net: enetc: build enetc_pf_common.c as a separate module

Compile enetc_pf_common.c as a standalone module to allow shared usage
between ENETC v1 and v4 PF drivers. Add struct enetc_pf_ops to register
different hardware operation interfaces for both ENETC v1 and v4 PF
drivers.

Signed-off-by: Wei Fang <wei.fang@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/freescale/enetc/Kconfig b/drivers/net/ethernet/freescale/enetc/Kconfig
index 51d80ea959d46b42616904a017a3efd3f073591b..e1b151a98b41d1bc98ee9d9d78c3819547bac2e6 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/Kconfig
+++ b/drivers/net/ethernet/freescale/enetc/Kconfig
@@ -7,6 +7,14 @@ config FSL_ENETC_CORE
 
          If compiled as module (M), the module name is fsl-enetc-core.
 
+config NXP_ENETC_PF_COMMON
+       tristate
+       help
+         This module supports common functionality between drivers of
+         different versions of NXP ENETC PF controllers.
+
+         If compiled as module (M), the module name is nxp-enetc-pf-common.
+
 config FSL_ENETC
        tristate "ENETC PF driver"
        depends on PCI_MSI
@@ -14,6 +22,7 @@ config FSL_ENETC
        select FSL_ENETC_CORE
        select FSL_ENETC_IERB
        select FSL_ENETC_MDIO
+       select NXP_ENETC_PF_COMMON
        select PHYLINK
        select PCS_LYNX
        select DIMLIB

diff --git a/drivers/net/ethernet/freescale/enetc/Makefile b/drivers/net/ethernet/freescale/enetc/Makefile
index 8f4d8e9c37a04c0b5b40016d9f617ebf2e1f3616..ebe232673ed460ae9789782b32790e61d9a4b972 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/Makefile
+++ b/drivers/net/ethernet/freescale/enetc/Makefile
@@ -3,8 +3,11 @@
 obj-$(CONFIG_FSL_ENETC_CORE) += fsl-enetc-core.o
 fsl-enetc-core-y := enetc.o enetc_cbdr.o enetc_ethtool.o
 
+obj-$(CONFIG_NXP_ENETC_PF_COMMON) += nxp-enetc-pf-common.o
+nxp-enetc-pf-common-y := enetc_pf_common.o
+
 obj-$(CONFIG_FSL_ENETC) += fsl-enetc.o
-fsl-enetc-y := enetc_pf.o enetc_pf_common.o
+fsl-enetc-y := enetc_pf.o
 fsl-enetc-$(CONFIG_PCI_IOV) += enetc_msg.o
 fsl-enetc-$(CONFIG_FSL_ENETC_QOS) += enetc_qos.o
 

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf.c b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
index 36fc93725309133af08aea739f32ed5fb88dec7a..1ff9a7a3386c5e1fc8fc221cd4d29ffb0d3c75cf 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
@@ -12,7 +12,7 @@
 
 #define ENETC_DRV_NAME_STR "ENETC PF driver"
 
-void enetc_pf_get_primary_mac_addr(struct enetc_hw *hw, int si, u8 *addr)
+static void enetc_pf_get_primary_mac_addr(struct enetc_hw *hw, int si, u8 *addr)
 {
        u32 upper = __raw_readl(hw->port + ENETC_PSIPMAR0(si));
        u16 lower = __raw_readw(hw->port + ENETC_PSIPMAR1(si));
@@ -21,8 +21,8 @@ void enetc_pf_get_primary_mac_addr(struct enetc_hw *hw, int si, u8 *addr)
        put_unaligned_le16(lower, addr + 4);
 }
 
-void enetc_pf_set_primary_mac_addr(struct enetc_hw *hw, int si,
-                                  const u8 *addr)
+static void enetc_pf_set_primary_mac_addr(struct enetc_hw *hw, int si,
+                                         const u8 *addr)
 {
        u32 upper = get_unaligned_le32(addr);
        u16 lower = get_unaligned_le16(addr + 4);
@@ -31,6 +31,17 @@ void enetc_pf_set_primary_mac_addr(struct enetc_hw *hw, int si,
        __raw_writew(lower, hw->port + ENETC_PSIPMAR1(si));
 }
 
+static struct phylink_pcs *enetc_pf_create_pcs(struct enetc_pf *pf,
+                                              struct mii_bus *bus)
+{
+       return lynx_pcs_create_mdiodev(bus, 0);
+}
+
+static void enetc_pf_destroy_pcs(struct phylink_pcs *pcs)
+{
+       lynx_pcs_destroy(pcs);
+}
+
 static void enetc_set_vlan_promisc(struct enetc_hw *hw, char si_map)
 {
        u32 val = enetc_port_rd(hw, ENETC_PSIPVMR);
@@ -971,6 +982,14 @@ static void enetc_psi_destroy(struct pci_dev *pdev)
        enetc_pci_remove(pdev);
 }
 
+static const struct enetc_pf_ops enetc_pf_ops = {
+       .set_si_primary_mac = enetc_pf_set_primary_mac_addr,
+       .get_si_primary_mac = enetc_pf_get_primary_mac_addr,
+       .create_pcs = enetc_pf_create_pcs,
+       .destroy_pcs = enetc_pf_destroy_pcs,
+       .enable_psfp = enetc_psfp_enable,
+};
+
 static int enetc_pf_probe(struct pci_dev *pdev,
                          const struct pci_device_id *ent)
 {
@@ -998,6 +1017,7 @@ static int enetc_pf_probe(struct pci_dev *pdev,
        pf = enetc_si_priv(si);
        pf->si = si;
        pf->total_vfs = pci_sriov_get_totalvfs(pdev);
+       pf->ops = &enetc_pf_ops;
 
        err = enetc_setup_mac_addresses(node, pf);
        if (err)

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf.h b/drivers/net/ethernet/freescale/enetc/enetc_pf.h
index c26bd66e45976aabc6300e8537809358f36b6284..53d20752aacf576061aa10176154183795d7f139 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.h
@@ -28,6 +28,16 @@ struct enetc_vf_state {
        enum enetc_vf_flags flags;
 };
 
+struct enetc_pf;
+
+struct enetc_pf_ops {
+       void (*set_si_primary_mac)(struct enetc_hw *hw, int si, const u8 *addr);
+       void (*get_si_primary_mac)(struct enetc_hw *hw, int si, u8 *addr);
+       struct phylink_pcs *(*create_pcs)(struct enetc_pf *pf, struct mii_bus *bus);
+       void (*destroy_pcs)(struct phylink_pcs *pcs);
+       int (*enable_psfp)(struct enetc_ndev_priv *priv);
+};
+
 struct enetc_pf {
        struct enetc_si *si;
        int num_vfs; /* number of active VFs, after sriov_init */
@@ -50,6 +60,8 @@ struct enetc_pf {
 
        phy_interface_t if_mode;
        struct phylink_config phylink_config;
+
+       const struct enetc_pf_ops *ops;
 };
 
 #define phylink_to_enetc_pf(config) \

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c b/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c
index 925011b165630b0bac92cc9ab20e73a8c6641ed6..e95252e898aee9afc4e494d1ed1bd3246c921ed8 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c
@@ -4,29 +4,44 @@
 #include <linux/fsl/enetc_mdio.h>
 #include <linux/of_mdio.h>
 #include <linux/of_net.h>
-#include <linux/pcs-lynx.h>
 
 #include "enetc_pf_common.h"
 
+static void enetc_set_si_hw_addr(struct enetc_pf *pf, int si,
+                                const u8 *mac_addr)
+{
+       struct enetc_hw *hw = &pf->si->hw;
+
+       pf->ops->set_si_primary_mac(hw, si, mac_addr);
+}
+
+static void enetc_get_si_hw_addr(struct enetc_pf *pf, int si, u8 *mac_addr)
+{
+       struct enetc_hw *hw = &pf->si->hw;
+
+       pf->ops->get_si_primary_mac(hw, si, mac_addr);
+}
+
 int enetc_pf_set_mac_addr(struct net_device *ndev, void *addr)
 {
        struct enetc_ndev_priv *priv = netdev_priv(ndev);
+       struct enetc_pf *pf = enetc_si_priv(priv->si);
        struct sockaddr *saddr = addr;
 
        if (!is_valid_ether_addr(saddr->sa_data))
                return -EADDRNOTAVAIL;
 
        eth_hw_addr_set(ndev, saddr->sa_data);
-       enetc_pf_set_primary_mac_addr(&priv->si->hw, 0, saddr->sa_data);
+       enetc_set_si_hw_addr(pf, 0, saddr->sa_data);
 
        return 0;
 }
+EXPORT_SYMBOL_GPL(enetc_pf_set_mac_addr);
 
 static int enetc_setup_mac_address(struct device_node *np, struct enetc_pf *pf,
                                   int si)
 {
        struct device *dev = &pf->si->pdev->dev;
-       struct enetc_hw *hw = &pf->si->hw;
        u8 mac_addr[ETH_ALEN] = { 0 };
        int err;
 
@@ -39,7 +54,7 @@ static int enetc_setup_mac_address(struct device_node *np, struct enetc_pf *pf,
 
        /* (2) bootloader supplied MAC address */
        if (is_zero_ether_addr(mac_addr))
-               enetc_pf_get_primary_mac_addr(hw, si, mac_addr);
+               enetc_get_si_hw_addr(pf, si, mac_addr);
 
        /* (3) choose a random one */
        if (is_zero_ether_addr(mac_addr)) {
@@ -48,7 +63,7 @@ static int enetc_setup_mac_address(struct device_node *np, struct enetc_pf *pf,
                         si, mac_addr);
        }
 
-       enetc_pf_set_primary_mac_addr(hw, si, mac_addr);
+       enetc_set_si_hw_addr(pf, si, mac_addr);
 
        return 0;
 }
@@ -70,11 +85,13 @@ int enetc_setup_mac_addresses(struct device_node *np, struct enetc_pf *pf)
 
        return 0;
 }
+EXPORT_SYMBOL_GPL(enetc_setup_mac_addresses);
 
 void enetc_pf_netdev_setup(struct enetc_si *si, struct net_device *ndev,
                           const struct net_device_ops *ndev_ops)
 {
        struct enetc_ndev_priv *priv = netdev_priv(ndev);
+       struct enetc_pf *pf = enetc_si_priv(si);
 
        SET_NETDEV_DEV(ndev, &si->pdev->dev);
        priv->ndev = ndev;
@@ -107,7 +124,8 @@ void enetc_pf_netdev_setup(struct enetc_si *si, struct net_device *ndev,
                             NETDEV_XDP_ACT_NDO_XMIT | NETDEV_XDP_ACT_RX_SG |
                             NETDEV_XDP_ACT_NDO_XMIT_SG;
 
-       if (si->hw_features & ENETC_SI_F_PSFP && !enetc_psfp_enable(priv)) {
+       if (si->hw_features & ENETC_SI_F_PSFP && pf->ops->enable_psfp &&
+           !pf->ops->enable_psfp(priv)) {
                priv->active_offloads |= ENETC_F_QCI;
                ndev->features |= NETIF_F_HW_TC;
                ndev->hw_features |= NETIF_F_HW_TC;
@@ -116,6 +134,7 @@ void enetc_pf_netdev_setup(struct enetc_si *si, struct net_device *ndev,
        /* pick up primary MAC address from SI */
        enetc_load_primary_mac_addr(&si->hw, ndev);
 }
+EXPORT_SYMBOL_GPL(enetc_pf_netdev_setup);
 
 static int enetc_mdio_probe(struct enetc_pf *pf, struct device_node *np)
 {
@@ -162,6 +181,12 @@ static int enetc_imdio_create(struct enetc_pf *pf)
        struct mii_bus *bus;
        int err;
 
+       if (!pf->ops->create_pcs) {
+               dev_err(dev, "Creating PCS is not supported\n");
+
+               return -EOPNOTSUPP;
+       }
+
        bus = mdiobus_alloc_size(sizeof(*mdio_priv));
        if (!bus)
                return -ENOMEM;
@@ -184,7 +209,7 @@ static int enetc_imdio_create(struct enetc_pf *pf)
                goto free_mdio_bus;
        }
 
-       phylink_pcs = lynx_pcs_create_mdiodev(bus, 0);
+       phylink_pcs = pf->ops->create_pcs(pf, bus);
        if (IS_ERR(phylink_pcs)) {
                err = PTR_ERR(phylink_pcs);
                dev_err(dev, "cannot create lynx pcs (%d)\n", err);
@@ -205,8 +230,8 @@ free_mdio_bus:
 
 static void enetc_imdio_remove(struct enetc_pf *pf)
 {
-       if (pf->pcs)
-               lynx_pcs_destroy(pf->pcs);
+       if (pf->pcs && pf->ops->destroy_pcs)
+               pf->ops->destroy_pcs(pf->pcs);
 
        if (pf->imdio) {
                mdiobus_unregister(pf->imdio);
@@ -246,12 +271,14 @@ int enetc_mdiobus_create(struct enetc_pf *pf, struct device_node *node)
 
        return 0;
 }
+EXPORT_SYMBOL_GPL(enetc_mdiobus_create);
 
 void enetc_mdiobus_destroy(struct enetc_pf *pf)
 {
        enetc_mdio_remove(pf);
        enetc_imdio_remove(pf);
 }
+EXPORT_SYMBOL_GPL(enetc_mdiobus_destroy);
 
 int enetc_phylink_create(struct enetc_ndev_priv *priv, struct device_node *node,
                         const struct phylink_mac_ops *ops)
@@ -288,8 +315,13 @@ int enetc_phylink_create(struct enetc_ndev_priv *priv, struct device_node *node,
 
        return 0;
 }
+EXPORT_SYMBOL_GPL(enetc_phylink_create);
 
 void enetc_phylink_destroy(struct enetc_ndev_priv *priv)
 {
        phylink_destroy(priv->phylink);
 }
+EXPORT_SYMBOL_GPL(enetc_phylink_destroy);
+
+MODULE_DESCRIPTION("NXP ENETC PF common functionality driver");
+MODULE_LICENSE("Dual BSD/GPL");

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf_common.h b/drivers/net/ethernet/freescale/enetc/enetc_pf_common.h
index 2ae9c87c8c8ad3fa42203fd41e892b0b81cdf4c8..964d4f53806b27cfb42dfb8a8411c6806bf42f37 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf_common.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf_common.h
@@ -3,9 +3,6 @@
 
 #include "enetc_pf.h"
 
-void enetc_pf_get_primary_mac_addr(struct enetc_hw *hw, int si, u8 *addr);
-void enetc_pf_set_primary_mac_addr(struct enetc_hw *hw, int si,
-                                  const u8 *addr);
 int enetc_pf_set_mac_addr(struct net_device *ndev, void *addr);
 int enetc_setup_mac_addresses(struct device_node *np, struct enetc_pf *pf);
 void enetc_pf_netdev_setup(struct enetc_si *si, struct net_device *ndev,