From df3fc620bbdcc584773f93c150d623a79abdd1a6 Mon Sep 17 00:00:00 2001 From: Vignesh Raghavendra Date: Wed, 12 May 2021 20:08:25 +0530 Subject: configs: am64x_evm_a53_defconfig: Enable DP83867 PHY driver AM64x GP and SK EVM have DP83867 PHY connected to CPSW external port0. Enable the driver in order to use ethernet at U-Boot prompt. CONFIG_PHY_TI is selected by CONFIG_PHY_TI_DP83867 and thus can be dropped. Signed-off-by: Vignesh Raghavendra Signed-off-by: Lokesh Vutla --- configs/am64x_evm_a53_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/am64x_evm_a53_defconfig b/configs/am64x_evm_a53_defconfig index 08bb8af..304f5b4 100644 --- a/configs/am64x_evm_a53_defconfig +++ b/configs/am64x_evm_a53_defconfig @@ -75,6 +75,7 @@ CONFIG_SF_DEFAULT_MODE=0 CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHY_TI=y +CONFIG_PHY_TI_DP83867=y CONFIG_PHY_FIXED=y CONFIG_DM_ETH=y CONFIG_TI_AM65_CPSW_NUSS=y -- cgit v1.1 From 4ec04073ab42cb61c54cf17809dec47bcea89f13 Mon Sep 17 00:00:00 2001 From: Suman Anna Date: Tue, 18 May 2021 16:38:25 -0500 Subject: arm: dts: k3-j721e: Fix up MAIN R5FSS cluster mode back to Split-mode The default U-Boot environment variables and design are all set up for both the MAIN R5FSS clusters to be in Split-mode. This is the setting in v2021.01 U-Boot and the dt nodes are synched with the kernel binding property names in commit 468ec2f3ef8f ("remoteproc: k3_r5: Sync to upstreamed kernel DT property names") merged in v2021.04-rc2. The modes for both the clusters got switched back to LockStep mode by mistake in commit 70e167495ab2 ("arm: dts: k3-j721e: Sync Linux v5.11-rc6 dts into U-Boot") also in v2021.04-rc2. This throws the following warning messages when early-booting the cores using default env variables, k3_r5f_rproc r5f at 5d00000: Invalid op: Trying to start secondary core 7 in lockstep mode Load Remote Processor 3 with data at addr=0x82000000 98484 bytes: Failed! k3_r5f_rproc r5f at 5f00000: Invalid op: Trying to start secondary core 9 in lockstep mode Load Remote Processor 5 with data at addr=0x82000000 98484 bytes: Failed! Fix this by switching back both the clusters to the expected Split-mode. Make this mode change in the u-boot specific dtsi file to avoid such sync overrides in the future until the kernel dts is also switched to Split-mode by default. Fixes: 70e167495ab2 ("arm: dts: k3-j721e: Sync Linux v5.11-rc6 dts into U-Boot") Reported-by: Minas Hambardzumyan Signed-off-by: Suman Anna Signed-off-by: Lokesh Vutla --- arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi index 3384ed9..fe095a6 100644 --- a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi +++ b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi @@ -193,3 +193,11 @@ &mcu_fss0_ospi1_pins_default { u-boot,dm-spl; }; + +&main_r5fss0 { + ti,cluster-mode = <0>; +}; + +&main_r5fss1 { + ti,cluster-mode = <0>; +}; -- cgit v1.1 From beed30583ccdeb6cfc5d077bc2a73ad10084f4fc Mon Sep 17 00:00:00 2001 From: Dave Gerlach Date: Thu, 13 May 2021 20:10:55 -0500 Subject: firmware: ti_sci: Update ti_sci_msg_req_reboot to include domain The ti_sci_msg_req_reboot message payload has been extended to include a domain field, but for the purposes of u-boot this should be zero to reset the entire SoC as it did before. Include domain for completeness and set to zero to ensure proper operation. Signed-off-by: Dave Gerlach Signed-off-by: Suman Anna Signed-off-by: Lokesh Vutla --- drivers/firmware/ti_sci.c | 1 + drivers/firmware/ti_sci.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c index 2aec2e3..4671a5e 100644 --- a/drivers/firmware/ti_sci.c +++ b/drivers/firmware/ti_sci.c @@ -1588,6 +1588,7 @@ static int ti_sci_cmd_core_reboot(const struct ti_sci_handle *handle) dev_err(info->dev, "Message alloc failed(%d)\n", ret); return ret; } + req.domain = 0; ret = ti_sci_do_xfer(info, xfer); if (ret) { diff --git a/drivers/firmware/ti_sci.h b/drivers/firmware/ti_sci.h index eec488f..e4a087c 100644 --- a/drivers/firmware/ti_sci.h +++ b/drivers/firmware/ti_sci.h @@ -137,12 +137,14 @@ struct ti_sci_msg_resp_version { /** * struct ti_sci_msg_req_reboot - Reboot the SoC * @hdr: Generic Header + * @domain: Domain to be reset, 0 for full SoC reboot. * * Request type is TI_SCI_MSG_SYS_RESET, responded with a generic * ACK/NACK message. */ struct ti_sci_msg_req_reboot { struct ti_sci_msg_hdr hdr; + u8 domain; } __packed; /** -- cgit v1.1 From a97ee92e4adb66098be879f399a5877ae76cc684 Mon Sep 17 00:00:00 2001 From: Suman Anna Date: Thu, 13 May 2021 20:10:56 -0500 Subject: arm: dts: k3-am642-evm: Add sysreset controller node The AM64x SoC uses a central Device Management and Security Controller (DMSC) processor that manages all the low-level device controls including the system-wide SoC reset. The system-wide reset is managed through the system reset driver. Add a sysreset controller node as a child of the dmsc node to enable the "reset" command from U-Boot prompt for the K3 AM642 EVM. Signed-off-by: Suman Anna Signed-off-by: Lokesh Vutla --- arch/arm/dts/k3-am642-evm-u-boot.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/dts/k3-am642-evm-u-boot.dtsi b/arch/arm/dts/k3-am642-evm-u-boot.dtsi index 9b0ba6b..10dea7a 100644 --- a/arch/arm/dts/k3-am642-evm-u-boot.dtsi +++ b/arch/arm/dts/k3-am642-evm-u-boot.dtsi @@ -60,6 +60,10 @@ &dmsc { u-boot,dm-spl; + k3_sysreset: sysreset-controller { + compatible = "ti,sci-sysreset"; + u-boot,dm-spl; + }; }; &k3_pds { -- cgit v1.1 From 7194a95d139ee6267642b8ae4932d836ce4c4a0e Mon Sep 17 00:00:00 2001 From: Suman Anna Date: Thu, 13 May 2021 20:10:57 -0500 Subject: arm: dts: k3-am642-sk: Add sysreset controller node The AM64x SoC uses a central Device Management and Security Controller (DMSC) processor that manages all the low-level device controls including the system-wide SoC reset. The system-wide reset is managed through the system reset driver. Add a sysreset controller node as a child of the dmsc node to enable the "reset" command from U-Boot prompt for the K3 AM642 SK. Signed-off-by: Suman Anna Signed-off-by: Lokesh Vutla --- arch/arm/dts/k3-am642-sk-u-boot.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/dts/k3-am642-sk-u-boot.dtsi b/arch/arm/dts/k3-am642-sk-u-boot.dtsi index 4ac7f5d..35b49df 100644 --- a/arch/arm/dts/k3-am642-sk-u-boot.dtsi +++ b/arch/arm/dts/k3-am642-sk-u-boot.dtsi @@ -60,6 +60,10 @@ &dmsc { u-boot,dm-spl; + k3_sysreset: sysreset-controller { + compatible = "ti,sci-sysreset"; + u-boot,dm-spl; + }; }; &k3_pds { -- cgit v1.1 From fed603f868469a0d8f2548bdac137feead333c6b Mon Sep 17 00:00:00 2001 From: Faiz Abbas Date: Mon, 19 Apr 2021 12:20:27 +0530 Subject: ARM: ti: Increase the allocated size for MLO.raw MLO has increased to a size greater than the allocated 128 kB in dfu_alt_info_emmc and _mmc. Therefore, double the allocated size for MLO.raw in the default environment. Signed-off-by: Faiz Abbas Signed-off-by: Aswath Govindraju Signed-off-by: Lokesh Vutla Link: https://lore.kernel.org/r/20210419065027.5834-1-a-govindraju@ti.com --- include/environment/ti/dfu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/environment/ti/dfu.h b/include/environment/ti/dfu.h index 720c345..3c90570 100644 --- a/include/environment/ti/dfu.h +++ b/include/environment/ti/dfu.h @@ -13,7 +13,7 @@ "boot part 0 1;" \ "rootfs part 0 2;" \ "MLO fat 0 1;" \ - "MLO.raw raw 0x100 0x100;" \ + "MLO.raw raw 0x100 0x200;" \ "u-boot.img.raw raw 0x300 0x1000;" \ "u-env.raw raw 0x1300 0x200;" \ "spl-os-args.raw raw 0x1500 0x200;" \ @@ -29,7 +29,7 @@ "boot part 1 1;" \ "rootfs part 1 2;" \ "MLO fat 1 1;" \ - "MLO.raw raw 0x100 0x100;" \ + "MLO.raw raw 0x100 0x200;" \ "u-boot.img.raw raw 0x300 0x1000;" \ "u-env.raw raw 0x1300 0x200;" \ "spl-os-args.raw raw 0x1500 0x200;" \ -- cgit v1.1