From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Cc: linux-media@vger.kernel.org, helen.koike@collabora.com,
ezequiel@collabora.com, hverkuil@xs4all.nl, kernel@collabora.com,
dafna3@gmail.com, sakari.ailus@linux.intel.com,
linux-rockchip@lists.infradead.org, mchehab@kernel.org
Subject: Re: [PATCH 2/5] media: staging: rkisp1: use a macro for the statistics flags mask
Date: Thu, 21 May 2020 02:27:49 +0300 [thread overview]
Message-ID: <20200520232749.GB25474@pendragon.ideasonboard.com> (raw)
In-Reply-To: <20200512120522.25960-3-dafna.hirschfeld@collabora.com>
Hi Dafna,
Thank you for the patch.
On Tue, May 12, 2020 at 02:05:19PM +0200, Dafna Hirschfeld wrote:
> The mask of the ready statistics flags is used in
> several places in the code using bitwise-or.
> Use a macro for that to make the code more readable.
>
> Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
> ---
> drivers/staging/media/rkisp1/rkisp1-common.h | 4 ++++
> drivers/staging/media/rkisp1/rkisp1-isp.c | 5 +----
> drivers/staging/media/rkisp1/rkisp1-stats.c | 12 +++---------
> 3 files changed, 8 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/staging/media/rkisp1/rkisp1-common.h b/drivers/staging/media/rkisp1/rkisp1-common.h
> index 33dffe21c769..c0ab16c6b3db 100644
> --- a/drivers/staging/media/rkisp1/rkisp1-common.h
> +++ b/drivers/staging/media/rkisp1/rkisp1-common.h
> @@ -42,6 +42,10 @@
>
> #define RKISP1_MAX_BUS_CLK 8
>
> +#define RKISP1_STATS_MEAS_MASK (RKISP1_CIF_ISP_AWB_DONE | \
> + RKISP1_CIF_ISP_AFM_FIN | \
> + RKISP1_CIF_ISP_EXP_END | \
> + RKISP1_CIF_ISP_HIST_MEASURE_RDY)
> enum rkisp1_rsz_pad {
> RKISP1_RSZ_PAD_SINK,
> RKISP1_RSZ_PAD_SRC,
> diff --git a/drivers/staging/media/rkisp1/rkisp1-isp.c b/drivers/staging/media/rkisp1/rkisp1-isp.c
> index 19ab0ed323aa..49b47e1734b0 100644
> --- a/drivers/staging/media/rkisp1/rkisp1-isp.c
> +++ b/drivers/staging/media/rkisp1/rkisp1-isp.c
> @@ -1137,10 +1137,7 @@ irqreturn_t rkisp1_isp_isr(struct rkisp1_device *rkisp1)
>
> /* New frame from the sensor received */
> isp_ris = rkisp1_read(rkisp1, RKISP1_CIF_ISP_RIS);
> - if (isp_ris & (RKISP1_CIF_ISP_AWB_DONE |
> - RKISP1_CIF_ISP_AFM_FIN |
> - RKISP1_CIF_ISP_EXP_END |
> - RKISP1_CIF_ISP_HIST_MEASURE_RDY))
> + if (isp_ris & RKISP1_STATS_MEAS_MASK)
> rkisp1_stats_isr(&rkisp1->stats, isp_ris);
> }
>
> diff --git a/drivers/staging/media/rkisp1/rkisp1-stats.c b/drivers/staging/media/rkisp1/rkisp1-stats.c
> index 6dfcbdc3deb8..12998db955e6 100644
> --- a/drivers/staging/media/rkisp1/rkisp1-stats.c
> +++ b/drivers/staging/media/rkisp1/rkisp1-stats.c
> @@ -407,22 +407,16 @@ void rkisp1_stats_isr(struct rkisp1_stats *stats, u32 isp_ris)
>
> spin_lock(&stats->irq_lock);
>
> - val = RKISP1_CIF_ISP_AWB_DONE | RKISP1_CIF_ISP_AFM_FIN |
> - RKISP1_CIF_ISP_EXP_END | RKISP1_CIF_ISP_HIST_MEASURE_RDY;
> + val = RKISP1_STATS_MEAS_MASK;
> rkisp1_write(rkisp1, val, RKISP1_CIF_ISP_ICR);
This could become
rkisp1_write(rkisp1, RKISP1_STATS_MEAS_MASK, RKISP1_CIF_ISP_ICR);
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>
> isp_mis_tmp = rkisp1_read(rkisp1, RKISP1_CIF_ISP_MIS);
> - if (isp_mis_tmp &
> - (RKISP1_CIF_ISP_AWB_DONE | RKISP1_CIF_ISP_AFM_FIN |
> - RKISP1_CIF_ISP_EXP_END | RKISP1_CIF_ISP_HIST_MEASURE_RDY))
> + if (isp_mis_tmp & RKISP1_STATS_MEAS_MASK)
> rkisp1->debug.stats_error++;
>
> if (!stats->is_streaming)
> goto unlock;
> - if (isp_ris & (RKISP1_CIF_ISP_AWB_DONE |
> - RKISP1_CIF_ISP_AFM_FIN |
> - RKISP1_CIF_ISP_EXP_END |
> - RKISP1_CIF_ISP_HIST_MEASURE_RDY)) {
> + if (isp_ris & RKISP1_STATS_MEAS_MASK) {
> work = kzalloc(sizeof(*work), GFP_ATOMIC);
> if (work) {
> INIT_WORK(&work->work,
--
Regards,
Laurent Pinchart
next prev parent reply other threads:[~2020-05-20 23:28 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-12 12:05 [PATCH 0/5] media: staging: rkisp1: change workqueue to threaded irq in stats Dafna Hirschfeld
2020-05-12 12:05 ` [PATCH 1/5] media: staging: rkisp1: return IRQ_NONE in isr when irq isn't for ISP Dafna Hirschfeld
2020-05-12 15:42 ` kbuild test robot
2020-05-20 10:58 ` Helen Koike
2020-05-20 20:58 ` Laurent Pinchart
2020-05-12 12:05 ` [PATCH 2/5] media: staging: rkisp1: use a macro for the statistics flags mask Dafna Hirschfeld
2020-05-20 11:03 ` Helen Koike
2020-05-20 23:27 ` Laurent Pinchart [this message]
2020-05-12 12:05 ` [PATCH 3/5] media: staging: rkisp1: stats: use spin_lock_irqsave for irq_lock Dafna Hirschfeld
2020-05-20 11:11 ` Helen Koike
2020-05-20 19:22 ` Dafna Hirschfeld
2020-05-20 23:40 ` Laurent Pinchart
2020-05-12 12:05 ` [PATCH 4/5] media: staging: rkisp1: stats: replace locks wq_lock, irq_lock with one lock Dafna Hirschfeld
2020-05-20 23:48 ` Laurent Pinchart
2020-05-12 12:05 ` [PATCH 5/5] media: staging: rkisp1: replace workqueue with threaded irq for reading statistics registers Dafna Hirschfeld
2020-05-12 16:41 ` kbuild test robot
2020-05-21 0:09 ` Laurent Pinchart
2020-05-21 10:38 ` Tomasz Figa
2020-05-28 19:19 ` Dafna Hirschfeld
2020-05-28 19:35 ` Tomasz Figa
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=20200520232749.GB25474@pendragon.ideasonboard.com \
--to=laurent.pinchart@ideasonboard.com \
--cc=dafna.hirschfeld@collabora.com \
--cc=dafna3@gmail.com \
--cc=ezequiel@collabora.com \
--cc=helen.koike@collabora.com \
--cc=hverkuil@xs4all.nl \
--cc=kernel@collabora.com \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mchehab@kernel.org \
--cc=sakari.ailus@linux.intel.com \
/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;
as well as URLs for NNTP newsgroup(s).