Corenet/p5040/SGMII:fix the problem for SGMII5/6
PATCH 1/2 Corenet/p5040/SGMII:fix the problem for SGMII5/6
SGMII5/6 and SGMII7/8 are not on the same slot on P5040 according to the serdes protocol.
So it is not proper to organize SGMII5/6 and SGMII7/8 on one bus and SGMII5/6 can't work.
So a new bus SUPER_HYDRA_FM3_SGMII_MDIO is added for SGMII5/6
--- board/freescale/corenet_ds/eth_superhydra.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
board/freescale/corenet_ds/eth_superhydra.c +18 -4
@@ -465,6 +465,8 @@ int board_eth_init(bd_t *bis) "SUPER_HYDRA_FM1_SGMII_MDIO");super_hydra_mdio_init (DEFAULT_FM_MDIO_NAME ,"SUPER_HYDRA_FM2_SGMII_MDIO" ); +super_hydra_mdio_init (DEFAULT_FM_MDIO_NAME , +"SUPER_HYDRA_FM3_SGMII_MDIO" );super_hydra_mdio_init (DEFAULT_FM_TGEC_MDIO_NAME ,"SUPER_HYDRA_FM1_TGEC_MDIO" ); super_hydra_mdio_init(DEFAULT_FM_TGEC_MDIO_NAME,
@@ -654,10 +656,22 @@ int board_eth_init(bd_t *bis)break ; }; -super_hydra_mdio_set_mux ("SUPER_HYDRA_FM2_SGMII_MDIO" , - mdio_mux[i].mask, mdio_mux[i].val); -fm_info_set_mdio (i, -miiphy_get_dev_by_name ("SUPER_HYDRA_FM2_SGMII_MDIO" )); +if (i ==FM2_DTSEC1 || i ==FM2_DTSEC2 ) { +super_hydra_mdio_set_mux ( +"SUPER_HYDRA_FM3_SGMII_MDIO" , + mdio_mux[i].mask, + mdio_mux[i].val); +fm_info_set_mdio (i,miiphy_get_dev_by_name ( +"SUPER_HYDRA_FM3_SGMII_MDIO" )); + }else { +super_hydra_mdio_set_mux ( +"SUPER_HYDRA_FM2_SGMII_MDIO" , + mdio_mux[i].mask, + mdio_mux[i].val); +fm_info_set_mdio (i,miiphy_get_dev_by_name ( +"SUPER_HYDRA_FM2_SGMII_MDIO" )); + } +break ;case PHY_INTERFACE_MODE_RGMII :/*
Signature · 1 line
1.8.0
PATCH 2/2 SGMII:fix PHY addresses for QSGMII Riser Card working in SGMII mode
Fix PHY addresses for QSGMII Riser Card working in SGMII mode on board P3041/P5020/P4080/P5040/B4860.
QSGMII Riser Card can work in SGMII mode, but having the different PHY addresses.
So the following steps should be done:
1. Confirm whether QSGMII Riser Card is used.
2. If yes, set the proper PHY address.
Generally, the function is_qsgmii_riser_card() is for step 1, and set_sgmii_phy() for step 2.
However, there are still some special situations, take P5040 and B4860 as examples, the PHY addresses need to be changed when serdes protocol is changed, so it is necessary to confirm the protocol before setting PHY addresses.
--- board/freescale/b4860qds/b4860qds_qixis.h | 5 +++ board/freescale/b4860qds/eth_b4860qds.c | 18 +++++++++++ board/freescale/corenet_ds/eth_hydra.c | 6 ++++ board/freescale/corenet_ds/eth_p4080.c | 12 +++++++ board/freescale/corenet_ds/eth_superhydra.c | 50 +++++++++++++++++++++++++++++ drivers/net/fm/fm.h | 1 + drivers/net/fm/init.c | 44 +++++++++++++++++++++++++ include/fm_eth.h | 4 +++ 8 files changed, 140 insertions(+)
board/freescale/b4860qds/b4860qds_qixis.h +5 -0
@@ -34,4 +34,9 @@#define QIXIS_SRDS1CLK_122 0x5a#define QIXIS_SRDS1CLK_125 0x5e + +/* SGMII */ +#define PHY_BASE_ADDR 0x18 +#define PORT_NUM 0x04 +#define REGNUM 0x00#endif
board/freescale/b4860qds/eth_b4860qds.c +18 -0
@@ -167,6 +167,8 @@ int board_eth_init(bd_t *bis)struct memac_mdio_info tg_memac_mdio_info;unsigned int i;unsigned int serdes1_prtcl, serdes2_prtcl; +int qsgmii; +struct mii_dev *bus;ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); serdes1_prtcl =in_be32 (&gur->rcwsr[4 ]) &FSL_CORENET2_RCWSR4_SRDS1_PRTCL ;
@@ -317,6 +319,22 @@ int board_eth_init(bd_t *bis)break ; } +/*set PHY address for QSGMII Riser Card on slot2*/ + bus =miiphy_get_dev_by_name (DEFAULT_FM_MDIO_NAME ); + qsgmii =is_qsgmii_riser_card (bus,PHY_BASE_ADDR ,PORT_NUM ,REGNUM ); + +if (qsgmii) { +switch (serdes2_prtcl) { +case 0xb2 : +case 0x8d : +fm_info_set_phy_address (FM1_DTSEC3 ,PHY_BASE_ADDR ); +fm_info_set_phy_address (FM1_DTSEC4 ,PHY_BASE_ADDR +1 ); +break ; +default : +break ; + } + } +for (i =FM1_DTSEC1 ; i <FM1_DTSEC1 +CONFIG_SYS_NUM_FM1_DTSEC ; i++) {int idx = i -FM1_DTSEC1 ;
board/freescale/corenet_ds/eth_hydra.c +6 -0
@@ -92,6 +92,8 @@#define BRDCFG2_REG_GPIO_SEL 0x20 +#define PHY_BASE_ADDR 0x00 +/* * BRDCFG1 mask and value for each MAC *
@@ -384,6 +386,7 @@ int board_eth_init(bd_t *bis)struct tgec_mdio_info tgec_mdio_info;unsigned int i, slot;int lane; +struct mii_dev *bus;printf ("Initializing Fman\n" );
@@ -489,6 +492,9 @@ int board_eth_init(bd_t *bis) } } + bus =miiphy_get_dev_by_name ("HYDRA_SGMII_MDIO" ); +set_sgmii_phy (bus,FM1_DTSEC1 ,CONFIG_SYS_NUM_FM1_DTSEC ,PHY_BASE_ADDR ); +/* * For 10G, we only support one XAUI card per Fman. If present, then we * force its routing and never touch those bits again, which removes the
board/freescale/corenet_ds/eth_p4080.c +12 -0
@@ -53,6 +53,9 @@#define EMI1_MASK 0xc0000000#define EMI2_MASK 0x30000000 +#define PHY_BASE_ADDR 0x00 +#define PHY_BASE_ADDR_SLOT5 0x10 +static int mdio_mux[NUM_FM_PORTS ];static char *mdio_names[16 ] = {
@@ -306,6 +309,7 @@ int board_eth_init(bd_t *bis)int i;struct fsl_pq_mdio_info dtsec_mdio_info;struct tgec_mdio_info tgec_mdio_info; +struct mii_dev *bus;/* Initialize the mdio_mux array so we can recognize empty elements */ for (i =0 ; i <NUM_FM_PORTS ; i++)
@@ -386,6 +390,9 @@ int board_eth_init(bd_t *bis)break ; } } + bus =mii_dev_for_muxval (EMI1_SLOT5 ); +set_sgmii_phy (bus,FM1_DTSEC1 , +CONFIG_SYS_NUM_FM1_DTSEC ,PHY_BASE_ADDR_SLOT5 );for (i =FM1_10GEC1 ; i <FM1_10GEC1 +CONFIG_SYS_NUM_FM1_10GEC ; i++) {int idx = i -FM1_10GEC1 , lane, slot;
@@ -451,6 +458,11 @@ int board_eth_init(bd_t *bis) } } + bus =mii_dev_for_muxval (EMI1_SLOT3 ); +set_sgmii_phy (bus,FM2_DTSEC1 ,CONFIG_SYS_NUM_FM2_DTSEC ,PHY_BASE_ADDR ); + bus =mii_dev_for_muxval (EMI1_SLOT4 ); +set_sgmii_phy (bus,FM2_DTSEC1 ,CONFIG_SYS_NUM_FM2_DTSEC ,PHY_BASE_ADDR ); +for (i =FM2_10GEC1 ; i <FM2_10GEC1 +CONFIG_SYS_NUM_FM2_10GEC ; i++) {int idx = i -FM2_10GEC1 , lane, slot;switch (fm_info_get_enet_if (i)) {
board/freescale/corenet_ds/eth_superhydra.c +50 -0
74 lines not on this page · raw message
drivers/net/fm/fm.h +1 -0
@@ -34,6 +34,7 @@#define TX_PORT_1G_BASE 0x28#define MAX_NUM_TX_PORT_1G CONFIG_SYS_NUM_FM1_DTSEC#define TX_PORT_10G_BASE 0x30 +#define MIIM_TIMEOUT 0xFFFFstruct fm_muram {u32 base;
drivers/net/fm/init.c +44 -0
47 lines not on this page · raw message
include/fm_eth.h +4 -0
@@ -170,5 +170,9 @@ void fm_info_set_phy_address(enum fm_port port, int address);int fm_info_get_phy_address (enum fm_port port);void fm_info_set_mdio (enum fm_port port,struct mii_dev *bus);void fm_disable_port (enum fm_port port); +void set_sgmii_phy (struct mii_dev *bus,enum fm_port base_port, +unsigned int port_num,int phy_base_addr); +int is_qsgmii_riser_card (struct mii_dev *bus,int phy_base_addr, +unsigned int port_num,unsigned regnum);#endif
Signature · 1 line
1.8.0
PATCH 2/2 SGMII:fix PHY addresses for QSGMII Riser Card working in SGMII mode
Quoted 11 lines · Zhao Qiang
Fix PHY addresses for QSGMII Riser Card working in SGMII mode on board P3041/P5020/P4080/P5040/B4860.
QSGMII Riser Card can work in SGMII mode, but having the different PHY addresses.
So the following steps should be done:
1. Confirm whether QSGMII Riser Card is used.
2. If yes, set the proper PHY address.
Generally, the functionis_qsgmii_riser_card()is for step 1, andset_sgmii_phy()for step 2.
Quoted 8 lines
However, there are still some special situations, take P5040 and B4860 as examples, the PHY addresses need to be changed when serdes protocol is changed, so it is necessary to confirm the protocol before setting PHY addresses.
Signed-off-by Zhao Qiang <[email protected]>---
Applied to u-boot-mpc85xx/next, pending merging to u-boot-mpc85xx/master branch.
York
PATCH 1/2 Corenet/p5040/SGMII:fix the problem for SGMII5/6
In reply to Zhao QiangQuoted 9 lines · Zhao Qiang
SGMII5/6 and SGMII7/8 are not on the same slot on P5040 according to the serdes protocol.
So it is not proper to organize SGMII5/6 and SGMII7/8 on one bus and SGMII5/6 can't work.
So a new busSUPER_HYDRA_FM3_SGMII_MDIOis added for SGMII5/6Signed-off-by Zhao Qiang <[email protected]>---
Applied to u-boot-mpc85xx/next, pending merging to u-boot-mpc85xx/master branch.
York