From: Fugang Duan <fugang.d...@nxp.com>

The commit da722186f654 (net: fec: set GPR bit on suspend by DT
configuration) set the GPR reigster offset and bit in driver for
wake on lan feature.

But it introduces two issues here:
- one SOC has two instances, they have different bit
- different SOCs may have different offset and bit

So to support wake-on-lan feature on other i.MX platforms, it should
configure the GPR reigster offset and bit from DT.

So the patch is to improve the commit da722186f654 (net: fec: set GPR
bit on suspend by DT configuration) to support multiple ethernet
instances on i.MX series.

v2:
 * switch back to store the quirks bitmask in driver_data

Signed-off-by: Fugang Duan <fugang.d...@nxp.com>
---
 drivers/net/ethernet/freescale/fec_main.c | 103 ++++++++++--------------------
 1 file changed, 34 insertions(+), 69 deletions(-)

diff --git a/drivers/net/ethernet/freescale/fec_main.c 
b/drivers/net/ethernet/freescale/fec_main.c
index 2e20914..4f55d30 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -86,56 +86,6 @@ static void fec_enet_itr_coal_init(struct net_device *ndev);
 #define FEC_ENET_OPD_V 0xFFF0
 #define FEC_MDIO_PM_TIMEOUT  100 /* ms */
 
-struct fec_devinfo {
-       u32 quirks;
-       u8 stop_gpr_reg;
-       u8 stop_gpr_bit;
-};
-
-static const struct fec_devinfo fec_imx25_info = {
-       .quirks = FEC_QUIRK_USE_GASKET | FEC_QUIRK_MIB_CLEAR |
-                 FEC_QUIRK_HAS_FRREG,
-};
-
-static const struct fec_devinfo fec_imx27_info = {
-       .quirks = FEC_QUIRK_MIB_CLEAR | FEC_QUIRK_HAS_FRREG,
-};
-
-static const struct fec_devinfo fec_imx28_info = {
-       .quirks = FEC_QUIRK_ENET_MAC | FEC_QUIRK_SWAP_FRAME |
-                 FEC_QUIRK_SINGLE_MDIO | FEC_QUIRK_HAS_RACC |
-                 FEC_QUIRK_HAS_FRREG,
-};
-
-static const struct fec_devinfo fec_imx6q_info = {
-       .quirks = FEC_QUIRK_ENET_MAC | FEC_QUIRK_HAS_GBIT |
-                 FEC_QUIRK_HAS_BUFDESC_EX | FEC_QUIRK_HAS_CSUM |
-                 FEC_QUIRK_HAS_VLAN | FEC_QUIRK_ERR006358 |
-                 FEC_QUIRK_HAS_RACC,
-       .stop_gpr_reg = 0x34,
-       .stop_gpr_bit = 27,
-};
-
-static const struct fec_devinfo fec_mvf600_info = {
-       .quirks = FEC_QUIRK_ENET_MAC | FEC_QUIRK_HAS_RACC,
-};
-
-static const struct fec_devinfo fec_imx6x_info = {
-       .quirks = FEC_QUIRK_ENET_MAC | FEC_QUIRK_HAS_GBIT |
-                 FEC_QUIRK_HAS_BUFDESC_EX | FEC_QUIRK_HAS_CSUM |
-                 FEC_QUIRK_HAS_VLAN | FEC_QUIRK_HAS_AVB |
-                 FEC_QUIRK_ERR007885 | FEC_QUIRK_BUG_CAPTURE |
-                 FEC_QUIRK_HAS_RACC | FEC_QUIRK_HAS_COALESCE,
-};
-
-static const struct fec_devinfo fec_imx6ul_info = {
-       .quirks = FEC_QUIRK_ENET_MAC | FEC_QUIRK_HAS_GBIT |
-                 FEC_QUIRK_HAS_BUFDESC_EX | FEC_QUIRK_HAS_CSUM |
-                 FEC_QUIRK_HAS_VLAN | FEC_QUIRK_ERR007885 |
-                 FEC_QUIRK_BUG_CAPTURE | FEC_QUIRK_HAS_RACC |
-                 FEC_QUIRK_HAS_COALESCE,
-};
-
 static struct platform_device_id fec_devtype[] = {
        {
                /* keep it for coldfire */
@@ -143,25 +93,39 @@ static struct platform_device_id fec_devtype[] = {
                .driver_data = 0,
        }, {
                .name = "imx25-fec",
-               .driver_data = (kernel_ulong_t)&fec_imx25_info,
+               .driver_data = FEC_QUIRK_USE_GASKET | FEC_QUIRK_MIB_CLEAR |
+                              FEC_QUIRK_HAS_FRREG,
        }, {
                .name = "imx27-fec",
-               .driver_data = (kernel_ulong_t)&fec_imx27_info,
+               .driver_data = FEC_QUIRK_MIB_CLEAR | FEC_QUIRK_HAS_FRREG,
        }, {
                .name = "imx28-fec",
-               .driver_data = (kernel_ulong_t)&fec_imx28_info,
+               .driver_data = FEC_QUIRK_ENET_MAC | FEC_QUIRK_SWAP_FRAME |
+                               FEC_QUIRK_SINGLE_MDIO | FEC_QUIRK_HAS_RACC |
+                               FEC_QUIRK_HAS_FRREG,
        }, {
                .name = "imx6q-fec",
-               .driver_data = (kernel_ulong_t)&fec_imx6q_info,
+               .driver_data = FEC_QUIRK_ENET_MAC | FEC_QUIRK_HAS_GBIT |
+                               FEC_QUIRK_HAS_BUFDESC_EX | FEC_QUIRK_HAS_CSUM |
+                               FEC_QUIRK_HAS_VLAN | FEC_QUIRK_ERR006358 |
+                               FEC_QUIRK_HAS_RACC,
        }, {
                .name = "mvf600-fec",
-               .driver_data = (kernel_ulong_t)&fec_mvf600_info,
+               .driver_data = FEC_QUIRK_ENET_MAC | FEC_QUIRK_HAS_RACC,
        }, {
                .name = "imx6sx-fec",
-               .driver_data = (kernel_ulong_t)&fec_imx6x_info,
+               .driver_data = FEC_QUIRK_ENET_MAC | FEC_QUIRK_HAS_GBIT |
+                               FEC_QUIRK_HAS_BUFDESC_EX | FEC_QUIRK_HAS_CSUM |
+                               FEC_QUIRK_HAS_VLAN | FEC_QUIRK_HAS_AVB |
+                               FEC_QUIRK_ERR007885 | FEC_QUIRK_BUG_CAPTURE |
+                               FEC_QUIRK_HAS_RACC | FEC_QUIRK_HAS_COALESCE,
        }, {
                .name = "imx6ul-fec",
-               .driver_data = (kernel_ulong_t)&fec_imx6ul_info,
+               .driver_data = FEC_QUIRK_ENET_MAC | FEC_QUIRK_HAS_GBIT |
+                               FEC_QUIRK_HAS_BUFDESC_EX | FEC_QUIRK_HAS_CSUM |
+                               FEC_QUIRK_HAS_VLAN | FEC_QUIRK_ERR007885 |
+                               FEC_QUIRK_BUG_CAPTURE | FEC_QUIRK_HAS_RACC |
+                               FEC_QUIRK_HAS_COALESCE,
        }, {
                /* sentinel */
        }
@@ -3476,19 +3440,23 @@ static int fec_enet_get_irq_cnt(struct platform_device 
*pdev)
 }
 
 static int fec_enet_init_stop_mode(struct fec_enet_private *fep,
-                                  struct fec_devinfo *dev_info,
                                   struct device_node *np)
 {
        struct device_node *gpr_np;
+       u32 out_val[3];
        int ret = 0;
 
-       if (!dev_info)
-               return 0;
-
-       gpr_np = of_parse_phandle(np, "gpr", 0);
+       gpr_np = of_parse_phandle(np, "fsl,stop-mode", 0);
        if (!gpr_np)
                return 0;
 
+       ret = of_property_read_u32_array(np, "fsl,stop-mode", out_val,
+                                        ARRAY_SIZE(out_val));
+       if (ret) {
+               dev_dbg(&fep->pdev->dev, "no stop mode property\n");
+               return ret;
+       }
+
        fep->stop_gpr.gpr = syscon_node_to_regmap(gpr_np);
        if (IS_ERR(fep->stop_gpr.gpr)) {
                dev_err(&fep->pdev->dev, "could not find gpr regmap\n");
@@ -3497,8 +3465,8 @@ static int fec_enet_init_stop_mode(struct 
fec_enet_private *fep,
                goto out;
        }
 
-       fep->stop_gpr.reg = dev_info->stop_gpr_reg;
-       fep->stop_gpr.bit = dev_info->stop_gpr_bit;
+       fep->stop_gpr.reg = out_val[1];
+       fep->stop_gpr.bit = out_val[2];
 
 out:
        of_node_put(gpr_np);
@@ -3521,7 +3489,6 @@ fec_probe(struct platform_device *pdev)
        int num_rx_qs;
        char irq_name[8];
        int irq_cnt;
-       struct fec_devinfo *dev_info;
 
        fec_enet_get_queue_num(pdev, &num_tx_qs, &num_rx_qs);
 
@@ -3539,9 +3506,7 @@ fec_probe(struct platform_device *pdev)
        of_id = of_match_device(fec_dt_ids, &pdev->dev);
        if (of_id)
                pdev->id_entry = of_id->data;
-       dev_info = (struct fec_devinfo *)pdev->id_entry->driver_data;
-       if (dev_info)
-               fep->quirks = dev_info->quirks;
+       fep->quirks = pdev->id_entry->driver_data;
 
        fep->netdev = ndev;
        fep->num_rx_queues = num_rx_qs;
@@ -3575,7 +3540,7 @@ fec_probe(struct platform_device *pdev)
        if (of_get_property(np, "fsl,magic-packet", NULL))
                fep->wol_flag |= FEC_WOL_HAS_MAGIC_PACKET;
 
-       ret = fec_enet_init_stop_mode(fep, dev_info, np);
+       ret = fec_enet_init_stop_mode(fep, np);
        if (ret)
                goto failed_stop_mode;
 
-- 
2.7.4

Reply via email to