Commit f9d323e7 authored by Marc Gonzalez's avatar Marc Gonzalez Committed by Neil Armstrong
Browse files

perf/amlogic: adjust register offsets 



Commit "perf/amlogic: resolve conflict between canvas & pmu"
changed the base address.

Fixes: 2016e211 ("perf/amlogic: Add support for Amlogic meson G12 SoC DDR PMU driver")
Signed-off-by: default avatarMarc Gonzalez <mgonzalez@freebox.fr>
Acked-by: default avatarWill Deacon <will@kernel.org>
Reviewed-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20230327120932.2158389-4-mgonzalez@freebox.fr


Signed-off-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
parent 33acea20

drivers/perf/amlogic/meson_g12_ddr_pmu.c

+17 −17
Original line number Diff line number Diff line
@@ -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");