Skip to contentSkip to conversation

firmware: PSCI: Fix PSCI support for OF live trees

PATCH New Jon Hunter 5 participants 8 messages Jun 18, 2020 – Jun 22, 2020

Subsystems (2)
lore
Share & tools
lore

Jon Hunter

author maintainer
#0 lore raw

PATCH 1/2 firmware: PSCI: Fix PSCI support for OF live trees

When CONFIG_OF_LIVE is enabled, dev_of_offset() cannot be used and if used returns an invalid offset. This causes the call to fdt_stringlist_get() in the psci_probe() to fail to read the 'method' property from the PSCI node for the device and hence prevents PSCI from working. Fix this by using the ofnode_read_string() API instead of the fdt_stringlist_get() because this will handle reading the property both when CONFIG_OF_LIVE is enabled or disabled.

Due to the above problem and since commit 81ea00838c68 ("efi_loader:
PSCI reset and shutdown") was added, the EFI system reset has been broken for Tegra210 and Tegra196 platforms. This also fixes the EFI system reset for these Tegra platforms.

---
 drivers/firmware/psci.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/firmware/psci.c +1 -3
index e0d66d74f54d..23cf807591c4 100644
@@ -67,11 +67,9 @@ static int psci_bind(struct udevice *dev)
 
 static int psci_probe(struct udevice *dev)
 {
-	DECLARE_GLOBAL_DATA_PTR;
 	const char *method;
 
-	method = fdt_stringlist_get(gd->fdt_blob, dev_of_offset(dev), "method",
-				    0, NULL);
+	method = ofnode_read_string(dev_ofnode(dev), "method");
 	if (!method) {
 		pr_warn("missing \"method\" property\n");
 		return -ENXIO;
Signature · 1 line
2.17.1
author maintainer
#1 lore raw

PATCH 1/2 firmware: PSCI: Fix PSCI support for OF live trees

Quoted 8 lines · Jon Hunter

When CONFIG_OF_LIVE is enabled, dev_of_offset() cannot be used and if used returns an invalid offset. This causes the call to fdt_stringlist_get() in the psci_probe() to fail to read the 'method' property from the PSCI node for the device and hence prevents PSCI from working. Fix this by using the ofnode_read_string() API instead of the fdt_stringlist_get() because this will handle reading the property both when CONFIG_OF_LIVE is enabled or disabled.

Quoted 4 lines

Due to the above problem and since commit 81ea00838c68 ("efi_loader:
PSCI reset and shutdown") was added, the EFI system reset has been broken for Tegra210 and Tegra196 platforms. This also fixes the EFI system reset for these Tegra platforms.

Oops, just spotted the above typo. Should be Tegra186 and not Tegra196 (which does not exist!). I can correct that.

Jon

Signature · 1 line
nvpublic
#2 lore raw

PATCH 1/2 firmware: PSCI: Fix PSCI support for OF live trees

No worries, I can fix it when I add them to u-boot-tegra. I have some other patches to add & generate a PR, I'll get it out by EOW. TomR - do you want me to take this patch as well as the ARM: tegra: patch in my PR, or do you want Jon's first patch to go thru a different repo?

Tom
--
nvpublic

-----Original Message-----
From: Jonathan Hunter <[email protected]>
Sent: Thursday, June 18, 2020 8:47 AM
To: Tom Rini <[email protected]>; Tom Warren <[email protected]>
Cc: Stephen Warren <[email protected]>; Thierry Reding <[email protected]>; Peter Robinson <[email protected]>; Heinrich Schuchardt <[email protected]>; u-boot at lists.denx.de
Subject: Re: [PATCH 1/2] firmware: PSCI: Fix PSCI support for OF live trees

Quoted 8 lines · Jon Hunter

When CONFIG_OF_LIVE is enabled, dev_of_offset() cannot be used and if used returns an invalid offset. This causes the call to fdt_stringlist_get() in the psci_probe() to fail to read the 'method' property from the PSCI node for the device and hence prevents PSCI from working. Fix this by using the ofnode_read_string() API instead of the fdt_stringlist_get() because this will handle reading the property both when CONFIG_OF_LIVE is enabled or disabled.

Quoted 4 lines

Due to the above problem and since commit 81ea00838c68 ("efi_loader:
PSCI reset and shutdown") was added, the EFI system reset has been broken for Tegra210 and Tegra196 platforms. This also fixes the EFI system reset for these Tegra platforms.

Oops, just spotted the above typo. Should be Tegra186 and not Tegra196 (which does not exist!). I can correct that.

Jon

--
nvpublic

#3 lore raw

PATCH 1/2 firmware: PSCI: Fix PSCI support for OF live trees

Quoted 1 line · Tom Warren

No worries, I can fix it when I add them to u-boot-tegra. I have some other patches to add & generate a PR, I'll get it out by EOW. TomR - do you want me to take this patch as well as the ARM: tegra: patch in my PR, or do you want Jon's first patch to go thru a different repo?

You can take them all, thanks!

Quoted 33 lines

Tom
--
nvpublic

-----Original Message-----
From: Jonathan Hunter <[email protected]>
Sent: Thursday, June 18, 2020 8:47 AM
To: Tom Rini <[email protected]>; Tom Warren <[email protected]>
Cc: Stephen Warren <[email protected]>; Thierry Reding <[email protected]>; Peter Robinson <[email protected]>; Heinrich Schuchardt <[email protected]>; u-boot at lists.denx.de
Subject: Re: [PATCH 1/2] firmware: PSCI: Fix PSCI support for OF live trees

Quoted 8 lines · Jon Hunter

When CONFIG_OF_LIVE is enabled, dev_of_offset() cannot be used and if used returns an invalid offset. This causes the call to fdt_stringlist_get() in the psci_probe() to fail to read the 'method' property from the PSCI node for the device and hence prevents PSCI from working. Fix this by using the ofnode_read_string() API instead of the fdt_stringlist_get() because this will handle reading the property both when CONFIG_OF_LIVE is enabled or disabled.

Quoted 4 lines

Due to the above problem and since commit 81ea00838c68 ("efi_loader:
PSCI reset and shutdown") was added, the EFI system reset has been broken for Tegra210 and Tegra196 platforms. This also fixes the EFI system reset for these Tegra platforms.

Oops, just spotted the above typo. Should be Tegra186 and not Tegra196 (which does not exist!). I can correct that.

Jon

--
nvpublic

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200618/9b3fbea6/attachment.sig>
#4 lore raw

PATCH 1/2 firmware: PSCI: Fix PSCI support for OF live trees

In reply to Jon Hunter
Quoted 9 lines · Jon Hunter

When CONFIG_OF_LIVE is enabled, dev_of_offset() cannot be used and if used returns an invalid offset. This causes the call to fdt_stringlist_get() in the psci_probe() to fail to read the 'method' property from the PSCI node for the device and hence prevents PSCI from working. Fix this by using the ofnode_read_string() API instead of the fdt_stringlist_get() because this will handle reading the property both when CONFIG_OF_LIVE is enabled or disabled.

Quoted 6 lines

Due to the above problem and since commit 81ea00838c68 ("efi_loader:
PSCI reset and shutdown") was added, the EFI system reset has been broken for Tegra210 and Tegra196 platforms. This also fixes the EFI system reset for these Tegra platforms.

Tested on the Jetson Nano and it now reboots as expected.

Quoted 24 lines
---
 drivers/firmware/psci.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/firmware/psci.c +1 -4
index e0d66d74f54d..23cf807591c4 100644
@@ -67,11 +67,9 @@ static int psci_bind(struct udevice *dev)
 
 static int psci_probe(struct udevice *dev)
 {
-       DECLARE_GLOBAL_DATA_PTR;
        const char *method;
 
-       method = fdt_stringlist_get(gd->fdt_blob, dev_of_offset(dev), "method",
-                                   0, NULL);
+       method = ofnode_read_string(dev_ofnode(dev), "method");
        if (!method) {
                pr_warn("missing \"method\" property\n");
                return -ENXIO;
--

2.17.1

author maintainer
#5 lore raw

PATCH 2/2 ARM: tegra: Enable PSCI support for Tegra210 and Tegra186

In reply to Jon Hunter

The PSCI nodes are currently not populated for the Tegra210 and Tegra186 devices. This prevents the PSCI driver from being able to identify the PSCI method used by these devices and causes the probe of the PSCI driver to fail.

Since commit 81ea00838c68 ("efi_loader: PSCI reset and shutdown") was added, which moves the PSCI EFI system reset handler into the PSCI driver, this has prevented the EFI system reset from working for Tegra210 and Tegra186. Therefore, populating these nodes is necessary to fix the EFI system reset for Tegra210 and Tegra186.

---
 arch/arm/dts/tegra186.dtsi | 5 +++++
 arch/arm/dts/tegra210.dtsi | 5 +++++
 2 files changed, 10 insertions(+)
arch/arm/dts/tegra186.dtsi +5 -0
index 0a9db9825b85..edcb7aacb8ee 100644
@@ -335,4 +335,9 @@
 			status = "disabled";
 		};
 	};
+
+	psci {
+		compatible = "arm,psci-1.0";
+		method = "smc";
+	};
 };
arch/arm/dts/tegra210.dtsi +5 -0
index 3ec54b11c43f..a521a43d6cfd 100644
@@ -867,6 +867,11 @@
 		};
 	};
 
+	psci {
+		compatible = "arm,psci-1.0";
+		method = "smc";
+	};
+
 	timer {
 		compatible = "arm,armv8-timer";
 		interrupts = <GIC_PPI 13
Signature · 1 line
2.17.1
#6 lore raw

PATCH 2/2 ARM: tegra: Enable PSCI support for Tegra210 and Tegra186

Quoted 6 lines · Jon Hunter

The PSCI nodes are currently not populated for the Tegra210 and Tegra186 devices. This prevents the PSCI driver from being able to identify the PSCI method used by these devices and causes the probe of the PSCI driver to fail.

Quoted 7 lines

Since commit 81ea00838c68 ("efi_loader: PSCI reset and shutdown") was added, which moves the PSCI EFI system reset handler into the PSCI driver, this has prevented the EFI system reset from working for Tegra210 and Tegra186. Therefore, populating these nodes is necessary to fix the EFI system reset for Tegra210 and Tegra186.

Tested on the Jetson Nano and it now reboots as expected.

Quoted 38 lines
---
 arch/arm/dts/tegra186.dtsi | 5 +++++
 arch/arm/dts/tegra210.dtsi | 5 +++++
 2 files changed, 10 insertions(+)
arch/arm/dts/tegra186.dtsi +5 -0
index 0a9db9825b85..edcb7aacb8ee 100644
@@ -335,4 +335,9 @@
                        status = "disabled";
                };
        };
+
+       psci {
+               compatible = "arm,psci-1.0";
+               method = "smc";
+       };
 };
arch/arm/dts/tegra210.dtsi +5 -1
index 3ec54b11c43f..a521a43d6cfd 100644
@@ -867,6 +867,11 @@
                };
        };
 
+       psci {
+               compatible = "arm,psci-1.0";
+               method = "smc";
+       };
+
        timer {
                compatible = "arm,armv8-timer";
                interrupts = <GIC_PPI 13
--

2.17.1

#7 lore raw

PATCH 2/2 ARM: tegra: Enable PSCI support for Tegra210 and Tegra186

In reply to Jon Hunter
Quoted 10 lines · Jon Hunter

The PSCI nodes are currently not populated for the Tegra210 and Tegra186 devices. This prevents the PSCI driver from being able to identify the PSCI method used by these devices and causes the probe of the PSCI driver to fail.

Since commit 81ea00838c68 ("efi_loader: PSCI reset and shutdown") was added, which moves the PSCI EFI system reset handler into the PSCI driver, this has prevented the EFI system reset from working for Tegra210 and Tegra186. Therefore, populating these nodes is necessary to fix the EFI system reset for Tegra210 and Tegra186.

I'm not sure that these platforms have *always* had a PSCI implementation, so this is a slight assumption. Ideally, the FW should add this to the DT and pass it to U-Boot... However, since all recentish FW builds do implement PSCI, and the DT is hard-coded into U-Boot rather than provided by the earlier FW, this change is probably just fine.