arm-bsp/juno: update kernel to 6.4
PATCH 1/1 arm-bsp/juno: update kernel to 6.4
Juno requires no patches to build and boot with 6.4, as the patches present were backports.
Signed-off-by Jon Mason <[email protected]>
--- ...-cache-properties-for-Arm-Ltd-platfo.patch | 138 ----------------- ...64-dts-fvp-Add-SPE-to-Foundation-FVP.patch | 35 ----- ...d-information-about-L1-and-L2-caches.patch | 146 ------------------ ...s-align-LED-node-names-with-dtschema.patch | 81 ---------- .../linux/linux-arm-platforms.inc | 6 - 5 files changed, 406 deletions(-) delete mode 100644 meta-arm-bsp/recipes-kernel/linux/files/juno/0001-arm64-dts-Update-cache-properties-for-Arm-Ltd-platfo.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/files/juno/0002-arm64-dts-fvp-Add-SPE-to-Foundation-FVP.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/files/juno/0003-arm64-dts-fvp-Add-information-about-L1-and-L2-caches.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/files/juno/0004-ARM-dts-vexpress-align-LED-node-names-with-dtschema.patch
meta-arm-bsp/recipes-kernel/linux/files/juno/0001-arm64-dts-Update-cache-properties-for-Arm-Ltd-platfo.patch deleted +0 -138
@@ -1,138 +0,0 @@ -From dc250cab31c6611cc7fa76bc8b2027dbd56dd65d Mon Sep 17 00:00:00 2001 -From: Pierre Gondois <[email protected]> -Date: Mon, 7 Nov 2022 16:56:58 +0100 -Subject: [PATCH] arm64: dts: Update cache properties for Arm Ltd platforms - -The DeviceTree Specification v0.3 specifies that the cache node -"compatible" and "cache-level" properties are required. - -Cf. s3.8 Multi-level and Shared Cache Nodes -The 'cache-unified' property should be present if one of the properties -for unified cache is present ('cache-size', ...). - -Update the relevant device trees nodes accordingly. - -Signed-off-by: Pierre Gondois <[email protected]> -Link: https://lore.kernel.org/r/[email protected] -Signed-off-by: Sudeep Holla <[email protected]> - -Signed-off-by: Jon Mason <[email protected]> -Upstream-Status: Backport ---- - arch/arm64/boot/dts/arm/corstone1000.dtsi | 1 + - arch/arm64/boot/dts/arm/foundation-v8.dtsi | 1 + - arch/arm64/boot/dts/arm/juno-r1.dts | 2 ++ - arch/arm64/boot/dts/arm/juno-r2.dts | 2 ++ - arch/arm64/boot/dts/arm/juno.dts | 2 ++ - arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts | 1 + - arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts | 1 + - 7 files changed, 10 insertions(+) - -diff --git a/arch/arm64/boot/dts/arm/corstone1000.dtsi b/arch/arm64/boot/dts/arm/corstone1000.dtsi -index 4e46826f883a..21f1f952e985 100644 ---- a/arch/arm64/boot/dts/arm/corstone1000.dtsi -+++ b/arch/arm64/boot/dts/arm/corstone1000.dtsi -@@ -53,6 +53,7 @@ gic: interrupt-controller@1c000000 { - - L2_0: l2-cache0 { - compatible = "cache"; -+ cache-unified; - cache-level = <2>; - cache-size = <0x80000>; - cache-line-size = <64>; -diff --git a/arch/arm64/boot/dts/arm/foundation-v8.dtsi b/arch/arm64/boot/dts/arm/foundation-v8.dtsi -index 83e3e7e3984f..c8bd23b1a7ba 100644 ---- a/arch/arm64/boot/dts/arm/foundation-v8.dtsi -+++ b/arch/arm64/boot/dts/arm/foundation-v8.dtsi -@@ -58,6 +58,7 @@ cpu3: cpu@3 { - - L2_0: l2-cache0 { - compatible = "cache"; -+ cache-level = <2>; - }; - }; - -diff --git a/arch/arm64/boot/dts/arm/juno-r1.dts b/arch/arm64/boot/dts/arm/juno-r1.dts -index 6451c62146fd..1d90eeebb37d 100644 ---- a/arch/arm64/boot/dts/arm/juno-r1.dts -+++ b/arch/arm64/boot/dts/arm/juno-r1.dts -@@ -189,6 +189,7 @@ A53_3: cpu@103 { - - A57_L2: l2-cache0 { - compatible = "cache"; -+ cache-unified; - cache-size = <0x200000>; - cache-line-size = <64>; - cache-sets = <2048>; -@@ -197,6 +198,7 @@ A57_L2: l2-cache0 { - - A53_L2: l2-cache1 { - compatible = "cache"; -+ cache-unified; - cache-size = <0x100000>; - cache-line-size = <64>; - cache-sets = <1024>; -diff --git a/arch/arm64/boot/dts/arm/juno-r2.dts b/arch/arm64/boot/dts/arm/juno-r2.dts -index 438cd1ff4bd0..d2ada69b0a43 100644 ---- a/arch/arm64/boot/dts/arm/juno-r2.dts -+++ b/arch/arm64/boot/dts/arm/juno-r2.dts -@@ -195,6 +195,7 @@ A53_3: cpu@103 { - - A72_L2: l2-cache0 { - compatible = "cache"; -+ cache-unified; - cache-size = <0x200000>; - cache-line-size = <64>; - cache-sets = <2048>; -@@ -203,6 +204,7 @@ A72_L2: l2-cache0 { - - A53_L2: l2-cache1 { - compatible = "cache"; -+ cache-unified; - cache-size = <0x100000>; - cache-line-size = <64>; - cache-sets = <1024>; -diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts -index cf4a58211399..5e48a01a5b9f 100644 ---- a/arch/arm64/boot/dts/arm/juno.dts -+++ b/arch/arm64/boot/dts/arm/juno.dts -@@ -194,6 +194,7 @@ A53_3: cpu@103 { - - A57_L2: l2-cache0 { - compatible = "cache"; -+ cache-unified; - cache-size = <0x200000>; - cache-line-size = <64>; - cache-sets = <2048>; -@@ -202,6 +203,7 @@ A57_L2: l2-cache0 { - - A53_L2: l2-cache1 { - compatible = "cache"; -+ cache-unified; - cache-size = <0x100000>; - cache-line-size = <64>; - cache-sets = <1024>; -diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts -index 258991ad7cc0..ef68f5aae7dd 100644 ---- a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts -+++ b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts -@@ -71,6 +71,7 @@ cpu@3 { - - L2_0: l2-cache0 { - compatible = "cache"; -+ cache-level = <2>; - }; - }; - -diff --git a/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts b/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts -index 5b6d9d8e934d..796cd7d02eb5 100644 ---- a/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts -+++ b/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts -@@ -57,6 +57,7 @@ cpu@1 { - - L2_0: l2-cache0 { - compatible = "cache"; -+ cache-level = <2>; - }; - }; -
meta-arm-bsp/recipes-kernel/linux/files/juno/0002-arm64-dts-fvp-Add-SPE-to-Foundation-FVP.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From bd354219987dddbf8ab6fd11450b4046547aca1b Mon Sep 17 00:00:00 2001 -From: James Clark <[email protected]> -Date: Thu, 17 Nov 2022 10:25:36 +0000 -Subject: [PATCH] arm64: dts: fvp: Add SPE to Foundation FVP - -Add SPE DT node to FVP model. If the model doesn't support SPE (e.g., -turned off via parameter), the driver will skip the initialisation -accordingly and thus is safe. - -Signed-off-by: James Clark <[email protected]> -Link: https://lore.kernel.org/r/[email protected] -Signed-off-by: Sudeep Holla <[email protected]> - -Signed-off-by: Jon Mason <[email protected]> -Upstream-Status: Backport ---- - arch/arm64/boot/dts/arm/foundation-v8.dtsi | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/arch/arm64/boot/dts/arm/foundation-v8.dtsi b/arch/arm64/boot/dts/arm/foundation-v8.dtsi -index c8bd23b1a7ba..029578072d8f 100644 ---- a/arch/arm64/boot/dts/arm/foundation-v8.dtsi -+++ b/arch/arm64/boot/dts/arm/foundation-v8.dtsi -@@ -85,6 +85,11 @@ pmu { - <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>; - }; - -+ spe-pmu { -+ compatible = "arm,statistical-profiling-extension-v1"; -+ interrupts = <GIC_PPI 5 IRQ_TYPE_LEVEL_HIGH>; -+ }; -+ - watchdog@2a440000 { - compatible = "arm,sbsa-gwdt"; - reg = <0x0 0x2a440000 0 0x1000>,
meta-arm-bsp/recipes-kernel/linux/files/juno/0003-arm64-dts-fvp-Add-information-about-L1-and-L2-caches.patch deleted +0 -146
146 lines not on this page · raw message
meta-arm-bsp/recipes-kernel/linux/files/juno/0004-ARM-dts-vexpress-align-LED-node-names-with-dtschema.patch deleted +0 -81
81 lines not on this page · raw message
meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +0 -6
@@ -77,12 +77,6 @@ SRC_URI:append:fvp-baser-aemv8r64 = " file://fvp-baser-aemv8r64.dts;subdir=git/a # COMPATIBLE_MACHINE:juno = "juno" FILESEXTRAPATHS:prepend:juno := "${ARMBSPFILESPATHS}" -SRC_URI:append:juno = " \ - file://0001-arm64-dts-Update-cache-properties-for-Arm-Ltd-platfo.patch \ - file://0002-arm64-dts-fvp-Add-SPE-to-Foundation-FVP.patch \ - file://0003-arm64-dts-fvp-Add-information-about-L1-and-L2-caches.patch \ - file://0004-ARM-dts-vexpress-align-LED-node-names-with-dtschema.patch \ - " # # Musca B1/S2 can't run Linux
Signature · 1 line
2.30.2
Jon Mason
AppliedQuoted 4 lines · Jon Mason
Juno requires no patches to build and boot with 6.4, as the patches present were backports.
Applied, thanks!
[1/1] arm-bsp/juno: update kernel to 6.4
commit: 2ac07293aa36019577562213f321f36d6fcfd316
Best regards,
Signature · 1 line
Jon Mason <[email protected]>