From: Ricardo Ribalda <ribalda@chromium.org>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: linux-media@vger.kernel.org,
Dafna Hirschfeld <dafna@fastmail.com>,
Heiko Stuebner <heiko@sntech.de>,
Paul Elder <paul.elder@ideasonboard.com>,
Tomasz Figa <tfiga@google.com>,
linux-rockchip@lists.infradead.org
Subject: Re: [PATCH v4 16/21] media: rkisp1: debug: Move resizer register dump to debugfs
Date: Mon, 25 Apr 2022 13:16:12 +0200 [thread overview]
Message-ID: <YmaC/D4QTJvGb6MY@gmail.com> (raw)
In-Reply-To: <20220421234240.1694-17-laurent.pinchart@ideasonboard.com>
Laurent Pinchart wrote:
> The debugfs support already includes support to dump core and ISP
> registers. Move the resizer register dump there too to make the
> userspace interface consistent.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Ricardo Ribalda <ribalda@chromium.org>
> ---
> Changes since v3:
>
> - Use RKISP1_MAINPATH and RKISP1_SELFPATH macros
> - Call pm_runtime_get_if_in_use()
> ---
> .../platform/rockchip/rkisp1/rkisp1-debug.c | 57 +++++++++++++++++++
> .../platform/rockchip/rkisp1/rkisp1-resizer.c | 37 ------------
> 2 files changed, 57 insertions(+), 37 deletions(-)
>
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c
> index 63aa81553178..d6cfbfaba3cb 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c
> @@ -81,6 +81,57 @@ static int rkisp1_debug_dump_isp_regs_show(struct seq_file *m, void *p)
> }
> DEFINE_SHOW_ATTRIBUTE(rkisp1_debug_dump_isp_regs);
>
> +#define RKISP1_DEBUG_RSZ_REG_DEC(name) { \
> + RKISP1_CIF_##name, RKISP1_CIF_##name##_SHD, #name, false \
> +}
> +
> +#define RKISP1_DEBUG_RSZ_REG_HEX(name) { \
> + RKISP1_CIF_##name, RKISP1_CIF_##name##_SHD, #name, true \
> +}
> +
> +static int rkisp1_debug_dump_rsz_regs_show(struct seq_file *m, void *p)
> +{
> + static const struct {
> + u32 reg;
> + u32 shadow;
> + const char * const name;
> + bool hex;
> + } registers[] = {
> + RKISP1_DEBUG_RSZ_REG_HEX(RSZ_CTRL),
> + RKISP1_DEBUG_RSZ_REG_DEC(RSZ_SCALE_HY),
> + RKISP1_DEBUG_RSZ_REG_DEC(RSZ_SCALE_HCB),
> + RKISP1_DEBUG_RSZ_REG_DEC(RSZ_SCALE_HCR),
> + RKISP1_DEBUG_RSZ_REG_DEC(RSZ_SCALE_VY),
> + RKISP1_DEBUG_RSZ_REG_DEC(RSZ_SCALE_VC),
> + RKISP1_DEBUG_RSZ_REG_DEC(RSZ_PHASE_HY),
> + RKISP1_DEBUG_RSZ_REG_DEC(RSZ_PHASE_HC),
> + RKISP1_DEBUG_RSZ_REG_DEC(RSZ_PHASE_VY),
> + RKISP1_DEBUG_RSZ_REG_DEC(RSZ_PHASE_VC),
> + { /* Sentinel */ },
> + };
> +
> + struct rkisp1_resizer *rsz = m->private;
> + typeof(registers[0]) *reg;
> + u32 val, shd;
> + int ret;
> +
> + ret = pm_runtime_get_if_in_use(rsz->rkisp1->dev);
> + if (ret <= 0)
> + return ret ? : -ENODATA;
> +
> + for (reg = registers; reg->name; ++reg) {
> + val = rkisp1_read(rsz->rkisp1, rsz->regs_base + reg->reg);
> + shd = rkisp1_read(rsz->rkisp1, rsz->regs_base + reg->shadow);
> + seq_printf(m, reg->hex ? "%14s: 0x%08x/0x%08x\n" : "%14s: %u/%u\n",
> + reg->name, val, shd);
> + }
> +
> + pm_runtime_put(rsz->rkisp1->dev);
> +
> + return 0;
> +}
> +DEFINE_SHOW_ATTRIBUTE(rkisp1_debug_dump_rsz_regs);
> +
> #define RKISP1_DEBUG_DATA_COUNT_BINS 32
> #define RKISP1_DEBUG_DATA_COUNT_STEP (4096 / RKISP1_DEBUG_DATA_COUNT_BINS)
>
> @@ -168,6 +219,12 @@ void rkisp1_debug_init(struct rkisp1_device *rkisp1)
> &rkisp1_debug_dump_core_regs_fops);
> debugfs_create_file("isp", 0444, regs_dir, rkisp1,
> &rkisp1_debug_dump_isp_regs_fops);
> + debugfs_create_file("mrsz", 0444, regs_dir,
> + &rkisp1->resizer_devs[RKISP1_MAINPATH],
> + &rkisp1_debug_dump_rsz_regs_fops);
> + debugfs_create_file("srsz", 0444, regs_dir,
> + &rkisp1->resizer_devs[RKISP1_SELFPATH],
> + &rkisp1_debug_dump_rsz_regs_fops);
> }
>
> void rkisp1_debug_cleanup(struct rkisp1_device *rkisp1)
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c
> index ac1b357a2a3a..1c07985c810d 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c
> @@ -203,41 +203,6 @@ static void rkisp1_dcrop_config(struct rkisp1_resizer *rsz)
> * Resizer hw configs
> */
>
> -static void rkisp1_rsz_dump_regs(struct rkisp1_resizer *rsz)
> -{
> - dev_dbg(rsz->rkisp1->dev,
> - "RSZ_CTRL 0x%08x/0x%08x\n"
> - "RSZ_SCALE_HY %d/%d\n"
> - "RSZ_SCALE_HCB %d/%d\n"
> - "RSZ_SCALE_HCR %d/%d\n"
> - "RSZ_SCALE_VY %d/%d\n"
> - "RSZ_SCALE_VC %d/%d\n"
> - "RSZ_PHASE_HY %d/%d\n"
> - "RSZ_PHASE_HC %d/%d\n"
> - "RSZ_PHASE_VY %d/%d\n"
> - "RSZ_PHASE_VC %d/%d\n",
> - rkisp1_rsz_read(rsz, RKISP1_CIF_RSZ_CTRL),
> - rkisp1_rsz_read(rsz, RKISP1_CIF_RSZ_CTRL_SHD),
> - rkisp1_rsz_read(rsz, RKISP1_CIF_RSZ_SCALE_HY),
> - rkisp1_rsz_read(rsz, RKISP1_CIF_RSZ_SCALE_HY_SHD),
> - rkisp1_rsz_read(rsz, RKISP1_CIF_RSZ_SCALE_HCB),
> - rkisp1_rsz_read(rsz, RKISP1_CIF_RSZ_SCALE_HCB_SHD),
> - rkisp1_rsz_read(rsz, RKISP1_CIF_RSZ_SCALE_HCR),
> - rkisp1_rsz_read(rsz, RKISP1_CIF_RSZ_SCALE_HCR_SHD),
> - rkisp1_rsz_read(rsz, RKISP1_CIF_RSZ_SCALE_VY),
> - rkisp1_rsz_read(rsz, RKISP1_CIF_RSZ_SCALE_VY_SHD),
> - rkisp1_rsz_read(rsz, RKISP1_CIF_RSZ_SCALE_VC),
> - rkisp1_rsz_read(rsz, RKISP1_CIF_RSZ_SCALE_VC_SHD),
> - rkisp1_rsz_read(rsz, RKISP1_CIF_RSZ_PHASE_HY),
> - rkisp1_rsz_read(rsz, RKISP1_CIF_RSZ_PHASE_HY_SHD),
> - rkisp1_rsz_read(rsz, RKISP1_CIF_RSZ_PHASE_HC),
> - rkisp1_rsz_read(rsz, RKISP1_CIF_RSZ_PHASE_HC_SHD),
> - rkisp1_rsz_read(rsz, RKISP1_CIF_RSZ_PHASE_VY),
> - rkisp1_rsz_read(rsz, RKISP1_CIF_RSZ_PHASE_VY_SHD),
> - rkisp1_rsz_read(rsz, RKISP1_CIF_RSZ_PHASE_VC),
> - rkisp1_rsz_read(rsz, RKISP1_CIF_RSZ_PHASE_VC_SHD));
> -}
> -
> static void rkisp1_rsz_update_shadow(struct rkisp1_resizer *rsz,
> enum rkisp1_shadow_regs_when when)
> {
> @@ -386,8 +351,6 @@ static void rkisp1_rsz_config(struct rkisp1_resizer *rsz,
>
> /* set values in the hw */
> rkisp1_rsz_config_regs(rsz, &sink_y, &sink_c, &src_y, &src_c, when);
> -
> - rkisp1_rsz_dump_regs(rsz);
> }
>
> /* ----------------------------------------------------------------------------
> --
> Regards,
>
> Laurent Pinchart
>
>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2022-04-25 11:16 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-21 23:42 [PATCH v4 00/21] media: rkisp1: Misc bug fixes and cleanups Laurent Pinchart
2022-04-21 23:42 ` [PATCH v4 01/21] media: rkisp1: capture: Initialize entity before video device Laurent Pinchart
2022-04-25 7:52 ` Ricardo Ribalda
2022-04-21 23:42 ` [PATCH v4 02/21] media: rkisp1: capture: Fix and simplify (un)registration Laurent Pinchart
2022-04-25 9:34 ` Ricardo Ribalda
2022-04-21 23:42 ` [PATCH v4 03/21] media: rkisp1: isp: " Laurent Pinchart
2022-04-25 9:36 ` Ricardo Ribalda
2022-04-21 23:42 ` [PATCH v4 04/21] media: rkisp1: resizer: " Laurent Pinchart
2022-04-25 9:37 ` Ricardo Ribalda
2022-04-21 23:42 ` [PATCH v4 05/21] media: rkisp1: params: " Laurent Pinchart
2022-04-25 9:39 ` Ricardo Ribalda
2022-04-21 23:42 ` [PATCH v4 06/21] media: rkisp1: stats: Simplify (un)registration Laurent Pinchart
2022-04-25 9:44 ` Ricardo Ribalda
2022-04-21 23:42 ` [PATCH v4 07/21] media: rkisp1: Simplify rkisp1_entities_register() error path Laurent Pinchart
2022-04-25 9:45 ` Ricardo Ribalda
2022-04-21 23:42 ` [PATCH v4 08/21] media: rkisp1: regs: Don't use BIT() macro for multi-bit register fields Laurent Pinchart
2022-04-25 9:50 ` Ricardo Ribalda
2022-04-21 23:42 ` [PATCH v4 09/21] media: rkisp1: regs: Rename CCL, ICCL and IRCL registers with VI_ prefix Laurent Pinchart
2022-04-25 9:51 ` Ricardo Ribalda
2022-04-21 23:42 ` [PATCH v4 10/21] media: rkisp1: Swap value and address arguments to rkisp1_write() Laurent Pinchart
2022-04-25 9:53 ` Ricardo Ribalda
2022-04-25 18:59 ` Laurent Pinchart
2022-04-21 23:42 ` [PATCH v4 11/21] media: rkisp1: resizer: Simplify register access Laurent Pinchart
2022-04-25 9:58 ` Ricardo Ribalda
2022-04-21 23:42 ` [PATCH v4 12/21] media: rkisp1: Move debugfs code to a separate file Laurent Pinchart
2022-04-25 10:54 ` Ricardo Ribalda
2022-04-21 23:42 ` [PATCH v4 13/21] media: rkisp1: Compile debugfs support conditionally Laurent Pinchart
2022-04-25 10:58 ` Ricardo Ribalda
2022-04-25 19:08 ` Laurent Pinchart
2022-04-26 7:33 ` Ricardo Ribalda
2022-04-21 23:42 ` [PATCH v4 14/21] media: rkisp1: debug: Collect input status by sampling ISP_FLAGS_SHD Laurent Pinchart
2022-04-25 11:08 ` Ricardo Ribalda
2022-04-25 20:13 ` Laurent Pinchart
2022-04-21 23:42 ` [PATCH v4 15/21] media: rkisp1: debug: Add debugfs files to dump core and ISP registers Laurent Pinchart
2022-04-25 11:13 ` Ricardo Ribalda
2022-04-21 23:42 ` [PATCH v4 16/21] media: rkisp1: debug: Move resizer register dump to debugfs Laurent Pinchart
2022-04-25 11:16 ` Ricardo Ribalda [this message]
2022-04-21 23:42 ` [PATCH v4 17/21] media: rkisp1: debug: Consolidate reg dumps for shadow registers Laurent Pinchart
2022-04-25 11:45 ` Ricardo Ribalda
2022-04-21 23:42 ` [PATCH v4 18/21] media: rkisp1: debug: Compute max register length name dynamically Laurent Pinchart
2022-04-25 11:49 ` Ricardo Ribalda
2022-04-25 19:05 ` Laurent Pinchart
2022-04-25 21:01 ` [PATCH v4.1 18/21] media: rkisp1: debug: Update max register name length Laurent Pinchart
2022-04-26 7:39 ` Ricardo Ribalda
2022-04-21 23:42 ` [PATCH v4 19/21] media: rkisp1: capture: Bypass the main device for handling querycap Laurent Pinchart
2022-04-25 11:51 ` Ricardo Ribalda
2022-04-21 23:42 ` [PATCH v4 20/21] media: rkisp1: Align macro definitions Laurent Pinchart
2022-04-25 11:52 ` Ricardo Ribalda
2022-04-21 23:42 ` [PATCH v4 21/21] media: rkisp1: Drop parentheses and fix indentation in rkisp1_probe() Laurent Pinchart
2022-04-25 8:30 ` Ricardo Ribalda
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=YmaC/D4QTJvGb6MY@gmail.com \
--to=ribalda@chromium.org \
--cc=dafna@fastmail.com \
--cc=heiko@sntech.de \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=paul.elder@ideasonboard.com \
--cc=tfiga@google.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).