From f65d850bba4b84c46537b0a77aeb437d4482a71e Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 4 Jan 2018 10:49:51 -0800 Subject: [PATCH] Backport patch from linux-next (next-20180103) to support SMP on tegra210 systems. --- debian/changelog | 5 + ...CPU-and-PSCI-nodes-for-NVIDIA-Tegra2.patch | 91 +++++++++++++++++++ debian/patches/series | 3 + 3 files changed, 99 insertions(+) create mode 100644 debian/patches/features/arm64/tegra210-smp/0001-arm64-tegra-Add-CPU-and-PSCI-nodes-for-NVIDIA-Tegra2.patch diff --git a/debian/changelog b/debian/changelog index 4b4b42ef3..6ef9cd959 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ linux (4.14.7-2) UNRELEASED; urgency=medium + [ Ben Hutchings ] * e1000e: Fix e1000_check_for_copper_link_ich8lan return value. (Closes: #885348) + [ Vagrant Cascadian ] + * [arm64] Backport patch from linux-next to support SMP on tegra210 + systems. + -- Ben Hutchings Thu, 28 Dec 2017 01:18:05 +0000 linux (4.14.7-1) unstable; urgency=medium diff --git a/debian/patches/features/arm64/tegra210-smp/0001-arm64-tegra-Add-CPU-and-PSCI-nodes-for-NVIDIA-Tegra2.patch b/debian/patches/features/arm64/tegra210-smp/0001-arm64-tegra-Add-CPU-and-PSCI-nodes-for-NVIDIA-Tegra2.patch new file mode 100644 index 000000000..12d70baa8 --- /dev/null +++ b/debian/patches/features/arm64/tegra210-smp/0001-arm64-tegra-Add-CPU-and-PSCI-nodes-for-NVIDIA-Tegra2.patch @@ -0,0 +1,91 @@ +From d67849c340aa803f25a1b3720ba399fecd4f88ab Mon Sep 17 00:00:00 2001 +From: Jon Hunter +Date: Tue, 28 Mar 2017 12:48:38 +0100 +Subject: [PATCH] arm64: tegra: Add CPU and PSCI nodes for NVIDIA Tegra210 + platforms + +Add the CPU and PSCI nodes for the NVIDIA Tegra210 platforms so that +all CPUs can be enabled on boot. This assumes that the PSCI firmware +has been loaded during the initial bootstrap on the device before the +kernel starts (which is typically the case for these platforms). The +PSCI firmware version is set to v0.2 which aligns with the current +shipping version for Tegra. + +Reported-by: Martin Michlmayr +Signed-off-by: Jon Hunter +Tested-By: Vagrant Cascadian +Signed-off-by: Thierry Reding +--- + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 23 +++++++++++++++++++++++ + arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi | 23 +++++++++++++++++++++++ + 2 files changed, 46 insertions(+) + +diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi +index d10d4430537a..212e6634c9ba 100644 +--- a/arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi ++++ b/arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi +@@ -297,6 +297,29 @@ + }; + }; + ++ cpus { ++ cpu@0 { ++ enable-method = "psci"; ++ }; ++ ++ cpu@1 { ++ enable-method = "psci"; ++ }; ++ ++ cpu@2 { ++ enable-method = "psci"; ++ }; ++ ++ cpu@3 { ++ enable-method = "psci"; ++ }; ++ }; ++ ++ psci { ++ compatible = "arm,psci-0.2"; ++ method = "smc"; ++ }; ++ + regulators { + vdd_gpu: regulator@100 { + compatible = "pwm-regulator"; +diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi +index be6066ff97c9..d0dc03923723 100644 +--- a/arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi ++++ b/arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi +@@ -52,4 +52,27 @@ + clock-frequency = <32768>; + }; + }; ++ ++ cpus { ++ cpu@0 { ++ enable-method = "psci"; ++ }; ++ ++ cpu@1 { ++ enable-method = "psci"; ++ }; ++ ++ cpu@2 { ++ enable-method = "psci"; ++ }; ++ ++ cpu@3 { ++ enable-method = "psci"; ++ }; ++ }; ++ ++ psci { ++ compatible = "arm,psci-0.2"; ++ method = "smc"; ++ }; + }; +-- +2.11.0 + diff --git a/debian/patches/series b/debian/patches/series index 3927f4ea0..bc52f5a59 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -167,4 +167,7 @@ features/arm/dwmac-sun8i/0006-ARM-dts-sunxi-Restore-EMAC-changes-boards.patch features/arm/dwmac-sun8i/0007-arm-dts-sunxi-h3-h5-Restore-EMAC-changes.patch features/arm/dwmac-sun8i/0008-ARM-dts-sunxi-h3-h5-represent-the-mdio-switch-used-b.patch +# Backport patches from linux-next (next-20180103) to support SMP on tegra210 systems +features/arm64/tegra210-smp/0001-arm64-tegra-Add-CPU-and-PSCI-nodes-for-NVIDIA-Tegra2.patch + # ABI maintenance