net: stmmac: loongson1: get ls1b resource only once

ls1b_dwmac_syscon_init() was getting the stmmac iomem resource to detect
which GMAC block is being used. Move this to a separate setup() function
that only runs at probe time, so it can sensibly behave with an
unrecognised resource adress. Use this to set a MAC index (id) which is
then used in place of testing the base address.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Keguang Zhang <keguang.zhang@gmail.com>
Tested-by: Keguang Zhang <keguang.zhang@gmail.com> # on LS1B & LS1C
Link: https://patch.msgid.link/E1uRqEE-004c7M-Go@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson1.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson1.c
index 78d9540be10ce0a8a25bb616bc009cd1ab552b30..32b5d1492e2e9caad1cbbafdd99767f2dbbb3c19 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson1.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson1.c
@@ -44,28 +44,50 @@
 struct ls1x_dwmac {
        struct plat_stmmacenet_data *plat_dat;
        struct regmap *regmap;
+       unsigned int id;
 };
 
 struct ls1x_data {
+       int (*setup)(struct platform_device *pdev,
+                    struct plat_stmmacenet_data *plat_dat);
        int (*init)(struct platform_device *pdev, void *bsp_priv);
 };
 
-static int ls1b_dwmac_syscon_init(struct platform_device *pdev, void *priv)
+static int ls1b_dwmac_setup(struct platform_device *pdev,
+                           struct plat_stmmacenet_data *plat_dat)
 {
-       struct ls1x_dwmac *dwmac = priv;
-       struct plat_stmmacenet_data *plat = dwmac->plat_dat;
-       struct regmap *regmap = dwmac->regmap;
+       struct ls1x_dwmac *dwmac = plat_dat->bsp_priv;
        struct resource *res;
-       unsigned long reg_base;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!res) {
+               /* This shouldn't fail - stmmac_get_platform_resources()
+                * already mapped this resource.
+                */
                dev_err(&pdev->dev, "Could not get IO_MEM resources\n");
                return -EINVAL;
        }
-       reg_base = (unsigned long)res->start;
 
-       if (reg_base == LS1B_GMAC0_BASE) {
+       if (res->start == LS1B_GMAC0_BASE) {
+               dwmac->id = 0;
+       } else if (res->start == LS1B_GMAC1_BASE) {
+               dwmac->id = 1;
+       } else {
+               dev_err(&pdev->dev, "Invalid Ethernet MAC base address %pR",
+                       res);
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+static int ls1b_dwmac_syscon_init(struct platform_device *pdev, void *priv)
+{
+       struct ls1x_dwmac *dwmac = priv;
+       struct plat_stmmacenet_data *plat = dwmac->plat_dat;
+       struct regmap *regmap = dwmac->regmap;
+
+       if (dwmac->id == 0) {
                switch (plat->phy_interface) {
                case PHY_INTERFACE_MODE_RGMII_ID:
                        regmap_update_bits(regmap, LS1X_SYSCON0,
@@ -84,7 +106,7 @@ static int ls1b_dwmac_syscon_init(struct platform_device *pdev, void *priv)
                }
 
                regmap_update_bits(regmap, LS1X_SYSCON0, GMAC0_SHUT, 0);
-       } else if (reg_base == LS1B_GMAC1_BASE) {
+       } else if (dwmac->id == 1) {
                regmap_update_bits(regmap, LS1X_SYSCON0,
                                   GMAC1_USE_UART1 | GMAC1_USE_UART0,
                                   GMAC1_USE_UART1 | GMAC1_USE_UART0);
@@ -108,10 +130,6 @@ static int ls1b_dwmac_syscon_init(struct platform_device *pdev, void *priv)
                }
 
                regmap_update_bits(regmap, LS1X_SYSCON1, GMAC1_SHUT, 0);
-       } else {
-               dev_err(&pdev->dev, "Invalid Ethernet MAC base address %lx",
-                       reg_base);
-               return -EINVAL;
        }
 
        return 0;
@@ -183,10 +201,17 @@ static int ls1x_dwmac_probe(struct platform_device *pdev)
        dwmac->plat_dat = plat_dat;
        dwmac->regmap = regmap;
 
+       if (data->setup) {
+               ret = data->setup(pdev, plat_dat);
+               if (ret)
+                       return ret;
+       }
+
        return devm_stmmac_pltfr_probe(pdev, plat_dat, &stmmac_res);
 }
 
 static const struct ls1x_data ls1b_dwmac_data = {
+       .setup = ls1b_dwmac_setup,
        .init = ls1b_dwmac_syscon_init,
 };