Hi Heiko,
On 1/8/21 4:33 PM, Heiko Stuebner wrote:
> From: Heiko Stuebner <heiko.stuebner@xxxxxxxxxxxxxxxxxxxxx>
>
> Depending on the per-soc implementation there can be one interrupt
> for isp, mipi and capture events or separate per-event interrupts.
>
> So simply check for the presence of a named "mi" interrupt
> to differentiate between the two cases.
>
> Signed-off-by: Heiko Stuebner <heiko.stuebner@xxxxxxxxxxxxxxxxxxxxx>
> ---
> .../platform/rockchip/rkisp1/rkisp1-capture.c | 9 ++-
> .../platform/rockchip/rkisp1/rkisp1-common.h | 7 ++-
> .../platform/rockchip/rkisp1/rkisp1-dev.c | 58 ++++++++++++++-----
> .../platform/rockchip/rkisp1/rkisp1-isp.c | 16 +++--
> 4 files changed, 69 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
> index 5f6c9d1623e4..f70c66c2a1d7 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
> @@ -685,12 +685,17 @@ static void rkisp1_handle_buffer(struct rkisp1_capture *cap)
> spin_unlock(&cap->buf.lock);
> }
>
> -void rkisp1_capture_isr(struct rkisp1_device *rkisp1)
> +irqreturn_t rkisp1_capture_isr(int irq, void *ctx)
> {
> + struct device *dev = ctx;
> + struct rkisp1_device *rkisp1 = dev_get_drvdata(dev);
> unsigned int i;
> u32 status;
>
> status = rkisp1_read(rkisp1, RKISP1_CIF_MI_MIS);
> + if (!status)
> + return IRQ_NONE;
> +
> rkisp1_write(rkisp1, status, RKISP1_CIF_MI_ICR);
>
> for (i = 0; i < ARRAY_SIZE(rkisp1->capture_devs); ++i) {
> @@ -718,6 +723,8 @@ void rkisp1_capture_isr(struct rkisp1_device *rkisp1)
> cap->is_streaming = false;
> wake_up(&cap->done);
> }
> +
> + return IRQ_HANDLED;
> }
>
> /* ----------------------------------------------------------------------------
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
> index 038c303a8aed..44f333bf5d6a 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
> @@ -12,6 +12,7 @@
> #define _RKISP1_COMMON_H
>
> #include <linux/clk.h>
> +#include <linux/interrupt.h>
> #include <linux/mutex.h>
> #include <linux/rkisp1-config.h>
> #include <media/media-device.h>
> @@ -460,9 +461,9 @@ void rkisp1_params_configure(struct rkisp1_params *params,
> void rkisp1_params_disable(struct rkisp1_params *params);
>
> /* irq handlers */
> -void rkisp1_isp_isr(struct rkisp1_device *rkisp1);
> -void rkisp1_mipi_isr(struct rkisp1_device *rkisp1);
> -void rkisp1_capture_isr(struct rkisp1_device *rkisp1);
> +irqreturn_t rkisp1_isp_isr(int irq, void *ctx);
> +irqreturn_t rkisp1_mipi_isr(int irq, void *ctx);
> +irqreturn_t rkisp1_capture_isr(int irq, void *ctx);> void rkisp1_stats_isr(struct rkisp1_stats *stats, u32 isp_ris);
> void rkisp1_params_isr(struct rkisp1_device *rkisp1);
>
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> index 68da1eed753d..96afc1d1a914 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> @@ -389,18 +389,15 @@ static int rkisp1_entities_register(struct rkisp1_device *rkisp1)
>
> static irqreturn_t rkisp1_isr(int irq, void *ctx)
> {
> - struct device *dev = ctx;
> - struct rkisp1_device *rkisp1 = dev_get_drvdata(dev);
> -
> /*
> * Call rkisp1_capture_isr() first to handle the frame that
> * potentially completed using the current frame_sequence number before
> * it is potentially incremented by rkisp1_isp_isr() in the vertical
> * sync.
> */
> - rkisp1_capture_isr(rkisp1);
> - rkisp1_isp_isr(rkisp1);
> - rkisp1_mipi_isr(rkisp1);
> + rkisp1_capture_isr(irq, ctx);
> + rkisp1_isp_isr(irq, ctx);
> + rkisp1_mipi_isr(irq, ctx);
>
> return IRQ_HANDLED;
> }
> @@ -481,15 +478,50 @@ static int rkisp1_probe(struct platform_device *pdev)
> if (IS_ERR(rkisp1->base_addr))
> return PTR_ERR(rkisp1->base_addr);
>
> - irq = platform_get_irq(pdev, 0);
> - if (irq < 0)
> + irq = platform_get_irq_byname_optional(pdev, "mi");
> + if (irq == -EPROBE_DEFER) {
> return irq;
> + } else if (irq < 0) {
> + irq = platform_get_irq(pdev, 0);
> + if (irq < 0)
> + return irq;
> +
> + ret = devm_request_irq(dev, irq, rkisp1_isr, IRQF_SHARED,
> + dev_driver_string(dev), dev);
> + if (ret) {
> + dev_err(dev, "request irq failed: %d\n", ret);
> + return ret;
> + }
> + } else {
> + /* we test-got the MI (capture) interrupt */
> + ret = devm_request_irq(dev, irq, rkisp1_capture_isr, IRQF_SHARED,
> + dev_driver_string(dev), dev);
> + if (ret) {
> + dev_err(dev, "request mi irq failed: %d\n", ret);
> + return ret;
> + }
>
> - ret = devm_request_irq(dev, irq, rkisp1_isr, IRQF_SHARED,
> - dev_driver_string(dev), dev);
> - if (ret) {
> - dev_err(dev, "request irq failed: %d\n", ret);
> - return ret;
> + irq = platform_get_irq_byname_optional(pdev, "mipi");
> + if (irq < 0)
> + return irq;
> +
> + ret = devm_request_irq(dev, irq, rkisp1_mipi_isr, IRQF_SHARED,
> + dev_driver_string(dev), dev);
> + if (ret) {
> + dev_err(dev, "request mipi irq failed: %d\n", ret);
> + return ret;
> + }
> +
> + irq = platform_get_irq_byname_optional(pdev, "isp");
> + if (irq < 0)
> + return irq;
> +
> + ret = devm_request_irq(dev, irq, rkisp1_isp_isr, IRQF_SHARED,
> + dev_driver_string(dev), dev);
> + if (ret) {
> + dev_err(dev, "request isp irq failed: %d\n", ret);
> + return ret;
> + }
> }
>
> rkisp1->irq = irq;
Could you also remove this? It seems unused and it doesn't make sense for separated interrupts.
Thanks
Helen
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> index 889982d8ca41..84440aa71210 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> @@ -1056,13 +1056,15 @@ void rkisp1_isp_unregister(struct rkisp1_device *rkisp1)
> * Interrupt handlers
> */
>
> -void rkisp1_mipi_isr(struct rkisp1_device *rkisp1)
> +irqreturn_t rkisp1_mipi_isr(int irq, void *ctx)
> {
> + struct device *dev = ctx;
> + struct rkisp1_device *rkisp1 = dev_get_drvdata(dev);
> u32 val, status;
>
> status = rkisp1_read(rkisp1, RKISP1_CIF_MIPI_MIS);
> if (!status)
> - return;
> + return IRQ_NONE;
>
> rkisp1_write(rkisp1, status, RKISP1_CIF_MIPI_ICR);
>
> @@ -1097,6 +1099,8 @@ void rkisp1_mipi_isr(struct rkisp1_device *rkisp1)
> } else {
> rkisp1->debug.mipi_error++;
> }
> +
> + return IRQ_HANDLED;
> }
>
> static void rkisp1_isp_queue_event_sof(struct rkisp1_isp *isp)
> @@ -1109,13 +1113,15 @@ static void rkisp1_isp_queue_event_sof(struct rkisp1_isp *isp)
> v4l2_event_queue(isp->sd.devnode, &event);
> }
>
> -void rkisp1_isp_isr(struct rkisp1_device *rkisp1)
> +irqreturn_t rkisp1_isp_isr(int irq, void *ctx)
> {
> + struct device *dev = ctx;
> + struct rkisp1_device *rkisp1 = dev_get_drvdata(dev);
> u32 status, isp_err;
>
> status = rkisp1_read(rkisp1, RKISP1_CIF_ISP_MIS);
> if (!status)
> - return;
> + return IRQ_NONE;
>
> rkisp1_write(rkisp1, status, RKISP1_CIF_ISP_ICR);
>
> @@ -1157,4 +1163,6 @@ void rkisp1_isp_isr(struct rkisp1_device *rkisp1)
> */
> rkisp1_params_isr(rkisp1);
> }
> +
> + return IRQ_HANDLED;
> }
>
