From fb264efbd2fef45ca96630c355cbe30957132f3f Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Thu, 18 Jun 2020 12:54:38 +0100 Subject: [PATCH 1/4] 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. Signed-off-by: Jon Hunter Tested-by: Peter Robinson --- drivers/firmware/psci.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index e0d66d74f5..23cf807591 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -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; From 1ec74533840650b914ccdf9f62a298ecb29994ab Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Thu, 18 Jun 2020 12:54:39 +0100 Subject: [PATCH 2/4] ARM: tegra: Enable PSCI support for Tegra210 and Tegra186 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. Signed-off-by: Jon Hunter Tested-by: Peter Robinson --- arch/arm/dts/tegra186.dtsi | 5 +++++ arch/arm/dts/tegra210.dtsi | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/arch/arm/dts/tegra186.dtsi b/arch/arm/dts/tegra186.dtsi index 0a9db9825b..edcb7aacb8 100644 --- a/arch/arm/dts/tegra186.dtsi +++ b/arch/arm/dts/tegra186.dtsi @@ -335,4 +335,9 @@ status = "disabled"; }; }; + + psci { + compatible = "arm,psci-1.0"; + method = "smc"; + }; }; diff --git a/arch/arm/dts/tegra210.dtsi b/arch/arm/dts/tegra210.dtsi index 3ec54b11c4..a521a43d6c 100644 --- a/arch/arm/dts/tegra210.dtsi +++ b/arch/arm/dts/tegra210.dtsi @@ -867,6 +867,11 @@ }; }; + psci { + compatible = "arm,psci-1.0"; + method = "smc"; + }; + timer { compatible = "arm,armv8-timer"; interrupts = Date: Mon, 13 Apr 2020 18:11:42 +0300 Subject: [PATCH 3/4] colibri_t20: change maintainer Take over maintainership for Colibri T20 module. Signed-off-by: Igor Opaniuk Acked-by: Lucas Stach --- board/toradex/colibri_t20/MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/toradex/colibri_t20/MAINTAINERS b/board/toradex/colibri_t20/MAINTAINERS index b251c000fe..2a8e6fb74b 100644 --- a/board/toradex/colibri_t20/MAINTAINERS +++ b/board/toradex/colibri_t20/MAINTAINERS @@ -1,5 +1,5 @@ COLIBRI_T20 -M: Lucas Stach +M: Igor Opaniuk S: Maintained F: board/toradex/colibri_t20/ F: include/configs/colibri_t20.h From 7b4f42b6cd5d8fa32f763b5ec03b7b8fdf7c4303 Mon Sep 17 00:00:00 2001 From: Tom Warren Date: Mon, 11 May 2020 16:38:58 -0700 Subject: [PATCH 4/4] t210: Nano: Add NVME support This allows Nano to use the key M.2 on the CVB to connect and use a M.2 NVMe SSD stick. Works on my Nano B00, WD SN750 NVMe SSD shows up w/'nvme' commands. Will add booting from NVMe via distro cmds in a future patch. Signed-off-by: Tom Warren --- configs/p3450-0000_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/p3450-0000_defconfig b/configs/p3450-0000_defconfig index 2bf8f97ca2..c27a6ea237 100644 --- a/configs/p3450-0000_defconfig +++ b/configs/p3450-0000_defconfig @@ -56,3 +56,4 @@ CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y +CONFIG_NVME=y