net: stmmac: move version handling into own function

Move the version handling out of stmmac_hwif_init() and into its own
function, returning the version information through a structure.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Tested-by: Mohd Ayaan Anwar <mohd.anwar@oss.qualcomm.com>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1vDteg-0000000CCBr-2m7q@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.c b/drivers/net/ethernet/stmicro/stmmac/hwif.c
index 41a7e18412276bcfde45a6f76785a51975a1dd5d..4924e74997e4a5c3994527bdbde283c7da9946ae 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/hwif.c
+++ b/drivers/net/ethernet/stmicro/stmmac/hwif.c
@@ -13,6 +13,11 @@
 #include "dwmac4_descs.h"
 #include "dwxgmac2.h"
 
+struct stmmac_version {
+       u8 snpsver;
+       u8 dev_id;
+};
+
 static u32 stmmac_get_id(struct stmmac_priv *priv, u32 id_reg)
 {
        u32 reg = readl(priv->ioaddr + id_reg);
@@ -40,6 +45,24 @@ static u32 stmmac_get_dev_id(struct stmmac_priv *priv, u32 id_reg)
        return (reg & GENMASK(15, 8)) >> 8;
 }
 
+static void stmmac_get_version(struct stmmac_priv *priv,
+                              struct stmmac_version *ver)
+{
+       enum dwmac_core_type core_type = priv->plat->core_type;
+
+       ver->dev_id = 0;
+
+       if (core_type == DWMAC_CORE_GMAC) {
+               ver->snpsver = stmmac_get_id(priv, GMAC_VERSION);
+       } else if (dwmac_is_xmac(core_type)) {
+               ver->snpsver = stmmac_get_id(priv, GMAC4_VERSION);
+               if (core_type == DWMAC_CORE_XGMAC)
+                       ver->dev_id = stmmac_get_dev_id(priv, GMAC4_VERSION);
+       } else {
+               ver->snpsver = 0;
+       }
+}
+
 static void stmmac_dwmac_mode_quirk(struct stmmac_priv *priv)
 {
        struct mac_device_info *mac = priv->hw;
@@ -292,23 +315,15 @@ int stmmac_hwif_init(struct stmmac_priv *priv)
 {
        enum dwmac_core_type core_type = priv->plat->core_type;
        const struct stmmac_hwif_entry *entry;
+       struct stmmac_version version;
        struct mac_device_info *mac;
        bool needs_setup = true;
-       u32 id, dev_id = 0;
        int i, ret;
 
-       if (core_type == DWMAC_CORE_GMAC) {
-               id = stmmac_get_id(priv, GMAC_VERSION);
-       } else if (dwmac_is_xmac(core_type)) {
-               id = stmmac_get_id(priv, GMAC4_VERSION);
-               if (core_type == DWMAC_CORE_XGMAC)
-                       dev_id = stmmac_get_dev_id(priv, GMAC4_VERSION);
-       } else {
-               id = 0;
-       }
+       stmmac_get_version(priv, &version);
 
        /* Save ID for later use */
-       priv->synopsys_id = id;
+       priv->synopsys_id = version.snpsver;
 
        /* Lets assume some safe values first */
        if (core_type == DWMAC_CORE_GMAC4) {
@@ -344,7 +359,8 @@ int stmmac_hwif_init(struct stmmac_priv *priv)
                /* Use synopsys_id var because some setups can override this */
                if (priv->synopsys_id < entry->min_id)
                        continue;
-               if (core_type == DWMAC_CORE_XGMAC && (dev_id ^ entry->dev_id))
+               if (core_type == DWMAC_CORE_XGMAC &&
+                   (version.dev_id ^ entry->dev_id))
                        continue;
 
                /* Only use generic HW helpers if needed */
@@ -380,7 +396,7 @@ int stmmac_hwif_init(struct stmmac_priv *priv)
        }
 
        dev_err(priv->device, "Failed to find HW IF (id=0x%x, gmac=%d/%d)\n",
-               id, core_type == DWMAC_CORE_GMAC,
+               version.snpsver, core_type == DWMAC_CORE_GMAC,
                core_type == DWMAC_CORE_GMAC4);
        return -EINVAL;
 }