| Message ID | 20220118093320.1150-2-pali@kernel.org |
|---|---|
| State | Accepted |
| Commit | f33d67647f8ac1fdb940865053348176d9afe20b |
| Delegated to: | Stefan Roese |
| Headers | show |
| Series | arm: mvebu: Remove comphy_update_map() | expand |
On 1/18/22 10:33, Pali Rohár wrote: > Code in board_fix_fdt() already detects connected MOX modules so there is > no need to have custom comphy_update_map() function for setting serdes > speeds. > > This change sets phy-mode for MOX SFP module (when present) to sgmii. > Comphy driver then sets sgmii serdes speed for this module to 1.25G. > > Signed-off-by: Pali Rohár <pali@kernel.org> Reviewed-by: Stefan Roese <sr@denx.de> Thanks, Stefan > --- > board/CZ.NIC/turris_mox/turris_mox.c | 48 +++++++++------------------- > 1 file changed, 15 insertions(+), 33 deletions(-) > > diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c > index 3eb5cb425606..f0c5aa6a520b 100644 > --- a/board/CZ.NIC/turris_mox/turris_mox.c > +++ b/board/CZ.NIC/turris_mox/turris_mox.c > @@ -21,7 +21,6 @@ > #include <linux/libfdt.h> > #include <linux/string.h> > #include <miiphy.h> > -#include <mvebu/comphy.h> > #include <spi.h> > > #include "mox_sp.h" > @@ -49,6 +48,7 @@ int board_fix_fdt(void *blob) > enum fdt_status status_pcie, status_eth1; > u8 topology[MAX_MOX_MODULES]; > int i, size, ret; > + bool eth1_sgmii; > > /* > * SPI driver is not loaded in driver model yet, but we have to find out > @@ -69,6 +69,7 @@ int board_fix_fdt(void *blob) > > status_pcie = FDT_STATUS_DISABLED; > status_eth1 = FDT_STATUS_DISABLED; > + eth1_sgmii = false; > > for (i = 0; i < MAX_MOX_MODULES; ++i) { > writel(0x0, ARMADA_37XX_SPI_DOUT); > @@ -82,6 +83,10 @@ int board_fix_fdt(void *blob) > > topology[i] &= 0xf; > > + if (topology[i] == MOX_MODULE_SFP && > + status_pcie == FDT_STATUS_DISABLED) > + eth1_sgmii = true; > + > if (topology[i] == MOX_MODULE_SFP || > topology[i] == MOX_MODULE_TOPAZ || > topology[i] == MOX_MODULE_PERIDOT) > @@ -98,6 +103,15 @@ int board_fix_fdt(void *blob) > printf("Cannot set status for eth1 in U-Boot's device tree: %s!\n", > fdt_strerror(ret)); > > + if (eth1_sgmii) { > + ret = fdt_path_offset(blob, "ethernet1"); > + if (ret >= 0) > + ret = fdt_setprop_string(blob, ret, "phy-mode", "sgmii"); > + if (ret < 0) > + printf("Cannot set phy-mode for eth1 to sgmii in U-Boot device tree: %s!\n", > + fdt_strerror(ret)); > + } > + > if (size > 1 && (topology[1] == MOX_MODULE_PCI || > topology[1] == MOX_MODULE_USB3 || > topology[1] == MOX_MODULE_PASSPCI)) > @@ -199,38 +213,6 @@ static int mox_get_topology(const u8 **ptopology, int *psize, int *pis_sd) > return 0; > } > > -int comphy_update_map(struct comphy_map *serdes_map, int count) > -{ > - int ret, i, size, sfpindex = -1, swindex = -1; > - const u8 *topology; > - > - ret = mox_get_topology(&topology, &size, NULL); > - if (ret) > - return ret; > - > - for (i = 0; i < size; ++i) { > - if (topology[i] == MOX_MODULE_SFP && sfpindex == -1) > - sfpindex = i; > - else if ((topology[i] == MOX_MODULE_TOPAZ || > - topology[i] == MOX_MODULE_PERIDOT) && > - swindex == -1) > - swindex = i; > - } > - > - if (sfpindex >= 0 && swindex >= 0) { > - if (sfpindex < swindex) > - serdes_map[0].speed = COMPHY_SPEED_1_25G; > - else > - serdes_map[0].speed = COMPHY_SPEED_3_125G; > - } else if (sfpindex >= 0) { > - serdes_map[0].speed = COMPHY_SPEED_1_25G; > - } else if (swindex >= 0) { > - serdes_map[0].speed = COMPHY_SPEED_3_125G; > - } > - > - return 0; > -} > - > #define SW_SMI_CMD_R(d, r) (0x9800 | (((d) & 0x1f) << 5) | ((r) & 0x1f)) > #define SW_SMI_CMD_W(d, r) (0x9400 | (((d) & 0x1f) << 5) | ((r) & 0x1f)) > > Viele Grüße, Stefan Roese
diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c index 3eb5cb425606..f0c5aa6a520b 100644 --- a/board/CZ.NIC/turris_mox/turris_mox.c +++ b/board/CZ.NIC/turris_mox/turris_mox.c @@ -21,7 +21,6 @@ #include <linux/libfdt.h> #include <linux/string.h> #include <miiphy.h> -#include <mvebu/comphy.h> #include <spi.h> #include "mox_sp.h" @@ -49,6 +48,7 @@ int board_fix_fdt(void *blob) enum fdt_status status_pcie, status_eth1; u8 topology[MAX_MOX_MODULES]; int i, size, ret; + bool eth1_sgmii; /* * SPI driver is not loaded in driver model yet, but we have to find out @@ -69,6 +69,7 @@ int board_fix_fdt(void *blob) status_pcie = FDT_STATUS_DISABLED; status_eth1 = FDT_STATUS_DISABLED; + eth1_sgmii = false; for (i = 0; i < MAX_MOX_MODULES; ++i) { writel(0x0, ARMADA_37XX_SPI_DOUT); @@ -82,6 +83,10 @@ int board_fix_fdt(void *blob) topology[i] &= 0xf; + if (topology[i] == MOX_MODULE_SFP && + status_pcie == FDT_STATUS_DISABLED) + eth1_sgmii = true; + if (topology[i] == MOX_MODULE_SFP || topology[i] == MOX_MODULE_TOPAZ || topology[i] == MOX_MODULE_PERIDOT) @@ -98,6 +103,15 @@ int board_fix_fdt(void *blob) printf("Cannot set status for eth1 in U-Boot's device tree: %s!\n", fdt_strerror(ret)); + if (eth1_sgmii) { + ret = fdt_path_offset(blob, "ethernet1"); + if (ret >= 0) + ret = fdt_setprop_string(blob, ret, "phy-mode", "sgmii"); + if (ret < 0) + printf("Cannot set phy-mode for eth1 to sgmii in U-Boot device tree: %s!\n", + fdt_strerror(ret)); + } + if (size > 1 && (topology[1] == MOX_MODULE_PCI || topology[1] == MOX_MODULE_USB3 || topology[1] == MOX_MODULE_PASSPCI)) @@ -199,38 +213,6 @@ static int mox_get_topology(const u8 **ptopology, int *psize, int *pis_sd) return 0; } -int comphy_update_map(struct comphy_map *serdes_map, int count) -{ - int ret, i, size, sfpindex = -1, swindex = -1; - const u8 *topology; - - ret = mox_get_topology(&topology, &size, NULL); - if (ret) - return ret; - - for (i = 0; i < size; ++i) { - if (topology[i] == MOX_MODULE_SFP && sfpindex == -1) - sfpindex = i; - else if ((topology[i] == MOX_MODULE_TOPAZ || - topology[i] == MOX_MODULE_PERIDOT) && - swindex == -1) - swindex = i; - } - - if (sfpindex >= 0 && swindex >= 0) { - if (sfpindex < swindex) - serdes_map[0].speed = COMPHY_SPEED_1_25G; - else - serdes_map[0].speed = COMPHY_SPEED_3_125G; - } else if (sfpindex >= 0) { - serdes_map[0].speed = COMPHY_SPEED_1_25G; - } else if (swindex >= 0) { - serdes_map[0].speed = COMPHY_SPEED_3_125G; - } - - return 0; -} - #define SW_SMI_CMD_R(d, r) (0x9800 | (((d) & 0x1f) << 5) | ((r) & 0x1f)) #define SW_SMI_CMD_W(d, r) (0x9400 | (((d) & 0x1f) << 5) | ((r) & 0x1f))
Code in board_fix_fdt() already detects connected MOX modules so there is no need to have custom comphy_update_map() function for setting serdes speeds. This change sets phy-mode for MOX SFP module (when present) to sgmii. Comphy driver then sets sgmii serdes speed for this module to 1.25G. Signed-off-by: Pali Rohár <pali@kernel.org> --- board/CZ.NIC/turris_mox/turris_mox.c | 48 +++++++++------------------- 1 file changed, 15 insertions(+), 33 deletions(-)