Merge tag 'ti-v2020.07-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti
[oweals/u-boot.git] / board / freescale / t4qds / eth.c
index a49c7d4f15fde64bb17dbab95364fd7c98921733..810868ff39498752ee3e7de9a14d37f82d25177c 100644 (file)
@@ -1,34 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2012 Freescale Semiconductor, Inc.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
  */
 
 #include <common.h>
 #include <command.h>
+#include <fdt_support.h>
+#include <log.h>
+#include <net.h>
 #include <netdev.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
 #include <asm/cache.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_law.h>
-#include <asm/fsl_ddr_sdram.h>
+#include <fsl_ddr_sdram.h>
 #include <asm/fsl_serdes.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
 #include <fsl_mdio.h>
 #include <miiphy.h>
 #include <phy.h>
-#include <asm/fsl_dtsec.h>
+#include <fsl_dtsec.h>
 #include <asm/fsl_serdes.h>
+#include <hwconfig.h>
 #include "../common/qixis.h"
 #include "../common/fman.h"
+#include <linux/libfdt.h>
 
 #include "t4240qds_qixis.h"
 
@@ -52,7 +40,7 @@
 #define EMI1_SLOT4     4
 #define EMI1_SLOT5     5
 #define EMI1_SLOT7     7
-#define EMI2           8 /* tmp, FIXME */
+#define EMI2           8
 /* Slot6 and Slot8 do not have EMI connections */
 
 static int mdio_mux[NUM_FM_PORTS];
@@ -71,6 +59,14 @@ static const char *mdio_names[] = {
 
 static u8 lane_to_slot_fsm1[] = {1, 1, 1, 1, 2, 2, 2, 2};
 static u8 lane_to_slot_fsm2[] = {3, 3, 3, 3, 4, 4, 4, 4};
+static u8 slot_qsgmii_phyaddr[5][4] = {
+       {0, 0, 0, 0},/* not used, to make index match slot No. */
+       {0, 1, 2, 3},
+       {4, 5, 6, 7},
+       {8, 9, 0xa, 0xb},
+       {0xc, 0xd, 0xe, 0xf},
+};
+static u8 qsgmiiphy_fix[NUM_FM_PORTS] = {0};
 
 static const char *t4240qds_mdio_name_for_muxval(u8 muxval)
 {
@@ -160,7 +156,7 @@ static int t4240qds_mdio_init(char *realbusname, u8 muxval)
        bus->read = t4240qds_mdio_read;
        bus->write = t4240qds_mdio_write;
        bus->reset = t4240qds_mdio_reset;
-       sprintf(bus->name, t4240qds_mdio_name_for_muxval(muxval));
+       strcpy(bus->name, t4240qds_mdio_name_for_muxval(muxval));
 
        pmdio->realbus = miiphy_get_dev_by_name(realbusname);
 
@@ -180,21 +176,321 @@ static int t4240qds_mdio_init(char *realbusname, u8 muxval)
 void board_ft_fman_fixup_port(void *blob, char * prop, phys_addr_t pa,
                                enum fm_port port, int offset)
 {
-       if (mdio_mux[port] == EMI1_RGMII)
-               fdt_set_phy_handle(blob, prop, pa, "phy_rgmii");
+       int interface = fm_info_get_enet_if(port);
+       ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
+       u32 prtcl2 = in_be32(&gur->rcwsr[4]) & FSL_CORENET2_RCWSR4_SRDS2_PRTCL;
+
+       prtcl2 >>= FSL_CORENET2_RCWSR4_SRDS2_PRTCL_SHIFT;
+
+       if (interface == PHY_INTERFACE_MODE_SGMII ||
+           interface == PHY_INTERFACE_MODE_QSGMII) {
+               switch (port) {
+               case FM1_DTSEC1:
+                       if (qsgmiiphy_fix[port])
+                               fdt_set_phy_handle(blob, prop, pa,
+                                                  "sgmii_phy21");
+                       break;
+               case FM1_DTSEC2:
+                       if (qsgmiiphy_fix[port])
+                               fdt_set_phy_handle(blob, prop, pa,
+                                                  "sgmii_phy22");
+                       break;
+               case FM1_DTSEC3:
+                       if (qsgmiiphy_fix[port])
+                               fdt_set_phy_handle(blob, prop, pa,
+                                                  "sgmii_phy23");
+                       break;
+               case FM1_DTSEC4:
+                       if (qsgmiiphy_fix[port])
+                               fdt_set_phy_handle(blob, prop, pa,
+                                                  "sgmii_phy24");
+                       break;
+               case FM1_DTSEC6:
+                       if (qsgmiiphy_fix[port])
+                               fdt_set_phy_handle(blob, prop, pa,
+                                                  "sgmii_phy12");
+                       break;
+               case FM1_DTSEC9:
+                       if (qsgmiiphy_fix[port])
+                               fdt_set_phy_handle(blob, prop, pa,
+                                                  "sgmii_phy14");
+                       else
+                               fdt_set_phy_handle(blob, prop, pa,
+                                                  "phy_sgmii4");
+                       break;
+               case FM1_DTSEC10:
+                       if (qsgmiiphy_fix[port])
+                               fdt_set_phy_handle(blob, prop, pa,
+                                                  "sgmii_phy13");
+                       else
+                               fdt_set_phy_handle(blob, prop, pa,
+                                                  "phy_sgmii3");
+                       break;
+               case FM2_DTSEC1:
+                       if (qsgmiiphy_fix[port])
+                               fdt_set_phy_handle(blob, prop, pa,
+                                                  "sgmii_phy41");
+                       break;
+               case FM2_DTSEC2:
+                       if (qsgmiiphy_fix[port])
+                               fdt_set_phy_handle(blob, prop, pa,
+                                                  "sgmii_phy42");
+                       break;
+               case FM2_DTSEC3:
+                       if (qsgmiiphy_fix[port])
+                               fdt_set_phy_handle(blob, prop, pa,
+                                                  "sgmii_phy43");
+                       break;
+               case FM2_DTSEC4:
+                       if (qsgmiiphy_fix[port])
+                               fdt_set_phy_handle(blob, prop, pa,
+                                                  "sgmii_phy44");
+                       break;
+               case FM2_DTSEC6:
+                       if (qsgmiiphy_fix[port])
+                               fdt_set_phy_handle(blob, prop, pa,
+                                                  "sgmii_phy32");
+                       break;
+               case FM2_DTSEC9:
+                       if (qsgmiiphy_fix[port])
+                               fdt_set_phy_handle(blob, prop, pa,
+                                                  "sgmii_phy34");
+                       else
+                               fdt_set_phy_handle(blob, prop, pa,
+                                                  "phy_sgmii12");
+                       break;
+               case FM2_DTSEC10:
+                       if (qsgmiiphy_fix[port])
+                               fdt_set_phy_handle(blob, prop, pa,
+                                                  "sgmii_phy33");
+                       else
+                               fdt_set_phy_handle(blob, prop, pa,
+                                                  "phy_sgmii11");
+                       break;
+               default:
+                       break;
+               }
+       } else if (interface == PHY_INTERFACE_MODE_XGMII &&
+                 ((prtcl2 == 55) || (prtcl2 == 57))) {
+               /*
+                * if the 10G is XFI, check hwconfig to see what is the
+                * media type, there are two types, fiber or copper,
+                * fix the dtb accordingly.
+                */
+               int media_type = 0;
+               struct fixed_link f_link;
+               char lane_mode[20] = {"10GBASE-KR"};
+               char buf[32] = "serdes-2,";
+               int off;
+
+               switch (port) {
+               case FM1_10GEC1:
+                       if (hwconfig_sub("fsl_10gkr_copper", "fm1_10g1")) {
+                               media_type = 1;
+                               fdt_set_phy_handle(blob, prop, pa,
+                                                  "phy_xfi1");
+                               sprintf(buf, "%s%s%s", buf, "lane-a,",
+                                       (char *)lane_mode);
+                       }
+                       break;
+               case FM1_10GEC2:
+                       if (hwconfig_sub("fsl_10gkr_copper", "fm1_10g2")) {
+                               media_type = 1;
+                               fdt_set_phy_handle(blob, prop, pa,
+                                                  "phy_xfi2");
+                               sprintf(buf, "%s%s%s", buf, "lane-b,",
+                                       (char *)lane_mode);
+                       }
+                       break;
+               case FM2_10GEC1:
+                       if (hwconfig_sub("fsl_10gkr_copper", "fm2_10g1")) {
+                               media_type = 1;
+                               fdt_set_phy_handle(blob, prop, pa,
+                                                  "phy_xfi3");
+                               sprintf(buf, "%s%s%s", buf, "lane-d,",
+                                       (char *)lane_mode);
+                       }
+                       break;
+               case FM2_10GEC2:
+                       if (hwconfig_sub("fsl_10gkr_copper", "fm2_10g2")) {
+                               media_type = 1;
+                               fdt_set_phy_handle(blob, prop, pa,
+                                                  "phy_xfi4");
+                               sprintf(buf, "%s%s%s", buf, "lane-c,",
+                                       (char *)lane_mode);
+                       }
+                       break;
+               default:
+                       return;
+               }
 
-       /* TODO: will do with dts */
+               if (!media_type) {
+                       /* fixed-link is used for XFI fiber cable */
+                       fdt_delprop(blob, offset, "phy-handle");
+                       f_link.phy_id = port;
+                       f_link.duplex = 1;
+                       f_link.link_speed = 10000;
+                       f_link.pause = 0;
+                       f_link.asym_pause = 0;
+                       fdt_setprop(blob, offset, "fixed-link", &f_link,
+                                   sizeof(f_link));
+               } else {
+                       /* set property for copper cable */
+                       off = fdt_node_offset_by_compat_reg(blob,
+                                       "fsl,fman-memac-mdio", pa + 0x1000);
+                       fdt_setprop_string(blob, off, "lane-instance", buf);
+               }
+       }
 }
 
 void fdt_fixup_board_enet(void *fdt)
 {
-       /* TODO: will do with dts */
+       int i;
+       ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
+       u32 prtcl2 = in_be32(&gur->rcwsr[4]) & FSL_CORENET2_RCWSR4_SRDS2_PRTCL;
+
+       prtcl2 >>= FSL_CORENET2_RCWSR4_SRDS2_PRTCL_SHIFT;
+       for (i = FM1_DTSEC1; i < NUM_FM_PORTS; i++) {
+               switch (fm_info_get_enet_if(i)) {
+               case PHY_INTERFACE_MODE_SGMII:
+               case PHY_INTERFACE_MODE_QSGMII:
+                       switch (mdio_mux[i]) {
+                       case EMI1_SLOT1:
+                               fdt_status_okay_by_alias(fdt, "emi1_slot1");
+                               break;
+                       case EMI1_SLOT2:
+                               fdt_status_okay_by_alias(fdt, "emi1_slot2");
+                               break;
+                       case EMI1_SLOT3:
+                               fdt_status_okay_by_alias(fdt, "emi1_slot3");
+                               break;
+                       case EMI1_SLOT4:
+                               fdt_status_okay_by_alias(fdt, "emi1_slot4");
+                               break;
+                       default:
+                               break;
+                       }
+                       break;
+               case PHY_INTERFACE_MODE_XGMII:
+                       /* check if it's XFI interface for 10g */
+                       if ((prtcl2 == 55) || (prtcl2 == 57)) {
+                               if (i == FM1_10GEC1 && hwconfig_sub(
+                                       "fsl_10gkr_copper", "fm1_10g1"))
+                                       fdt_status_okay_by_alias(
+                                       fdt, "xfi_pcs_mdio1");
+                               if (i == FM1_10GEC2 && hwconfig_sub(
+                                       "fsl_10gkr_copper", "fm1_10g2"))
+                                       fdt_status_okay_by_alias(
+                                       fdt, "xfi_pcs_mdio2");
+                               if (i == FM2_10GEC1 && hwconfig_sub(
+                                       "fsl_10gkr_copper", "fm2_10g1"))
+                                       fdt_status_okay_by_alias(
+                                       fdt, "xfi_pcs_mdio3");
+                               if (i == FM2_10GEC2 && hwconfig_sub(
+                                       "fsl_10gkr_copper", "fm2_10g2"))
+                                       fdt_status_okay_by_alias(
+                                       fdt, "xfi_pcs_mdio4");
+                               break;
+                       }
+                       switch (i) {
+                       case FM1_10GEC1:
+                               fdt_status_okay_by_alias(fdt, "emi2_xauislot1");
+                               break;
+                       case FM1_10GEC2:
+                               fdt_status_okay_by_alias(fdt, "emi2_xauislot2");
+                               break;
+                       case FM2_10GEC1:
+                               fdt_status_okay_by_alias(fdt, "emi2_xauislot3");
+                               break;
+                       case FM2_10GEC2:
+                               fdt_status_okay_by_alias(fdt, "emi2_xauislot4");
+                               break;
+                       default:
+                               break;
+                       }
+                       break;
+               default:
+                       break;
+               }
+       }
+}
+
+static void initialize_qsgmiiphy_fix(void)
+{
+       int i;
+       unsigned short reg;
+
+       for (i = 1; i <= 4; i++) {
+               /*
+                * Try to read if a SGMII card is used, we do it slot by slot.
+                * if a SGMII PHY address is valid on a slot, then we mark
+                * all ports on the slot, then fix the PHY address for the
+                * marked port when doing dtb fixup.
+                */
+               if (miiphy_read(mdio_names[i],
+                               SGMII_CARD_PORT1_PHY_ADDR, MII_PHYSID2, &reg) != 0) {
+                       debug("Slot%d PHY ID register 2 read failed\n", i);
+                       continue;
+               }
+
+               debug("Slot%d MII_PHYSID2 @ 0x1c= 0x%04x\n", i, reg);
+
+               if (reg == 0xFFFF) {
+                       /* No physical device present at this address */
+                       continue;
+               }
+
+               switch (i) {
+               case 1:
+                       qsgmiiphy_fix[FM1_DTSEC5] = 1;
+                       qsgmiiphy_fix[FM1_DTSEC6] = 1;
+                       qsgmiiphy_fix[FM1_DTSEC9] = 1;
+                       qsgmiiphy_fix[FM1_DTSEC10] = 1;
+                       slot_qsgmii_phyaddr[1][0] =  SGMII_CARD_PORT1_PHY_ADDR;
+                       slot_qsgmii_phyaddr[1][1] =  SGMII_CARD_PORT2_PHY_ADDR;
+                       slot_qsgmii_phyaddr[1][2] =  SGMII_CARD_PORT3_PHY_ADDR;
+                       slot_qsgmii_phyaddr[1][3] =  SGMII_CARD_PORT4_PHY_ADDR;
+                       break;
+               case 2:
+                       qsgmiiphy_fix[FM1_DTSEC1] = 1;
+                       qsgmiiphy_fix[FM1_DTSEC2] = 1;
+                       qsgmiiphy_fix[FM1_DTSEC3] = 1;
+                       qsgmiiphy_fix[FM1_DTSEC4] = 1;
+                       slot_qsgmii_phyaddr[2][0] =  SGMII_CARD_PORT1_PHY_ADDR;
+                       slot_qsgmii_phyaddr[2][1] =  SGMII_CARD_PORT2_PHY_ADDR;
+                       slot_qsgmii_phyaddr[2][2] =  SGMII_CARD_PORT3_PHY_ADDR;
+                       slot_qsgmii_phyaddr[2][3] =  SGMII_CARD_PORT4_PHY_ADDR;
+                       break;
+               case 3:
+                       qsgmiiphy_fix[FM2_DTSEC5] = 1;
+                       qsgmiiphy_fix[FM2_DTSEC6] = 1;
+                       qsgmiiphy_fix[FM2_DTSEC9] = 1;
+                       qsgmiiphy_fix[FM2_DTSEC10] = 1;
+                       slot_qsgmii_phyaddr[3][0] =  SGMII_CARD_PORT1_PHY_ADDR;
+                       slot_qsgmii_phyaddr[3][1] =  SGMII_CARD_PORT2_PHY_ADDR;
+                       slot_qsgmii_phyaddr[3][2] =  SGMII_CARD_PORT3_PHY_ADDR;
+                       slot_qsgmii_phyaddr[3][3] =  SGMII_CARD_PORT4_PHY_ADDR;
+                       break;
+               case 4:
+                       qsgmiiphy_fix[FM2_DTSEC1] = 1;
+                       qsgmiiphy_fix[FM2_DTSEC2] = 1;
+                       qsgmiiphy_fix[FM2_DTSEC3] = 1;
+                       qsgmiiphy_fix[FM2_DTSEC4] = 1;
+                       slot_qsgmii_phyaddr[4][0] =  SGMII_CARD_PORT1_PHY_ADDR;
+                       slot_qsgmii_phyaddr[4][1] =  SGMII_CARD_PORT2_PHY_ADDR;
+                       slot_qsgmii_phyaddr[4][2] =  SGMII_CARD_PORT3_PHY_ADDR;
+                       slot_qsgmii_phyaddr[4][3] =  SGMII_CARD_PORT4_PHY_ADDR;
+                       break;
+               default:
+                       break;
+               }
+       }
 }
 
 int board_eth_init(bd_t *bis)
 {
 #if defined(CONFIG_FMAN_ENET)
-       int i;
+       int i, idx, lane, slot, interface;
        struct memac_mdio_info dtsec_mdio_info;
        struct memac_mdio_info tgec_mdio_info;
        ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
@@ -236,6 +532,7 @@ int board_eth_init(bd_t *bis)
        t4240qds_mdio_init(DEFAULT_FM_MDIO_NAME, EMI1_SLOT7);
        t4240qds_mdio_init(DEFAULT_FM_TGEC_MDIO_NAME, EMI2);
 
+       initialize_qsgmiiphy_fix();
 
        switch (srds_prtcl_s1) {
        case 1:
@@ -245,47 +542,57 @@ int board_eth_init(bd_t *bis)
                fm_info_set_phy_address(FM1_10GEC1, FM1_10GEC1_PHY_ADDR);
                fm_info_set_phy_address(FM1_10GEC2, FM1_10GEC2_PHY_ADDR);
                break;
+       case 27:
        case 28:
+       case 35:
        case 36:
                /* SGMII in Slot1 and Slot2 */
-               fm_info_set_phy_address(FM1_DTSEC1, SGMII_CARD_PORT1_PHY_ADDR);
-               fm_info_set_phy_address(FM1_DTSEC2, SGMII_CARD_PORT2_PHY_ADDR);
-               fm_info_set_phy_address(FM1_DTSEC3, SGMII_CARD_PORT3_PHY_ADDR);
-               fm_info_set_phy_address(FM1_DTSEC4, SGMII_CARD_PORT4_PHY_ADDR);
-               fm_info_set_phy_address(FM1_DTSEC5, SGMII_CARD_PORT1_PHY_ADDR);
-               fm_info_set_phy_address(FM1_DTSEC6, SGMII_CARD_PORT2_PHY_ADDR);
-               if ((srds_prtcl_s2 != 56) && (srds_prtcl_s2 != 57)) {
+               fm_info_set_phy_address(FM1_DTSEC1, slot_qsgmii_phyaddr[2][0]);
+               fm_info_set_phy_address(FM1_DTSEC2, slot_qsgmii_phyaddr[2][1]);
+               fm_info_set_phy_address(FM1_DTSEC3, slot_qsgmii_phyaddr[2][2]);
+               fm_info_set_phy_address(FM1_DTSEC4, slot_qsgmii_phyaddr[2][3]);
+               fm_info_set_phy_address(FM1_DTSEC5, slot_qsgmii_phyaddr[1][0]);
+               fm_info_set_phy_address(FM1_DTSEC6, slot_qsgmii_phyaddr[1][1]);
+               if ((srds_prtcl_s2 != 55) && (srds_prtcl_s2 != 57)) {
                        fm_info_set_phy_address(FM1_DTSEC9,
-                                               SGMII_CARD_PORT4_PHY_ADDR);
+                                               slot_qsgmii_phyaddr[1][3]);
                        fm_info_set_phy_address(FM1_DTSEC10,
-                                               SGMII_CARD_PORT3_PHY_ADDR);
+                                               slot_qsgmii_phyaddr[1][2]);
                }
                break;
+       case 37:
        case 38:
-               fm_info_set_phy_address(FM1_DTSEC5, QSGMII_CARD_PHY_ADDR);
-               fm_info_set_phy_address(FM1_DTSEC6, QSGMII_CARD_PHY_ADDR);
-               if ((srds_prtcl_s2 != 56) && (srds_prtcl_s2 != 57)) {
+               fm_info_set_phy_address(FM1_DTSEC1, slot_qsgmii_phyaddr[2][0]);
+               fm_info_set_phy_address(FM1_DTSEC2, slot_qsgmii_phyaddr[2][1]);
+               fm_info_set_phy_address(FM1_DTSEC3, slot_qsgmii_phyaddr[2][2]);
+               fm_info_set_phy_address(FM1_DTSEC4, slot_qsgmii_phyaddr[2][3]);
+               fm_info_set_phy_address(FM1_DTSEC5, slot_qsgmii_phyaddr[1][0]);
+               fm_info_set_phy_address(FM1_DTSEC6, slot_qsgmii_phyaddr[1][1]);
+               if ((srds_prtcl_s2 != 55) && (srds_prtcl_s2 != 57)) {
                        fm_info_set_phy_address(FM1_DTSEC9,
-                                               QSGMII_CARD_PHY_ADDR);
+                                               slot_qsgmii_phyaddr[1][2]);
                        fm_info_set_phy_address(FM1_DTSEC10,
-                                               QSGMII_CARD_PHY_ADDR);
+                                               slot_qsgmii_phyaddr[1][3]);
                }
                break;
+       case 39:
        case 40:
+       case 45:
        case 46:
+       case 47:
        case 48:
-               fm_info_set_phy_address(FM1_DTSEC5, SGMII_CARD_PORT1_PHY_ADDR);
-               fm_info_set_phy_address(FM1_DTSEC6, SGMII_CARD_PORT2_PHY_ADDR);
-               if ((srds_prtcl_s2 != 56) && (srds_prtcl_s2 != 57)) {
+               fm_info_set_phy_address(FM1_DTSEC5, slot_qsgmii_phyaddr[1][0]);
+               fm_info_set_phy_address(FM1_DTSEC6, slot_qsgmii_phyaddr[1][1]);
+               if ((srds_prtcl_s2 != 55) && (srds_prtcl_s2 != 57)) {
                        fm_info_set_phy_address(FM1_DTSEC10,
-                                               SGMII_CARD_PORT3_PHY_ADDR);
+                                               slot_qsgmii_phyaddr[1][2]);
                        fm_info_set_phy_address(FM1_DTSEC9,
-                                               SGMII_CARD_PORT4_PHY_ADDR);
+                                               slot_qsgmii_phyaddr[1][3]);
                }
-               fm_info_set_phy_address(FM1_DTSEC1, QSGMII_CARD_PHY_ADDR);
-               fm_info_set_phy_address(FM1_DTSEC2, QSGMII_CARD_PHY_ADDR);
-               fm_info_set_phy_address(FM1_DTSEC3, QSGMII_CARD_PHY_ADDR);
-               fm_info_set_phy_address(FM1_DTSEC4, QSGMII_CARD_PHY_ADDR);
+               fm_info_set_phy_address(FM1_DTSEC1, slot_qsgmii_phyaddr[2][0]);
+               fm_info_set_phy_address(FM1_DTSEC2, slot_qsgmii_phyaddr[2][1]);
+               fm_info_set_phy_address(FM1_DTSEC3, slot_qsgmii_phyaddr[2][2]);
+               fm_info_set_phy_address(FM1_DTSEC4, slot_qsgmii_phyaddr[2][3]);
                break;
        default:
                puts("Invalid SerDes1 protocol for T4240QDS\n");
@@ -293,16 +600,32 @@ int board_eth_init(bd_t *bis)
        }
 
        for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CONFIG_SYS_NUM_FM1_DTSEC; i++) {
-               int idx = i - FM1_DTSEC1, lane, slot;
-               switch (fm_info_get_enet_if(i)) {
+               idx = i - FM1_DTSEC1;
+               interface = fm_info_get_enet_if(i);
+               switch (interface) {
                case PHY_INTERFACE_MODE_SGMII:
-                       lane = serdes_get_first_lane(FSL_SRDS_1,
+               case PHY_INTERFACE_MODE_QSGMII:
+                       if (interface == PHY_INTERFACE_MODE_QSGMII) {
+                               if (idx <= 3)
+                                       lane = serdes_get_first_lane(FSL_SRDS_1,
+                                                       QSGMII_FM1_A);
+                               else
+                                       lane = serdes_get_first_lane(FSL_SRDS_1,
+                                                       QSGMII_FM1_B);
+                               if (lane < 0)
+                                       break;
+                               slot = lane_to_slot_fsm1[lane];
+                               debug("FM1@DTSEC%u expects QSGMII in slot %u\n",
+                                     idx + 1, slot);
+                       } else {
+                               lane = serdes_get_first_lane(FSL_SRDS_1,
                                                SGMII_FM1_DTSEC1 + idx);
-                       if (lane < 0)
-                               break;
-                       slot = lane_to_slot_fsm1[lane];
-                       debug("FM1@DTSEC%u expects SGMII in slot %u\n",
-                               idx + 1, slot);
+                               if (lane < 0)
+                                       break;
+                               slot = lane_to_slot_fsm1[lane];
+                               debug("FM1@DTSEC%u expects SGMII in slot %u\n",
+                                     idx + 1, slot);
+                       }
                        if (QIXIS_READ(present2) & (1 << (slot - 1)))
                                fm_disable_port(i);
                        switch (slot) {
@@ -334,8 +657,21 @@ int board_eth_init(bd_t *bis)
        }
 
        for (i = FM1_10GEC1; i < FM1_10GEC1 + CONFIG_SYS_NUM_FM1_10GEC; i++) {
+               idx = i - FM1_10GEC1;
                switch (fm_info_get_enet_if(i)) {
                case PHY_INTERFACE_MODE_XGMII:
+                       if ((srds_prtcl_s2 == 55) || (srds_prtcl_s2 == 57)) {
+                               /* A fake PHY address to make U-Boot happy */
+                               fm_info_set_phy_address(i, i);
+                       } else {
+                               lane = serdes_get_first_lane(FSL_SRDS_1,
+                                               XAUI_FM1_MAC9 + idx);
+                               if (lane < 0)
+                                       break;
+                               slot = lane_to_slot_fsm1[lane];
+                               if (QIXIS_READ(present2) & (1 << (slot - 1)))
+                                       fm_disable_port(i);
+                       }
                        mdio_mux[i] = EMI2;
                        fm_info_set_mdio(i, mii_dev_for_muxval(mdio_mux[i]));
                        break;
@@ -344,7 +680,6 @@ int board_eth_init(bd_t *bis)
                }
        }
 
-
 #if (CONFIG_SYS_NUM_FMAN == 2)
        switch (srds_prtcl_s2) {
        case 1:
@@ -354,78 +689,88 @@ int board_eth_init(bd_t *bis)
                fm_info_set_phy_address(FM2_10GEC1, FM2_10GEC1_PHY_ADDR);
                fm_info_set_phy_address(FM2_10GEC2, FM2_10GEC2_PHY_ADDR);
                break;
+       case 6:
        case 7:
+       case 12:
        case 13:
        case 14:
+       case 15:
        case 16:
+       case 21:
        case 22:
        case 23:
+       case 24:
        case 25:
        case 26:
                /* XAUI/HiGig in Slot3, SGMII in Slot4 */
                fm_info_set_phy_address(FM2_10GEC1, FM2_10GEC1_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC1, SGMII_CARD_PORT1_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC2, SGMII_CARD_PORT2_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC3, SGMII_CARD_PORT3_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC4, SGMII_CARD_PORT4_PHY_ADDR);
+               fm_info_set_phy_address(FM2_DTSEC1, slot_qsgmii_phyaddr[4][0]);
+               fm_info_set_phy_address(FM2_DTSEC2, slot_qsgmii_phyaddr[4][1]);
+               fm_info_set_phy_address(FM2_DTSEC3, slot_qsgmii_phyaddr[4][2]);
+               fm_info_set_phy_address(FM2_DTSEC4, slot_qsgmii_phyaddr[4][3]);
                break;
+       case 27:
        case 28:
+       case 35:
        case 36:
                /* SGMII in Slot3 and Slot4 */
-               fm_info_set_phy_address(FM2_DTSEC1, SGMII_CARD_PORT1_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC2, SGMII_CARD_PORT2_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC3, SGMII_CARD_PORT3_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC4, SGMII_CARD_PORT4_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC5, SGMII_CARD_PORT1_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC6, SGMII_CARD_PORT2_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC9, SGMII_CARD_PORT4_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC10, SGMII_CARD_PORT3_PHY_ADDR);
+               fm_info_set_phy_address(FM2_DTSEC1, slot_qsgmii_phyaddr[4][0]);
+               fm_info_set_phy_address(FM2_DTSEC2, slot_qsgmii_phyaddr[4][1]);
+               fm_info_set_phy_address(FM2_DTSEC3, slot_qsgmii_phyaddr[4][2]);
+               fm_info_set_phy_address(FM2_DTSEC4, slot_qsgmii_phyaddr[4][3]);
+               fm_info_set_phy_address(FM2_DTSEC5, slot_qsgmii_phyaddr[3][0]);
+               fm_info_set_phy_address(FM2_DTSEC6, slot_qsgmii_phyaddr[3][1]);
+               fm_info_set_phy_address(FM2_DTSEC9, slot_qsgmii_phyaddr[3][3]);
+               fm_info_set_phy_address(FM2_DTSEC10, slot_qsgmii_phyaddr[3][2]);
                break;
+       case 37:
        case 38:
                /* QSGMII in Slot3 and Slot4 */
-               fm_info_set_phy_address(FM2_DTSEC1, QSGMII_CARD_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC2, QSGMII_CARD_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC3, QSGMII_CARD_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC4, QSGMII_CARD_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC5, QSGMII_CARD_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC6, QSGMII_CARD_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC9, QSGMII_CARD_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC10, QSGMII_CARD_PHY_ADDR);
+               fm_info_set_phy_address(FM2_DTSEC1, slot_qsgmii_phyaddr[4][0]);
+               fm_info_set_phy_address(FM2_DTSEC2, slot_qsgmii_phyaddr[4][1]);
+               fm_info_set_phy_address(FM2_DTSEC3, slot_qsgmii_phyaddr[4][2]);
+               fm_info_set_phy_address(FM2_DTSEC4, slot_qsgmii_phyaddr[4][3]);
+               fm_info_set_phy_address(FM2_DTSEC5, slot_qsgmii_phyaddr[3][0]);
+               fm_info_set_phy_address(FM2_DTSEC6, slot_qsgmii_phyaddr[3][1]);
+               fm_info_set_phy_address(FM2_DTSEC9, slot_qsgmii_phyaddr[3][2]);
+               fm_info_set_phy_address(FM2_DTSEC10, slot_qsgmii_phyaddr[3][3]);
                break;
+       case 39:
        case 40:
+       case 45:
        case 46:
+       case 47:
        case 48:
                /* SGMII in Slot3 */
-               fm_info_set_phy_address(FM2_DTSEC5, SGMII_CARD_PORT1_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC6, SGMII_CARD_PORT2_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC9, SGMII_CARD_PORT4_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC10, SGMII_CARD_PORT3_PHY_ADDR);
+               fm_info_set_phy_address(FM2_DTSEC5, slot_qsgmii_phyaddr[3][0]);
+               fm_info_set_phy_address(FM2_DTSEC6, slot_qsgmii_phyaddr[3][1]);
+               fm_info_set_phy_address(FM2_DTSEC9, slot_qsgmii_phyaddr[3][3]);
+               fm_info_set_phy_address(FM2_DTSEC10, slot_qsgmii_phyaddr[3][2]);
                /* QSGMII in Slot4 */
-               fm_info_set_phy_address(FM2_DTSEC1, QSGMII_CARD_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC2, QSGMII_CARD_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC3, QSGMII_CARD_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC4, QSGMII_CARD_PHY_ADDR);
+               fm_info_set_phy_address(FM2_DTSEC1, slot_qsgmii_phyaddr[4][0]);
+               fm_info_set_phy_address(FM2_DTSEC2, slot_qsgmii_phyaddr[4][1]);
+               fm_info_set_phy_address(FM2_DTSEC3, slot_qsgmii_phyaddr[4][2]);
+               fm_info_set_phy_address(FM2_DTSEC4, slot_qsgmii_phyaddr[4][3]);
                break;
+       case 49:
        case 50:
+       case 51:
        case 52:
+       case 53:
        case 54:
                fm_info_set_phy_address(FM2_10GEC1, FM2_10GEC1_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC1, QSGMII_CARD_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC2, QSGMII_CARD_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC3, QSGMII_CARD_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC4, QSGMII_CARD_PHY_ADDR);
+               fm_info_set_phy_address(FM2_DTSEC1, slot_qsgmii_phyaddr[4][0]);
+               fm_info_set_phy_address(FM2_DTSEC2, slot_qsgmii_phyaddr[4][1]);
+               fm_info_set_phy_address(FM2_DTSEC3, slot_qsgmii_phyaddr[4][2]);
+               fm_info_set_phy_address(FM2_DTSEC4, slot_qsgmii_phyaddr[4][3]);
                break;
-       case 56:
+       case 55:
        case 57:
                /* XFI in Slot3, SGMII in Slot4 */
-               fm_info_set_phy_address(FM1_10GEC1, XFI_CARD_PORT1_PHY_ADDR);
-               fm_info_set_phy_address(FM1_10GEC2, XFI_CARD_PORT2_PHY_ADDR);
-               fm_info_set_phy_address(FM2_10GEC2, XFI_CARD_PORT3_PHY_ADDR);
-               fm_info_set_phy_address(FM2_10GEC1, XFI_CARD_PORT4_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC1, SGMII_CARD_PORT1_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC2, SGMII_CARD_PORT2_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC3, SGMII_CARD_PORT3_PHY_ADDR);
-               fm_info_set_phy_address(FM2_DTSEC4, SGMII_CARD_PORT4_PHY_ADDR);
+               fm_info_set_phy_address(FM2_DTSEC1, slot_qsgmii_phyaddr[4][0]);
+               fm_info_set_phy_address(FM2_DTSEC2, slot_qsgmii_phyaddr[4][1]);
+               fm_info_set_phy_address(FM2_DTSEC3, slot_qsgmii_phyaddr[4][2]);
+               fm_info_set_phy_address(FM2_DTSEC4, slot_qsgmii_phyaddr[4][3]);
                break;
        default:
                puts("Invalid SerDes2 protocol for T4240QDS\n");
@@ -433,16 +778,32 @@ int board_eth_init(bd_t *bis)
        }
 
        for (i = FM2_DTSEC1; i < FM2_DTSEC1 + CONFIG_SYS_NUM_FM2_DTSEC; i++) {
-               int idx = i - FM2_DTSEC1, lane, slot;
-               switch (fm_info_get_enet_if(i)) {
+               idx = i - FM2_DTSEC1;
+               interface = fm_info_get_enet_if(i);
+               switch (interface) {
                case PHY_INTERFACE_MODE_SGMII:
-                       lane = serdes_get_first_lane(FSL_SRDS_2,
+               case PHY_INTERFACE_MODE_QSGMII:
+                       if (interface == PHY_INTERFACE_MODE_QSGMII) {
+                               if (idx <= 3)
+                                       lane = serdes_get_first_lane(FSL_SRDS_2,
+                                                       QSGMII_FM2_A);
+                               else
+                                       lane = serdes_get_first_lane(FSL_SRDS_2,
+                                                       QSGMII_FM2_B);
+                               if (lane < 0)
+                                       break;
+                               slot = lane_to_slot_fsm2[lane];
+                               debug("FM2@DTSEC%u expects QSGMII in slot %u\n",
+                                     idx + 1, slot);
+                       } else {
+                               lane = serdes_get_first_lane(FSL_SRDS_2,
                                                SGMII_FM2_DTSEC1 + idx);
-                       if (lane < 0)
-                               break;
-                       slot = lane_to_slot_fsm2[lane];
-                       debug("FM2@DTSEC%u expects SGMII in slot %u\n",
-                               idx + 1, slot);
+                               if (lane < 0)
+                                       break;
+                               slot = lane_to_slot_fsm2[lane];
+                               debug("FM2@DTSEC%u expects SGMII in slot %u\n",
+                                     idx + 1, slot);
+                       }
                        if (QIXIS_READ(present2) & (1 << (slot - 1)))
                                fm_disable_port(i);
                        switch (slot) {
@@ -477,8 +838,21 @@ int board_eth_init(bd_t *bis)
        }
 
        for (i = FM2_10GEC1; i < FM2_10GEC1 + CONFIG_SYS_NUM_FM2_10GEC; i++) {
+               idx = i - FM2_10GEC1;
                switch (fm_info_get_enet_if(i)) {
                case PHY_INTERFACE_MODE_XGMII:
+                       if ((srds_prtcl_s2 == 55) || (srds_prtcl_s2 == 57)) {
+                               /* A fake PHY address to make U-Boot happy */
+                               fm_info_set_phy_address(i, i);
+                       } else {
+                               lane = serdes_get_first_lane(FSL_SRDS_2,
+                                               XAUI_FM2_MAC9 + idx);
+                               if (lane < 0)
+                                       break;
+                               slot = lane_to_slot_fsm2[lane];
+                               if (QIXIS_READ(present2) & (1 << (slot - 1)))
+                                       fm_disable_port(i);
+                       }
                        mdio_mux[i] = EMI2;
                        fm_info_set_mdio(i, mii_dev_for_muxval(mdio_mux[i]));
                        break;