ClearFog Base static variant support
Subsystems (3)
v6 cover ClearFog Base static variant support
This patch series adds support for ClearFog Base static configuration, as well as updating and fixing the ClearFog support for MMC and SPI booting.
v2 changes:
- updated against, and dependent on, https://patchwork.ozlabs.org/cover/1200324
v3 changes:
- rebased against ClearFog runtime TLV EEPROM changes merged into mvebu/master
v4
- adjust static SerDes configuration at runtime instead of #ifdef
v5
- distinguish build-only config changes (SFP and PCIe/SATA) from runtime detectable config changes
- retested SATA mode in PCIe slot with swap rx changes, confirmed working as presently patched. Only tested with ClearFog Base which only provides single channel, but Pro mechanism is parallel.
v6
- address minor review feedback
Joel Johnson (12):
arm: mvebu: fix SerDes table alignment
arm: mvebu: solidrun: remove hardcoded DTS MAC address
arm: mvebu: clearfog: use Pro name by default
arm: mvebu: clearfog: initial ClearFog Base variant
arm: mvebu: clearfog: Add option for 2.5 Gbps SFP
arm: mvebu: clearfog: Add SATA mode flags
arm: mvebu: clearfog: Unify DT selection paths
arm: mvebu: clearfog: add SPI offsets
arm: mvebu: enable working default boot support
arm: mvebu: clearfog: move ENV params to Kconfig
arm: mvebu: clearfog: don't always use SPL MMC
arm: mvebu: clearfog: Use Pro DT by default
.../arm/dts/armada-38x-solidrun-microsom.dtsi | 1 - arch/arm/mach-mvebu/Kconfig | 13 ++++ .../serdes/a38x/high_speed_env_spec.c | 6 +- board/solidrun/clearfog/Kconfig | 62 +++++++++++++++++++ board/solidrun/clearfog/clearfog.c | 61 +++++++++++++++--- configs/clearfog_defconfig | 4 -- include/configs/clearfog.h | 1 - 7 files changed, 132 insertions(+), 16 deletions(-) create mode 100644 board/solidrun/clearfog/Kconfig
Signature · 1 line
2.25.0
PATCH v6 1/12 arm: mvebu: fix SerDes table alignment
Tested on Solidrun ClearFog Base. Table alignment was:
| Lane # | Speed | Type |
--------------------------------
| 0 | 3 | SATA0 | | 1 | 0 | SGMII1 | | 2 | 3 | SATA1 | | 3 | 5 | USB3 HOST1 | | 4 | 5 | USB3 HOST0 | | 5 | 4 | SGMII2 |
--------------------------------
After the change, it's correctly aligned as:
| Lane # | Speed | Type |
--------------------------------
| 0 | 3 | SATA0 | | 1 | 0 | SGMII1 | | 2 | 5 | PCIe1 | | 3 | 5 | USB3 HOST1 | | 4 | 5 | PCIe2 | | 5 | 0 | SGMII2 |
--------------------------------
---
v2 changes
- none
v3 changes
- none
v4 changes
- none
v5 changes
- none
v6 changes
- none
--- arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c +3 -3
@@ -1366,16 +1366,16 @@ static void print_topology_details(const struct serdes_map *serdes_map,DEBUG_INIT_S ("board SerDes lanes topology details:\n" ); -DEBUG_INIT_S (" | Lane # | Speed | Type |\n" ); +DEBUG_INIT_S (" | Lane # | Speed | Type |\n" );DEBUG_INIT_S (" --------------------------------\n" );for (lane_num =0 ; lane_num < count; lane_num++) {if (serdes_map[lane_num].serdes_type ==DEFAULT_SERDES )continue ;DEBUG_INIT_S (" | " );DEBUG_INIT_D (hws_get_physical_serdes_num (lane_num),1 ); -DEBUG_INIT_S (" | " ); +DEBUG_INIT_S (" | " );DEBUG_INIT_D (serdes_map[lane_num].serdes_speed,2 ); -DEBUG_INIT_S (" | " ); +DEBUG_INIT_S (" | " );DEBUG_INIT_S ((char *) serdes_type_to_string[serdes_map[lane_num]. serdes_type]);
Signature · 1 line
2.25.0
PATCH v6 2/12 arm: mvebu: solidrun: remove hardcoded DTS MAC address
In reply to Joel JohnsonUsing a consistent hardcoded MAC address from the DTS file causes issues when using multiple devices on the same network segment. Instead rely on environment configuration or random generation.
---
v2 changes:
- none
v3 changes:
- none
v4 changes:
- none
v5 changes:
- none
v6 changes:
- none
--- arch/arm/dts/armada-38x-solidrun-microsom.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm/dts/armada-38x-solidrun-microsom.dtsi +0 -1
@@ -39,7 +39,6 @@ ð0 { /* ethernet at 70000 */ - mac-address = [00 50 43 02 02 01]; pinctrl-0 = <&ge0_rgmii_pins>; pinctrl-names = "default"; phy = <&phy_dedicated>;
Signature · 1 line
2.25.0
PATCH v6 3/12 arm: mvebu: clearfog: use Pro name by default
In reply to Joel JohnsonMake the board version printed indicate the Pro variant default. Also adjust static name casing to match what is expected for EEPROM product name to share string constants.
---
v4 changes:
- newly added
v5 changes:
- none
v6 changes:
- none
--- board/solidrun/clearfog/clearfog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
board/solidrun/clearfog/clearfog.c +1 -1
@@ -170,7 +170,7 @@ int board_init(void)int checkboard (void ) { -char *board ="ClearFog" ; +char *board ="Clearfog Pro" ;cf_read_tlv_data ();if (strlen (cf_tlv_data.tlv_product_name[0 ]) >0 )
Signature · 1 line
2.25.0
PATCH v6 4/12 arm: mvebu: clearfog: initial ClearFog Base variant
In reply to Joel JohnsonAdd a unique entry for ClearFog Base variant, reflected in the board name and adjusted SerDes topology.
---
v2 changes:
- reworked based on Baruch's run-time TLV EEPROM detection series
v3 changes:
- rebased on mvebu merged run-time TLV EEPROM detection series
- minor update to help test regarding runtime detection failures
v4 changes:
- use runtime static config adjust instead of #ifdef in cases where hardware EEPROM detection fails or is disabled in build
SPL size change for defconfig increases 36 bytes (122893 to 122929) SPL size change for defconfig+Base increases 60 bytes (122893 to 122953)
- add placeholder support for EEPROM based Clearfog Pro, based on initial name confirmation from Baruch. I wanted to include the check at least in the patch for review to indicate expected usage to ensure that a Clearfog Pro EEPROM device boots correctly even if the image is built with Base static configuration. If there are other prerelease concerns and this should be added separately later, I'd be fine with that too.
- Note that this approach *does not* currently provide any mechanism for EEPROM detected boards to have their SFP speed changed or switch between PCIE/SATA signalling. I'm assuming that will be done based on hardware detection, but confirmation/acceptance in review would be appreciated so it can be revisited if needed.
v5 changes:
- only make Base variant adjustment based on runtime configuration
v6 changes:
- print console message when falling back to static default; this would be nice to issue separate messages for the cause (no EEPROM detected, not compiled in, no matching product name) but that is better done as a separate changeset
--- arch/arm/mach-mvebu/Kconfig | 2 ++ board/solidrun/clearfog/Kconfig | 18 ++++++++++++++ board/solidrun/clearfog/clearfog.c | 38 +++++++++++++++++++++++++----- 3 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 board/solidrun/clearfog/Kconfig
arch/arm/mach-mvebu/Kconfig +2 -0
@@ -280,4 +280,6 @@ config SECURED_MODE_CSK_INDEX default 0 depends on SECURED_MODE_IMAGE +source "board/solidrun/clearfog/Kconfig" + endif
board/solidrun/clearfog/Kconfig new file +18 -0
@@ -0,0 +1,18 @@ +menu "ClearFog configuration" + depends on TARGET_CLEARFOG + +config TARGET_CLEARFOG_BASE + bool "Use ClearFog Base static configuration" + help + Use the ClearFog Base as the static configuration instead of the + default which uses the ClearFog Pro. + + Runtime board detection is always attempted and used if available. The + static configuration is used as a fallback in cases where runtime + detection is disabled, is not available in hardware, or otherwise fails. + + Only newer revisions of the ClearFog product line support runtime + detection via additional EEPROM hardware. This option enables selecting + the Base variant for older hardware revisions. + +endmenu
board/solidrun/clearfog/clearfog.c +32 -6
@@ -42,6 +42,7 @@ static void cf_read_tlv_data(void)read_tlv_data (&cf_tlv_data); } +/* The starting board_serdes_map reflects original Clearfog Pro usage */ static struct serdes_map board_serdes_map[] = { {SATA0 ,SERDES_SPEED_3_GBPS ,SERDES_DEFAULT_MODE ,0 ,0 }, {SGMII1 ,SERDES_SPEED_1_25_GBPS ,SERDES_DEFAULT_MODE ,0 ,0 },
@@ -51,6 +52,13 @@ static struct serdes_map board_serdes_map[] = { {SGMII2, SERDES_SPEED_1_25_GBPS, SERDES_DEFAULT_MODE, 0, 0}, }; +void config_cfbase_serdes_map (void ) +{ + board_serdes_map[4 ].serdes_type =USB3_HOST0 ; + board_serdes_map[4 ].serdes_speed =SERDES_SPEED_5_GBPS ; + board_serdes_map[4 ].serdes_mode =SERDES_DEFAULT_MODE ; +} +int hws_board_topology_load (struct serdes_map **serdes_map_array,u8 *count) {cf_read_tlv_data ();
@@ -59,12 +67,26 @@ int hws_board_topology_load(struct serdes_map **serdes_map_array, u8 *count) board_serdes_map[0 ].serdes_type =PEX0 ; board_serdes_map[0 ].serdes_speed =SERDES_SPEED_5_GBPS ; board_serdes_map[0 ].serdes_mode =PEX_ROOT_COMPLEX_X1 ; - } - -if (sr_product_is (&cf_tlv_data,"Clearfog Base" )) { - board_serdes_map[4 ].serdes_type =USB3_HOST0 ; - board_serdes_map[4 ].serdes_speed =SERDES_SPEED_5_GBPS ; - board_serdes_map[4 ].serdes_mode =SERDES_DEFAULT_MODE ; + }else if (sr_product_is (&cf_tlv_data,"Clearfog Pro" )) { +/* handle recognized product as noop, no adjustment required */ + }else if (sr_product_is (&cf_tlv_data,"Clearfog Base" )) { +config_cfbase_serdes_map (); + }else { +/* +* Fallback to static default. EEPROM TLV support is not +* enabled, runtime detection failed, hardware support is not +* present, EEPROM is corrupt, or an unrecognized product name +* is present. +*/ +if (IS_ENABLED (CONFIG_SPL_CMD_TLV_EEPROM )) +puts ("EEPROM TLV detection failed: " ); +puts ("Using static config for " ); +if (IS_ENABLED (CONFIG_TARGET_CLEARFOG_BASE )) { +puts ("Clearfog Base.\n" ); +config_cfbase_serdes_map (); + }else { +puts ("Clearfog Pro.\n" ); + } } *serdes_map_array = board_serdes_map;
@@ -171,6 +193,8 @@ int board_init(void)int checkboard (void ) {char *board ="Clearfog Pro" ; +if (IS_ENABLED (CONFIG_TARGET_CLEARFOG_BASE )) + board ="Clearfog Base" ;cf_read_tlv_data ();if (strlen (cf_tlv_data.tlv_product_name[0 ]) >0 )
@@ -200,6 +224,8 @@ int board_late_init(void)env_set ("fdtfile" ,"armada-385-clearfog-gtr-s4.dtb" ); else if (sr_product_is(&cf_tlv_data, "Clearfog GTR L8"))env_set ("fdtfile" ,"armada-385-clearfog-gtr-l8.dtb" ); + else if (IS_ENABLED(CONFIG_TARGET_CLEARFOG_BASE)) + env_set("fdtfile", "armada-388-clearfog-base.dtb");return 0 ; }
Signature · 1 line
2.25.0
PATCH v6 4/12 arm: mvebu: clearfog: initial ClearFog Base variant
Quoted 4 lines · Joel Johnson
Add a unique entry for ClearFog Base variant, reflected in the board name and adjusted SerDes topology.
Signed-off-by Joel Johnson <[email protected]>
Thanks,
Stefan
Quoted 144 lines
---
v2 changes:
- reworked based on Baruch's run-time TLV EEPROM detection series
v3 changes:
- rebased on mvebu merged run-time TLV EEPROM detection series
- minor update to help test regarding runtime detection failures
v4 changes:
- use runtime static config adjust instead of #ifdef in cases where hardware EEPROM detection fails or is disabled in build
SPL size change for defconfig increases 36 bytes (122893 to 122929) SPL size change for defconfig+Base increases 60 bytes (122893 to 122953)
- add placeholder support for EEPROM based Clearfog Pro, based on initial name confirmation from Baruch. I wanted to include the check at least in the patch for review to indicate expected usage to ensure that a Clearfog Pro EEPROM device boots correctly even if the image is built with Base static configuration. If there are other prerelease concerns and this should be added separately later, I'd be fine with that too.
- Note that this approach *does not* currently provide any mechanism for EEPROM detected boards to have their SFP speed changed or switch between PCIE/SATA signalling. I'm assuming that will be done based on hardware detection, but confirmation/acceptance in review would be appreciated so it can be revisited if needed.
v5 changes:
- only make Base variant adjustment based on runtime configuration
v6 changes:
- print console message when falling back to static default; this would be nice to issue separate messages for the cause (no EEPROM detected, not compiled in, no matching product name) but that is better done as a separate changeset--- arch/arm/mach-mvebu/Kconfig | 2 ++ board/solidrun/clearfog/Kconfig | 18 ++++++++++++++ board/solidrun/clearfog/clearfog.c | 38 +++++++++++++++++++++++++----- 3 files changed, 52 insertions(+), 6 deletions(-)create mode 100644 board/solidrun/clearfog/Kconfig
arch/arm/mach-mvebu/Kconfig +2
-0@@ -280,4 +280,6 @@ config SECURED_MODE_CSK_INDEX default 0 depends on SECURED_MODE_IMAGE +source "board/solidrun/clearfog/Kconfig" + endifboard/solidrun/clearfog/Kconfig new file +18
-0@@ -0,0 +1,18 @@ +menu "ClearFog configuration" + depends on TARGET_CLEARFOG + +config TARGET_CLEARFOG_BASE + bool "Use ClearFog Base static configuration" + help + Use the ClearFog Base as the static configuration instead of the + default which uses the ClearFog Pro. + + Runtime board detection is always attempted and used if available. The + static configuration is used as a fallback in cases where runtime + detection is disabled, is not available in hardware, or otherwise fails. + + Only newer revisions of the ClearFog product line support runtime + detection via additional EEPROM hardware. This option enables selecting + the Base variant for older hardware revisions. + +endmenuboard/solidrun/clearfog/clearfog.c +30
-6@@ -42,6 +42,7 @@ static void cf_read_tlv_data(void)read_tlv_data (&cf_tlv_data); } +/* The starting board_serdes_map reflects original Clearfog Pro usage */ static struct serdes_map board_serdes_map[] = { {SATA0 ,SERDES_SPEED_3_GBPS ,SERDES_DEFAULT_MODE ,0 ,0 }, {SGMII1 ,SERDES_SPEED_1_25_GBPS ,SERDES_DEFAULT_MODE ,0 ,0 },@@ -51,6 +52,13 @@ static struct serdes_map board_serdes_map[] = { {SGMII2, SERDES_SPEED_1_25_GBPS, SERDES_DEFAULT_MODE, 0, 0}, }; +void config_cfbase_serdes_map (void ) +{ + board_serdes_map[4 ].serdes_type =USB3_HOST0 ; + board_serdes_map[4 ].serdes_speed =SERDES_SPEED_5_GBPS ; + board_serdes_map[4 ].serdes_mode =SERDES_DEFAULT_MODE ; +} +int hws_board_topology_load (struct serdes_map **serdes_map_array,u8 *count) {cf_read_tlv_data ();@@ -59,12 +67,26 @@ int hws_board_topology_load(struct serdes_map **serdes_map_array, u8 *count) board_serdes_map[0 ].serdes_type =PEX0 ; board_serdes_map[0 ].serdes_speed =SERDES_SPEED_5_GBPS ; board_serdes_map[0 ].serdes_mode =PEX_ROOT_COMPLEX_X1 ; - } - -if (sr_product_is (&cf_tlv_data,"Clearfog Base" )) { - board_serdes_map[4 ].serdes_type =USB3_HOST0 ; - board_serdes_map[4 ].serdes_speed =SERDES_SPEED_5_GBPS ; - board_serdes_map[4 ].serdes_mode =SERDES_DEFAULT_MODE ; + }else if (sr_product_is (&cf_tlv_data,"Clearfog Pro" )) { +/* handle recognized product as noop, no adjustment required */ + }else if (sr_product_is (&cf_tlv_data,"Clearfog Base" )) { +config_cfbase_serdes_map (); + }else { +/* +* Fallback to static default. EEPROM TLV support is not +* enabled, runtime detection failed, hardware support is not +* present, EEPROM is corrupt, or an unrecognized product name +* is present. +*/ +if (IS_ENABLED (CONFIG_SPL_CMD_TLV_EEPROM )) +puts ("EEPROM TLV detection failed: " ); +puts ("Using static config for " ); +if (IS_ENABLED (CONFIG_TARGET_CLEARFOG_BASE )) { +puts ("Clearfog Base.\n" ); +config_cfbase_serdes_map (); + }else { +puts ("Clearfog Pro.\n" ); + } } *serdes_map_array = board_serdes_map;@@ -171,6 +193,8 @@ int board_init(void)int checkboard (void ) {char *board ="Clearfog Pro" ; +if (IS_ENABLED (CONFIG_TARGET_CLEARFOG_BASE )) + board ="Clearfog Base" ;cf_read_tlv_data ();if (strlen (cf_tlv_data.tlv_product_name[0 ]) >0 )
board/solidrun/clearfog/clearfog.c int board_late_init(void) · line 231
Quoted 8 lines
board/solidrun/clearfog/clearfog.c +2
-0@@ -200,6 +224,8 @@ int board_late_init(void)env_set ("fdtfile" ,"armada-385-clearfog-gtr-s4.dtb" ); else if (sr_product_is(&cf_tlv_data, "Clearfog GTR L8"))env_set ("fdtfile" ,"armada-385-clearfog-gtr-l8.dtb" ); + else if (IS_ENABLED(CONFIG_TARGET_CLEARFOG_BASE)) + env_set("fdtfile", "armada-388-clearfog-base.dtb");return 0 ; }
Viele Gr??e,
Stefan
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-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
PATCH v6 5/12 arm: mvebu: clearfog: Add option for 2.5 Gbps SFP
In reply to Joel JohnsonWhile newer Linux kernels provide autoconfiguration of SFP, provide an option for setting in U-Boot Kconfig for use prior to booting.
---
v2 changes:
- fixed help indentation
v3 changes:
- none
v4 changes:
- adjust static SerDes configuration at runtime instead of #ifdef
v5 changes:
- make independent of runtime detection
v6 changes:
- none
--- board/solidrun/clearfog/Kconfig | 7 +++++++ board/solidrun/clearfog/clearfog.c | 5 +++++ 2 files changed, 12 insertions(+)
board/solidrun/clearfog/Kconfig +7 -0
@@ -15,4 +15,11 @@ config TARGET_CLEARFOG_BASE detection via additional EEPROM hardware. This option enables selecting the Base variant for older hardware revisions. +config CLEARFOG_SFP_25GB + bool "Enable 2.5 Gbps mode for SFP" + help + Set the SFP module connection to support 2.5 Gbps transfer speed for the + SGMII connection (requires a supporting SFP). By default, transfer speed + of 1.25 Gbps is used, suitable for a more common 1 Gbps SFP module. + endmenu
board/solidrun/clearfog/clearfog.c +5 -0
@@ -63,6 +63,11 @@ int hws_board_topology_load(struct serdes_map **serdes_map_array, u8 *count) {cf_read_tlv_data (); +/* Apply build configuration options before runtime configuration */ +if (IS_ENABLED (CONFIG_CLEARFOG_SFP_25GB )) + board_serdes_map[5 ].serdes_speed =SERDES_SPEED_3_125_GBPS ; + +/* Apply runtime detection changes */ if (sr_product_is (&cf_tlv_data,"Clearfog GTR" )) { board_serdes_map[0 ].serdes_type =PEX0 ; board_serdes_map[0 ].serdes_speed =SERDES_SPEED_5_GBPS ;
Signature · 1 line
2.25.0
PATCH v6 6/12 arm: mvebu: clearfog: Add SATA mode flags
In reply to Joel JohnsonThe mPCIe slots on ClearFog Pro and ClearFog Base may be alternately configured for SATA usage.
---
v2 changes:
- fixed help indentation
v3 changes:
- none
v4 changes:
- adjust static SerDes configuration at runtime instead of #ifdef
- add setting of swap_rx for SATA (as yet untested on hardware)
v5 changes:
- make independent of runtime detection
v6 change:
- remove code side double check of config consistency
--- board/solidrun/clearfog/Kconfig | 17 +++++++++++++++++ board/solidrun/clearfog/clearfog.c | 14 ++++++++++++++ 2 files changed, 31 insertions(+)
board/solidrun/clearfog/Kconfig +17 -0
@@ -15,6 +15,23 @@ config TARGET_CLEARFOG_BASE detection via additional EEPROM hardware. This option enables selecting the Base variant for older hardware revisions. +config CLEARFOG_CON3_SATA + bool "Use CON3 slot in SATA mode" + help + Use the CON3 port with SATA protocol instead of the default PCIe. + The ClearFog port allows usage of either mSATA or miniPCIe + modules, but the desired protocol must be configured at build + time since it affects the SerDes topology layout. + +config CLEARFOG_CON2_SATA + bool "Use CON2 slot in SATA mode" + depends on !TARGET_CLEARFOG_BASE + help + Use the CON2 port with SATA protocol instead of the default PCIe. + The ClearFog port allows usage of either mSATA or miniPCIe + modules, but the desired protocol must be configured at build + time since it affects the SerDes topology layout. + config CLEARFOG_SFP_25GB bool "Enable 2.5 Gbps mode for SFP" help
board/solidrun/clearfog/clearfog.c +14 -0
@@ -67,6 +67,20 @@ int hws_board_topology_load(struct serdes_map **serdes_map_array, u8 *count)if (IS_ENABLED (CONFIG_CLEARFOG_SFP_25GB )) board_serdes_map[5 ].serdes_speed =SERDES_SPEED_3_125_GBPS ; +if (IS_ENABLED (CONFIG_CLEARFOG_CON2_SATA )) { + board_serdes_map[4 ].serdes_type =SATA2 ; + board_serdes_map[4 ].serdes_speed =SERDES_SPEED_3_GBPS ; + board_serdes_map[4 ].serdes_mode =SERDES_DEFAULT_MODE ; + board_serdes_map[4 ].swap_rx =1 ; + } + +if (IS_ENABLED (CONFIG_CLEARFOG_CON3_SATA )) { + board_serdes_map[2 ].serdes_type =SATA1 ; + board_serdes_map[2 ].serdes_speed =SERDES_SPEED_3_GBPS ; + board_serdes_map[2 ].serdes_mode =SERDES_DEFAULT_MODE ; + board_serdes_map[2 ].swap_rx =1 ; + } +/* Apply runtime detection changes */ if (sr_product_is (&cf_tlv_data,"Clearfog GTR" )) { board_serdes_map[0 ].serdes_type =PEX0 ;
Signature · 1 line
2.25.0
PATCH v6 7/12 arm: mvebu: clearfog: Unify DT selection paths
In reply to Joel JohnsonUnify the location of DT selection into board_late_init instead of split between detection and static configuration paths.
---
v2 changes
- newly added in V2 series based on run-time rebasing
v3 changes
- none
v4 changes
- separate change to explicit pro DT into separate commit
v5 changes
- none
v6 changes
- none
--- board/solidrun/clearfog/clearfog.c | 2 ++ include/configs/clearfog.h | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)
board/solidrun/clearfog/clearfog.c +2 -0
@@ -245,6 +245,8 @@ int board_late_init(void)env_set ("fdtfile" ,"armada-385-clearfog-gtr-l8.dtb" ); else if (IS_ENABLED(CONFIG_TARGET_CLEARFOG_BASE)) env_set("fdtfile", "armada-388-clearfog-base.dtb"); + else + env_set("fdtfile", "armada-388-clearfog.dtb");return 0 ; }
include/configs/clearfog.h +0 -1
@@ -134,7 +134,6 @@#define CONFIG_EXTRA_ENV_SETTINGS \ RELOCATION_LIMITS_ENV_SETTINGS \ LOAD_ADDRESS_ENV_SETTINGS \ - "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ "console=ttyS0,115200\0" \ BOOTENV
Signature · 1 line
2.25.0
PATCH v6 8/12 arm: mvebu: clearfog: add SPI offsets
In reply to Joel JohnsonAdd reasonable default SPI offsets and ENV size when configured to boot from SPI flash.
---
v2 changes:
- none
v3 changes:
- none
v4 changes:
- none
v5 changes:
- none
v6 changes:
- none
There was some reasonable concern raised about duplicating config entries within a board specific config file rather than making board specific configurations within defconfig. This seems to offer a more board localized mechanism to provide platform defaults for core values. As mentioned in the review, this usage seems to match the Kconfig documented intended usage. As noted at
https://www.kernel.org/doc/html/latest/kbuild/kconfig-language.html:
"Default values are not limited to the menu entry where
they are defined. This means the default can be defined somewhere else or be overridden by an earlier definition."
Given that there is some dependency variability with these values I prefer keeping them as Kconfig values, but defer to maintainers. Notably, for the ENV values in this and a later commit, I'm using a pattern already in used several other board configs.
--- board/solidrun/clearfog/Kconfig | 12 ++++++++++++ 1 file changed, 12 insertions(+)
board/solidrun/clearfog/Kconfig +12 -0
@@ -39,4 +39,16 @@ config CLEARFOG_SFP_25GB SGMII connection (requires a supporting SFP). By default, transfer speed of 1.25 Gbps is used, suitable for a more common 1 Gbps SFP module. +config ENV_SECT_SIZE + hex "Environment Sector-Size" + # Use SPI flash erase block size of 4 KiB + default 0x1000 if MVEBU_SPL_BOOT_DEVICE_SPI + # Use optimistic 64 KiB erase block, will vary between actual media + default 0x10000 if MVEBU_SPL_BOOT_DEVICE_MMC + +config SYS_SPI_U_BOOT_OFFS + hex "address of u-boot payload in SPI flash" + default 0x20000 + depends on MVEBU_SPL_BOOT_DEVICE_SPI + endmenu
Signature · 1 line
2.25.0
PATCH v6 9/12 arm: mvebu: enable working default boot support
In reply to Joel JohnsonWith the move to driver model usage, ensure that the required driver support for SPI and MMC booting is available in SPL.
Tested on SolidRun ClearFog devices.
---
v2 changes:
- change "select" for ENV_IS_IN_X to "imply" to allow disabling the default env location and configuring a different one if desired
- remove SPL_DM_GPIO from defconfig, only include if needed for MMC booting
v3 changes:
- none
v4 changes:
- none
v5 changes:
- none
v6 changes:
- none
--- arch/arm/mach-mvebu/Kconfig | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/arm/mach-mvebu/Kconfig +10 -0
@@ -235,9 +235,19 @@ choice config MVEBU_SPL_BOOT_DEVICE_SPI bool "SPI NOR flash" + imply ENV_IS_IN_SPI_FLASH + select SPL_DM_SPI + select SPL_MTD_SUPPORT + select SPL_SPI_FLASH_SUPPORT + select SPL_SPI_LOAD + select SPL_SPI_SUPPORT config MVEBU_SPL_BOOT_DEVICE_MMC bool "SDIO/MMC card" + imply ENV_IS_IN_MMC + # GPIO required for SD card presence detection line + select SPL_DM_GPIO + select SPL_DM_MMC select SPL_LIBDISK_SUPPORT config MVEBU_SPL_BOOT_DEVICE_SATA
Signature · 1 line
2.25.0
PATCH v6 9/12 arm: mvebu: enable working default boot support
Hi Joel,
Quoted 10 lines · Joel Johnson
With the move to driver model usage, ensure that the required driver support for SPI and MMC booting is available in SPL.
Tested on SolidRun ClearFog devices.
Signed-off-by Joel Johnson <[email protected]>Reviewed-by Stefan Roese <[email protected]>---
Quoted 13 lines
v2 changes:
- change "select" forENV_IS_IN_Xto "imply" to allow disabling the default env location and configuring a different one if desired
- removeSPL_DM_GPIOfrom defconfig, only include if needed for MMC booting
v3 changes:
- none
v4 changes:
- none
v5 changes:
- none
v6 changes:
- none
This patch generates multiple warnings on other MVEBU platforms. I've dropped it for now in my upcoming pull request. Please rework the problematic patches (missing in the pull request) and re-send.
Thanks,
Stefan
Quoted 20 lines
--- arch/arm/mach-mvebu/Kconfig | 10 ++++++++++ 1 file changed, 10 insertions(+)arch/arm/mach-mvebu/Kconfig +6
-0@@ -235,9 +235,19 @@ choice config MVEBU_SPL_BOOT_DEVICE_SPI bool "SPI NOR flash" + imply ENV_IS_IN_SPI_FLASH + select SPL_DM_SPI + select SPL_MTD_SUPPORT + select SPL_SPI_FLASH_SUPPORT + select SPL_SPI_LOAD + select SPL_SPI_SUPPORT
arch/arm/mach-mvebu/Kconfig choice · line 253
Quoted 10 lines
arch/arm/mach-mvebu/Kconfig +4
-0config MVEBU_SPL_BOOT_DEVICE_MMC bool "SDIO/MMC card" + imply ENV_IS_IN_MMC + # GPIO required for SD card presence detection line + select SPL_DM_GPIO + select SPL_DM_MMC select SPL_LIBDISK_SUPPORT config MVEBU_SPL_BOOT_DEVICE_SATA
Viele Gr??e,
Stefan
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-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
PATCH v6 9/12 arm: mvebu: enable working default boot support
Quoted 11 lines · Stefan Roese
Hi Joel,
Quoted 8 lines · Joel Johnson
With the move to driver model usage, ensure that the required driver support for SPI and MMC booting is available in SPL.
Tested on SolidRun ClearFog devices.
Signed-off-by Joel Johnson <[email protected]>Reviewed-by Stefan Roese <[email protected]>
Quoted 8 lines
Quoted 1 line
---
This patch generates multiple warnings on other MVEBU platforms. I've dropped it for now in my upcoming pull request. Please rework the problematic patches (missing in the pull request) and re-send.
Thanks,
Stefan
Sure, I'm looking into the changes and will have a new series with the reworked patches in the next couple of days. The warnings really highlighted additional cleanup on mvebu booting and defaults in general which I'm taking a look at.
I'm not too familiar with the multi-target building, but have read up on and am currently using the buildman tool with arm and aarch64 toolsets, and building the entire mvebu target set (21 boards currently). Is this the best way to do the testing and building across multiple boards or is there a different way you'd like the testing to be done in the end?
Somewhat offtopic, what's the best location to which wiki issues should be reported? The page on Patches [1] still describes the old MAKEALL script. I hadn't found the script originally so skipped that step since it wasn't possible. This time, in digging further in source history I found the commit that removed it and referenced buildman. It would be useful for new contributors to update the wiki with a pointer to buildman if that's the desired replacement tool.
Joel
PATCH v6 9/12 arm: mvebu: enable working default boot support
Quoted 18 lines · Joel Johnson
Quoted 17 lines · Stefan Roese
Hi Joel,
Quoted 9 lines · Joel Johnson
With the move to driver model usage, ensure that the required driver support for SPI and MMC booting is available in SPL.
Tested on SolidRun ClearFog devices.
Signed-off-by Joel Johnson <[email protected]>Reviewed-by Stefan Roese <[email protected]>---
This patch generates multiple warnings on other MVEBU platforms. I've dropped it for now in my upcoming pull request. Please rework the problematic patches (missing in the pull request) and re-send.
Quoted 7 lines
Quoted 2 lines
Thanks,
StefanSure, I'm looking into the changes and will have a new series with the reworked patches in the next couple of days. The warnings really highlighted additional cleanup on mvebu booting and defaults in general which I'm taking a look at.
Thanks.
Quoted 5 lines
I'm not too familiar with the multi-target building, but have read up on and am currently using the buildman tool with arm and aarch64 toolsets, and building the entire mvebu target set (21 boards currently). Is this the best way to do the testing and building across multiple boards or is there a different way you'd like the testing to be done in the end?
buildman is the correct tool for this. It can also automatically download all necessary toolchains for other architectures.
Quoted 3 lines
Somewhat offtopic, what's the best location to which wiki issues should be reported? The page on Patches [1] still describes the old MAKEALL script.
This is outdated.
Quoted 5 lines
I hadn't found the script originally so skipped that step since it wasn't possible. This time, in digging further in source history I found the commit that removed it and referenced buildman. It would be useful for new contributors to update the wiki with a pointer to buildman if that's the desired replacement tool.
Could you please work on the wiki with the updated infos? That would be helpful.
Thanks,
Stefan
PATCH v6 10/12 arm: mvebu: clearfog: move ENV params to Kconfig
In reply to Joel JohnsonMigrate the values for ENV_SIZE and ENV_OFFSET into board specific Kconfig defaults so they're more accessible for configuration.
---
v2 changes:
- none
v3 changes:
- none
v4 changes:
- none
v5 changes:
- none
v6 changes:
- none
--- board/solidrun/clearfog/Kconfig | 8 ++++++++ configs/clearfog_defconfig | 2 -- 2 files changed, 8 insertions(+), 2 deletions(-)
board/solidrun/clearfog/Kconfig +8 -0
@@ -39,6 +39,14 @@ config CLEARFOG_SFP_25GB SGMII connection (requires a supporting SFP). By default, transfer speed of 1.25 Gbps is used, suitable for a more common 1 Gbps SFP module. +config ENV_SIZE + hex "Environment Size" + default 0x10000 + +config ENV_OFFSET + hex "Environment offset" + default 0xF0000 + config ENV_SECT_SIZE hex "Environment Sector-Size" # Use SPI flash erase block size of 4 KiB
configs/clearfog_defconfig +0 -2
@@ -9,8 +9,6 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_CLEARFOG=y CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC=y -CONFIG_ENV_SIZE=0x10000 -CONFIG_ENV_OFFSET=0xF0000 CONFIG_DM_GPIO=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y
Signature · 1 line
2.25.0
PATCH v6 11/12 arm: mvebu: clearfog: don't always use SPL MMC
In reply to Joel JohnsonMove MMC booting assuptions from defconfig to Kconfig which includes as needed based on dependent options.
---
v2 changes:
- rebased on master to use Baruch's dynamic MMC/SD offset logic
- update description, will revisit removal of CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC in separate future path if a more viable option is identified
v3 changes:
- none
v4 changes:
- none
v5 changes:
- none
v6 changes:
- none
--- arch/arm/mach-mvebu/Kconfig | 1 + configs/clearfog_defconfig | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-)
arch/arm/mach-mvebu/Kconfig +1 -0
@@ -249,6 +249,7 @@ config MVEBU_SPL_BOOT_DEVICE_MMC select SPL_DM_GPIO select SPL_DM_MMC select SPL_LIBDISK_SUPPORT + select SPL_MMC_SUPPORT config MVEBU_SPL_BOOT_DEVICE_SATA bool "SATA"
configs/clearfog_defconfig +0 -2
@@ -10,7 +10,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_CLEARFOG=y CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC=y CONFIG_DM_GPIO=y -CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 CONFIG_SPL=y
@@ -42,7 +41,6 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y # CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_DEFAULT_DEVICE_TREE="armada-388-clearfog" -CONFIG_ENV_IS_IN_MMC=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_OF_TRANSLATE=y CONFIG_AHCI_MVEBU=y
Signature · 1 line
2.25.0
PATCH v6 11/12 arm: mvebu: clearfog: don't always use SPL MMC
Hi Joel,
Quoted 8 lines · Joel Johnson
Move MMC booting assuptions from defconfig to
Kconfigwhich includes as needed based on dependent options.Signed-off-by Joel Johnson <[email protected]>Reviewed-by Stefan Roese <[email protected]>---
Quoted 13 lines
v2 changes:
- rebased on master to use Baruch's dynamic MMC/SD offset logic
- update description, will revisit removal ofCONFIG_MVEBU_SPL_BOOT_DEVICE_MMCin separate future path if a more viable option is identified
v3 changes:
- none
v4 changes:
- none
v5 changes:
- none
v6 changes:
- none
This generates this warning on (at least) helios4:
...include/configs/helios4.h:105:0: warning: "CONFIG_SPL_MMC_SUPPORT" redefined
#define CONFIG_SPL_MMC_SUPPORT
In file included from ././include/linux/kconfig.h:4:0,
from <command-line>:0:
include/generated/autoconf.h:83:0: note: this is the location of the previous definition
#define CONFIG_SPL_MMC_SUPPORT 1
In file included from include/config.h:5:0,
from include/common.h:16,
from drivers/ddr/marvell/a38x/ddr_ml_wrapper.h:9, from drivers/ddr/marvell/a38x/mv_ddr_topology.c:5:include/configs/helios4.h:105:0: warning: "CONFIG_SPL_MMC_SUPPORT" redefined
#define CONFIG_SPL_MMC_SUPPORT
In file included from ././include/linux/kconfig.h:4:0,
from <command-line>:0:
include/generated/autoconf.h:83:0: note: this is the location of the previous definition
#define CONFIG_SPL_MMC_SUPPORT 1
...
Could you please check and send a new version of this patch?
Please make sure that at least all MVEBU based boards (arm and aarch64) compile clean with your patches applied.
Thanks,
Stefan
Quoted 31 lines
--- arch/arm/mach-mvebu/Kconfig | 1 + configs/clearfog_defconfig | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-)arch/arm/mach-mvebu/Kconfig +1
-0@@ -249,6 +249,7 @@ config MVEBU_SPL_BOOT_DEVICE_MMC select SPL_DM_GPIO select SPL_DM_MMC select SPL_LIBDISK_SUPPORT + select SPL_MMC_SUPPORT config MVEBU_SPL_BOOT_DEVICE_SATA bool "SATA"configs/clearfog_defconfig +0
-1@@ -10,7 +10,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_CLEARFOG=y CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC=y CONFIG_DM_GPIO=y -CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 CONFIG_SPL=y
configs/clearfog_defconfig CONFIG_CMD_CACHE=y · line 46
Quoted 7 lines
configs/clearfog_defconfig +0
-1@@ -42,7 +41,6 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y # CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_DEFAULT_DEVICE_TREE="armada-388-clearfog" -CONFIG_ENV_IS_IN_MMC=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_OF_TRANSLATE=y CONFIG_AHCI_MVEBU=y
Viele Gr??e,
Stefan
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-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
PATCH v6 12/12 arm: mvebu: clearfog: Use Pro DT by default
In reply to Joel JohnsonSwitch to explicitly using the Pro variant DT, which has been available since Linux 4.11.
---
v4 changes:
- new
v5 changes:
- none
v6 changes:
- none
I separated out this change to the end of the series since it drew questioning on prior review. I'd still advocate for making the change, since especially with the additions of static variants and runtime detection, it becomes easier from within a booted kernel to identify the type and version of U-Boot image installed. Without making this change, it becomes less direct to determine an actual Pro vs. Base, vs old U-Boot image maybe supporting some hybrid variant configuration.
Even in the Linux kernel adding of the Pro DTS, it is indicated that it was meant for backwards compatibility.
Except for cases where checking is done directly against the product name from userspace, I don't see downsides even from a compatibility perspective for not making this change. In cases where checking *is* done from userspace, the broadening of the Clearfog product line would seem to mean that userspace checking should be flagged as needing to be udpated as well (or glob/regex matched as needed).
--- board/solidrun/clearfog/clearfog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
board/solidrun/clearfog/clearfog.c +1 -1
@@ -246,7 +246,7 @@ int board_late_init(void)else if (IS_ENABLED (CONFIG_TARGET_CLEARFOG_BASE ))env_set ("fdtfile" ,"armada-388-clearfog-base.dtb" );else -env_set ("fdtfile" ,"armada-388-clearfog.dtb" ); +env_set ("fdtfile" ,"armada-388-clearfog-pro.dtb" );return 0 ; }
Signature · 1 line
2.25.0