From: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
To: Heiko Stuebner <heiko@sntech.de>,
mchehab@kernel.org, hverkuil-cisco@xs4all.nl
Cc: ezequiel@collabora.com, helen.koike@collabora.com,
Laurent.pinchart@ideasonboard.com,
linux-rockchip@lists.infradead.org, linux-media@vger.kernel.org,
Heiko Stuebner <heiko.stuebner@theobroma-systems.com>
Subject: Re: [PATCH v2 2/7] media: rockchip: rkisp1: allow separate interrupts
Date: Tue, 15 Jun 2021 08:42:26 +0300 [thread overview]
Message-ID: <a60a5dce-eb81-06c4-011e-ba567f143d59@collabora.com> (raw)
In-Reply-To: <20210615003741.3758316-3-heiko@sntech.de>
Hi,
On 15.06.21 03:37, Heiko Stuebner wrote:
> From: Heiko Stuebner <heiko.stuebner@theobroma-systems.com>
>
> 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.
So in this patch you actually relay on the 'interrupt-names' property added to
the binding right? So I think you should also update the 'rockchip-isp1.yaml' file.
Thanks,
Dafna
>
> Signed-off-by: Heiko Stuebner <heiko.stuebner@theobroma-systems.com>
> ---
> .../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 be8a350c7527..25dd5c93620e 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>
> @@ -459,9 +460,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 7afa4c123834..ddc05189c62a 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> @@ -385,18 +385,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;
> }
> @@ -478,15 +475,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;
> + }
> }
>
> for (i = 0; i < match_data->size; i++)
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> index 2e5b57e3aedc..1de98e688008 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> @@ -1090,13 +1090,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);
>
> @@ -1131,6 +1133,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)
> @@ -1143,13 +1147,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);
>
> @@ -1191,4 +1197,6 @@ void rkisp1_isp_isr(struct rkisp1_device *rkisp1)
> */
> rkisp1_params_isr(rkisp1);
> }
> +
> + return IRQ_HANDLED;
> }
>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2021-06-15 19:22 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-15 0:37 [PATCH v2 0/7] rkisp1 support for px30 Heiko Stuebner
2021-06-15 0:37 ` [PATCH v2 1/7] media: rockchip: rkisp1: remove unused irq variable Heiko Stuebner
2021-06-15 5:44 ` Dafna Hirschfeld
2021-06-15 0:37 ` [PATCH v2 2/7] media: rockchip: rkisp1: allow separate interrupts Heiko Stuebner
2021-06-15 5:42 ` Dafna Hirschfeld [this message]
2021-06-15 0:37 ` [PATCH v2 3/7] media: rockchip: rkisp1: make some isp-param functions variable Heiko Stuebner
2021-06-15 5:53 ` Dafna Hirschfeld
2021-06-15 22:44 ` Heiko Stübner
2021-06-16 18:17 ` kernel test robot
2021-06-15 0:37 ` [PATCH v2 4/7] media: rockchip: rkisp1: make some isp-stats " Heiko Stuebner
2021-06-15 0:37 ` [PATCH v2 5/7] media: rockchip: rkisp1: add prefixes for v10 specific parts Heiko Stuebner
2021-06-15 6:06 ` Dafna Hirschfeld
2021-06-16 19:36 ` kernel test robot
2021-06-15 0:37 ` [PATCH v2 6/7] media: rockchip: rkisp1: add support for v12 isp variants Heiko Stuebner
2021-06-15 6:33 ` Dafna Hirschfeld
2021-06-15 22:31 ` Heiko Stübner
2021-06-15 0:37 ` [PATCH v2 7/7] media: rockchip: rkisp1: add support for px30 isp version Heiko Stuebner
2021-06-15 6:31 ` Dafna Hirschfeld
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a60a5dce-eb81-06c4-011e-ba567f143d59@collabora.com \
--to=dafna.hirschfeld@collabora.com \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=ezequiel@collabora.com \
--cc=heiko.stuebner@theobroma-systems.com \
--cc=heiko@sntech.de \
--cc=helen.koike@collabora.com \
--cc=hverkuil-cisco@xs4all.nl \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mchehab@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox