From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2D33FC76195 for ; Mon, 27 Mar 2023 15:12:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=sGKugJJ7NnGtgWX2ZICtfjMdHvTHASsN+F81ODm7gS4=; b=dMmS5hYPgvYsO9 MTt+g1z9ny2abGhg/jPAkAtVOMnVXMLv8sJZxlBHadX1eIhlh6RzqB59BmCk07bq0PeZPMP52tOwY QIeepJ6aoDo6YS+pi3VOKxAjO7XwpbB3N2CL6MDH1odgLfI3r0dTRj2UiGf3sYBRgn2GJjs/O22KI EEueGr7YUbhLO5E3TAZ6nfEOhXgnmqhAhstl5cIHJ0DBcmGVAbyXdeYXE0h+rblBy08A7U6Yxn7JC mUaF9aaEOwQqy2yiKb0fml3oZFVXCytZ2dHDZ5G4UVjA8+Dr1o6dOzre4YSiCQUwFzYsIW84/3pbr DVYtsJZXQM79b5Slvf6g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pgoWK-00BTUH-13; Mon, 27 Mar 2023 15:12:28 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pgoWH-00BTSu-2p; Mon, 27 Mar 2023 15:12:27 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 35B77B81616; Mon, 27 Mar 2023 15:12:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CDB9BC433EF; Mon, 27 Mar 2023 15:12:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1679929943; bh=j9PLzn1taq+ed5KwV9+KtXcTo4kwdryon7XM4NMATIM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=LqYZHTGkHPwNoqIaOlBa/ktJhPtXjVZO/dW9L6Sxt5vDwXSkuSpWAjpPW3m0YPzvP jrFk++EaJ+ExJ4A1hmaA90ZOATVUBWZrREdrjMNFKscakqDjOtC6c0hit5zX2dOku4 yqZF8/dueJqwHIebIsdna2DZ4t+akvxDJRCOV2rh49LhCg9UmsqRaLSyiH/M55o5Oq WR5+bTffX9syAAMlrqKognv2cmerhbcIB34cZ+9qmqgmVHuyKCzJtX+Xf4SypGX+QC /eoCXgo6QGSVGgBBR7uJqfpQ8DpU0qDf8Bnrj4/C6Z/34ukdu+4Bgt0ltqmQSmZ/JR YzAHRhVmT4yFA== Date: Mon, 27 Mar 2023 16:12:17 +0100 From: Will Deacon To: Neil Armstrong Cc: Marc Gonzalez , Marc Gonzalez , Jiucheng Xu , Pierre-Hugues Husson , Jerome Brunet , Kevin Hilman , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Martin Blumenstingl , Mark Rutland Subject: Re: [PATCH v2 3/3] perf/amlogic: adjust register offsets Message-ID: <20230327151216.GA32275@willie-the-truck> References: <20230327120932.2158389-1-mgonzalez@freebox.fr> <20230327120932.2158389-4-mgonzalez@freebox.fr> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230327_081226_207741_860A13F4 X-CRM114-Status: GOOD ( 17.17 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org On Mon, Mar 27, 2023 at 04:17:29PM +0200, Neil Armstrong wrote: > 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 > > --- > > 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 > > Will, I've applied DT patches 1 & 2, can you apply this one via your fixes tree for v6.3 ? If you're sending the DT patches as fixes, you may as well just take this driver change at the same time with my ack: Acked-by: Will Deacon Does that work for you? Will _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic