Merge tag 'u-boot-rockchip-20200501' of https://gitlab.denx.de/u-boot/custodians...

[platform/kernel/u-boot.git] / drivers / net / fm / init.c

diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c
index ff04695..8669d21 100644 (file)
--- a/drivers/net/fm/init.c
+++ b/drivers/net/fm/init.c
@@ -1,14 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright 2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
+ * Copyright 2011-2015 Freescale Semiconductor, Inc.
  */
+#include <errno.h>
 #include <common.h>
 #include <asm/io.h>
+#include <fdt_support.h>
+#include <fsl_mdio.h>
+#ifdef CONFIG_FSL_LAYERSCAPE
+#include <asm/arch/fsl_serdes.h>
+#else
 #include <asm/fsl_serdes.h>
+#endif
 
 #include "fm.h"
 
+#ifndef CONFIG_DM_ETH
 struct fm_eth_info fm_info[] = {
 #if (CONFIG_SYS_NUM_FM1_DTSEC >= 1)
        FM_DTSEC_INFO_INITIALIZER(1, 1),
@@ -151,7 +158,9 @@ void fm_disable_port(enum fm_port port)
                return;
 
        fm_info[i].enabled = 0;
+#ifndef CONFIG_SYS_FMAN_V3
        fman_disable_port(port);
+#endif
 }
 
 void fm_enable_port(enum fm_port port)
@@ -229,27 +238,33 @@ void board_ft_fman_fixup_port(void *blob, char * prop, phys_addr_t pa,
                                enum fm_port port, int offset)
         __attribute__((weak, alias("__def_board_ft_fman_fixup_port")));
 
-static void ft_fixup_port(void *blob, struct fm_eth_info *info, char *prop)
+int ft_fixup_port(void *blob, struct fm_eth_info *info, char *prop)
 {
        int off;
        uint32_t ph;
        phys_addr_t paddr = CONFIG_SYS_CCSRBAR_PHYS + info->compat_offset;
+#ifndef CONFIG_SYS_FMAN_V3
        u64 dtsec1_addr = (u64)CONFIG_SYS_CCSRBAR_PHYS +
                                CONFIG_SYS_FSL_FM1_DTSEC1_OFFSET;
+#endif
 
        off = fdt_node_offset_by_compat_reg(blob, prop, paddr);
+       if (off == -FDT_ERR_NOTFOUND)
+               return -EINVAL;
 
        if (info->enabled) {
                fdt_fixup_phy_connection(blob, off, info->enet_if);
                board_ft_fman_fixup_port(blob, prop, paddr, info->port, off);
-               return ;
+               return 0;
        }
 
 #ifdef CONFIG_SYS_FMAN_V3
+#ifndef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
        /*
-        * Physically FM1_DTSEC9 and FM1_10GEC1 use the same dual-role MAC, when
-        * FM1_10GEC1 is enabled and  FM1_DTSEC9 is disabled, ensure that the
-        * dual-role MAC is not disabled, ditto for other dual-role MACs.
+        * On T2/T4 SoCs, physically FM1_DTSEC9 and FM1_10GEC1 use the same
+        * dual-role MAC, when FM1_10GEC1 is enabled and  FM1_DTSEC9
+        * is disabled, ensure that the dual-role MAC is not disabled,
+        * ditto for other dual-role MACs.
         */
        if (((info->port == FM1_DTSEC9) && (PORT_IS_ENABLED(FM1_10GEC1)))  ||
            ((info->port == FM1_DTSEC10) && (PORT_IS_ENABLED(FM1_10GEC2))) ||
@@ -266,20 +281,35 @@ static void ft_fixup_port(void *blob, struct fm_eth_info *info, char *prop)
            ((info->port == FM2_10GEC1) && (PORT_IS_ENABLED(FM2_DTSEC9)))       ||
            ((info->port == FM2_10GEC2) && (PORT_IS_ENABLED(FM2_DTSEC10)))
 #endif
+#else
+       /* FM1_DTSECx and FM1_10GECx use the same dual-role MAC */
+       if (((info->port == FM1_DTSEC1) && (PORT_IS_ENABLED(FM1_10GEC1)))  ||
+           ((info->port == FM1_DTSEC2) && (PORT_IS_ENABLED(FM1_10GEC2)))  ||
+           ((info->port == FM1_DTSEC3) && (PORT_IS_ENABLED(FM1_10GEC3)))  ||
+           ((info->port == FM1_DTSEC4) && (PORT_IS_ENABLED(FM1_10GEC4)))  ||
+           ((info->port == FM1_10GEC1) && (PORT_IS_ENABLED(FM1_DTSEC1)))  ||
+           ((info->port == FM1_10GEC2) && (PORT_IS_ENABLED(FM1_DTSEC2)))  ||
+           ((info->port == FM1_10GEC3) && (PORT_IS_ENABLED(FM1_DTSEC3)))  ||
+           ((info->port == FM1_10GEC4) && (PORT_IS_ENABLED(FM1_DTSEC4)))
+#endif
        )
-               return;
+               return 0;
 #endif
        /* board code might have caused offset to change */
        off = fdt_node_offset_by_compat_reg(blob, prop, paddr);
 
+#ifndef CONFIG_SYS_FMAN_V3
        /* Don't disable FM1-DTSEC1 MAC as its used for MDIO */
        if (paddr != dtsec1_addr)
+#endif
                fdt_status_disabled(blob, off); /* disable the MAC node */
 
        /* disable the fsl,dpa-ethernet node that points to the MAC */
        ph = fdt_get_phandle(blob, off);
        do_fixup_by_prop(blob, "fsl,fman-mac", &ph, sizeof(ph),
                "status", "disabled", strlen("disabled") + 1, 1);
+
+       return 0;
 }
 
 void fdt_fixup_fman_ethernet(void *blob)
@@ -291,10 +321,19 @@ void fdt_fixup_fman_ethernet(void *blob)
                ft_fixup_port(blob, &fm_info[i], "fsl,fman-memac");
 #else
        for (i = 0; i < ARRAY_SIZE(fm_info); i++) {
-               if (fm_info[i].type == FM_ETH_1G_E)
-                       ft_fixup_port(blob, &fm_info[i], "fsl,fman-1g-mac");
-               else
-                       ft_fixup_port(blob, &fm_info[i], "fsl,fman-10g-mac");
+               /* Try the new compatible first.
+                * If the node is missing, try the old.
+                */
+               if (fm_info[i].type == FM_ETH_1G_E) {
+                       if (ft_fixup_port(blob, &fm_info[i], "fsl,fman-dtsec"))
+                               ft_fixup_port(blob, &fm_info[i],
+                                             "fsl,fman-1g-mac");
+               } else {
+                       if (ft_fixup_port(blob, &fm_info[i], "fsl,fman-xgec") &&
+                           ft_fixup_port(blob, &fm_info[i], "fsl,fman-tgec"))
+                               ft_fixup_port(blob, &fm_info[i],
+                                             "fsl,fman-10g-mac");
+               }
        }
 #endif
 }
@@ -342,3 +381,4 @@ int is_qsgmii_riser_card(struct mii_dev *bus, int phy_base_addr,
 
        return 0;
 }
+#endif /* CONFIG_DM_ETH */