net: enetc: add basic support for the ENETC with pseudo MAC for i.MX94

The ENETC with pseudo MAC is an internal port which connects to the CPU
port of the switch. The switch CPU/host ENETC is fully integrated with
the switch and does not require a back-to-back MAC, instead a light
weight "pseudo MAC" provides the delineation between switch and ENETC.
This translates to lower power (less logic and memory) and lower delay
(as there is no serialization delay across this link).

Different from the standalone ENETC which is used as the external port,
the internal ENETC has a different PCIe device ID, and it does not have
Ethernet MAC port registers, instead, it has a small number of pseudo
MAC port registers, so some features are not supported by pseudo MAC,
such as loopback, half duplex, one-step timestamping and so on.

Therefore, the configuration of this internal ENETC is also somewhat
different from that of the standalone ENETC. So add the basic support
for ENETC with pseudo MAC. More supports will be added in the future.

Signed-off-by: Wei Fang <wei.fang@nxp.com>
Reviewed-by: Claudiu Manoil <claudiu.manoil@nxp.com>
Link: https://patch.msgid.link/20251029013900.407583-6-wei.fang@nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
index 0535e92404e3cb4016fbb2133cf5dbf778dce925..3ed0e04eb589f8828cb76b7b1dad49f85b537521 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc.c
@@ -14,12 +14,21 @@
 
 u32 enetc_port_mac_rd(struct enetc_si *si, u32 reg)
 {
+       /* ENETC with pseudo MAC does not have Ethernet MAC
+        * port registers.
+        */
+       if (enetc_is_pseudo_mac(si))
+               return 0;
+
        return enetc_port_rd(&si->hw, reg);
 }
 EXPORT_SYMBOL_GPL(enetc_port_mac_rd);
 
 void enetc_port_mac_wr(struct enetc_si *si, u32 reg, u32 val)
 {
+       if (enetc_is_pseudo_mac(si))
+               return;
+
        enetc_port_wr(&si->hw, reg, val);
        if (si->hw_features & ENETC_SI_F_QBU)
                enetc_port_wr(&si->hw, reg + si->drvdata->pmac_offset, val);
@@ -3367,7 +3376,8 @@ int enetc_hwtstamp_set(struct net_device *ndev,
                new_offloads |= ENETC_F_TX_TSTAMP;
                break;
        case HWTSTAMP_TX_ONESTEP_SYNC:
-               if (!enetc_si_is_pf(priv->si))
+               if (!enetc_si_is_pf(priv->si) ||
+                   enetc_is_pseudo_mac(priv->si))
                        return -EOPNOTSUPP;
 
                new_offloads &= ~ENETC_F_TX_TSTAMP_MASK;
@@ -3708,6 +3718,13 @@ static const struct enetc_drvdata enetc4_pf_data = {
        .eth_ops = &enetc4_pf_ethtool_ops,
 };
 
+static const struct enetc_drvdata enetc4_ppm_data = {
+       .sysclk_freq = ENETC_CLK_333M,
+       .tx_csum = true,
+       .max_frags = ENETC4_MAX_SKB_FRAGS,
+       .eth_ops = &enetc4_ppm_ethtool_ops,
+};
+
 static const struct enetc_drvdata enetc_vf_data = {
        .sysclk_freq = ENETC_CLK_400M,
        .max_frags = ENETC_MAX_SKB_FRAGS,
@@ -3727,6 +3744,11 @@ static const struct enetc_platform_info enetc_info[] = {
          .dev_id = ENETC_DEV_ID_VF,
          .data = &enetc_vf_data,
        },
+       {
+         .revision = ENETC_REV_4_3,
+         .dev_id = NXP_ENETC_PPM_DEV_ID,
+         .data = &enetc4_ppm_data,
+       },
 };
 
 int enetc_get_driver_data(struct enetc_si *si)

diff --git a/drivers/net/ethernet/freescale/enetc/enetc.h b/drivers/net/ethernet/freescale/enetc/enetc.h
index f279fa597991ec85379388bab3ea990bafa15794..dce27bd67a7d102208a00319570ae47b58efc4c3 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc.h
@@ -273,6 +273,7 @@ enum enetc_errata {
 #define ENETC_SI_F_QBV  BIT(1)
 #define ENETC_SI_F_QBU  BIT(2)
 #define ENETC_SI_F_LSO BIT(3)
+#define ENETC_SI_F_PPM BIT(4) /* pseudo MAC */
 
 struct enetc_drvdata {
        u32 pmac_offset; /* Only valid for PSI which supports 802.1Qbu */
@@ -362,6 +363,11 @@ static inline int enetc_pf_to_port(struct pci_dev *pf_pdev)
        }
 }
 
+static inline bool enetc_is_pseudo_mac(struct enetc_si *si)
+{
+       return si->hw_features & ENETC_SI_F_PPM;
+}
+
 #define ENETC_MAX_NUM_TXQS     8
 #define ENETC_INT_NAME_MAX     (IFNAMSIZ + 8)
 
@@ -534,6 +540,8 @@ int enetc_hwtstamp_set(struct net_device *ndev,
 extern const struct ethtool_ops enetc_pf_ethtool_ops;
 extern const struct ethtool_ops enetc4_pf_ethtool_ops;
 extern const struct ethtool_ops enetc_vf_ethtool_ops;
+extern const struct ethtool_ops enetc4_ppm_ethtool_ops;
+
 void enetc_set_ethtool_ops(struct net_device *ndev);
 void enetc_mm_link_state_update(struct enetc_ndev_priv *priv, bool link);
 void enetc_mm_commit_preemptible_tcs(struct enetc_ndev_priv *priv);

diff --git a/drivers/net/ethernet/freescale/enetc/enetc4_hw.h b/drivers/net/ethernet/freescale/enetc/enetc4_hw.h
index 19bf0e89cdc2589ba7d615cdf458a56e82879548..ebea4298791ce8d557720db1f92c6d01d1380c40 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc4_hw.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc4_hw.h
@@ -11,6 +11,7 @@
 
 #define NXP_ENETC_VENDOR_ID            0x1131
 #define NXP_ENETC_PF_DEV_ID            0xe101
+#define NXP_ENETC_PPM_DEV_ID           0xe110
 
 /**********************Station interface registers************************/
 /* Station interface LSO segmentation flag mask register 0/1 */
@@ -115,6 +116,10 @@
 #define  PMCAPR_HD                     BIT(8)
 #define  PMCAPR_FP                     GENMASK(10, 9)
 
+/* Port capability register */
+#define ENETC4_PCAPR                   0x4000
+#define  PCAPR_LINK_TYPE               BIT(4)
+
 /* Port configuration register */
 #define ENETC4_PCR                     0x4010
 #define  PCR_HDR_FMT                   BIT(0)
@@ -193,4 +198,29 @@
 #define   SSP_1G                       2
 #define  PM_IF_MODE_ENA                        BIT(15)
 
+/**********************ENETC Pseudo MAC port registers************************/
+/* Port pseudo MAC receive octets counter (64-bit) */
+#define ENETC4_PPMROCR                 0x5080
+
+/* Port pseudo MAC receive unicast frame counter register (64-bit) */
+#define ENETC4_PPMRUFCR                        0x5088
+
+/* Port pseudo MAC receive multicast frame counter register (64-bit) */
+#define ENETC4_PPMRMFCR                        0x5090
+
+/* Port pseudo MAC receive broadcast frame counter register (64-bit) */
+#define ENETC4_PPMRBFCR                        0x5098
+
+/* Port pseudo MAC transmit octets counter (64-bit) */
+#define ENETC4_PPMTOCR                 0x50c0
+
+/* Port pseudo MAC transmit unicast frame counter register (64-bit) */
+#define ENETC4_PPMTUFCR                        0x50c8
+
+/* Port pseudo MAC transmit multicast frame counter register (64-bit) */
+#define ENETC4_PPMTMFCR                        0x50d0
+
+/* Port pseudo MAC transmit broadcast frame counter register (64-bit) */
+#define ENETC4_PPMTBFCR                        0x50d8
+
 #endif

diff --git a/drivers/net/ethernet/freescale/enetc/enetc4_pf.c b/drivers/net/ethernet/freescale/enetc/enetc4_pf.c
index 82c443b28b154d5d7dda249673762b38351e033f..498346dd996aa997b1206068f69f007877a3fa5d 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc4_pf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc4_pf.c
@@ -41,6 +41,16 @@ static void enetc4_get_port_caps(struct enetc_pf *pf)
        pf->caps.mac_filter_num = val & PSIMAFCAPR_NUM_MAC_AFTE;
 }
 
+static void enetc4_get_psi_hw_features(struct enetc_si *si)
+{
+       struct enetc_hw *hw = &si->hw;
+       u32 val;
+
+       val = enetc_port_rd(hw, ENETC4_PCAPR);
+       if (val & PCAPR_LINK_TYPE)
+               si->hw_features |= ENETC_SI_F_PPM;
+}
+
 static void enetc4_pf_set_si_primary_mac(struct enetc_hw *hw, int si,
                                         const u8 *addr)
 {
@@ -277,6 +287,7 @@ static int enetc4_pf_struct_init(struct enetc_si *si)
        pf->ops = &enetc4_pf_ops;
 
        enetc4_get_port_caps(pf);
+       enetc4_get_psi_hw_features(si);
 
        return 0;
 }
@@ -589,6 +600,9 @@ static void enetc4_mac_config(struct enetc_pf *pf, unsigned int mode,
        struct enetc_si *si = pf->si;
        u32 val;
 
+       if (enetc_is_pseudo_mac(si))
+               return;
+
        val = enetc_port_mac_rd(si, ENETC4_PM_IF_MODE(0));
        val &= ~(PM_IF_MODE_IFMODE | PM_IF_MODE_ENA);
 
@@ -1071,6 +1085,7 @@ static void enetc4_pf_remove(struct pci_dev *pdev)
 
 static const struct pci_device_id enetc4_pf_id_table[] = {
        { PCI_DEVICE(NXP_ENETC_VENDOR_ID, NXP_ENETC_PF_DEV_ID) },
+       { PCI_DEVICE(NXP_ENETC_VENDOR_ID, NXP_ENETC_PPM_DEV_ID) },
        { 0, } /* End of table. */
 };
 MODULE_DEVICE_TABLE(pci, enetc4_pf_id_table);

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
index 71d052de669abc1e82b00bec81659a1138e9a57e..5ef2c5f3ff8f633ec15cbd08b06c9fdc2dc1e088 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
@@ -435,6 +435,48 @@ static void enetc_get_eth_mac_stats(struct net_device *ndev,
        }
 }
 
+static void enetc_ppm_mac_stats(struct enetc_si *si,
+                               struct ethtool_eth_mac_stats *s)
+{
+       struct enetc_hw *hw = &si->hw;
+       u64 rufcr, rmfcr, rbfcr;
+       u64 tufcr, tmfcr, tbfcr;
+
+       rufcr = enetc_port_rd64(hw, ENETC4_PPMRUFCR);
+       rmfcr = enetc_port_rd64(hw, ENETC4_PPMRMFCR);
+       rbfcr = enetc_port_rd64(hw, ENETC4_PPMRBFCR);
+
+       tufcr = enetc_port_rd64(hw, ENETC4_PPMTUFCR);
+       tmfcr = enetc_port_rd64(hw, ENETC4_PPMTMFCR);
+       tbfcr = enetc_port_rd64(hw, ENETC4_PPMTBFCR);
+
+       s->FramesTransmittedOK = tufcr + tmfcr + tbfcr;
+       s->FramesReceivedOK = rufcr + rmfcr + rbfcr;
+       s->OctetsTransmittedOK = enetc_port_rd64(hw, ENETC4_PPMTOCR);
+       s->OctetsReceivedOK = enetc_port_rd64(hw, ENETC4_PPMROCR);
+       s->MulticastFramesXmittedOK = tmfcr;
+       s->BroadcastFramesXmittedOK = tbfcr;
+       s->MulticastFramesReceivedOK = rmfcr;
+       s->BroadcastFramesReceivedOK = rbfcr;
+}
+
+static void enetc_ppm_get_eth_mac_stats(struct net_device *ndev,
+                                       struct ethtool_eth_mac_stats *mac_stats)
+{
+       struct enetc_ndev_priv *priv = netdev_priv(ndev);
+
+       switch (mac_stats->src) {
+       case ETHTOOL_MAC_STATS_SRC_EMAC:
+               enetc_ppm_mac_stats(priv->si, mac_stats);
+               break;
+       case ETHTOOL_MAC_STATS_SRC_PMAC:
+               break;
+       case ETHTOOL_MAC_STATS_SRC_AGGREGATE:
+               ethtool_aggregate_mac_stats(ndev, mac_stats);
+               break;
+       }
+}
+
 static void enetc_get_eth_ctrl_stats(struct net_device *ndev,
                                     struct ethtool_eth_ctrl_stats *ctrl_stats)
 {
@@ -1313,6 +1355,25 @@ const struct ethtool_ops enetc_pf_ethtool_ops = {
        .get_mm_stats = enetc_get_mm_stats,
 };
 
+const struct ethtool_ops enetc4_ppm_ethtool_ops = {
+       .supported_coalesce_params = ETHTOOL_COALESCE_USECS |
+                                    ETHTOOL_COALESCE_MAX_FRAMES |
+                                    ETHTOOL_COALESCE_USE_ADAPTIVE_RX,
+       .get_eth_mac_stats = enetc_ppm_get_eth_mac_stats,
+       .get_rxnfc = enetc4_get_rxnfc,
+       .get_rxfh_key_size = enetc_get_rxfh_key_size,
+       .get_rxfh_indir_size = enetc_get_rxfh_indir_size,
+       .get_rxfh = enetc_get_rxfh,
+       .set_rxfh = enetc_set_rxfh,
+       .get_rxfh_fields = enetc_get_rxfh_fields,
+       .get_ringparam = enetc_get_ringparam,
+       .get_coalesce = enetc_get_coalesce,
+       .set_coalesce = enetc_set_coalesce,
+       .get_link_ksettings = enetc_get_link_ksettings,
+       .set_link_ksettings = enetc_set_link_ksettings,
+       .get_link = ethtool_op_get_link,
+};
+
 const struct ethtool_ops enetc_vf_ethtool_ops = {
        .supported_coalesce_params = ETHTOOL_COALESCE_USECS |
                                     ETHTOOL_COALESCE_MAX_FRAMES |

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_hw.h b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
index 377c963258147aa894f2956fd8e027e5971bcb62..7b882b8921fe94fc7fb6d2efe1ecdafd8e195e47 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc_hw.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
@@ -378,6 +378,7 @@ enum enetc_bdr_type {TX, RX};
 #define EIPBRR0_REVISION       GENMASK(15, 0)
 #define ENETC_REV_1_0          0x0100
 #define ENETC_REV_4_1          0X0401
+#define ENETC_REV_4_3          0x0403
 
 #define ENETC_G_EIPBRR1                0x0bfc
 #define ENETC_G_EPFBLPR(n)     (0xd00 + 4 * (n))

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c b/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c
index edf14a95cab732f8a0b7f17542bb07e80147a96a..9c634205e2a76a524478d5693c5884d864cba7a6 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c
@@ -109,7 +109,7 @@ void enetc_pf_netdev_setup(struct enetc_si *si, struct net_device *ndev,
 
        ndev->hw_features = NETIF_F_SG | NETIF_F_RXCSUM |
                            NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX |
-                           NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_LOOPBACK |
+                           NETIF_F_HW_VLAN_CTAG_FILTER |
                            NETIF_F_HW_CSUM | NETIF_F_TSO | NETIF_F_TSO6 |
                            NETIF_F_GSO_UDP_L4;
        ndev->features = NETIF_F_HIGHDMA | NETIF_F_SG | NETIF_F_RXCSUM |
@@ -133,6 +133,9 @@ void enetc_pf_netdev_setup(struct enetc_si *si, struct net_device *ndev,
                ndev->features |= NETIF_F_RXHASH;
        }
 
+       if (!enetc_is_pseudo_mac(si))
+               ndev->hw_features |= NETIF_F_LOOPBACK;
+
        /* TODO: currently, i.MX95 ENETC driver does not support advanced features */
        if (!is_enetc_rev1(si))
                goto end;