From: Po Liu <Po.Liu@nxp.com>
To: davem@davemloft.net, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org
Cc: vinicius.gomes@intel.com, po.liu@nxp.com, claudiu.manoil@nxp.com,
vladimir.oltean@nxp.com, alexandru.marginean@nxp.com,
michael.chan@broadcom.com, vishal@chelsio.com,
saeedm@mellanox.com, leon@kernel.org, jiri@mellanox.com,
idosch@mellanox.com, alexandre.belloni@bootlin.com,
UNGLinuxDriver@microchip.com, kuba@kernel.org, jhs@mojatatu.com,
xiyou.wangcong@gmail.com, simon.horman@netronome.com,
pablo@netfilter.org, moshe@mellanox.com, m-karicheri2@ti.com,
andre.guedes@linux.intel.com, stephen@networkplumber.org,
Po Liu <Po.Liu@nxp.com>
Subject: [v3,net-next 3/4] net: enetc: add hw tc hw offload features for PSPF capability
Date: Wed, 22 Apr 2020 10:48:51 +0800 [thread overview]
Message-ID: <20200422024852.23224-4-Po.Liu@nxp.com> (raw)
In-Reply-To: <20200422024852.23224-1-Po.Liu@nxp.com>
This patch is to let ethtool enable/disable the tc flower offload
features. Hardware ENETC has the feature of PSFP which is for per-stream
policing. When enable the tc hw offloading feature, driver would enable
the IEEE 802.1Qci feature. It is only set the register enable bit for
this feature not enable for any entry of per stream filtering and stream
gate or stream identify but get how much capabilities for each feature.
Signed-off-by: Po Liu <Po.Liu@nxp.com>
---
drivers/net/ethernet/freescale/enetc/enetc.c | 23 +++++++++
drivers/net/ethernet/freescale/enetc/enetc.h | 48 +++++++++++++++++++
.../net/ethernet/freescale/enetc/enetc_hw.h | 17 +++++++
.../net/ethernet/freescale/enetc/enetc_pf.c | 8 ++++
4 files changed, 96 insertions(+)
diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
index ccf2611f4a20..04aac7cbb506 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc.c
@@ -756,6 +756,9 @@ 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_PSFP)
+ si->hw_features |= ENETC_SI_F_PSFP;
}
static int enetc_dma_alloc_bdr(struct enetc_bdr *r, size_t bd_size)
@@ -1567,6 +1570,23 @@ static int enetc_set_rss(struct net_device *ndev, int en)
return 0;
}
+static int enetc_set_psfp(struct net_device *ndev, int en)
+{
+ struct enetc_ndev_priv *priv = netdev_priv(ndev);
+
+ if (en) {
+ priv->active_offloads |= ENETC_F_QCI;
+ enetc_get_max_cap(priv);
+ enetc_psfp_enable(&priv->si->hw);
+ } else {
+ priv->active_offloads &= ~ENETC_F_QCI;
+ memset(&priv->psfp_cap, 0, sizeof(struct psfp_cap));
+ enetc_psfp_disable(&priv->si->hw);
+ }
+
+ return 0;
+}
+
int enetc_set_features(struct net_device *ndev,
netdev_features_t features)
{
@@ -1575,6 +1595,9 @@ int enetc_set_features(struct net_device *ndev,
if (changed & NETIF_F_RXHASH)
enetc_set_rss(ndev, !!(features & NETIF_F_RXHASH));
+ if (changed & NETIF_F_HW_TC)
+ enetc_set_psfp(ndev, !!(features & NETIF_F_HW_TC));
+
return 0;
}
diff --git a/drivers/net/ethernet/freescale/enetc/enetc.h b/drivers/net/ethernet/freescale/enetc/enetc.h
index 56c43f35b633..2cfe877c3778 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc.h
@@ -151,6 +151,7 @@ enum enetc_errata {
};
#define ENETC_SI_F_QBV BIT(0)
+#define ENETC_SI_F_PSFP BIT(1)
/* PCI IEP device data */
struct enetc_si {
@@ -203,12 +204,20 @@ struct enetc_cls_rule {
};
#define ENETC_MAX_BDR_INT 2 /* fixed to max # of available cpus */
+struct psfp_cap {
+ u32 max_streamid;
+ u32 max_psfp_filter;
+ u32 max_psfp_gate;
+ u32 max_psfp_gatelist;
+ u32 max_psfp_meter;
+};
/* TODO: more hardware offloads */
enum enetc_active_offloads {
ENETC_F_RX_TSTAMP = BIT(0),
ENETC_F_TX_TSTAMP = BIT(1),
ENETC_F_QBV = BIT(2),
+ ENETC_F_QCI = BIT(3),
};
struct enetc_ndev_priv {
@@ -231,6 +240,8 @@ struct enetc_ndev_priv {
struct enetc_cls_rule *cls_rules;
+ struct psfp_cap psfp_cap;
+
struct device_node *phy_node;
phy_interface_t if_mode;
};
@@ -289,9 +300,46 @@ int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data);
void enetc_sched_speed_set(struct net_device *ndev);
int enetc_setup_tc_cbs(struct net_device *ndev, void *type_data);
int enetc_setup_tc_txtime(struct net_device *ndev, void *type_data);
+
+static inline void enetc_get_max_cap(struct enetc_ndev_priv *priv)
+{
+ u32 reg;
+
+ reg = enetc_port_rd(&priv->si->hw, ENETC_PSIDCAPR);
+ priv->psfp_cap.max_streamid = reg & ENETC_PSIDCAPR_MSK;
+ /* Port stream filter capability */
+ reg = enetc_port_rd(&priv->si->hw, ENETC_PSFCAPR);
+ priv->psfp_cap.max_psfp_filter = reg & ENETC_PSFCAPR_MSK;
+ /* Port stream gate capability */
+ reg = enetc_port_rd(&priv->si->hw, ENETC_PSGCAPR);
+ priv->psfp_cap.max_psfp_gate = (reg & ENETC_PSGCAPR_SGIT_MSK);
+ priv->psfp_cap.max_psfp_gatelist = (reg & ENETC_PSGCAPR_GCL_MSK) >> 16;
+ /* Port flow meter capability */
+ reg = enetc_port_rd(&priv->si->hw, ENETC_PFMCAPR);
+ priv->psfp_cap.max_psfp_meter = reg & ENETC_PFMCAPR_MSK;
+}
+
+static inline void enetc_psfp_enable(struct enetc_hw *hw)
+{
+ enetc_wr(hw, ENETC_PPSFPMR, enetc_rd(hw, ENETC_PPSFPMR) |
+ ENETC_PPSFPMR_PSFPEN | ENETC_PPSFPMR_VS |
+ ENETC_PPSFPMR_PVC | ENETC_PPSFPMR_PVZC);
+}
+
+static inline void enetc_psfp_disable(struct enetc_hw *hw)
+{
+ enetc_wr(hw, ENETC_PPSFPMR, enetc_rd(hw, ENETC_PPSFPMR) &
+ ~ENETC_PPSFPMR_PSFPEN & ~ENETC_PPSFPMR_VS &
+ ~ENETC_PPSFPMR_PVC & ~ENETC_PPSFPMR_PVZC);
+}
#else
#define enetc_setup_tc_taprio(ndev, type_data) -EOPNOTSUPP
#define enetc_sched_speed_set(ndev) (void)0
#define enetc_setup_tc_cbs(ndev, type_data) -EOPNOTSUPP
#define enetc_setup_tc_txtime(ndev, type_data) -EOPNOTSUPP
+#define enetc_get_max_cap(p) \
+ memset(&((p)->psfp_cap), 0, sizeof(struct psfp_cap))
+
+#define enetc_psfp_enable(hw) (void)0
+#define enetc_psfp_disable(hw) (void)0
#endif
diff --git a/drivers/net/ethernet/freescale/enetc/enetc_hw.h b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
index 2a6523136947..587974862f48 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc_hw.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
@@ -19,6 +19,7 @@
#define ENETC_SICTR1 0x1c
#define ENETC_SIPCAPR0 0x20
#define ENETC_SIPCAPR0_QBV BIT(4)
+#define ENETC_SIPCAPR0_PSFP BIT(9)
#define ENETC_SIPCAPR0_RSS BIT(8)
#define ENETC_SIPCAPR1 0x24
#define ENETC_SITGTGR 0x30
@@ -228,6 +229,15 @@ enum enetc_bdr_type {TX, RX};
#define ENETC_PM0_IFM_RLP (BIT(5) | BIT(11))
#define ENETC_PM0_IFM_RGAUTO (BIT(15) | ENETC_PMO_IFM_RG | BIT(1))
#define ENETC_PM0_IFM_XGMII BIT(12)
+#define ENETC_PSIDCAPR 0x1b08
+#define ENETC_PSIDCAPR_MSK GENMASK(15, 0)
+#define ENETC_PSFCAPR 0x1b18
+#define ENETC_PSFCAPR_MSK GENMASK(15, 0)
+#define ENETC_PSGCAPR 0x1b28
+#define ENETC_PSGCAPR_GCL_MSK GENMASK(18, 16)
+#define ENETC_PSGCAPR_SGIT_MSK GENMASK(15, 0)
+#define ENETC_PFMCAPR 0x1b38
+#define ENETC_PFMCAPR_MSK GENMASK(15, 0)
/* MAC counters */
#define ENETC_PM0_REOCT 0x8100
@@ -621,3 +631,10 @@ struct enetc_cbd {
/* Port time specific departure */
#define ENETC_PTCTSDR(n) (0x1210 + 4 * (n))
#define ENETC_TSDE BIT(31)
+
+/* PSFP setting */
+#define ENETC_PPSFPMR 0x11b00
+#define ENETC_PPSFPMR_PSFPEN BIT(0)
+#define ENETC_PPSFPMR_VS BIT(1)
+#define ENETC_PPSFPMR_PVC BIT(2)
+#define ENETC_PPSFPMR_PVZC BIT(3)
diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf.c b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
index de1ad4975074..cef9fbfdb056 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
@@ -727,6 +727,14 @@ static void enetc_pf_netdev_setup(struct enetc_si *si, struct net_device *ndev,
if (si->hw_features & ENETC_SI_F_QBV)
priv->active_offloads |= ENETC_F_QBV;
+ if (si->hw_features & ENETC_SI_F_PSFP) {
+ priv->active_offloads |= ENETC_F_QCI;
+ ndev->features |= NETIF_F_HW_TC;
+ ndev->hw_features |= NETIF_F_HW_TC;
+ enetc_get_max_cap(priv);
+ enetc_psfp_enable(&si->hw);
+ }
+
/* pick up primary MAC address from SI */
enetc_get_primary_mac_addr(&si->hw, ndev->dev_addr);
}
--
2.17.1
next prev parent reply other threads:[~2020-04-22 3:09 UTC|newest]
Thread overview: 125+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-06 12:55 [RFC,net-next 0/9] Introduce a flow gate control action and apply IEEE Po Liu
2020-03-06 12:55 ` [RFC,net-next 1/9] net: qos offload add flow status with dropped count Po Liu
2020-03-06 12:56 ` [RFC,net-next 2/9] net: qos: introduce a gate control flow action Po Liu
2020-03-06 19:11 ` Jakub Kicinski
2020-03-07 6:05 ` [EXT] " Po Liu
2020-03-12 22:14 ` Vinicius Costa Gomes
2020-03-13 3:47 ` [EXT] " Po Liu
2020-03-13 18:36 ` Cong Wang
2020-03-14 4:09 ` [EXT] " Po Liu
2020-03-06 12:56 ` [RFC,net-next 3/9] net: schedule: add action gate offloading Po Liu
2020-03-06 19:02 ` Jakub Kicinski
2020-03-06 19:19 ` Jakub Kicinski
2020-03-07 4:38 ` [EXT] " Po Liu
2020-03-06 12:56 ` [RFC,net-next 4/9] net: enetc: add hw tc hw offload features for PSPF capability Po Liu
2020-03-06 12:56 ` [RFC,net-next 5/9] net: enetc: add tc flower psfp offload driver Po Liu
2020-03-12 22:14 ` Vinicius Costa Gomes
2020-03-13 5:59 ` [EXT] " Po Liu
2020-03-06 12:56 ` [RFC,net-next 6/9] net: qos: add tc police offloading action with max frame size limit Po Liu
2020-06-23 6:34 ` [v1,net-next 1/4] " Po Liu
2020-06-23 6:34 ` [v1,net-next 2/4] net: enetc: add support max frame size for tc flower offload Po Liu
2020-06-23 6:34 ` [v1,net-next 3/4] net: qos: police action add index for tc flower offloading Po Liu
2020-06-23 7:09 ` Ido Schimmel
2020-06-23 7:39 ` [EXT] " Po Liu
2020-06-23 10:08 ` Jamal Hadi Salim
2020-06-23 6:34 ` [v1,net-next 4/4] net: enetc add tc flower offload flow metering policing action Po Liu
2020-06-23 14:54 ` kernel test robot
2020-06-23 15:08 ` kernel test robot
2020-06-24 9:36 ` [v2,net-next 1/4] net: qos: add tc police offloading action with max frame size limit Po Liu
2020-06-24 9:36 ` [v2,net-next 2/4] net: enetc: add support max frame size for tc flower offload Po Liu
2020-06-25 5:04 ` David Miller
2020-06-24 9:36 ` [v2,net-next 3/4] net: qos: police action add index for tc flower offloading Po Liu
2020-06-25 5:04 ` David Miller
2020-06-24 9:36 ` [v2,net-next 4/4] net: enetc add tc flower offload flow metering policing action Po Liu
2020-06-25 5:04 ` David Miller
2020-06-25 5:04 ` [v2,net-next 1/4] net: qos: add tc police offloading action with max frame size limit David Miller
2020-06-23 7:01 ` [v1,net-next " Ido Schimmel
2020-03-06 12:56 ` [RFC,net-next 7/9] net: enetc: add support max frame size for tc flower offload Po Liu
2020-03-06 12:56 ` [RFC,net-next 8/9] net: qos: police action add index for tc flower offloading Po Liu
2020-06-21 10:04 ` Ido Schimmel
2020-03-06 12:56 ` [RFC,net-next 9/9] net: enetc add tc flower offload flow metering policing action Po Liu
2020-03-06 12:56 ` [RFC, iproute2-next] iproute2:tc:action: add a gate control action Po Liu
2020-03-24 3:47 ` [v1,net-next 0/5] Introduce a flow gate control action and apply IEEE Po Liu
2020-03-24 3:47 ` [v1,net-next 1/5] net: qos offload add flow status with dropped count Po Liu
2020-03-24 10:01 ` Jiri Pirko
2020-03-24 13:04 ` [EXT] " Po Liu
2020-03-24 3:47 ` [v1,net-next 2/5] net: qos: introduce a gate control flow action Po Liu
2020-03-24 10:19 ` Jiri Pirko
2020-03-24 10:28 ` [EXT] " Po Liu
2020-03-24 3:47 ` [v1,net-next 3/5] net: schedule: add action gate offloading Po Liu
2020-03-24 3:47 ` [v1,net-next 4/5] net: enetc: add hw tc hw offload features for PSPF capability Po Liu
2020-03-24 11:18 ` kbuild test robot
2020-03-24 12:14 ` Jiri Pirko
2020-03-24 3:47 ` [v1,net-next 5/5] net: enetc: add tc flower psfp offload driver Po Liu
2020-03-24 12:53 ` kbuild test robot
2020-03-24 3:47 ` [v1,iproute2 1/2] iproute2:tc:action: add a gate control action Po Liu
2020-03-24 21:59 ` Stephen Hemminger
2020-03-25 2:40 ` [EXT] " Po Liu
2020-03-24 3:47 ` [v1,iproute2 2/2] iproute2: add gate action man page Po Liu
2020-04-14 5:40 ` [v2,net-next 0/4] Introduce a flow gate control action and apply IEEE Po Liu
2020-04-14 5:40 ` [ v2,net-next 1/4] net: qos: introduce a gate control flow action Po Liu
2020-04-14 5:40 ` [ v2,net-next 2/4] net: schedule: add action gate offloading Po Liu
2020-04-14 5:40 ` [ v2,net-next 3/4] net: enetc: add hw tc hw offload features for PSPF capability Po Liu
2020-04-14 5:40 ` [ v2,net-next 4/4] net: enetc: add tc flower psfp offload driver Po Liu
2020-04-14 23:41 ` [v2,net-next 0/4] Introduce a flow gate control action and apply IEEE David Miller
2020-04-18 1:12 ` Po Liu
2020-04-18 1:12 ` [ v2,net-next 1/4] net: qos: introduce a gate control flow action Po Liu
2020-04-18 1:12 ` [ v2,net-next 2/4] net: schedule: add action gate offloading Po Liu
2020-04-18 1:12 ` [ v2,net-next 3/4] net: enetc: add hw tc hw offload features for PSPF capability Po Liu
2020-04-18 1:12 ` [ v2,net-next 4/4] net: enetc: add tc flower psfp offload driver Po Liu
2020-04-18 22:52 ` Vladimir Oltean
2020-04-19 1:44 ` [EXT] " Po Liu
2020-04-22 2:48 ` [v3,net-next 0/4] Introduce a flow gate control action and apply IEEE Po Liu
2020-04-22 2:48 ` [v3,net-next 1/4] net: qos: introduce a gate control flow action Po Liu
2020-04-22 13:23 ` Vlad Buslov
2020-04-23 3:14 ` [EXT] " Po Liu
2020-04-23 7:43 ` Vlad Buslov
2020-04-23 8:32 ` Po Liu
2020-04-23 9:15 ` Po Liu
2020-04-23 11:14 ` Vlad Buslov
2020-04-23 11:03 ` Vlad Buslov
2020-04-22 19:19 ` Allan W. Nielsen
2020-04-22 19:28 ` Vladimir Oltean
2020-04-22 20:05 ` Dave Taht
2020-04-23 3:29 ` [EXT] " Po Liu
2020-04-23 19:11 ` Allan W. Nielsen
2020-04-23 3:27 ` [EXT] " Po Liu
2020-04-23 17:38 ` Vinicius Costa Gomes
2020-04-23 19:17 ` Allan W. Nielsen
2020-04-24 3:23 ` [EXT] " Po Liu
2020-04-24 17:41 ` Vinicius Costa Gomes
2020-04-25 1:49 ` Po Liu
2020-04-22 2:48 ` [v3,net-next 2/4] net: schedule: add action gate offloading Po Liu
2020-04-22 14:14 ` Vlad Buslov
2020-04-22 2:48 ` Po Liu [this message]
2020-04-22 2:48 ` [v3,net-next 4/4] net: enetc: add tc flower psfp offload driver Po Liu
2020-04-28 3:34 ` [v4,net-next 0/4] Introduce a flow gate control action and apply IEEE Po Liu
2020-04-28 3:34 ` [v4,net-next 1/4] net: qos: introduce a gate control flow action Po Liu
2020-04-29 17:04 ` Vlad Buslov
2020-04-30 0:52 ` [EXT] " Po Liu
2020-04-28 3:34 ` [v4,net-next 2/4] net: schedule: add action gate offloading Po Liu
2020-04-29 17:40 ` Vlad Buslov
2020-04-28 3:34 ` [v4,net-next 3/4] net: enetc: add hw tc hw offload features for PSPF capability Po Liu
2020-04-28 3:34 ` [v4,net-next 4/4] net: enetc: add tc flower psfp offload driver Po Liu
2020-05-01 0:53 ` [v5,net-next 0/4] Introduce a flow gate control action and apply IEEE Po Liu
2020-05-01 0:53 ` [v5,net-next 1/4] net: qos: introduce a gate control flow action Po Liu
2020-05-01 0:53 ` [v5,net-next 2/4] net: schedule: add action gate offloading Po Liu
2020-05-01 0:53 ` [v5,net-next 3/4] net: enetc: add hw tc hw offload features for PSPF capability Po Liu
2020-05-01 0:53 ` [v5,net-next 4/4] net: enetc: add tc flower psfp offload driver Po Liu
2020-05-03 6:32 ` [v3,iproute2 1/2] iproute2:tc:action: add a gate control action Po Liu
2020-05-03 6:32 ` [v3,iproute2 2/2] iproute2: add gate action man page Po Liu
2020-05-06 8:40 ` [v4,iproute2-next 1/2] iproute2-next:tc:action: add a gate control action Po Liu
2020-05-06 8:40 ` [v4,iproute2-next 2/2] iproute2-next: add gate action man page Po Liu
2020-05-08 7:02 ` [v5,iproute2-next 1/2] iproute2-next:tc:action: add a gate control action Po Liu
2020-05-08 7:02 ` [v5,iproute2-next 2/2] iproute2-next: add gate action man page Po Liu
2020-05-13 2:21 ` [v5,iproute2-next 1/2] iproute2-next:tc:action: add a gate control action David Ahern
2020-05-06 12:54 ` [v4,iproute2-next " Davide Caratti
2020-05-07 2:28 ` [EXT] " Po Liu
2020-05-06 15:21 ` Stephen Hemminger
2020-05-05 0:05 ` [v3,iproute2 1/2] iproute2:tc:action: " Stephen Hemminger
2020-05-05 0:06 ` Stephen Hemminger
2020-05-01 23:08 ` [v5,net-next 0/4] Introduce a flow gate control action and apply IEEE David Miller
2020-06-19 6:01 ` [v2,net-next] net: qos offload add flow status with dropped count Po Liu
2020-06-19 7:03 ` Simon Horman
2020-06-19 18:00 ` Vlad Buslov
2020-06-19 19:54 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200422024852.23224-4-Po.Liu@nxp.com \
--to=po.liu@nxp.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--cc=alexandru.marginean@nxp.com \
--cc=andre.guedes@linux.intel.com \
--cc=claudiu.manoil@nxp.com \
--cc=davem@davemloft.net \
--cc=idosch@mellanox.com \
--cc=jhs@mojatatu.com \
--cc=jiri@mellanox.com \
--cc=kuba@kernel.org \
--cc=leon@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=m-karicheri2@ti.com \
--cc=michael.chan@broadcom.com \
--cc=moshe@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=saeedm@mellanox.com \
--cc=simon.horman@netronome.com \
--cc=stephen@networkplumber.org \
--cc=vinicius.gomes@intel.com \
--cc=vishal@chelsio.com \
--cc=vladimir.oltean@nxp.com \
--cc=xiyou.wangcong@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).