Add support for dynamic overriding of default SF bus
Subsystems (2)
v2 cover Add support for dynamic overriding of default SF bus
Currently the SPI flash to load from is defined through the compile time config CONFIG_SF_DEFAULT_BUS and CONFIG_SF_DEFAULT_CS, this prevents the loading of binaries from different SPI flash using the same build.
This series adds support for choosing the flash device based on the selected boot device thus allowing platforms to override the SF_BUS and SF_CS to load from the desired flash.
Changes tested on J721E for OSPI and QSPI boot.
V1->V2:
* drop unnecessary Kconfig option for SF bus override, suggested by Heiko Schocher.
Vaishnav Achath (2):
common: spl: spl_spi: add support for dynamic override of sf bus
arm: k3: j721e: add dynamic sf bus override support for j721e
arch/arm/mach-k3/j721e_init.c | 17 +++++++++++++++++ arch/arm/mach-k3/sysfw-loader.c | 4 ++-- common/spl/spl_spi.c | 16 +++++++++++++--- include/spl.h | 16 ++++++++++++++++ 4 files changed, 48 insertions(+), 5 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/2 common: spl: spl_spi: add support for dynamic override of sf bus
Currently the SPI flash to load from is defined through the compile time config CONFIG_SF_DEFAULT_BUS and CONFIG_SF_DEFAULT_CS, this prevents the loading of binaries from different SPI flash using the same build.E.g. supporting QSPI flash boot and OSPI flash boot on J721E platform is not possible due to this limitation.
This commit adds lookup functions spl_spi_boot_bus() and spl_spi_boot_cs for identifying the flash device based on the selected boot device, when not overridden the lookup functions are weakly defined in common/spl/spl_spi.c.
--- common/spl/spl_spi.c | 16 +++++++++++++--- include/spl.h | 16 ++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-)
common/spl/spl_spi.c +13 -3
@@ -71,6 +71,16 @@ unsigned int __weak spl_spi_get_uboot_offs(struct spi_flash *flash)return CONFIG_SYS_SPI_U_BOOT_OFFS ; } +u32 __weak spl_spi_boot_bus (void ) +{ +return CONFIG_SF_DEFAULT_BUS ; +} + +u32 __weak spl_spi_boot_cs (void ) +{ +return CONFIG_SF_DEFAULT_CS ; +} +/* * The main entry for SPI booting. It's necessary that SDRAM is already * configured and available since this code loads the main U-Boot image
@@ -83,15 +93,15 @@ static int spl_spi_load_image(struct spl_image_info *spl_image,unsigned int payload_offs;struct spi_flash *flash;struct image_header *header; +unsigned int sf_bus =spl_spi_boot_bus (); +unsigned int sf_cs =spl_spi_boot_cs ();/* * Load U-Boot image from SPI flash into RAM * In DM mode: defaults speed and mode will be * taken from DT when available */ - - flash =spi_flash_probe (CONFIG_SF_DEFAULT_BUS , -CONFIG_SF_DEFAULT_CS , + flash =spi_flash_probe (sf_bus, sf_cs,CONFIG_SF_DEFAULT_SPEED ,CONFIG_SF_DEFAULT_MODE );if (!flash) {
include/spl.h +16 -0
@@ -361,6 +361,22 @@ int spl_load_imx_container(struct spl_image_info *spl_image,void preloader_console_init (void );u32 spl_boot_device (void ); +/** +* spl_spi_boot_bus() - Lookup function for the SPI boot bus source. +* +* This function returns the SF bus to load from. +* If not overridden, it is weakly defined in common/spl/spl_spi.c. +*/ +u32 spl_spi_boot_bus (void ); + +/** +* spl_spi_boot_cs() - Lookup function for the SPI boot CS source. +* +* This function returns the SF CS to load from. +* If not overridden, it is weakly defined in common/spl/spl_spi.c. +*/ +u32 spl_spi_boot_cs (void ); +/** * spl_mmc_boot_mode() - Lookup function for the mode of an MMC boot source. * @boot_device: ID of the device which the MMC driver wants to read
Signature · 1 line
2.17.1
Re: [PATCH v2 1/2] common: spl: spl_spi: add support for dynamic override of sf bus
Hello Achath,
Quoted 6 lines · Vaishnav Achath
Currently the SPI flash to load from is defined through the compile time config
CONFIG_SF_DEFAULT_BUSandCONFIG_SF_DEFAULT_CS, this prevents the loading of binaries from different SPI flash using the same build.E.g. supporting QSPI flash boot and OSPI flash boot on J721E platform is not possible due to this limitation.
Quoted 7 lines
This commit adds lookup functions
spl_spi_boot_bus()andspl_spi_boot_csfor identifying the flash device based on the selected boot device, when not overridden the lookup functions are weakly defined incommon/spl/spl_spi.c.Signed-off-by Vaishnav Achath <[email protected]>---
you miss here change history. May you want to look into patman tool in
u-boot:/tools/patman/README
which can help you here much.
Quoted 3 lines
common/spl/spl_spi.c | 16 +++++++++++++--- include/spl.h | 16 ++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-)
Looks fine for me, thanks!
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: [email protected]
Re: [PATCH v2 1/2] common: spl: spl_spi: add support for dynamic override of sf bus
Hi Heiko,
Quoted 14 lines · Heiko Schocher
Hello Achath,
Quoted 11 lines · Vaishnav Achath
Currently the SPI flash to load from is defined through the compile time config
CONFIG_SF_DEFAULT_BUSandCONFIG_SF_DEFAULT_CS, this prevents the loading of binaries from different SPI flash using the same build.E.g. supporting QSPI flash boot and OSPI flash boot on J721E platform is not possible due to this limitation.This commit adds lookup functions
spl_spi_boot_bus()andspl_spi_boot_csfor identifying the flash device based on the selected boot device, when not overridden the lookup functions are weakly defined incommon/spl/spl_spi.c.
Quoted 9 lines
Quoted 2 lines
Signed-off-by Vaishnav Achath <[email protected]>---
you miss here change history. May you want to look into patman tool in
u-boot:/tools/patman/README
which can help you here much.
Noted, sorry I missed this, will wait for further feedback and include the change history in next revision, please let me know if a v3 with the change history alone fixed is required.
Quoted 8 lines
Quoted 3 lines
common/spl/spl_spi.c | 16 +++++++++++++--- include/spl.h | 16 ++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-)Looks fine for me, thanks!
Reviewed-by Heiko Schocher <[email protected]>
Thank you for the review.
Quoted 2 lines
bye,
Heiko
Signature · 2 lines
Regards, Vaishnav
Re: [PATCH v2 1/2] common: spl: spl_spi: add support for dynamic override of sf bus
In reply to Vaishnav AchathQuoted 6 lines · Vaishnav Achath
Currently the SPI flash to load from is defined through the compile time config
CONFIG_SF_DEFAULT_BUSandCONFIG_SF_DEFAULT_CS, this prevents the loading of binaries from different SPI flash using the same build.E.g. supporting QSPI flash boot and OSPI flash boot on J721E platform is not possible due to this limitation.
Quoted 6 lines
This commit adds lookup functions
spl_spi_boot_bus()andspl_spi_boot_csfor identifying the flash device based on the selected boot device, when not overridden the lookup functions are weakly defined incommon/spl/spl_spi.c.Signed-off-by Vaishnav Achath <[email protected]>
Signature · 3 lines
Regards, Pratyush Yadav Texas Instruments Inc.
PATCH v2 2/2 arm: k3: j721e: add dynamic sf bus override support for j721e
In reply to Vaishnav Achathimplement overrides for spl_spi_boot_bus() and spl_spi_boot_cs() lookup functions according to bootmode selection, so as to support both QSPI and OSPI boot using the same build.
--- arch/arm/mach-k3/j721e_init.c | 17 +++++++++++++++++ arch/arm/mach-k3/sysfw-loader.c | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-)
arch/arm/mach-k3/j721e_init.c +17 -0
@@ -355,6 +355,23 @@ static u32 __get_primary_bootmedia(u32 main_devstat, u32 wkup_devstat)return bootmode; } +u32 spl_spi_boot_bus (void ) +{ +u32 wkup_devstat =readl (CTRLMMR_WKUP_DEVSTAT ); +u32 main_devstat =readl (CTRLMMR_MAIN_DEVSTAT ); +u32 bootmode = ((wkup_devstat &WKUP_DEVSTAT_PRIMARY_BOOTMODE_MASK ) >> +WKUP_DEVSTAT_PRIMARY_BOOTMODE_SHIFT ) | + ((main_devstat &MAIN_DEVSTAT_BOOT_MODE_B_MASK ) <<BOOT_MODE_B_SHIFT ); + +return (bootmode ==BOOT_DEVICE_QSPI ) ?1 :0 ; +} + +/* both OSPI and QSPI flash are in CS0 */ +u32 spl_spi_boot_cs (void ) +{ +return 0 ; +} +u32 spl_boot_device (void ) {u32 wkup_devstat =readl (CTRLMMR_WKUP_DEVSTAT );
arch/arm/mach-k3/sysfw-loader.c +2 -2
@@ -324,9 +324,9 @@ static void *k3_sysfw_get_spi_addr(void)struct udevice *dev;fdt_addr_t addr;int ret; +unsigned int sf_bus =spl_spi_boot_bus (); - ret =uclass_find_device_by_seq (UCLASS_SPI ,CONFIG_SF_DEFAULT_BUS , - &dev); + ret =uclass_find_device_by_seq (UCLASS_SPI , sf_bus, &dev);if (ret)return NULL ;
Signature · 1 line
2.17.1
Re: [PATCH v2 2/2] arm: k3: j721e: add dynamic sf bus override support for j721e
Hi Vaishnav,
Quoted 25 lines · Vaishnav Achath
implement overrides for
spl_spi_boot_bus()andspl_spi_boot_cs()lookup functions according to bootmode selection, so as to support both QSPI and OSPI boot using the same build.Signed-off-by Vaishnav Achath <[email protected]>--- arch/arm/mach-k3/j721e_init.c | 17 +++++++++++++++++ arch/arm/mach-k3/sysfw-loader.c | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-)arch/arm/mach-k3/j721e_init.c +7
-0@@ -355,6 +355,23 @@ static u32 __get_primary_bootmedia(u32 main_devstat, u32 wkup_devstat)return bootmode; } +u32 spl_spi_boot_bus (void ) +{ +u32 wkup_devstat =readl (CTRLMMR_WKUP_DEVSTAT ); +u32 main_devstat =readl (CTRLMMR_MAIN_DEVSTAT ); +u32 bootmode = ((wkup_devstat &WKUP_DEVSTAT_PRIMARY_BOOTMODE_MASK ) >> +WKUP_DEVSTAT_PRIMARY_BOOTMODE_SHIFT ) | + ((main_devstat &MAIN_DEVSTAT_BOOT_MODE_B_MASK ) <<BOOT_MODE_B_SHIFT );
arch/arm/mach-k3/j721e_init.c static u32 __get_primary_bootmedia(u32 main_devstat, u32 wkup_devstat) · line 374
Quoted 10 lines
arch/arm/mach-k3/j721e_init.c +10
-0+ +return (bootmode ==BOOT_DEVICE_QSPI ) ?1 :0 ; +} + +/* both OSPI and QSPI flash are in CS0 */ +u32 spl_spi_boot_cs (void ) +{ +return 0 ; +} +
I don't think we need to hard-code the chip select here. Let that come from the config. Other than this,
Quoted 22 lines
arch/arm/mach-k3/j721e_init.c +0
-0u32 spl_boot_device (void ) {u32 wkup_devstat =readl (CTRLMMR_WKUP_DEVSTAT );arch/arm/mach-k3/sysfw-loader.c +2
-2@@ -324,9 +324,9 @@ static void *k3_sysfw_get_spi_addr(void)struct udevice *dev;fdt_addr_t addr;int ret; +unsigned int sf_bus =spl_spi_boot_bus (); - ret =uclass_find_device_by_seq (UCLASS_SPI ,CONFIG_SF_DEFAULT_BUS , - &dev); + ret =uclass_find_device_by_seq (UCLASS_SPI , sf_bus, &dev);if (ret)return NULL ;Signature · 1 line
2.17.1
Signature · 3 lines
Regards, Pratyush Yadav Texas Instruments Inc.