mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-22 10:31:08 +00:00
Code Issues Releases Wiki Activity

Amlogic fixes for v6.3-rc:

Browse source 
- fix conflicts between DMC memory space and Amlogic perf driver
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEPVPGJshWBf4d9CyLd9zb2sjISdEFAmQkLLkACgkQd9zb2sjI
 SdFm7Q//aDal2EZ4Iu6a0tikywQHVR2FcrDE0TXQLNaPc4o6/RFkwSOOzHyKRuud
 HlpHsTgQO/C11xWhbkuld/Md3hwa8u3xr1Fy7hX6k3X+FDzYP0XH6mFSSDbhybGw
 MrqwGyNdLOxUvDlzbktNkhAwckRck5CFgBSN5S3rGdQlQK0FgNoSeokmy25liZPv
 BYl/Q3eprvke1Nr6J7IlcHtiOQDOgiO5HtWm6ro2rblsrn63GCrbN7lSFpkp8/1n
 cf/4Xsnc/BjdN1sVs/1koq85AbQ6DNZLz82vmk5QrE8WA6gkABsK6C8u8/jy2UAz
 uVxlwWIr+6WNCguToI+bwpkRnwHb6Xmgw67fZq82YXYcZxzUBacfQCvcqIreaKTz
 9qN2eWVBfIt6qw08Sb0q77Fgexj4W8AJ95LAnwpy7u0Bk+FPNHcT86J131CPrd7s
 cTi20UaKlmxu2tE9KVSPIXV3j4GPdr/VAjKloXeDyWH/U8v+G1eFb2Afepj9BS4J
 numtcFRw4+KkwlVKXNWkUxlAsY2GhPp9/WZsiYa1TZlnWmXXVVZ9C6NuDJmU6mNO
 WwdTELakPHTzEf3JUR7jKMTH3NxM6Q6A/y1PKe+1LP9WOY1lGCgwHUgYg4MdEnrN
 LVBhwUFxQFFxGd4kXxudmG+t7fqfOq076ala2WLXADxrKA58kx0=
 =fPrA
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmQq9e4ACgkQmmx57+YA
 GNmX4g/9H/d4aTPzLsOM+hRTuKu1I7ndnXUzkU8G+uo27xJYaqa8N0Wuh7W1NZ/T
 pAsR1Mo60L8oUxSxJ3d8/AQE+UlGmCvB/B6OqeqHlU139NHYtRbFF3VZBD25k8Qb
 /fbMc5hKtTInTqHTsb38NUQhaRY7Pk6JTfGh3oTDN6cIgkd96esIeNaMq9ocDJBN
 KGj4RetJT31fb1xLHoeGiFkmfW6eUZ9f2q6s9O3y1eHmUn6sso3faM/Zuyvm0fje
 aOMNvfswpSRZED6DLRI+xvfq04I3Pm11QnoZkIwM5DhTu+5FBCFuPuQCzjwWrzj+
 UcFhgRCpQHTUx/mHFI7oRva5AWeDg7TrXSti5yknaH8mrYj39q1NpwBsOQYfB7ZS
 o5kaWIwTNJ0i2dgKibXE1ANg1eeE6E549/EKRmg7IMrMeF/nIru7ML1eAzZO8OxE
 ppUDiOQrsl5UnXLkT2/l8pCG8oYkVxIK966YKtk0ClgKLQGhCM1xYUf1WfqdbQ+4
 GeztnYkl3ooMDcTiGpmi7yE5MhdG8jyqSCrebbnOOkENIfyLDMdAvK/pb7rYwKd3
 kpIFyiU5mvozdE9v4qV/WwYmYSjCEbhrevD+313l2ojovIzIgZag0UhXqghShmu+
 LG7Jn851pAR+pc6LOF+AxkNB+wV9cos19Wc46x7PuQSc/aj2zPM=
 =fCvS
 -----END PGP SIGNATURE-----

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-04-03 17:51:09 +02:00
commit 0311454f4f
2 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1571,15 +1571,20 @@ usb2_phy0: phy@36000 {
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 @@ internal_ephy: ethernet-phy@8 {
};
};
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>;

32
drivers/perf/amlogic/meson_g12_ddr_pmu.c
View file

@ -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_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 (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_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");