[PATCH 0/2] board: solidrun: clearfog gtr: add serdes configuration
Add missing configuration options for clearog gtr serdes:
1. select between sata and pci-e for serdes 0 2. configure serdes 2 for 2.5Gbps link with managed switch
Signed-off-by: Josua Mayer josua@solid-run.com --- Josua Mayer (2): arm: mvebu: clearfog gtr: add config option to select serdes0 interface board: solidrun: clearfog: fix serdes 1 / eth2 speed for clearfog gtr
board/solidrun/clearfog/Kconfig | 19 +++++++++++++++++++ board/solidrun/clearfog/clearfog.c | 19 ++++++++++++++++--- 2 files changed, 35 insertions(+), 3 deletions(-) --- base-commit: 82750ce44226e5f2b3bbcd79cf7b3ba3dfd3de4d change-id: 20240106-clearfog-gtr-serdes-8a927f496bda
Sincerely,
Clearfog GTR has an assembly option for a SATA connector, CON18. It shares the serdes with mini-pcie connector CON3.
Add new kconfig option to select betweenata and pci, defaulting to pci as it was previously configured in board-file.
Clearfog GTR connects eth2 / serdes 1 to a 2.5Gbps capable ethernet switch port. Linux already configures a fixed-link at speed 2500 from device-tree. Upgrade serdes 1 rate to 3.125Gbps to support a 2.5Gbps network link on Clearfog GTR.
Signed-off-by: Josua Mayer josua@solid-run.com --- board/solidrun/clearfog/Kconfig | 19 +++++++++++++++++++ board/solidrun/clearfog/clearfog.c | 11 ++++++++--- 2 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/board/solidrun/clearfog/Kconfig b/board/solidrun/clearfog/Kconfig index 60d3921307..765d8a6355 100644 --- a/board/solidrun/clearfog/Kconfig +++ b/board/solidrun/clearfog/Kconfig @@ -39,6 +39,25 @@ 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.
+choice CLEARFOG_GTR_SERDES0 + prompt "Select Clearfog GTR SerDes 0 Function" + help + Select function for SerDes 0 which is shared between CON3 and CON18 + for either pci-e or sata. + +config CLEARFOG_GTR_SERDES0_PCIE + bool "PCI-E on CON3" + default y + help + Configure SerDes 0 for PCI-E to enable CON3 mini-PCI-E connector. + +config CLEARFOG_GTR_SERDES0_SATA + bool "SATA on CON18" + help + Configure SerDes 0 for SATA to enable CON18 SATA connector. + +endchoice + config ENV_SIZE hex "Environment Size" default 0x10000 diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c index 6fa2fe5fe3..51c5be518a 100644 --- a/board/solidrun/clearfog/clearfog.c +++ b/board/solidrun/clearfog/clearfog.c @@ -90,9 +90,14 @@ int hws_board_topology_load(struct serdes_map **serdes_map_array, u8 *count)
/* 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; - board_serdes_map[0].serdes_mode = PEX_ROOT_COMPLEX_X1; + if (IS_ENABLED(CONFIG_CLEARFOG_GTR_SERDES0_SATA)) { + /* serdes 0 is sata (like clearfog pro) */ + } else if (IS_ENABLED(CONFIG_CLEARFOG_GTR_SERDES0_PCIE)) { + /* serdes 0 is pci */ + 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; + } } 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")) {
On 1/6/24 18:29, Josua Mayer wrote:
Clearfog GTR has an assembly option for a SATA connector, CON18. It shares the serdes with mini-pcie connector CON3.
Add new kconfig option to select betweenata and pci, defaulting to pci as it was previously configured in board-file.
Clearfog GTR connects eth2 / serdes 1 to a 2.5Gbps capable ethernet switch port. Linux already configures a fixed-link at speed 2500 from device-tree. Upgrade serdes 1 rate to 3.125Gbps to support a 2.5Gbps network link on Clearfog GTR.
Signed-off-by: Josua Mayer josua@solid-run.com
board/solidrun/clearfog/Kconfig | 19 +++++++++++++++++++ board/solidrun/clearfog/clearfog.c | 11 ++++++++--- 2 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/board/solidrun/clearfog/Kconfig b/board/solidrun/clearfog/Kconfig index 60d3921307..765d8a6355 100644 --- a/board/solidrun/clearfog/Kconfig +++ b/board/solidrun/clearfog/Kconfig @@ -39,6 +39,25 @@ 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.
+choice CLEARFOG_GTR_SERDES0
- prompt "Select Clearfog GTR SerDes 0 Function"
- help
Select function for SerDes 0 which is shared between CON3 and CON18for either pci-e or sata.+config CLEARFOG_GTR_SERDES0_PCIE
- bool "PCI-E on CON3"
- default y
After applying this patch I get this warning:
board/solidrun/clearfog/Kconfig:50:warning: defaults for choice values not supported
Could you please take a look?
Thanks, Stefan
- help
Configure SerDes 0 for PCI-E to enable CON3 mini-PCI-E connector.+config CLEARFOG_GTR_SERDES0_SATA
- bool "SATA on CON18"
- help
Configure SerDes 0 for SATA to enable CON18 SATA connector.+endchoice
- config ENV_SIZE hex "Environment Size" default 0x10000
diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c index 6fa2fe5fe3..51c5be518a 100644 --- a/board/solidrun/clearfog/clearfog.c +++ b/board/solidrun/clearfog/clearfog.c @@ -90,9 +90,14 @@ int hws_board_topology_load(struct serdes_map **serdes_map_array, u8 *count)
/* 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;board_serdes_map[0].serdes_mode = PEX_ROOT_COMPLEX_X1;
if (IS_ENABLED(CONFIG_CLEARFOG_GTR_SERDES0_SATA)) {/* serdes 0 is sata (like clearfog pro) */} else if (IS_ENABLED(CONFIG_CLEARFOG_GTR_SERDES0_PCIE)) {/* serdes 0 is pci */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;}
Viele Grüße, Stefan Roese
Hi Stefan,
Am 09.01.24 um 12:45 schrieb Stefan Roese:
+choice CLEARFOG_GTR_SERDES0 + prompt "Select Clearfog GTR SerDes 0 Function" + help + Select function for SerDes 0 which is shared between CON3 and CON18 + for either pci-e or sata.
+config CLEARFOG_GTR_SERDES0_PCIE + bool "PCI-E on CON3" + default y
After applying this patch I get this warning:
board/solidrun/clearfog/Kconfig:50:warning: defaults for choice values not supported
Could you please take a look?
Thank you, I was mistaken about where the default setting belongs, apparently it belongs to the "choice" - not its elements. Will send v2 soon.
Clearfog GTR connects eth2 / serdes 1 to a 2.5Gbps capable ethernet switch port. Linux already configures a fixed-link at speed 2500 from device-tree.
Upgrade serdes 1 rate to 3.125Gbps to support a 2.5Gbps link.
Additionally add comments documenting each serdes' function of clearfog gtr, which are shared with clearfog pro.
Signed-off-by: Josua Mayer josua@solid-run.com --- board/solidrun/clearfog/clearfog.c | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c index 51c5be518a..6977db0a9e 100644 --- a/board/solidrun/clearfog/clearfog.c +++ b/board/solidrun/clearfog/clearfog.c @@ -98,6 +98,14 @@ int hws_board_topology_load(struct serdes_map **serdes_map_array, u8 *count) board_serdes_map[0].serdes_speed = SERDES_SPEED_5_GBPS; board_serdes_map[0].serdes_mode = PEX_ROOT_COMPLEX_X1; } + /* serdes 1 is 2.5Gbps fixed link to ethernet switch */ + board_serdes_map[1].serdes_type = SGMII1; + board_serdes_map[1].serdes_speed = SERDES_SPEED_3_125_GBPS; + board_serdes_map[1].serdes_mode = SERDES_DEFAULT_MODE; + /* serdes 2 is pci (like clearfog pro) */ + /* serdes 3 is usb-3 (like clearfog pro) */ + /* serdes 4 is pci (like clearfog pro) */ + /* serdes 5 is sfp connector (like clearfog pro) */ } 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")) {
participants (2)
-
Josua Mayer -
Stefan Roese