Skip to contentSkip to conversation

enetc: Configure the Time-Aware Scheduler via tc-taprio offload

PATCH Superseded Po Liu 7 participants 36 messages Nov 11, 2019 – Nov 16, 2019

Subsystems (3)
lore
Share & tools
lore

Po Liu

author
#0 lore raw

PATCH 1/2 enetc: Configure the Time-Aware Scheduler via tc-taprio offload

ENETC supports in hardware for time-based egress shaping according to IEEE 802.1Qbv. This patch implement the Qbv enablement by the hardware offload method qdisc tc-taprio method.
Also update cbdr writeback to up level since control bd ring may writeback data to control bd ring.

---
 drivers/net/ethernet/freescale/enetc/Makefile |   1 +
 drivers/net/ethernet/freescale/enetc/enetc.c  |  19 ++-
 drivers/net/ethernet/freescale/enetc/enetc.h  |   2 +
 .../net/ethernet/freescale/enetc/enetc_cbdr.c |   5 +-
 .../net/ethernet/freescale/enetc/enetc_hw.h   | 150 ++++++++++++++++--
 .../net/ethernet/freescale/enetc/enetc_qos.c  | 130 +++++++++++++++
 6 files changed, 285 insertions(+), 22 deletions(-)
 create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_qos.c
drivers/net/ethernet/freescale/enetc/Makefile +1 -0
index d200c27c3bf6..389f722efc43 100644
@@ -5,6 +5,7 @@ common-objs := enetc.o enetc_cbdr.o enetc_ethtool.o
 obj-$(CONFIG_FSL_ENETC) += fsl-enetc.o
 fsl-enetc-y := enetc_pf.o enetc_mdio.o $(common-objs)
 fsl-enetc-$(CONFIG_PCI_IOV) += enetc_msg.o
+fsl-enetc-$(CONFIG_NET_SCH_TAPRIO) += enetc_qos.o
 
 obj-$(CONFIG_FSL_ENETC_VF) += fsl-enetc-vf.o
 fsl-enetc-vf-y := enetc_vf.o $(common-objs)
drivers/net/ethernet/freescale/enetc/enetc.c +14 -5
index 3e8f9819f08c..d58dbc2c4270 100644
@@ -1427,8 +1427,7 @@ int enetc_close(struct net_device *ndev)
 	return 0;
 }
 
-int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
-		   void *type_data)
+int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data)
 {
 	struct enetc_ndev_priv *priv = netdev_priv(ndev);
 	struct tc_mqprio_qopt *mqprio = type_data;
@@ -1436,9 +1435,6 @@ int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
 	u8 num_tc;
 	int i;
 
-	if (type != TC_SETUP_QDISC_MQPRIO)
-		return -EOPNOTSUPP;
-
 	mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;
 	num_tc = mqprio->num_tc;
 
@@ -1483,6 +1479,19 @@ int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
 	return 0;
 }
 
+int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
+		   void *type_data)
+{
+	switch (type) {
+	case TC_SETUP_QDISC_MQPRIO:
+		return enetc_setup_tc_mqprio(ndev, type_data);
+	case TC_SETUP_QDISC_TAPRIO:
+		return enetc_setup_tc_taprio(ndev, type_data);
+	default:
+		return -EOPNOTSUPP;
+	}
+}
+
 struct net_device_stats *enetc_get_stats(struct net_device *ndev)
 {
 	struct enetc_ndev_priv *priv = netdev_priv(ndev);
drivers/net/ethernet/freescale/enetc/enetc.h +2 -0
index 541b4e2073fe..8676631041d5 100644
@@ -244,3 +244,5 @@ int enetc_set_fs_entry(struct enetc_si *si, struct enetc_cmd_rfse *rfse,
 void enetc_set_rss_key(struct enetc_hw *hw, const u8 *bytes);
 int enetc_get_rss_table(struct enetc_si *si, u32 *table, int count);
 int enetc_set_rss_table(struct enetc_si *si, const u32 *table, int count);
+int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd);
+int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data);
drivers/net/ethernet/freescale/enetc/enetc_cbdr.c +4 -1
index de466b71bf8f..201cbc362e33 100644
@@ -32,7 +32,7 @@ static int enetc_cbd_unused(struct enetc_cbdr *r)
 		r->bd_count;
 }
 
-static int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
+int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
 {
 	struct enetc_cbdr *ring = &si->cbd_ring;
 	int timeout = ENETC_CBDR_TIMEOUT;
@@ -66,6 +66,9 @@ static int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
 	if (!timeout)
 		return -EBUSY;
 
+	/* CBD may writeback data, feedback up level */
+	*cbd = *dest_cbd;
+
 	enetc_clean_cbdr(si);
 
 	return 0;
drivers/net/ethernet/freescale/enetc/enetc_hw.h +134 -16

171 lines not on this page · raw message

drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +130 -0

130 lines not on this page · raw message

Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/2 enetc: update TSN Qbv PSPEED set according to adjust link speed

ENETC has a register PSPEED to indicate the link speed of hardware. It is need to update accordingly. PSPEED field needs to be updated with the port speed for QBV scheduling purposes. Or else there is chance for gate slot not free by frame taking the MAC if PSPEED and phy speed not match. So update PSPEED when link adjust. This is implement by the adjust_link.

---
 drivers/net/ethernet/freescale/enetc/enetc.c  | 13 +++++--
 drivers/net/ethernet/freescale/enetc/enetc.h  |  7 ++++
 .../net/ethernet/freescale/enetc/enetc_pf.c   |  3 ++
 .../net/ethernet/freescale/enetc/enetc_qos.c  | 34 +++++++++++++++++++
 4 files changed, 55 insertions(+), 2 deletions(-)
drivers/net/ethernet/freescale/enetc/enetc.c +11 -2
index d58dbc2c4270..f6b00c68451b 100644
@@ -742,9 +742,14 @@ void enetc_get_si_caps(struct enetc_si *si)
 	si->num_rss = 0;
 	val = enetc_rd(hw, ENETC_SIPCAPR0);
 	if (val & ENETC_SIPCAPR0_RSS) {
-		val = enetc_rd(hw, ENETC_SIRSSCAPR);
-		si->num_rss = ENETC_SIRSSCAPR_GET_NUM_RSS(val);
+		u32 rss;
+
+		rss = enetc_rd(hw, ENETC_SIRSSCAPR);
+		si->num_rss = ENETC_SIRSSCAPR_GET_NUM_RSS(rss);
 	}
+
+	if (val & ENETC_SIPCAPR0_QBV)
+		si->hw_features |= ENETC_SI_F_QBV;
 }
 
 static int enetc_dma_alloc_bdr(struct enetc_bdr *r, size_t bd_size)
@@ -1314,8 +1319,12 @@ static void enetc_disable_interrupts(struct enetc_ndev_priv *priv)
 
 static void adjust_link(struct net_device *ndev)
 {
+	struct enetc_ndev_priv *priv = netdev_priv(ndev);
 	struct phy_device *phydev = ndev->phydev;
 
+	if (priv->active_offloads & ENETC_F_QBV)
+		enetc_sched_speed_set(ndev);
+
 	phy_print_status(phydev);
 }
 
drivers/net/ethernet/freescale/enetc/enetc.h +7 -0
index 8676631041d5..e85e5301c578 100644
@@ -118,6 +118,8 @@ enum enetc_errata {
 	ENETC_ERR_UCMCSWP	= BIT(2),
 };
 
+#define ENETC_SI_F_QBV  (1<<0)
+
 /* PCI IEP device data */
 struct enetc_si {
 	struct pci_dev *pdev;
@@ -133,6 +135,7 @@ struct enetc_si {
 	int num_fs_entries;
 	int num_rss; /* number of RSS buckets */
 	unsigned short pad;
+	int hw_features;
 };
 
 #define ENETC_SI_ALIGN	32
@@ -173,6 +176,7 @@ struct enetc_cls_rule {
 enum enetc_active_offloads {
 	ENETC_F_RX_TSTAMP	= BIT(0),
 	ENETC_F_TX_TSTAMP	= BIT(1),
+	ENETC_F_QBV             = BIT(2),
 };
 
 struct enetc_ndev_priv {
@@ -188,6 +192,8 @@ struct enetc_ndev_priv {
 	u16 msg_enable;
 	int active_offloads;
 
+	u32 speed; /* store speed for compare update pspeed */
+
 	struct enetc_bdr *tx_ring[16];
 	struct enetc_bdr *rx_ring[16];
 
@@ -246,3 +252,4 @@ int enetc_get_rss_table(struct enetc_si *si, u32 *table, int count);
 int enetc_set_rss_table(struct enetc_si *si, const u32 *table, int count);
 int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd);
 int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data);
+void enetc_sched_speed_set(struct net_device *ndev);
drivers/net/ethernet/freescale/enetc/enetc_pf.c +3 -0
index 7da79b816416..e7482d483b28 100644
@@ -742,6 +742,9 @@ static void enetc_pf_netdev_setup(struct enetc_si *si, struct net_device *ndev,
 
 	ndev->priv_flags |= IFF_UNICAST_FLT;
 
+	if (si->hw_features & ENETC_SI_F_QBV)
+		priv->active_offloads |= ENETC_F_QBV;
+
 	/* pick up primary MAC address from SI */
 	enetc_get_primary_mac_addr(&si->hw, ndev->dev_addr);
 }
drivers/net/ethernet/freescale/enetc/enetc_qos.c +34 -0
index 036bb39c7a0b..801104dd2ba6 100644
@@ -11,6 +11,40 @@ static u16 enetc_get_max_gcl_len(struct enetc_hw *hw)
 		& ENETC_QBV_MAX_GCL_LEN_MASK;
 }
 
+void enetc_sched_speed_set(struct net_device *ndev)
+{
+	struct enetc_ndev_priv *priv = netdev_priv(ndev);
+	struct phy_device *phydev = ndev->phydev;
+	u32 old_speed = priv->speed;
+	u32 speed, pspeed;
+
+	if (phydev->speed == old_speed)
+		return;
+
+	speed = phydev->speed;
+	switch (speed) {
+	case SPEED_1000:
+		pspeed = ENETC_PMR_PSPEED_1000M;
+		break;
+	case SPEED_2500:
+		pspeed = ENETC_PMR_PSPEED_2500M;
+		break;
+	case SPEED_100:
+		pspeed = ENETC_PMR_PSPEED_100M;
+		break;
+	case SPEED_10:
+	default:
+		pspeed = ENETC_PMR_PSPEED_10M;
+		netdev_err(ndev, "Qbv PSPEED set speed link down.\n");
+	}
+
+	priv->speed = speed;
+	enetc_port_wr(&priv->si->hw, ENETC_PMR,
+		      (enetc_port_rd(&priv->si->hw, ENETC_PMR)
+		      & (~ENETC_PMR_PSPEED_MASK))
+		      | pspeed);
+}
+
 static int enetc_setup_taprio(struct net_device *ndev,
 			      struct tc_taprio_qopt_offload *admin_conf)
 {
Signature · 1 line
2.17.1
author
#2 lore raw

PATCH v2 1/2 enetc: Configure the Time-Aware Scheduler via tc-taprio offload

ENETC supports in hardware for time-based egress shaping according to IEEE 802.1Qbv. This patch implement the Qbv enablement by the hardware offload method qdisc tc-taprio method.
Also update cbdr writeback to up level since control bd ring may writeback data to control bd ring.

---
changes:
- introduce a local define CONFIG_FSL_ENETC_QOS to fix the various configurations will result in link errors.
Since the CONFIG_NET_SCH_TAPRIO depends on many Qos configs. Not to use it directly in driver. Add it to CONFIG_FSL_ENETC_QOS depends on list, so only CONFIG_NET_SCH_TAPRIO enabled, user can enable this tsn feature, or else, return not support.

 drivers/net/ethernet/freescale/enetc/Kconfig  |  10 ++
 drivers/net/ethernet/freescale/enetc/Makefile |   1 +
 drivers/net/ethernet/freescale/enetc/enetc.c  |  19 ++-
 drivers/net/ethernet/freescale/enetc/enetc.h  |   7 +
 .../net/ethernet/freescale/enetc/enetc_cbdr.c |   5 +-
 .../net/ethernet/freescale/enetc/enetc_hw.h   | 150 ++++++++++++++++--
 .../net/ethernet/freescale/enetc/enetc_qos.c  | 130 +++++++++++++++
 7 files changed, 300 insertions(+), 22 deletions(-)
 create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_qos.c
drivers/net/ethernet/freescale/enetc/Kconfig +10 -0
index c219587bd334..017ade2d0e50 100644
@@ -50,3 +50,13 @@ config FSL_ENETC_HW_TIMESTAMPING
 	  allocation has not been supported and it is too expensive to use
 	  extended RX BDs if timestamping is not used, this option enables
 	  extended RX BDs in order to support hardware timestamping.
+
+config FSL_ENETC_QOS
+	bool "ENETC hardware Time-sensitive Network support"
+	depends on FSL_ENETC && NET_SCH_TAPRIO
+	help
+	  There are Time-Sensitive Network(TSN) capabilities(802.1Qbv/802.1Qci
+	  /802.1Qbu etc.) supported by ENETC. These TSN capabilities can be set
+	  enable/disable from user space via Qos commands(tc). In the kernel
+	  side, it can be loaded by Qos driver. Currently, it is only support
+	  taprio(802.1Qbv).
drivers/net/ethernet/freescale/enetc/Makefile +1 -0
index d200c27c3bf6..7a80680a7634 100644
@@ -5,6 +5,7 @@ common-objs := enetc.o enetc_cbdr.o enetc_ethtool.o
 obj-$(CONFIG_FSL_ENETC) += fsl-enetc.o
 fsl-enetc-y := enetc_pf.o enetc_mdio.o $(common-objs)
 fsl-enetc-$(CONFIG_PCI_IOV) += enetc_msg.o
+fsl-enetc-$(CONFIG_FSL_ENETC_QOS) += enetc_qos.o
 
 obj-$(CONFIG_FSL_ENETC_VF) += fsl-enetc-vf.o
 fsl-enetc-vf-y := enetc_vf.o $(common-objs)
drivers/net/ethernet/freescale/enetc/enetc.c +14 -5
index 3e8f9819f08c..d58dbc2c4270 100644
@@ -1427,8 +1427,7 @@ int enetc_close(struct net_device *ndev)
 	return 0;
 }
 
-int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
-		   void *type_data)
+int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data)
 {
 	struct enetc_ndev_priv *priv = netdev_priv(ndev);
 	struct tc_mqprio_qopt *mqprio = type_data;
@@ -1436,9 +1435,6 @@ int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
 	u8 num_tc;
 	int i;
 
-	if (type != TC_SETUP_QDISC_MQPRIO)
-		return -EOPNOTSUPP;
-
 	mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;
 	num_tc = mqprio->num_tc;
 
@@ -1483,6 +1479,19 @@ int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
 	return 0;
 }
 
+int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
+		   void *type_data)
+{
+	switch (type) {
+	case TC_SETUP_QDISC_MQPRIO:
+		return enetc_setup_tc_mqprio(ndev, type_data);
+	case TC_SETUP_QDISC_TAPRIO:
+		return enetc_setup_tc_taprio(ndev, type_data);
+	default:
+		return -EOPNOTSUPP;
+	}
+}
+
 struct net_device_stats *enetc_get_stats(struct net_device *ndev)
 {
 	struct enetc_ndev_priv *priv = netdev_priv(ndev);
drivers/net/ethernet/freescale/enetc/enetc.h +7 -0
index 541b4e2073fe..8ca2f97050c8 100644
@@ -244,3 +244,10 @@ int enetc_set_fs_entry(struct enetc_si *si, struct enetc_cmd_rfse *rfse,
 void enetc_set_rss_key(struct enetc_hw *hw, const u8 *bytes);
 int enetc_get_rss_table(struct enetc_si *si, u32 *table, int count);
 int enetc_set_rss_table(struct enetc_si *si, const u32 *table, int count);
+int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd);
+
+#ifdef CONFIG_FSL_ENETC_QOS
+int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data);
+#else
+#define enetc_setup_tc_taprio(ndev, type_data) -EOPNOTSUPP
+#endif
drivers/net/ethernet/freescale/enetc/enetc_cbdr.c +4 -1
index de466b71bf8f..201cbc362e33 100644
@@ -32,7 +32,7 @@ static int enetc_cbd_unused(struct enetc_cbdr *r)
 		r->bd_count;
 }
 
-static int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
+int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
 {
 	struct enetc_cbdr *ring = &si->cbd_ring;
 	int timeout = ENETC_CBDR_TIMEOUT;
@@ -66,6 +66,9 @@ static int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
 	if (!timeout)
 		return -EBUSY;
 
+	/* CBD may writeback data, feedback up level */
+	*cbd = *dest_cbd;
+
 	enetc_clean_cbdr(si);
 
 	return 0;
drivers/net/ethernet/freescale/enetc/enetc_hw.h +134 -16

171 lines not on this page · raw message

drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +130 -0

130 lines not on this page · raw message

Signature · 1 line
2.17.1
author
#3 lore raw

PATCH v2 2/2 enetc: update TSN Qbv PSPEED set according to adjust link speed

ENETC has a register PSPEED to indicate the link speed of hardware. It is need to update accordingly. PSPEED field needs to be updated with the port speed for QBV scheduling purposes. Or else there is chance for gate slot not free by frame taking the MAC if PSPEED and phy speed not match. So update PSPEED when link adjust. This is implement by the adjust_link.

---
changes:
- fix for enetc_sched_speed_set() define for different config.

 drivers/net/ethernet/freescale/enetc/enetc.c  | 13 +++++--
 drivers/net/ethernet/freescale/enetc/enetc.h  |  8 +++++
 .../net/ethernet/freescale/enetc/enetc_pf.c   |  3 ++
 .../net/ethernet/freescale/enetc/enetc_qos.c  | 34 +++++++++++++++++++
 4 files changed, 56 insertions(+), 2 deletions(-)
drivers/net/ethernet/freescale/enetc/enetc.c +11 -2
index d58dbc2c4270..f6b00c68451b 100644
@@ -742,9 +742,14 @@ void enetc_get_si_caps(struct enetc_si *si)
 	si->num_rss = 0;
 	val = enetc_rd(hw, ENETC_SIPCAPR0);
 	if (val & ENETC_SIPCAPR0_RSS) {
-		val = enetc_rd(hw, ENETC_SIRSSCAPR);
-		si->num_rss = ENETC_SIRSSCAPR_GET_NUM_RSS(val);
+		u32 rss;
+
+		rss = enetc_rd(hw, ENETC_SIRSSCAPR);
+		si->num_rss = ENETC_SIRSSCAPR_GET_NUM_RSS(rss);
 	}
+
+	if (val & ENETC_SIPCAPR0_QBV)
+		si->hw_features |= ENETC_SI_F_QBV;
 }
 
 static int enetc_dma_alloc_bdr(struct enetc_bdr *r, size_t bd_size)
@@ -1314,8 +1319,12 @@ static void enetc_disable_interrupts(struct enetc_ndev_priv *priv)
 
 static void adjust_link(struct net_device *ndev)
 {
+	struct enetc_ndev_priv *priv = netdev_priv(ndev);
 	struct phy_device *phydev = ndev->phydev;
 
+	if (priv->active_offloads & ENETC_F_QBV)
+		enetc_sched_speed_set(ndev);
+
 	phy_print_status(phydev);
 }
 
drivers/net/ethernet/freescale/enetc/enetc.h +8 -0
index 8ca2f97050c8..89f23156f330 100644
@@ -118,6 +118,8 @@ enum enetc_errata {
 	ENETC_ERR_UCMCSWP	= BIT(2),
 };
 
+#define ENETC_SI_F_QBV BIT(0)
+
 /* PCI IEP device data */
 struct enetc_si {
 	struct pci_dev *pdev;
@@ -133,6 +135,7 @@ struct enetc_si {
 	int num_fs_entries;
 	int num_rss; /* number of RSS buckets */
 	unsigned short pad;
+	int hw_features;
 };
 
 #define ENETC_SI_ALIGN	32
@@ -173,6 +176,7 @@ struct enetc_cls_rule {
 enum enetc_active_offloads {
 	ENETC_F_RX_TSTAMP	= BIT(0),
 	ENETC_F_TX_TSTAMP	= BIT(1),
+	ENETC_F_QBV             = BIT(2),
 };
 
 struct enetc_ndev_priv {
@@ -188,6 +192,8 @@ struct enetc_ndev_priv {
 	u16 msg_enable;
 	int active_offloads;
 
+	u32 speed; /* store speed for compare update pspeed */
+
 	struct enetc_bdr *tx_ring[16];
 	struct enetc_bdr *rx_ring[16];
 
@@ -248,6 +254,8 @@ int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd);
 
 #ifdef CONFIG_FSL_ENETC_QOS
 int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data);
+void enetc_sched_speed_set(struct net_device *ndev);
 #else
 #define enetc_setup_tc_taprio(ndev, type_data) -EOPNOTSUPP
+#define enetc_sched_speed_set(ndev) (void)0
 #endif
drivers/net/ethernet/freescale/enetc/enetc_pf.c +3 -0
index 7da79b816416..e7482d483b28 100644
@@ -742,6 +742,9 @@ static void enetc_pf_netdev_setup(struct enetc_si *si, struct net_device *ndev,
 
 	ndev->priv_flags |= IFF_UNICAST_FLT;
 
+	if (si->hw_features & ENETC_SI_F_QBV)
+		priv->active_offloads |= ENETC_F_QBV;
+
 	/* pick up primary MAC address from SI */
 	enetc_get_primary_mac_addr(&si->hw, ndev->dev_addr);
 }
drivers/net/ethernet/freescale/enetc/enetc_qos.c +34 -0
index 036bb39c7a0b..801104dd2ba6 100644
@@ -11,6 +11,40 @@ static u16 enetc_get_max_gcl_len(struct enetc_hw *hw)
 		& ENETC_QBV_MAX_GCL_LEN_MASK;
 }
 
+void enetc_sched_speed_set(struct net_device *ndev)
+{
+	struct enetc_ndev_priv *priv = netdev_priv(ndev);
+	struct phy_device *phydev = ndev->phydev;
+	u32 old_speed = priv->speed;
+	u32 speed, pspeed;
+
+	if (phydev->speed == old_speed)
+		return;
+
+	speed = phydev->speed;
+	switch (speed) {
+	case SPEED_1000:
+		pspeed = ENETC_PMR_PSPEED_1000M;
+		break;
+	case SPEED_2500:
+		pspeed = ENETC_PMR_PSPEED_2500M;
+		break;
+	case SPEED_100:
+		pspeed = ENETC_PMR_PSPEED_100M;
+		break;
+	case SPEED_10:
+	default:
+		pspeed = ENETC_PMR_PSPEED_10M;
+		netdev_err(ndev, "Qbv PSPEED set speed link down.\n");
+	}
+
+	priv->speed = speed;
+	enetc_port_wr(&priv->si->hw, ENETC_PMR,
+		      (enetc_port_rd(&priv->si->hw, ENETC_PMR)
+		      & (~ENETC_PMR_PSPEED_MASK))
+		      | pspeed);
+}
+
 static int enetc_setup_taprio(struct net_device *ndev,
 			      struct tc_taprio_qopt_offload *admin_conf)
 {
Signature · 1 line
2.17.1
maintainer Applied
#4 lore raw

Re: [v2,net-next, 2/2] enetc: update TSN Qbv PSPEED set according to adjust link speed

From: Po Liu <[email protected]>
Date: Tue, 12 Nov 2019 08:42:55 +0000

Quoted 10 lines

ENETC has a register PSPEED to indicate the link speed of hardware. It is need to update accordingly. PSPEED field needs to be updated with the port speed for QBV scheduling purposes. Or else there is chance for gate slot not free by frame taking the MAC if PSPEED and phy speed not match. So update PSPEED when link adjust. This is implement by the adjust_link.

Applied.

author
#5 lore raw

PATCH v3 1/2 enetc: Configure the Time-Aware Scheduler via tc-taprio offload

In reply to Po Liu

ENETC supports in hardware for time-based egress shaping according to IEEE 802.1Qbv. This patch implement the Qbv enablement by the hardware offload method qdisc tc-taprio method.
Also update cbdr writeback to up level since control bd ring may writeback data to control bd ring.

---
changes:
v2:
- introduce a local define CONFIG_FSL_ENETC_QOS to fix the various
configurations will result in link errors.
Since the CONFIG_NET_SCH_TAPRIO depends on many Qos configs. Not
to use it directly in driver. Add it to CONFIG_FSL_ENETC_QOS depends
on list, so only CONFIG_NET_SCH_TAPRIO enabled, user can enable this
tsn feature, or else, return not support.
v3:
- fix the compiling vf module failure issue:
ERROR: "enetc_sched_speed_set" [drivers/net/ethernet/freescale/enetc/fsl-enetc-vf.ko] undefined!
ERROR: "enetc_setup_tc_taprio" [drivers/net/ethernet/freescale/enetc/fsl-enetc-vf.ko] undefined!
- remove defines not used in this patch
- fix hardware endian issue
- make the qbv set code more rubust with some error condition may occur.

 drivers/net/ethernet/freescale/enetc/Kconfig  |  10 ++
 drivers/net/ethernet/freescale/enetc/Makefile |   2 +
 drivers/net/ethernet/freescale/enetc/enetc.c  |  19 ++-
 drivers/net/ethernet/freescale/enetc/enetc.h  |   7 +
 .../net/ethernet/freescale/enetc/enetc_cbdr.c |   5 +-
 .../net/ethernet/freescale/enetc/enetc_hw.h   |  84 ++++++++---
 .../net/ethernet/freescale/enetc/enetc_qos.c  | 134 ++++++++++++++++++
 7 files changed, 239 insertions(+), 22 deletions(-)
 create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_qos.c
drivers/net/ethernet/freescale/enetc/Kconfig +10 -0
index c219587bd334..491659fe3e35 100644
@@ -50,3 +50,13 @@ config FSL_ENETC_HW_TIMESTAMPING
 	  allocation has not been supported and it is too expensive to use
 	  extended RX BDs if timestamping is not used, this option enables
 	  extended RX BDs in order to support hardware timestamping.
+
+config FSL_ENETC_QOS
+	bool "ENETC hardware Time-sensitive Network support"
+	depends on (FSL_ENETC || FSL_ENETC_VF) && NET_SCH_TAPRIO
+	help
+	  There are Time-Sensitive Network(TSN) capabilities(802.1Qbv/802.1Qci
+	  /802.1Qbu etc.) supported by ENETC. These TSN capabilities can be set
+	  enable/disable from user space via Qos commands(tc). In the kernel
+	  side, it can be loaded by Qos driver. Currently, it is only support
+	  taprio(802.1Qbv).
drivers/net/ethernet/freescale/enetc/Makefile +2 -0
index d200c27c3bf6..d0db33e5b6b7 100644
@@ -5,9 +5,11 @@ common-objs := enetc.o enetc_cbdr.o enetc_ethtool.o
 obj-$(CONFIG_FSL_ENETC) += fsl-enetc.o
 fsl-enetc-y := enetc_pf.o enetc_mdio.o $(common-objs)
 fsl-enetc-$(CONFIG_PCI_IOV) += enetc_msg.o
+fsl-enetc-$(CONFIG_FSL_ENETC_QOS) += enetc_qos.o
 
 obj-$(CONFIG_FSL_ENETC_VF) += fsl-enetc-vf.o
 fsl-enetc-vf-y := enetc_vf.o $(common-objs)
+fsl-enetc-vf-$(CONFIG_FSL_ENETC_QOS) += enetc_qos.o
 
 obj-$(CONFIG_FSL_ENETC_MDIO) += fsl-enetc-mdio.o
 fsl-enetc-mdio-y := enetc_pci_mdio.o enetc_mdio.o
drivers/net/ethernet/freescale/enetc/enetc.c +14 -5
index 3e8f9819f08c..d58dbc2c4270 100644
@@ -1427,8 +1427,7 @@ int enetc_close(struct net_device *ndev)
 	return 0;
 }
 
-int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
-		   void *type_data)
+int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data)
 {
 	struct enetc_ndev_priv *priv = netdev_priv(ndev);
 	struct tc_mqprio_qopt *mqprio = type_data;
@@ -1436,9 +1435,6 @@ int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
 	u8 num_tc;
 	int i;
 
-	if (type != TC_SETUP_QDISC_MQPRIO)
-		return -EOPNOTSUPP;
-
 	mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;
 	num_tc = mqprio->num_tc;
 
@@ -1483,6 +1479,19 @@ int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
 	return 0;
 }
 
+int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
+		   void *type_data)
+{
+	switch (type) {
+	case TC_SETUP_QDISC_MQPRIO:
+		return enetc_setup_tc_mqprio(ndev, type_data);
+	case TC_SETUP_QDISC_TAPRIO:
+		return enetc_setup_tc_taprio(ndev, type_data);
+	default:
+		return -EOPNOTSUPP;
+	}
+}
+
 struct net_device_stats *enetc_get_stats(struct net_device *ndev)
 {
 	struct enetc_ndev_priv *priv = netdev_priv(ndev);
drivers/net/ethernet/freescale/enetc/enetc.h +7 -0
index 541b4e2073fe..8ca2f97050c8 100644
@@ -244,3 +244,10 @@ int enetc_set_fs_entry(struct enetc_si *si, struct enetc_cmd_rfse *rfse,
 void enetc_set_rss_key(struct enetc_hw *hw, const u8 *bytes);
 int enetc_get_rss_table(struct enetc_si *si, u32 *table, int count);
 int enetc_set_rss_table(struct enetc_si *si, const u32 *table, int count);
+int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd);
+
+#ifdef CONFIG_FSL_ENETC_QOS
+int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data);
+#else
+#define enetc_setup_tc_taprio(ndev, type_data) -EOPNOTSUPP
+#endif
drivers/net/ethernet/freescale/enetc/enetc_cbdr.c +4 -1
index de466b71bf8f..201cbc362e33 100644
@@ -32,7 +32,7 @@ static int enetc_cbd_unused(struct enetc_cbdr *r)
 		r->bd_count;
 }
 
-static int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
+int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
 {
 	struct enetc_cbdr *ring = &si->cbd_ring;
 	int timeout = ENETC_CBDR_TIMEOUT;
@@ -66,6 +66,9 @@ static int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
 	if (!timeout)
 		return -EBUSY;
 
+	/* CBD may writeback data, feedback up level */
+	*cbd = *dest_cbd;
+
 	enetc_clean_cbdr(si);
 
 	return 0;
drivers/net/ethernet/freescale/enetc/enetc_hw.h +68 -16

99 lines not on this page · raw message

drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +134 -0

134 lines not on this page · raw message

Signature · 1 line
2.17.1
author
#6 lore raw

PATCH v3 2/2 enetc: update TSN Qbv PSPEED set according to adjust link speed

ENETC has a register PSPEED to indicate the link speed of hardware. It is need to update accordingly. PSPEED field needs to be updated with the port speed for QBV scheduling purposes. Or else there is chance for gate slot not free by frame taking the MAC if PSPEED and phy speed not match. So update PSPEED when link adjust. This is implement by the adjust_link.

---
 drivers/net/ethernet/freescale/enetc/enetc.c  | 13 +++++--
 drivers/net/ethernet/freescale/enetc/enetc.h  |  8 +++++
 .../net/ethernet/freescale/enetc/enetc_hw.h   |  5 +++
 .../net/ethernet/freescale/enetc/enetc_pf.c   |  3 ++
 .../net/ethernet/freescale/enetc/enetc_qos.c  | 34 +++++++++++++++++++
 5 files changed, 61 insertions(+), 2 deletions(-)
drivers/net/ethernet/freescale/enetc/enetc.c +11 -2
index d58dbc2c4270..f6b00c68451b 100644
@@ -742,9 +742,14 @@ void enetc_get_si_caps(struct enetc_si *si)
 	si->num_rss = 0;
 	val = enetc_rd(hw, ENETC_SIPCAPR0);
 	if (val & ENETC_SIPCAPR0_RSS) {
-		val = enetc_rd(hw, ENETC_SIRSSCAPR);
-		si->num_rss = ENETC_SIRSSCAPR_GET_NUM_RSS(val);
+		u32 rss;
+
+		rss = enetc_rd(hw, ENETC_SIRSSCAPR);
+		si->num_rss = ENETC_SIRSSCAPR_GET_NUM_RSS(rss);
 	}
+
+	if (val & ENETC_SIPCAPR0_QBV)
+		si->hw_features |= ENETC_SI_F_QBV;
 }
 
 static int enetc_dma_alloc_bdr(struct enetc_bdr *r, size_t bd_size)
@@ -1314,8 +1319,12 @@ static void enetc_disable_interrupts(struct enetc_ndev_priv *priv)
 
 static void adjust_link(struct net_device *ndev)
 {
+	struct enetc_ndev_priv *priv = netdev_priv(ndev);
 	struct phy_device *phydev = ndev->phydev;
 
+	if (priv->active_offloads & ENETC_F_QBV)
+		enetc_sched_speed_set(ndev);
+
 	phy_print_status(phydev);
 }
 
drivers/net/ethernet/freescale/enetc/enetc.h +8 -0
index 8ca2f97050c8..89f23156f330 100644
@@ -118,6 +118,8 @@ enum enetc_errata {
 	ENETC_ERR_UCMCSWP	= BIT(2),
 };
 
+#define ENETC_SI_F_QBV BIT(0)
+
 /* PCI IEP device data */
 struct enetc_si {
 	struct pci_dev *pdev;
@@ -133,6 +135,7 @@ struct enetc_si {
 	int num_fs_entries;
 	int num_rss; /* number of RSS buckets */
 	unsigned short pad;
+	int hw_features;
 };
 
 #define ENETC_SI_ALIGN	32
@@ -173,6 +176,7 @@ struct enetc_cls_rule {
 enum enetc_active_offloads {
 	ENETC_F_RX_TSTAMP	= BIT(0),
 	ENETC_F_TX_TSTAMP	= BIT(1),
+	ENETC_F_QBV             = BIT(2),
 };
 
 struct enetc_ndev_priv {
@@ -188,6 +192,8 @@ struct enetc_ndev_priv {
 	u16 msg_enable;
 	int active_offloads;
 
+	u32 speed; /* store speed for compare update pspeed */
+
 	struct enetc_bdr *tx_ring[16];
 	struct enetc_bdr *rx_ring[16];
 
@@ -248,6 +254,8 @@ int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd);
 
 #ifdef CONFIG_FSL_ENETC_QOS
 int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data);
+void enetc_sched_speed_set(struct net_device *ndev);
 #else
 #define enetc_setup_tc_taprio(ndev, type_data) -EOPNOTSUPP
+#define enetc_sched_speed_set(ndev) (void)0
 #endif
drivers/net/ethernet/freescale/enetc/enetc_hw.h +5 -0
index df6b35dc3534..924ddb6d358a 100644
@@ -149,6 +149,11 @@ enum enetc_bdr_type {TX, RX};
 #define ENETC_PORT_BASE		0x10000
 #define ENETC_PMR		0x0000
 #define ENETC_PMR_EN	GENMASK(18, 16)
+#define ENETC_PMR_PSPEED_MASK GENMASK(11, 8)
+#define ENETC_PMR_PSPEED_10M	0
+#define ENETC_PMR_PSPEED_100M	BIT(8)
+#define ENETC_PMR_PSPEED_1000M	BIT(9)
+#define ENETC_PMR_PSPEED_2500M	BIT(10)
 #define ENETC_PSR		0x0004 /* RO */
 #define ENETC_PSIPMR		0x0018
 #define ENETC_PSIPMR_SET_UP(n)	BIT(n) /* n = SI index */
drivers/net/ethernet/freescale/enetc/enetc_pf.c +3 -0
index 7da79b816416..e7482d483b28 100644
@@ -742,6 +742,9 @@ static void enetc_pf_netdev_setup(struct enetc_si *si, struct net_device *ndev,
 
 	ndev->priv_flags |= IFF_UNICAST_FLT;
 
+	if (si->hw_features & ENETC_SI_F_QBV)
+		priv->active_offloads |= ENETC_F_QBV;
+
 	/* pick up primary MAC address from SI */
 	enetc_get_primary_mac_addr(&si->hw, ndev->dev_addr);
 }
drivers/net/ethernet/freescale/enetc/enetc_qos.c +34 -0
index 9ce983c00201..f804da639dd3 100644
@@ -11,6 +11,40 @@ static u16 enetc_get_max_gcl_len(struct enetc_hw *hw)
 		& ENETC_QBV_MAX_GCL_LEN_MASK;
 }
 
+void enetc_sched_speed_set(struct net_device *ndev)
+{
+	struct enetc_ndev_priv *priv = netdev_priv(ndev);
+	struct phy_device *phydev = ndev->phydev;
+	u32 old_speed = priv->speed;
+	u32 speed, pspeed;
+
+	if (phydev->speed == old_speed)
+		return;
+
+	speed = phydev->speed;
+	switch (speed) {
+	case SPEED_1000:
+		pspeed = ENETC_PMR_PSPEED_1000M;
+		break;
+	case SPEED_2500:
+		pspeed = ENETC_PMR_PSPEED_2500M;
+		break;
+	case SPEED_100:
+		pspeed = ENETC_PMR_PSPEED_100M;
+		break;
+	case SPEED_10:
+	default:
+		pspeed = ENETC_PMR_PSPEED_10M;
+		netdev_err(ndev, "Qbv PSPEED set speed link down.\n");
+	}
+
+	priv->speed = speed;
+	enetc_port_wr(&priv->si->hw, ENETC_PMR,
+		      (enetc_port_rd(&priv->si->hw, ENETC_PMR)
+		      & (~ENETC_PMR_PSPEED_MASK))
+		      | pspeed);
+}
+
 static int enetc_setup_taprio(struct net_device *ndev,
 			      struct tc_taprio_qopt_offload *admin_conf)
 {
Signature · 1 line
2.17.1
author
#7 lore raw

PATCH v4 1/2 enetc: Configure the Time-Aware Scheduler via tc-taprio offload

ENETC supports in hardware for time-based egress shaping according to IEEE 802.1Qbv. This patch implement the Qbv enablement by the hardware offload method qdisc tc-taprio method.
Also update cbdr writeback to up level since control bd ring may writeback data to control bd ring.

---
changes:
v2:
- introduce a local define CONFIG_FSL_ENETC_QOS to fix the various
configurations will result in link errors.
Since the CONFIG_NET_SCH_TAPRIO depends on many Qos configs. Not
to use it directly in driver. Add it to CONFIG_FSL_ENETC_QOS depends
on list, so only CONFIG_NET_SCH_TAPRIO enabled, user can enable this
tsn feature, or else, return not support.
v3:
- fix the compiling vf module failure issue:
ERROR: "enetc_sched_speed_set" [drivers/net/ethernet/freescale/enetc/fsl-enetc-vf.ko] undefined!
ERROR: "enetc_setup_tc_taprio" [drivers/net/ethernet/freescale/enetc/fsl-enetc-vf.ko] undefined!
- remove defines not used in this patch
- fix hardware endian issue
- make the qbv set code more rubust with some error condition may occur.
v4:
- delete hardware qbv disable before enable it
- fix when enetc_setup_taprio() return error condition, restore priority
set.

 drivers/net/ethernet/freescale/enetc/Kconfig  |  10 ++
 drivers/net/ethernet/freescale/enetc/Makefile |   2 +
 drivers/net/ethernet/freescale/enetc/enetc.c  |  19 ++-
 drivers/net/ethernet/freescale/enetc/enetc.h  |   7 +
 .../net/ethernet/freescale/enetc/enetc_cbdr.c |   5 +-
 .../net/ethernet/freescale/enetc/enetc_hw.h   |  84 +++++++++--
 .../net/ethernet/freescale/enetc/enetc_qos.c  | 138 ++++++++++++++++++
 7 files changed, 243 insertions(+), 22 deletions(-)
 create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_qos.c
drivers/net/ethernet/freescale/enetc/Kconfig +10 -0
index c219587bd334..491659fe3e35 100644
@@ -50,3 +50,13 @@ config FSL_ENETC_HW_TIMESTAMPING
 	  allocation has not been supported and it is too expensive to use
 	  extended RX BDs if timestamping is not used, this option enables
 	  extended RX BDs in order to support hardware timestamping.
+
+config FSL_ENETC_QOS
+	bool "ENETC hardware Time-sensitive Network support"
+	depends on (FSL_ENETC || FSL_ENETC_VF) && NET_SCH_TAPRIO
+	help
+	  There are Time-Sensitive Network(TSN) capabilities(802.1Qbv/802.1Qci
+	  /802.1Qbu etc.) supported by ENETC. These TSN capabilities can be set
+	  enable/disable from user space via Qos commands(tc). In the kernel
+	  side, it can be loaded by Qos driver. Currently, it is only support
+	  taprio(802.1Qbv).
drivers/net/ethernet/freescale/enetc/Makefile +2 -0
index d200c27c3bf6..d0db33e5b6b7 100644
@@ -5,9 +5,11 @@ common-objs := enetc.o enetc_cbdr.o enetc_ethtool.o
 obj-$(CONFIG_FSL_ENETC) += fsl-enetc.o
 fsl-enetc-y := enetc_pf.o enetc_mdio.o $(common-objs)
 fsl-enetc-$(CONFIG_PCI_IOV) += enetc_msg.o
+fsl-enetc-$(CONFIG_FSL_ENETC_QOS) += enetc_qos.o
 
 obj-$(CONFIG_FSL_ENETC_VF) += fsl-enetc-vf.o
 fsl-enetc-vf-y := enetc_vf.o $(common-objs)
+fsl-enetc-vf-$(CONFIG_FSL_ENETC_QOS) += enetc_qos.o
 
 obj-$(CONFIG_FSL_ENETC_MDIO) += fsl-enetc-mdio.o
 fsl-enetc-mdio-y := enetc_pci_mdio.o enetc_mdio.o
drivers/net/ethernet/freescale/enetc/enetc.c +14 -5
index 3e8f9819f08c..d58dbc2c4270 100644
@@ -1427,8 +1427,7 @@ int enetc_close(struct net_device *ndev)
 	return 0;
 }
 
-int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
-		   void *type_data)
+int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data)
 {
 	struct enetc_ndev_priv *priv = netdev_priv(ndev);
 	struct tc_mqprio_qopt *mqprio = type_data;
@@ -1436,9 +1435,6 @@ int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
 	u8 num_tc;
 	int i;
 
-	if (type != TC_SETUP_QDISC_MQPRIO)
-		return -EOPNOTSUPP;
-
 	mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;
 	num_tc = mqprio->num_tc;
 
@@ -1483,6 +1479,19 @@ int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
 	return 0;
 }
 
+int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
+		   void *type_data)
+{
+	switch (type) {
+	case TC_SETUP_QDISC_MQPRIO:
+		return enetc_setup_tc_mqprio(ndev, type_data);
+	case TC_SETUP_QDISC_TAPRIO:
+		return enetc_setup_tc_taprio(ndev, type_data);
+	default:
+		return -EOPNOTSUPP;
+	}
+}
+
 struct net_device_stats *enetc_get_stats(struct net_device *ndev)
 {
 	struct enetc_ndev_priv *priv = netdev_priv(ndev);
drivers/net/ethernet/freescale/enetc/enetc.h +7 -0
index 541b4e2073fe..8ca2f97050c8 100644
@@ -244,3 +244,10 @@ int enetc_set_fs_entry(struct enetc_si *si, struct enetc_cmd_rfse *rfse,
 void enetc_set_rss_key(struct enetc_hw *hw, const u8 *bytes);
 int enetc_get_rss_table(struct enetc_si *si, u32 *table, int count);
 int enetc_set_rss_table(struct enetc_si *si, const u32 *table, int count);
+int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd);
+
+#ifdef CONFIG_FSL_ENETC_QOS
+int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data);
+#else
+#define enetc_setup_tc_taprio(ndev, type_data) -EOPNOTSUPP
+#endif
drivers/net/ethernet/freescale/enetc/enetc_cbdr.c +4 -1
index de466b71bf8f..201cbc362e33 100644
@@ -32,7 +32,7 @@ static int enetc_cbd_unused(struct enetc_cbdr *r)
 		r->bd_count;
 }
 
-static int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
+int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
 {
 	struct enetc_cbdr *ring = &si->cbd_ring;
 	int timeout = ENETC_CBDR_TIMEOUT;
@@ -66,6 +66,9 @@ static int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
 	if (!timeout)
 		return -EBUSY;
 
+	/* CBD may writeback data, feedback up level */
+	*cbd = *dest_cbd;
+
 	enetc_clean_cbdr(si);
 
 	return 0;
drivers/net/ethernet/freescale/enetc/enetc_hw.h +68 -16

99 lines not on this page · raw message

drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +138 -0

138 lines not on this page · raw message

Signature · 1 line
2.17.1
author
#8 lore raw

PATCH v4 2/2 enetc: update TSN Qbv PSPEED set according to adjust link speed

ENETC has a register PSPEED to indicate the link speed of hardware. It is need to update accordingly. PSPEED field needs to be updated with the port speed for QBV scheduling purposes. Or else there is chance for gate slot not free by frame taking the MAC if PSPEED and phy speed not match. So update PSPEED when link adjust. This is implement by the adjust_link.

---
 drivers/net/ethernet/freescale/enetc/enetc.c  | 13 +++++--
 drivers/net/ethernet/freescale/enetc/enetc.h  |  8 +++++
 .../net/ethernet/freescale/enetc/enetc_hw.h   |  5 +++
 .../net/ethernet/freescale/enetc/enetc_pf.c   |  3 ++
 .../net/ethernet/freescale/enetc/enetc_qos.c  | 34 +++++++++++++++++++
 5 files changed, 61 insertions(+), 2 deletions(-)
drivers/net/ethernet/freescale/enetc/enetc.c +11 -2
index d58dbc2c4270..f6b00c68451b 100644
@@ -742,9 +742,14 @@ void enetc_get_si_caps(struct enetc_si *si)
 	si->num_rss = 0;
 	val = enetc_rd(hw, ENETC_SIPCAPR0);
 	if (val & ENETC_SIPCAPR0_RSS) {
-		val = enetc_rd(hw, ENETC_SIRSSCAPR);
-		si->num_rss = ENETC_SIRSSCAPR_GET_NUM_RSS(val);
+		u32 rss;
+
+		rss = enetc_rd(hw, ENETC_SIRSSCAPR);
+		si->num_rss = ENETC_SIRSSCAPR_GET_NUM_RSS(rss);
 	}
+
+	if (val & ENETC_SIPCAPR0_QBV)
+		si->hw_features |= ENETC_SI_F_QBV;
 }
 
 static int enetc_dma_alloc_bdr(struct enetc_bdr *r, size_t bd_size)
@@ -1314,8 +1319,12 @@ static void enetc_disable_interrupts(struct enetc_ndev_priv *priv)
 
 static void adjust_link(struct net_device *ndev)
 {
+	struct enetc_ndev_priv *priv = netdev_priv(ndev);
 	struct phy_device *phydev = ndev->phydev;
 
+	if (priv->active_offloads & ENETC_F_QBV)
+		enetc_sched_speed_set(ndev);
+
 	phy_print_status(phydev);
 }
 
drivers/net/ethernet/freescale/enetc/enetc.h +8 -0
index 8ca2f97050c8..89f23156f330 100644
@@ -118,6 +118,8 @@ enum enetc_errata {
 	ENETC_ERR_UCMCSWP	= BIT(2),
 };
 
+#define ENETC_SI_F_QBV BIT(0)
+
 /* PCI IEP device data */
 struct enetc_si {
 	struct pci_dev *pdev;
@@ -133,6 +135,7 @@ struct enetc_si {
 	int num_fs_entries;
 	int num_rss; /* number of RSS buckets */
 	unsigned short pad;
+	int hw_features;
 };
 
 #define ENETC_SI_ALIGN	32
@@ -173,6 +176,7 @@ struct enetc_cls_rule {
 enum enetc_active_offloads {
 	ENETC_F_RX_TSTAMP	= BIT(0),
 	ENETC_F_TX_TSTAMP	= BIT(1),
+	ENETC_F_QBV             = BIT(2),
 };
 
 struct enetc_ndev_priv {
@@ -188,6 +192,8 @@ struct enetc_ndev_priv {
 	u16 msg_enable;
 	int active_offloads;
 
+	u32 speed; /* store speed for compare update pspeed */
+
 	struct enetc_bdr *tx_ring[16];
 	struct enetc_bdr *rx_ring[16];
 
@@ -248,6 +254,8 @@ int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd);
 
 #ifdef CONFIG_FSL_ENETC_QOS
 int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data);
+void enetc_sched_speed_set(struct net_device *ndev);
 #else
 #define enetc_setup_tc_taprio(ndev, type_data) -EOPNOTSUPP
+#define enetc_sched_speed_set(ndev) (void)0
 #endif
drivers/net/ethernet/freescale/enetc/enetc_hw.h +5 -0
index df6b35dc3534..924ddb6d358a 100644
@@ -149,6 +149,11 @@ enum enetc_bdr_type {TX, RX};
 #define ENETC_PORT_BASE		0x10000
 #define ENETC_PMR		0x0000
 #define ENETC_PMR_EN	GENMASK(18, 16)
+#define ENETC_PMR_PSPEED_MASK GENMASK(11, 8)
+#define ENETC_PMR_PSPEED_10M	0
+#define ENETC_PMR_PSPEED_100M	BIT(8)
+#define ENETC_PMR_PSPEED_1000M	BIT(9)
+#define ENETC_PMR_PSPEED_2500M	BIT(10)
 #define ENETC_PSR		0x0004 /* RO */
 #define ENETC_PSIPMR		0x0018
 #define ENETC_PSIPMR_SET_UP(n)	BIT(n) /* n = SI index */
drivers/net/ethernet/freescale/enetc/enetc_pf.c +3 -0
index 7da79b816416..e7482d483b28 100644
@@ -742,6 +742,9 @@ static void enetc_pf_netdev_setup(struct enetc_si *si, struct net_device *ndev,
 
 	ndev->priv_flags |= IFF_UNICAST_FLT;
 
+	if (si->hw_features & ENETC_SI_F_QBV)
+		priv->active_offloads |= ENETC_F_QBV;
+
 	/* pick up primary MAC address from SI */
 	enetc_get_primary_mac_addr(&si->hw, ndev->dev_addr);
 }
drivers/net/ethernet/freescale/enetc/enetc_qos.c +34 -0
index 84c2ab98fae9..66a3da61ca16 100644
@@ -11,6 +11,40 @@ static u16 enetc_get_max_gcl_len(struct enetc_hw *hw)
 		& ENETC_QBV_MAX_GCL_LEN_MASK;
 }
 
+void enetc_sched_speed_set(struct net_device *ndev)
+{
+	struct enetc_ndev_priv *priv = netdev_priv(ndev);
+	struct phy_device *phydev = ndev->phydev;
+	u32 old_speed = priv->speed;
+	u32 speed, pspeed;
+
+	if (phydev->speed == old_speed)
+		return;
+
+	speed = phydev->speed;
+	switch (speed) {
+	case SPEED_1000:
+		pspeed = ENETC_PMR_PSPEED_1000M;
+		break;
+	case SPEED_2500:
+		pspeed = ENETC_PMR_PSPEED_2500M;
+		break;
+	case SPEED_100:
+		pspeed = ENETC_PMR_PSPEED_100M;
+		break;
+	case SPEED_10:
+	default:
+		pspeed = ENETC_PMR_PSPEED_10M;
+		netdev_err(ndev, "Qbv PSPEED set speed link down.\n");
+	}
+
+	priv->speed = speed;
+	enetc_port_wr(&priv->si->hw, ENETC_PMR,
+		      (enetc_port_rd(&priv->si->hw, ENETC_PMR)
+		      & (~ENETC_PMR_PSPEED_MASK))
+		      | pspeed);
+}
+
 static int enetc_setup_taprio(struct net_device *ndev,
 			      struct tc_taprio_qopt_offload *admin_conf)
 {
Signature · 1 line
2.17.1
maintainer Applied
#9 lore raw

Re: [v4,net-next, 2/2] enetc: update TSN Qbv PSPEED set according to adjust link speed

From: Po Liu <[email protected]>
Date: Fri, 15 Nov 2019 03:33:41 +0000

Quoted 10 lines

ENETC has a register PSPEED to indicate the link speed of hardware. It is need to update accordingly. PSPEED field needs to be updated with the port speed for QBV scheduling purposes. Or else there is chance for gate slot not free by frame taking the MAC if PSPEED and phy speed not match. So update PSPEED when link adjust. This is implement by the adjust_link.

Applied.

#10 lore raw
In reply to Po Liu
Quoted 296 lines · Po Liu

ENETC supports in hardware for time-based egress shaping according to IEEE 802.1Qbv. This patch implement the Qbv enablement by the hardware offload method qdisc tc-taprio method.
Also update cbdr writeback to up level since control bd ring may writeback data to control bd ring.

---
changes:
v2:
- introduce a local define CONFIG_FSL_ENETC_QOS to fix the various
configurations will result in link errors.
Since the CONFIG_NET_SCH_TAPRIO depends on many Qos configs. Not
to use it directly in driver. Add it to CONFIG_FSL_ENETC_QOS depends
on list, so only CONFIG_NET_SCH_TAPRIO enabled, user can enable this
tsn feature, or else, return not support.
v3:
- fix the compiling vf module failure issue:
ERROR: "enetc_sched_speed_set" [drivers/net/ethernet/freescale/enetc/fsl-enetc-vf.ko] undefined!
ERROR: "enetc_setup_tc_taprio" [drivers/net/ethernet/freescale/enetc/fsl-enetc-vf.ko] undefined!
- remove defines not used in this patch
- fix hardware endian issue
- make the qbv set code more rubust with some error condition may occur.
v4:
- delete hardware qbv disable before enable it
- fix when enetc_setup_taprio() return error condition, restore priority
set.

drivers/net/ethernet/freescale/enetc/Kconfig  |  10 ++
drivers/net/ethernet/freescale/enetc/Makefile |   2 +
drivers/net/ethernet/freescale/enetc/enetc.c  |  19 ++-
drivers/net/ethernet/freescale/enetc/enetc.h  |   7 +
.../net/ethernet/freescale/enetc/enetc_cbdr.c |   5 +-
.../net/ethernet/freescale/enetc/enetc_hw.h   |  84 +++++++++--
.../net/ethernet/freescale/enetc/enetc_qos.c  | 138 ++++++++++++++++++
7 files changed, 243 insertions(+), 22 deletions(-)

create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_qos.c

drivers/net/ethernet/freescale/enetc/Kconfig +10 -0
index c219587bd334..491659fe3e35 100644
@@ -50,3 +50,13 @@ config FSL_ENETC_HW_TIMESTAMPING
 	  allocation has not been supported and it is too expensive to use
 	  extended RX BDs if timestamping is not used, this option enables
 	  extended RX BDs in order to support hardware timestamping.
+
+config FSL_ENETC_QOS
+	bool "ENETC hardware Time-sensitive Network support"
+	depends on (FSL_ENETC || FSL_ENETC_VF) && NET_SCH_TAPRIO
+	help
+	  There are Time-Sensitive Network(TSN) capabilities(802.1Qbv/802.1Qci
+	  /802.1Qbu etc.) supported by ENETC. These TSN capabilities can be set
+	  enable/disable from user space via Qos commands(tc). In the kernel
+	  side, it can be loaded by Qos driver. Currently, it is only support
+	  taprio(802.1Qbv).
drivers/net/ethernet/freescale/enetc/Makefile +0 -0
index d200c27c3bf6..d0db33e5b6b7 100644
@@ -5,9 +5,11 @@ common-objs := enetc.o enetc_cbdr.o enetc_ethtool.o

obj-$(CONFIG_FSL_ENETC) += fsl-enetc.o fsl-enetc-y := enetc_pf.o enetc_mdio.o $(common-objs) fsl-enetc-$(CONFIG_PCI_IOV) += enetc_msg.o +fsl-enetc-$(CONFIG_FSL_ENETC_QOS) += enetc_qos.o

obj-$(CONFIG_FSL_ENETC_VF) += fsl-enetc-vf.o fsl-enetc-vf-y := enetc_vf.o $(common-objs) +fsl-enetc-vf-$(CONFIG_FSL_ENETC_QOS) += enetc_qos.o

obj-$(CONFIG_FSL_ENETC_MDIO) += fsl-enetc-mdio.o
fsl-enetc-mdio-y := enetc_pci_mdio.o enetc_mdio.o

drivers/net/ethernet/freescale/enetc/enetc.c +14 -5
index 3e8f9819f08c..d58dbc2c4270 100644
@@ -1427,8 +1427,7 @@ int enetc_close(struct net_device *ndev)
 	return 0;
 }
 
-int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
-		   void *type_data)
+int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data)
 {
 	struct enetc_ndev_priv *priv = netdev_priv(ndev);
 	struct tc_mqprio_qopt *mqprio = type_data;
@@ -1436,9 +1435,6 @@ int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
 	u8 num_tc;
 	int i;
 
-	if (type != TC_SETUP_QDISC_MQPRIO)
-		return -EOPNOTSUPP;
-
 	mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;
 	num_tc = mqprio->num_tc;
 
@@ -1483,6 +1479,19 @@ int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
 	return 0;
 }
 
+int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
+		   void *type_data)
+{
+	switch (type) {
+	case TC_SETUP_QDISC_MQPRIO:
+		return enetc_setup_tc_mqprio(ndev, type_data);
+	case TC_SETUP_QDISC_TAPRIO:
+		return enetc_setup_tc_taprio(ndev, type_data);
+	default:
+		return -EOPNOTSUPP;
+	}
+}
+
 struct net_device_stats *enetc_get_stats(struct net_device *ndev)
 {
 	struct enetc_ndev_priv *priv = netdev_priv(ndev);
drivers/net/ethernet/freescale/enetc/enetc.h +7 -0
index 541b4e2073fe..8ca2f97050c8 100644
@@ -244,3 +244,10 @@ int enetc_set_fs_entry(struct enetc_si *si, struct enetc_cmd_rfse *rfse,
 void enetc_set_rss_key(struct enetc_hw *hw, const u8 *bytes);
 int enetc_get_rss_table(struct enetc_si *si, u32 *table, int count);
 int enetc_set_rss_table(struct enetc_si *si, const u32 *table, int count);
+int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd);
+
+#ifdef CONFIG_FSL_ENETC_QOS
+int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data);
+#else
+#define enetc_setup_tc_taprio(ndev, type_data) -EOPNOTSUPP
+#endif
drivers/net/ethernet/freescale/enetc/enetc_cbdr.c +4 -1
index de466b71bf8f..201cbc362e33 100644
@@ -32,7 +32,7 @@ static int enetc_cbd_unused(struct enetc_cbdr *r)
 		r->bd_count;
 }
 
-static int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
+int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
 {
 	struct enetc_cbdr *ring = &si->cbd_ring;
 	int timeout = ENETC_CBDR_TIMEOUT;
@@ -66,6 +66,9 @@ static int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
 	if (!timeout)
 		return -EBUSY;
 
+	/* CBD may writeback data, feedback up level */
+	*cbd = *dest_cbd;
+
 	enetc_clean_cbdr(si);
 
 	return 0;
drivers/net/ethernet/freescale/enetc/enetc_hw.h +68 -16
index 88276299f447..df6b35dc3534 100644
@@ -18,6 +18,7 @@
 #define ENETC_SICTR0	0x18
 #define ENETC_SICTR1	0x1c
 #define ENETC_SIPCAPR0	0x20
+#define ENETC_SIPCAPR0_QBV	BIT(4)
 #define ENETC_SIPCAPR0_RSS	BIT(8)
 #define ENETC_SIPCAPR1	0x24
 #define ENETC_SITGTGR	0x30
@@ -440,22 +441,6 @@ union enetc_rx_bd {
 #define EMETC_MAC_ADDR_FILT_RES	3 /* # of reserved entries at the beginning */
 #define ENETC_MAX_NUM_VFS	2
 
-struct enetc_cbd {
-	union {
-		struct {
-			__le32 addr[2];
-			__le32 opt[4];
-		};
-		__le32 data[6];
-	};
-	__le16 index;
-	__le16 length;
-	u8 cmd;
-	u8 cls;
-	u8 _res;
-	u8 status_flags;
-};
-
 #define ENETC_CBD_FLAGS_SF	BIT(7) /* short format */
 #define ENETC_CBD_STATUS_MASK	0xf
 
@@ -554,3 +539,70 @@ static inline void enetc_set_bdr_prio(struct enetc_hw *hw, int bdr_idx,
 	val |= ENETC_TBMR_SET_PRIO(prio);
 	enetc_txbdr_wr(hw, bdr_idx, ENETC_TBMR, val);
 }
+
+enum bdcr_cmd_class {
+	BDCR_CMD_UNSPEC = 0,
+	BDCR_CMD_MAC_FILTER,
+	BDCR_CMD_VLAN_FILTER,
+	BDCR_CMD_RSS,
+	BDCR_CMD_RFS,
+	BDCR_CMD_PORT_GCL,
+	BDCR_CMD_RECV_CLASSIFIER,
+	__BDCR_CMD_MAX_LEN,
+	BDCR_CMD_MAX_LEN = __BDCR_CMD_MAX_LEN - 1,
+};
+
+/* class 5, command 0 */
+struct tgs_gcl_conf {
+	u8	atc;	/* init gate value */
+	u8	res[7];
+	struct {
+		u8	res1[4];
+		__le16	acl_len;
+		u8	res2[2];
+	};
+};
+
+/* gate control list entry */
+struct gce {
+	__le32	period;
+	u8	gate;
+	u8	res[3];
+};
+
+/* tgs_gcl_conf address point to this data space */
+struct tgs_gcl_data {
+	__le32		btl;
+	__le32		bth;
+	__le32		ct;
+	__le32		cte;
+	struct gce	entry[0];
+};
+
+struct enetc_cbd {
+	union{
+		struct {
+			__le32	addr[2];
+			union {
+				__le32	opt[4];
+				struct tgs_gcl_conf	gcl_conf;
+			};
+		};	/* Long format */
+		__le32 data[6];
+	};
+	__le16 index;
+	__le16 length;
+	u8 cmd;
+	u8 cls;
+	u8 _res;
+	u8 status_flags;
+};
+
+/* port time gating control register */
+#define ENETC_QBV_PTGCR_OFFSET		0x11a00
+#define ENETC_QBV_TGE			BIT(31)
+#define ENETC_QBV_TGPE			BIT(30)
+
+/* Port time gating capability register */
+#define ENETC_QBV_PTGCAPR_OFFSET	0x11a08
+#define ENETC_QBV_MAX_GCL_LEN_MASK	GENMASK(15, 0)
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +28 -0
new file mode 100644
index 000000000000..84c2ab98fae9
@@ -0,0 +1,138 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+/* Copyright 2019 NXP */
+
+#include "enetc.h"
+
+#include <net/pkt_sched.h>
+
+static u16 enetc_get_max_gcl_len(struct enetc_hw *hw)
+{
+	return enetc_rd(hw, ENETC_QBV_PTGCAPR_OFFSET)
+		& ENETC_QBV_MAX_GCL_LEN_MASK;
+}
+
+static int enetc_setup_taprio(struct net_device *ndev,
+			      struct tc_taprio_qopt_offload *admin_conf)
+{
+	struct enetc_ndev_priv *priv = netdev_priv(ndev);
+	struct enetc_cbd cbd = {.cmd = 0};
+	struct tgs_gcl_conf *gcl_config;
+	struct tgs_gcl_data *gcl_data;
+	struct gce *gce;
+	dma_addr_t dma;
+	u16 data_size;
+	u16 gcl_len;
+	u32 tge;
+	int err;
+	int i;
+

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 38

Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +10 -0
+	if (admin_conf->num_entries > enetc_get_max_gcl_len(&priv->si->hw))
+		return -EINVAL;
+	gcl_len = admin_conf->num_entries;
+
+	tge = enetc_rd(&priv->si->hw, ENETC_QBV_PTGCR_OFFSET);
+	if (!admin_conf->enable) {
+		enetc_wr(&priv->si->hw,
+			 ENETC_QBV_PTGCR_OFFSET,
+			 tge & (~ENETC_QBV_TGE));
+		return 0;

Answer on comment in v3,
Problem not in errata - problem in w/a.
If it gets to unknown state - better restart it, but not silently. I see dropped the reset in this version, you probably better know the errata w/a.

but I've expected it to be reseted by asking user explicitly to do this if oper cycle is present as it's probably not what is expected, if no oper state then reset and start as it was.

Now the reset is removed from configuration, even if there is no oper state. Probably it's not good. But you better know.

What actually the problem to save variable like priv->qbv_enabled and use it for making appropriate decision?

JFI, you can use also link on allocated configuration from taprio with API from taprio:

taprio_offload_free(taprio);
taprio_offload_get(taprio);

preventing taprio struct from to be freed.

And use taprio pointer as a boolen instead of priv->qbv_enabled. Kind of:

if (priv->taprio)

	taprio_offload_free(priv->taprio);

priv->taprio = taprio->enable ? taprio_offload_get(taprio) :

				NULL;

So you have saved conf settings (seems like you don't need, but that's for now) and at the same time a key to read enable/disable state.

Quoted 103 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +100 -0
+	}
+
+	if (admin_conf->cycle_time > U32_MAX ||
+	    admin_conf->cycle_time_extension > U32_MAX)
+		return -EINVAL;
+
+	/* Configure the (administrative) gate control list using the
+	 * control BD descriptor.
+	 */
+	gcl_config = &cbd.gcl_conf;
+
+	data_size = struct_size(gcl_data, entry, gcl_len);
+	gcl_data = kzalloc(data_size, __GFP_DMA | GFP_KERNEL);
+	if (!gcl_data)
+		return -ENOMEM;
+
+	gce = (struct gce *)(gcl_data + 1);
+
+	/* Set all gates open as default */
+	gcl_config->atc = 0xff;
+	gcl_config->acl_len = cpu_to_le16(gcl_len);
+
+	if (!admin_conf->base_time) {
+		gcl_data->btl =
+			cpu_to_le32(enetc_rd(&priv->si->hw, ENETC_SICTR0));
+		gcl_data->bth =
+			cpu_to_le32(enetc_rd(&priv->si->hw, ENETC_SICTR1));
+	} else {
+		gcl_data->btl =
+			cpu_to_le32(lower_32_bits(admin_conf->base_time));
+		gcl_data->bth =
+			cpu_to_le32(upper_32_bits(admin_conf->base_time));
+	}
+
+	gcl_data->ct = cpu_to_le32(admin_conf->cycle_time);
+	gcl_data->cte = cpu_to_le32(admin_conf->cycle_time_extension);
+
+	for (i = 0; i < gcl_len; i++) {
+		struct tc_taprio_sched_entry *temp_entry;
+		struct gce *temp_gce = gce + i;
+
+		temp_entry = &admin_conf->entries[i];
+
+		temp_gce->gate = (u8)temp_entry->gate_mask;
+		temp_gce->period = cpu_to_le32(temp_entry->interval);
+	}
+
+	cbd.length = cpu_to_le16(data_size);
+	cbd.status_flags = 0;
+
+	dma = dma_map_single(&priv->si->pdev->dev, gcl_data,
+			     data_size, DMA_TO_DEVICE);
+	if (dma_mapping_error(&priv->si->pdev->dev, dma)) {
+		netdev_err(priv->si->ndev, "DMA mapping failed!\n");
+		kfree(gcl_data);
+		return -ENOMEM;
+	}
+
+	cbd.addr[0] = lower_32_bits(dma);
+	cbd.addr[1] = upper_32_bits(dma);
+	cbd.cls = BDCR_CMD_PORT_GCL;
+	cbd.status_flags = 0;
+
+	enetc_wr(&priv->si->hw, ENETC_QBV_PTGCR_OFFSET,
+		 tge | ENETC_QBV_TGE);
+
+	err = enetc_send_cmd(priv->si, &cbd);
+	if (err)
+		enetc_wr(&priv->si->hw,
+			 ENETC_QBV_PTGCR_OFFSET,
+			 tge & (~ENETC_QBV_TGE));
+
+	dma_unmap_single(&priv->si->pdev->dev, dma, data_size, DMA_TO_DEVICE);
+	kfree(gcl_data);
+
+	return err;
+}
+
+int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data)
+{
+	struct tc_taprio_qopt_offload *taprio = type_data;
+	struct enetc_ndev_priv *priv = netdev_priv(ndev);
+	int err;
+	int i;
+
+	for (i = 0; i < priv->num_tx_rings; i++)
+		enetc_set_bdr_prio(&priv->si->hw,
+				   priv->tx_ring[i]->index,
+				   taprio->enable ? i : 0);
+
+	err = enetc_setup_taprio(ndev, taprio);
+
+	if (err)
+		for (i = 0; i < priv->num_tx_rings; i++)
+			enetc_set_bdr_prio(&priv->si->hw,
+					   priv->tx_ring[i]->index,
+					   taprio->enable ? 0 : i);
+
+	return err;
+}
Signature · 1 line
2.17.1
Signature · 2 lines
Regards,
Ivan Khoronzhuk
maintainer Applied
#11 lore raw
In reply to Po Liu

From: Po Liu <[email protected]>
Date: Fri, 15 Nov 2019 03:33:33 +0000

Quoted 9 lines

ENETC supports in hardware for time-based egress shaping according to IEEE 802.1Qbv. This patch implement the Qbv enablement by the hardware offload method qdisc tc-taprio method.
Also update cbdr writeback to up level since control bd ring may writeback data to control bd ring.

Applied.

#12 lore raw
In reply to Po Liu
Quoted 297 lines · Po Liu

ENETC supports in hardware for time-based egress shaping according to IEEE 802.1Qbv. This patch implement the Qbv enablement by the hardware offload method qdisc tc-taprio method.
Also update cbdr writeback to up level since control bd ring may writeback data to control bd ring.

---
changes:
v2:
- introduce a local define CONFIG_FSL_ENETC_QOS to fix the various
configurations will result in link errors.
Since the CONFIG_NET_SCH_TAPRIO depends on many Qos configs. Not
to use it directly in driver. Add it to CONFIG_FSL_ENETC_QOS depends
on list, so only CONFIG_NET_SCH_TAPRIO enabled, user can enable this
tsn feature, or else, return not support.
v3:
- fix the compiling vf module failure issue:
ERROR: "enetc_sched_speed_set" [drivers/net/ethernet/freescale/enetc/fsl-enetc-vf.ko] undefined!
ERROR: "enetc_setup_tc_taprio" [drivers/net/ethernet/freescale/enetc/fsl-enetc-vf.ko] undefined!
- remove defines not used in this patch
- fix hardware endian issue
- make the qbv set code more rubust with some error condition may occur.

drivers/net/ethernet/freescale/enetc/Kconfig  |  10 ++
drivers/net/ethernet/freescale/enetc/Makefile |   2 +
drivers/net/ethernet/freescale/enetc/enetc.c  |  19 ++-
drivers/net/ethernet/freescale/enetc/enetc.h  |   7 +
.../net/ethernet/freescale/enetc/enetc_cbdr.c |   5 +-
.../net/ethernet/freescale/enetc/enetc_hw.h   |  84 ++++++++---
.../net/ethernet/freescale/enetc/enetc_qos.c  | 134 ++++++++++++++++++
7 files changed, 239 insertions(+), 22 deletions(-)

create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_qos.c

drivers/net/ethernet/freescale/enetc/Kconfig +10 -0
index c219587bd334..491659fe3e35 100644
@@ -50,3 +50,13 @@ config FSL_ENETC_HW_TIMESTAMPING
 	  allocation has not been supported and it is too expensive to use
 	  extended RX BDs if timestamping is not used, this option enables
 	  extended RX BDs in order to support hardware timestamping.
+
+config FSL_ENETC_QOS
+	bool "ENETC hardware Time-sensitive Network support"
+	depends on (FSL_ENETC || FSL_ENETC_VF) && NET_SCH_TAPRIO
+	help
+	  There are Time-Sensitive Network(TSN) capabilities(802.1Qbv/802.1Qci
+	  /802.1Qbu etc.) supported by ENETC. These TSN capabilities can be set
+	  enable/disable from user space via Qos commands(tc). In the kernel
+	  side, it can be loaded by Qos driver. Currently, it is only support
+	  taprio(802.1Qbv).
drivers/net/ethernet/freescale/enetc/Makefile +0 -0
index d200c27c3bf6..d0db33e5b6b7 100644
@@ -5,9 +5,11 @@ common-objs := enetc.o enetc_cbdr.o enetc_ethtool.o

obj-$(CONFIG_FSL_ENETC) += fsl-enetc.o fsl-enetc-y := enetc_pf.o enetc_mdio.o $(common-objs) fsl-enetc-$(CONFIG_PCI_IOV) += enetc_msg.o +fsl-enetc-$(CONFIG_FSL_ENETC_QOS) += enetc_qos.o

obj-$(CONFIG_FSL_ENETC_VF) += fsl-enetc-vf.o fsl-enetc-vf-y := enetc_vf.o $(common-objs) +fsl-enetc-vf-$(CONFIG_FSL_ENETC_QOS) += enetc_qos.o

obj-$(CONFIG_FSL_ENETC_MDIO) += fsl-enetc-mdio.o
fsl-enetc-mdio-y := enetc_pci_mdio.o enetc_mdio.o

drivers/net/ethernet/freescale/enetc/enetc.c +14 -5
index 3e8f9819f08c..d58dbc2c4270 100644
@@ -1427,8 +1427,7 @@ int enetc_close(struct net_device *ndev)
 	return 0;
 }
 
-int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
-		   void *type_data)
+int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data)
 {
 	struct enetc_ndev_priv *priv = netdev_priv(ndev);
 	struct tc_mqprio_qopt *mqprio = type_data;
@@ -1436,9 +1435,6 @@ int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
 	u8 num_tc;
 	int i;
 
-	if (type != TC_SETUP_QDISC_MQPRIO)
-		return -EOPNOTSUPP;
-
 	mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;
 	num_tc = mqprio->num_tc;
 
@@ -1483,6 +1479,19 @@ int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
 	return 0;
 }
 
+int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
+		   void *type_data)
+{
+	switch (type) {
+	case TC_SETUP_QDISC_MQPRIO:
+		return enetc_setup_tc_mqprio(ndev, type_data);
+	case TC_SETUP_QDISC_TAPRIO:
+		return enetc_setup_tc_taprio(ndev, type_data);
+	default:
+		return -EOPNOTSUPP;
+	}
+}
+
 struct net_device_stats *enetc_get_stats(struct net_device *ndev)
 {
 	struct enetc_ndev_priv *priv = netdev_priv(ndev);
drivers/net/ethernet/freescale/enetc/enetc.h +7 -0
index 541b4e2073fe..8ca2f97050c8 100644
@@ -244,3 +244,10 @@ int enetc_set_fs_entry(struct enetc_si *si, struct enetc_cmd_rfse *rfse,
 void enetc_set_rss_key(struct enetc_hw *hw, const u8 *bytes);
 int enetc_get_rss_table(struct enetc_si *si, u32 *table, int count);
 int enetc_set_rss_table(struct enetc_si *si, const u32 *table, int count);
+int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd);
+
+#ifdef CONFIG_FSL_ENETC_QOS
+int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data);
+#else
+#define enetc_setup_tc_taprio(ndev, type_data) -EOPNOTSUPP
+#endif
drivers/net/ethernet/freescale/enetc/enetc_cbdr.c +4 -1
index de466b71bf8f..201cbc362e33 100644
@@ -32,7 +32,7 @@ static int enetc_cbd_unused(struct enetc_cbdr *r)
 		r->bd_count;
 }
 
-static int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
+int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
 {
 	struct enetc_cbdr *ring = &si->cbd_ring;
 	int timeout = ENETC_CBDR_TIMEOUT;
@@ -66,6 +66,9 @@ static int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
 	if (!timeout)
 		return -EBUSY;
 
+	/* CBD may writeback data, feedback up level */
+	*cbd = *dest_cbd;
+
 	enetc_clean_cbdr(si);
 
 	return 0;
drivers/net/ethernet/freescale/enetc/enetc_hw.h +68 -16
index 88276299f447..df6b35dc3534 100644
@@ -18,6 +18,7 @@
 #define ENETC_SICTR0	0x18
 #define ENETC_SICTR1	0x1c
 #define ENETC_SIPCAPR0	0x20
+#define ENETC_SIPCAPR0_QBV	BIT(4)
 #define ENETC_SIPCAPR0_RSS	BIT(8)
 #define ENETC_SIPCAPR1	0x24
 #define ENETC_SITGTGR	0x30
@@ -440,22 +441,6 @@ union enetc_rx_bd {
 #define EMETC_MAC_ADDR_FILT_RES	3 /* # of reserved entries at the beginning */
 #define ENETC_MAX_NUM_VFS	2
 
-struct enetc_cbd {
-	union {
-		struct {
-			__le32 addr[2];
-			__le32 opt[4];
-		};
-		__le32 data[6];
-	};
-	__le16 index;
-	__le16 length;
-	u8 cmd;
-	u8 cls;
-	u8 _res;
-	u8 status_flags;
-};
-
 #define ENETC_CBD_FLAGS_SF	BIT(7) /* short format */
 #define ENETC_CBD_STATUS_MASK	0xf
 
@@ -554,3 +539,70 @@ static inline void enetc_set_bdr_prio(struct enetc_hw *hw, int bdr_idx,
 	val |= ENETC_TBMR_SET_PRIO(prio);
 	enetc_txbdr_wr(hw, bdr_idx, ENETC_TBMR, val);
 }
+
+enum bdcr_cmd_class {
+	BDCR_CMD_UNSPEC = 0,
+	BDCR_CMD_MAC_FILTER,
+	BDCR_CMD_VLAN_FILTER,
+	BDCR_CMD_RSS,
+	BDCR_CMD_RFS,
+	BDCR_CMD_PORT_GCL,
+	BDCR_CMD_RECV_CLASSIFIER,
+	__BDCR_CMD_MAX_LEN,
+	BDCR_CMD_MAX_LEN = __BDCR_CMD_MAX_LEN - 1,
+};
+
+/* class 5, command 0 */
+struct tgs_gcl_conf {
+	u8	atc;	/* init gate value */
+	u8	res[7];
+	struct {
+		u8	res1[4];
+		__le16	acl_len;
+		u8	res2[2];
+	};
+};
+
+/* gate control list entry */
+struct gce {
+	__le32	period;
+	u8	gate;
+	u8	res[3];
+};
+
+/* tgs_gcl_conf address point to this data space */
+struct tgs_gcl_data {
+	__le32		btl;
+	__le32		bth;
+	__le32		ct;
+	__le32		cte;
+	struct gce	entry[0];
+};
+
+struct enetc_cbd {
+	union{
+		struct {
+			__le32	addr[2];
+			union {
+				__le32	opt[4];
+				struct tgs_gcl_conf	gcl_conf;
+			};
+		};	/* Long format */
+		__le32 data[6];
+	};
+	__le16 index;
+	__le16 length;
+	u8 cmd;
+	u8 cls;
+	u8 _res;
+	u8 status_flags;
+};
+
+/* port time gating control register */
+#define ENETC_QBV_PTGCR_OFFSET		0x11a00
+#define ENETC_QBV_TGE			BIT(31)
+#define ENETC_QBV_TGPE			BIT(30)
+
+/* Port time gating capability register */
+#define ENETC_QBV_PTGCAPR_OFFSET	0x11a08
+#define ENETC_QBV_MAX_GCL_LEN_MASK	GENMASK(15, 0)
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +33 -0
new file mode 100644
index 000000000000..9ce983c00201
@@ -0,0 +1,134 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+/* Copyright 2019 NXP */
+
+#include "enetc.h"
+
+#include <net/pkt_sched.h>
+
+static u16 enetc_get_max_gcl_len(struct enetc_hw *hw)
+{
+	return enetc_rd(hw, ENETC_QBV_PTGCAPR_OFFSET)
+		& ENETC_QBV_MAX_GCL_LEN_MASK;
+}
+
+static int enetc_setup_taprio(struct net_device *ndev,
+			      struct tc_taprio_qopt_offload *admin_conf)
+{
+	struct enetc_ndev_priv *priv = netdev_priv(ndev);
+	struct enetc_cbd cbd = {.cmd = 0};
+	struct tgs_gcl_conf *gcl_config;
+	struct tgs_gcl_data *gcl_data;
+	struct gce *gce;
+	dma_addr_t dma;
+	u16 data_size;
+	u16 gcl_len;
+	u32 tge;
+	int err;
+	int i;
+
+	if (admin_conf->num_entries > enetc_get_max_gcl_len(&priv->si->hw))
+		return -EINVAL;
+	gcl_len = admin_conf->num_entries;
+
+	tge = enetc_rd(&priv->si->hw, ENETC_QBV_PTGCR_OFFSET);

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 43

Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +10 -0
+	if (!admin_conf->enable) {
+		enetc_wr(&priv->si->hw,
+			 ENETC_QBV_PTGCR_OFFSET,
+			 tge & (~ENETC_QBV_TGE));
+		return 0;
+	}
+
+	if (admin_conf->cycle_time > (u32)~0 ||
+	    admin_conf->cycle_time_extension > (u32)~0)
+		return -EINVAL;

U32_MAX?

Quoted 50 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +50 -0
+
+	/* Configure the (administrative) gate control list using the
+	 * control BD descriptor.
+	 */
+	gcl_config = &cbd.gcl_conf;
+
+	data_size = struct_size(gcl_data, entry, gcl_len);
+	gcl_data = kzalloc(data_size, __GFP_DMA | GFP_KERNEL);
+	if (!gcl_data)
+		return -ENOMEM;
+
+	gce = (struct gce *)(gcl_data + 1);
+
+	/* Set all gates open as default */
+	gcl_config->atc = 0xff;
+	gcl_config->acl_len = cpu_to_le16(gcl_len);
+
+	if (!admin_conf->base_time) {
+		gcl_data->btl =
+			cpu_to_le32(enetc_rd(&priv->si->hw, ENETC_SICTR0));
+		gcl_data->bth =
+			cpu_to_le32(enetc_rd(&priv->si->hw, ENETC_SICTR1));
+	} else {
+		gcl_data->btl =
+			cpu_to_le32(lower_32_bits(admin_conf->base_time));
+		gcl_data->bth =
+			cpu_to_le32(upper_32_bits(admin_conf->base_time));
+	}
+
+	gcl_data->ct = cpu_to_le32(admin_conf->cycle_time);
+	gcl_data->cte = cpu_to_le32(admin_conf->cycle_time_extension);
+
+	for (i = 0; i < gcl_len; i++) {
+		struct tc_taprio_sched_entry *temp_entry;
+		struct gce *temp_gce = gce + i;
+
+		temp_entry = &admin_conf->entries[i];
+
+		temp_gce->gate = (u8)temp_entry->gate_mask;
+		temp_gce->period = cpu_to_le32(temp_entry->interval);
+	}
+
+	cbd.length = cpu_to_le16(data_size);
+	cbd.status_flags = 0;
+
+	dma = dma_map_single(&priv->si->pdev->dev, gcl_data,
+			     data_size, DMA_TO_DEVICE);
+	if (dma_mapping_error(&priv->si->pdev->dev, dma)) {
+		netdev_err(priv->si->ndev, "DMA mapping failed!\n");
+		kfree(gcl_data);

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 103

Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +10 -0
+		return -ENOMEM;
+	}
+
+	cbd.addr[0] = lower_32_bits(dma);
+	cbd.addr[1] = upper_32_bits(dma);
+	cbd.cls = BDCR_CMD_PORT_GCL;
+	cbd.status_flags = 0;
+
+	enetc_wr(&priv->si->hw, ENETC_QBV_PTGCR_OFFSET,
+		 tge & (~ENETC_QBV_TGE));

Sorry, but, please, before sending new version, be sure you understand what should be changed.

Let's back to IEEE Std 802.1Q

Do you know what means cycle time extension that is programmed here. And why needed admin and oper configurations, and their base times?

It's needed to not stop active oper configuration (that actually this function do), so that it's active till new one, that is admin, will be able to replace it.

If user wants to stop it, and then load new one, he has to do it himself. But, when some configuration is active - that is OPER at the moment - and user requests w/o stopping it new configuration in some new admin base time, the oper stay active till this admin base time, then dropped in hw.

What this code do, it's in hidden way, stop oper configuration at the time of configuration and no matter which admit base time is.

That's definitely wrong. Just look how sw version works. And why all this admin/oper headache exists in IEEE Std 802.1Q exactly for this reason.

So, if oper configuration exists at the moment of calling taprio configuration and no way to apply new on in some future time (admin base time), the code should say to user:

Please, stop prev. oper configuration - then prog new one.

The taprio interface is common and can't be treated differently depending on hw.

Hope it's clean.

Quoted 18 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +18 -0
+
+	usleep_range(10, 20);
+
+	enetc_wr(&priv->si->hw, ENETC_QBV_PTGCR_OFFSET,
+		 tge | ENETC_QBV_TGE);
+
+	err = enetc_send_cmd(priv->si, &cbd);
+	if (err)
+		enetc_wr(&priv->si->hw,
+			 ENETC_QBV_PTGCR_OFFSET,
+			 tge & (~ENETC_QBV_TGE));
+
+	dma_unmap_single(&priv->si->pdev->dev, dma, data_size, DMA_TO_DEVICE);
+	kfree(gcl_data);
+
+	return err;
+}
+

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 131

Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +10 -0
+int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data)
+{
+	struct tc_taprio_qopt_offload *taprio = type_data;
+	struct enetc_ndev_priv *priv = netdev_priv(ndev);
+	int i;
+
+	for (i = 0; i < priv->num_tx_rings; i++)
+		enetc_set_bdr_prio(&priv->si->hw,
+				   priv->tx_ring[i]->index,
+				   taprio->enable ? i : 0);

Again, you should restore enetc_set_bdr_prio
if below enetc_setup_taprio() fails.

Quoted 6 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +3 -0
+
+	return enetc_setup_taprio(ndev, taprio);
+}
Signature · 1 line
2.17.1
Signature · 2 lines
Regards,
Ivan Khoronzhuk
author
#13 lore raw

Br,
Po Liu

Quoted 406 lines

-----Original Message-----
From: Ivan Khoronzhuk <[email protected]>
Sent: 2019年11月15日 2:51
To: Po Liu <[email protected]>
Cc: Claudiu Manoil <[email protected]>; [email protected]; linux- [email protected]; [email protected]; [email protected]; Vladimir Oltean <[email protected]>; Alexandru Marginean <[email protected]>; Xiaoliang Yang <[email protected]>; Roy Zang <[email protected]>; Mingkai Hu <[email protected]>; Jerry Huang <[email protected]>; Leo Li <[email protected]>
Subject: [EXT] Re: [v3,net-next, 1/2] enetc: Configure the Time-Aware Scheduler via tc-taprio offload

Caution: EXT Email

Quoted 9 lines · Po Liu

ENETC supports in hardware for time-based egress shaping according to IEEE 802.1Qbv. This patch implement the Qbv enablement by the hardware offload method qdisc tc-taprio method.
Also update cbdr writeback to up level since control bd ring may writeback data to control bd ring.

Quoted 12 lines

---
changes:
v2:
- introduce a local define CONFIG_FSL_ENETC_QOS to fix the various configurations will result in link errors.
Since the CONFIG_NET_SCH_TAPRIO depends on many Qos configs. Not to use it directly in driver. Add it to CONFIG_FSL_ENETC_QOS depends on list, so only CONFIG_NET_SCH_TAPRIO enabled, user can enable this tsn feature, or else, return not support.
v3:
- fix the compiling vf module failure issue:
ERROR: "enetc_sched_speed_set" [drivers/net/ethernet/freescale/enetc/fsl-

enetc-vf.ko] undefined!

Quoted 1 line

ERROR: "enetc_setup_tc_taprio" [drivers/net/ethernet/freescale/enetc/fsl-

enetc-vf.ko] undefined!

drivers/net/ethernet/freescale/enetc/enetc.c int enetc_setup_tc(struct net_device *ndev, enum

Quoted 76 lines

- remove defines not used in this patch
- fix hardware endian issue
- make the qbv set code more rubust with some error condition may occur.

drivers/net/ethernet/freescale/enetc/Kconfig  |  10 ++
drivers/net/ethernet/freescale/enetc/Makefile |   2 +
drivers/net/ethernet/freescale/enetc/enetc.c  |  19 ++-
drivers/net/ethernet/freescale/enetc/enetc.h  |   7 +
.../net/ethernet/freescale/enetc/enetc_cbdr.c |   5 +-
.../net/ethernet/freescale/enetc/enetc_hw.h   |  84 ++++++++---
.../net/ethernet/freescale/enetc/enetc_qos.c  | 134 ++++++++++++++++++
7 files changed, 239 insertions(+), 22 deletions(-) create mode 100644

drivers/net/ethernet/freescale/enetc/enetc_qos.c

drivers/net/ethernet/freescale/enetc/Kconfig +10 -0
index c219587bd334..491659fe3e35 100644
@@ -50,3 +50,13 @@ config FSL_ENETC_HW_TIMESTAMPING
        allocation has not been supported and it is too expensive to use
        extended RX BDs if timestamping is not used, this option enables
        extended RX BDs in order to support hardware timestamping.
+
+config FSL_ENETC_QOS
+      bool "ENETC hardware Time-sensitive Network support"
+      depends on (FSL_ENETC || FSL_ENETC_VF) && NET_SCH_TAPRIO
+      help
+        There are Time-Sensitive Network(TSN) capabilities(802.1Qbv/802.1Qci
+        /802.1Qbu etc.) supported by ENETC. These TSN capabilities can be set
+        enable/disable from user space via Qos commands(tc). In the kernel
+        side, it can be loaded by Qos driver. Currently, it is only support
+        taprio(802.1Qbv).
drivers/net/ethernet/freescale/enetc/Makefile +0 -0
index d200c27c3bf6..d0db33e5b6b7 100644
@@ -5,9 +5,11 @@ common-objs := enetc.o enetc_cbdr.o enetc_ethtool.o

obj-$(CONFIG_FSL_ENETC) += fsl-enetc.o fsl-enetc-y := enetc_pf.o enetc_mdio.o $(common-objs)
fsl-enetc-$(CONFIG_PCI_IOV) += enetc_msg.o +fsl-enetc-$(CONFIG_FSL_ENETC_QOS) += enetc_qos.o

obj-$(CONFIG_FSL_ENETC_VF) += fsl-enetc-vf.o fsl-enetc-vf-y := enetc_vf.o $(common-objs) +fsl-enetc-vf-$(CONFIG_FSL_ENETC_QOS) += enetc_qos.o

obj-$(CONFIG_FSL_ENETC_MDIO) += fsl-enetc-mdio.o fsl-enetc-mdio-y := enetc_pci_mdio.o enetc_mdio.o diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
index 3e8f9819f08c..d58dbc2c4270 100644

drivers/net/ethernet/freescale/enetc/enetc.c +1 -2
@@ -1427,8 +1427,7 @@ int enetc_close(struct net_device *ndev)
      return 0;
 }
 
-int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
-                 void *type_data)
+int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data)
 {
      struct enetc_ndev_priv *priv = netdev_priv(ndev);
      struct tc_mqprio_qopt *mqprio = type_data; @@ -1436,9 +1435,6 @@

int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,

      u8 num_tc;
      int i;
drivers/net/ethernet/freescale/enetc/enetc.c +0 -3
-      if (type != TC_SETUP_QDISC_MQPRIO)
-              return -EOPNOTSUPP;
-
      mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;
      num_tc = mqprio->num_tc;
@@ -1483,6 +1479,19 @@ int enetc_setup_tc(struct net_device *ndev, enum

tc_setup_type type,

Quoted 72 lines
drivers/net/ethernet/freescale/enetc/enetc.c +13 -0
      return 0;
 }
 
+int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
+                 void *type_data)
+{
+      switch (type) {
+      case TC_SETUP_QDISC_MQPRIO:
+              return enetc_setup_tc_mqprio(ndev, type_data);
+      case TC_SETUP_QDISC_TAPRIO:
+              return enetc_setup_tc_taprio(ndev, type_data);
+      default:
+              return -EOPNOTSUPP;
+      }
+}
+
 struct net_device_stats *enetc_get_stats(struct net_device *ndev)  {
      struct enetc_ndev_priv *priv = netdev_priv(ndev); diff --git

a/drivers/net/ethernet/freescale/enetc/enetc.h
b/drivers/net/ethernet/freescale/enetc/enetc.h
index 541b4e2073fe..8ca2f97050c8 100644

drivers/net/ethernet/freescale/enetc/enetc.h +0 -0
@@ -244,3 +244,10 @@ int enetc_set_fs_entry(struct enetc_si *si, struct
 enetc_cmd_rfse *rfse,  void enetc_set_rss_key(struct enetc_hw *hw,

const u8 *bytes); int enetc_get_rss_table(struct enetc_si *si, u32 *table, int count); int enetc_set_rss_table(struct enetc_si *si, const u32 *table, int count);

drivers/net/ethernet/freescale/enetc/enetc.h +6 -0
+int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd);
+
+#ifdef CONFIG_FSL_ENETC_QOS
+int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data);
+#else #define enetc_setup_tc_taprio(ndev, type_data) -EOPNOTSUPP
+#endif
drivers/net/ethernet/freescale/enetc/enetc_cbdr.c +1 -1
index de466b71bf8f..201cbc362e33 100644
@@ -32,7 +32,7 @@ static int enetc_cbd_unused(struct enetc_cbdr *r)
              r->bd_count;
 }
 
-static int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
+int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
 {
      struct enetc_cbdr *ring = &si->cbd_ring;
      int timeout = ENETC_CBDR_TIMEOUT; @@ -66,6 +66,9 @@ static int

enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)

      if (!timeout)
              return -EBUSY;
drivers/net/ethernet/freescale/enetc/enetc_cbdr.c +3 -0
+      /* CBD may writeback data, feedback up level */
+      *cbd = *dest_cbd;
+
      enetc_clean_cbdr(si);
 
      return 0;
drivers/net/ethernet/freescale/enetc/enetc_hw.h +1 -0
index 88276299f447..df6b35dc3534 100644
@@ -18,6 +18,7 @@
 #define ENETC_SICTR0  0x18
 #define ENETC_SICTR1  0x1c
 #define ENETC_SIPCAPR0        0x20
+#define ENETC_SIPCAPR0_QBV    BIT(4)
 #define ENETC_SIPCAPR0_RSS    BIT(8)
 #define ENETC_SIPCAPR1        0x24
 #define ENETC_SITGTGR 0x30

drivers/net/ethernet/freescale/enetc/enetc_hw.h union enetc_rx_bd { · line 441

Quoted 1 line
drivers/net/ethernet/freescale/enetc/enetc_hw.h +0 -0
@@ -440,22 +441,6 @@ union enetc_rx_bd {
 #define EMETC_MAC_ADDR_FILT_RES       3 /* # of reserved entries at the

beginning */

drivers/net/ethernet/freescale/enetc/enetc_hw.h static inline void enetc_set_bdr_prio(struct

Quoted 22 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +0 -16
 #define ENETC_MAX_NUM_VFS     2
 
-struct enetc_cbd {
-      union {
-              struct {
-                      __le32 addr[2];
-                      __le32 opt[4];
-              };
-              __le32 data[6];
-      };
-      __le16 index;
-      __le16 length;
-      u8 cmd;
-      u8 cls;
-      u8 _res;
-      u8 status_flags;
-};
-
 #define ENETC_CBD_FLAGS_SF    BIT(7) /* short format */
 #define ENETC_CBD_STATUS_MASK 0xf
 
@@ -554,3 +539,70 @@ static inline void enetc_set_bdr_prio(struct

enetc_hw *hw, int bdr_idx,

Quoted 106 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +66 -0
      val |= ENETC_TBMR_SET_PRIO(prio);
      enetc_txbdr_wr(hw, bdr_idx, ENETC_TBMR, val);  }
+
+enum bdcr_cmd_class {
+      BDCR_CMD_UNSPEC = 0,
+      BDCR_CMD_MAC_FILTER,
+      BDCR_CMD_VLAN_FILTER,
+      BDCR_CMD_RSS,
+      BDCR_CMD_RFS,
+      BDCR_CMD_PORT_GCL,
+      BDCR_CMD_RECV_CLASSIFIER,
+      __BDCR_CMD_MAX_LEN,
+      BDCR_CMD_MAX_LEN = __BDCR_CMD_MAX_LEN - 1, };
+
+/* class 5, command 0 */
+struct tgs_gcl_conf {
+      u8      atc;    /* init gate value */
+      u8      res[7];
+      struct {
+              u8      res1[4];
+              __le16  acl_len;
+              u8      res2[2];
+      };
+};
+
+/* gate control list entry */
+struct gce {
+      __le32  period;
+      u8      gate;
+      u8      res[3];
+};
+
+/* tgs_gcl_conf address point to this data space */ struct
+tgs_gcl_data {
+      __le32          btl;
+      __le32          bth;
+      __le32          ct;
+      __le32          cte;
+      struct gce      entry[0];
+};
+
+struct enetc_cbd {
+      union{
+              struct {
+                      __le32  addr[2];
+                      union {
+                              __le32  opt[4];
+                              struct tgs_gcl_conf     gcl_conf;
+                      };
+              };      /* Long format */
+              __le32 data[6];
+      };
+      __le16 index;
+      __le16 length;
+      u8 cmd;
+      u8 cls;
+      u8 _res;
+      u8 status_flags;
+};
+
+/* port time gating control register */
+#define ENETC_QBV_PTGCR_OFFSET                0x11a00
+#define ENETC_QBV_TGE                 BIT(31)
+#define ENETC_QBV_TGPE                        BIT(30)
+
+/* Port time gating capability register */
+#define ENETC_QBV_PTGCAPR_OFFSET      0x11a08
+#define ENETC_QBV_MAX_GCL_LEN_MASK    GENMASK(15, 0)
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +31 -0
new file mode 100644
index 000000000000..9ce983c00201
@@ -0,0 +1,134 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+/* Copyright 2019 NXP */
+
+#include "enetc.h"
+
+#include <net/pkt_sched.h>
+
+static u16 enetc_get_max_gcl_len(struct enetc_hw *hw) {
+      return enetc_rd(hw, ENETC_QBV_PTGCAPR_OFFSET)
+              & ENETC_QBV_MAX_GCL_LEN_MASK; }
+
+static int enetc_setup_taprio(struct net_device *ndev,
+                            struct tc_taprio_qopt_offload *admin_conf)
+{
+      struct enetc_ndev_priv *priv = netdev_priv(ndev);
+      struct enetc_cbd cbd = {.cmd = 0};
+      struct tgs_gcl_conf *gcl_config;
+      struct tgs_gcl_data *gcl_data;
+      struct gce *gce;
+      dma_addr_t dma;
+      u16 data_size;
+      u16 gcl_len;
+      u32 tge;
+      int err;
+      int i;
+
+      if (admin_conf->num_entries > enetc_get_max_gcl_len(&priv->si->hw))
+              return -EINVAL;
+      gcl_len = admin_conf->num_entries;
+
+      tge = enetc_rd(&priv->si->hw, ENETC_QBV_PTGCR_OFFSET);

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 41

Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +10 -0
+      if (!admin_conf->enable) {
+              enetc_wr(&priv->si->hw,
+                       ENETC_QBV_PTGCR_OFFSET,
+                       tge & (~ENETC_QBV_TGE));
+              return 0;
+      }
+
+      if (admin_conf->cycle_time > (u32)~0 ||
+          admin_conf->cycle_time_extension > (u32)~0)
+              return -EINVAL;

U32_MAX?

Quoted 50 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +50 -0
+
+      /* Configure the (administrative) gate control list using the
+       * control BD descriptor.
+       */
+      gcl_config = &cbd.gcl_conf;
+
+      data_size = struct_size(gcl_data, entry, gcl_len);
+      gcl_data = kzalloc(data_size, __GFP_DMA | GFP_KERNEL);
+      if (!gcl_data)
+              return -ENOMEM;
+
+      gce = (struct gce *)(gcl_data + 1);
+
+      /* Set all gates open as default */
+      gcl_config->atc = 0xff;
+      gcl_config->acl_len = cpu_to_le16(gcl_len);
+
+      if (!admin_conf->base_time) {
+              gcl_data->btl =
+                      cpu_to_le32(enetc_rd(&priv->si->hw, ENETC_SICTR0));
+              gcl_data->bth =
+                      cpu_to_le32(enetc_rd(&priv->si->hw, ENETC_SICTR1));
+      } else {
+              gcl_data->btl =
+                      cpu_to_le32(lower_32_bits(admin_conf->base_time));
+              gcl_data->bth =
+                      cpu_to_le32(upper_32_bits(admin_conf->base_time));
+      }
+
+      gcl_data->ct = cpu_to_le32(admin_conf->cycle_time);
+      gcl_data->cte = cpu_to_le32(admin_conf->cycle_time_extension);
+
+      for (i = 0; i < gcl_len; i++) {
+              struct tc_taprio_sched_entry *temp_entry;
+              struct gce *temp_gce = gce + i;
+
+              temp_entry = &admin_conf->entries[i];
+
+              temp_gce->gate = (u8)temp_entry->gate_mask;
+              temp_gce->period = cpu_to_le32(temp_entry->interval);
+      }
+
+      cbd.length = cpu_to_le16(data_size);
+      cbd.status_flags = 0;
+
+      dma = dma_map_single(&priv->si->pdev->dev, gcl_data,
+                           data_size, DMA_TO_DEVICE);
+      if (dma_mapping_error(&priv->si->pdev->dev, dma)) {
+              netdev_err(priv->si->ndev, "DMA mapping failed!\n");
+              kfree(gcl_data);

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 103

Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +10 -0
+              return -ENOMEM;
+      }
+
+      cbd.addr[0] = lower_32_bits(dma);
+      cbd.addr[1] = upper_32_bits(dma);
+      cbd.cls = BDCR_CMD_PORT_GCL;
+      cbd.status_flags = 0;
+
+      enetc_wr(&priv->si->hw, ENETC_QBV_PTGCR_OFFSET,
+               tge & (~ENETC_QBV_TGE));

Sorry, but, please, before sending new version, be sure you understand what should be changed.

Let's back to IEEE Std 802.1Q

Do you know what means cycle time extension that is programmed here. And why needed admin and oper configurations, and their base times?

It's needed to not stop active oper configuration (that actually this function do), so that it's active till new one, that is admin, will be able to replace it.

Quoted 7 lines

If user wants to stop it, and then load new one, he has to do it himself. But, when some configuration is active - that is OPER at the moment - and user requests w/o stopping it new configuration in some new admin base time, the oper stay active till this admin base time, then dropped in hw.

What this code do, it's in hidden way, stop oper configuration at the time of configuration and no matter which admit base time is.

I am definitely know the spec in the Qbv. Here is hardware errata which I have mentioned in previous feedback in v2.

Quoted 57 lines

That's definitely wrong. Just look how sw version works.
And why all this admin/oper headache exists in IEEE Std 802.1Q exactly for this reason.

So, if oper configuration exists at the moment of calling taprio configuration and no way to apply new on in some future time (admin base time), the code should say to user:

Please, stop prev. oper configuration - then prog new one.

The taprio interface is common and can't be treated differently depending on hw.

Hope it's clean.

drivers/net/ethernet/freescale/enetc/enetc_qos.c

Quoted 13 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +13 -0
+
+      usleep_range(10, 20);
+
+      enetc_wr(&priv->si->hw, ENETC_QBV_PTGCR_OFFSET,
+               tge | ENETC_QBV_TGE);
+
+      err = enetc_send_cmd(priv->si, &cbd);
+      if (err)
+              enetc_wr(&priv->si->hw,
+                       ENETC_QBV_PTGCR_OFFSET,
+                       tge & (~ENETC_QBV_TGE));
+
+      dma_unmap_single(&priv->si->pdev->dev, dma, data_size,

DMA_TO_DEVICE);

Quoted 4 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +4 -0
+      kfree(gcl_data);
+
+      return err;
+}

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 131

Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +10 -0
+
+int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data) {
+      struct tc_taprio_qopt_offload *taprio = type_data;
+      struct enetc_ndev_priv *priv = netdev_priv(ndev);
+      int i;
+
+      for (i = 0; i < priv->num_tx_rings; i++)
+              enetc_set_bdr_prio(&priv->si->hw,
+                                 priv->tx_ring[i]->index,
+                                 taprio->enable ? i : 0);

Again, you should restore enetc_set_bdr_prio if below enetc_setup_taprio() fails.

Quoted 5 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +2 -1
+
+      return enetc_setup_taprio(ndev, taprio); }
--

2.17.1

--
Regards,
Ivan Khoronzhuk

maintainer Applied
#14 lore raw
In reply to Po Liu

From: Po Liu <[email protected]>
Date: Tue, 12 Nov 2019 08:42:49 +0000

Quoted 9 lines

ENETC supports in hardware for time-based egress shaping according to IEEE 802.1Qbv. This patch implement the Qbv enablement by the hardware offload method qdisc tc-taprio method.
Also update cbdr writeback to up level since control bd ring may writeback data to control bd ring.

Applied.

#15 lore raw
In reply to Po Liu

Hello,

Quoted 28 lines · Po Liu

ENETC supports in hardware for time-based egress shaping according to IEEE 802.1Qbv. This patch implement the Qbv enablement by the hardware offload method qdisc tc-taprio method.
Also update cbdr writeback to up level since control bd ring may writeback data to control bd ring.

---
changes:
- introduce a local define CONFIG_FSL_ENETC_QOS to fix the various configurations will result in link errors.
Since the CONFIG_NET_SCH_TAPRIO depends on many Qos configs. Not to use it directly in driver. Add it to CONFIG_FSL_ENETC_QOS depends on list, so only CONFIG_NET_SCH_TAPRIO enabled, user can enable this tsn feature, or else, return not support.

drivers/net/ethernet/freescale/enetc/Kconfig  |  10 ++
drivers/net/ethernet/freescale/enetc/Makefile |   1 +
drivers/net/ethernet/freescale/enetc/enetc.c  |  19 ++-
drivers/net/ethernet/freescale/enetc/enetc.h  |   7 +
.../net/ethernet/freescale/enetc/enetc_cbdr.c |   5 +-
.../net/ethernet/freescale/enetc/enetc_hw.h   | 150 ++++++++++++++++--
.../net/ethernet/freescale/enetc/enetc_qos.c  | 130 +++++++++++++++
7 files changed, 300 insertions(+), 22 deletions(-)

create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_qos.c

[...]

drivers/net/ethernet/freescale/enetc/enetc.c int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type, · line 1487

Quoted 11 lines
drivers/net/ethernet/freescale/enetc/enetc.c +6 -0
@@ -1483,6 +1479,19 @@ int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
 	return 0;
 }
 
+int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
+		   void *type_data)
+{
+	switch (type) {
+	case TC_SETUP_QDISC_MQPRIO:
+		return enetc_setup_tc_mqprio(ndev, type_data);

Sorry didn't see v2, so i duplicate my question here:

This patch is for taprio offload, I see that mqprio is related and is part of taprio offload configuration. But taprio offload has own mqprio settings. The taprio mqprio part is not offloaded with TC_SETUP_QDISC_MQPRIO.

So, a combination of mqprio and tario qdiscs used. Could you please share the commands were used for your setup?

And couple interesting questions about all of this:
- The taprio qdisc has to have mqprio settings, but if it's done with mqprio then it just skipped (by reading tc class num).
- If no separate mqprio qdisc configuration then mqprio conf from taprio is set, who should restore tc mappings when taprio qdisc is unloaded? Maybe there is reason to implement TC_SETUP_QDISC_MQPRIO offload in taprio since it's required feature?

Would be better to move changes for mqprio in separate patch with explanation.

Quoted 7 lines
drivers/net/ethernet/freescale/enetc/enetc.c +7 -0
+	case TC_SETUP_QDISC_TAPRIO:
+		return enetc_setup_tc_taprio(ndev, type_data);
+	default:
+		return -EOPNOTSUPP;
+	}
+}
+

[...]

Quoted 5 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +0 -0
new file mode 100644
index 000000000000..036bb39c7a0b

[...]

Quoted 22 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +22 -0
+static int enetc_setup_taprio(struct net_device *ndev,
+			      struct tc_taprio_qopt_offload *admin_conf)
+{
+	struct enetc_ndev_priv *priv = netdev_priv(ndev);
+	struct enetc_cbd cbd = {.cmd = 0};
+	struct tgs_gcl_conf *gcl_config;
+	struct tgs_gcl_data *gcl_data;
+	struct gce *gce;
+	dma_addr_t dma;
+	u16 data_size;
+	u16 gcl_len;
+	u32 temp;
+	int i;
+
+	gcl_len = admin_conf->num_entries;
+	if (gcl_len > enetc_get_max_gcl_len(&priv->si->hw))
+		return -EINVAL;
+
+	if (admin_conf->enable) {
+		enetc_wr(&priv->si->hw,
+			 ENETC_QBV_PTGCR_OFFSET,
+			 temp & (~ENETC_QBV_TGE));

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 45

Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +10 -0
+		usleep_range(10, 20);
+		enetc_wr(&priv->si->hw,
+			 ENETC_QBV_PTGCR_OFFSET,
+			 temp | ENETC_QBV_TGE);
+	} else {
+		enetc_wr(&priv->si->hw,
+			 ENETC_QBV_PTGCR_OFFSET,
+			 temp & (~ENETC_QBV_TGE));
+		return 0;
+	}

Better do the upper qbv enable/disable procedure closer to enetc_send_cmd() or at least after kzalloc that can fail, no need to restore then.

Quoted 6 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +6 -0
+
+	/* Configure the (administrative) gate control list using the
+	 * control BD descriptor.
+	 */
+	gcl_config = &cbd.gcl_conf;
+

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 61

Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +10 -0
+	data_size = sizeof(struct tgs_gcl_data) + gcl_len * sizeof(struct gce);
+
+	gcl_data = kzalloc(data_size, __GFP_DMA | GFP_KERNEL);
+	if (!gcl_data)
+		return -ENOMEM;
+
+	gce = (struct gce *)(gcl_data + 1);
+
+	/* Since no initial state config in taprio, set gates open as default.
+	 */

tc-taprio and IEEE Qbv allows to change configuration in flight, so that oper state is active till new admin start time. So, here comment says it does initial state config, if in-flight feature is not supported then error has to be returned instead of silently rewriting configuration. But if it can be implemented then state should be remembered/verified in order to not brake oper configuration?

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 63

Quoted 2 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +2 -0
+	gcl_config->atc = 0xff;
+	gcl_config->acl_len = cpu_to_le16(gcl_len);

Ok, this is maximum number of schedules.
According to tc-taprio it's possible to set cycle period more then schedules actually can consume. If cycle time is more, then last gate's state can be kept till the end of cycle. But if last schedule has it's own interval set then gates should be closed till the end of cycle or no? if it has to be closed, then one more endl schedule should be present closing gates at the end of list for the rest cycle time. Can be implemented in h/w but just to be sure, how it's done in h/w?

Quoted 5 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +5 -0
+
+	if (!admin_conf->base_time) {
+		gcl_data->btl =
+			cpu_to_le32(enetc_rd(&priv->si->hw, ENETC_SICTR0));
+		gcl_data->bth =

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 78

Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +10 -0
+			cpu_to_le32(enetc_rd(&priv->si->hw, ENETC_SICTR1));
+	} else {
+		gcl_data->btl =
+			cpu_to_le32(lower_32_bits(admin_conf->base_time));
+		gcl_data->bth =
+			cpu_to_le32(upper_32_bits(admin_conf->base_time));
+	}
+
+	gcl_data->ct = cpu_to_le32(admin_conf->cycle_time);
+	gcl_data->cte = cpu_to_le32(admin_conf->cycle_time_extension);

Not sure it's good idea to write values w/o verification, The cycle time and time extension is 64 values, so it's supposed them to be more then 4,3 seconds, it's probably not a case, but better return error if it's more.

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 86

Quoted 8 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +8 -0
+
+	for (i = 0; i < gcl_len; i++) {
+		struct tc_taprio_sched_entry *temp_entry;
+		struct gce *temp_gce = gce + i;
+
+		temp_entry = &admin_conf->entries[i];
+
+		temp_gce->gate = cpu_to_le32(temp_entry->gate_mask);

So, gate_mask can have up to 32 traffic classes? :-|.

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 87

Quoted 1 line
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +1 -0
+		temp_gce->period = cpu_to_le32(temp_entry->interval);

So, the interval can be up to 4.3 seconds for one schedule? That is, one cycle can be one schedule.
great.

drivers/net/ethernet/freescale/enetc/enetc_qos.c

Quoted 1 line
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +1 -0
+	}

There is no schedule cmd set, so only SetGateStates is supported? But anyway it's Ok.

Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +10 -0
+
+	cbd.length = cpu_to_le16(data_size);
+	cbd.status_flags = 0;
+
+	dma = dma_map_single(&priv->si->pdev->dev, gcl_data,
+			     data_size, DMA_TO_DEVICE);
+	if (dma_mapping_error(&priv->si->pdev->dev, dma)) {
+		netdev_err(priv->si->ndev, "DMA mapping failed!\n");
+		kfree(gcl_data);
+		return -ENOMEM;

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 108

Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +10 -0
+	}
+
+	cbd.addr[0] = lower_32_bits(dma);
+	cbd.addr[1] = upper_32_bits(dma);
+	cbd.cls = BDCR_CMD_PORT_GCL;
+
+	/* Updated by ENETC on completion of the configuration
+	 * command. A zero value indicates success.
+	 */
+	cbd.status_flags = 0;

It's updated on completion by setting 0 on success, then why it's here set to 0 but not 1 and not verified afterwards?

Quoted 9 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +9 -0
+
+	enetc_send_cmd(priv->si, &cbd);
+
+	dma_unmap_single(&priv->si->pdev->dev, dma, data_size, DMA_TO_DEVICE);
+	kfree(gcl_data);
+
+	return 0;
+}
+

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 127

Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +10 -0
+int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data)
+{
+	struct tc_taprio_qopt_offload *taprio = type_data;
+	struct enetc_ndev_priv *priv = netdev_priv(ndev);
+	int i;
+
+	for (i = 0; i < priv->num_tx_rings; i++)
+		enetc_set_bdr_prio(&priv->si->hw,
+				   priv->tx_ring[i]->index,
+				   taprio->enable ? i : 0);

then why enable/disable at the beginning for whole qbv scheduler, maybe better do it together? Or better say, what if setup_taprio failed, who restore configuration?

Quoted 6 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +3 -0
+
+	return enetc_setup_taprio(ndev, taprio);
+}
Signature · 1 line
2.17.1
Signature · 2 lines
Regards,
Ivan Khoronzhuk
author
#16 lore raw

Hi Ivan,

Quoted 64 lines

-----Original Message-----
From: Ivan Khoronzhuk <[email protected]>
Sent: 2019年11月13日 5:10
To: Po Liu <[email protected]>
Cc: Claudiu Manoil <[email protected]>; [email protected]; linux- [email protected]; [email protected]; [email protected]; Vladimir Oltean <[email protected]>; Alexandru Marginean <[email protected]>; Xiaoliang Yang <[email protected]>; Roy Zang <[email protected]>; Mingkai Hu <[email protected]>; Jerry Huang <[email protected]>; Leo Li <[email protected]>
Subject: [EXT] Re: [v2,net-next, 1/2] enetc: Configure the Time-Aware Scheduler via tc-taprio offload

Caution: EXT Email

Hello,

Quoted 28 lines · Po Liu

ENETC supports in hardware for time-based egress shaping according to IEEE 802.1Qbv. This patch implement the Qbv enablement by the hardware offload method qdisc tc-taprio method.
Also update cbdr writeback to up level since control bd ring may writeback data to control bd ring.

---
changes:
- introduce a local define CONFIG_FSL_ENETC_QOS to fix the various configurations will result in link errors.
Since the CONFIG_NET_SCH_TAPRIO depends on many Qos configs. Not to use it directly in driver. Add it to CONFIG_FSL_ENETC_QOS depends on list, so only CONFIG_NET_SCH_TAPRIO enabled, user can enable this tsn feature, or else, return not support.

drivers/net/ethernet/freescale/enetc/Kconfig  |  10 ++
drivers/net/ethernet/freescale/enetc/Makefile |   1 +
drivers/net/ethernet/freescale/enetc/enetc.c  |  19 ++-
drivers/net/ethernet/freescale/enetc/enetc.h  |   7 +
.../net/ethernet/freescale/enetc/enetc_cbdr.c |   5 +-
.../net/ethernet/freescale/enetc/enetc_hw.h   | 150 ++++++++++++++++--
.../net/ethernet/freescale/enetc/enetc_qos.c  | 130 +++++++++++++++
7 files changed, 300 insertions(+), 22 deletions(-) create mode 100644

drivers/net/ethernet/freescale/enetc/enetc_qos.c

[...]

Review int enetc_setup_tc(struct net_device *ndev, enum

Quoted 2 lines
(quoted diff) +0 -0
@@ -1483,6 +1479,19 @@ int enetc_setup_tc(struct net_device *ndev, enum

tc_setup_type type,

drivers/net/ethernet/freescale/enetc/enetc.c int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type, · line 1487

Quoted 9 lines
drivers/net/ethernet/freescale/enetc/enetc.c +6 -0
      return 0;
 }
 
+int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
+                 void *type_data)
+{
+      switch (type) {
+      case TC_SETUP_QDISC_MQPRIO:
+              return enetc_setup_tc_mqprio(ndev, type_data);

Sorry didn't see v2, so i duplicate my question here:

Quoted 7 lines

This patch is for taprio offload, I see that mqprio is related and is part of taprio offload configuration. But taprio offload has own mqprio settings.
The taprio mqprio part is not offloaded with TC_SETUP_QDISC_MQPRIO.

So, a combination of mqprio and tario qdiscs used. Could you please share the commands were used for your setup?

Example command:
tc qdisc replace dev eth0 parent root handle 100 taprio num_tc 8 map 0 1 2 3 4 5 6 7 queues 1@0 1@1 1@2 1@3 1@4 1@5 1@6 1@7 base-time 01 sched-entry S 02 300000 flags 0x2

Quoted 7 lines

And couple interesting questions about all of this:
- The taprio qdisc has to have mqprio settings, but if it's done with mqprio then it just skipped (by reading tc class num).
- If no separate mqprio qdisc configuration then mqprio conf from taprio is set, who should restore tc mappings when taprio qdisc is unloaded?
Maybe there is reason to implement TC_SETUP_QDISC_MQPRIO offload in taprio since it's required feature?

Mqprio offload with TC_SETUP_QDISC_MQPRIO would be good or even the plus with num_tc would fix some hack. This has a discussion with Vinicius Gomes for a future patch fix. I know the problem is the mqprio will be set after the offload function. But offload function may use some for hardware set.

Quoted 49 lines

Would be better to move changes for mqprio in separate patch with explanation.

Quoted 7 lines
drivers/net/ethernet/freescale/enetc/enetc.c +7 -0
+      case TC_SETUP_QDISC_TAPRIO:
+              return enetc_setup_tc_taprio(ndev, type_data);
+      default:
+              return -EOPNOTSUPP;
+      }
+}
+

[...]

Quoted 6 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +0 -0
new file mode 100644
index 000000000000..036bb39c7a0b

[...]

Quoted 27 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +27 -0
+static int enetc_setup_taprio(struct net_device *ndev,
+                            struct tc_taprio_qopt_offload *admin_conf)
+{
+      struct enetc_ndev_priv *priv = netdev_priv(ndev);
+      struct enetc_cbd cbd = {.cmd = 0};
+      struct tgs_gcl_conf *gcl_config;
+      struct tgs_gcl_data *gcl_data;
+      struct gce *gce;
+      dma_addr_t dma;
+      u16 data_size;
+      u16 gcl_len;
+      u32 temp;
+      int i;
+
+      gcl_len = admin_conf->num_entries;
+      if (gcl_len > enetc_get_max_gcl_len(&priv->si->hw))
+              return -EINVAL;
+
+      if (admin_conf->enable) {
+              enetc_wr(&priv->si->hw,
+                       ENETC_QBV_PTGCR_OFFSET,
+                       temp & (~ENETC_QBV_TGE));
+              usleep_range(10, 20);
+              enetc_wr(&priv->si->hw,
+                       ENETC_QBV_PTGCR_OFFSET,
+                       temp | ENETC_QBV_TGE);
+      } else {
Quoted 8 lines

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 45

Quoted 5 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +5 -0
+              enetc_wr(&priv->si->hw,
+                       ENETC_QBV_PTGCR_OFFSET,
+                       temp & (~ENETC_QBV_TGE));
+              return 0;
+      }

Better do the upper qbv enable/disable procedure closer to enetc_send_cmd() or at least after kzalloc that can fail, no need to restore then.

After saving the 'if' suggest by Simon Horman, the enable part could move close to the cmd().

Quoted 15 lines
Quoted 15 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +14 -0
+
+      /* Configure the (administrative) gate control list using the
+       * control BD descriptor.
+       */
+      gcl_config = &cbd.gcl_conf;
+
+      data_size = sizeof(struct tgs_gcl_data) + gcl_len *
+ sizeof(struct gce);
+
+      gcl_data = kzalloc(data_size, __GFP_DMA | GFP_KERNEL);
+      if (!gcl_data)
+              return -ENOMEM;
+
+      gce = (struct gce *)(gcl_data + 1);
Quoted 8 lines

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 61

Quoted 3 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +3 -0
+
+      /* Since no initial state config in taprio, set gates open as default.
+       */

tc-taprio and IEEE Qbv allows to change configuration in flight, so that oper state is active till new admin start time. So, here comment says it does initial state config, if in-flight feature is not supported then error has to be returned instead of silently rewriting configuration. But if it can be implemented then state should be remembered/verified in order to not brake oper configuration?

I think this is ok as per standard. Also see this comment in net/sched/sch_taprio.c:

	/* Until the schedule starts, all the queues are open */

I would change the comment.

Quoted 11 lines

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 63

Quoted 2 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +2 -0
+      gcl_config->atc = 0xff;
+      gcl_config->acl_len = cpu_to_le16(gcl_len);

Ok, this is maximum number of schedules.
According to tc-taprio it's possible to set cycle period more then schedules actually can consume. If cycle time is more, then last gate's state can be kept till the end of cycle. But if last schedule has it's own interval set then gates should be closed till the end of cycle or no? if it has to be closed, then one more endl schedule should be present closing gates at the end of list for the rest cycle time. Can be implemented in h/w but just to be sure, how it's done in h/w?

There is already check the list len in up code.
if (admin_conf->num_entries > enetc_get_max_gcl_len(&priv->si->hw))

	return -EINVAL;

gcl_len = admin_conf->num_entries;

Quoted 11 lines
Quoted 11 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +11 -0
+
+      if (!admin_conf->base_time) {
+              gcl_data->btl =
+                      cpu_to_le32(enetc_rd(&priv->si->hw, ENETC_SICTR0));
+              gcl_data->bth =
+                      cpu_to_le32(enetc_rd(&priv->si->hw, ENETC_SICTR1));
+      } else {
+              gcl_data->btl =
+                      cpu_to_le32(lower_32_bits(admin_conf->base_time));
+              gcl_data->bth =
+                      cpu_to_le32(upper_32_bits(admin_conf->base_time));
Quoted 9 lines

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 78

Quoted 4 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +4 -0
+      }
+
+      gcl_data->ct = cpu_to_le32(admin_conf->cycle_time);
+      gcl_data->cte = cpu_to_le32(admin_conf->cycle_time_extension);

Not sure it's good idea to write values w/o verification, The cycle time and time extension is 64 values, so it's supposed them to be more then 4,3 seconds, it's probably not a case, but better return error if it's more.

Can add a check for cycle time and extension since type not match.

Quoted 10 lines

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 86

Quoted 8 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +8 -0
+
+      for (i = 0; i < gcl_len; i++) {
+              struct tc_taprio_sched_entry *temp_entry;
+              struct gce *temp_gce = gce + i;
+
+              temp_entry = &admin_conf->entries[i];
+
+              temp_gce->gate = cpu_to_le32(temp_entry->gate_mask);

So, gate_mask can have up to 32 traffic classes? :-|.

Gate_mask is defined u32 type. Simon has suggested endian issue. Would change in next patch.

Quoted 27 lines
Quoted 2 lines

+ temp_gce->period = cpu_to_le32(temp_entry->interval);

So, the interval can be up to 4.3 seconds for one schedule? That is, one cycle can be one schedule.
great.

Quoted 1 line

+ }

There is no schedule cmd set, so only SetGateStates is supported? But anyway it's Ok.

Quoted 15 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +15 -0
+
+      cbd.length = cpu_to_le16(data_size);
+      cbd.status_flags = 0;
+
+      dma = dma_map_single(&priv->si->pdev->dev, gcl_data,
+                           data_size, DMA_TO_DEVICE);
+      if (dma_mapping_error(&priv->si->pdev->dev, dma)) {
+              netdev_err(priv->si->ndev, "DMA mapping failed!\n");
+              kfree(gcl_data);
+              return -ENOMEM;
+      }
+
+      cbd.addr[0] = lower_32_bits(dma);
+      cbd.addr[1] = upper_32_bits(dma);
+      cbd.cls = BDCR_CMD_PORT_GCL;
Quoted 9 lines

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 108

Quoted 5 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +5 -0
+
+      /* Updated by ENETC on completion of the configuration
+       * command. A zero value indicates success.
+       */
+      cbd.status_flags = 0;

It's updated on completion by setting 0 on success, then why it's here set to 0 but not 1 and not verified afterwards?

This byte is feedback by hardware after enetc_send_cmd. Hardware require the cbd space set status_flags 0 before send to hardware.
No choice of larger than 0 before send to hardware.
But you mind me the enetc_send_cmd() need to check return value.

Quoted 15 lines

drivers/net/ethernet/freescale/enetc/enetc_qos.c

Quoted 4 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +4 -0
+
+      enetc_send_cmd(priv->si, &cbd);
+
+      dma_unmap_single(&priv->si->pdev->dev, dma, data_size,

DMA_TO_DEVICE);

Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +10 -0
+      kfree(gcl_data);
+
+      return 0;
+}
+
+int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data) {
+      struct tc_taprio_qopt_offload *taprio = type_data;
+      struct enetc_ndev_priv *priv = netdev_priv(ndev);
+      int i;
+
Quoted 8 lines

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 127

Quoted 4 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +4 -0
+      for (i = 0; i < priv->num_tx_rings; i++)
+              enetc_set_bdr_prio(&priv->si->hw,
+                                 priv->tx_ring[i]->index,
+                                 taprio->enable ? i : 0);

then why enable/disable at the beginning for whole qbv scheduler, maybe better do it together? Or better say, what if setup_taprio failed, who restore configuration?

You remind me the enetc_send_cmd() need to check return value.

Quoted 9 lines
Quoted 5 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +2 -1
+
+      return enetc_setup_taprio(ndev, taprio); }
--

2.17.1

--
Regards,
Ivan Khoronzhuk

#17 lore raw
Quoted 70 lines · Po Liu

Hi Ivan,

Quoted 68 lines

-----Original Message-----
From: Ivan Khoronzhuk <[email protected]>
Sent: 2019年11月13日 5:10
To: Po Liu <[email protected]>
Cc: Claudiu Manoil <[email protected]>; [email protected]; linux- [email protected]; [email protected]; [email protected]; Vladimir Oltean <[email protected]>; Alexandru Marginean <[email protected]>; Xiaoliang Yang <[email protected]>; Roy Zang <[email protected]>; Mingkai Hu <[email protected]>; Jerry Huang <[email protected]>; Leo Li <[email protected]>
Subject: [EXT] Re: [v2,net-next, 1/2] enetc: Configure the Time-Aware Scheduler via tc-taprio offload

Caution: EXT Email

Hello,

Quoted 28 lines · Po Liu

ENETC supports in hardware for time-based egress shaping according to IEEE 802.1Qbv. This patch implement the Qbv enablement by the hardware offload method qdisc tc-taprio method.
Also update cbdr writeback to up level since control bd ring may writeback data to control bd ring.

---
changes:
- introduce a local define CONFIG_FSL_ENETC_QOS to fix the various configurations will result in link errors.
Since the CONFIG_NET_SCH_TAPRIO depends on many Qos configs. Not to use it directly in driver. Add it to CONFIG_FSL_ENETC_QOS depends on list, so only CONFIG_NET_SCH_TAPRIO enabled, user can enable this tsn feature, or else, return not support.

drivers/net/ethernet/freescale/enetc/Kconfig  |  10 ++
drivers/net/ethernet/freescale/enetc/Makefile |   1 +
drivers/net/ethernet/freescale/enetc/enetc.c  |  19 ++-
drivers/net/ethernet/freescale/enetc/enetc.h  |   7 +
.../net/ethernet/freescale/enetc/enetc_cbdr.c |   5 +-
.../net/ethernet/freescale/enetc/enetc_hw.h   | 150 ++++++++++++++++--
.../net/ethernet/freescale/enetc/enetc_qos.c  | 130 +++++++++++++++
7 files changed, 300 insertions(+), 22 deletions(-) create mode 100644

drivers/net/ethernet/freescale/enetc/enetc_qos.c

[...]

Review int enetc_setup_tc(struct net_device *ndev, enum

Quoted 2 lines
(quoted diff) +0 -0
@@ -1483,6 +1479,19 @@ int enetc_setup_tc(struct net_device *ndev, enum

tc_setup_type type,

drivers/net/ethernet/freescale/enetc/enetc.c int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type, · line 1487

Quoted 9 lines
drivers/net/ethernet/freescale/enetc/enetc.c +6 -0
      return 0;
 }
 
+int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
+                 void *type_data)
+{
+      switch (type) {
+      case TC_SETUP_QDISC_MQPRIO:
+              return enetc_setup_tc_mqprio(ndev, type_data);

Sorry didn't see v2, so i duplicate my question here:

This patch is for taprio offload, I see that mqprio is related and is part of taprio offload configuration. But taprio offload has own mqprio settings.
The taprio mqprio part is not offloaded with TC_SETUP_QDISC_MQPRIO.

Quoted 6 lines
Quoted 3 lines

So, a combination of mqprio and tario qdiscs used. Could you please share the commands were used for your setup?

Example command:
tc qdisc replace dev eth0 parent root handle 100 taprio num_tc 8 map 0 1 2 3 4 5 6 7 queues 1@0 1@1 1@2 1@3 1@4 1@5 1@6 1@7 base-time 01 sched-entry S 02 300000 flags 0x2

So, the TC_SETUP_QDISC_MQPRIO is really not required here, and mqprio qdisc is not used. Then why is it here, should be placed in separate patch at least.

But even the comb mqprio qdisc and taprio qdisc are used together then taprio requires hw offload also. I'm Ok to add it later to taprio, and I'm asking about it because I need it also, what ever way it could be added.

Not clear how you combined mqprio qdisc and taprio now to get it working From this command:

tc qdisc replace dev eth0 parent root handle 100 taprio num_tc 8 map 0 1 2 3 4 5 6 7 queues 1@0 1@1 1@2 1@3 1@4 1@5 1@6 1@7 base-time 01 sched-entry S 02 300000 flags 0x2

I can conclude that some default h/w mapping (one to one) were used and no need to use mqprio qdisc, the command above is enough.

Is it true?
Then move it to spearate patch please as it's not taprio related yet.

Quoted 9 lines
Quoted 8 lines

And couple interesting questions about all of this:
- The taprio qdisc has to have mqprio settings, but if it's done with mqprio then it just skipped (by reading tc class num).
- If no separate mqprio qdisc configuration then mqprio conf from taprio is set, who should restore tc mappings when taprio qdisc is unloaded?
Maybe there is reason to implement TC_SETUP_QDISC_MQPRIO offload in taprio since it's required feature?

[...]

Quoted 24 lines
Quoted 15 lines
Quoted 15 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +14 -0
+
+      /* Configure the (administrative) gate control list using the
+       * control BD descriptor.
+       */
+      gcl_config = &cbd.gcl_conf;
+
+      data_size = sizeof(struct tgs_gcl_data) + gcl_len *
+ sizeof(struct gce);
+
+      gcl_data = kzalloc(data_size, __GFP_DMA | GFP_KERNEL);
+      if (!gcl_data)
+              return -ENOMEM;
+
+      gce = (struct gce *)(gcl_data + 1);
Quoted 8 lines

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 61

Quoted 3 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +3 -0
+
+      /* Since no initial state config in taprio, set gates open as default.
+       */

tc-taprio and IEEE Qbv allows to change configuration in flight, so that oper state is active till new admin start time. So, here comment says it does initial state config, if in-flight feature is not supported then error has to be returned instead of silently rewriting configuration. But if it can be implemented then state should be remembered/verified in order to not brake oper configuration?

Quoted 2 lines

I think this is ok as per standard. Also see this comment in net/sched/sch_taprio.c:

From the code above (duplicate for convenience):

     if (admin_conf->enable) {
             enetc_wr(&priv->si->hw,
                      ENETC_QBV_PTGCR_OFFSET,
                      temp & (~ENETC_QBV_TGE));
             usleep_range(10, 20);
             enetc_wr(&priv->si->hw,
                      ENETC_QBV_PTGCR_OFFSET,
                      temp | ENETC_QBV_TGE);
     } else {
             enetc_wr(&priv->si->hw,
                      ENETC_QBV_PTGCR_OFFSET,
                      temp & (~ENETC_QBV_TGE));
             return 0;
     }

I see that's not true, as Simon noted, you have same command:

enetc_wr(&priv->si->hw, ENETC_QBV_PTGCR_OFFSET, temp & (~ENETC_QBV_TGE));

before enabling and for disabling. I guess it's stop command, that is disable qbv. So, before enabling new configuration with enetc_setup_tc(), the tario is inited|cleared|reseted|rebooted|defaulted|offed but not updated. It means no in-flight capabilities or they are ignored.

JFI, it's possible to do first time:

tc qdisc replace dev eth0 parent root handle 100 taprio num_tc 8 map 0 1 2 3 4 5 6 7 queues 1@0 1@1 1@2 1@3 1@4 1@5 1@6 1@7 base-time 01 sched-entry S 02 300000 flags 0x2

and then:

tc qdisc replace dev eth0 parent root handle 100 taprio base-time 01 sched-entry S 02 200000 flags 0x2

Do it many times, but w/o mqprio configuration.

So, this function must return error if it cannot be done, as above commands suppose that configuration can be updated in runtime, that is, set ADMIN cycle while OPER cycle is still active for some time and not broken like it's done now. If it can be achieved then no need to do enetc_wr(&priv->si->hw, ENETC_QBV_PTGCR_OFFSET, temp & (~ENETC_QBV_TGE)); when admin_conf->enable.

So or return error, or do it appropriately.

Quoted 15 lines
	/* Until the schedule starts, all the queues are open */

I would change the comment.

Quoted 11 lines

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 63

Quoted 2 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +2 -0
+      gcl_config->atc = 0xff;
+      gcl_config->acl_len = cpu_to_le16(gcl_len);

Ok, this is maximum number of schedules.
According to tc-taprio it's possible to set cycle period more then schedules actually can consume. If cycle time is more, then last gate's state can be kept till the end of cycle. But if last schedule has it's own interval set then gates should be closed till the end of cycle or no? if it has to be closed, then one more endl schedule should be present closing gates at the end of list for the rest cycle time. Can be implemented in h/w but just to be sure, how it's done in h/w?

Quoted 4 lines

There is already check the list len in up code.
if (admin_conf->num_entries > enetc_get_max_gcl_len(&priv->si->hw))

	return -EINVAL;

gcl_len = admin_conf->num_entries;

I mean +1 schedule to finalize the cycle with closed gates if last schedule has provided time interval. If I set couple schedules, with intervals, and cycle time more then those schedules consume, then I suppose the gates closed for the rest time of cycle, probably.

Example:

sched1 ----> shced2 ----> time w/o scheds -> cycle end
gate 1 gate 2 no gates

But if shced2 is last one then gate 2 is opened till the end of cycle. So, to close gate one more shched is needed with closed gates to finalize it. Or it's supposed that gate2 is opened till the end of cycle,
How is it in you case. Or this is can be provided by configuration from tc?

It's question not statement. Just though. Anyway i'll verify later it can be done with tc and how it's done in sw version, just interesting how your h/w works.

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +6 -0
+
+      if (!admin_conf->base_time) {
+              gcl_data->btl =
+                      cpu_to_le32(enetc_rd(&priv->si->hw, ENETC_SICTR0));
+              gcl_data->bth =
+                      cpu_to_le32(enetc_rd(&priv->si->hw, ENETC_SICTR1));

[...]

Signature · 2 lines
Regards,
Ivan Khoronzhuk
author
#18 lore raw

Hi Ivan,

Quoted 95 lines

-----Original Message-----
From: Ivan Khoronzhuk <[email protected]>
Sent: 2019年11月13日 21:42
To: Po Liu <[email protected]>
Cc: Claudiu Manoil <[email protected]>; [email protected]; linux- [email protected]; [email protected]; [email protected]; Vladimir Oltean <[email protected]>; Alexandru Marginean <[email protected]>; Xiaoliang Yang <[email protected]>; Roy Zang <[email protected]>; Mingkai Hu <[email protected]>; Jerry Huang <[email protected]>; Leo Li <[email protected]>
Subject: Re: [EXT] Re: [v2,net-next, 1/2] enetc: Configure the Time-Aware Scheduler via tc-taprio offload

Caution: EXT Email

Quoted 71 lines · Po Liu

Hi Ivan,

Quoted 69 lines

-----Original Message-----
From: Ivan Khoronzhuk <[email protected]>
Sent: 2019年11月13日 5:10
To: Po Liu <[email protected]>
Cc: Claudiu Manoil <[email protected]>; [email protected]; linux- [email protected]; [email protected]; [email protected]; Vladimir Oltean <[email protected]>; Alexandru Marginean <[email protected]>; Xiaoliang Yang <[email protected]>; Roy Zang <[email protected]>; Mingkai Hu <[email protected]>; Jerry Huang <[email protected]>; Leo Li <[email protected]>
Subject: [EXT] Re: [v2,net-next, 1/2] enetc: Configure the Time-Aware Scheduler via tc-taprio offload

Caution: EXT Email

Hello,

Quoted 30 lines · Po Liu

ENETC supports in hardware for time-based egress shaping according to IEEE 802.1Qbv. This patch implement the Qbv enablement by the hardware offload method qdisc tc-taprio method.
Also update cbdr writeback to up level since control bd ring may writeback data to control bd ring.

---
changes:
- introduce a local define CONFIG_FSL_ENETC_QOS to fix the various configurations will result in link errors.
Since the CONFIG_NET_SCH_TAPRIO depends on many Qos configs. Not to use it directly in driver. Add it to CONFIG_FSL_ENETC_QOS
depends
on list, so only CONFIG_NET_SCH_TAPRIO enabled, user can enable
this
tsn feature, or else, return not support.

drivers/net/ethernet/freescale/enetc/Kconfig  |  10 ++
drivers/net/ethernet/freescale/enetc/Makefile |   1 +
drivers/net/ethernet/freescale/enetc/enetc.c  |  19 ++-
drivers/net/ethernet/freescale/enetc/enetc.h  |   7 +
.../net/ethernet/freescale/enetc/enetc_cbdr.c |   5 +-
.../net/ethernet/freescale/enetc/enetc_hw.h   | 150 ++++++++++++++++--
.../net/ethernet/freescale/enetc/enetc_qos.c  | 130 +++++++++++++++
7 files changed, 300 insertions(+), 22 deletions(-) create mode

100644 drivers/net/ethernet/freescale/enetc/enetc_qos.c

[...]

Quoted 3 lines
(quoted diff) +0 -0
@@ -1483,6 +1479,19 @@ int enetc_setup_tc(struct net_device *ndev,

enum

tc_setup_type type,

drivers/net/ethernet/freescale/enetc/enetc.c int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type, · line 1487

Quoted 9 lines
      return 0;
}
drivers/net/ethernet/freescale/enetc/enetc.c +6 -0
+int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
+                 void *type_data)
+{
+      switch (type) {
+      case TC_SETUP_QDISC_MQPRIO:
+              return enetc_setup_tc_mqprio(ndev, type_data);

Sorry didn't see v2, so i duplicate my question here:

This patch is for taprio offload, I see that mqprio is related and is part of taprio offload configuration. But taprio offload has own mqprio

settings.

Quoted 6 lines
Quoted 5 lines

The taprio mqprio part is not offloaded with TC_SETUP_QDISC_MQPRIO.

So, a combination of mqprio and tario qdiscs used. Could you please share the commands were used for your setup?

Quoted 8 lines
Quoted 4 lines

Example command:
tc qdisc replace dev eth0 parent root handle 100 taprio num_tc 8 map 0 1 2 3 4 5 6 7 queues 1@0 1@1 1@2 1@3 1@4 1@5 1@6 1@7 base-time 01 sched-entry S 02 300000 flags 0x2

So, the TC_SETUP_QDISC_MQPRIO is really not required here, and mqprio qdisc is not used. Then why is it here, should be placed in separate patch at least.

Taprio is not fully copy the mqprio but refer the mqprio feature. I don't think there is Problem for them all list in driver. Some person may not use taprio at all.

Quoted 13 lines

But even the comb mqprio qdisc and taprio qdisc are used together then taprio requires hw offload also. I'm Ok to add it later to taprio, and I'm asking about it because I need it also, what ever way it could be added.

Not clear how you combined mqprio qdisc and taprio now to get it working From this command:

tc qdisc replace dev eth0 parent root handle 100 taprio num_tc 8 map 0 1 2 3 4
5 6 7 queues 1@0 1@1 1@2 1@3 1@4 1@5 1@6 1@7 base-time 01 sched- entry S 02
300000 flags 0x2

Quoted 5 lines

I can conclude that some default h/w mapping (one to one) were used and no need to use mqprio qdisc, the command above is enough.

Is it true?
Then move it to spearate patch please as it's not taprio related yet.

As mentioned, to set the queue mapping it is require the data_type include the mqprio parameter. So here hardware set it as default. Without the settting, taprio would not say it is implement the offload. So I don’t think it is proper to seperate another patch.

Quoted 58 lines
Quoted 9 lines
Quoted 8 lines

And couple interesting questions about all of this:
- The taprio qdisc has to have mqprio settings, but if it's done with mqprio then it just skipped (by reading tc class num).
- If no separate mqprio qdisc configuration then mqprio conf from taprio is set, who should restore tc mappings when taprio qdisc is unloaded? Maybe there is reason to implement TC_SETUP_QDISC_MQPRIO offload in taprio since it's required feature?

[...]

Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +14 -0
+
+      /* Configure the (administrative) gate control list using the
+       * control BD descriptor.
+       */
+      gcl_config = &cbd.gcl_conf;
+
+      data_size = sizeof(struct tgs_gcl_data) + gcl_len *
+ sizeof(struct gce);
+
+      gcl_data = kzalloc(data_size, __GFP_DMA | GFP_KERNEL);
+      if (!gcl_data)
+              return -ENOMEM;
+
+      gce = (struct gce *)(gcl_data + 1);
Quoted 8 lines
Quoted 8 lines

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 61

Quoted 3 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +3 -0
+
+      /* Since no initial state config in taprio, set gates open as default.
+       */

tc-taprio and IEEE Qbv allows to change configuration in flight, so that oper state is active till new admin start time. So, here comment says it does initial state config, if in-flight feature is not supported then error has to be returned instead of silently rewriting configuration. But if it can be implemented then state should be

remembered/verified in order to not brake oper configuration?

Quoted 3 lines

I think this is ok as per standard. Also see this comment in net/sched/sch_taprio.c:

From the code above (duplicate for convenience):

      if (admin_conf->enable) {
              enetc_wr(&priv->si->hw,
                       ENETC_QBV_PTGCR_OFFSET,
                       temp & (~ENETC_QBV_TGE));
              usleep_range(10, 20);
              enetc_wr(&priv->si->hw,
                       ENETC_QBV_PTGCR_OFFSET,
                       temp | ENETC_QBV_TGE);
      } else {
              enetc_wr(&priv->si->hw,
                       ENETC_QBV_PTGCR_OFFSET,
                       temp & (~ENETC_QBV_TGE));
              return 0;
      }

I see that's not true, as Simon noted, you have same command:

Quoted 8 lines

enetc_wr(&priv->si->hw, ENETC_QBV_PTGCR_OFFSET, temp & (~ENETC_QBV_TGE));

before enabling and for disabling. I guess it's stop command, that is disable qbv. So, before enabling new configuration with enetc_setup_tc(), the tario is

inited|cleared|reseted|rebooted|defaulted|offed but not updated. It
inited|cleared|reseted|rebooted|defaulted|means no

in-flight capabilities or they are ignored.

The Qbv spec do not show the disable before enable.
Here is hardware workaround to avoid the hardware run into unknow state.

Quoted 56 lines

JFI, it's possible to do first time:

tc qdisc replace dev eth0 parent root handle 100 taprio num_tc 8 map 0 1 2 3 4
5 6 7 queues 1@0 1@1 1@2 1@3 1@4 1@5 1@6 1@7 base-time 01 sched- entry S 02
300000 flags 0x2

and then:

tc qdisc replace dev eth0 parent root handle 100 taprio base-time 01 sched- entry S 02 200000 flags 0x2

Do it many times, but w/o mqprio configuration.

So, this function must return error if it cannot be done, as above commands suppose that configuration can be updated in runtime, that is, set ADMIN cycle while OPER cycle is still active for some time and not broken like it's done now. If it can be achieved then no need to do enetc_wr(&priv->si->hw, ENETC_QBV_PTGCR_OFFSET, temp & (~ENETC_QBV_TGE)); when admin_conf-

Quoted 1 line

enable.

So or return error, or do it appropriately.

Quoted 14 lines
      /* Until the schedule starts, all the queues are open */ I would

change the comment.

Quoted 10 lines

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 63

Quoted 2 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +2 -0
+      gcl_config->atc = 0xff;
+      gcl_config->acl_len = cpu_to_le16(gcl_len);

Ok, this is maximum number of schedules.
According to tc-taprio it's possible to set cycle period more then schedules actually can consume. If cycle time is more, then last gate's state can be kept till the end of cycle. But if last schedule has it's own interval set then gates should be closed till the end of cycle or no? if it has to be closed, then one more endl schedule should be present closing gates at the end of list for the rest cycle time. Can

be implemented in h/w but just to be sure, how it's done in h/w?

Quoted 5 lines
Quoted 1 line

There is already check the list len in up code.
if (admin_conf->num_entries > enetc_get_max_gcl_len(&priv->si->hw))

      return -EINVAL;

gcl_len = admin_conf->num_entries;

I mean +1 schedule to finalize the cycle with closed gates if last schedule has provided time interval. If I set couple schedules, with intervals, and cycle time more then those schedules consume, then I suppose the gates closed for the rest time of cycle, probably.

Example:

sched1 ----> shced2 ----> time w/o scheds -> cycle end
gate 1 gate 2 no gates

Quoted 7 lines

But if shced2 is last one then gate 2 is opened till the end of cycle. So, to close gate one more shched is needed with closed gates to finalize it. Or it's supposed that gate2 is opened till the end of cycle, How is it in you case. Or this is can be provided by configuration from tc?

It's question not statement. Just though. Anyway i'll verify later it can be done with tc and how it's done in sw version, just interesting how your h/w works.

What user command set the gate list would set into the hardware.
We have detail setting in the user manual which you can have it try.

Quoted 14 lines
Quoted 8 lines
Quoted 8 lines

drivers/net/ethernet/freescale/enetc/enetc_qos.c

Quoted 8 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +7 -0
+
+      if (!admin_conf->base_time) {
+              gcl_data->btl =
+                      cpu_to_le32(enetc_rd(&priv->si->hw, ENETC_SICTR0));
+              gcl_data->bth =
+                      cpu_to_le32(enetc_rd(&priv->si->hw,
+ ENETC_SICTR1));

[...]

--
Regards,
Ivan Khoronzhuk

#19 lore raw

Re: [net-next, 2/2] enetc: update TSN Qbv PSPEED set according to adjust link speed

In reply to Po Liu
Quoted 81 lines · Po Liu

ENETC has a register PSPEED to indicate the link speed of hardware. It is need to update accordingly. PSPEED field needs to be updated with the port speed for QBV scheduling purposes. Or else there is chance for gate slot not free by frame taking the MAC if PSPEED and phy speed not match. So update PSPEED when link adjust. This is implement by the adjust_link.

---
 drivers/net/ethernet/freescale/enetc/enetc.c  | 13 +++++--
 drivers/net/ethernet/freescale/enetc/enetc.h  |  7 ++++
 .../net/ethernet/freescale/enetc/enetc_pf.c   |  3 ++
 .../net/ethernet/freescale/enetc/enetc_qos.c  | 34 +++++++++++++++++++
 4 files changed, 55 insertions(+), 2 deletions(-)
drivers/net/ethernet/freescale/enetc/enetc.c +11 -2
index d58dbc2c4270..f6b00c68451b 100644
@@ -742,9 +742,14 @@ void enetc_get_si_caps(struct enetc_si *si)
 	si->num_rss = 0;
 	val = enetc_rd(hw, ENETC_SIPCAPR0);
 	if (val & ENETC_SIPCAPR0_RSS) {
-		val = enetc_rd(hw, ENETC_SIRSSCAPR);
-		si->num_rss = ENETC_SIRSSCAPR_GET_NUM_RSS(val);
+		u32 rss;
+
+		rss = enetc_rd(hw, ENETC_SIRSSCAPR);
+		si->num_rss = ENETC_SIRSSCAPR_GET_NUM_RSS(rss);
 	}
+
+	if (val & ENETC_SIPCAPR0_QBV)
+		si->hw_features |= ENETC_SI_F_QBV;
 }
 
 static int enetc_dma_alloc_bdr(struct enetc_bdr *r, size_t bd_size)
@@ -1314,8 +1319,12 @@ static void enetc_disable_interrupts(struct enetc_ndev_priv *priv)
 
 static void adjust_link(struct net_device *ndev)
 {
+	struct enetc_ndev_priv *priv = netdev_priv(ndev);
 	struct phy_device *phydev = ndev->phydev;
 
+	if (priv->active_offloads & ENETC_F_QBV)
+		enetc_sched_speed_set(ndev);
+
 	phy_print_status(phydev);
 }
 
drivers/net/ethernet/freescale/enetc/enetc.h +4 -0
index 8676631041d5..e85e5301c578 100644
@@ -118,6 +118,8 @@ enum enetc_errata {
 	ENETC_ERR_UCMCSWP	= BIT(2),
 };
 
+#define ENETC_SI_F_QBV  (1<<0)
+
 /* PCI IEP device data */
 struct enetc_si {
 	struct pci_dev *pdev;
@@ -133,6 +135,7 @@ struct enetc_si {
 	int num_fs_entries;
 	int num_rss; /* number of RSS buckets */
 	unsigned short pad;
+	int hw_features;
 };
 
 #define ENETC_SI_ALIGN	32
@@ -173,6 +176,7 @@ struct enetc_cls_rule {
 enum enetc_active_offloads {
 	ENETC_F_RX_TSTAMP	= BIT(0),
 	ENETC_F_TX_TSTAMP	= BIT(1),
+	ENETC_F_QBV             = BIT(2),
 };
 
 struct enetc_ndev_priv {

drivers/net/ethernet/freescale/enetc/enetc.h struct enetc_ndev_priv { · line 195

Quoted 4 lines
drivers/net/ethernet/freescale/enetc/enetc.h +1 -0
@@ -188,6 +192,8 @@ struct enetc_ndev_priv {
 	u16 msg_enable;
 	int active_offloads;
 
+	u32 speed; /* store speed for compare update pspeed */

struct phy_device seems to use int for speed. Perhaps that would be a more appropriate type here, and likewise in enetc_sched_speed_set().

Quoted 53 lines
drivers/net/ethernet/freescale/enetc/enetc.h +2 -0
+
 	struct enetc_bdr *tx_ring[16];
 	struct enetc_bdr *rx_ring[16];
 
@@ -246,3 +252,4 @@ int enetc_get_rss_table(struct enetc_si *si, u32 *table, int count);
 int enetc_set_rss_table(struct enetc_si *si, const u32 *table, int count);
 int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd);
 int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data);
+void enetc_sched_speed_set(struct net_device *ndev);
drivers/net/ethernet/freescale/enetc/enetc_pf.c +3 -0
index 7da79b816416..e7482d483b28 100644
@@ -742,6 +742,9 @@ static void enetc_pf_netdev_setup(struct enetc_si *si, struct net_device *ndev,
 
 	ndev->priv_flags |= IFF_UNICAST_FLT;
 
+	if (si->hw_features & ENETC_SI_F_QBV)
+		priv->active_offloads |= ENETC_F_QBV;
+
 	/* pick up primary MAC address from SI */
 	enetc_get_primary_mac_addr(&si->hw, ndev->dev_addr);
 }
drivers/net/ethernet/freescale/enetc/enetc_qos.c +22 -0
index 036bb39c7a0b..801104dd2ba6 100644
@@ -11,6 +11,40 @@ static u16 enetc_get_max_gcl_len(struct enetc_hw *hw)
 		& ENETC_QBV_MAX_GCL_LEN_MASK;
 }
 
+void enetc_sched_speed_set(struct net_device *ndev)
+{
+	struct enetc_ndev_priv *priv = netdev_priv(ndev);
+	struct phy_device *phydev = ndev->phydev;
+	u32 old_speed = priv->speed;
+	u32 speed, pspeed;
+
+	if (phydev->speed == old_speed)
+		return;
+
+	speed = phydev->speed;
+	switch (speed) {
+	case SPEED_1000:
+		pspeed = ENETC_PMR_PSPEED_1000M;
+		break;
+	case SPEED_2500:
+		pspeed = ENETC_PMR_PSPEED_2500M;
+		break;
+	case SPEED_100:
+		pspeed = ENETC_PMR_PSPEED_100M;
+		break;
+	case SPEED_10:

drivers/net/ethernet/freescale/enetc/enetc_qos.c static u16 enetc_get_max_gcl_len(struct enetc_hw *hw) · line 45

Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c +10 -0
+	default:
+		pspeed = ENETC_PMR_PSPEED_10M;
+		netdev_err(ndev, "Qbv PSPEED set speed link down.\n");
+	}
+
+	priv->speed = speed;
+	enetc_port_wr(&priv->si->hw, ENETC_PMR,
+		      (enetc_port_rd(&priv->si->hw, ENETC_PMR)
+		      & (~ENETC_PMR_PSPEED_MASK))
+		      | pspeed);

The above two lines could be combined.

Also, the parentheses seem unnecessary.

Quoted 8 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c +2 -0
+}
+
 static int enetc_setup_taprio(struct net_device *ndev,
 			      struct tc_taprio_qopt_offload *admin_conf)
 {
Signature · 1 line
2.17.1
#20 lore raw

Re: [net-next, 2/2] enetc: update TSN Qbv PSPEED set according to adjust link speed

In reply to Po Liu
Thank you for the patch! Yet something to improve:

Hi Po,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on net-next/master]
[also build test ERROR on v5.4-rc7 next-20191111]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]

url:    https://github.com/0day-ci/linux/commits/Po-Liu/enetc-Configure-the-Time-Aware-Scheduler-via-tc-taprio-offload/20191112-193235
base:   https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git ca22d6977b9b4ab0fd2e7909b57e32ba5b95046f
config: i386-allmodconfig (attached as .config)
compiler: gcc-7 (Debian 7.4.0-14) 7.4.0
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386 

If you fix the issue, kindly add following tag

All errors (new ones prefixed by >>):

>> ERROR: "enetc_sched_speed_set" [drivers/net/ethernet/freescale/enetc/fsl-enetc-vf.ko] undefined!

ERROR: "enetc_setup_tc_taprio" [drivers/net/ethernet/freescale/enetc/fsl-enetc-vf.ko] undefined!

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org Intel Corporation

#21 lore raw
In reply to Po Liu

From: Po Liu <[email protected]>
Date: Mon, 11 Nov 2019 04:41:26 +0000

Quoted 1 line

+fsl-enetc-$(CONFIG_NET_SCH_TAPRIO) += enetc_qos.o

Code is Kconfig guarded.

drivers/net/ethernet/freescale/enetc/enetc.c int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type, · line 1489

Quoted 2 lines
drivers/net/ethernet/freescale/enetc/enetc.c +2 -0
+	case TC_SETUP_QDISC_TAPRIO:
+		return enetc_setup_tc_taprio(ndev, type_data);

Yet invoked unconditionally.

I can see just by reading your code that various configurations will result in link errors.

...

Quoted 16 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +13 -0
+int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data)
+{
+	struct tc_taprio_qopt_offload *taprio = type_data;
+	struct enetc_ndev_priv *priv = netdev_priv(ndev);
+	int i;
+
+	for (i = 0; i < priv->num_tx_rings; i++)
+		enetc_set_bdr_prio(&priv->si->hw,
+				   priv->tx_ring[i]->index,
+				   taprio->enable ? i : 0);
+
+	return enetc_setup_taprio(ndev, taprio);
+}
Signature · 1 line
2.17.1
author
#22 lore raw

Hi David,

Br,
Po Liu

Quoted 21 lines

-----Original Message-----
From: David Miller <[email protected]>
Sent: 2019年11月12日 13:51
To: Po Liu <[email protected]>
Cc: Claudiu Manoil <[email protected]>; [email protected]; [email protected]; [email protected]; Vladimir Oltean <[email protected]>; Alexandru Marginean <[email protected]>; Xiaoliang Yang <[email protected]>; Roy Zang <[email protected]>; Mingkai Hu <[email protected]>; Jerry Huang <[email protected]>; Leo Li <[email protected]>
Subject: [EXT] Re: [net-next, 1/2] enetc: Configure the Time-Aware Scheduler via tc-taprio offload

Caution: EXT Email

From: Po Liu <[email protected]>
Date: Mon, 11 Nov 2019 04:41:26 +0000

Quoted 1 line

+fsl-enetc-$(CONFIG_NET_SCH_TAPRIO) += enetc_qos.o

Quoted 8 lines

Code is Kconfig guarded.

drivers/net/ethernet/freescale/enetc/enetc.c int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type, · line 1489

Quoted 2 lines
drivers/net/ethernet/freescale/enetc/enetc.c +2 -0
+     case TC_SETUP_QDISC_TAPRIO:
+             return enetc_setup_tc_taprio(ndev, type_data);

Yet invoked unconditionally.

I can see just by reading your code that various configurations will result in link errors.

I get it. Thanks!

Quoted 16 lines

...

Quoted 14 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +11 -1
+int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data) {
+     struct tc_taprio_qopt_offload *taprio = type_data;
+     struct enetc_ndev_priv *priv = netdev_priv(ndev);
+     int i;
+
+     for (i = 0; i < priv->num_tx_rings; i++)
+             enetc_set_bdr_prio(&priv->si->hw,
+                                priv->tx_ring[i]->index,
+                                taprio->enable ? i : 0);
+
+     return enetc_setup_taprio(ndev, taprio); }
--

2.17.1

#23 lore raw
In reply to Po Liu
Quoted 121 lines · Po Liu

ENETC supports in hardware for time-based egress shaping according to IEEE 802.1Qbv. This patch implement the Qbv enablement by the hardware offload method qdisc tc-taprio method.
Also update cbdr writeback to up level since control bd ring may writeback data to control bd ring.

---
 drivers/net/ethernet/freescale/enetc/Makefile |   1 +
 drivers/net/ethernet/freescale/enetc/enetc.c  |  19 ++-
 drivers/net/ethernet/freescale/enetc/enetc.h  |   2 +
 .../net/ethernet/freescale/enetc/enetc_cbdr.c |   5 +-
 .../net/ethernet/freescale/enetc/enetc_hw.h   | 150 ++++++++++++++++--
 .../net/ethernet/freescale/enetc/enetc_qos.c  | 130 +++++++++++++++
 6 files changed, 285 insertions(+), 22 deletions(-)
 create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_qos.c
drivers/net/ethernet/freescale/enetc/Makefile +1 -0
index d200c27c3bf6..389f722efc43 100644
@@ -5,6 +5,7 @@ common-objs := enetc.o enetc_cbdr.o enetc_ethtool.o
 obj-$(CONFIG_FSL_ENETC) += fsl-enetc.o
 fsl-enetc-y := enetc_pf.o enetc_mdio.o $(common-objs)
 fsl-enetc-$(CONFIG_PCI_IOV) += enetc_msg.o
+fsl-enetc-$(CONFIG_NET_SCH_TAPRIO) += enetc_qos.o
 
 obj-$(CONFIG_FSL_ENETC_VF) += fsl-enetc-vf.o
 fsl-enetc-vf-y := enetc_vf.o $(common-objs)
drivers/net/ethernet/freescale/enetc/enetc.c +14 -5
index 3e8f9819f08c..d58dbc2c4270 100644
@@ -1427,8 +1427,7 @@ int enetc_close(struct net_device *ndev)
 	return 0;
 }
 
-int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
-		   void *type_data)
+int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data)
 {
 	struct enetc_ndev_priv *priv = netdev_priv(ndev);
 	struct tc_mqprio_qopt *mqprio = type_data;
@@ -1436,9 +1435,6 @@ int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
 	u8 num_tc;
 	int i;
 
-	if (type != TC_SETUP_QDISC_MQPRIO)
-		return -EOPNOTSUPP;
-
 	mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;
 	num_tc = mqprio->num_tc;
 
@@ -1483,6 +1479,19 @@ int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
 	return 0;
 }
 
+int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
+		   void *type_data)
+{
+	switch (type) {
+	case TC_SETUP_QDISC_MQPRIO:
+		return enetc_setup_tc_mqprio(ndev, type_data);
+	case TC_SETUP_QDISC_TAPRIO:
+		return enetc_setup_tc_taprio(ndev, type_data);
+	default:
+		return -EOPNOTSUPP;
+	}
+}
+
 struct net_device_stats *enetc_get_stats(struct net_device *ndev)
 {
 	struct enetc_ndev_priv *priv = netdev_priv(ndev);
drivers/net/ethernet/freescale/enetc/enetc.h +2 -0
index 541b4e2073fe..8676631041d5 100644
@@ -244,3 +244,5 @@ int enetc_set_fs_entry(struct enetc_si *si, struct enetc_cmd_rfse *rfse,
 void enetc_set_rss_key(struct enetc_hw *hw, const u8 *bytes);
 int enetc_get_rss_table(struct enetc_si *si, u32 *table, int count);
 int enetc_set_rss_table(struct enetc_si *si, const u32 *table, int count);
+int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd);
+int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data);
drivers/net/ethernet/freescale/enetc/enetc_cbdr.c +4 -1
index de466b71bf8f..201cbc362e33 100644
@@ -32,7 +32,7 @@ static int enetc_cbd_unused(struct enetc_cbdr *r)
 		r->bd_count;
 }
 
-static int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
+int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
 {
 	struct enetc_cbdr *ring = &si->cbd_ring;
 	int timeout = ENETC_CBDR_TIMEOUT;
@@ -66,6 +66,9 @@ static int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
 	if (!timeout)
 		return -EBUSY;
 
+	/* CBD may writeback data, feedback up level */
+	*cbd = *dest_cbd;
+
 	enetc_clean_cbdr(si);
 
 	return 0;
drivers/net/ethernet/freescale/enetc/enetc_hw.h +1 -0
index 88276299f447..75a7c0f1f8ce 100644
@@ -18,6 +18,7 @@
 #define ENETC_SICTR0	0x18
 #define ENETC_SICTR1	0x1c
 #define ENETC_SIPCAPR0	0x20
+#define ENETC_SIPCAPR0_QBV	BIT(4)
 #define ENETC_SIPCAPR0_RSS	BIT(8)
 #define ENETC_SIPCAPR1	0x24
 #define ENETC_SITGTGR	0x30

drivers/net/ethernet/freescale/enetc/enetc_hw.h enum enetc_bdr_type {TX, RX}; · line 156

Quoted 8 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +5 -0
@@ -148,6 +149,12 @@ enum enetc_bdr_type {TX, RX};
 #define ENETC_PORT_BASE		0x10000
 #define ENETC_PMR		0x0000
 #define ENETC_PMR_EN	GENMASK(18, 16)
+#define ENETC_PMR_PSPEED_MASK GENMASK(11, 8)
+#define ENETC_PMR_PSPEED_10M 0x000
+#define ENETC_PMR_PSPEED_100M 0x100
+#define ENETC_PMR_PSPEED_1000M 0x200
+#define ENETC_PMR_PSPEED_2500M 0x400

Perhaps BIT() is appropriate here.

The changes above to enetc_hw.h are not used until the following patch, perhaps it would be better if they were part of that patch.

Quoted 42 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +12 -16
+
 #define ENETC_PSR		0x0004 /* RO */
 #define ENETC_PSIPMR		0x0018
 #define ENETC_PSIPMR_SET_UP(n)	BIT(n) /* n = SI index */
@@ -440,22 +447,6 @@ union enetc_rx_bd {
 #define EMETC_MAC_ADDR_FILT_RES	3 /* # of reserved entries at the beginning */
 #define ENETC_MAX_NUM_VFS	2
 
-struct enetc_cbd {
-	union {
-		struct {
-			__le32 addr[2];
-			__le32 opt[4];
-		};
-		__le32 data[6];
-	};
-	__le16 index;
-	__le16 length;
-	u8 cmd;
-	u8 cls;
-	u8 _res;
-	u8 status_flags;
-};
-
 #define ENETC_CBD_FLAGS_SF	BIT(7) /* short format */
 #define ENETC_CBD_STATUS_MASK	0xf
 
@@ -554,3 +545,130 @@ static inline void enetc_set_bdr_prio(struct enetc_hw *hw, int bdr_idx,
 	val |= ENETC_TBMR_SET_PRIO(prio);
 	enetc_txbdr_wr(hw, bdr_idx, ENETC_TBMR, val);
 }
+
+enum bdcr_cmd_class {
+	BDCR_CMD_UNSPEC = 0,
+	BDCR_CMD_MAC_FILTER,
+	BDCR_CMD_VLAN_FILTER,
+	BDCR_CMD_RSS,
+	BDCR_CMD_RFS,
+	BDCR_CMD_PORT_GCL,
+	BDCR_CMD_RECV_CLASSIFIER,
+	__BDCR_CMD_MAX_LEN,
+	BDCR_CMD_MAX_LEN = __BDCR_CMD_MAX_LEN - 1,

drivers/net/ethernet/freescale/enetc/enetc_hw.h static inline void enetc_set_bdr_prio(struct enetc_hw *hw, int bdr_idx, · line 568

Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +10 -0
+};
+
+/* class 5, command 0 */
+struct tgs_gcl_conf {
+	u8	atc;	/* init gate value */
+	u8	res[7];
+	union {
+		struct {
+			u8	res1[4];
+			__le16	acl_len;

Given that u* types are used in this structure I think le16 would be more appropriate than __le16.

drivers/net/ethernet/freescale/enetc/enetc_hw.h static inline void enetc_set_bdr_prio(struct enetc_hw *hw, int bdr_idx, · line 574

Quoted 6 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +6 -0
+			u8	res2[2];
+		};
+		struct {
+			u32 cctl;
+			u32 ccth;
+		};

I'm a little surprised to see host endian values in a structure that appears to be written to hardware. Is this intentional?

Also, these fields do not seem to be used in this patch-set. Is that also intentional?

drivers/net/ethernet/freescale/enetc/enetc_hw.h static inline void enetc_set_bdr_prio(struct enetc_hw *hw, int bdr_idx, · line 581

Quoted 7 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +7 -0
+	};
+};
+
+#define ENETC_CBDR_SGL_IOMEN	BIT(0)
+#define ENETC_CBDR_SGL_IPVEN	BIT(3)
+#define ENETC_CBDR_SGL_GTST	BIT(4)
+#define ENETC_CBDR_SGL_IPV_MASK 0xe

Perhaps GENMASK() is appropriate here and elsewhere for generating masks.

drivers/net/ethernet/freescale/enetc/enetc_hw.h static inline void enetc_set_bdr_prio(struct enetc_hw *hw, int bdr_idx, · line 585

Quoted 4 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +4 -0
+
+/* gate control list entry */
+struct gce {
+	u32	period;

Likewise, I'm a little surprised to see host-byte order data to be written to HW. And below too. Though as I've noted below, some of these values are used to store le32 data, so it seems that the types are incorrect.

Quoted 13 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +13 -0
+	u8	gate;
+	u8	res[3];
+};
+
+/* tgs_gcl_conf address point to this data space */
+struct tgs_gcl_data {
+	u32	btl;
+	u32	bth;
+	u32	ct;
+	u32	cte;
+};
+
+/* class 5, command 1 */

drivers/net/ethernet/freescale/enetc/enetc_hw.h static inline void enetc_set_bdr_prio(struct enetc_hw *hw, int bdr_idx, · line 608

Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +10 -0
+struct tgs_gcl_query {
+		u8	res[12];
+		union {
+			struct {
+				__le16	acl_len; /* admin list length */
+				__le16	ocl_len; /* operation list length */
+			};
+			struct {
+				u16 admin_list_len;
+				u16 oper_list_len;

Again, is it intentional that these are a) host-byte order and
b) unused?

Quoted 9 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +9 -0
+			};
+		};
+};
+
+/* tgs_gcl_query command response data format */
+struct tgs_gcl_resp {
+	u32 abtl;	/* base time */
+	u32 abth;
+	u32 act;	/* cycle time */

drivers/net/ethernet/freescale/enetc/enetc_hw.h static inline void enetc_set_bdr_prio(struct enetc_hw *hw, int bdr_idx, · line 627

Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +10 -0
+	u32 acte;	/* cycle time extend */
+	u32 cctl;	/* config change time */
+	u32 ccth;
+	u32 obtl;	/* operation base time */
+	u32 obth;
+	u32 oct;	/* operation cycle time */
+	u32 octe;	/* operation cycle time extend */
+	u32 ccel;	/* config change error */
+	u32 cceh;
+};

This structure seems unused in this patchset.

Quoted 78 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +47 -0
+
+struct enetc_cbd {
+	union{
+		struct {
+			__le32	addr[2];
+			union {
+				__le32	opt[4];
+				struct tgs_gcl_conf	gcl_conf;
+				struct tgs_gcl_query	gcl_query;
+			};
+		};	/* Long format */
+		__le32 data[6];
+	};
+	__le16 index;
+	__le16 length;
+	u8 cmd;
+	u8 cls;
+	u8 _res;
+	u8 status_flags;
+};
+
+#define ENETC_PTCFPR(n)		(0x1910 + (n) * 4) /* n = [0 ..7] */
+#define ENETC_FPE		BIT(31)
+
+/* Port capability register 0 */
+#define ENETC_PCAPR0_PSFPM	BIT(10)
+#define ENETC_PCAPR0_PSFP	BIT(9)
+#define ENETC_PCAPR0_TSN	BIT(4)
+#define ENETC_PCAPR0_QBU	BIT(3)
+
+/* port time gating control register */
+#define ENETC_QBV_PTGCR_OFFSET		0x11a00
+#define ENETC_QBV_TGE			0x80000000
+#define ENETC_QBV_TGPE			BIT(30)
+#define ENETC_QBV_TGDROP_DISABLE	BIT(29)
+
+/* Port time gating capability register */
+#define ENETC_QBV_PTGCAPR_OFFSET	0x11a08
+#define ENETC_QBV_MAX_GCL_LEN_MASK	0xffff
+
+/* Port time gating admin gate list status register */
+#define ENETC_QBV_PTGAGLSR_OFFSET	0x11a10
+#define ENETC_QBV_CFG_PEND_MASK	0x00000002
+
+#define ENETC_TGLSTR			0xa200
+#define ENETC_TGS_MIN_DIS_MASK		0x80000000
+#define ENETC_MIN_LOOKAHEAD_MASK	0xffff
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +25 -0
new file mode 100644
index 000000000000..036bb39c7a0b
@@ -0,0 +1,130 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+/* Copyright 2019 NXP */
+
+#include "enetc.h"
+
+#include <net/pkt_sched.h>
+
+static u16 enetc_get_max_gcl_len(struct enetc_hw *hw)
+{
+	return enetc_rd(hw, ENETC_QBV_PTGCAPR_OFFSET)
+		& ENETC_QBV_MAX_GCL_LEN_MASK;
+}
+
+static int enetc_setup_taprio(struct net_device *ndev,
+			      struct tc_taprio_qopt_offload *admin_conf)
+{
+	struct enetc_ndev_priv *priv = netdev_priv(ndev);
+	struct enetc_cbd cbd = {.cmd = 0};
+	struct tgs_gcl_conf *gcl_config;
+	struct tgs_gcl_data *gcl_data;
+	struct gce *gce;
+	dma_addr_t dma;
+	u16 data_size;
+	u16 gcl_len;
+	u32 temp;

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 35

Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +10 -0
+	int i;
+
+	gcl_len = admin_conf->num_entries;
+	if (gcl_len > enetc_get_max_gcl_len(&priv->si->hw))
+		return -EINVAL;
+
+	if (admin_conf->enable) {
+		enetc_wr(&priv->si->hw,
+			 ENETC_QBV_PTGCR_OFFSET,
+			 temp & (~ENETC_QBV_TGE));

The enetc_wr() call seems to be common to both arms of the condition. If so perhaps it could be move outside of the condition.

Quoted 7 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +7 -0
+		usleep_range(10, 20);
+		enetc_wr(&priv->si->hw,
+			 ENETC_QBV_PTGCR_OFFSET,
+			 temp | ENETC_QBV_TGE);
+	} else {
+		enetc_wr(&priv->si->hw,
+			 ENETC_QBV_PTGCR_OFFSET,

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 52

Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +10 -0
+			 temp & (~ENETC_QBV_TGE));
+		return 0;
+	}
+
+	/* Configure the (administrative) gate control list using the
+	 * control BD descriptor.
+	 */
+	gcl_config = &cbd.gcl_conf;
+
+	data_size = sizeof(struct tgs_gcl_data) + gcl_len * sizeof(struct gce);

I think struct_size() can be used here.

Quoted 13 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +13 -0
+
+	gcl_data = kzalloc(data_size, __GFP_DMA | GFP_KERNEL);
+	if (!gcl_data)
+		return -ENOMEM;
+
+	gce = (struct gce *)(gcl_data + 1);
+
+	/* Since no initial state config in taprio, set gates open as default.
+	 */
+	gcl_config->atc = 0xff;
+	gcl_config->acl_len = cpu_to_le16(gcl_len);
+
+	if (!admin_conf->base_time) {

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 75

Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +10 -0
+		gcl_data->btl =
+			cpu_to_le32(enetc_rd(&priv->si->hw, ENETC_SICTR0));
+		gcl_data->bth =
+			cpu_to_le32(enetc_rd(&priv->si->hw, ENETC_SICTR1));
+	} else {
+		gcl_data->btl =
+			cpu_to_le32(lower_32_bits(admin_conf->base_time));
+		gcl_data->bth =
+			cpu_to_le32(upper_32_bits(admin_conf->base_time));
+	}

It looks like the types of the btl and bth fields are u32. Perhaps they should be le32?

Please consider running sparse over this code to check for any endian problems.

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 86

Quoted 11 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +11 -0
+
+	gcl_data->ct = cpu_to_le32(admin_conf->cycle_time);
+	gcl_data->cte = cpu_to_le32(admin_conf->cycle_time_extension);
+
+	for (i = 0; i < gcl_len; i++) {
+		struct tc_taprio_sched_entry *temp_entry;
+		struct gce *temp_gce = gce + i;
+
+		temp_entry = &admin_conf->entries[i];
+
+		temp_gce->gate = cpu_to_le32(temp_entry->gate_mask);

Gate is a u8 followed by 3 reserved bytes. Perhaps there needs to be some bounds checking on the value stored there given that the source is 32bits wide.

Also, its not clear to me that the above logic, which I assume takes the last significant byte of a 32bit value, works on big endian systems as the 32bit value is always little endian.

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 87

Quoted 1 line
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +1 -0
+		temp_gce->period = cpu_to_le32(temp_entry->interval);

It looks like the types of the gate field is u32. Perhaps it should be le32?

Quoted 46 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +43 -0
+	}
+
+	cbd.length = cpu_to_le16(data_size);
+	cbd.status_flags = 0;
+
+	dma = dma_map_single(&priv->si->pdev->dev, gcl_data,
+			     data_size, DMA_TO_DEVICE);
+	if (dma_mapping_error(&priv->si->pdev->dev, dma)) {
+		netdev_err(priv->si->ndev, "DMA mapping failed!\n");
+		kfree(gcl_data);
+		return -ENOMEM;
+	}
+
+	cbd.addr[0] = lower_32_bits(dma);
+	cbd.addr[1] = upper_32_bits(dma);
+	cbd.cls = BDCR_CMD_PORT_GCL;
+
+	/* Updated by ENETC on completion of the configuration
+	 * command. A zero value indicates success.
+	 */
+	cbd.status_flags = 0;
+
+	enetc_send_cmd(priv->si, &cbd);
+
+	dma_unmap_single(&priv->si->pdev->dev, dma, data_size, DMA_TO_DEVICE);
+	kfree(gcl_data);
+
+	return 0;
+}
+
+int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data)
+{
+	struct tc_taprio_qopt_offload *taprio = type_data;
+	struct enetc_ndev_priv *priv = netdev_priv(ndev);
+	int i;
+
+	for (i = 0; i < priv->num_tx_rings; i++)
+		enetc_set_bdr_prio(&priv->si->hw,
+				   priv->tx_ring[i]->index,
+				   taprio->enable ? i : 0);
+
+	return enetc_setup_taprio(ndev, taprio);
+}
Signature · 1 line
2.17.1
author
#24 lore raw

Br,
Po Liu

Quoted 150 lines

-----Original Message-----
From: Simon Horman <[email protected]>
Sent: 2019年11月12日 17:41
To: Po Liu <[email protected]>
Cc: Claudiu Manoil <[email protected]>; [email protected]; linux- [email protected]; [email protected]; [email protected]; Vladimir Oltean <[email protected]>; Alexandru Marginean <[email protected]>; Xiaoliang Yang <[email protected]>; Roy Zang <[email protected]>; Mingkai Hu <[email protected]>; Jerry Huang <[email protected]>; Leo Li <[email protected]>
Subject: [EXT] Re: [net-next, 1/2] enetc: Configure the Time-Aware Scheduler via tc-taprio offload

Caution: EXT Email

drivers/net/ethernet/freescale/enetc/enetc.c int enetc_setup_tc(struct net_device *ndev,

Quoted 58 lines · Po Liu

ENETC supports in hardware for time-based egress shaping according to IEEE 802.1Qbv. This patch implement the Qbv enablement by the hardware offload method qdisc tc-taprio method.
Also update cbdr writeback to up level since control bd ring may writeback data to control bd ring.

---
 drivers/net/ethernet/freescale/enetc/Makefile |   1 +
 drivers/net/ethernet/freescale/enetc/enetc.c  |  19 ++-
 drivers/net/ethernet/freescale/enetc/enetc.h  |   2 +
 .../net/ethernet/freescale/enetc/enetc_cbdr.c |   5 +-
 .../net/ethernet/freescale/enetc/enetc_hw.h   | 150 ++++++++++++++++--
 .../net/ethernet/freescale/enetc/enetc_qos.c  | 130 +++++++++++++++
 6 files changed, 285 insertions(+), 22 deletions(-)  create mode

100644 drivers/net/ethernet/freescale/enetc/enetc_qos.c

drivers/net/ethernet/freescale/enetc/Makefile +1 -0
index d200c27c3bf6..389f722efc43 100644
@@ -5,6 +5,7 @@ common-objs := enetc.o enetc_cbdr.o enetc_ethtool.o
 obj-$(CONFIG_FSL_ENETC) += fsl-enetc.o  fsl-enetc-y := enetc_pf.o
 enetc_mdio.o $(common-objs)
 fsl-enetc-$(CONFIG_PCI_IOV) += enetc_msg.o
+fsl-enetc-$(CONFIG_NET_SCH_TAPRIO) += enetc_qos.o
 
 obj-$(CONFIG_FSL_ENETC_VF) += fsl-enetc-vf.o  fsl-enetc-vf-y :=

enetc_vf.o $(common-objs) diff --git
a/drivers/net/ethernet/freescale/enetc/enetc.c
b/drivers/net/ethernet/freescale/enetc/enetc.c
index 3e8f9819f08c..d58dbc2c4270 100644

drivers/net/ethernet/freescale/enetc/enetc.c +1 -2
@@ -1427,8 +1427,7 @@ int enetc_close(struct net_device *ndev)
      return 0;
 }
 
-int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
-                void *type_data)
+int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data)
 {
      struct enetc_ndev_priv *priv = netdev_priv(ndev);
      struct tc_mqprio_qopt *mqprio = type_data; @@ -1436,9 +1435,6 @@

int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,

      u8 num_tc;
      int i;
drivers/net/ethernet/freescale/enetc/enetc.c +0 -3
-     if (type != TC_SETUP_QDISC_MQPRIO)
-             return -EOPNOTSUPP;
-
      mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;
      num_tc = mqprio->num_tc;
@@ -1483,6 +1479,19 @@ int enetc_setup_tc(struct net_device *ndev,

enum tc_setup_type type,

Quoted 68 lines
drivers/net/ethernet/freescale/enetc/enetc.c +13 -0
      return 0;
 }
 
+int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
+                void *type_data)
+{
+     switch (type) {
+     case TC_SETUP_QDISC_MQPRIO:
+             return enetc_setup_tc_mqprio(ndev, type_data);
+     case TC_SETUP_QDISC_TAPRIO:
+             return enetc_setup_tc_taprio(ndev, type_data);
+     default:
+             return -EOPNOTSUPP;
+     }
+}
+
 struct net_device_stats *enetc_get_stats(struct net_device *ndev)  {
      struct enetc_ndev_priv *priv = netdev_priv(ndev); diff --git

a/drivers/net/ethernet/freescale/enetc/enetc.h
b/drivers/net/ethernet/freescale/enetc/enetc.h
index 541b4e2073fe..8676631041d5 100644

drivers/net/ethernet/freescale/enetc/enetc.h +0 -0
@@ -244,3 +244,5 @@ int enetc_set_fs_entry(struct enetc_si *si, struct
 enetc_cmd_rfse *rfse,  void enetc_set_rss_key(struct enetc_hw *hw,

const u8 *bytes); int enetc_get_rss_table(struct enetc_si *si, u32 *table, int count); int enetc_set_rss_table(struct enetc_si *si, const u32 *table, int count);

drivers/net/ethernet/freescale/enetc/enetc.h +2 -0
+int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd); int
+enetc_setup_tc_taprio(struct net_device *ndev, void *type_data);
drivers/net/ethernet/freescale/enetc/enetc_cbdr.c +1 -1
index de466b71bf8f..201cbc362e33 100644
@@ -32,7 +32,7 @@ static int enetc_cbd_unused(struct enetc_cbdr *r)
              r->bd_count;
 }
 
-static int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
+int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
 {
      struct enetc_cbdr *ring = &si->cbd_ring;
      int timeout = ENETC_CBDR_TIMEOUT; @@ -66,6 +66,9 @@ static int

enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)

      if (!timeout)
              return -EBUSY;
drivers/net/ethernet/freescale/enetc/enetc_cbdr.c +3 -0
+     /* CBD may writeback data, feedback up level */
+     *cbd = *dest_cbd;
+
      enetc_clean_cbdr(si);
 
      return 0;
drivers/net/ethernet/freescale/enetc/enetc_hw.h +1 -0
index 88276299f447..75a7c0f1f8ce 100644
@@ -18,6 +18,7 @@
 #define ENETC_SICTR0 0x18
 #define ENETC_SICTR1 0x1c
 #define ENETC_SIPCAPR0       0x20
+#define ENETC_SIPCAPR0_QBV   BIT(4)
 #define ENETC_SIPCAPR0_RSS   BIT(8)
 #define ENETC_SIPCAPR1       0x24
 #define ENETC_SITGTGR        0x30

drivers/net/ethernet/freescale/enetc/enetc_hw.h enum enetc_bdr_type {TX, RX}; · line 153

Quoted 5 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +2 -0
@@ -148,6 +149,12 @@ enum enetc_bdr_type {TX, RX};
 #define ENETC_PORT_BASE              0x10000
 #define ENETC_PMR            0x0000
 #define ENETC_PMR_EN GENMASK(18, 16)
+#define ENETC_PMR_PSPEED_MASK GENMASK(11, 8) #define
+ENETC_PMR_PSPEED_10M 0x000 #define ENETC_PMR_PSPEED_100M

0x100

Quoted 5 lines

drivers/net/ethernet/freescale/enetc/enetc_hw.h enum enetc_bdr_type {TX, RX}; · line 154

Quoted 1 line
drivers/net/ethernet/freescale/enetc/enetc_hw.h +1 -0
+#define ENETC_PMR_PSPEED_1000M 0x200 #define

ENETC_PMR_PSPEED_2500M

drivers/net/ethernet/freescale/enetc/enetc_hw.h enum enetc_bdr_type {TX, RX}; · line 155

Quoted 1 line
drivers/net/ethernet/freescale/enetc/enetc_hw.h +1 -0
+0x400

Perhaps BIT() is appropriate here.

Will change to BIT().

Quoted 4 lines

The changes above to enetc_hw.h are not used until the following patch, perhaps it would be better if they were part of that patch.

Yes, better to move to patch 2/2.

Quoted 47 lines

drivers/net/ethernet/freescale/enetc/enetc_hw.h union enetc_rx_bd { · line 447

Quoted 6 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +1 -0
+
 #define ENETC_PSR            0x0004 /* RO */
 #define ENETC_PSIPMR         0x0018
 #define ENETC_PSIPMR_SET_UP(n)       BIT(n) /* n = SI index */
@@ -440,22 +447,6 @@ union enetc_rx_bd {
 #define EMETC_MAC_ADDR_FILT_RES      3 /* # of reserved entries at the

beginning */

drivers/net/ethernet/freescale/enetc/enetc_hw.h static inline void enetc_set_bdr_prio(struct

Quoted 22 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +0 -16
 #define ENETC_MAX_NUM_VFS    2
 
-struct enetc_cbd {
-     union {
-             struct {
-                     __le32 addr[2];
-                     __le32 opt[4];
-             };
-             __le32 data[6];
-     };
-     __le16 index;
-     __le16 length;
-     u8 cmd;
-     u8 cls;
-     u8 _res;
-     u8 status_flags;
-};
-
 #define ENETC_CBD_FLAGS_SF   BIT(7) /* short format */
 #define ENETC_CBD_STATUS_MASK        0xf
 
@@ -554,3 +545,130 @@ static inline void enetc_set_bdr_prio(struct

enetc_hw *hw, int bdr_idx,

Quoted 17 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +15 -0
      val |= ENETC_TBMR_SET_PRIO(prio);
      enetc_txbdr_wr(hw, bdr_idx, ENETC_TBMR, val);  }
+
+enum bdcr_cmd_class {
+     BDCR_CMD_UNSPEC = 0,
+     BDCR_CMD_MAC_FILTER,
+     BDCR_CMD_VLAN_FILTER,
+     BDCR_CMD_RSS,
+     BDCR_CMD_RFS,
+     BDCR_CMD_PORT_GCL,
+     BDCR_CMD_RECV_CLASSIFIER,
+     __BDCR_CMD_MAX_LEN,
+     BDCR_CMD_MAX_LEN = __BDCR_CMD_MAX_LEN - 1, };
+
+/* class 5, command 0 */
+struct tgs_gcl_conf {
+     u8      atc;    /* init gate value */
Quoted 8 lines

drivers/net/ethernet/freescale/enetc/enetc_hw.h static inline void enetc_set_bdr_prio(struct enetc_hw *hw, int bdr_idx, · line 568

Quoted 5 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +5 -0
+     u8      res[7];
+     union {
+             struct {
+                     u8      res1[4];
+                     __le16  acl_len;

Given that u* types are used in this structure I think le16 would be more appropriate than __le16.

Here keep the same code style of this .h file. I think it is better to have another patch to fix them all. Do you agree?

Quoted 10 lines

drivers/net/ethernet/freescale/enetc/enetc_hw.h static inline void enetc_set_bdr_prio(struct enetc_hw *hw, int bdr_idx, · line 574

Quoted 7 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +6 -0
+                     u8      res2[2];
+             };
+             struct {
+                     u32 cctl;
+                     u32 ccth;
+             };

I'm a little surprised to see host endian values in a structure that appears to be written to hardware. Is this intentional?

Will remove.

Quoted 3 lines

Also, these fields do not seem to be used in this patch-set. Is that also intentional?

This is defined hardware writeback value, can be remove temporary.

Quoted 11 lines

drivers/net/ethernet/freescale/enetc/enetc_hw.h static inline void enetc_set_bdr_prio(struct enetc_hw *hw, int bdr_idx, · line 581

Quoted 8 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +7 -0
+     };
+};
+
+#define ENETC_CBDR_SGL_IOMEN BIT(0)
+#define ENETC_CBDR_SGL_IPVEN BIT(3)
+#define ENETC_CBDR_SGL_GTST  BIT(4)
+#define ENETC_CBDR_SGL_IPV_MASK 0xe

Perhaps GENMASK() is appropriate here and elsewhere for generating masks.

Will remove these define in this patch.

Quoted 8 lines

drivers/net/ethernet/freescale/enetc/enetc_hw.h static inline void enetc_set_bdr_prio(struct enetc_hw *hw, int bdr_idx, · line 585

Quoted 4 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +4 -0
+
+/* gate control list entry */
+struct gce {
+     u32     period;

Likewise, I'm a little surprised to see host-byte order data to be written to HW. And below too. Though as I've noted below, some of these values are used to store le32 data, so it seems that the types are incorrect

Ok. change to le32.

Quoted 13 lines

drivers/net/ethernet/freescale/enetc/enetc_hw.h static inline void enetc_set_bdr_prio(struct enetc_hw *hw, int bdr_idx, · line 597

Quoted 13 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +12 -0
+     u8      gate;
+     u8      res[3];
+};
+
+/* tgs_gcl_conf address point to this data space */ struct
+tgs_gcl_data {
+     u32     btl;
+     u32     bth;
+     u32     ct;
+     u32     cte;
+};
+

Ok. change to le32.

Quoted 6 lines
Quoted 6 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +6 -0
+/* class 5, command 1 */
+struct tgs_gcl_query {
+             u8      res[12];
+             union {
+                     struct {
+                             __le16  acl_len; /* admin list length */
Quoted 8 lines

drivers/net/ethernet/freescale/enetc/enetc_hw.h static inline void enetc_set_bdr_prio(struct enetc_hw *hw, int bdr_idx, · line 608

Quoted 5 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +5 -0
+                             __le16  ocl_len; /* operation list length */
+                     };
+                     struct {
+                             u16 admin_list_len;
+                             u16 oper_list_len;

Again, is it intentional that these are a) host-byte order and
b) unused?

Ok. Can be remove temporary.

Quoted 14 lines
Quoted 14 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +13 -0
+                     };
+             };
+};
+
+/* tgs_gcl_query command response data format */ struct tgs_gcl_resp
+{
+     u32 abtl;       /* base time */
+     u32 abth;
+     u32 act;        /* cycle time */
+     u32 acte;       /* cycle time extend */
+     u32 cctl;       /* config change time */
+     u32 ccth;
+     u32 obtl;       /* operation base time */
Quoted 8 lines

drivers/net/ethernet/freescale/enetc/enetc_hw.h static inline void enetc_set_bdr_prio(struct enetc_hw *hw, int bdr_idx, · line 627

Quoted 6 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +6 -0
+     u32 obth;
+     u32 oct;        /* operation cycle time */
+     u32 octe;       /* operation cycle time extend */
+     u32 ccel;       /* config change error */
+     u32 cceh;
+};

This structure seems unused in this patchset.

Will remove.

Quoted 83 lines
Quoted 83 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +47 -0
+
+struct enetc_cbd {
+     union{
+             struct {
+                     __le32  addr[2];
+                     union {
+                             __le32  opt[4];
+                             struct tgs_gcl_conf     gcl_conf;
+                             struct tgs_gcl_query    gcl_query;
+                     };
+             };      /* Long format */
+             __le32 data[6];
+     };
+     __le16 index;
+     __le16 length;
+     u8 cmd;
+     u8 cls;
+     u8 _res;
+     u8 status_flags;
+};
+
+#define ENETC_PTCFPR(n)              (0x1910 + (n) * 4) /* n = [0 ..7] */
+#define ENETC_FPE            BIT(31)
+
+/* Port capability register 0 */
+#define ENETC_PCAPR0_PSFPM   BIT(10)
+#define ENETC_PCAPR0_PSFP    BIT(9)
+#define ENETC_PCAPR0_TSN     BIT(4)
+#define ENETC_PCAPR0_QBU     BIT(3)
+
+/* port time gating control register */
+#define ENETC_QBV_PTGCR_OFFSET               0x11a00
+#define ENETC_QBV_TGE                        0x80000000
+#define ENETC_QBV_TGPE                       BIT(30)
+#define ENETC_QBV_TGDROP_DISABLE     BIT(29)
+
+/* Port time gating capability register */
+#define ENETC_QBV_PTGCAPR_OFFSET     0x11a08
+#define ENETC_QBV_MAX_GCL_LEN_MASK   0xffff
+
+/* Port time gating admin gate list status register */
+#define ENETC_QBV_PTGAGLSR_OFFSET    0x11a10
+#define ENETC_QBV_CFG_PEND_MASK      0x00000002
+
+#define ENETC_TGLSTR                 0xa200
+#define ENETC_TGS_MIN_DIS_MASK               0x80000000
+#define ENETC_MIN_LOOKAHEAD_MASK     0xffff
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +28 -0
new file mode 100644
index 000000000000..036bb39c7a0b
@@ -0,0 +1,130 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+/* Copyright 2019 NXP */
+
+#include "enetc.h"
+
+#include <net/pkt_sched.h>
+
+static u16 enetc_get_max_gcl_len(struct enetc_hw *hw) {
+     return enetc_rd(hw, ENETC_QBV_PTGCAPR_OFFSET)
+             & ENETC_QBV_MAX_GCL_LEN_MASK; }
+
+static int enetc_setup_taprio(struct net_device *ndev,
+                           struct tc_taprio_qopt_offload *admin_conf)
+{
+     struct enetc_ndev_priv *priv = netdev_priv(ndev);
+     struct enetc_cbd cbd = {.cmd = 0};
+     struct tgs_gcl_conf *gcl_config;
+     struct tgs_gcl_data *gcl_data;
+     struct gce *gce;
+     dma_addr_t dma;
+     u16 data_size;
+     u16 gcl_len;
+     u32 temp;
+     int i;
+
+     gcl_len = admin_conf->num_entries;
+     if (gcl_len > enetc_get_max_gcl_len(&priv->si->hw))
+             return -EINVAL;
Quoted 8 lines

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 35

Quoted 5 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +5 -0
+
+     if (admin_conf->enable) {
+             enetc_wr(&priv->si->hw,
+                      ENETC_QBV_PTGCR_OFFSET,
+                      temp & (~ENETC_QBV_TGE));

The enetc_wr() call seems to be common to both arms of the condition. If so perhaps it could be move outside of the condition.

Ok. will move it down after the if condition.

Quoted 13 lines
Quoted 13 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +12 -0
+             usleep_range(10, 20);
+             enetc_wr(&priv->si->hw,
+                      ENETC_QBV_PTGCR_OFFSET,
+                      temp | ENETC_QBV_TGE);
+     } else {
+             enetc_wr(&priv->si->hw,
+                      ENETC_QBV_PTGCR_OFFSET,
+                      temp & (~ENETC_QBV_TGE));
+             return 0;
+     }
+
+     /* Configure the (administrative) gate control list using the
Quoted 8 lines

drivers/net/ethernet/freescale/enetc/enetc_qos.c

Quoted 6 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +6 -0
+      * control BD descriptor.
+      */
+     gcl_config = &cbd.gcl_conf;
+
+     data_size = sizeof(struct tgs_gcl_data) + gcl_len *
+ sizeof(struct gce);

I think struct_size() can be used here.

Ok.

Quoted 19 lines
Quoted 19 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +18 -0
+
+     gcl_data = kzalloc(data_size, __GFP_DMA | GFP_KERNEL);
+     if (!gcl_data)
+             return -ENOMEM;
+
+     gce = (struct gce *)(gcl_data + 1);
+
+     /* Since no initial state config in taprio, set gates open as default.
+      */
+     gcl_config->atc = 0xff;
+     gcl_config->acl_len = cpu_to_le16(gcl_len);
+
+     if (!admin_conf->base_time) {
+             gcl_data->btl =
+                     cpu_to_le32(enetc_rd(&priv->si->hw, ENETC_SICTR0));
+             gcl_data->bth =
+                     cpu_to_le32(enetc_rd(&priv->si->hw, ENETC_SICTR1));
+     } else {
Quoted 8 lines

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 75

Quoted 5 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +5 -0
+             gcl_data->btl =
+                     cpu_to_le32(lower_32_bits(admin_conf->base_time));
+             gcl_data->bth =
+                     cpu_to_le32(upper_32_bits(admin_conf->base_time));
+     }

It looks like the types of the btl and bth fields are u32. Perhaps they should be le32?

Ok. should be le32.

Quoted 19 lines

Please consider running sparse over this code to check for any endian problems.

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 86

Quoted 11 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +11 -0
+
+     gcl_data->ct = cpu_to_le32(admin_conf->cycle_time);
+     gcl_data->cte = cpu_to_le32(admin_conf->cycle_time_extension);
+
+     for (i = 0; i < gcl_len; i++) {
+             struct tc_taprio_sched_entry *temp_entry;
+             struct gce *temp_gce = gce + i;
+
+             temp_entry = &admin_conf->entries[i];
+
+             temp_gce->gate = cpu_to_le32(temp_entry->gate_mask);

Gate is a u8 followed by 3 reserved bytes. Perhaps there needs to be some bounds checking on the value stored there given that the source is 32bits wide.

Quoted 3 lines

Also, its not clear to me that the above logic, which I assume takes the last significant byte of a 32bit value, works on big endian systems as the 32bit value is always little endian.

temp_entry->gate_mask is 32bit for wide possible input. Here change to hardware set 8bit wide. Can it just be like:

	temp_gce->gate = (u8) temp_entry->gate_mask;
Quoted 5 lines

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 87

Quoted 2 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +1 -0
+             temp_gce->period = cpu_to_le32(temp_entry->interval);

It looks like the types of the gate field is u32. Perhaps it should be le32?

Ok. should be le32.

Quoted 46 lines
Quoted 16 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +15 -0
+     }
+
+     cbd.length = cpu_to_le16(data_size);
+     cbd.status_flags = 0;
+
+     dma = dma_map_single(&priv->si->pdev->dev, gcl_data,
+                          data_size, DMA_TO_DEVICE);
+     if (dma_mapping_error(&priv->si->pdev->dev, dma)) {
+             netdev_err(priv->si->ndev, "DMA mapping failed!\n");
+             kfree(gcl_data);
+             return -ENOMEM;
+     }
+
+     cbd.addr[0] = lower_32_bits(dma);
+     cbd.addr[1] = upper_32_bits(dma);

drivers/net/ethernet/freescale/enetc/enetc_qos.c

Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +10 -0
+     cbd.cls = BDCR_CMD_PORT_GCL;
+
+     /* Updated by ENETC on completion of the configuration
+      * command. A zero value indicates success.
+      */
+     cbd.status_flags = 0;
+
+     enetc_send_cmd(priv->si, &cbd);
+
+     dma_unmap_single(&priv->si->pdev->dev, dma, data_size,

DMA_TO_DEVICE);

Quoted 19 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +16 -1
+     kfree(gcl_data);
+
+     return 0;
+}
+
+int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data) {
+     struct tc_taprio_qopt_offload *taprio = type_data;
+     struct enetc_ndev_priv *priv = netdev_priv(ndev);
+     int i;
+
+     for (i = 0; i < priv->num_tx_rings; i++)
+             enetc_set_bdr_prio(&priv->si->hw,
+                                priv->tx_ring[i]->index,
+                                taprio->enable ? i : 0);
+
+     return enetc_setup_taprio(ndev, taprio); }
--

2.17.1

maintainer
#25 lore raw
Quoted 2 lines

-----Original Message-----
From: Po Liu <[email protected]>

[...]

Quoted 2 lines
Quoted 2 lines

-----Original Message-----
From: Simon Horman <[email protected]>

[...]

Quoted 12 lines
Quoted 11 lines

drivers/net/ethernet/freescale/enetc/enetc_hw.h static inline void enetc_set_bdr_prio(struct enetc_hw *hw, int bdr_idx, · line 568

Quoted 8 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +8 -0
+/* class 5, command 0 */
+struct tgs_gcl_conf {
+     u8      atc;    /* init gate value */
+     u8      res[7];
+     union {
+             struct {
+                     u8      res1[4];
+                     __le16  acl_len;

Given that u* types are used in this structure I think le16 would be more appropriate than __le16.

Quoted 3 lines

Here keep the same code style of this .h file. I think it is better to have another patch to fix them all. Do you agree?

I don't see why "le16" would be more appropriate than "__le16" in this context. The "__leXX" types are widely used in kernel drivers and not only, to annotate the endianess of the hardware. These are generic types defined din "include/uapi/linux/types.h". Whereas "leXX" are defined in "fs/ntfs/types.h", and there's no usage of these types in other h/w device drivers (I didn't find any). Am I missing anything?

-Claudiu

#26 lore raw
Quoted 22 lines · Claudiu Manoil
Quoted 2 lines

-----Original Message-----
From: Po Liu <[email protected]>

[...]

Quoted 2 lines
Quoted 2 lines

-----Original Message-----
From: Simon Horman <[email protected]>

[...]

Quoted 12 lines
Quoted 11 lines

drivers/net/ethernet/freescale/enetc/enetc_hw.h static inline void enetc_set_bdr_prio(struct enetc_hw *hw, int bdr_idx, · line 568

Quoted 8 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +8 -0
+/* class 5, command 0 */
+struct tgs_gcl_conf {
+     u8      atc;    /* init gate value */
+     u8      res[7];
+     union {
+             struct {
+                     u8      res1[4];
+                     __le16  acl_len;

Given that u* types are used in this structure I think le16 would be more appropriate than __le16.

Quoted 3 lines

Here keep the same code style of this .h file. I think it is better to have another patch to fix them all. Do you agree?

Quoted 5 lines

I don't see why "le16" would be more appropriate than "__le16" in this context. The "__leXX" types are widely used in kernel drivers and not only, to annotate the endianess of the hardware. These are generic types defined din "include/uapi/linux/types.h". Whereas "leXX" are defined in "fs/ntfs/types.h", and there's no usage of these types in other h/w device drivers (I didn't find any). Am I missing anything?

My point is a cosmetic one:
I think that __u8 goes with __le16, while u8 goes with le16.

#27 lore raw
In reply to Po Liu

On Tue, Nov 12, 2019 at 11:19:43AM +0000, Po Liu wrote:

...

Quoted 23 lines
Quoted 11 lines

drivers/net/ethernet/freescale/enetc/enetc_hw.h static inline void enetc_set_bdr_prio(struct enetc_hw *hw, int bdr_idx, · line 568

Quoted 8 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +8 -0
+/* class 5, command 0 */
+struct tgs_gcl_conf {
+     u8      atc;    /* init gate value */
+     u8      res[7];
+     union {
+             struct {
+                     u8      res1[4];
+                     __le16  acl_len;

Given that u* types are used in this structure I think le16 would be more appropriate than __le16.

Here keep the same code style of this .h file. I think it is better to have another patch to fix them all. Do you agree?

Quoted 9 lines
Quoted 8 lines
drivers/net/ethernet/freescale/enetc/enetc_hw.h +6 -0
+                     u8      res2[2];
+             };
+             struct {
+                     u32 cctl;
+                     u32 ccth;
+             };
Quoted 4 lines
Quoted 2 lines

I'm a little surprised to see host endian values in a structure that appears to be written to hardware. Is this intentional?

Will remove.

If the HW defines these fields then I think its fine to leave them, though with the correct byte-order.

I was more asking if it is intentional that the value for these fields, when sent to the HW, is always zero in the context of this patch-set. Likewise elsewhere.

...

Quoted 16 lines
Quoted 16 lines

drivers/net/ethernet/freescale/enetc/enetc_qos.c line 86

Quoted 11 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +11 -0
+
+     gcl_data->ct = cpu_to_le32(admin_conf->cycle_time);
+     gcl_data->cte = cpu_to_le32(admin_conf->cycle_time_extension);
+
+     for (i = 0; i < gcl_len; i++) {
+             struct tc_taprio_sched_entry *temp_entry;
+             struct gce *temp_gce = gce + i;
+
+             temp_entry = &admin_conf->entries[i];
+
+             temp_gce->gate = cpu_to_le32(temp_entry->gate_mask);

Gate is a u8 followed by 3 reserved bytes. Perhaps there needs to be some bounds checking on the value stored there given that the source is 32bits wide.

Quoted 7 lines
Quoted 3 lines

Also, its not clear to me that the above logic, which I assume takes the last significant byte of a 32bit value, works on big endian systems as the 32bit value is always little endian.

temp_entry->gate_mask is 32bit for wide possible input. Here change to hardware set 8bit wide. Can it just be like:

	temp_gce->gate = (u8) temp_entry->gate_mask;

I think that would be better.
Perhaps its best to also mask out the unwanted bits.

...

maintainer
#28 lore raw
In reply to Simon Horman

Oops, I didn't see this feedback because v2 had been posted.

I'll revert that now.

Please address Simon's feedback on these two patches, and then post a v3, thank you.

maintainer
#29 lore raw

From: David Miller <[email protected]>
Date: Tue, 12 Nov 2019 10:58:59 -0800 (PST)

Quoted 7 lines

Oops, I didn't see this feedback because v2 had been posted.

I'll revert that now.

Please address Simon's feedback on these two patches, and then post a v3, thank you.

Also, v2 doesn't even compile :-(

In file included from drivers/net/ethernet/freescale/enetc/enetc.h:14,
from drivers/net/ethernet/freescale/enetc/enetc_qos.c:4:
drivers/net/ethernet/freescale/enetc/enetc_qos.c: In function ‘enetc_setup_tc_taprio’:
drivers/net/ethernet/freescale/enetc/enetc_hw.h:308:32: warning: ‘temp’ may be used uninitialized in this function [-Wmaybe-uninitialized]

 #define enetc_wr_reg(reg, val) iowrite32((val), (reg))
                                ^~~~~~~~~
drivers/net/ethernet/freescale/enetc/enetc_qos.c:59:6: note: ‘temp’ was declared here
  u32 temp;
      ^~~~

ERROR: "enetc_sched_speed_set" [drivers/net/ethernet/freescale/enetc/fsl-enetc-vf.ko] undefined!
ERROR: "enetc_setup_tc_taprio" [drivers/net/ethernet/freescale/enetc/fsl-enetc-vf.ko] undefined! make[1]: *** [scripts/Makefile.modpost:94: __modpost] Error 1
make: *** [Makefile:1282: modules] Error 2

author
#30 lore raw

Hi David,

Thanks!
Br,
Po Liu

Quoted 36 lines

-----Original Message-----
From: David Miller <[email protected]>
Sent: 2019年11月13日 3:00
To: [email protected]
Cc: Po Liu <[email protected]>; Claudiu Manoil <[email protected]>; [email protected]; [email protected]; [email protected]; Vladimir Oltean <[email protected]>; Alexandru Marginean <[email protected]>; Xiaoliang Yang <[email protected]>; Roy Zang <[email protected]>; Mingkai Hu <[email protected]>; Jerry Huang <[email protected]>; Leo Li <[email protected]>
Subject: [EXT] Re: [net-next, 1/2] enetc: Configure the Time-Aware Scheduler via tc-taprio offload

Caution: EXT Email

From: David Miller <[email protected]>
Date: Tue, 12 Nov 2019 10:58:59 -0800 (PST)

Quoted 7 lines

Oops, I didn't see this feedback because v2 had been posted.

I'll revert that now.

Please address Simon's feedback on these two patches, and then post a v3, thank you.

Also, v2 doesn't even compile :-(

In file included from drivers/net/ethernet/freescale/enetc/enetc.h:14,
from drivers/net/ethernet/freescale/enetc/enetc_qos.c:4:
drivers/net/ethernet/freescale/enetc/enetc_qos.c: In function ʽenetc_setup_tc_taprioʼ:
drivers/net/ethernet/freescale/enetc/enetc_hw.h:308:32: warning: ʽtempʼ may be used uninitialized in this function [-Wmaybe-uninitialized] #define enetc_wr_reg(reg, val) iowrite32((val), (reg))

Quoted 3 lines
                                ^~~~~~~~~

drivers/net/ethernet/freescale/enetc/enetc_qos.c:59:6: note: ʽtempʼ was declared here

More delete one line. Will fix in v3.

Quoted 8 lines
  u32 temp;
      ^~~~

ERROR: "enetc_sched_speed_set" [drivers/net/ethernet/freescale/enetc/fsl- enetc-vf.ko] undefined!
ERROR: "enetc_setup_tc_taprio" [drivers/net/ethernet/freescale/enetc/fsl- enetc-vf.ko] undefined!
make[1]: *** [scripts/Makefile.modpost:94: __modpost] Error 1
make: *** [Makefile:1282: modules] Error 2

I got this situation.
It happened when set module mode, since vf drvier should not own the taprio set. Thanks!

#31 lore raw
In reply to Po Liu
Thank you for the patch! Perhaps something to improve:

Hi Po,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on net-next/master]
[also build test WARNING on v5.4-rc7 next-20191111]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]

url:    https://github.com/0day-ci/linux/commits/Po-Liu/enetc-Configure-the-Time-Aware-Scheduler-via-tc-taprio-offload/20191112-193235
base:   https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git ca22d6977b9b4ab0fd2e7909b57e32ba5b95046f
config: s390-allmodconfig (attached as .config)
compiler: s390-linux-gcc (GCC) 7.4.0

reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=7.4.0 make.cross ARCH=s390

If you fix the issue, kindly add following tag

Note: it may well be a FALSE warning. FWIW you are at least aware of it now.
http://gcc.gnu.org/wiki/Better_Uninitialized_Warnings

All warnings (new ones prefixed by >>):

In file included from arch/s390/include/asm/io.h:76:0,

                    from include/linux/io.h:13,
                    from include/linux/pci.h:39,
                    from drivers/net/ethernet/freescale/enetc/enetc.h:5,
                    from drivers/net/ethernet/freescale/enetc/enetc_qos.c:4:
   drivers/net/ethernet/freescale/enetc/enetc_qos.c: In function 'enetc_setup_tc_taprio':
>> include/asm-generic/io.h:735:19: warning: 'temp' may be used uninitialized in this function [-Wmaybe-uninitialized]
    #define iowrite32 iowrite32
                      ^~~~~~~~~
   drivers/net/ethernet/freescale/enetc/enetc_qos.c:25:6: note: 'temp' was declared here
     u32 temp;
         ^~~~
--
   In file included from arch/s390/include/asm/io.h:76:0,
                    from include/linux/io.h:13,
                    from include/linux/pci.h:39,
                    from drivers/net//ethernet/freescale/enetc/enetc.h:5,
                    from drivers/net//ethernet/freescale/enetc/enetc_qos.c:4:
   drivers/net//ethernet/freescale/enetc/enetc_qos.c: In function 'enetc_setup_tc_taprio':
>> include/asm-generic/io.h:735:19: warning: 'temp' may be used uninitialized in this function [-Wmaybe-uninitialized]
    #define iowrite32 iowrite32
                      ^~~~~~~~~
   drivers/net//ethernet/freescale/enetc/enetc_qos.c:25:6: note: 'temp' was declared here
     u32 temp;
         ^~~~

vim +/temp +735 include/asm-generic/io.h

9216efafc52ff9 Thierry Reding 2014-10-01 733

9216efafc52ff9 Thierry Reding 2014-10-01  734  #ifndef iowrite32
9216efafc52ff9 Thierry Reding 2014-10-01 @735  #define iowrite32 iowrite32
9216efafc52ff9 Thierry Reding 2014-10-01  736  static inline void iowrite32(u32 value, volatile void __iomem *addr)
9216efafc52ff9 Thierry Reding 2014-10-01  737  {
9216efafc52ff9 Thierry Reding 2014-10-01  738  	writel(value, addr);
9216efafc52ff9 Thierry Reding 2014-10-01  739  }
9216efafc52ff9 Thierry Reding 2014-10-01  740  #endif

9216efafc52ff9 Thierry Reding 2014-10-01 741

:::::: The code at line 735 was first introduced by commit
:::::: 9216efafc52ff99e9351ef60de5fcafc2bc8adb6 asm-generic/io.h: Reconcile I/O accessor overrides

:::::: TO: Thierry Reding <[email protected]>
:::::: CC: Thierry Reding <[email protected]>

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org Intel Corporation

#32 lore raw
In reply to Po Liu
Thank you for the patch! Perhaps something to improve:

Hi Po,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on net-next/master]
[also build test WARNING on v5.4-rc7 next-20191112]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]

url:    https://github.com/0day-ci/linux/commits/Po-Liu/enetc-Configure-the-Time-Aware-Scheduler-via-tc-taprio-offload/20191112-193235
base:   https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git ca22d6977b9b4ab0fd2e7909b57e32ba5b95046f
config: arm64-allmodconfig (attached as .config)
compiler: aarch64-linux-gcc (GCC) 7.4.0

reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=7.4.0 make.cross ARCH=arm64

If you fix the issue, kindly add following tag

Note: it may well be a FALSE warning. FWIW you are at least aware of it now.
http://gcc.gnu.org/wiki/Better_Uninitialized_Warnings

All warnings (new ones prefixed by >>):

drivers/net/ethernet/freescale/enetc/enetc_qos.c: In function 'enetc_setup_tc_taprio':

>> drivers/net/ethernet/freescale/enetc/enetc_qos.c:25:6: warning: 'temp' may be used uninitialized in this function [-Wmaybe-uninitialized]
     u32 temp;
         ^~~~

vim +/temp +25 drivers/net/ethernet/freescale/enetc/enetc_qos.c

    13	
    14	static int enetc_setup_taprio(struct net_device *ndev,
    15				      struct tc_taprio_qopt_offload *admin_conf)
    16	{
    17		struct enetc_ndev_priv *priv = netdev_priv(ndev);
    18		struct enetc_cbd cbd = {.cmd = 0};
    19		struct tgs_gcl_conf *gcl_config;
    20		struct tgs_gcl_data *gcl_data;
    21		struct gce *gce;
    22		dma_addr_t dma;
    23		u16 data_size;
    24		u16 gcl_len;
  > 25		u32 temp;
    26		int i;
    27	
    28		gcl_len = admin_conf->num_entries;
    29		if (gcl_len > enetc_get_max_gcl_len(&priv->si->hw))
    30			return -EINVAL;
    31	
    32		if (admin_conf->enable) {
    33			enetc_wr(&priv->si->hw,
    34				 ENETC_QBV_PTGCR_OFFSET,
    35				 temp & (~ENETC_QBV_TGE));
    36			usleep_range(10, 20);
    37			enetc_wr(&priv->si->hw,
    38				 ENETC_QBV_PTGCR_OFFSET,
    39				 temp | ENETC_QBV_TGE);
    40		} else {
    41			enetc_wr(&priv->si->hw,
    42				 ENETC_QBV_PTGCR_OFFSET,
    43				 temp & (~ENETC_QBV_TGE));
    44			return 0;
    45		}
    46	
    47		/* Configure the (administrative) gate control list using the
    48		 * control BD descriptor.
    49		 */
    50		gcl_config = &cbd.gcl_conf;
    51	
    52		data_size = sizeof(struct tgs_gcl_data) + gcl_len * sizeof(struct gce);
    53	
    54		gcl_data = kzalloc(data_size, __GFP_DMA | GFP_KERNEL);
    55		if (!gcl_data)
    56			return -ENOMEM;
    57	
    58		gce = (struct gce *)(gcl_data + 1);
    59	
    60		/* Since no initial state config in taprio, set gates open as default.
    61		 */
    62		gcl_config->atc = 0xff;
    63		gcl_config->acl_len = cpu_to_le16(gcl_len);
    64	
    65		if (!admin_conf->base_time) {
    66			gcl_data->btl =
    67				cpu_to_le32(enetc_rd(&priv->si->hw, ENETC_SICTR0));
    68			gcl_data->bth =
    69				cpu_to_le32(enetc_rd(&priv->si->hw, ENETC_SICTR1));
    70		} else {
    71			gcl_data->btl =
    72				cpu_to_le32(lower_32_bits(admin_conf->base_time));
    73			gcl_data->bth =
    74				cpu_to_le32(upper_32_bits(admin_conf->base_time));
    75		}
    76	
    77		gcl_data->ct = cpu_to_le32(admin_conf->cycle_time);
    78		gcl_data->cte = cpu_to_le32(admin_conf->cycle_time_extension);
    79	
    80		for (i = 0; i < gcl_len; i++) {
    81			struct tc_taprio_sched_entry *temp_entry;
    82			struct gce *temp_gce = gce + i;
    83	
    84			temp_entry = &admin_conf->entries[i];
    85	
    86			temp_gce->gate = cpu_to_le32(temp_entry->gate_mask);
    87			temp_gce->period = cpu_to_le32(temp_entry->interval);
    88		}
    89	
    90		cbd.length = cpu_to_le16(data_size);
    91		cbd.status_flags = 0;
    92	
    93		dma = dma_map_single(&priv->si->pdev->dev, gcl_data,
    94				     data_size, DMA_TO_DEVICE);
    95		if (dma_mapping_error(&priv->si->pdev->dev, dma)) {
    96			netdev_err(priv->si->ndev, "DMA mapping failed!\n");
    97			kfree(gcl_data);
    98			return -ENOMEM;
    99		}

100
101 cbd.addr[0] = lower_32_bits(dma);
102 cbd.addr[1] = upper_32_bits(dma);
103 cbd.cls = BDCR_CMD_PORT_GCL;
104
105 /* Updated by ENETC on completion of the configuration
106 * command. A zero value indicates success.
107 */
108 cbd.status_flags = 0;
109
110 enetc_send_cmd(priv->si, &cbd);
111
112 dma_unmap_single(&priv->si->pdev->dev, dma, data_size, DMA_TO_DEVICE);
113 kfree(gcl_data);
114
115 return 0;
116 }
117

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org Intel Corporation

#33 lore raw
In reply to Po Liu
Quoted 56 lines · Po Liu

ENETC supports in hardware for time-based egress shaping according to IEEE 802.1Qbv. This patch implement the Qbv enablement by the hardware offload method qdisc tc-taprio method.
Also update cbdr writeback to up level since control bd ring may writeback data to control bd ring.

---

drivers/net/ethernet/freescale/enetc/Makefile |   1 +
drivers/net/ethernet/freescale/enetc/enetc.c  |  19 ++-
drivers/net/ethernet/freescale/enetc/enetc.h  |   2 +
.../net/ethernet/freescale/enetc/enetc_cbdr.c |   5 +-
.../net/ethernet/freescale/enetc/enetc_hw.h   | 150 ++++++++++++++++--
.../net/ethernet/freescale/enetc/enetc_qos.c  | 130 +++++++++++++++
6 files changed, 285 insertions(+), 22 deletions(-)

create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_qos.c

drivers/net/ethernet/freescale/enetc/Makefile +0 -0
index d200c27c3bf6..389f722efc43 100644
@@ -5,6 +5,7 @@ common-objs := enetc.o enetc_cbdr.o enetc_ethtool.o

obj-$(CONFIG_FSL_ENETC) += fsl-enetc.o fsl-enetc-y := enetc_pf.o enetc_mdio.o $(common-objs) fsl-enetc-$(CONFIG_PCI_IOV) += enetc_msg.o +fsl-enetc-$(CONFIG_NET_SCH_TAPRIO) += enetc_qos.o

obj-$(CONFIG_FSL_ENETC_VF) += fsl-enetc-vf.o
fsl-enetc-vf-y := enetc_vf.o $(common-objs)

drivers/net/ethernet/freescale/enetc/enetc.c +1 -5
index 3e8f9819f08c..d58dbc2c4270 100644
@@ -1427,8 +1427,7 @@ int enetc_close(struct net_device *ndev)
 	return 0;
 }
 
-int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
-		   void *type_data)
+int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data)
 {
 	struct enetc_ndev_priv *priv = netdev_priv(ndev);
 	struct tc_mqprio_qopt *mqprio = type_data;
@@ -1436,9 +1435,6 @@ int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
 	u8 num_tc;
 	int i;
 
-	if (type != TC_SETUP_QDISC_MQPRIO)
-		return -EOPNOTSUPP;
-
 	mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;
 	num_tc = mqprio->num_tc;
 

drivers/net/ethernet/freescale/enetc/enetc.c int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type, · line 1487

Quoted 9 lines
drivers/net/ethernet/freescale/enetc/enetc.c +6 -0
@@ -1483,6 +1479,19 @@ int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
 	return 0;
 }
 
+int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
+		   void *type_data)
+{
+	switch (type) {
+	case TC_SETUP_QDISC_MQPRIO:
+		return enetc_setup_tc_mqprio(ndev, type_data);

This patch is for taprio offload, I see that mqprio is related and is part of taprio offload configuration. But taprio offload has own mqprio settings. The taprio mqprio part is not offloaded with TC_SETUP_QDISC_MQPRIO.

So, a combination of mqprio and tario qdiscs used. Could you please share the commands were used for your setup?

And couple interesting questions about all of this:
- The taprio qdisc has to have mqprio settings, but if it's done with mqprio then it just skipped (by reading tc class num).
- If no separate mqprio qdisc configuration then mqprio conf from taprio is set, who should restore tc mappings when taprio qdisc is unloaded?

Maybe there is reason to implement TC_SETUP_QDISC_MQPRIO offload in taprio since it's required feature?

Would be better to move changes for mqprio in separate patch with explanation.

Quoted 361 lines
drivers/net/ethernet/freescale/enetc/enetc.c +7 -0
+	case TC_SETUP_QDISC_TAPRIO:
+		return enetc_setup_tc_taprio(ndev, type_data);
+	default:
+		return -EOPNOTSUPP;
+	}
+}
+
 struct net_device_stats *enetc_get_stats(struct net_device *ndev)
 {
 	struct enetc_ndev_priv *priv = netdev_priv(ndev);
drivers/net/ethernet/freescale/enetc/enetc.h +2 -0
index 541b4e2073fe..8676631041d5 100644
@@ -244,3 +244,5 @@ int enetc_set_fs_entry(struct enetc_si *si, struct enetc_cmd_rfse *rfse,
 void enetc_set_rss_key(struct enetc_hw *hw, const u8 *bytes);
 int enetc_get_rss_table(struct enetc_si *si, u32 *table, int count);
 int enetc_set_rss_table(struct enetc_si *si, const u32 *table, int count);
+int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd);
+int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data);
drivers/net/ethernet/freescale/enetc/enetc_cbdr.c +4 -1
index de466b71bf8f..201cbc362e33 100644
@@ -32,7 +32,7 @@ static int enetc_cbd_unused(struct enetc_cbdr *r)
 		r->bd_count;
 }
 
-static int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
+int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
 {
 	struct enetc_cbdr *ring = &si->cbd_ring;
 	int timeout = ENETC_CBDR_TIMEOUT;
@@ -66,6 +66,9 @@ static int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
 	if (!timeout)
 		return -EBUSY;
 
+	/* CBD may writeback data, feedback up level */
+	*cbd = *dest_cbd;
+
 	enetc_clean_cbdr(si);
 
 	return 0;
drivers/net/ethernet/freescale/enetc/enetc_hw.h +134 -16
index 88276299f447..75a7c0f1f8ce 100644
@@ -18,6 +18,7 @@
 #define ENETC_SICTR0	0x18
 #define ENETC_SICTR1	0x1c
 #define ENETC_SIPCAPR0	0x20
+#define ENETC_SIPCAPR0_QBV	BIT(4)
 #define ENETC_SIPCAPR0_RSS	BIT(8)
 #define ENETC_SIPCAPR1	0x24
 #define ENETC_SITGTGR	0x30
@@ -148,6 +149,12 @@ enum enetc_bdr_type {TX, RX};
 #define ENETC_PORT_BASE		0x10000
 #define ENETC_PMR		0x0000
 #define ENETC_PMR_EN	GENMASK(18, 16)
+#define ENETC_PMR_PSPEED_MASK GENMASK(11, 8)
+#define ENETC_PMR_PSPEED_10M 0x000
+#define ENETC_PMR_PSPEED_100M 0x100
+#define ENETC_PMR_PSPEED_1000M 0x200
+#define ENETC_PMR_PSPEED_2500M 0x400
+
 #define ENETC_PSR		0x0004 /* RO */
 #define ENETC_PSIPMR		0x0018
 #define ENETC_PSIPMR_SET_UP(n)	BIT(n) /* n = SI index */
@@ -440,22 +447,6 @@ union enetc_rx_bd {
 #define EMETC_MAC_ADDR_FILT_RES	3 /* # of reserved entries at the beginning */
 #define ENETC_MAX_NUM_VFS	2
 
-struct enetc_cbd {
-	union {
-		struct {
-			__le32 addr[2];
-			__le32 opt[4];
-		};
-		__le32 data[6];
-	};
-	__le16 index;
-	__le16 length;
-	u8 cmd;
-	u8 cls;
-	u8 _res;
-	u8 status_flags;
-};
-
 #define ENETC_CBD_FLAGS_SF	BIT(7) /* short format */
 #define ENETC_CBD_STATUS_MASK	0xf
 
@@ -554,3 +545,130 @@ static inline void enetc_set_bdr_prio(struct enetc_hw *hw, int bdr_idx,
 	val |= ENETC_TBMR_SET_PRIO(prio);
 	enetc_txbdr_wr(hw, bdr_idx, ENETC_TBMR, val);
 }
+
+enum bdcr_cmd_class {
+	BDCR_CMD_UNSPEC = 0,
+	BDCR_CMD_MAC_FILTER,
+	BDCR_CMD_VLAN_FILTER,
+	BDCR_CMD_RSS,
+	BDCR_CMD_RFS,
+	BDCR_CMD_PORT_GCL,
+	BDCR_CMD_RECV_CLASSIFIER,
+	__BDCR_CMD_MAX_LEN,
+	BDCR_CMD_MAX_LEN = __BDCR_CMD_MAX_LEN - 1,
+};
+
+/* class 5, command 0 */
+struct tgs_gcl_conf {
+	u8	atc;	/* init gate value */
+	u8	res[7];
+	union {
+		struct {
+			u8	res1[4];
+			__le16	acl_len;
+			u8	res2[2];
+		};
+		struct {
+			u32 cctl;
+			u32 ccth;
+		};
+	};
+};
+
+#define ENETC_CBDR_SGL_IOMEN	BIT(0)
+#define ENETC_CBDR_SGL_IPVEN	BIT(3)
+#define ENETC_CBDR_SGL_GTST	BIT(4)
+#define ENETC_CBDR_SGL_IPV_MASK 0xe
+
+/* gate control list entry */
+struct gce {
+	u32	period;
+	u8	gate;
+	u8	res[3];
+};
+
+/* tgs_gcl_conf address point to this data space */
+struct tgs_gcl_data {
+	u32	btl;
+	u32	bth;
+	u32	ct;
+	u32	cte;
+};
+
+/* class 5, command 1 */
+struct tgs_gcl_query {
+		u8	res[12];
+		union {
+			struct {
+				__le16	acl_len; /* admin list length */
+				__le16	ocl_len; /* operation list length */
+			};
+			struct {
+				u16 admin_list_len;
+				u16 oper_list_len;
+			};
+		};
+};
+
+/* tgs_gcl_query command response data format */
+struct tgs_gcl_resp {
+	u32 abtl;	/* base time */
+	u32 abth;
+	u32 act;	/* cycle time */
+	u32 acte;	/* cycle time extend */
+	u32 cctl;	/* config change time */
+	u32 ccth;
+	u32 obtl;	/* operation base time */
+	u32 obth;
+	u32 oct;	/* operation cycle time */
+	u32 octe;	/* operation cycle time extend */
+	u32 ccel;	/* config change error */
+	u32 cceh;
+};
+
+struct enetc_cbd {
+	union{
+		struct {
+			__le32	addr[2];
+			union {
+				__le32	opt[4];
+				struct tgs_gcl_conf	gcl_conf;
+				struct tgs_gcl_query	gcl_query;
+			};
+		};	/* Long format */
+		__le32 data[6];
+	};
+	__le16 index;
+	__le16 length;
+	u8 cmd;
+	u8 cls;
+	u8 _res;
+	u8 status_flags;
+};
+
+#define ENETC_PTCFPR(n)		(0x1910 + (n) * 4) /* n = [0 ..7] */
+#define ENETC_FPE		BIT(31)
+
+/* Port capability register 0 */
+#define ENETC_PCAPR0_PSFPM	BIT(10)
+#define ENETC_PCAPR0_PSFP	BIT(9)
+#define ENETC_PCAPR0_TSN	BIT(4)
+#define ENETC_PCAPR0_QBU	BIT(3)
+
+/* port time gating control register */
+#define ENETC_QBV_PTGCR_OFFSET		0x11a00
+#define ENETC_QBV_TGE			0x80000000
+#define ENETC_QBV_TGPE			BIT(30)
+#define ENETC_QBV_TGDROP_DISABLE	BIT(29)
+
+/* Port time gating capability register */
+#define ENETC_QBV_PTGCAPR_OFFSET	0x11a08
+#define ENETC_QBV_MAX_GCL_LEN_MASK	0xffff
+
+/* Port time gating admin gate list status register */
+#define ENETC_QBV_PTGAGLSR_OFFSET	0x11a10
+#define ENETC_QBV_CFG_PEND_MASK	0x00000002
+
+#define ENETC_TGLSTR			0xa200
+#define ENETC_TGS_MIN_DIS_MASK		0x80000000
+#define ENETC_MIN_LOOKAHEAD_MASK	0xffff
drivers/net/ethernet/freescale/enetc/enetc_qos.c new file +130 -0
new file mode 100644
index 000000000000..036bb39c7a0b
@@ -0,0 +1,130 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+/* Copyright 2019 NXP */
+
+#include "enetc.h"
+
+#include <net/pkt_sched.h>
+
+static u16 enetc_get_max_gcl_len(struct enetc_hw *hw)
+{
+	return enetc_rd(hw, ENETC_QBV_PTGCAPR_OFFSET)
+		& ENETC_QBV_MAX_GCL_LEN_MASK;
+}
+
+static int enetc_setup_taprio(struct net_device *ndev,
+			      struct tc_taprio_qopt_offload *admin_conf)
+{
+	struct enetc_ndev_priv *priv = netdev_priv(ndev);
+	struct enetc_cbd cbd = {.cmd = 0};
+	struct tgs_gcl_conf *gcl_config;
+	struct tgs_gcl_data *gcl_data;
+	struct gce *gce;
+	dma_addr_t dma;
+	u16 data_size;
+	u16 gcl_len;
+	u32 temp;
+	int i;
+
+	gcl_len = admin_conf->num_entries;
+	if (gcl_len > enetc_get_max_gcl_len(&priv->si->hw))
+		return -EINVAL;
+
+	if (admin_conf->enable) {
+		enetc_wr(&priv->si->hw,
+			 ENETC_QBV_PTGCR_OFFSET,
+			 temp & (~ENETC_QBV_TGE));
+		usleep_range(10, 20);
+		enetc_wr(&priv->si->hw,
+			 ENETC_QBV_PTGCR_OFFSET,
+			 temp | ENETC_QBV_TGE);
+	} else {
+		enetc_wr(&priv->si->hw,
+			 ENETC_QBV_PTGCR_OFFSET,
+			 temp & (~ENETC_QBV_TGE));
+		return 0;
+	}
+
+	/* Configure the (administrative) gate control list using the
+	 * control BD descriptor.
+	 */
+	gcl_config = &cbd.gcl_conf;
+
+	data_size = sizeof(struct tgs_gcl_data) + gcl_len * sizeof(struct gce);
+
+	gcl_data = kzalloc(data_size, __GFP_DMA | GFP_KERNEL);
+	if (!gcl_data)
+		return -ENOMEM;
+
+	gce = (struct gce *)(gcl_data + 1);
+
+	/* Since no initial state config in taprio, set gates open as default.
+	 */
+	gcl_config->atc = 0xff;
+	gcl_config->acl_len = cpu_to_le16(gcl_len);
+
+	if (!admin_conf->base_time) {
+		gcl_data->btl =
+			cpu_to_le32(enetc_rd(&priv->si->hw, ENETC_SICTR0));
+		gcl_data->bth =
+			cpu_to_le32(enetc_rd(&priv->si->hw, ENETC_SICTR1));
+	} else {
+		gcl_data->btl =
+			cpu_to_le32(lower_32_bits(admin_conf->base_time));
+		gcl_data->bth =
+			cpu_to_le32(upper_32_bits(admin_conf->base_time));
+	}
+
+	gcl_data->ct = cpu_to_le32(admin_conf->cycle_time);
+	gcl_data->cte = cpu_to_le32(admin_conf->cycle_time_extension);
+
+	for (i = 0; i < gcl_len; i++) {
+		struct tc_taprio_sched_entry *temp_entry;
+		struct gce *temp_gce = gce + i;
+
+		temp_entry = &admin_conf->entries[i];
+
+		temp_gce->gate = cpu_to_le32(temp_entry->gate_mask);
+		temp_gce->period = cpu_to_le32(temp_entry->interval);
+	}
+
+	cbd.length = cpu_to_le16(data_size);
+	cbd.status_flags = 0;
+
+	dma = dma_map_single(&priv->si->pdev->dev, gcl_data,
+			     data_size, DMA_TO_DEVICE);
+	if (dma_mapping_error(&priv->si->pdev->dev, dma)) {
+		netdev_err(priv->si->ndev, "DMA mapping failed!\n");
+		kfree(gcl_data);
+		return -ENOMEM;
+	}
+
+	cbd.addr[0] = lower_32_bits(dma);
+	cbd.addr[1] = upper_32_bits(dma);
+	cbd.cls = BDCR_CMD_PORT_GCL;
+
+	/* Updated by ENETC on completion of the configuration
+	 * command. A zero value indicates success.
+	 */
+	cbd.status_flags = 0;
+
+	enetc_send_cmd(priv->si, &cbd);
+
+	dma_unmap_single(&priv->si->pdev->dev, dma, data_size, DMA_TO_DEVICE);
+	kfree(gcl_data);
+
+	return 0;
+}
+
+int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data)
+{
+	struct tc_taprio_qopt_offload *taprio = type_data;
+	struct enetc_ndev_priv *priv = netdev_priv(ndev);
+	int i;
+
+	for (i = 0; i < priv->num_tx_rings; i++)
+		enetc_set_bdr_prio(&priv->si->hw,
+				   priv->tx_ring[i]->index,
+				   taprio->enable ? i : 0);
+
+	return enetc_setup_taprio(ndev, taprio);
+}
Signature · 1 line
2.17.1
Signature · 2 lines
Regards,
Ivan Khoronzhuk
#34 lore raw

[RFC PATCH] enetc: enetc_setup_tc_mqprio() can be static

In reply to Po Liu
Fixes: 0ffc020dc8f3 ("enetc: Configure the Time-Aware Scheduler via tc-taprio offload")
Fixes 0ffc020dc8f3 ("enetc: Configure the Time-Aware Scheduler via tc-taprio offload")
---
 enetc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/freescale/enetc/enetc.c +1 -1
index d58dbc2c4270e..724dc90bf87a2 100644
@@ -1427,7 +1427,7 @@ int enetc_close(struct net_device *ndev)
 	return 0;
 }
 
-int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data)
+static int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data)
 {
 	struct enetc_ndev_priv *priv = netdev_priv(ndev);
 	struct tc_mqprio_qopt *mqprio = type_data;
#35 lore raw
In reply to Po Liu
Thank you for the patch! Perhaps something to improve:

Hi Po,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on net-next/master]
[also build test WARNING on v5.4-rc7 next-20191111]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]

url:    https://github.com/0day-ci/linux/commits/Po-Liu/enetc-Configure-the-Time-Aware-Scheduler-via-tc-taprio-offload/20191112-193235
base:   https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git ca22d6977b9b4ab0fd2e7909b57e32ba5b95046f
reproduce:
        # apt-get install sparse
        # sparse version: v0.6.1-29-g781bc5d-dirty
        make ARCH=x86_64 allmodconfig
        make C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__'

If you fix the issue, kindly add following tag

sparse warnings: (new ones prefixed by >>)

>> drivers/net/ethernet/freescale/enetc/enetc.c:1430:5: sparse: sparse: symbol 'enetc_setup_tc_mqprio' was not declared. Should it be static?
--
>> drivers/net/ethernet/freescale/enetc/enetc_qos.c:66:31: sparse: sparse: incorrect type in assignment (different base types) @@    expected unsigned int [usertype] btl @@    got restrunsigned int [usertype] btl @@
>> drivers/net/ethernet/freescale/enetc/enetc_qos.c:66:31: sparse:    expected unsigned int [usertype] btl
>> drivers/net/ethernet/freescale/enetc/enetc_qos.c:66:31: sparse:    got restricted __le32 [usertype]
>> drivers/net/ethernet/freescale/enetc/enetc_qos.c:68:31: sparse: sparse: incorrect type in assignment (different base types) @@    expected unsigned int [usertype] bth @@    got restrunsigned int [usertype] bth @@
>> drivers/net/ethernet/freescale/enetc/enetc_qos.c:68:31: sparse:    expected unsigned int [usertype] bth
   drivers/net/ethernet/freescale/enetc/enetc_qos.c:68:31: sparse:    got restricted __le32 [usertype]
   drivers/net/ethernet/freescale/enetc/enetc_qos.c:71:31: sparse: sparse: incorrect type in assignment (different base types) @@    expected unsigned int [usertype] btl @@    got restrunsigned int [usertype] btl @@
   drivers/net/ethernet/freescale/enetc/enetc_qos.c:71:31: sparse:    expected unsigned int [usertype] btl
   drivers/net/ethernet/freescale/enetc/enetc_qos.c:71:31: sparse:    got restricted __le32 [usertype]
   drivers/net/ethernet/freescale/enetc/enetc_qos.c:73:31: sparse: sparse: incorrect type in assignment (different base types) @@    expected unsigned int [usertype] bth @@    got restrunsigned int [usertype] bth @@
   drivers/net/ethernet/freescale/enetc/enetc_qos.c:73:31: sparse:    expected unsigned int [usertype] bth
   drivers/net/ethernet/freescale/enetc/enetc_qos.c:73:31: sparse:    got restricted __le32 [usertype]
>> drivers/net/ethernet/freescale/enetc/enetc_qos.c:77:22: sparse: sparse: incorrect type in assignment (different base types) @@    expected unsigned int [usertype] ct @@    got restrunsigned int [usertype] ct @@
>> drivers/net/ethernet/freescale/enetc/enetc_qos.c:77:22: sparse:    expected unsigned int [usertype] ct
   drivers/net/ethernet/freescale/enetc/enetc_qos.c:77:22: sparse:    got restricted __le32 [usertype]
>> drivers/net/ethernet/freescale/enetc/enetc_qos.c:78:23: sparse: sparse: incorrect type in assignment (different base types) @@    expected unsigned int [usertype] cte @@    got restrunsigned int [usertype] cte @@
>> drivers/net/ethernet/freescale/enetc/enetc_qos.c:78:23: sparse:    expected unsigned int [usertype] cte
   drivers/net/ethernet/freescale/enetc/enetc_qos.c:78:23: sparse:    got restricted __le32 [usertype]
>> drivers/net/ethernet/freescale/enetc/enetc_qos.c:86:32: sparse: sparse: incorrect type in assignment (different base types) @@    expected unsigned char [usertype] gate @@    got restunsigned char [usertype] gate @@
>> drivers/net/ethernet/freescale/enetc/enetc_qos.c:86:32: sparse:    expected unsigned char [usertype] gate
   drivers/net/ethernet/freescale/enetc/enetc_qos.c:86:32: sparse:    got restricted __le32 [usertype]
>> drivers/net/ethernet/freescale/enetc/enetc_qos.c:87:34: sparse: sparse: incorrect type in assignment (different base types) @@    expected unsigned int [usertype] period @@    got restrunsigned int [usertype] period @@
>> drivers/net/ethernet/freescale/enetc/enetc_qos.c:87:34: sparse:    expected unsigned int [usertype] period
   drivers/net/ethernet/freescale/enetc/enetc_qos.c:87:34: sparse:    got restricted __le32 [usertype]
>> drivers/net/ethernet/freescale/enetc/enetc_qos.c:101:21: sparse: sparse: incorrect type in assignment (different base types) @@    expected restricted __le32 @@    got unsignerestricted __le32 @@
>> drivers/net/ethernet/freescale/enetc/enetc_qos.c:101:21: sparse:    expected restricted __le32
>> drivers/net/ethernet/freescale/enetc/enetc_qos.c:101:21: sparse:    got unsigned int [usertype]

drivers/net/ethernet/freescale/enetc/enetc_qos.c:102:21: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __le32 @@ got unsignerestricted __le32 @@
drivers/net/ethernet/freescale/enetc/enetc_qos.c:102:21: sparse: expected restricted __le32
drivers/net/ethernet/freescale/enetc/enetc_qos.c:102:21: sparse: got unsigned int [usertype]

Please review and possibly fold the followup patch.

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org Intel Corporation