June 2023 - U-Boot

[PATCH v9 0/6] tpm: Support boot measurements
by Eddie James 07 Aug '23

07 Aug '23

This series adds support for measuring the boot images more generically than the existing EFI support. Several EFI functions have been moved to the TPM layer. The series includes optional measurement from the bootm command. A new test case has been added for the bootm measurement to test the new path, and the sandbox TPM2 driver has been updated to support this use case. This series is based on Ilias' auto-startup series and Simon's additions. Changes since v8: - Fix a sandbox driver off-by-one error in checking the property type. - Fix log parsing again - any data corruption seen while replaying the event log was failing the entire measurement. - Added an option to ignore the existing log and a configuration option for systems to select that for the bootm measurement. This would only be selected for systems that know that U-Boot is the first stage bootloader. This is necessary because the reserved memory region may persist through resets and so U-Boot attempts to append to the previous boot's log. Changes since v7: - Change name of tcg2_init_log and add more documentation - Add a check, when parsing the event log header, to ensure that the previous stage bootloader used all the active PCRs. - Change name of tcg2_log_find_end - Fix the greater than or equal to check to exit the log parsing - Make sure log_position is 0 if there is any error discovering the log - Return errors parsing the log if the data is corrupt so that we don't end up with half a log Changes since v6: - Added comment for bootm_measure - Fixed line length in bootm_measure - Added Linaro copyright for all the EFI moved code - Changed tcg2_init_log (and by extension, tcg2_measurement_init) to copy any discovered event log to the user's log if passed in. Changes since v5: - Re-ordered the patches to put the sandbox TPM driver patch second - Remove unused platform_get_eventlog in efi_tcg2.c - First look for tpm_event_log_* properties instead of linux,sml-* - Fix efi_tcg2.c compilation - Select SHA* configs - Remove the !SANDBOX dependency for EFI TCG2 - Only compile in the measurement u-boot command when CONFIG_MEASURED_BOOT is enabled Changes since v4: - Remove tcg2_measure_event function and check for NULL data in tcg2_measure_data - Use tpm_auto_startup - Fix efi_tcg2.c compilation for removing tcg2_pcr_read function - Change PCR indexes for initrd and dtb - Drop u8 casting in measurement test - Use bullets in documentation Changes since v3: - Reordered headers - Refactored more of EFI code into common code Removed digest_info structure and instead used the common alg_to_mask and alg_to_len Improved event log parsing in common code to get it equivalent to EFI Common code now extends PCR if previous bootloader stage couldn't No need to allocate memory in the common code, so EFI copies the discovered buffer like it did before Rename efi measure_event function Changes since v2: - Add documentation. - Changed reserved memory address to the top of the RAM for sandbox dts. - Add measure state to booti and bootz. - Skip measurement for EFI images that should be measured Changes since v1: - Refactor TPM layer functions to allow EFI system to use them, and remove duplicate EFI functions. - Add test case - Drop #ifdefs for bootm - Add devicetree measurement config option - Update sandbox TPM driver Eddie James (6): tpm: Fix spelling for tpmu_ha union tpm: sandbox: Update for needed TPM2 capabilities tpm: Support boot measurements bootm: Support boot measurement test: Add sandbox TPM boot measurement doc: Add measured boot documentation arch/sandbox/dts/sandbox.dtsi | 13 + arch/sandbox/dts/test.dts | 13 + boot/Kconfig | 32 + boot/bootm.c | 74 +++ cmd/booti.c | 1 + cmd/bootm.c | 2 + cmd/bootz.c | 1 + configs/sandbox_defconfig | 1 + doc/usage/index.rst | 1 + doc/usage/measured_boot.rst | 23 + drivers/tpm/tpm2_tis_sandbox.c | 100 ++- include/bootm.h | 11 + include/efi_tcg2.h | 44 -- include/image.h | 1 + include/test/suites.h | 1 + include/tpm-v2.h | 263 +++++++- lib/Kconfig | 4 + lib/efi_loader/Kconfig | 2 - lib/efi_loader/efi_tcg2.c | 1054 +++----------------------------- lib/tpm-v2.c | 814 ++++++++++++++++++++++++ test/boot/Makefile | 1 + test/boot/measurement.c | 66 ++ test/cmd_ut.c | 4 + 23 files changed, 1473 insertions(+), 1053 deletions(-) create mode 100644 doc/usage/measured_boot.rst create mode 100644 test/boot/measurement.c -- 2.31.1

3 15

[PATCH 1/4] config: rock64: start USB to make storage usable
by Peter Robinson 04 Aug '23

04 Aug '23

Start the USB stack so usb storage can be used. Adding the command as usb keyboard isn't enabled as there's not currently display output. Signed-off-by: Peter Robinson <pbrobinson(a)gmail.com> --- configs/rock64-rk3328_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig index 5e36612bb80..1da9b0545a5 100644 --- a/configs/rock64-rk3328_defconfig +++ b/configs/rock64-rk3328_defconfig @@ -23,6 +23,8 @@ CONFIG_DEBUG_UART_BASE=0xFF130000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_SYS_LOAD_ADDR=0x800800 CONFIG_DEBUG_UART=y +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="usb start" # CONFIG_ANDROID_BOOT_IMAGE is not set CONFIG_FIT=y CONFIG_FIT_VERBOSE=y -- 2.41.0

3 12

[PATCH] freescale: Remove Rajesh Bhagat MAINTAINERS
by Sean Anderson 03 Aug '23

03 Aug '23

Rajesh's email bounces. Remove his email from all boards he maintains. Fortunately, he has co-maintainers on most boards. I have taken the liberty of volunteering Pramod to maintain the LS1012AFRDM, since he also maintains the LS1012AFRWY. Let me know if the board should be orphaned instead. Signed-off-by: Sean Anderson <sean.anderson(a)seco.com> --- board/freescale/ls1012afrdm/MAINTAINERS | 2 +- board/freescale/ls1012aqds/MAINTAINERS | 1 - board/freescale/ls1012ardb/MAINTAINERS | 1 - board/freescale/ls1028a/MAINTAINERS | 2 -- board/freescale/ls1043aqds/MAINTAINERS | 1 - board/freescale/ls1043ardb/MAINTAINERS | 1 - board/freescale/ls1046aqds/MAINTAINERS | 1 - board/freescale/ls1046ardb/MAINTAINERS | 1 - board/freescale/ls1088a/MAINTAINERS | 2 -- board/freescale/ls2080aqds/MAINTAINERS | 1 - board/freescale/ls2080ardb/MAINTAINERS | 1 - 11 files changed, 1 insertion(+), 13 deletions(-) diff --git a/board/freescale/ls1012afrdm/MAINTAINERS b/board/freescale/ls1012afrdm/MAINTAINERS index 5fc7e93850e..89d1085b00b 100644 --- a/board/freescale/ls1012afrdm/MAINTAINERS +++ b/board/freescale/ls1012afrdm/MAINTAINERS @@ -1,5 +1,5 @@ LS1012AFRDM BOARD -M: Rajesh Bhagat <rajesh.bhagat(a)nxp.com> +M: Pramod Kumar <pramod.kumar_1(a)nxp.com> S: Maintained F: board/freescale/ls1012afrdm/ F: include/configs/ls1012afrdm.h diff --git a/board/freescale/ls1012aqds/MAINTAINERS b/board/freescale/ls1012aqds/MAINTAINERS index c1bb8d51508..eabf5805765 100644 --- a/board/freescale/ls1012aqds/MAINTAINERS +++ b/board/freescale/ls1012aqds/MAINTAINERS @@ -1,5 +1,4 @@ LS1012AQDS BOARD -M: Rajesh Bhagat <rajesh.bhagat(a)nxp.com> M: Pramod Kumar <pramod.kumar_1(a)nxp.com> S: Maintained F: board/freescale/ls1012aqds/ diff --git a/board/freescale/ls1012ardb/MAINTAINERS b/board/freescale/ls1012ardb/MAINTAINERS index b0c008b5fc9..ce2f9a16cc7 100644 --- a/board/freescale/ls1012ardb/MAINTAINERS +++ b/board/freescale/ls1012ardb/MAINTAINERS @@ -1,5 +1,4 @@ LS1012ARDB BOARD -M: Rajesh Bhagat <rajesh.bhagat(a)nxp.com> M: Pramod Kumar <pramod.kumar_1(a)nxp.com> S: Maintained F: board/freescale/ls1012ardb/ diff --git a/board/freescale/ls1028a/MAINTAINERS b/board/freescale/ls1028a/MAINTAINERS index 9e7b0697ff6..551f6a08651 100644 --- a/board/freescale/ls1028a/MAINTAINERS +++ b/board/freescale/ls1028a/MAINTAINERS @@ -1,5 +1,4 @@ LS1028AQDS BOARD -M: Rajesh Bhagat <rajesh.bhagat(a)nxp.com> M: Tang Yuantian <andy.tang(a)nxp.com> S: Maintained F: board/freescale/ls1028a/ @@ -9,7 +8,6 @@ F: configs/ls1028aqds_tfa_defconfig F: configs/ls1028aqds_tfa_lpuart_defconfig LS1028ARDB BOARD -M: Rajesh Bhagat <rajesh.bhagat(a)nxp.com> M: Tang Yuantian <andy.tang(a)nxp.com> S: Maintained F: board/freescale/ls1028a/ diff --git a/board/freescale/ls1043aqds/MAINTAINERS b/board/freescale/ls1043aqds/MAINTAINERS index 9fb6cc85cd0..f7420ecd303 100644 --- a/board/freescale/ls1043aqds/MAINTAINERS +++ b/board/freescale/ls1043aqds/MAINTAINERS @@ -1,6 +1,5 @@ LS1043AQDS BOARD M: Mingkai Hu <mingkai.hu(a)nxp.com> -M: Rajesh Bhagat <rajesh.bhagat(a)nxp.com> S: Maintained F: board/freescale/ls1043aqds/ F: include/configs/ls1043aqds.h diff --git a/board/freescale/ls1043ardb/MAINTAINERS b/board/freescale/ls1043ardb/MAINTAINERS index 36e7331538f..9bbec4d9acc 100644 --- a/board/freescale/ls1043ardb/MAINTAINERS +++ b/board/freescale/ls1043ardb/MAINTAINERS @@ -1,6 +1,5 @@ LS1043A BOARD M: Mingkai Hu <mingkai.hu(a)nxp.com> -M: Rajesh Bhagat <rajesh.bhagat(a)nxp.com> S: Maintained F: board/freescale/ls1043ardb/ F: board/freescale/ls1043ardb/ls1043ardb.c diff --git a/board/freescale/ls1046aqds/MAINTAINERS b/board/freescale/ls1046aqds/MAINTAINERS index 72c4253fcf5..e1db2aaa8e4 100644 --- a/board/freescale/ls1046aqds/MAINTAINERS +++ b/board/freescale/ls1046aqds/MAINTAINERS @@ -1,6 +1,5 @@ LS1046AQDS BOARD M: Mingkai Hu <Mingkai.Hu(a)nxp.com> -M: Rajesh Bhagat <rajesh.bhagat(a)nxp.com> S: Maintained F: board/freescale/ls1046aqds/ F: include/configs/ls1046aqds.h diff --git a/board/freescale/ls1046ardb/MAINTAINERS b/board/freescale/ls1046ardb/MAINTAINERS index 3c8cfe720dc..d5a6b261519 100644 --- a/board/freescale/ls1046ardb/MAINTAINERS +++ b/board/freescale/ls1046ardb/MAINTAINERS @@ -1,6 +1,5 @@ LS1046A BOARD M: Mingkai Hu <mingkai.hu(a)nxp.com> -M: Rajesh Bhagat <rajesh.bhagat(a)nxp.com> S: Maintained F: board/freescale/ls1046ardb/ F: board/freescale/ls1046ardb/ls1046ardb.c diff --git a/board/freescale/ls1088a/MAINTAINERS b/board/freescale/ls1088a/MAINTAINERS index 5c7925a95f4..95a14149e4f 100644 --- a/board/freescale/ls1088a/MAINTAINERS +++ b/board/freescale/ls1088a/MAINTAINERS @@ -1,6 +1,5 @@ LS1088ARDB BOARD M: Ashish Kumar <Ashish.Kumar(a)nxp.com> -M: Rajesh Bhagat <rajesh.bhagat(a)nxp.com> S: Maintained F: board/freescale/ls1088a/ F: include/configs/ls1088ardb.h @@ -11,7 +10,6 @@ F: configs/ls1088ardb_tfa_SECURE_BOOT_defconfig LS1088AQDS BOARD M: Ashish Kumar <Ashish.Kumar(a)nxp.com> -M: Rajesh Bhagat <rajesh.bhagat(a)nxp.com> S: Maintained F: board/freescale/ls1088a/ F: include/configs/ls1088aqds.h diff --git a/board/freescale/ls2080aqds/MAINTAINERS b/board/freescale/ls2080aqds/MAINTAINERS index 39d02ae3f46..fdad199ec25 100644 --- a/board/freescale/ls2080aqds/MAINTAINERS +++ b/board/freescale/ls2080aqds/MAINTAINERS @@ -1,6 +1,5 @@ LS2080A BOARD M: Priyanka Jain <priyanka.jain(a)nxp.com> -M: Rajesh Bhagat <rajesh.bhagat(a)nxp.com> M: Wasim Khan <wasim.khan(a)nxp.com> S: Maintained F: board/freescale/ls2080aqds/ diff --git a/board/freescale/ls2080ardb/MAINTAINERS b/board/freescale/ls2080ardb/MAINTAINERS index f49d26af3a0..f2f834ffbd9 100644 --- a/board/freescale/ls2080ardb/MAINTAINERS +++ b/board/freescale/ls2080ardb/MAINTAINERS @@ -10,7 +10,6 @@ F: configs/ls2080ardb_nand_defconfig LS2088A_QSPI-boot BOARD M: Priyanka Jain <priyanka.jain(a)nxp.com> -M: Rajesh Bhagat <rajesh.bhagat(a)nxp.com> M: Wasim Khan <wasim.khan(a)nxp.com> S: Maintained F: configs/ls2088ardb_qspi_defconfig -- 2.35.1.1320.gc452695387.dirty

2 5

[PATCH] net: ksz9477: add support for KSZ9893 GbE switch
by Karsten Wiese 28 Jul '23

28 Jul '23

Copy and tweak the required code from the linux kernel. Only the KSZ9893 has been tested. Signed-off-by: Karsten Wiese <karsten.wiese(a)protechna.com> --- drivers/net/ksz9477.c | 103 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 89 insertions(+), 14 deletions(-) diff --git a/drivers/net/ksz9477.c b/drivers/net/ksz9477.c index 6b59b5fcd2..43baa69961 100644 --- a/drivers/net/ksz9477.c +++ b/drivers/net/ksz9477.c @@ -16,6 +16,10 @@ #include <asm-generic/gpio.h> +/* Used with variable features to indicate capabilities. */ +#define NEW_XMII BIT(1) +#define IS_9893 BIT(2) + /* Global registers */ /* Chip ID */ @@ -41,6 +45,13 @@ #define PORT_RMII_SEL 0x1 #define PORT_GMII_SEL 0x2 #define PORT_MII_SEL 0x3 +/* S1 */ +#define PORT_MII_1000MBIT_S1 BIT(6) +/* S1 */ +#define PORT_MII_SEL_S1 0x0 +#define PORT_RMII_SEL_S1 0x1 +#define PORT_GMII_SEL_S1 0x2 +#define PORT_RGMII_SEL_S1 0x3 /* Port MSTP State Register */ #define REG_PORT_MSTP_STATE 0x0b04 @@ -62,6 +73,8 @@ struct ksz_dsa_priv { struct udevice *dev; + + u32 features; /* chip specific features */ }; static inline int ksz_read8(struct udevice *dev, u32 reg, u8 *val) @@ -284,6 +297,60 @@ U_BOOT_DRIVER(ksz_mdio) = { .plat_auto = sizeof(struct mdio_perdev_priv), }; +static void ksz9477_set_gbit(struct ksz_dsa_priv *priv, bool gbit, u8 *data) +{ + if (priv->features & NEW_XMII) { + if (gbit) + *data &= ~PORT_MII_NOT_1GBIT; + else + *data |= PORT_MII_NOT_1GBIT; + } else { + if (gbit) + *data |= PORT_MII_1000MBIT_S1; + else + *data &= ~PORT_MII_1000MBIT_S1; + } +} + +static void ksz9477_set_xmii(struct ksz_dsa_priv *priv, int mode, u8 *data) +{ + u8 xmii; + + if (priv->features & NEW_XMII) { + switch (mode) { + case 0: + xmii = PORT_MII_SEL; + break; + case 1: + xmii = PORT_RMII_SEL; + break; + case 2: + xmii = PORT_GMII_SEL; + break; + default: + xmii = PORT_RGMII_SEL; + break; + } + } else { + switch (mode) { + case 0: + xmii = PORT_MII_SEL_S1; + break; + case 1: + xmii = PORT_RMII_SEL_S1; + break; + case 2: + xmii = PORT_GMII_SEL_S1; + break; + default: + xmii = PORT_RGMII_SEL_S1; + break; + } + } + *data &= ~PORT_MII_SEL_M; + *data |= xmii; +} + static int ksz_port_setup(struct udevice *dev, int port, phy_interface_t interface) { @@ -293,9 +360,11 @@ static int ksz_port_setup(struct udevice *dev, int port, dev_dbg(dev, "%s P%d %s\n", __func__, port + 1, (port == pdata->cpu_port) ? "cpu" : ""); + struct ksz_dsa_priv *priv = dev_get_priv(dev); if (port != pdata->cpu_port) { - /* phy port: config errata and leds */ - ksz_phy_errata_setup(dev, port); + if (priv->features & NEW_XMII) + /* phy port: config errata and leds */ + ksz_phy_errata_setup(dev, port); } else { /* cpu port: configure MAC interface mode */ ksz_pread8(dev, port, REG_PORT_XMII_CTRL_1, &data8); @@ -303,24 +372,20 @@ static int ksz_port_setup(struct udevice *dev, int port, phy_string_for_interface(interface)); switch (interface) { case PHY_INTERFACE_MODE_MII: - data8 &= ~PORT_MII_SEL_M; - data8 |= PORT_MII_SEL; - data8 |= PORT_MII_NOT_1GBIT; + ksz9477_set_xmii(priv, 0, &data8); + ksz9477_set_gbit(priv, false, &data8); break; case PHY_INTERFACE_MODE_RMII: - data8 &= ~PORT_MII_SEL_M; - data8 |= PORT_RMII_SEL; - data8 |= PORT_MII_NOT_1GBIT; + ksz9477_set_xmii(priv, 1, &data8); + ksz9477_set_gbit(priv, false, &data8); break; case PHY_INTERFACE_MODE_GMII: - data8 &= ~PORT_MII_SEL_M; - data8 |= PORT_GMII_SEL; - data8 &= ~PORT_MII_NOT_1GBIT; + ksz9477_set_xmii(priv, 2, &data8); + ksz9477_set_gbit(priv, true, &data8); break; default: - data8 &= ~PORT_MII_SEL_M; - data8 |= PORT_RGMII_SEL; - data8 &= ~PORT_MII_NOT_1GBIT; + ksz9477_set_xmii(priv, 3, &data8); + ksz9477_set_gbit(priv, true, &data8); data8 &= ~PORT_RGMII_ID_IG_ENABLE; data8 &= ~PORT_RGMII_ID_EG_ENABLE; if (interface == PHY_INTERFACE_MODE_RGMII_ID || @@ -329,6 +394,8 @@ static int ksz_port_setup(struct udevice *dev, int port, if (interface == PHY_INTERFACE_MODE_RGMII_ID || interface == PHY_INTERFACE_MODE_RGMII_TXID) data8 |= PORT_RGMII_ID_EG_ENABLE; + if (priv->features & IS_9893) + data8 &= ~PORT_MII_MAC_MODE; break; } ksz_write8(dev, PORT_CTRL_ADDR(port, REG_PORT_XMII_CTRL_1), data8); @@ -479,10 +546,17 @@ static int ksz_i2c_probe(struct udevice *dev) case 0x00989700: puts("KSZ9897S: "); break; + case 0x00989300: + puts("KSZ9893R: "); + break; default: dev_err(dev, "invalid chip id: 0x%08x\n", id); return -EINVAL; } + if ((id & 0xf00) == 0x300) + priv->features |= IS_9893; + else + priv->features |= NEW_XMII; /* probe mdio bus */ ret = ksz_probe_mdio(dev); @@ -503,6 +577,7 @@ static const struct udevice_id ksz_i2c_ids[] = { { .compatible = "microchip,ksz9897" }, { .compatible = "microchip,ksz9477" }, { .compatible = "microchip,ksz9567" }, + { .compatible = "microchip,ksz9893" }, { } }; -- 2.25.1

4 3

[PATCH 0/2] IPv6 Network Discovery Boundary Variable and Packed Structure
by emohandesi＠linux.microsoft.com 27 Jul '23

27 Jul '23

From: Ehsan Mohandesi <emohandesi(a)linux.microsoft.com> This series addresses the following. 1. Coverity Issue (CID 450971): Loop boundary variables should be checked to be within appropriate limits. 2. Making the structure icmp6_ra_prefix_info packed because it contains network protocol data received from the network. Ehsan Mohandesi (2): net: ipv6: router advertisement message length should be within limits net: ipv6: network protocol structures should be packed include/net6.h | 2 +- net/ndisc.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) -- 1.8.3.1

4 8

[PATCH 1/2] net: phy: Factor out PHY GPIO reset code
by Marek Vasut 27 Jul '23

27 Jul '23

Pull the PHY GPIO reset code into separate function, since this is and will be reused multiple times. Set up default reset assert and deassert timing to generous 20ms and 1ms for maximum compatibility in case those DT properties are missing. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)mailbox.org> --- Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Marek Vasut <marek.vasut+renesas(a)mailbox.org> Cc: Michal Simek <michal.simek(a)amd.com> Cc: Nishanth Menon <nm(a)ti.com> Cc: Ramon Fried <rfried.dev(a)gmail.com> --- drivers/net/phy/ethernet_id.c | 37 ++++----------------------- drivers/net/phy/phy.c | 47 +++++++++++++++++++++++++++++++++++ include/phy.h | 9 +++++++ 3 files changed, 61 insertions(+), 32 deletions(-) diff --git a/drivers/net/phy/ethernet_id.c b/drivers/net/phy/ethernet_id.c index 877a51c3d00..0beafaae46a 100644 --- a/drivers/net/phy/ethernet_id.c +++ b/drivers/net/phy/ethernet_id.c @@ -18,12 +18,11 @@ struct phy_device *phy_connect_phy_id(struct mii_dev *bus, struct udevice *dev, { struct phy_device *phydev; struct ofnode_phandle_args phandle_args; - struct gpio_desc gpio; const char *node_name; struct udevice *pdev; - ofnode node; - u32 id, assert, deassert; u16 vendor, device; + ofnode node; + u32 id; int ret; if (dev_read_phandle_with_args(dev, "phy-handle", NULL, 0, 0, @@ -41,35 +40,9 @@ struct phy_device *phy_connect_phy_id(struct mii_dev *bus, struct udevice *dev, return NULL; } - if (!IS_ENABLED(CONFIG_DM_ETH_PHY)) { - ret = gpio_request_by_name_nodev(node, "reset-gpios", 0, &gpio, - GPIOD_IS_OUT | GPIOD_ACTIVE_LOW); - if (!ret) { - assert = ofnode_read_u32_default(node, - "reset-assert-us", 0); - deassert = ofnode_read_u32_default(node, - "reset-deassert-us", - 0); - ret = dm_gpio_set_value(&gpio, 1); - if (ret) { - dev_err(dev, - "Failed assert gpio, err: %d\n", ret); - return NULL; - } - - udelay(assert); - - ret = dm_gpio_set_value(&gpio, 0); - if (ret) { - dev_err(dev, - "Failed deassert gpio, err: %d\n", - ret); - return NULL; - } - - udelay(deassert); - } - } + ret = phy_gpio_reset(dev); + if (ret) + return NULL; id = vendor << 16 | device; phydev = phy_device_create(bus, phyaddr, id, false); diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index ae21acb059b..3d69c2c4d28 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -18,6 +18,8 @@ #include <phy.h> #include <errno.h> #include <asm/global_data.h> +#include <asm/gpio.h> +#include <dm/device_compat.h> #include <dm/of_extra.h> #include <linux/bitops.h> #include <linux/delay.h> @@ -799,6 +801,51 @@ int miiphy_reset(const char *devname, unsigned char addr) return phy_reset(phydev); } +int phy_gpio_reset(struct udevice *dev) +{ + struct ofnode_phandle_args phandle_args; + struct gpio_desc gpio; + u32 assert, deassert; + ofnode node; + int ret; + + ret = dev_read_phandle_with_args(dev, "phy-handle", NULL, 0, 0, + &phandle_args); + /* No PHY handle is OK */ + if (ret) + return 0; + + node = phandle_args.node; + if (!ofnode_valid(node)) + return -EINVAL; + + ret = gpio_request_by_name_nodev(node, "reset-gpios", 0, &gpio, + GPIOD_IS_OUT | GPIOD_ACTIVE_LOW); + /* No PHY reset GPIO is OK */ + if (ret) + return 0; + + assert = ofnode_read_u32_default(node, "reset-assert-us", 20000); + deassert = ofnode_read_u32_default(node, "reset-deassert-us", 1000); + ret = dm_gpio_set_value(&gpio, 1); + if (ret) { + dev_err(dev, "Failed assert gpio, err: %d\n", ret); + return ret; + } + + udelay(assert); + + ret = dm_gpio_set_value(&gpio, 0); + if (ret) { + dev_err(dev, "Failed deassert gpio, err: %d\n", ret); + return ret; + } + + udelay(deassert); + + return 0; +} + struct phy_device *phy_find_by_mask(struct mii_dev *bus, uint phy_mask) { /* Reset the bus */ diff --git a/include/phy.h b/include/phy.h index f023a3c2685..6fe397be1fe 100644 --- a/include/phy.h +++ b/include/phy.h @@ -188,6 +188,15 @@ int phy_init(void); */ int phy_reset(struct phy_device *phydev); +/** + * phy_gpio_reset() - Resets the specified PHY using GPIO reset + * Toggles the optional PHY reset GPIO + * + * @dev: PHY udevice to reset + * @return: 0 if OK, -ve on error + */ +int phy_gpio_reset(struct udevice *dev); + /** * phy_find_by_mask() - Searches for a PHY on the specified MDIO bus * The function checks the PHY addresses flagged in phy_mask and returns a -- 2.39.2

3 4

Trying to boot JH7110 RISCV-V CPU from MMC
by Roland Ruckerbauer 27 Jul '23

27 Jul '23

Hi! I am trying to use upstream u-boot + opensbi, to boot my visionfive2 SBC I got from external SD card. I had not much luck with the vendor provided images / tools, they seem to have a lot of hard coded stuff and just won`t work correctly. With upstream u-boot I followed the doc/board/starfive/visionfive2.rst to the point, but unfortunately it did not work. First I ran into an issue, where the chip would pick up a random SPL somewhere else on the SD card, and so I could not test my build. I fixed it by completely erasing the whole sdcard to make sure there can be no other SPL/Uboot on it. This worked, but unfortunately the sd card I made with the steps from doc/board/starfive/visionfive2.rst still did not work. I managed to figure out, that I need to make special modifications to the first 2 sectors of the sd card (protective MBR and GPT header), using https://github.com/starfive-tech/Tools/tree/master/spl_tool. Calling spl_tool -i -f /dev/sdb on my sdcard patches the first sectors with an invalid SPL, and also a offset to the backup SPL (which is the primary one I flashed according to the documentation). Maybe this should be added to the docu, otherwise it will not work, or worse, load some other SPL also on the SD card and cause confusion. There also is a mention in the docu, that the boot ROM searches for the SPL by looking for the offset of its partition in the GPT with a specific GUID. Not sure where this information comes from, but testing showed, that its probably not true. Now to my actual problem, hopefully someone can help: The sdcard I built with u-boot and opensbi can now boot the spl, and also start opensbi and load u-boot. Unfortunately the init_sequence_r now fails with an error: initcall sequence 00000000fffe0738 failed at call 0000000040216240 (err=-19) Digging through the source and some printf debugging revealed to me, that initr_dm_devices() fails, because it can not find a timer device with in dm_timer_init() call. For the JH7110 and pretty much any other RISCV chip the timer device should be provided by the SBI, which is functioning correctly as far as I can tell. I searched for it in the u-boot code, and figured out that riscv_timer uboot driver should be probed, when the booting cpu is bound to its driver in the riscv_cpu_bind() function. Unfortunately it seems like this cpu driver bind function is never called before the initcall sequence crashed because of the missing timer device. That is pretty much everything I could figure out on my own until now, but I am not sure what exactly is going wrong. Hopefully it has nothing to do with how my local setup compiles the code. u-boot seems to be using many tricks like the U_BOOT_DRIVER() macro and others, maybe some of them do not guarantee to create entries in a specific order, and the code accidentally depends on a specific order. Maybe somebody can give me some pointers, I would appreciate it. Greetings, Roland Ruckerbauer

2 2

[PATCH] riscv: Support riscv64 image type
by Rick Chen 27 Jul '23

27 Jul '23

Allow U-Boot to load 32 or 64 bits RISC-V Kernel Image distinguishly. It helps to avoid someone maybe make a mistake to run 32-bit U-Boot to load 64-bit kernel. Signed-off-by: Rick Chen <rick(a)andestech.com> --- The patchset is based on Simon's patch: riscv: Add a 64-bit image type --- --- arch/riscv/include/asm/u-boot.h | 4 ++++ cmd/booti.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/u-boot.h b/arch/riscv/include/asm/u-boot.h index d5e1d5f323..e3b4a0357c 100644 --- a/arch/riscv/include/asm/u-boot.h +++ b/arch/riscv/include/asm/u-boot.h @@ -23,6 +23,10 @@ #include <asm/u-boot-riscv.h> /* For image.h:image_check_target_arch() */ +#ifdef CONFIG_ARCH_RV64I +#define IH_ARCH_DEFAULT IH_ARCH_RISCV64 +#else #define IH_ARCH_DEFAULT IH_ARCH_RISCV +#endif #endif /* _U_BOOT_H_ */ diff --git a/cmd/booti.c b/cmd/booti.c index 6ac39193db..dc0b0ae41c 100644 --- a/cmd/booti.c +++ b/cmd/booti.c @@ -119,7 +119,7 @@ int do_booti(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) images.os.os = IH_OS_LINUX; #ifdef CONFIG_RISCV_SMODE - images.os.arch = IH_ARCH_RISCV; + images.os.arch = IH_ARCH_DEFAULT; #elif CONFIG_ARM64 images.os.arch = IH_ARCH_ARM64; #endif -- 2.17.1

4 5

[PATCH v1] HSD #18028953892: usb: xhci-dwc3: Fix USB3.1 controller register access in reset state
by Jit Loon Lim 27 Jul '23

27 Jul '23

From: Teik Heng Chong <teik.heng.chong(a)intel.com> The controller registers should not be accessed while the controller's vcc_reset_n is asserted. Signed-off-by: Teik Heng Chong <teik.heng.chong(a)intel.com> --- drivers/usb/host/xhci-dwc3.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c index 1dbd65dfaa..3172956bd6 100644 --- a/drivers/usb/host/xhci-dwc3.c +++ b/drivers/usb/host/xhci-dwc3.c @@ -227,6 +227,11 @@ static int xhci_dwc3_probe(struct udevice *dev) static int xhci_dwc3_remove(struct udevice *dev) { struct xhci_dwc3_plat *plat = dev_get_plat(dev); + int ret; + + ret = xhci_deregister(dev); + if (ret) + return ret; dwc3_shutdown_phy(dev, &plat->phys); @@ -234,7 +239,7 @@ static int xhci_dwc3_remove(struct udevice *dev) reset_release_bulk(&plat->resets); - return xhci_deregister(dev); + return 0; } static const struct udevice_id xhci_dwc3_ids[] = { -- 2.26.2

5 11

[PATCH next v3 0/2] rockchip: rk3399: pass platform parameter to TF-A
by Quentin Schulz 26 Jul '23

26 Jul '23

Finally pass the FDT address to TF-A since it now gracefully fallbacks to hardcoded defaults if it cannot parse it. This allows us to avoid modifying hardcoded values in TF-A to enable the console. This was tested with TF-A v2.9.0 on Puma Haikou RK3399. We do this only for new RK3399 boards, where this will be a conscious choice to enable CONFIG_SPL_ATF_NO_PLATFORM_PARAM, and Puma since it's been tested with upstream TF-A. The imply condition on SPL_ATF is always true because SPL_ATF is selected for all RK3399-based boards in arch/arm/mach-rockchip/Kconfig. For board maintainers who received this mail, this patch series does not modify anything for your board. However, this highlights that your board does not make use of a feature (passing U-Boot DTB to TF-A) I find useful. I know this has been a pain point for some of you since TF-A has a default baudrate of 115200 on UART2 for its debug console which meant you had the choice of: 1) patch TF-A to run at 1500000 baudrate instead (Rockchip's BSP default) and/or a different UART controller than UART2, 2) not have TF-A output, You're now aware there's a third choice: disable SPL_ATF_NO_PLATFORM_PARAM Kconfig option if your TF-A is of version 2.4 or newer. Up to you to send a patch for your board defconfig. This option was not disabled on all platforms on purpose since Kever prefers to be careful since some boards might require downstream/blob-only TF-A that are older than 2.4 version. Signed-off-by: Quentin Schulz <quentin.schulz(a)theobroma-systems.com> --- Changes in v3: - rebased on top of master - tested with TF-A v2.9.0 on Puma - changed defconfigs for new RK3399 boards since v2 - Link to v2: https://lore.kernel.org/r/20221114-rk3399-tf-a-plat-param-v2-0-29287f1a501e… Changes in v2: - keep the option selected for existing boards except Puma, - added board maintainers to recipients of this mail, - Link to v1: https://lore.kernel.org/r/20221114-rk3399-tf-a-plat-param-v1-0-0f873897bda7… --- Quentin Schulz (2): rockchip: rk3399: pass platform parameter to TF-A by default for new RK3399 boards rockchip: puma: pass platform parameter to TF-A arch/arm/mach-rockchip/Kconfig | 1 - configs/chromebook_bob_defconfig | 1 + configs/chromebook_kevin_defconfig | 1 + configs/eaidk-610-rk3399_defconfig | 1 + configs/evb-rk3399_defconfig | 1 + configs/ficus-rk3399_defconfig | 1 + configs/firefly-rk3399_defconfig | 1 + configs/khadas-edge-captain-rk3399_defconfig | 1 + configs/khadas-edge-rk3399_defconfig | 1 + configs/khadas-edge-v-rk3399_defconfig | 1 + configs/leez-rk3399_defconfig | 1 + configs/nanopc-t4-rk3399_defconfig | 1 + configs/nanopi-m4-2gb-rk3399_defconfig | 1 + configs/nanopi-m4-rk3399_defconfig | 1 + configs/nanopi-m4b-rk3399_defconfig | 1 + configs/nanopi-neo4-rk3399_defconfig | 1 + configs/nanopi-r4s-rk3399_defconfig | 1 + configs/orangepi-rk3399_defconfig | 1 + configs/pinebook-pro-rk3399_defconfig | 1 + configs/pinephone-pro-rk3399_defconfig | 1 + configs/roc-pc-mezzanine-rk3399_defconfig | 1 + configs/roc-pc-rk3399_defconfig | 1 + configs/rock-4c-plus-rk3399_defconfig | 1 + configs/rock-pi-4-rk3399_defconfig | 1 + configs/rock-pi-4c-rk3399_defconfig | 1 + configs/rock-pi-n10-rk3399pro_defconfig | 1 + configs/rock960-rk3399_defconfig | 1 + configs/rockpro64-rk3399_defconfig | 1 + 28 files changed, 27 insertions(+), 1 deletion(-) --- base-commit: 50842b217fef505a0ec6662cc2acdc55d0bb23c5 change-id: 20221114-rk3399-tf-a-plat-param-3ab055f40b9e Best regards, -- Quentin Schulz <quentin.schulz(a)theobroma-systems.com>

2 4