Linux-Amlogic Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Neil Armstrong <neil.armstrong@linaro.org>
To: Will Deacon <will@kernel.org>, Marc Gonzalez <mgonzalez@freebox.fr>
Cc: Marc Gonzalez <marc.w.gonzalez@free.fr>,
	Jiucheng Xu <jiucheng.xu@amlogic.com>,
	Pierre-Hugues Husson <phh@phh.me>,
	Jerome Brunet <jbrunet@baylibre.com>,
	Kevin Hilman <khilman@baylibre.com>,
	linux-amlogic@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org,
	Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
	Mark Rutland <mark.rutland@arm.com>
Subject: Re: [PATCH v2 3/3] perf/amlogic: adjust register offsets
Date: Mon, 27 Mar 2023 16:17:29 +0200	[thread overview]
Message-ID: <f0432ff5-7e73-1e7e-1745-6f3b679153fe@linaro.org> (raw)
In-Reply-To: <20230327120932.2158389-4-mgonzalez@freebox.fr>

Hi,

On 27/03/2023 14:09, Marc Gonzalez wrote:
> Commit "perf/amlogic: resolve conflict between canvas & pmu"
> changed the base address.
> 
> Fixes: 2016e2113d35 ("perf/amlogic: Add support for Amlogic meson G12 SoC DDR PMU driver")
> Signed-off-by: Marc Gonzalez <mgonzalez@freebox.fr>
> ---
>   drivers/perf/amlogic/meson_g12_ddr_pmu.c | 34 +++++++++++++++++-----------------
>   1 file changed, 17 insertions(+), 17 deletions(-)
> 
> diff --git a/drivers/perf/amlogic/meson_g12_ddr_pmu.c b/drivers/perf/amlogic/meson_g12_ddr_pmu.c
> index a78fdb15e26c2..8b643888d5036 100644
> --- a/drivers/perf/amlogic/meson_g12_ddr_pmu.c
> +++ b/drivers/perf/amlogic/meson_g12_ddr_pmu.c
> @@ -21,23 +21,23 @@
>   #define DMC_QOS_IRQ		BIT(30)
>   
>   /* DMC bandwidth monitor register address offset */
> -#define DMC_MON_G12_CTRL0		(0x20  << 2)
> -#define DMC_MON_G12_CTRL1		(0x21  << 2)
> -#define DMC_MON_G12_CTRL2		(0x22  << 2)
> -#define DMC_MON_G12_CTRL3		(0x23  << 2)
> -#define DMC_MON_G12_CTRL4		(0x24  << 2)
> -#define DMC_MON_G12_CTRL5		(0x25  << 2)
> -#define DMC_MON_G12_CTRL6		(0x26  << 2)
> -#define DMC_MON_G12_CTRL7		(0x27  << 2)
> -#define DMC_MON_G12_CTRL8		(0x28  << 2)
> -
> -#define DMC_MON_G12_ALL_REQ_CNT		(0x29  << 2)
> -#define DMC_MON_G12_ALL_GRANT_CNT	(0x2a  << 2)
> -#define DMC_MON_G12_ONE_GRANT_CNT	(0x2b  << 2)
> -#define DMC_MON_G12_SEC_GRANT_CNT	(0x2c  << 2)
> -#define DMC_MON_G12_THD_GRANT_CNT	(0x2d  << 2)
> -#define DMC_MON_G12_FOR_GRANT_CNT	(0x2e  << 2)
> -#define DMC_MON_G12_TIMER		(0x2f  << 2)
> +#define DMC_MON_G12_CTRL0		(0x0  << 2)
> +#define DMC_MON_G12_CTRL1		(0x1  << 2)
> +#define DMC_MON_G12_CTRL2		(0x2  << 2)
> +#define DMC_MON_G12_CTRL3		(0x3  << 2)
> +#define DMC_MON_G12_CTRL4		(0x4  << 2)
> +#define DMC_MON_G12_CTRL5		(0x5  << 2)
> +#define DMC_MON_G12_CTRL6		(0x6  << 2)
> +#define DMC_MON_G12_CTRL7		(0x7  << 2)
> +#define DMC_MON_G12_CTRL8		(0x8  << 2)
> +
> +#define DMC_MON_G12_ALL_REQ_CNT		(0x9  << 2)
> +#define DMC_MON_G12_ALL_GRANT_CNT	(0xa  << 2)
> +#define DMC_MON_G12_ONE_GRANT_CNT	(0xb  << 2)
> +#define DMC_MON_G12_SEC_GRANT_CNT	(0xc  << 2)
> +#define DMC_MON_G12_THD_GRANT_CNT	(0xd  << 2)
> +#define DMC_MON_G12_FOR_GRANT_CNT	(0xe  << 2)
> +#define DMC_MON_G12_TIMER		(0xf  << 2)
>   
>   /* Each bit represent a axi line */
>   PMU_FORMAT_ATTR(event, "config:0-7");


Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>

Will, I've applied DT patches 1 & 2, can you apply this one via your fixes tree for v6.3 ?

Thanks,
Neil

_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

  reply	other threads:[~2023-03-27 14:17 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-27 12:09 [PATCH v2 0/3] Fix G12 PMU conflict Marc Gonzalez
2023-03-27 12:09 ` [PATCH v2 1/3] arm64: dts: meson-g12-common: specify full DMC range Marc Gonzalez
2023-03-27 12:09 ` [PATCH v2 2/3] perf/amlogic: resolve conflict between canvas & pmu Marc Gonzalez
2023-03-27 12:44   ` Marc Gonzalez
2023-03-27 14:12   ` Neil Armstrong
2023-03-28 11:56     ` Marc Gonzalez
2023-03-27 12:09 ` [PATCH v2 3/3] perf/amlogic: adjust register offsets Marc Gonzalez
2023-03-27 14:17   ` Neil Armstrong [this message]
2023-03-27 15:12     ` Will Deacon
2023-03-27 15:27       ` Neil Armstrong
2023-03-27 14:15 ` (subset) [PATCH v2 0/3] Fix G12 PMU conflict Neil Armstrong
2023-03-27 15:25 ` Marc Gonzalez
2023-03-27 15:36   ` Marc Gonzalez
2023-03-27 15:52     ` Marc Gonzalez
2023-03-29  0:01       ` Marc Gonzalez
2023-03-27 15:31 ` (subset) " Neil Armstrong

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=f0432ff5-7e73-1e7e-1745-6f3b679153fe@linaro.org \
    --to=neil.armstrong@linaro.org \
    --cc=jbrunet@baylibre.com \
    --cc=jiucheng.xu@amlogic.com \
    --cc=khilman@baylibre.com \
    --cc=linux-amlogic@lists.infradead.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marc.w.gonzalez@free.fr \
    --cc=mark.rutland@arm.com \
    --cc=martin.blumenstingl@googlemail.com \
    --cc=mgonzalez@freebox.fr \
    --cc=phh@phh.me \
    --cc=will@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