The i.MX95 ENETC has been upgraded to revision 4.1, which is very
different from the LS1028A ENETC (revision 1.0) except for the SI
part. Therefore, the fsl-enetc driver is incompatible with i.MX95
ENETC PF. So we developed the nxp-enetc4 driver for i.MX95 ENETC
PF, and this driver will be used to support the ENETC PF with major
revision 4 in the future.
Currently, the nxp-enetc4 driver only supports basic transmission
feature for i.MX95 ENETC PF, the more basic and advanced features
will be added in the subsequent patches.
Signed-off-by: Wei Fang <wei.fang@nxp.com>
---
drivers/net/ethernet/freescale/enetc/Kconfig | 17 +
drivers/net/ethernet/freescale/enetc/Makefile | 3 +
drivers/net/ethernet/freescale/enetc/enetc.c | 50 +-
drivers/net/ethernet/freescale/enetc/enetc.h | 19 +-
.../net/ethernet/freescale/enetc/enetc4_hw.h | 153 ++++
.../net/ethernet/freescale/enetc/enetc4_pf.c | 761 ++++++++++++++++++
.../ethernet/freescale/enetc/enetc_ethtool.c | 68 +-
.../net/ethernet/freescale/enetc/enetc_hw.h | 12 +-
.../net/ethernet/freescale/enetc/enetc_pf.h | 9 +
.../freescale/enetc/enetc_pf_common.c | 10 +-
10 files changed, 1080 insertions(+), 22 deletions(-)
create mode 100644 drivers/net/ethernet/freescale/enetc/enetc4_hw.h
create mode 100644 drivers/net/ethernet/freescale/enetc/enetc4_pf.c
diff --git a/drivers/net/ethernet/freescale/enetc/Kconfig b/drivers/net/ethernet/freescale/enetc/Kconfig
index 6f3306f14060..357c42efc4fb 100644
--- a/drivers/net/ethernet/freescale/enetc/Kconfig
+++ b/drivers/net/ethernet/freescale/enetc/Kconfig
@@ -33,6 +33,23 @@ config FSL_ENETC
If compiled as module (M), the module name is fsl-enetc.
+config NXP_ENETC4
+ tristate "ENETC4 PF driver"
+ depends on PCI_MSI
+ select MDIO_DEVRES
+ select NXP_ENETC_PF_COMMON
+ select FSL_ENETC_CORE
+ select FSL_ENETC_MDIO
+ select PHYLINK
+ select DIMLIB
+ help
+ This driver supports NXP ENETC devices with major revision 4. ENETC is
+ as the NIC functionality in NETC, it supports virtualization/isolation
+ based on PCIe Single Root IO Virtualization (SR-IOV) and a full range
+ of TSN standards and NIC offload capabilities.
+
+ If compiled as module (M), the module name is nxp-enetc4.
+
config FSL_ENETC_VF
tristate "ENETC VF driver"
depends on PCI_MSI
diff --git a/drivers/net/ethernet/freescale/enetc/Makefile b/drivers/net/ethernet/freescale/enetc/Makefile
index b81ca462e358..5417815957b5 100644
--- a/drivers/net/ethernet/freescale/enetc/Makefile
+++ b/drivers/net/ethernet/freescale/enetc/Makefile
@@ -11,6 +11,9 @@ fsl-enetc-y := enetc_pf.o
fsl-enetc-$(CONFIG_PCI_IOV) += enetc_msg.o
fsl-enetc-$(CONFIG_FSL_ENETC_QOS) += enetc_qos.o
+obj-$(CONFIG_NXP_ENETC4) += nxp-enetc4.o
+nxp-enetc4-y := enetc4_pf.o
+
obj-$(CONFIG_FSL_ENETC_VF) += fsl-enetc-vf.o
fsl-enetc-vf-y := enetc_vf.o
diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
index b84c88a76762..4e672089e260 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc.c
@@ -2,6 +2,7 @@
/* Copyright 2017-2019 NXP */
#include "enetc.h"
+#include <linux/clk.h>
#include <linux/bpf_trace.h>
#include <linux/tcp.h>
#include <linux/udp.h>
@@ -21,7 +22,7 @@ void enetc_port_mac_wr(struct enetc_si *si, u32 reg, u32 val)
{
enetc_port_wr(&si->hw, reg, val);
if (si->hw_features & ENETC_SI_F_QBU)
- enetc_port_wr(&si->hw, reg + ENETC_PMAC_OFFSET, val);
+ enetc_port_wr(&si->hw, reg + si->pmac_offset, val);
}
EXPORT_SYMBOL_GPL(enetc_port_mac_wr);
@@ -700,8 +701,10 @@ static void enetc_rx_dim_work(struct work_struct *w)
net_dim_get_rx_moderation(dim->mode, dim->profile_ix);
struct enetc_int_vector *v =
container_of(dim, struct enetc_int_vector, rx_dim);
+ struct enetc_ndev_priv *priv = netdev_priv(v->rx_ring.ndev);
+ u64 clk_freq = priv->si->clk_freq;
- v->rx_ictt = enetc_usecs_to_cycles(moder.usec);
+ v->rx_ictt = enetc_usecs_to_cycles(moder.usec, clk_freq);
dim->state = DIM_START_MEASURE;
}
@@ -1721,14 +1724,25 @@ void enetc_get_si_caps(struct enetc_si *si)
struct enetc_hw *hw = &si->hw;
u32 val;
+ if (is_enetc_rev1(si))
+ si->clk_freq = ENETC_CLK;
+ else
+ si->clk_freq = ENETC_CLK_333M;
+
/* find out how many of various resources we have to work with */
val = enetc_rd(hw, ENETC_SICAPR0);
si->num_rx_rings = (val >> 16) & 0xff;
si->num_tx_rings = val & 0xff;
- val = enetc_rd(hw, ENETC_SIRFSCAPR);
- si->num_fs_entries = ENETC_SIRFSCAPR_GET_NUM_RFS(val);
- si->num_fs_entries = min(si->num_fs_entries, ENETC_MAX_RFS_SIZE);
+ val = enetc_rd(hw, ENETC_SIPCAPR0);
+ if (val & ENETC_SIPCAPR0_RFS) {
+ val = enetc_rd(hw, ENETC_SIRFSCAPR);
+ si->num_fs_entries = ENETC_SIRFSCAPR_GET_NUM_RFS(val);
+ si->num_fs_entries = min(si->num_fs_entries, ENETC_MAX_RFS_SIZE);
+ } else {
+ /* ENETC which not supports RFS */
+ si->num_fs_entries = 0;
+ }
si->num_rss = 0;
val = enetc_rd(hw, ENETC_SIPCAPR0);
@@ -1742,8 +1756,11 @@ void enetc_get_si_caps(struct enetc_si *si)
if (val & ENETC_SIPCAPR0_QBV)
si->hw_features |= ENETC_SI_F_QBV;
- if (val & ENETC_SIPCAPR0_QBU)
+ if (val & ENETC_SIPCAPR0_QBU) {
si->hw_features |= ENETC_SI_F_QBU;
+ si->pmac_offset = is_enetc_rev1(si) ? ENETC_PMAC_OFFSET :
+ ENETC4_PMAC_OFFSET;
+ }
if (val & ENETC_SIPCAPR0_PSFP)
si->hw_features |= ENETC_SI_F_PSFP;
@@ -2056,7 +2073,7 @@ int enetc_configure_si(struct enetc_ndev_priv *priv)
/* enable SI */
enetc_wr(hw, ENETC_SIMR, ENETC_SIMR_EN);
- if (si->num_rss) {
+ if (si->num_rss && is_enetc_rev1(si)) {
err = enetc_setup_default_rss_table(si, priv->num_rx_rings);
if (err)
return err;
@@ -2080,9 +2097,15 @@ void enetc_init_si_rings_params(struct enetc_ndev_priv *priv)
*/
priv->num_rx_rings = min_t(int, cpus, si->num_rx_rings);
priv->num_tx_rings = si->num_tx_rings;
- priv->bdr_int_num = cpus;
+ if (is_enetc_rev1(si)) {
+ priv->bdr_int_num = cpus;
+ priv->tx_ictt = enetc_usecs_to_cycles(600, ENETC_CLK);
+ } else {
+ priv->bdr_int_num = priv->num_rx_rings;
+ priv->tx_ictt = enetc_usecs_to_cycles(500, ENETC_CLK_333M);
+ }
+
priv->ic_mode = ENETC_IC_RX_ADAPTIVE | ENETC_IC_TX_MANUAL;
- priv->tx_ictt = ENETC_TXIC_TIMETHR;
}
EXPORT_SYMBOL_GPL(enetc_init_si_rings_params);
@@ -2475,10 +2498,14 @@ int enetc_open(struct net_device *ndev)
extended = !!(priv->active_offloads & ENETC_F_RX_TSTAMP);
- err = enetc_setup_irqs(priv);
+ err = clk_prepare_enable(priv->ref_clk);
if (err)
return err;
+ err = enetc_setup_irqs(priv);
+ if (err)
+ goto err_setup_irqs;
+
err = enetc_phylink_connect(ndev);
if (err)
goto err_phy_connect;
@@ -2510,6 +2537,8 @@ int enetc_open(struct net_device *ndev)
phylink_disconnect_phy(priv->phylink);
err_phy_connect:
enetc_free_irqs(priv);
+err_setup_irqs:
+ clk_disable_unprepare(priv->ref_clk);
return err;
}
@@ -2559,6 +2588,7 @@ int enetc_close(struct net_device *ndev)
enetc_assign_tx_resources(priv, NULL);
enetc_free_irqs(priv);
+ clk_disable_unprepare(priv->ref_clk);
return 0;
}
diff --git a/drivers/net/ethernet/freescale/enetc/enetc.h b/drivers/net/ethernet/freescale/enetc/enetc.h
index 97524dfa234c..7f1ea11c33a0 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc.h
@@ -14,6 +14,7 @@
#include <net/xdp.h>
#include "enetc_hw.h"
+#include "enetc4_hw.h"
#define ENETC_MAC_MAXFRM_SIZE 9600
#define ENETC_MAX_MTU (ENETC_MAC_MAXFRM_SIZE - \
@@ -222,6 +223,7 @@ struct enetc_msg_swbd {
};
#define ENETC_REV1 0x1
+#define ENETC_REV4 0x4
enum enetc_errata {
ENETC_ERR_VLAN_ISOL = BIT(0),
ENETC_ERR_UCMCSWP = BIT(1),
@@ -247,10 +249,22 @@ struct enetc_si {
int num_rss; /* number of RSS buckets */
unsigned short pad;
int hw_features;
+ int pmac_offset; /* Only valid for PSI which supports 802.1Qbu */
+ u64 clk_freq;
};
#define ENETC_SI_ALIGN 32
+static inline bool is_enetc_rev1(struct enetc_si *si)
+{
+ return si->pdev->revision == ENETC_REV1;
+}
+
+static inline bool is_enetc_rev4(struct enetc_si *si)
+{
+ return si->pdev->revision == ENETC_REV4;
+}
+
static inline void *enetc_si_priv(const struct enetc_si *si)
{
return (char *)si + ALIGN(sizeof(struct enetc_si), ENETC_SI_ALIGN);
@@ -302,7 +316,7 @@ struct enetc_cls_rule {
int used;
};
-#define ENETC_MAX_BDR_INT 2 /* fixed to max # of available cpus */
+#define ENETC_MAX_BDR_INT 6 /* fixed to max # of available cpus */
struct psfp_cap {
u32 max_streamid;
u32 max_psfp_filter;
@@ -340,7 +354,6 @@ enum enetc_ic_mode {
#define ENETC_RXIC_PKTTHR min_t(u32, 256, ENETC_RX_RING_DEFAULT_SIZE / 2)
#define ENETC_TXIC_PKTTHR min_t(u32, 128, ENETC_TX_RING_DEFAULT_SIZE / 2)
-#define ENETC_TXIC_TIMETHR enetc_usecs_to_cycles(600)
struct enetc_ndev_priv {
struct net_device *ndev;
@@ -388,6 +401,8 @@ struct enetc_ndev_priv {
* and link state updates
*/
struct mutex mm_lock;
+
+ struct clk *ref_clk; /* RGMII/RMII reference clock */
};
/* Messaging */
diff --git a/drivers/net/ethernet/freescale/enetc/enetc4_hw.h b/drivers/net/ethernet/freescale/enetc/enetc4_hw.h
new file mode 100644
index 000000000000..0b2a35189e9d
--- /dev/null
+++ b/drivers/net/ethernet/freescale/enetc/enetc4_hw.h
@@ -0,0 +1,153 @@
+/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
+/*
+ * This header file defines the register offsets and bit fields
+ * of ENETC4 PF and VFs. Note that the same registers as ENETC
+ * version 1.0 are defined in the enetc_hw.h file.
+ *
+ * Copyright 2024 NXP
+ */
+#ifndef __ENETC4_HW_H_
+#define __ENETC4_HW_H_
+
+/***************************ENETC port registers**************************/
+#define ENETC4_ECAPR0 0x0
+#define ECAPR0_RFS BIT(2)
+#define ECAPR0_TSD BIT(5)
+#define ECAPR0_RSS BIT(8)
+#define ECAPR0_RSC BIT(9)
+#define ECAPR0_LSO BIT(10)
+#define ECAPR0_WO BIT(13)
+
+#define ENETC4_ECAPR1 0x4
+#define ECAPR1_NUM_TCS GENMASK(6, 4)
+#define ECAPR1_NUM_MCH GENMASK(9, 8)
+#define ECAPR1_NUM_UCH GENMASK(11, 10)
+#define ECAPR1_NUM_MSIX GENMASK(22, 12)
+#define ECAPR1_NUM_VSI GENMASK(27, 24)
+#define ECAPR1_NUM_IPV BIT(31)
+
+#define ENETC4_ECAPR2 0x8
+#define ECAPR2_NUM_TX_BDR GENMASK(9, 0)
+#define ECAPR2_NUM_RX_BDR GENMASK(25, 16)
+
+#define ENETC4_PMR 0x10
+#define PMR_SI_EN(a) BIT((16 + (a)))
+
+/* Port Pause ON/OFF threshold register */
+#define ENETC4_PPAUONTR 0x108
+#define ENETC4_PPAUOFFTR 0x10c
+
+/* Port Station interface promiscuous MAC mode register */
+#define ENETC4_PSIPMMR 0x200
+#define PSIPMMR_SI0_MAC_UP BIT(0)
+#define PSIPMMR_SI_MAC_UP GENMASK(2, 0)
+#define PSIPMMR_SI0_MAC_MP BIT(16)
+#define PSIPMMR_SI_MAC_MP GENMASK(18, 16)
+
+/* Port Station interface promiscuous VLAN mode register */
+#define ENETC4_PSIPVMR 0x204
+
+/* Port RSS key register n. n = 0,1,2,...,9 */
+#define ENETC4_PRSSKR(n) ((n) * 0x4 + 0x250)
+
+/* Port station interface MAC address filtering capability register */
+#define ENETC4_PSIMAFCAPR 0x280
+#define PSIMAFCAPR_NUM_MAC_AFTE GENMASK(11, 0)
+
+/* Port station interface VLAN filtering capability register */
+#define ENETC4_PSIVLANFCAPR 0x2c0
+#define PSIVLANFCAPR_NUM_VLAN_FTE GENMASK(11, 0)
+
+/* Port station interface VLAN filtering mode register */
+#define ENETC4_PSIVLANFMR 0x2c4
+#define PSIVLANFMR_VS BIT(0)
+
+/* Port Station interface a primary MAC address registers */
+#define ENETC4_PSIPMAR0(a) ((a) * 0x80 + 0x2000)
+#define ENETC4_PSIPMAR1(a) ((a) * 0x80 + 0x2004)
+
+/* Port station interface a configuration register 0/2 */
+#define ENETC4_PSICFGR0(a) ((a) * 0x80 + 0x2010)
+#define PSICFGR0_VASE BIT(13)
+#define PSICFGR0_ASE BIT(15)
+#define PSICFGR0_ANTI_SPOOFING (PSICFGR0_VASE | PSICFGR0_ASE)
+
+#define ENETC4_PSICFGR2(a) ((a) * 0x80 + 0x2018)
+
+#define ENETC4_PMCAPR 0x4004
+#define PMCAPR_HD BIT(8)
+#define PMCAPR_FP GENMASK(10, 9)
+
+/* Port configuration register */
+#define ENETC4_PCR 0x4010
+#define PCR_HDR_FMT BIT(0)
+#define PCR_L2DOSE BIT(4)
+#define PCR_TIMER_CS BIT(8)
+#define PCR_PSPEED GENMASK(29, 16)
+#define PCR_PSPEED_VAL(speed) (((speed) / 10 - 1) << 16)
+
+/* Port MAC address register 0/1 */
+#define ENETC4_PMAR0 0x4020
+#define ENETC4_PMAR1 0x4024
+
+/* Port operational register */
+#define ENETC4_POR 0x4100
+
+/* Port traffic class a transmit maximum SDU register */
+#define ENETC4_PTCTMSDUR(a) ((a) * 0x20 + 0x4208)
+#define PTCTMSDUR_MAXSDU GENMASK(15, 0)
+#define PTCTMSDUR_SDU_TYPE GENMASK(17, 16)
+#define SDU_TYPE_PPDU 0
+#define SDU_TYPE_MPDU 1
+#define SDU_TYPE_MSDU 2
+
+#define ENETC4_PMAC_OFFSET 0x400
+#define ENETC4_PM_CMD_CFG(mac) (0x5008 + (mac) * 0x400)
+#define PM_CMD_CFG_TX_EN BIT(0)
+#define PM_CMD_CFG_RX_EN BIT(1)
+#define PM_CMD_CFG_PAUSE_FWD BIT(7)
+#define PM_CMD_CFG_PAUSE_IGN BIT(8)
+#define PM_CMD_CFG_TX_ADDR_INS BIT(9)
+#define PM_CMD_CFG_LOOP_EN BIT(10)
+#define PM_CMD_CFG_LPBK_MODE GENMASK(12, 11)
+#define LPBCK_MODE_EXT_TX_CLK 0
+#define LPBCK_MODE_MAC_LEVEL 1
+#define LPBCK_MODE_INT_TX_CLK 2
+#define PM_CMD_CFG_CNT_FRM_EN BIT(13)
+#define PM_CMD_CFG_TXP BIT(15)
+#define PM_CMD_CFG_SEND_IDLE BIT(16)
+#define PM_CMD_CFG_HD_FCEN BIT(18)
+#define PM_CMD_CFG_SFD BIT(21)
+#define PM_CMD_CFG_TX_FLUSH BIT(22)
+#define PM_CMD_CFG_TX_LOWP_EN BIT(23)
+#define PM_CMD_CFG_RX_LOWP_EMPTY BIT(24)
+#define PM_CMD_CFG_SWR BIT(26)
+#define PM_CMD_CFG_TS_MODE BIT(30)
+#define PM_CMD_CFG_MG BIT(31)
+
+/* Port MAC 0/1 Maximum Frame Length Register */
+#define ENETC4_PM_MAXFRM(mac) (0x5014 + (mac) * 0x400)
+
+/* Port MAC 0/1 Pause Quanta Register */
+#define ENETC4_PM_PAUSE_QUANTA(mac) (0x5054 + (mac) * 0x400)
+
+/* Port MAC 0/1 Pause Quanta Threshold Register */
+#define ENETC4_PM_PAUSE_THRESH(mac) (0x5064 + (mac) * 0x400)
+
+/* Port MAC 0 Interface Mode Control Register */
+#define ENETC4_PM_IF_MODE(mac) (0x5300 + (mac) * 0x400)
+#define PM_IF_MODE_IFMODE GENMASK(2, 0)
+#define IFMODE_XGMII 0
+#define IFMODE_RMII 3
+#define IFMODE_RGMII 4
+#define IFMODE_SGMII 5
+#define PM_IF_MODE_REVMII BIT(3)
+#define PM_IF_MODE_M10 BIT(4)
+#define PM_IF_MODE_HD BIT(6)
+#define PM_IF_MODE_SSP GENMASK(14, 13)
+#define SSP_100M 0
+#define SSP_10M 1
+#define SSP_1G 2
+#define PM_IF_MODE_ENA BIT(15)
+
+#endif
diff --git a/drivers/net/ethernet/freescale/enetc/enetc4_pf.c b/drivers/net/ethernet/freescale/enetc/enetc4_pf.c
new file mode 100644
index 000000000000..e38ade76260b
--- /dev/null
+++ b/drivers/net/ethernet/freescale/enetc/enetc4_pf.c
@@ -0,0 +1,761 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+/* Copyright 2024 NXP */
+#include <linux/unaligned.h>
+#include <linux/module.h>
+#include <linux/of_net.h>
+#include <linux/of_platform.h>
+#include <linux/clk.h>
+#include <linux/pinctrl/consumer.h>
+#include <linux/fsl/netc_global.h>
+
+#include "enetc_pf.h"
+
+#define ENETC_SI_MAX_RING_NUM 8
+
+static void enetc4_get_port_caps(struct enetc_pf *pf)
+{
+ struct enetc_hw *hw = &pf->si->hw;
+ u32 val;
+
+ val = enetc_port_rd(hw, ENETC4_ECAPR1);
+ pf->caps.num_vsi = (val & ECAPR1_NUM_VSI) >> 24;
+ pf->caps.num_msix = ((val & ECAPR1_NUM_MSIX) >> 12) + 1;
+
+ val = enetc_port_rd(hw, ENETC4_ECAPR2);
+ pf->caps.num_rx_bdr = (val & ECAPR2_NUM_RX_BDR) >> 16;
+ pf->caps.num_tx_bdr = val & ECAPR2_NUM_TX_BDR;
+
+ val = enetc_port_rd(hw, ENETC4_PMCAPR);
+ pf->caps.half_duplex = (val & PMCAPR_HD) ? 1 : 0;
+}
+
+static void enetc4_pf_set_si_primary_mac(struct enetc_hw *hw, int si,
+ const u8 *addr)
+{
+ u16 lower = get_unaligned_le16(addr + 4);
+ u32 upper = get_unaligned_le32(addr);
+
+ if (si != 0) {
+ __raw_writel(upper, hw->port + ENETC4_PSIPMAR0(si));
+ __raw_writew(lower, hw->port + ENETC4_PSIPMAR1(si));
+ } else {
+ __raw_writel(upper, hw->port + ENETC4_PMAR0);
+ __raw_writew(lower, hw->port + ENETC4_PMAR1);
+ }
+}
+
+static void enetc4_pf_get_si_primary_mac(struct enetc_hw *hw, int si,
+ u8 *addr)
+{
+ u32 upper;
+ u16 lower;
+
+ upper = __raw_readl(hw->port + ENETC4_PSIPMAR0(si));
+ lower = __raw_readw(hw->port + ENETC4_PSIPMAR1(si));
+
+ put_unaligned_le32(upper, addr);
+ put_unaligned_le16(lower, addr + 4);
+}
+
+static const struct enetc_pf_ops enetc4_pf_ops = {
+ .set_si_primary_mac = enetc4_pf_set_si_primary_mac,
+ .get_si_primary_mac = enetc4_pf_get_si_primary_mac,
+};
+
+static int enetc4_pf_struct_init(struct enetc_si *si)
+{
+ struct enetc_pf *pf = enetc_si_priv(si);
+
+ pf->si = si;
+ pf->total_vfs = pci_sriov_get_totalvfs(si->pdev);
+
+ enetc4_get_port_caps(pf);
+ enetc_pf_ops_register(pf, &enetc4_pf_ops);
+
+ return 0;
+}
+
+static u32 enetc4_psicfgr0_val_construct(bool is_vf, u32 num_tx_bdr, u32 num_rx_bdr)
+{
+ u32 val;
+
+ val = ENETC_PSICFGR0_SET_TXBDR(num_tx_bdr);
+ val |= ENETC_PSICFGR0_SET_RXBDR(num_rx_bdr);
+ val |= ENETC_PSICFGR0_SIVC(ENETC_VLAN_TYPE_C | ENETC_VLAN_TYPE_S);
+
+ if (is_vf)
+ val |= ENETC_PSICFGR0_VTE | ENETC_PSICFGR0_SIVIE;
+
+ return val;
+}
+
+static void enetc4_default_rings_allocation(struct enetc_pf *pf)
+{
+ struct enetc_hw *hw = &pf->si->hw;
+ u32 num_rx_bdr, num_tx_bdr, val;
+ u32 vf_tx_bdr, vf_rx_bdr;
+ int i, rx_rem, tx_rem;
+
+ if (pf->caps.num_rx_bdr < ENETC_SI_MAX_RING_NUM + pf->caps.num_vsi)
+ num_rx_bdr = pf->caps.num_rx_bdr - pf->caps.num_vsi;
+ else
+ num_rx_bdr = ENETC_SI_MAX_RING_NUM;
+
+ if (pf->caps.num_tx_bdr < ENETC_SI_MAX_RING_NUM + pf->caps.num_vsi)
+ num_tx_bdr = pf->caps.num_tx_bdr - pf->caps.num_vsi;
+ else
+ num_tx_bdr = ENETC_SI_MAX_RING_NUM;
+
+ val = enetc4_psicfgr0_val_construct(false, num_tx_bdr, num_rx_bdr);
+ enetc_port_wr(hw, ENETC4_PSICFGR0(0), val);
+
+ num_rx_bdr = pf->caps.num_rx_bdr - num_rx_bdr;
+ rx_rem = num_rx_bdr % pf->caps.num_vsi;
+ num_rx_bdr = num_rx_bdr / pf->caps.num_vsi;
+
+ num_tx_bdr = pf->caps.num_tx_bdr - num_tx_bdr;
+ tx_rem = num_tx_bdr % pf->caps.num_vsi;
+ num_tx_bdr = num_tx_bdr / pf->caps.num_vsi;
+
+ for (i = 0; i < pf->caps.num_vsi; i++) {
+ vf_tx_bdr = (i < tx_rem) ? num_tx_bdr + 1 : num_tx_bdr;
+ vf_rx_bdr = (i < rx_rem) ? num_rx_bdr + 1 : num_rx_bdr;
+ val = enetc4_psicfgr0_val_construct(true, vf_tx_bdr, vf_rx_bdr);
+ enetc_port_wr(hw, ENETC4_PSICFGR0(i + 1), val);
+ }
+}
+
+static void enetc4_allocate_si_rings(struct enetc_pf *pf)
+{
+ enetc4_default_rings_allocation(pf);
+}
+
+static void enetc4_pf_set_si_vlan_promisc(struct enetc_hw *hw, int si, bool en)
+{
+ u32 val = enetc_port_rd(hw, ENETC4_PSIPVMR);
+
+ if (en)
+ val |= BIT(si);
+ else
+ val &= ~BIT(si);
+
+ enetc_port_wr(hw, ENETC4_PSIPVMR, val);
+}
+
+static void enetc4_set_default_si_vlan_promisc(struct enetc_pf *pf)
+{
+ struct enetc_hw *hw = &pf->si->hw;
+ int num_si = pf->caps.num_vsi + 1;
+ int i;
+
+ /* enforce VLAN promisc mode for all SIs */
+ for (i = 0; i < num_si; i++)
+ enetc4_pf_set_si_vlan_promisc(hw, i, true);
+}
+
+/* Allocate the number of MSI-X vectors for per SI. */
+static void enetc4_set_si_msix_num(struct enetc_pf *pf)
+{
+ struct enetc_hw *hw = &pf->si->hw;
+ int i, num_msix, total_si;
+ u32 val;
+
+ total_si = pf->caps.num_vsi + 1;
+
+ num_msix = pf->caps.num_msix / total_si +
+ pf->caps.num_msix % total_si - 1;
+ val = num_msix & 0x3f;
+ enetc_port_wr(hw, ENETC4_PSICFGR2(0), val);
+
+ num_msix = pf->caps.num_msix / total_si - 1;
+ val = num_msix & 0x3f;
+ for (i = 0; i < pf->caps.num_vsi; i++)
+ enetc_port_wr(hw, ENETC4_PSICFGR2(i + 1), val);
+}
+
+static void enetc4_enable_all_si(struct enetc_pf *pf)
+{
+ struct enetc_hw *hw = &pf->si->hw;
+ int num_si = pf->caps.num_vsi + 1;
+ u32 si_bitmap = 0;
+ int i;
+
+ /* Master enable for all SIs */
+ for (i = 0; i < num_si; i++)
+ si_bitmap |= PMR_SI_EN(i);
+
+ enetc_port_wr(hw, ENETC4_PMR, si_bitmap);
+}
+
+static void enetc4_configure_port_si(struct enetc_pf *pf)
+{
+ struct enetc_hw *hw = &pf->si->hw;
+
+ enetc4_allocate_si_rings(pf);
+
+ /* Outer VLAN tag will be used for VLAN filtering */
+ enetc_port_wr(hw, ENETC4_PSIVLANFMR, PSIVLANFMR_VS);
+
+ enetc4_set_default_si_vlan_promisc(pf);
+
+ /* Disable SI MAC multicast & unicast promiscuous */
+ enetc_port_wr(hw, ENETC4_PSIPMMR, 0);
+
+ enetc4_set_si_msix_num(pf);
+
+ enetc4_enable_all_si(pf);
+}
+
+static void enetc4_pf_reset_tc_msdu(struct enetc_hw *hw)
+{
+ u32 val = ENETC_MAC_MAXFRM_SIZE;
+ int tc;
+
+ val = u32_replace_bits(val, SDU_TYPE_MPDU, PTCTMSDUR_SDU_TYPE);
+
+ for (tc = 0; tc < 8; tc++)
+ enetc_port_wr(hw, ENETC4_PTCTMSDUR(tc), val);
+}
+
+static void enetc4_set_trx_frame_size(struct enetc_pf *pf)
+{
+ struct enetc_si *si = pf->si;
+
+ enetc_port_mac_wr(si, ENETC4_PM_MAXFRM(0),
+ ENETC_SET_MAXFRM(ENETC_MAC_MAXFRM_SIZE));
+
+ enetc4_pf_reset_tc_msdu(&si->hw);
+}
+
+static void enetc4_set_rss_key(struct enetc_hw *hw, const u8 *bytes)
+{
+ int i;
+
+ for (i = 0; i < ENETC_RSSHASH_KEY_SIZE / 4; i++)
+ enetc_port_wr(hw, ENETC4_PRSSKR(i), ((u32 *)bytes)[i]);
+}
+
+static void enetc4_set_default_rss_key(struct enetc_pf *pf)
+{
+ u8 hash_key[ENETC_RSSHASH_KEY_SIZE] = {0};
+ struct enetc_hw *hw = &pf->si->hw;
+
+ /* set up hash key */
+ get_random_bytes(hash_key, ENETC_RSSHASH_KEY_SIZE);
+ enetc4_set_rss_key(hw, hash_key);
+}
+
+static void enetc4_enable_trx(struct enetc_pf *pf)
+{
+ struct enetc_hw *hw = &pf->si->hw;
+
+ /* Enable port transmit/receive */
+ enetc_port_wr(hw, ENETC4_POR, 0);
+}
+
+static void enetc4_configure_port(struct enetc_pf *pf)
+{
+ enetc4_configure_port_si(pf);
+ enetc4_set_trx_frame_size(pf);
+ enetc4_set_default_rss_key(pf);
+ enetc4_enable_trx(pf);
+}
+
+static int enetc4_pf_init(struct enetc_pf *pf)
+{
+ struct device *dev = &pf->si->pdev->dev;
+ int err;
+
+ /* Initialize the MAC address for PF and VFs */
+ err = enetc_setup_mac_addresses(dev->of_node, pf);
+ if (err) {
+ dev_err(dev, "Failed to set MAC addresses\n");
+ return err;
+ }
+
+ enetc4_configure_port(pf);
+
+ return 0;
+}
+
+static const struct net_device_ops enetc4_ndev_ops = {
+ .ndo_open = enetc_open,
+ .ndo_stop = enetc_close,
+ .ndo_start_xmit = enetc_xmit,
+ .ndo_get_stats = enetc_get_stats,
+ .ndo_set_mac_address = enetc_pf_set_mac_addr,
+};
+
+static struct phylink_pcs *
+enetc4_pl_mac_select_pcs(struct phylink_config *config, phy_interface_t iface)
+{
+ struct enetc_pf *pf = phylink_to_enetc_pf(config);
+
+ return pf->pcs;
+}
+
+static void enetc4_mac_config(struct enetc_pf *pf, unsigned int mode,
+ phy_interface_t phy_mode)
+{
+ struct enetc_ndev_priv *priv = netdev_priv(pf->si->ndev);
+ struct enetc_si *si = pf->si;
+ u32 val;
+
+ val = enetc_port_mac_rd(si, ENETC4_PM_IF_MODE(0));
+ val &= ~(PM_IF_MODE_IFMODE | PM_IF_MODE_ENA);
+
+ switch (phy_mode) {
+ case PHY_INTERFACE_MODE_RGMII:
+ case PHY_INTERFACE_MODE_RGMII_ID:
+ case PHY_INTERFACE_MODE_RGMII_RXID:
+ case PHY_INTERFACE_MODE_RGMII_TXID:
+ val |= IFMODE_RGMII;
+ /* We need to enable auto-negotiation for the MAC
+ * if its RGMII interface support In-Band status.
+ */
+ if (phylink_autoneg_inband(mode))
+ val |= PM_IF_MODE_ENA;
+ break;
+ case PHY_INTERFACE_MODE_RMII:
+ val |= IFMODE_RMII;
+ break;
+ case PHY_INTERFACE_MODE_SGMII:
+ case PHY_INTERFACE_MODE_2500BASEX:
+ val |= IFMODE_SGMII;
+ break;
+ case PHY_INTERFACE_MODE_10GBASER:
+ case PHY_INTERFACE_MODE_XGMII:
+ case PHY_INTERFACE_MODE_USXGMII:
+ val |= IFMODE_XGMII;
+ break;
+ default:
+ dev_err(priv->dev,
+ "Unsupported PHY mode:%d\n", phy_mode);
+ return;
+ }
+
+ enetc_port_mac_wr(si, ENETC4_PM_IF_MODE(0), val);
+}
+
+static void enetc4_pl_mac_config(struct phylink_config *config, unsigned int mode,
+ const struct phylink_link_state *state)
+{
+ struct enetc_pf *pf = phylink_to_enetc_pf(config);
+
+ enetc4_mac_config(pf, mode, state->interface);
+}
+
+static void enetc4_set_port_speed(struct enetc_ndev_priv *priv, int speed)
+{
+ u32 old_speed = priv->speed;
+ u32 val;
+
+ if (speed == old_speed)
+ return;
+
+ val = enetc_port_rd(&priv->si->hw, ENETC4_PCR);
+ val &= ~PCR_PSPEED;
+
+ switch (speed) {
+ case SPEED_100:
+ case SPEED_1000:
+ case SPEED_2500:
+ case SPEED_10000:
+ val |= (PCR_PSPEED & PCR_PSPEED_VAL(speed));
+ break;
+ case SPEED_10:
+ default:
+ val |= (PCR_PSPEED & PCR_PSPEED_VAL(SPEED_10));
+ }
+
+ priv->speed = speed;
+ enetc_port_wr(&priv->si->hw, ENETC4_PCR, val);
+}
+
+static void enetc4_set_rgmii_mac(struct enetc_pf *pf, int speed, int duplex)
+{
+ struct enetc_si *si = pf->si;
+ u32 old_val, val;
+
+ old_val = enetc_port_mac_rd(si, ENETC4_PM_IF_MODE(0));
+ val = old_val & ~(PM_IF_MODE_ENA | PM_IF_MODE_M10 | PM_IF_MODE_REVMII);
+
+ switch (speed) {
+ case SPEED_1000:
+ val = u32_replace_bits(val, SSP_1G, PM_IF_MODE_SSP);
+ break;
+ case SPEED_100:
+ val = u32_replace_bits(val, SSP_100M, PM_IF_MODE_SSP);
+ break;
+ case SPEED_10:
+ val = u32_replace_bits(val, SSP_10M, PM_IF_MODE_SSP);
+ }
+
+ val = u32_replace_bits(val, duplex == DUPLEX_FULL ? 0 : 1,
+ PM_IF_MODE_HD);
+
+ if (val == old_val)
+ return;
+
+ enetc_port_mac_wr(si, ENETC4_PM_IF_MODE(0), val);
+}
+
+static void enetc4_set_rmii_mac(struct enetc_pf *pf, int speed, int duplex)
+{
+ struct enetc_si *si = pf->si;
+ u32 old_val, val;
+
+ old_val = enetc_port_mac_rd(si, ENETC4_PM_IF_MODE(0));
+ val = old_val & ~(PM_IF_MODE_ENA | PM_IF_MODE_SSP);
+
+ switch (speed) {
+ case SPEED_100:
+ val &= ~PM_IF_MODE_M10;
+ break;
+ case SPEED_10:
+ val |= PM_IF_MODE_M10;
+ }
+
+ val = u32_replace_bits(val, duplex == DUPLEX_FULL ? 0 : 1,
+ PM_IF_MODE_HD);
+
+ if (val == old_val)
+ return;
+
+ enetc_port_mac_wr(si, ENETC4_PM_IF_MODE(0), val);
+}
+
+static void enetc4_set_hd_flow_control(struct enetc_pf *pf, bool enable)
+{
+ struct enetc_si *si = pf->si;
+ u32 old_val, val;
+
+ if (!pf->caps.half_duplex)
+ return;
+
+ old_val = enetc_port_mac_rd(si, ENETC4_PM_CMD_CFG(0));
+ val = u32_replace_bits(old_val, enable ? 1 : 0, PM_CMD_CFG_HD_FCEN);
+ if (val == old_val)
+ return;
+
+ enetc_port_mac_wr(si, ENETC4_PM_CMD_CFG(0), val);
+}
+
+static void enetc4_set_rx_pause(struct enetc_pf *pf, bool rx_pause)
+{
+ struct enetc_si *si = pf->si;
+ u32 old_val, val;
+
+ old_val = enetc_port_mac_rd(si, ENETC4_PM_CMD_CFG(0));
+ val = u32_replace_bits(old_val, rx_pause ? 0 : 1, PM_CMD_CFG_PAUSE_IGN);
+ if (val == old_val)
+ return;
+
+ enetc_port_mac_wr(si, ENETC4_PM_CMD_CFG(0), val);
+}
+
+static void enetc4_set_tx_pause(struct enetc_pf *pf, int num_rxbdr, bool tx_pause)
+{
+ u32 pause_off_thresh = 0, pause_on_thresh = 0;
+ u32 init_quanta = 0, refresh_quanta = 0;
+ struct enetc_hw *hw = &pf->si->hw;
+ u32 rbmr, old_rbmr;
+ int i;
+
+ for (i = 0; i < num_rxbdr; i++) {
+ old_rbmr = enetc_rxbdr_rd(hw, i, ENETC_RBMR);
+ rbmr = u32_replace_bits(old_rbmr, tx_pause ? 1 : 0, ENETC_RBMR_CM);
+ if (rbmr == old_rbmr)
+ continue;
+
+ enetc_rxbdr_wr(hw, i, ENETC_RBMR, rbmr);
+ }
+
+ if (tx_pause) {
+ /* When the port first enters congestion, send a PAUSE request
+ * with the maximum number of quanta. When the port exits
+ * congestion, it will automatically send a PAUSE frame with
+ * zero quanta.
+ */
+ init_quanta = 0xffff;
+
+ /* Also, set up the refresh timer to send follow-up PAUSE
+ * frames at half the quanta value, in case the congestion
+ * condition persists.
+ */
+ refresh_quanta = 0xffff / 2;
+
+ /* Start emitting PAUSE frames when 3 large frames (or more
+ * smaller frames) have accumulated in the FIFO waiting to be
+ * DMAed to the RX ring.
+ */
+ pause_on_thresh = 3 * ENETC_MAC_MAXFRM_SIZE;
+ pause_off_thresh = 1 * ENETC_MAC_MAXFRM_SIZE;
+ }
+
+ enetc_port_mac_wr(pf->si, ENETC4_PM_PAUSE_QUANTA(0), init_quanta);
+ enetc_port_mac_wr(pf->si, ENETC4_PM_PAUSE_THRESH(0), refresh_quanta);
+ enetc_port_wr(hw, ENETC4_PPAUONTR, pause_on_thresh);
+ enetc_port_wr(hw, ENETC4_PPAUOFFTR, pause_off_thresh);
+}
+
+static void enetc4_enable_mac(struct enetc_pf *pf, bool en)
+{
+ struct enetc_si *si = pf->si;
+ u32 val;
+
+ val = enetc_port_mac_rd(si, ENETC4_PM_CMD_CFG(0));
+ val &= ~(PM_CMD_CFG_TX_EN | PM_CMD_CFG_RX_EN);
+ val |= en ? (PM_CMD_CFG_TX_EN | PM_CMD_CFG_RX_EN) : 0;
+
+ enetc_port_mac_wr(si, ENETC4_PM_CMD_CFG(0), val);
+}
+
+static void enetc4_pl_mac_link_up(struct phylink_config *config,
+ struct phy_device *phy, unsigned int mode,
+ phy_interface_t interface, int speed,
+ int duplex, bool tx_pause, bool rx_pause)
+{
+ struct enetc_pf *pf = phylink_to_enetc_pf(config);
+ struct enetc_si *si = pf->si;
+ struct enetc_ndev_priv *priv;
+ bool hd_fc = false;
+
+ priv = netdev_priv(si->ndev);
+ enetc4_set_port_speed(priv, speed);
+
+ if (!phylink_autoneg_inband(mode) &&
+ phy_interface_mode_is_rgmii(interface))
+ enetc4_set_rgmii_mac(pf, speed, duplex);
+
+ if (interface == PHY_INTERFACE_MODE_RMII)
+ enetc4_set_rmii_mac(pf, speed, duplex);
+
+ if (duplex == DUPLEX_FULL) {
+ /* When preemption is enabled, generation of PAUSE frames
+ * must be disabled, as stated in the IEEE 802.3 standard.
+ */
+ if (priv->active_offloads & ENETC_F_QBU)
+ tx_pause = false;
+ } else { /* DUPLEX_HALF */
+ if (tx_pause || rx_pause)
+ hd_fc = true;
+
+ /* As per 802.3 annex 31B, PAUSE frames are only supported
+ * when the link is configured for full duplex operation.
+ */
+ tx_pause = false;
+ rx_pause = false;
+ }
+
+ enetc4_set_hd_flow_control(pf, hd_fc);
+ enetc4_set_tx_pause(pf, priv->num_rx_rings, tx_pause);
+ enetc4_set_rx_pause(pf, rx_pause);
+ enetc4_enable_mac(pf, true);
+}
+
+static void enetc4_pl_mac_link_down(struct phylink_config *config,
+ unsigned int mode,
+ phy_interface_t interface)
+{
+ struct enetc_pf *pf = phylink_to_enetc_pf(config);
+
+ enetc4_enable_mac(pf, false);
+}
+
+static const struct phylink_mac_ops enetc_pl_mac_ops = {
+ .mac_select_pcs = enetc4_pl_mac_select_pcs,
+ .mac_config = enetc4_pl_mac_config,
+ .mac_link_up = enetc4_pl_mac_link_up,
+ .mac_link_down = enetc4_pl_mac_link_down,
+};
+
+static int enetc4_link_init(struct enetc_ndev_priv *priv,
+ struct device_node *node)
+{
+ struct enetc_pf *pf = enetc_si_priv(priv->si);
+ struct device *dev = priv->dev;
+ int err;
+
+ err = of_get_phy_mode(node, &pf->if_mode);
+ if (err) {
+ dev_err(dev, "Failed to get PHY mode\n");
+ return err;
+ }
+
+ err = enetc_mdiobus_create(pf, node);
+ if (err) {
+ dev_err(dev, "Failed to create MDIO bus\n");
+ return err;
+ }
+
+ err = enetc_phylink_create(priv, node, &enetc_pl_mac_ops);
+ if (err) {
+ dev_err(dev, "Failed to create phylink\n");
+ goto err_phylink_create;
+ }
+
+ return 0;
+
+err_phylink_create:
+ enetc_mdiobus_destroy(pf);
+
+ return err;
+}
+
+static void enetc4_link_deinit(struct enetc_ndev_priv *priv)
+{
+ struct enetc_pf *pf = enetc_si_priv(priv->si);
+
+ enetc_phylink_destroy(priv);
+ enetc_mdiobus_destroy(pf);
+}
+
+static int enetc4_pf_netdev_create(struct enetc_si *si)
+{
+ struct device *dev = &si->pdev->dev;
+ struct enetc_ndev_priv *priv;
+ struct net_device *ndev;
+ int err;
+
+ ndev = alloc_etherdev_mqs(sizeof(struct enetc_ndev_priv),
+ si->num_tx_rings, si->num_rx_rings);
+ if (!ndev)
+ return -ENOMEM;
+
+ priv = netdev_priv(ndev);
+ priv->ref_clk = devm_clk_get_optional(dev, "enet_ref_clk");
+ if (IS_ERR(priv->ref_clk)) {
+ dev_err(dev, "Get enet_ref_clk failed\n");
+ err = PTR_ERR(priv->ref_clk);
+ goto err_clk_get;
+ }
+
+ enetc_pf_netdev_setup(si, ndev, &enetc4_ndev_ops);
+
+ enetc_init_si_rings_params(priv);
+
+ err = enetc_configure_si(priv);
+ if (err) {
+ dev_err(dev, "Failed to configure SI\n");
+ goto err_config_si;
+ }
+
+ err = enetc_alloc_msix(priv);
+ if (err) {
+ dev_err(dev, "Failed to alloc MSI-X\n");
+ goto err_alloc_msix;
+ }
+
+ err = enetc4_link_init(priv, dev->of_node);
+ if (err)
+ goto err_link_init;
+
+ err = register_netdev(ndev);
+ if (err) {
+ dev_err(dev, "Failed to register netdev\n");
+ goto err_reg_netdev;
+ }
+
+ return 0;
+
+err_reg_netdev:
+ enetc4_link_deinit(priv);
+err_link_init:
+ enetc_free_msix(priv);
+err_alloc_msix:
+err_config_si:
+err_clk_get:
+ mutex_destroy(&priv->mm_lock);
+ free_netdev(ndev);
+
+ return err;
+}
+
+static void enetc4_pf_netdev_destroy(struct enetc_si *si)
+{
+ struct net_device *ndev = si->ndev;
+ struct enetc_ndev_priv *priv;
+
+ priv = netdev_priv(ndev);
+ unregister_netdev(ndev);
+ enetc_free_msix(priv);
+ free_netdev(ndev);
+}
+
+static int enetc4_pf_probe(struct pci_dev *pdev,
+ const struct pci_device_id *ent)
+{
+ struct device *dev = &pdev->dev;
+ struct enetc_si *si;
+ struct enetc_pf *pf;
+ int err;
+
+ err = enetc_pci_probe(pdev, KBUILD_MODNAME, sizeof(*pf));
+ if (err) {
+ dev_err(dev, "PCIe probing failed\n");
+ return err;
+ }
+
+ /* si is the private data. */
+ si = pci_get_drvdata(pdev);
+ if (!si->hw.port || !si->hw.global) {
+ err = -ENODEV;
+ dev_err(dev, "Couldn't map PF only space!\n");
+ goto err_enetc_pci_probe;
+ }
+
+ err = enetc4_pf_struct_init(si);
+ if (err)
+ goto err_pf_struct_init;
+
+ pf = enetc_si_priv(si);
+ err = enetc4_pf_init(pf);
+ if (err)
+ goto err_pf_init;
+
+ pinctrl_pm_select_default_state(dev);
+ enetc_get_si_caps(si);
+ err = enetc4_pf_netdev_create(si);
+ if (err)
+ goto err_netdev_create;
+
+ return 0;
+
+err_netdev_create:
+err_pf_init:
+err_pf_struct_init:
+err_enetc_pci_probe:
+ enetc_pci_remove(pdev);
+
+ return err;
+}
+
+static void enetc4_pf_remove(struct pci_dev *pdev)
+{
+ struct enetc_si *si;
+ struct enetc_pf *pf;
+
+ si = pci_get_drvdata(pdev);
+ pf = enetc_si_priv(si);
+
+ enetc4_pf_netdev_destroy(si);
+ enetc_pci_remove(pdev);
+}
+
+static const struct pci_device_id enetc4_pf_id_table[] = {
+ { PCI_DEVICE(PCI_VENDOR_ID_NXP2, PCI_DEVICE_ID_NXP2_ENETC_PF) },
+ { 0, } /* End of table. */
+};
+MODULE_DEVICE_TABLE(pci, enetc4_pf_id_table);
+
+static struct pci_driver enetc4_pf_driver = {
+ .name = KBUILD_MODNAME,
+ .id_table = enetc4_pf_id_table,
+ .probe = enetc4_pf_probe,
+ .remove = enetc4_pf_remove,
+};
+module_pci_driver(enetc4_pf_driver);
+
+MODULE_DESCRIPTION("ENETC4 PF Driver");
+MODULE_LICENSE("Dual BSD/GPL");
diff --git a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
index 2563eb8ac7b6..13ce771e0c43 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
@@ -44,6 +44,9 @@ static int enetc_get_reglen(struct net_device *ndev)
struct enetc_hw *hw = &priv->si->hw;
int len;
+ if (is_enetc_rev4(priv->si))
+ return -EOPNOTSUPP;
+
len = ARRAY_SIZE(enetc_si_regs);
len += ARRAY_SIZE(enetc_txbdr_regs) * priv->num_tx_rings;
len += ARRAY_SIZE(enetc_rxbdr_regs) * priv->num_rx_rings;
@@ -68,6 +71,9 @@ static void enetc_get_regs(struct net_device *ndev, struct ethtool_regs *regs,
int i, j;
u32 addr;
+ if (is_enetc_rev4(priv->si))
+ return;
+
for (i = 0; i < ARRAY_SIZE(enetc_si_regs); i++) {
*buf++ = enetc_si_regs[i];
*buf++ = enetc_rd(hw, enetc_si_regs[i]);
@@ -229,6 +235,9 @@ static int enetc_get_sset_count(struct net_device *ndev, int sset)
struct enetc_ndev_priv *priv = netdev_priv(ndev);
int len;
+ if (is_enetc_rev4(priv->si))
+ return -EOPNOTSUPP;
+
if (sset != ETH_SS_STATS)
return -EOPNOTSUPP;
@@ -250,6 +259,9 @@ static void enetc_get_strings(struct net_device *ndev, u32 stringset, u8 *data)
u8 *p = data;
int i, j;
+ if (is_enetc_rev4(priv->si))
+ return;
+
switch (stringset) {
case ETH_SS_STATS:
for (i = 0; i < ARRAY_SIZE(enetc_si_counters); i++) {
@@ -290,6 +302,9 @@ static void enetc_get_ethtool_stats(struct net_device *ndev,
struct enetc_hw *hw = &priv->si->hw;
int i, o = 0;
+ if (is_enetc_rev4(priv->si))
+ return;
+
for (i = 0; i < ARRAY_SIZE(enetc_si_counters); i++)
data[o++] = enetc_rd64(hw, enetc_si_counters[i].reg);
@@ -331,6 +346,9 @@ static void enetc_get_pause_stats(struct net_device *ndev,
struct enetc_hw *hw = &priv->si->hw;
struct enetc_si *si = priv->si;
+ if (is_enetc_rev4(si))
+ return;
+
switch (pause_stats->src) {
case ETHTOOL_MAC_STATS_SRC_EMAC:
enetc_pause_stats(hw, 0, pause_stats);
@@ -418,6 +436,9 @@ static void enetc_get_eth_mac_stats(struct net_device *ndev,
struct enetc_hw *hw = &priv->si->hw;
struct enetc_si *si = priv->si;
+ if (is_enetc_rev4(si))
+ return;
+
switch (mac_stats->src) {
case ETHTOOL_MAC_STATS_SRC_EMAC:
enetc_mac_stats(hw, 0, mac_stats);
@@ -439,6 +460,9 @@ static void enetc_get_eth_ctrl_stats(struct net_device *ndev,
struct enetc_hw *hw = &priv->si->hw;
struct enetc_si *si = priv->si;
+ if (is_enetc_rev4(si))
+ return;
+
switch (ctrl_stats->src) {
case ETHTOOL_MAC_STATS_SRC_EMAC:
enetc_ctrl_stats(hw, 0, ctrl_stats);
@@ -461,6 +485,9 @@ static void enetc_get_rmon_stats(struct net_device *ndev,
struct enetc_hw *hw = &priv->si->hw;
struct enetc_si *si = priv->si;
+ if (is_enetc_rev4(si))
+ return;
+
*ranges = enetc_rmon_ranges;
switch (rmon_stats->src) {
@@ -593,6 +620,9 @@ static int enetc_get_rxnfc(struct net_device *ndev, struct ethtool_rxnfc *rxnfc,
struct enetc_ndev_priv *priv = netdev_priv(ndev);
int i, j;
+ if (is_enetc_rev4(priv->si))
+ return -EOPNOTSUPP;
+
switch (rxnfc->cmd) {
case ETHTOOL_GRXRINGS:
rxnfc->data = priv->num_rx_rings;
@@ -643,6 +673,9 @@ static int enetc_set_rxnfc(struct net_device *ndev, struct ethtool_rxnfc *rxnfc)
struct enetc_ndev_priv *priv = netdev_priv(ndev);
int err;
+ if (is_enetc_rev4(priv->si))
+ return -EOPNOTSUPP;
+
switch (rxnfc->cmd) {
case ETHTOOL_SRXCLSRLINS:
if (rxnfc->fs.location >= priv->si->num_fs_entries)
@@ -678,6 +711,9 @@ static u32 enetc_get_rxfh_key_size(struct net_device *ndev)
{
struct enetc_ndev_priv *priv = netdev_priv(ndev);
+ if (is_enetc_rev4(priv->si))
+ return 0;
+
/* return the size of the RX flow hash key. PF only */
return (priv->si->hw.port) ? ENETC_RSSHASH_KEY_SIZE : 0;
}
@@ -686,6 +722,9 @@ static u32 enetc_get_rxfh_indir_size(struct net_device *ndev)
{
struct enetc_ndev_priv *priv = netdev_priv(ndev);
+ if (is_enetc_rev4(priv->si))
+ return 0;
+
/* return the size of the RX flow hash indirection table */
return priv->si->num_rss;
}
@@ -697,6 +736,9 @@ static int enetc_get_rxfh(struct net_device *ndev,
struct enetc_hw *hw = &priv->si->hw;
int err = 0, i;
+ if (is_enetc_rev4(priv->si))
+ return -EOPNOTSUPP;
+
/* return hash function */
rxfh->hfunc = ETH_RSS_HASH_TOP;
@@ -731,6 +773,9 @@ static int enetc_set_rxfh(struct net_device *ndev,
struct enetc_hw *hw = &priv->si->hw;
int err = 0;
+ if (is_enetc_rev4(priv->si))
+ return -EOPNOTSUPP;
+
/* set hash key, if PF */
if (rxfh->key && hw->port)
enetc_set_rss_key(hw, rxfh->key);
@@ -775,9 +820,10 @@ static int enetc_get_coalesce(struct net_device *ndev,
{
struct enetc_ndev_priv *priv = netdev_priv(ndev);
struct enetc_int_vector *v = priv->int_vector[0];
+ u64 clk_freq = priv->si->clk_freq;
- ic->tx_coalesce_usecs = enetc_cycles_to_usecs(priv->tx_ictt);
- ic->rx_coalesce_usecs = enetc_cycles_to_usecs(v->rx_ictt);
+ ic->tx_coalesce_usecs = enetc_cycles_to_usecs(priv->tx_ictt, clk_freq);
+ ic->rx_coalesce_usecs = enetc_cycles_to_usecs(v->rx_ictt, clk_freq);
ic->tx_max_coalesced_frames = ENETC_TXIC_PKTTHR;
ic->rx_max_coalesced_frames = ENETC_RXIC_PKTTHR;
@@ -793,12 +839,13 @@ static int enetc_set_coalesce(struct net_device *ndev,
struct netlink_ext_ack *extack)
{
struct enetc_ndev_priv *priv = netdev_priv(ndev);
+ u64 clk_freq = priv->si->clk_freq;
u32 rx_ictt, tx_ictt;
int i, ic_mode;
bool changed;
- tx_ictt = enetc_usecs_to_cycles(ic->tx_coalesce_usecs);
- rx_ictt = enetc_usecs_to_cycles(ic->rx_coalesce_usecs);
+ tx_ictt = enetc_usecs_to_cycles(ic->tx_coalesce_usecs, clk_freq);
+ rx_ictt = enetc_usecs_to_cycles(ic->rx_coalesce_usecs, clk_freq);
if (ic->rx_max_coalesced_frames != ENETC_RXIC_PKTTHR)
return -EOPNOTSUPP;
@@ -843,8 +890,12 @@ static int enetc_set_coalesce(struct net_device *ndev,
static int enetc_get_ts_info(struct net_device *ndev,
struct kernel_ethtool_ts_info *info)
{
+ struct enetc_ndev_priv *priv = netdev_priv(ndev);
int *phc_idx;
+ if (is_enetc_rev4(priv->si))
+ return -EOPNOTSUPP;
+
phc_idx = symbol_get(enetc_phc_index);
if (phc_idx) {
info->phc_index = *phc_idx;
@@ -942,6 +993,9 @@ static void enetc_get_mm_stats(struct net_device *ndev,
struct enetc_hw *hw = &priv->si->hw;
struct enetc_si *si = priv->si;
+ if (is_enetc_rev4(si))
+ return;
+
if (!(si->hw_features & ENETC_SI_F_QBU))
return;
@@ -960,6 +1014,9 @@ static int enetc_get_mm(struct net_device *ndev, struct ethtool_mm_state *state)
struct enetc_hw *hw = &si->hw;
u32 lafs, rafs, val;
+ if (is_enetc_rev4(si))
+ return -EOPNOTSUPP;
+
if (!(si->hw_features & ENETC_SI_F_QBU))
return -EOPNOTSUPP;
@@ -1090,6 +1147,9 @@ static int enetc_set_mm(struct net_device *ndev, struct ethtool_mm_cfg *cfg,
u32 val, add_frag_size;
int err;
+ if (is_enetc_rev4(si))
+ return -EOPNOTSUPP;
+
if (!(si->hw_features & ENETC_SI_F_QBU))
return -EOPNOTSUPP;
diff --git a/drivers/net/ethernet/freescale/enetc/enetc_hw.h b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
index 6a7b9b75d660..230e94986091 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc_hw.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
@@ -25,6 +25,7 @@
#define ENETC_SIPCAPR0_RSS BIT(8)
#define ENETC_SIPCAPR0_QBV BIT(4)
#define ENETC_SIPCAPR0_QBU BIT(3)
+#define ENETC_SIPCAPR0_RFS BIT(2)
#define ENETC_SIPCAPR1 0x24
#define ENETC_SITGTGR 0x30
#define ENETC_SIRBGCR 0x38
@@ -971,15 +972,16 @@ struct enetc_cbd {
u8 status_flags;
};
-#define ENETC_CLK 400000000ULL
-static inline u32 enetc_cycles_to_usecs(u32 cycles)
+#define ENETC_CLK 400000000ULL
+#define ENETC_CLK_333M 333000000ULL
+static inline u32 enetc_cycles_to_usecs(u32 cycles, u64 clk_freq)
{
- return (u32)div_u64(cycles * 1000000ULL, ENETC_CLK);
+ return (u32)div_u64(cycles * 1000000ULL, clk_freq);
}
-static inline u32 enetc_usecs_to_cycles(u32 usecs)
+static inline u32 enetc_usecs_to_cycles(u32 usecs, u64 clk_freq)
{
- return (u32)div_u64(usecs * ENETC_CLK, 1000000ULL);
+ return (u32)div_u64(usecs * clk_freq, 1000000ULL);
}
/* Port traffic class frame preemption register */
diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf.h b/drivers/net/ethernet/freescale/enetc/enetc_pf.h
index ad7dab0eb752..91f2b5afb506 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.h
@@ -28,6 +28,14 @@ struct enetc_vf_state {
enum enetc_vf_flags flags;
};
+struct enetc_port_caps {
+ u32 half_duplex:1;
+ int num_vsi;
+ int num_msix;
+ int num_rx_bdr;
+ int num_tx_bdr;
+};
+
struct enetc_pf;
struct enetc_pf_ops {
@@ -60,6 +68,7 @@ struct enetc_pf {
phy_interface_t if_mode;
struct phylink_config phylink_config;
+ struct enetc_port_caps caps;
const struct enetc_pf_ops *ops;
};
diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c b/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c
index bbfb5c1ffd13..d00e1ddadb43 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c
@@ -119,10 +119,17 @@ void enetc_pf_netdev_setup(struct enetc_si *si, struct net_device *ndev,
ndev->vlan_features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_TSO |
NETIF_F_TSO6 | NETIF_F_GSO_UDP_L4;
+ ndev->priv_flags |= IFF_UNICAST_FLT;
+
+ /* TODO: currently, i.MX95 ENETC driver does not support advanced features */
+ if (is_enetc_rev4(si)) {
+ ndev->hw_features &= ~(NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_LOOPBACK);
+ goto end;
+ }
+
if (si->num_rss)
ndev->hw_features |= NETIF_F_RXHASH;
- ndev->priv_flags |= IFF_UNICAST_FLT;
ndev->xdp_features = NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDIRECT |
NETDEV_XDP_ACT_NDO_XMIT | NETDEV_XDP_ACT_RX_SG |
NETDEV_XDP_ACT_NDO_XMIT_SG;
@@ -133,6 +140,7 @@ void enetc_pf_netdev_setup(struct enetc_si *si, struct net_device *ndev,
ndev->hw_features |= NETIF_F_HW_TC;
}
+end:
/* pick up primary MAC address from SI */
enetc_load_primary_mac_addr(&si->hw, ndev);
}
--
2.34.1On Wed, Oct 09, 2024 at 05:51:15PM +0800, Wei Fang wrote:
> The i.MX95 ENETC has been upgraded to revision 4.1, which is very
> different from the LS1028A ENETC (revision 1.0) except for the SI
> part. Therefore, the fsl-enetc driver is incompatible with i.MX95
> ENETC PF. So we developed the nxp-enetc4 driver for i.MX95 ENETC
> PF, and this driver will be used to support the ENETC PF with major
> revision 4 in the future.
>
> Currently, the nxp-enetc4 driver only supports basic transmission
> feature for i.MX95 ENETC PF, the more basic and advanced features
> will be added in the subsequent patches.
>
> Signed-off-by: Wei Fang <wei.fang@nxp.com>
...
> diff --git a/drivers/net/ethernet/freescale/enetc/enetc4_pf.c b/drivers/net/ethernet/freescale/enetc/enetc4_pf.c
...
> +static void enetc4_pf_remove(struct pci_dev *pdev)
> +{
> + struct enetc_si *si;
> + struct enetc_pf *pf;
> +
> + si = pci_get_drvdata(pdev);
> + pf = enetc_si_priv(si);
Hi Wei Fang,
pf is set but otherwise unused in this function. So I think that it, and
the call to enetc_si_priv() should probably be removed. They can be added
back if and when they are needed in subsequent patches.
> +
> + enetc4_pf_netdev_destroy(si);
> + enetc_pci_remove(pdev);
> +}
...
On Wed, Oct 09, 2024 at 05:51:15PM +0800, Wei Fang wrote:
> The i.MX95 ENETC has been upgraded to revision 4.1, which is very
> different from the LS1028A ENETC (revision 1.0) except for the SI
> part. Therefore, the fsl-enetc driver is incompatible with i.MX95
> ENETC PF. So we developed the nxp-enetc4 driver for i.MX95 ENETC
So add new nxp-enetc4 driver for i.MX95 ENETC PF with
major revision 4.
> PF, and this driver will be used to support the ENETC PF with major
> revision 4 in the future.
>
> Currently, the nxp-enetc4 driver only supports basic transmission
> feature for i.MX95 ENETC PF, the more basic and advanced features
> will be added in the subsequent patches.
>
> Signed-off-by: Wei Fang <wei.fang@nxp.com>
> ---
> drivers/net/ethernet/freescale/enetc/Kconfig | 17 +
> drivers/net/ethernet/freescale/enetc/Makefile | 3 +
> drivers/net/ethernet/freescale/enetc/enetc.c | 50 +-
> drivers/net/ethernet/freescale/enetc/enetc.h | 19 +-
> .../net/ethernet/freescale/enetc/enetc4_hw.h | 153 ++++
> .../net/ethernet/freescale/enetc/enetc4_pf.c | 761 ++++++++++++++++++
> .../ethernet/freescale/enetc/enetc_ethtool.c | 68 +-
> .../net/ethernet/freescale/enetc/enetc_hw.h | 12 +-
> .../net/ethernet/freescale/enetc/enetc_pf.h | 9 +
> .../freescale/enetc/enetc_pf_common.c | 10 +-
> 10 files changed, 1080 insertions(+), 22 deletions(-)
> create mode 100644 drivers/net/ethernet/freescale/enetc/enetc4_hw.h
> create mode 100644 drivers/net/ethernet/freescale/enetc/enetc4_pf.c
>
> diff --git a/drivers/net/ethernet/freescale/enetc/Kconfig b/drivers/net/ethernet/freescale/enetc/Kconfig
> index 6f3306f14060..357c42efc4fb 100644
> --- a/drivers/net/ethernet/freescale/enetc/Kconfig
> +++ b/drivers/net/ethernet/freescale/enetc/Kconfig
> @@ -33,6 +33,23 @@ config FSL_ENETC
>
> If compiled as module (M), the module name is fsl-enetc.
>
> +config NXP_ENETC4
> + tristate "ENETC4 PF driver"
> + depends on PCI_MSI
> + select MDIO_DEVRES
> + select NXP_ENETC_PF_COMMON
> + select FSL_ENETC_CORE
> + select FSL_ENETC_MDIO
> + select PHYLINK
> + select DIMLIB
> + help
> + This driver supports NXP ENETC devices with major revision 4. ENETC is
> + as the NIC functionality in NETC, it supports virtualization/isolation
> + based on PCIe Single Root IO Virtualization (SR-IOV) and a full range
> + of TSN standards and NIC offload capabilities.
> +
> + If compiled as module (M), the module name is nxp-enetc4.
> +
> config FSL_ENETC_VF
> tristate "ENETC VF driver"
> depends on PCI_MSI
> diff --git a/drivers/net/ethernet/freescale/enetc/Makefile b/drivers/net/ethernet/freescale/enetc/Makefile
> index b81ca462e358..5417815957b5 100644
> --- a/drivers/net/ethernet/freescale/enetc/Makefile
> +++ b/drivers/net/ethernet/freescale/enetc/Makefile
> @@ -11,6 +11,9 @@ fsl-enetc-y := enetc_pf.o
> fsl-enetc-$(CONFIG_PCI_IOV) += enetc_msg.o
> fsl-enetc-$(CONFIG_FSL_ENETC_QOS) += enetc_qos.o
>
> +obj-$(CONFIG_NXP_ENETC4) += nxp-enetc4.o
> +nxp-enetc4-y := enetc4_pf.o
> +
> obj-$(CONFIG_FSL_ENETC_VF) += fsl-enetc-vf.o
> fsl-enetc-vf-y := enetc_vf.o
>
> diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
> index b84c88a76762..4e672089e260 100644
> --- a/drivers/net/ethernet/freescale/enetc/enetc.c
> +++ b/drivers/net/ethernet/freescale/enetc/enetc.c
> @@ -2,6 +2,7 @@
> /* Copyright 2017-2019 NXP */
>
> #include "enetc.h"
> +#include <linux/clk.h>
> #include <linux/bpf_trace.h>
> #include <linux/tcp.h>
> #include <linux/udp.h>
> @@ -21,7 +22,7 @@ void enetc_port_mac_wr(struct enetc_si *si, u32 reg, u32 val)
> {
> enetc_port_wr(&si->hw, reg, val);
> if (si->hw_features & ENETC_SI_F_QBU)
> - enetc_port_wr(&si->hw, reg + ENETC_PMAC_OFFSET, val);
> + enetc_port_wr(&si->hw, reg + si->pmac_offset, val);
> }
> EXPORT_SYMBOL_GPL(enetc_port_mac_wr);
>
> @@ -700,8 +701,10 @@ static void enetc_rx_dim_work(struct work_struct *w)
> net_dim_get_rx_moderation(dim->mode, dim->profile_ix);
> struct enetc_int_vector *v =
> container_of(dim, struct enetc_int_vector, rx_dim);
> + struct enetc_ndev_priv *priv = netdev_priv(v->rx_ring.ndev);
> + u64 clk_freq = priv->si->clk_freq;
>
> - v->rx_ictt = enetc_usecs_to_cycles(moder.usec);
> + v->rx_ictt = enetc_usecs_to_cycles(moder.usec, clk_freq);
> dim->state = DIM_START_MEASURE;
> }
>
> @@ -1721,14 +1724,25 @@ void enetc_get_si_caps(struct enetc_si *si)
> struct enetc_hw *hw = &si->hw;
> u32 val;
>
> + if (is_enetc_rev1(si))
> + si->clk_freq = ENETC_CLK;
> + else
> + si->clk_freq = ENETC_CLK_333M;
> +
> /* find out how many of various resources we have to work with */
> val = enetc_rd(hw, ENETC_SICAPR0);
> si->num_rx_rings = (val >> 16) & 0xff;
> si->num_tx_rings = val & 0xff;
>
> - val = enetc_rd(hw, ENETC_SIRFSCAPR);
> - si->num_fs_entries = ENETC_SIRFSCAPR_GET_NUM_RFS(val);
> - si->num_fs_entries = min(si->num_fs_entries, ENETC_MAX_RFS_SIZE);
> + val = enetc_rd(hw, ENETC_SIPCAPR0);
> + if (val & ENETC_SIPCAPR0_RFS) {
> + val = enetc_rd(hw, ENETC_SIRFSCAPR);
> + si->num_fs_entries = ENETC_SIRFSCAPR_GET_NUM_RFS(val);
> + si->num_fs_entries = min(si->num_fs_entries, ENETC_MAX_RFS_SIZE);
> + } else {
> + /* ENETC which not supports RFS */
> + si->num_fs_entries = 0;
> + }
>
> si->num_rss = 0;
> val = enetc_rd(hw, ENETC_SIPCAPR0);
> @@ -1742,8 +1756,11 @@ void enetc_get_si_caps(struct enetc_si *si)
> if (val & ENETC_SIPCAPR0_QBV)
> si->hw_features |= ENETC_SI_F_QBV;
>
> - if (val & ENETC_SIPCAPR0_QBU)
> + if (val & ENETC_SIPCAPR0_QBU) {
> si->hw_features |= ENETC_SI_F_QBU;
> + si->pmac_offset = is_enetc_rev1(si) ? ENETC_PMAC_OFFSET :
> + ENETC4_PMAC_OFFSET;
> + }
>
> if (val & ENETC_SIPCAPR0_PSFP)
> si->hw_features |= ENETC_SI_F_PSFP;
> @@ -2056,7 +2073,7 @@ int enetc_configure_si(struct enetc_ndev_priv *priv)
> /* enable SI */
> enetc_wr(hw, ENETC_SIMR, ENETC_SIMR_EN);
>
> - if (si->num_rss) {
> + if (si->num_rss && is_enetc_rev1(si)) {
> err = enetc_setup_default_rss_table(si, priv->num_rx_rings);
> if (err)
> return err;
> @@ -2080,9 +2097,15 @@ void enetc_init_si_rings_params(struct enetc_ndev_priv *priv)
> */
> priv->num_rx_rings = min_t(int, cpus, si->num_rx_rings);
> priv->num_tx_rings = si->num_tx_rings;
> - priv->bdr_int_num = cpus;
> + if (is_enetc_rev1(si)) {
> + priv->bdr_int_num = cpus;
> + priv->tx_ictt = enetc_usecs_to_cycles(600, ENETC_CLK);
> + } else {
> + priv->bdr_int_num = priv->num_rx_rings;
> + priv->tx_ictt = enetc_usecs_to_cycles(500, ENETC_CLK_333M);
> + }
> +
> priv->ic_mode = ENETC_IC_RX_ADAPTIVE | ENETC_IC_TX_MANUAL;
> - priv->tx_ictt = ENETC_TXIC_TIMETHR;
> }
> EXPORT_SYMBOL_GPL(enetc_init_si_rings_params);
>
> @@ -2475,10 +2498,14 @@ int enetc_open(struct net_device *ndev)
>
> extended = !!(priv->active_offloads & ENETC_F_RX_TSTAMP);
>
> - err = enetc_setup_irqs(priv);
> + err = clk_prepare_enable(priv->ref_clk);
> if (err)
> return err;
>
> + err = enetc_setup_irqs(priv);
> + if (err)
> + goto err_setup_irqs;
> +
> err = enetc_phylink_connect(ndev);
> if (err)
> goto err_phy_connect;
> @@ -2510,6 +2537,8 @@ int enetc_open(struct net_device *ndev)
> phylink_disconnect_phy(priv->phylink);
> err_phy_connect:
> enetc_free_irqs(priv);
> +err_setup_irqs:
> + clk_disable_unprepare(priv->ref_clk);
>
> return err;
> }
> @@ -2559,6 +2588,7 @@ int enetc_close(struct net_device *ndev)
> enetc_assign_tx_resources(priv, NULL);
>
> enetc_free_irqs(priv);
> + clk_disable_unprepare(priv->ref_clk);
>
> return 0;
> }
> diff --git a/drivers/net/ethernet/freescale/enetc/enetc.h b/drivers/net/ethernet/freescale/enetc/enetc.h
> index 97524dfa234c..7f1ea11c33a0 100644
> --- a/drivers/net/ethernet/freescale/enetc/enetc.h
> +++ b/drivers/net/ethernet/freescale/enetc/enetc.h
> @@ -14,6 +14,7 @@
> #include <net/xdp.h>
>
> #include "enetc_hw.h"
> +#include "enetc4_hw.h"
>
> #define ENETC_MAC_MAXFRM_SIZE 9600
> #define ENETC_MAX_MTU (ENETC_MAC_MAXFRM_SIZE - \
> @@ -222,6 +223,7 @@ struct enetc_msg_swbd {
> };
>
> #define ENETC_REV1 0x1
> +#define ENETC_REV4 0x4
> enum enetc_errata {
> ENETC_ERR_VLAN_ISOL = BIT(0),
> ENETC_ERR_UCMCSWP = BIT(1),
> @@ -247,10 +249,22 @@ struct enetc_si {
> int num_rss; /* number of RSS buckets */
> unsigned short pad;
> int hw_features;
> + int pmac_offset; /* Only valid for PSI which supports 802.1Qbu */
> + u64 clk_freq;
> };
>
> #define ENETC_SI_ALIGN 32
>
> +static inline bool is_enetc_rev1(struct enetc_si *si)
> +{
> + return si->pdev->revision == ENETC_REV1;
> +}
> +
> +static inline bool is_enetc_rev4(struct enetc_si *si)
> +{
> + return si->pdev->revision == ENETC_REV4;
> +}
> +
Actually, I suggest you check features, instead of check version number.
> static inline void *enetc_si_priv(const struct enetc_si *si)
> {
> return (char *)si + ALIGN(sizeof(struct enetc_si), ENETC_SI_ALIGN);
> @@ -302,7 +316,7 @@ struct enetc_cls_rule {
> int used;
> };
>
> -#define ENETC_MAX_BDR_INT 2 /* fixed to max # of available cpus */
> +#define ENETC_MAX_BDR_INT 6 /* fixed to max # of available cpus */
> struct psfp_cap {
> u32 max_streamid;
> u32 max_psfp_filter;
> @@ -340,7 +354,6 @@ enum enetc_ic_mode {
>
> #define ENETC_RXIC_PKTTHR min_t(u32, 256, ENETC_RX_RING_DEFAULT_SIZE / 2)
> #define ENETC_TXIC_PKTTHR min_t(u32, 128, ENETC_TX_RING_DEFAULT_SIZE / 2)
> -#define ENETC_TXIC_TIMETHR enetc_usecs_to_cycles(600)
>
> struct enetc_ndev_priv {
> struct net_device *ndev;
> @@ -388,6 +401,8 @@ struct enetc_ndev_priv {
> * and link state updates
> */
> struct mutex mm_lock;
> +
> + struct clk *ref_clk; /* RGMII/RMII reference clock */
> };
>
> /* Messaging */
> diff --git a/drivers/net/ethernet/freescale/enetc/enetc4_hw.h b/drivers/net/ethernet/freescale/enetc/enetc4_hw.h
> new file mode 100644
> index 000000000000..0b2a35189e9d
> --- /dev/null
> +++ b/drivers/net/ethernet/freescale/enetc/enetc4_hw.h
> @@ -0,0 +1,153 @@
> +/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
> +/*
> + * This header file defines the register offsets and bit fields
> + * of ENETC4 PF and VFs. Note that the same registers as ENETC
> + * version 1.0 are defined in the enetc_hw.h file.
> + *
> + * Copyright 2024 NXP
> + */
> +#ifndef __ENETC4_HW_H_
> +#define __ENETC4_HW_H_
> +
> +/***************************ENETC port registers**************************/
> +#define ENETC4_ECAPR0 0x0
> +#define ECAPR0_RFS BIT(2)
> +#define ECAPR0_TSD BIT(5)
> +#define ECAPR0_RSS BIT(8)
> +#define ECAPR0_RSC BIT(9)
> +#define ECAPR0_LSO BIT(10)
> +#define ECAPR0_WO BIT(13)
> +
> +#define ENETC4_ECAPR1 0x4
> +#define ECAPR1_NUM_TCS GENMASK(6, 4)
> +#define ECAPR1_NUM_MCH GENMASK(9, 8)
> +#define ECAPR1_NUM_UCH GENMASK(11, 10)
> +#define ECAPR1_NUM_MSIX GENMASK(22, 12)
> +#define ECAPR1_NUM_VSI GENMASK(27, 24)
> +#define ECAPR1_NUM_IPV BIT(31)
> +
> +#define ENETC4_ECAPR2 0x8
> +#define ECAPR2_NUM_TX_BDR GENMASK(9, 0)
> +#define ECAPR2_NUM_RX_BDR GENMASK(25, 16)
> +
> +#define ENETC4_PMR 0x10
> +#define PMR_SI_EN(a) BIT((16 + (a)))
> +
> +/* Port Pause ON/OFF threshold register */
> +#define ENETC4_PPAUONTR 0x108
> +#define ENETC4_PPAUOFFTR 0x10c
> +
> +/* Port Station interface promiscuous MAC mode register */
> +#define ENETC4_PSIPMMR 0x200
> +#define PSIPMMR_SI0_MAC_UP BIT(0)
> +#define PSIPMMR_SI_MAC_UP GENMASK(2, 0)
> +#define PSIPMMR_SI0_MAC_MP BIT(16)
> +#define PSIPMMR_SI_MAC_MP GENMASK(18, 16)
> +
> +/* Port Station interface promiscuous VLAN mode register */
> +#define ENETC4_PSIPVMR 0x204
> +
> +/* Port RSS key register n. n = 0,1,2,...,9 */
> +#define ENETC4_PRSSKR(n) ((n) * 0x4 + 0x250)
> +
> +/* Port station interface MAC address filtering capability register */
> +#define ENETC4_PSIMAFCAPR 0x280
> +#define PSIMAFCAPR_NUM_MAC_AFTE GENMASK(11, 0)
> +
> +/* Port station interface VLAN filtering capability register */
> +#define ENETC4_PSIVLANFCAPR 0x2c0
> +#define PSIVLANFCAPR_NUM_VLAN_FTE GENMASK(11, 0)
> +
> +/* Port station interface VLAN filtering mode register */
> +#define ENETC4_PSIVLANFMR 0x2c4
> +#define PSIVLANFMR_VS BIT(0)
> +
> +/* Port Station interface a primary MAC address registers */
> +#define ENETC4_PSIPMAR0(a) ((a) * 0x80 + 0x2000)
> +#define ENETC4_PSIPMAR1(a) ((a) * 0x80 + 0x2004)
> +
> +/* Port station interface a configuration register 0/2 */
> +#define ENETC4_PSICFGR0(a) ((a) * 0x80 + 0x2010)
> +#define PSICFGR0_VASE BIT(13)
> +#define PSICFGR0_ASE BIT(15)
> +#define PSICFGR0_ANTI_SPOOFING (PSICFGR0_VASE | PSICFGR0_ASE)
> +
> +#define ENETC4_PSICFGR2(a) ((a) * 0x80 + 0x2018)
> +
> +#define ENETC4_PMCAPR 0x4004
> +#define PMCAPR_HD BIT(8)
> +#define PMCAPR_FP GENMASK(10, 9)
> +
> +/* Port configuration register */
> +#define ENETC4_PCR 0x4010
> +#define PCR_HDR_FMT BIT(0)
> +#define PCR_L2DOSE BIT(4)
> +#define PCR_TIMER_CS BIT(8)
> +#define PCR_PSPEED GENMASK(29, 16)
> +#define PCR_PSPEED_VAL(speed) (((speed) / 10 - 1) << 16)
> +
> +/* Port MAC address register 0/1 */
> +#define ENETC4_PMAR0 0x4020
> +#define ENETC4_PMAR1 0x4024
> +
> +/* Port operational register */
> +#define ENETC4_POR 0x4100
> +
> +/* Port traffic class a transmit maximum SDU register */
> +#define ENETC4_PTCTMSDUR(a) ((a) * 0x20 + 0x4208)
> +#define PTCTMSDUR_MAXSDU GENMASK(15, 0)
> +#define PTCTMSDUR_SDU_TYPE GENMASK(17, 16)
> +#define SDU_TYPE_PPDU 0
> +#define SDU_TYPE_MPDU 1
> +#define SDU_TYPE_MSDU 2
> +
> +#define ENETC4_PMAC_OFFSET 0x400
> +#define ENETC4_PM_CMD_CFG(mac) (0x5008 + (mac) * 0x400)
> +#define PM_CMD_CFG_TX_EN BIT(0)
> +#define PM_CMD_CFG_RX_EN BIT(1)
> +#define PM_CMD_CFG_PAUSE_FWD BIT(7)
> +#define PM_CMD_CFG_PAUSE_IGN BIT(8)
> +#define PM_CMD_CFG_TX_ADDR_INS BIT(9)
> +#define PM_CMD_CFG_LOOP_EN BIT(10)
> +#define PM_CMD_CFG_LPBK_MODE GENMASK(12, 11)
> +#define LPBCK_MODE_EXT_TX_CLK 0
> +#define LPBCK_MODE_MAC_LEVEL 1
> +#define LPBCK_MODE_INT_TX_CLK 2
> +#define PM_CMD_CFG_CNT_FRM_EN BIT(13)
> +#define PM_CMD_CFG_TXP BIT(15)
> +#define PM_CMD_CFG_SEND_IDLE BIT(16)
> +#define PM_CMD_CFG_HD_FCEN BIT(18)
> +#define PM_CMD_CFG_SFD BIT(21)
> +#define PM_CMD_CFG_TX_FLUSH BIT(22)
> +#define PM_CMD_CFG_TX_LOWP_EN BIT(23)
> +#define PM_CMD_CFG_RX_LOWP_EMPTY BIT(24)
> +#define PM_CMD_CFG_SWR BIT(26)
> +#define PM_CMD_CFG_TS_MODE BIT(30)
> +#define PM_CMD_CFG_MG BIT(31)
> +
> +/* Port MAC 0/1 Maximum Frame Length Register */
> +#define ENETC4_PM_MAXFRM(mac) (0x5014 + (mac) * 0x400)
> +
> +/* Port MAC 0/1 Pause Quanta Register */
> +#define ENETC4_PM_PAUSE_QUANTA(mac) (0x5054 + (mac) * 0x400)
> +
> +/* Port MAC 0/1 Pause Quanta Threshold Register */
> +#define ENETC4_PM_PAUSE_THRESH(mac) (0x5064 + (mac) * 0x400)
> +
> +/* Port MAC 0 Interface Mode Control Register */
> +#define ENETC4_PM_IF_MODE(mac) (0x5300 + (mac) * 0x400)
> +#define PM_IF_MODE_IFMODE GENMASK(2, 0)
> +#define IFMODE_XGMII 0
> +#define IFMODE_RMII 3
> +#define IFMODE_RGMII 4
> +#define IFMODE_SGMII 5
> +#define PM_IF_MODE_REVMII BIT(3)
> +#define PM_IF_MODE_M10 BIT(4)
> +#define PM_IF_MODE_HD BIT(6)
> +#define PM_IF_MODE_SSP GENMASK(14, 13)
> +#define SSP_100M 0
> +#define SSP_10M 1
> +#define SSP_1G 2
> +#define PM_IF_MODE_ENA BIT(15)
> +
> +#endif
> diff --git a/drivers/net/ethernet/freescale/enetc/enetc4_pf.c b/drivers/net/ethernet/freescale/enetc/enetc4_pf.c
> new file mode 100644
> index 000000000000..e38ade76260b
> --- /dev/null
> +++ b/drivers/net/ethernet/freescale/enetc/enetc4_pf.c
> @@ -0,0 +1,761 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
> +/* Copyright 2024 NXP */
> +#include <linux/unaligned.h>
> +#include <linux/module.h>
> +#include <linux/of_net.h>
> +#include <linux/of_platform.h>
> +#include <linux/clk.h>
> +#include <linux/pinctrl/consumer.h>
> +#include <linux/fsl/netc_global.h>
sort headers.
> +
> +#include "enetc_pf.h"
> +
> +#define ENETC_SI_MAX_RING_NUM 8
> +
> +static void enetc4_get_port_caps(struct enetc_pf *pf)
> +{
> + struct enetc_hw *hw = &pf->si->hw;
> + u32 val;
> +
> + val = enetc_port_rd(hw, ENETC4_ECAPR1);
> + pf->caps.num_vsi = (val & ECAPR1_NUM_VSI) >> 24;
> + pf->caps.num_msix = ((val & ECAPR1_NUM_MSIX) >> 12) + 1;
> +
> + val = enetc_port_rd(hw, ENETC4_ECAPR2);
> + pf->caps.num_rx_bdr = (val & ECAPR2_NUM_RX_BDR) >> 16;
> + pf->caps.num_tx_bdr = val & ECAPR2_NUM_TX_BDR;
> +
> + val = enetc_port_rd(hw, ENETC4_PMCAPR);
> + pf->caps.half_duplex = (val & PMCAPR_HD) ? 1 : 0;
> +}
> +
> +static void enetc4_pf_set_si_primary_mac(struct enetc_hw *hw, int si,
> + const u8 *addr)
> +{
> + u16 lower = get_unaligned_le16(addr + 4);
> + u32 upper = get_unaligned_le32(addr);
> +
> + if (si != 0) {
> + __raw_writel(upper, hw->port + ENETC4_PSIPMAR0(si));
> + __raw_writew(lower, hw->port + ENETC4_PSIPMAR1(si));
> + } else {
> + __raw_writel(upper, hw->port + ENETC4_PMAR0);
> + __raw_writew(lower, hw->port + ENETC4_PMAR1);
> + }
> +}
> +
> +static void enetc4_pf_get_si_primary_mac(struct enetc_hw *hw, int si,
> + u8 *addr)
> +{
> + u32 upper;
> + u16 lower;
> +
> + upper = __raw_readl(hw->port + ENETC4_PSIPMAR0(si));
> + lower = __raw_readw(hw->port + ENETC4_PSIPMAR1(si));
> +
> + put_unaligned_le32(upper, addr);
> + put_unaligned_le16(lower, addr + 4);
> +}
> +
> +static const struct enetc_pf_ops enetc4_pf_ops = {
> + .set_si_primary_mac = enetc4_pf_set_si_primary_mac,
> + .get_si_primary_mac = enetc4_pf_get_si_primary_mac,
> +};
> +
> +static int enetc4_pf_struct_init(struct enetc_si *si)
> +{
> + struct enetc_pf *pf = enetc_si_priv(si);
> +
> + pf->si = si;
> + pf->total_vfs = pci_sriov_get_totalvfs(si->pdev);
> +
> + enetc4_get_port_caps(pf);
> + enetc_pf_ops_register(pf, &enetc4_pf_ops);
> +
> + return 0;
> +}
> +
> +static u32 enetc4_psicfgr0_val_construct(bool is_vf, u32 num_tx_bdr, u32 num_rx_bdr)
> +{
> + u32 val;
> +
> + val = ENETC_PSICFGR0_SET_TXBDR(num_tx_bdr);
> + val |= ENETC_PSICFGR0_SET_RXBDR(num_rx_bdr);
> + val |= ENETC_PSICFGR0_SIVC(ENETC_VLAN_TYPE_C | ENETC_VLAN_TYPE_S);
> +
> + if (is_vf)
> + val |= ENETC_PSICFGR0_VTE | ENETC_PSICFGR0_SIVIE;
> +
> + return val;
> +}
> +
> +static void enetc4_default_rings_allocation(struct enetc_pf *pf)
> +{
> + struct enetc_hw *hw = &pf->si->hw;
> + u32 num_rx_bdr, num_tx_bdr, val;
> + u32 vf_tx_bdr, vf_rx_bdr;
> + int i, rx_rem, tx_rem;
> +
> + if (pf->caps.num_rx_bdr < ENETC_SI_MAX_RING_NUM + pf->caps.num_vsi)
> + num_rx_bdr = pf->caps.num_rx_bdr - pf->caps.num_vsi;
> + else
> + num_rx_bdr = ENETC_SI_MAX_RING_NUM;
> +
> + if (pf->caps.num_tx_bdr < ENETC_SI_MAX_RING_NUM + pf->caps.num_vsi)
> + num_tx_bdr = pf->caps.num_tx_bdr - pf->caps.num_vsi;
> + else
> + num_tx_bdr = ENETC_SI_MAX_RING_NUM;
> +
> + val = enetc4_psicfgr0_val_construct(false, num_tx_bdr, num_rx_bdr);
> + enetc_port_wr(hw, ENETC4_PSICFGR0(0), val);
> +
> + num_rx_bdr = pf->caps.num_rx_bdr - num_rx_bdr;
> + rx_rem = num_rx_bdr % pf->caps.num_vsi;
> + num_rx_bdr = num_rx_bdr / pf->caps.num_vsi;
> +
> + num_tx_bdr = pf->caps.num_tx_bdr - num_tx_bdr;
> + tx_rem = num_tx_bdr % pf->caps.num_vsi;
> + num_tx_bdr = num_tx_bdr / pf->caps.num_vsi;
> +
> + for (i = 0; i < pf->caps.num_vsi; i++) {
> + vf_tx_bdr = (i < tx_rem) ? num_tx_bdr + 1 : num_tx_bdr;
> + vf_rx_bdr = (i < rx_rem) ? num_rx_bdr + 1 : num_rx_bdr;
> + val = enetc4_psicfgr0_val_construct(true, vf_tx_bdr, vf_rx_bdr);
> + enetc_port_wr(hw, ENETC4_PSICFGR0(i + 1), val);
> + }
> +}
> +
> +static void enetc4_allocate_si_rings(struct enetc_pf *pf)
> +{
> + enetc4_default_rings_allocation(pf);
> +}
> +
> +static void enetc4_pf_set_si_vlan_promisc(struct enetc_hw *hw, int si, bool en)
> +{
> + u32 val = enetc_port_rd(hw, ENETC4_PSIPVMR);
> +
> + if (en)
> + val |= BIT(si);
> + else
> + val &= ~BIT(si);
> +
> + enetc_port_wr(hw, ENETC4_PSIPVMR, val);
> +}
> +
> +static void enetc4_set_default_si_vlan_promisc(struct enetc_pf *pf)
> +{
> + struct enetc_hw *hw = &pf->si->hw;
> + int num_si = pf->caps.num_vsi + 1;
> + int i;
> +
> + /* enforce VLAN promisc mode for all SIs */
> + for (i = 0; i < num_si; i++)
> + enetc4_pf_set_si_vlan_promisc(hw, i, true);
> +}
> +
> +/* Allocate the number of MSI-X vectors for per SI. */
> +static void enetc4_set_si_msix_num(struct enetc_pf *pf)
> +{
> + struct enetc_hw *hw = &pf->si->hw;
> + int i, num_msix, total_si;
> + u32 val;
> +
> + total_si = pf->caps.num_vsi + 1;
> +
> + num_msix = pf->caps.num_msix / total_si +
> + pf->caps.num_msix % total_si - 1;
> + val = num_msix & 0x3f;
> + enetc_port_wr(hw, ENETC4_PSICFGR2(0), val);
> +
> + num_msix = pf->caps.num_msix / total_si - 1;
> + val = num_msix & 0x3f;
> + for (i = 0; i < pf->caps.num_vsi; i++)
> + enetc_port_wr(hw, ENETC4_PSICFGR2(i + 1), val);
> +}
> +
> +static void enetc4_enable_all_si(struct enetc_pf *pf)
> +{
> + struct enetc_hw *hw = &pf->si->hw;
> + int num_si = pf->caps.num_vsi + 1;
> + u32 si_bitmap = 0;
> + int i;
> +
> + /* Master enable for all SIs */
> + for (i = 0; i < num_si; i++)
> + si_bitmap |= PMR_SI_EN(i);
> +
> + enetc_port_wr(hw, ENETC4_PMR, si_bitmap);
> +}
> +
> +static void enetc4_configure_port_si(struct enetc_pf *pf)
> +{
> + struct enetc_hw *hw = &pf->si->hw;
> +
> + enetc4_allocate_si_rings(pf);
> +
> + /* Outer VLAN tag will be used for VLAN filtering */
> + enetc_port_wr(hw, ENETC4_PSIVLANFMR, PSIVLANFMR_VS);
> +
> + enetc4_set_default_si_vlan_promisc(pf);
> +
> + /* Disable SI MAC multicast & unicast promiscuous */
> + enetc_port_wr(hw, ENETC4_PSIPMMR, 0);
> +
> + enetc4_set_si_msix_num(pf);
> +
> + enetc4_enable_all_si(pf);
> +}
> +
> +static void enetc4_pf_reset_tc_msdu(struct enetc_hw *hw)
> +{
> + u32 val = ENETC_MAC_MAXFRM_SIZE;
> + int tc;
> +
> + val = u32_replace_bits(val, SDU_TYPE_MPDU, PTCTMSDUR_SDU_TYPE);
> +
> + for (tc = 0; tc < 8; tc++)
> + enetc_port_wr(hw, ENETC4_PTCTMSDUR(tc), val);
> +}
> +
> +static void enetc4_set_trx_frame_size(struct enetc_pf *pf)
> +{
> + struct enetc_si *si = pf->si;
> +
> + enetc_port_mac_wr(si, ENETC4_PM_MAXFRM(0),
> + ENETC_SET_MAXFRM(ENETC_MAC_MAXFRM_SIZE));
> +
> + enetc4_pf_reset_tc_msdu(&si->hw);
> +}
> +
> +static void enetc4_set_rss_key(struct enetc_hw *hw, const u8 *bytes)
> +{
> + int i;
> +
> + for (i = 0; i < ENETC_RSSHASH_KEY_SIZE / 4; i++)
> + enetc_port_wr(hw, ENETC4_PRSSKR(i), ((u32 *)bytes)[i]);
> +}
> +
> +static void enetc4_set_default_rss_key(struct enetc_pf *pf)
> +{
> + u8 hash_key[ENETC_RSSHASH_KEY_SIZE] = {0};
> + struct enetc_hw *hw = &pf->si->hw;
> +
> + /* set up hash key */
> + get_random_bytes(hash_key, ENETC_RSSHASH_KEY_SIZE);
> + enetc4_set_rss_key(hw, hash_key);
> +}
> +
> +static void enetc4_enable_trx(struct enetc_pf *pf)
> +{
> + struct enetc_hw *hw = &pf->si->hw;
> +
> + /* Enable port transmit/receive */
> + enetc_port_wr(hw, ENETC4_POR, 0);
> +}
> +
> +static void enetc4_configure_port(struct enetc_pf *pf)
> +{
> + enetc4_configure_port_si(pf);
> + enetc4_set_trx_frame_size(pf);
> + enetc4_set_default_rss_key(pf);
> + enetc4_enable_trx(pf);
> +}
> +
> +static int enetc4_pf_init(struct enetc_pf *pf)
> +{
> + struct device *dev = &pf->si->pdev->dev;
> + int err;
> +
> + /* Initialize the MAC address for PF and VFs */
> + err = enetc_setup_mac_addresses(dev->of_node, pf);
> + if (err) {
> + dev_err(dev, "Failed to set MAC addresses\n");
> + return err;
> + }
> +
> + enetc4_configure_port(pf);
> +
> + return 0;
> +}
> +
> +static const struct net_device_ops enetc4_ndev_ops = {
> + .ndo_open = enetc_open,
> + .ndo_stop = enetc_close,
> + .ndo_start_xmit = enetc_xmit,
> + .ndo_get_stats = enetc_get_stats,
> + .ndo_set_mac_address = enetc_pf_set_mac_addr,
> +};
> +
> +static struct phylink_pcs *
> +enetc4_pl_mac_select_pcs(struct phylink_config *config, phy_interface_t iface)
> +{
> + struct enetc_pf *pf = phylink_to_enetc_pf(config);
> +
> + return pf->pcs;
> +}
> +
> +static void enetc4_mac_config(struct enetc_pf *pf, unsigned int mode,
> + phy_interface_t phy_mode)
> +{
> + struct enetc_ndev_priv *priv = netdev_priv(pf->si->ndev);
> + struct enetc_si *si = pf->si;
> + u32 val;
> +
> + val = enetc_port_mac_rd(si, ENETC4_PM_IF_MODE(0));
> + val &= ~(PM_IF_MODE_IFMODE | PM_IF_MODE_ENA);
> +
> + switch (phy_mode) {
> + case PHY_INTERFACE_MODE_RGMII:
> + case PHY_INTERFACE_MODE_RGMII_ID:
> + case PHY_INTERFACE_MODE_RGMII_RXID:
> + case PHY_INTERFACE_MODE_RGMII_TXID:
> + val |= IFMODE_RGMII;
> + /* We need to enable auto-negotiation for the MAC
> + * if its RGMII interface support In-Band status.
> + */
> + if (phylink_autoneg_inband(mode))
> + val |= PM_IF_MODE_ENA;
> + break;
> + case PHY_INTERFACE_MODE_RMII:
> + val |= IFMODE_RMII;
> + break;
> + case PHY_INTERFACE_MODE_SGMII:
> + case PHY_INTERFACE_MODE_2500BASEX:
> + val |= IFMODE_SGMII;
> + break;
> + case PHY_INTERFACE_MODE_10GBASER:
> + case PHY_INTERFACE_MODE_XGMII:
> + case PHY_INTERFACE_MODE_USXGMII:
> + val |= IFMODE_XGMII;
> + break;
> + default:
> + dev_err(priv->dev,
> + "Unsupported PHY mode:%d\n", phy_mode);
> + return;
> + }
> +
> + enetc_port_mac_wr(si, ENETC4_PM_IF_MODE(0), val);
> +}
> +
> +static void enetc4_pl_mac_config(struct phylink_config *config, unsigned int mode,
> + const struct phylink_link_state *state)
> +{
> + struct enetc_pf *pf = phylink_to_enetc_pf(config);
> +
> + enetc4_mac_config(pf, mode, state->interface);
> +}
> +
> +static void enetc4_set_port_speed(struct enetc_ndev_priv *priv, int speed)
> +{
> + u32 old_speed = priv->speed;
> + u32 val;
> +
> + if (speed == old_speed)
> + return;
> +
> + val = enetc_port_rd(&priv->si->hw, ENETC4_PCR);
> + val &= ~PCR_PSPEED;
> +
> + switch (speed) {
> + case SPEED_100:
> + case SPEED_1000:
> + case SPEED_2500:
> + case SPEED_10000:
> + val |= (PCR_PSPEED & PCR_PSPEED_VAL(speed));
> + break;
> + case SPEED_10:
> + default:
> + val |= (PCR_PSPEED & PCR_PSPEED_VAL(SPEED_10));
> + }
> +
> + priv->speed = speed;
> + enetc_port_wr(&priv->si->hw, ENETC4_PCR, val);
> +}
> +
> +static void enetc4_set_rgmii_mac(struct enetc_pf *pf, int speed, int duplex)
> +{
> + struct enetc_si *si = pf->si;
> + u32 old_val, val;
> +
> + old_val = enetc_port_mac_rd(si, ENETC4_PM_IF_MODE(0));
> + val = old_val & ~(PM_IF_MODE_ENA | PM_IF_MODE_M10 | PM_IF_MODE_REVMII);
> +
> + switch (speed) {
> + case SPEED_1000:
> + val = u32_replace_bits(val, SSP_1G, PM_IF_MODE_SSP);
> + break;
> + case SPEED_100:
> + val = u32_replace_bits(val, SSP_100M, PM_IF_MODE_SSP);
> + break;
> + case SPEED_10:
> + val = u32_replace_bits(val, SSP_10M, PM_IF_MODE_SSP);
> + }
> +
> + val = u32_replace_bits(val, duplex == DUPLEX_FULL ? 0 : 1,
> + PM_IF_MODE_HD);
> +
> + if (val == old_val)
> + return;
> +
> + enetc_port_mac_wr(si, ENETC4_PM_IF_MODE(0), val);
> +}
> +
> +static void enetc4_set_rmii_mac(struct enetc_pf *pf, int speed, int duplex)
> +{
> + struct enetc_si *si = pf->si;
> + u32 old_val, val;
> +
> + old_val = enetc_port_mac_rd(si, ENETC4_PM_IF_MODE(0));
> + val = old_val & ~(PM_IF_MODE_ENA | PM_IF_MODE_SSP);
> +
> + switch (speed) {
> + case SPEED_100:
> + val &= ~PM_IF_MODE_M10;
> + break;
> + case SPEED_10:
> + val |= PM_IF_MODE_M10;
> + }
> +
> + val = u32_replace_bits(val, duplex == DUPLEX_FULL ? 0 : 1,
> + PM_IF_MODE_HD);
> +
> + if (val == old_val)
> + return;
> +
> + enetc_port_mac_wr(si, ENETC4_PM_IF_MODE(0), val);
> +}
> +
> +static void enetc4_set_hd_flow_control(struct enetc_pf *pf, bool enable)
> +{
> + struct enetc_si *si = pf->si;
> + u32 old_val, val;
> +
> + if (!pf->caps.half_duplex)
> + return;
> +
> + old_val = enetc_port_mac_rd(si, ENETC4_PM_CMD_CFG(0));
> + val = u32_replace_bits(old_val, enable ? 1 : 0, PM_CMD_CFG_HD_FCEN);
> + if (val == old_val)
> + return;
> +
> + enetc_port_mac_wr(si, ENETC4_PM_CMD_CFG(0), val);
> +}
> +
> +static void enetc4_set_rx_pause(struct enetc_pf *pf, bool rx_pause)
> +{
> + struct enetc_si *si = pf->si;
> + u32 old_val, val;
> +
> + old_val = enetc_port_mac_rd(si, ENETC4_PM_CMD_CFG(0));
> + val = u32_replace_bits(old_val, rx_pause ? 0 : 1, PM_CMD_CFG_PAUSE_IGN);
> + if (val == old_val)
> + return;
> +
> + enetc_port_mac_wr(si, ENETC4_PM_CMD_CFG(0), val);
> +}
> +
> +static void enetc4_set_tx_pause(struct enetc_pf *pf, int num_rxbdr, bool tx_pause)
> +{
> + u32 pause_off_thresh = 0, pause_on_thresh = 0;
> + u32 init_quanta = 0, refresh_quanta = 0;
> + struct enetc_hw *hw = &pf->si->hw;
> + u32 rbmr, old_rbmr;
> + int i;
> +
> + for (i = 0; i < num_rxbdr; i++) {
> + old_rbmr = enetc_rxbdr_rd(hw, i, ENETC_RBMR);
> + rbmr = u32_replace_bits(old_rbmr, tx_pause ? 1 : 0, ENETC_RBMR_CM);
> + if (rbmr == old_rbmr)
> + continue;
> +
> + enetc_rxbdr_wr(hw, i, ENETC_RBMR, rbmr);
> + }
> +
> + if (tx_pause) {
> + /* When the port first enters congestion, send a PAUSE request
> + * with the maximum number of quanta. When the port exits
> + * congestion, it will automatically send a PAUSE frame with
> + * zero quanta.
> + */
> + init_quanta = 0xffff;
> +
> + /* Also, set up the refresh timer to send follow-up PAUSE
> + * frames at half the quanta value, in case the congestion
> + * condition persists.
> + */
> + refresh_quanta = 0xffff / 2;
> +
> + /* Start emitting PAUSE frames when 3 large frames (or more
> + * smaller frames) have accumulated in the FIFO waiting to be
> + * DMAed to the RX ring.
> + */
> + pause_on_thresh = 3 * ENETC_MAC_MAXFRM_SIZE;
> + pause_off_thresh = 1 * ENETC_MAC_MAXFRM_SIZE;
> + }
> +
> + enetc_port_mac_wr(pf->si, ENETC4_PM_PAUSE_QUANTA(0), init_quanta);
> + enetc_port_mac_wr(pf->si, ENETC4_PM_PAUSE_THRESH(0), refresh_quanta);
> + enetc_port_wr(hw, ENETC4_PPAUONTR, pause_on_thresh);
> + enetc_port_wr(hw, ENETC4_PPAUOFFTR, pause_off_thresh);
> +}
> +
> +static void enetc4_enable_mac(struct enetc_pf *pf, bool en)
> +{
> + struct enetc_si *si = pf->si;
> + u32 val;
> +
> + val = enetc_port_mac_rd(si, ENETC4_PM_CMD_CFG(0));
> + val &= ~(PM_CMD_CFG_TX_EN | PM_CMD_CFG_RX_EN);
> + val |= en ? (PM_CMD_CFG_TX_EN | PM_CMD_CFG_RX_EN) : 0;
> +
> + enetc_port_mac_wr(si, ENETC4_PM_CMD_CFG(0), val);
> +}
> +
> +static void enetc4_pl_mac_link_up(struct phylink_config *config,
> + struct phy_device *phy, unsigned int mode,
> + phy_interface_t interface, int speed,
> + int duplex, bool tx_pause, bool rx_pause)
> +{
> + struct enetc_pf *pf = phylink_to_enetc_pf(config);
> + struct enetc_si *si = pf->si;
> + struct enetc_ndev_priv *priv;
> + bool hd_fc = false;
> +
> + priv = netdev_priv(si->ndev);
> + enetc4_set_port_speed(priv, speed);
> +
> + if (!phylink_autoneg_inband(mode) &&
> + phy_interface_mode_is_rgmii(interface))
> + enetc4_set_rgmii_mac(pf, speed, duplex);
> +
> + if (interface == PHY_INTERFACE_MODE_RMII)
> + enetc4_set_rmii_mac(pf, speed, duplex);
> +
> + if (duplex == DUPLEX_FULL) {
> + /* When preemption is enabled, generation of PAUSE frames
> + * must be disabled, as stated in the IEEE 802.3 standard.
> + */
> + if (priv->active_offloads & ENETC_F_QBU)
> + tx_pause = false;
> + } else { /* DUPLEX_HALF */
> + if (tx_pause || rx_pause)
> + hd_fc = true;
> +
> + /* As per 802.3 annex 31B, PAUSE frames are only supported
> + * when the link is configured for full duplex operation.
> + */
> + tx_pause = false;
> + rx_pause = false;
> + }
> +
> + enetc4_set_hd_flow_control(pf, hd_fc);
> + enetc4_set_tx_pause(pf, priv->num_rx_rings, tx_pause);
> + enetc4_set_rx_pause(pf, rx_pause);
> + enetc4_enable_mac(pf, true);
> +}
> +
> +static void enetc4_pl_mac_link_down(struct phylink_config *config,
> + unsigned int mode,
> + phy_interface_t interface)
> +{
> + struct enetc_pf *pf = phylink_to_enetc_pf(config);
> +
> + enetc4_enable_mac(pf, false);
> +}
> +
> +static const struct phylink_mac_ops enetc_pl_mac_ops = {
> + .mac_select_pcs = enetc4_pl_mac_select_pcs,
> + .mac_config = enetc4_pl_mac_config,
> + .mac_link_up = enetc4_pl_mac_link_up,
> + .mac_link_down = enetc4_pl_mac_link_down,
> +};
> +
> +static int enetc4_link_init(struct enetc_ndev_priv *priv,
> + struct device_node *node)
> +{
> + struct enetc_pf *pf = enetc_si_priv(priv->si);
> + struct device *dev = priv->dev;
> + int err;
> +
> + err = of_get_phy_mode(node, &pf->if_mode);
> + if (err) {
> + dev_err(dev, "Failed to get PHY mode\n");
> + return err;
> + }
> +
> + err = enetc_mdiobus_create(pf, node);
> + if (err) {
> + dev_err(dev, "Failed to create MDIO bus\n");
> + return err;
> + }
> +
> + err = enetc_phylink_create(priv, node, &enetc_pl_mac_ops);
> + if (err) {
> + dev_err(dev, "Failed to create phylink\n");
> + goto err_phylink_create;
> + }
> +
> + return 0;
> +
> +err_phylink_create:
> + enetc_mdiobus_destroy(pf);
> +
> + return err;
> +}
> +
> +static void enetc4_link_deinit(struct enetc_ndev_priv *priv)
> +{
> + struct enetc_pf *pf = enetc_si_priv(priv->si);
> +
> + enetc_phylink_destroy(priv);
> + enetc_mdiobus_destroy(pf);
> +}
> +
> +static int enetc4_pf_netdev_create(struct enetc_si *si)
> +{
> + struct device *dev = &si->pdev->dev;
> + struct enetc_ndev_priv *priv;
> + struct net_device *ndev;
> + int err;
> +
> + ndev = alloc_etherdev_mqs(sizeof(struct enetc_ndev_priv),
> + si->num_tx_rings, si->num_rx_rings);
> + if (!ndev)
> + return -ENOMEM;
> +
> + priv = netdev_priv(ndev);
> + priv->ref_clk = devm_clk_get_optional(dev, "enet_ref_clk");
> + if (IS_ERR(priv->ref_clk)) {
> + dev_err(dev, "Get enet_ref_clk failed\n");
> + err = PTR_ERR(priv->ref_clk);
> + goto err_clk_get;
> + }
> +
> + enetc_pf_netdev_setup(si, ndev, &enetc4_ndev_ops);
> +
> + enetc_init_si_rings_params(priv);
> +
> + err = enetc_configure_si(priv);
> + if (err) {
> + dev_err(dev, "Failed to configure SI\n");
> + goto err_config_si;
> + }
> +
> + err = enetc_alloc_msix(priv);
> + if (err) {
> + dev_err(dev, "Failed to alloc MSI-X\n");
> + goto err_alloc_msix;
> + }
> +
> + err = enetc4_link_init(priv, dev->of_node);
> + if (err)
> + goto err_link_init;
> +
> + err = register_netdev(ndev);
> + if (err) {
> + dev_err(dev, "Failed to register netdev\n");
> + goto err_reg_netdev;
> + }
> +
> + return 0;
> +
> +err_reg_netdev:
> + enetc4_link_deinit(priv);
> +err_link_init:
> + enetc_free_msix(priv);
> +err_alloc_msix:
> +err_config_si:
> +err_clk_get:
> + mutex_destroy(&priv->mm_lock);
> + free_netdev(ndev);
> +
> + return err;
> +}
> +
> +static void enetc4_pf_netdev_destroy(struct enetc_si *si)
> +{
> + struct net_device *ndev = si->ndev;
> + struct enetc_ndev_priv *priv;
> +
> + priv = netdev_priv(ndev);
> + unregister_netdev(ndev);
> + enetc_free_msix(priv);
> + free_netdev(ndev);
> +}
> +
> +static int enetc4_pf_probe(struct pci_dev *pdev,
> + const struct pci_device_id *ent)
> +{
> + struct device *dev = &pdev->dev;
> + struct enetc_si *si;
> + struct enetc_pf *pf;
> + int err;
> +
> + err = enetc_pci_probe(pdev, KBUILD_MODNAME, sizeof(*pf));
> + if (err) {
> + dev_err(dev, "PCIe probing failed\n");
> + return err;
use dev_err_probe()
> + }
> +
> + /* si is the private data. */
> + si = pci_get_drvdata(pdev);
> + if (!si->hw.port || !si->hw.global) {
> + err = -ENODEV;
> + dev_err(dev, "Couldn't map PF only space!\n");
> + goto err_enetc_pci_probe;
> + }
> +
> + err = enetc4_pf_struct_init(si);
> + if (err)
> + goto err_pf_struct_init;
> +
> + pf = enetc_si_priv(si);
> + err = enetc4_pf_init(pf);
> + if (err)
> + goto err_pf_init;
> +
> + pinctrl_pm_select_default_state(dev);
> + enetc_get_si_caps(si);
> + err = enetc4_pf_netdev_create(si);
> + if (err)
> + goto err_netdev_create;
> +
> + return 0;
> +
> +err_netdev_create:
> +err_pf_init:
> +err_pf_struct_init:
> +err_enetc_pci_probe:
> + enetc_pci_remove(pdev);
you can use devm_add_action_or_reset() to remove these goto labels.
Frank
> +
> + return err;
> +}
> +
> +static void enetc4_pf_remove(struct pci_dev *pdev)
> +{
> + struct enetc_si *si;
> + struct enetc_pf *pf;
> +
> + si = pci_get_drvdata(pdev);
> + pf = enetc_si_priv(si);
> +
> + enetc4_pf_netdev_destroy(si);
> + enetc_pci_remove(pdev);
> +}
> +
> +static const struct pci_device_id enetc4_pf_id_table[] = {
> + { PCI_DEVICE(PCI_VENDOR_ID_NXP2, PCI_DEVICE_ID_NXP2_ENETC_PF) },
> + { 0, } /* End of table. */
> +};
> +MODULE_DEVICE_TABLE(pci, enetc4_pf_id_table);
> +
> +static struct pci_driver enetc4_pf_driver = {
> + .name = KBUILD_MODNAME,
> + .id_table = enetc4_pf_id_table,
> + .probe = enetc4_pf_probe,
> + .remove = enetc4_pf_remove,
> +};
> +module_pci_driver(enetc4_pf_driver);
> +
> +MODULE_DESCRIPTION("ENETC4 PF Driver");
> +MODULE_LICENSE("Dual BSD/GPL");
> diff --git a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
> index 2563eb8ac7b6..13ce771e0c43 100644
> --- a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
> +++ b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
> @@ -44,6 +44,9 @@ static int enetc_get_reglen(struct net_device *ndev)
> struct enetc_hw *hw = &priv->si->hw;
> int len;
>
> + if (is_enetc_rev4(priv->si))
> + return -EOPNOTSUPP;
> +
> len = ARRAY_SIZE(enetc_si_regs);
> len += ARRAY_SIZE(enetc_txbdr_regs) * priv->num_tx_rings;
> len += ARRAY_SIZE(enetc_rxbdr_regs) * priv->num_rx_rings;
> @@ -68,6 +71,9 @@ static void enetc_get_regs(struct net_device *ndev, struct ethtool_regs *regs,
> int i, j;
> u32 addr;
>
> + if (is_enetc_rev4(priv->si))
> + return;
> +
> for (i = 0; i < ARRAY_SIZE(enetc_si_regs); i++) {
> *buf++ = enetc_si_regs[i];
> *buf++ = enetc_rd(hw, enetc_si_regs[i]);
> @@ -229,6 +235,9 @@ static int enetc_get_sset_count(struct net_device *ndev, int sset)
> struct enetc_ndev_priv *priv = netdev_priv(ndev);
> int len;
>
> + if (is_enetc_rev4(priv->si))
> + return -EOPNOTSUPP;
> +
> if (sset != ETH_SS_STATS)
> return -EOPNOTSUPP;
>
> @@ -250,6 +259,9 @@ static void enetc_get_strings(struct net_device *ndev, u32 stringset, u8 *data)
> u8 *p = data;
> int i, j;
>
> + if (is_enetc_rev4(priv->si))
> + return;
> +
> switch (stringset) {
> case ETH_SS_STATS:
> for (i = 0; i < ARRAY_SIZE(enetc_si_counters); i++) {
> @@ -290,6 +302,9 @@ static void enetc_get_ethtool_stats(struct net_device *ndev,
> struct enetc_hw *hw = &priv->si->hw;
> int i, o = 0;
>
> + if (is_enetc_rev4(priv->si))
> + return;
> +
> for (i = 0; i < ARRAY_SIZE(enetc_si_counters); i++)
> data[o++] = enetc_rd64(hw, enetc_si_counters[i].reg);
>
> @@ -331,6 +346,9 @@ static void enetc_get_pause_stats(struct net_device *ndev,
> struct enetc_hw *hw = &priv->si->hw;
> struct enetc_si *si = priv->si;
>
> + if (is_enetc_rev4(si))
> + return;
> +
> switch (pause_stats->src) {
> case ETHTOOL_MAC_STATS_SRC_EMAC:
> enetc_pause_stats(hw, 0, pause_stats);
> @@ -418,6 +436,9 @@ static void enetc_get_eth_mac_stats(struct net_device *ndev,
> struct enetc_hw *hw = &priv->si->hw;
> struct enetc_si *si = priv->si;
>
> + if (is_enetc_rev4(si))
> + return;
> +
> switch (mac_stats->src) {
> case ETHTOOL_MAC_STATS_SRC_EMAC:
> enetc_mac_stats(hw, 0, mac_stats);
> @@ -439,6 +460,9 @@ static void enetc_get_eth_ctrl_stats(struct net_device *ndev,
> struct enetc_hw *hw = &priv->si->hw;
> struct enetc_si *si = priv->si;
>
> + if (is_enetc_rev4(si))
> + return;
> +
> switch (ctrl_stats->src) {
> case ETHTOOL_MAC_STATS_SRC_EMAC:
> enetc_ctrl_stats(hw, 0, ctrl_stats);
> @@ -461,6 +485,9 @@ static void enetc_get_rmon_stats(struct net_device *ndev,
> struct enetc_hw *hw = &priv->si->hw;
> struct enetc_si *si = priv->si;
>
> + if (is_enetc_rev4(si))
> + return;
> +
> *ranges = enetc_rmon_ranges;
>
> switch (rmon_stats->src) {
> @@ -593,6 +620,9 @@ static int enetc_get_rxnfc(struct net_device *ndev, struct ethtool_rxnfc *rxnfc,
> struct enetc_ndev_priv *priv = netdev_priv(ndev);
> int i, j;
>
> + if (is_enetc_rev4(priv->si))
> + return -EOPNOTSUPP;
> +
> switch (rxnfc->cmd) {
> case ETHTOOL_GRXRINGS:
> rxnfc->data = priv->num_rx_rings;
> @@ -643,6 +673,9 @@ static int enetc_set_rxnfc(struct net_device *ndev, struct ethtool_rxnfc *rxnfc)
> struct enetc_ndev_priv *priv = netdev_priv(ndev);
> int err;
>
> + if (is_enetc_rev4(priv->si))
> + return -EOPNOTSUPP;
> +
> switch (rxnfc->cmd) {
> case ETHTOOL_SRXCLSRLINS:
> if (rxnfc->fs.location >= priv->si->num_fs_entries)
> @@ -678,6 +711,9 @@ static u32 enetc_get_rxfh_key_size(struct net_device *ndev)
> {
> struct enetc_ndev_priv *priv = netdev_priv(ndev);
>
> + if (is_enetc_rev4(priv->si))
> + return 0;
> +
> /* return the size of the RX flow hash key. PF only */
> return (priv->si->hw.port) ? ENETC_RSSHASH_KEY_SIZE : 0;
> }
> @@ -686,6 +722,9 @@ static u32 enetc_get_rxfh_indir_size(struct net_device *ndev)
> {
> struct enetc_ndev_priv *priv = netdev_priv(ndev);
>
> + if (is_enetc_rev4(priv->si))
> + return 0;
> +
> /* return the size of the RX flow hash indirection table */
> return priv->si->num_rss;
> }
> @@ -697,6 +736,9 @@ static int enetc_get_rxfh(struct net_device *ndev,
> struct enetc_hw *hw = &priv->si->hw;
> int err = 0, i;
>
> + if (is_enetc_rev4(priv->si))
> + return -EOPNOTSUPP;
> +
> /* return hash function */
> rxfh->hfunc = ETH_RSS_HASH_TOP;
>
> @@ -731,6 +773,9 @@ static int enetc_set_rxfh(struct net_device *ndev,
> struct enetc_hw *hw = &priv->si->hw;
> int err = 0;
>
> + if (is_enetc_rev4(priv->si))
> + return -EOPNOTSUPP;
> +
> /* set hash key, if PF */
> if (rxfh->key && hw->port)
> enetc_set_rss_key(hw, rxfh->key);
> @@ -775,9 +820,10 @@ static int enetc_get_coalesce(struct net_device *ndev,
> {
> struct enetc_ndev_priv *priv = netdev_priv(ndev);
> struct enetc_int_vector *v = priv->int_vector[0];
> + u64 clk_freq = priv->si->clk_freq;
>
> - ic->tx_coalesce_usecs = enetc_cycles_to_usecs(priv->tx_ictt);
> - ic->rx_coalesce_usecs = enetc_cycles_to_usecs(v->rx_ictt);
> + ic->tx_coalesce_usecs = enetc_cycles_to_usecs(priv->tx_ictt, clk_freq);
> + ic->rx_coalesce_usecs = enetc_cycles_to_usecs(v->rx_ictt, clk_freq);
>
> ic->tx_max_coalesced_frames = ENETC_TXIC_PKTTHR;
> ic->rx_max_coalesced_frames = ENETC_RXIC_PKTTHR;
> @@ -793,12 +839,13 @@ static int enetc_set_coalesce(struct net_device *ndev,
> struct netlink_ext_ack *extack)
> {
> struct enetc_ndev_priv *priv = netdev_priv(ndev);
> + u64 clk_freq = priv->si->clk_freq;
> u32 rx_ictt, tx_ictt;
> int i, ic_mode;
> bool changed;
>
> - tx_ictt = enetc_usecs_to_cycles(ic->tx_coalesce_usecs);
> - rx_ictt = enetc_usecs_to_cycles(ic->rx_coalesce_usecs);
> + tx_ictt = enetc_usecs_to_cycles(ic->tx_coalesce_usecs, clk_freq);
> + rx_ictt = enetc_usecs_to_cycles(ic->rx_coalesce_usecs, clk_freq);
>
> if (ic->rx_max_coalesced_frames != ENETC_RXIC_PKTTHR)
> return -EOPNOTSUPP;
> @@ -843,8 +890,12 @@ static int enetc_set_coalesce(struct net_device *ndev,
> static int enetc_get_ts_info(struct net_device *ndev,
> struct kernel_ethtool_ts_info *info)
> {
> + struct enetc_ndev_priv *priv = netdev_priv(ndev);
> int *phc_idx;
>
> + if (is_enetc_rev4(priv->si))
> + return -EOPNOTSUPP;
> +
> phc_idx = symbol_get(enetc_phc_index);
> if (phc_idx) {
> info->phc_index = *phc_idx;
> @@ -942,6 +993,9 @@ static void enetc_get_mm_stats(struct net_device *ndev,
> struct enetc_hw *hw = &priv->si->hw;
> struct enetc_si *si = priv->si;
>
> + if (is_enetc_rev4(si))
> + return;
> +
> if (!(si->hw_features & ENETC_SI_F_QBU))
> return;
>
> @@ -960,6 +1014,9 @@ static int enetc_get_mm(struct net_device *ndev, struct ethtool_mm_state *state)
> struct enetc_hw *hw = &si->hw;
> u32 lafs, rafs, val;
>
> + if (is_enetc_rev4(si))
> + return -EOPNOTSUPP;
> +
> if (!(si->hw_features & ENETC_SI_F_QBU))
> return -EOPNOTSUPP;
>
> @@ -1090,6 +1147,9 @@ static int enetc_set_mm(struct net_device *ndev, struct ethtool_mm_cfg *cfg,
> u32 val, add_frag_size;
> int err;
>
> + if (is_enetc_rev4(si))
> + return -EOPNOTSUPP;
> +
> if (!(si->hw_features & ENETC_SI_F_QBU))
> return -EOPNOTSUPP;
>
> diff --git a/drivers/net/ethernet/freescale/enetc/enetc_hw.h b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
> index 6a7b9b75d660..230e94986091 100644
> --- a/drivers/net/ethernet/freescale/enetc/enetc_hw.h
> +++ b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
> @@ -25,6 +25,7 @@
> #define ENETC_SIPCAPR0_RSS BIT(8)
> #define ENETC_SIPCAPR0_QBV BIT(4)
> #define ENETC_SIPCAPR0_QBU BIT(3)
> +#define ENETC_SIPCAPR0_RFS BIT(2)
> #define ENETC_SIPCAPR1 0x24
> #define ENETC_SITGTGR 0x30
> #define ENETC_SIRBGCR 0x38
> @@ -971,15 +972,16 @@ struct enetc_cbd {
> u8 status_flags;
> };
>
> -#define ENETC_CLK 400000000ULL
> -static inline u32 enetc_cycles_to_usecs(u32 cycles)
> +#define ENETC_CLK 400000000ULL
> +#define ENETC_CLK_333M 333000000ULL
> +static inline u32 enetc_cycles_to_usecs(u32 cycles, u64 clk_freq)
> {
> - return (u32)div_u64(cycles * 1000000ULL, ENETC_CLK);
> + return (u32)div_u64(cycles * 1000000ULL, clk_freq);
> }
>
> -static inline u32 enetc_usecs_to_cycles(u32 usecs)
> +static inline u32 enetc_usecs_to_cycles(u32 usecs, u64 clk_freq)
> {
> - return (u32)div_u64(usecs * ENETC_CLK, 1000000ULL);
> + return (u32)div_u64(usecs * clk_freq, 1000000ULL);
> }
>
> /* Port traffic class frame preemption register */
> diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf.h b/drivers/net/ethernet/freescale/enetc/enetc_pf.h
> index ad7dab0eb752..91f2b5afb506 100644
> --- a/drivers/net/ethernet/freescale/enetc/enetc_pf.h
> +++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.h
> @@ -28,6 +28,14 @@ struct enetc_vf_state {
> enum enetc_vf_flags flags;
> };
>
> +struct enetc_port_caps {
> + u32 half_duplex:1;
> + int num_vsi;
> + int num_msix;
> + int num_rx_bdr;
> + int num_tx_bdr;
> +};
> +
> struct enetc_pf;
>
> struct enetc_pf_ops {
> @@ -60,6 +68,7 @@ struct enetc_pf {
> phy_interface_t if_mode;
> struct phylink_config phylink_config;
>
> + struct enetc_port_caps caps;
> const struct enetc_pf_ops *ops;
> };
>
> diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c b/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c
> index bbfb5c1ffd13..d00e1ddadb43 100644
> --- a/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c
> +++ b/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c
> @@ -119,10 +119,17 @@ void enetc_pf_netdev_setup(struct enetc_si *si, struct net_device *ndev,
> ndev->vlan_features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_TSO |
> NETIF_F_TSO6 | NETIF_F_GSO_UDP_L4;
>
> + ndev->priv_flags |= IFF_UNICAST_FLT;
> +
> + /* TODO: currently, i.MX95 ENETC driver does not support advanced features */
> + if (is_enetc_rev4(si)) {
> + ndev->hw_features &= ~(NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_LOOPBACK);
> + goto end;
> + }
> +
> if (si->num_rss)
> ndev->hw_features |= NETIF_F_RXHASH;
>
> - ndev->priv_flags |= IFF_UNICAST_FLT;
> ndev->xdp_features = NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDIRECT |
> NETDEV_XDP_ACT_NDO_XMIT | NETDEV_XDP_ACT_RX_SG |
> NETDEV_XDP_ACT_NDO_XMIT_SG;
> @@ -133,6 +140,7 @@ void enetc_pf_netdev_setup(struct enetc_si *si, struct net_device *ndev,
> ndev->hw_features |= NETIF_F_HW_TC;
> }
>
> +end:
> /* pick up primary MAC address from SI */
> enetc_load_primary_mac_addr(&si->hw, ndev);
> }
> --
> 2.34.1
>
© 2016 - 2024 Red Hat, Inc.