Unverified Commit 0311454f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-fixes-v6.3-rc' of... 

Merge tag 'amlogic-fixes-v6.3-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/fixes

Amlogic fixes for v6.3-rc:
- fix conflicts between DMC memory space and Amlogic perf driver

* tag 'amlogic-fixes-v6.3-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  perf/amlogic: adjust register offsets
  arm64: dts: meson-g12-common: resolve conflict between canvas & pmu
  arm64: dts: meson-g12-common: specify full DMC range

Link: https://lore.kernel.org/r/db5fcdb4-60e8-95e6-06b5-1ac474ecabe3@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 167fba62 f9d323e7

arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi

+7 −8
Original line number Diff line number Diff line
@@ -1571,15 +1571,20 @@ 


			dmc: bus@38000 {

				compatible = "simple-bus";

				reg = <0x0 0x38000 0x0 0x400>;

				#address-cells = <2>;

				#size-cells = <2>;

				ranges = <0x0 0x0 0x0 0x38000 0x0 0x400>;

				ranges = <0x0 0x0 0x0 0x38000 0x0 0x2000>;



				canvas: video-lut@48 {

					compatible = "amlogic,canvas";

					reg = <0x0 0x48 0x0 0x14>;

				};



				pmu: pmu@80 {

					reg = <0x0 0x80 0x0 0x40>,

					      <0x0 0xc00 0x0 0x40>;

					interrupts = <GIC_SPI 52 IRQ_TYPE_EDGE_RISING>;

				};

			};



			usb2_phy1: phy@3a000 {
@@ -1705,12 +1710,6 @@ 
			};

		};



		pmu: pmu@ff638000 {

			reg = <0x0 0xff638000 0x0 0x100>,

			      <0x0 0xff638c00 0x0 0x100>;

			interrupts = <GIC_SPI 52 IRQ_TYPE_EDGE_RISING>;

		};



		aobus: bus@ff800000 {

			compatible = "simple-bus";

			reg = <0x0 0xff800000 0x0 0x100000>;

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");