net: stmmac: TSN support using TAPRIO API
Subsystems (4)
cover net: stmmac: TSN support using TAPRIO API
This series adds TSN support (EST and Frame Preemption) for stmmac driver.
1) Adds the HW specific support for EST in GMAC5+ cores.
2) Adds the HW specific support for EST in XGMAC3+ cores.
3) Integrates EST HW specific support with TAPRIO scheduler API.
4) Adds the Frame Preemption suppor on stmmac TAPRIO implementation.
5) Adds the HW specific support for Frame Preemption in GMAC5+ cores.
6) Adds the HW specific support for Frame Preemption in XGMAC3+ cores.
7) Adds support for HW debug counters for Frame Preemption available in GMAC5+ cores.
---
Cc: Giuseppe Cavallaro <[email protected]>
Cc: Alexandre Torgue <[email protected]>
Cc: Jose Abreu <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Maxime Coquelin <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
Jose Abreu (7):
net: stmmac: Add basic EST support for GMAC5+
net: stmmac: Add basic EST support for XGMAC
net: stmmac: Integrate EST with TAPRIO scheduler API
net: stmmac: Add Frame Preemption support using TAPRIO API
net: stmmac: gmac5+: Add support for Frame Preemption
net: stmmac: xgmac3+: Add support for Frame Preemption
net: stmmac: mmc: Add Frame Preemption counters on GMAC5+ cores
drivers/net/ethernet/stmicro/stmmac/common.h | 5 + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 12 ++ drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 4 + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 4 + drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 118 ++++++++++++++++++ drivers/net/ethernet/stmicro/stmmac/dwmac5.h | 24 ++++ drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 25 ++++ .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 76 ++++++++++++ drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 4 + drivers/net/ethernet/stmicro/stmmac/hwif.h | 14 +++ drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 16 +++ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 135 +++++++++++++++++++++ include/linux/stmmac.h | 13 ++ 14 files changed, 452 insertions(+)
Signature · 1 line
2.7.4
PATCH 1/7 net: stmmac: Add basic EST support for GMAC5+
From: Jose Abreu <[email protected]>
Adds the support for EST in GMAC5+ cores. This feature allows to offload scheduling of queues opening time to the IP.
---
Cc: Giuseppe Cavallaro <[email protected]>
Cc: Alexandre Torgue <[email protected]>
Cc: Jose Abreu <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Maxime Coquelin <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
--- drivers/net/ethernet/stmicro/stmmac/common.h | 4 + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 9 +++ drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 3 + drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 95 +++++++++++++++++++++++ drivers/net/ethernet/stmicro/stmmac/dwmac5.h | 19 +++++ drivers/net/ethernet/stmicro/stmmac/hwif.h | 5 ++ include/linux/stmmac.h | 13 ++++ 8 files changed, 150 insertions(+)
drivers/net/ethernet/stmicro/stmmac/common.h +4 -0
@@ -363,6 +363,10 @@ struct dma_features {unsigned int dvlan;unsigned int l3l4fnum;unsigned int arpoffsel; +/* TSN Features */ +unsigned int estwid; +unsigned int estdep; +unsigned int estsel; };/* GMAC TX FIFO is 8K, Rx FIFO is 16K */
drivers/net/ethernet/stmicro/stmmac/dwmac4.h +9 -0
@@ -176,6 +176,8 @@ enum power_event {#define GMAC_CONFIG_SARC GENMASK(30, 28)#define GMAC_CONFIG_SARC_SHIFT 28#define GMAC_CONFIG_IPC BIT(27) +#define GMAC_CONFIG_IPG GENMASK(26, 24) +#define GMAC_CONFIG_IPG_SHIFT 24#define GMAC_CONFIG_2K BIT(22)#define GMAC_CONFIG_ACS BIT(20)#define GMAC_CONFIG_BE BIT(18)
@@ -183,6 +185,7 @@ enum power_event {#define GMAC_CONFIG_JE BIT(16)#define GMAC_CONFIG_PS BIT(15)#define GMAC_CONFIG_FES BIT(14) +#define GMAC_CONFIG_FES_SHIFT 14#define GMAC_CONFIG_DM BIT(13)#define GMAC_CONFIG_LM BIT(12)#define GMAC_CONFIG_DCRS BIT(9)
@@ -190,6 +193,9 @@ enum power_event {#define GMAC_CONFIG_RE BIT(0)/* MAC extended config */ +#define GMAC_CONFIG_EIPG GENMASK(29, 25) +#define GMAC_CONFIG_EIPG_SHIFT 25 +#define GMAC_CONFIG_EIPG_EN BIT(24)#define GMAC_CONFIG_HDSMS GENMASK(22, 20)#define GMAC_CONFIG_HDSMS_SHIFT 20#define GMAC_CONFIG_HDSMS_256 (0x2 << GMAC_CONFIG_HDSMS_SHIFT)
@@ -231,6 +237,9 @@ enum power_event {/* MAC HW features3 bitmap */ #define GMAC_HW_FEAT_ASP GENMASK(29, 28) +#define GMAC_HW_FEAT_ESTWID GENMASK(21, 20) +#define GMAC_HW_FEAT_ESTDEP GENMASK(19, 17) +#define GMAC_HW_FEAT_ESTSEL BIT(16)#define GMAC_HW_FEAT_FRPES GENMASK(14, 13)#define GMAC_HW_FEAT_FRPBS GENMASK(12, 11)#define GMAC_HW_FEAT_FRPSEL BIT(10)
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +2 -0
@@ -984,6 +984,7 @@ const struct stmmac_ops dwmac410_ops = { .set_arp_offload = dwmac4_set_arp_offload, .config_l3_filter = dwmac4_config_l3_filter, .config_l4_filter = dwmac4_config_l4_filter, + .est_configure = dwmac5_est_configure, };const struct stmmac_ops dwmac510_ops = {
@@ -1027,6 +1028,7 @@ const struct stmmac_ops dwmac510_ops = { .set_arp_offload = dwmac4_set_arp_offload, .config_l3_filter = dwmac4_config_l3_filter, .config_l4_filter = dwmac4_config_l4_filter, + .est_configure = dwmac5_est_configure, };int dwmac4_setup (struct stmmac_priv *priv)
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c +3 -0
@@ -404,6 +404,9 @@ static void dwmac4_get_hw_feature(void __iomem *ioaddr,/* 5.10 Features */ dma_cap->asp = (hw_cap &GMAC_HW_FEAT_ASP ) >>28 ; + dma_cap->estwid = (hw_cap &GMAC_HW_FEAT_ESTWID ) >>20 ; + dma_cap->estdep = (hw_cap &GMAC_HW_FEAT_ESTDEP ) >>17 ; + dma_cap->estsel = (hw_cap &GMAC_HW_FEAT_ESTSEL ) >>16 ; dma_cap->frpes = (hw_cap &GMAC_HW_FEAT_FRPES ) >>13 ; dma_cap->frpbs = (hw_cap &GMAC_HW_FEAT_FRPBS ) >>11 ; dma_cap->frpsel = (hw_cap &GMAC_HW_FEAT_FRPSEL ) >>10 ;
drivers/net/ethernet/stmicro/stmmac/dwmac5.c +95 -0
98 lines not on this page · raw message
drivers/net/ethernet/stmicro/stmmac/dwmac5.h +19 -0
@@ -30,6 +30,23 @@#define MAC_PPSx_INTERVAL (x) (0x00000b88 + ((x) * 0x10))#define MAC_PPSx_WIDTH (x) (0x00000b8c + ((x) * 0x10)) +#define MTL_EST_CONTROL 0x00000c50 +#define PTOV GENMASK(31, 24) +#define PTOV_SHIFT 24 +#define SSWL BIT(1) +#define EEST BIT(0) +#define MTL_EST_GCL_CONTROL 0x00000c80 +#define BTR_LOW 0x0 +#define BTR_HIGH 0x1 +#define CTR_LOW 0x2 +#define CTR_HIGH 0x3 +#define TER 0x4 +#define LLR 0x5 +#define ADDR_SHIFT 8 +#define GCRR BIT(2) +#define SRWO BIT(0) +#define MTL_EST_GCL_DATA 0x00000c84 +#define MTL_RXP_CONTROL_STATUS 0x00000ca0#define RXPI BIT(31)#define NPE GENMASK(23, 16)
@@ -83,5 +100,7 @@ int dwmac5_rxp_config(void __iomem *ioaddr, struct stmmac_tc_entry *entries,int dwmac5_flex_pps_config (void __iomem *ioaddr,int index,struct stmmac_pps_cfg *cfg,bool enable,u32 sub_second_inc,u32 systime_flags); +int dwmac5_est_configure (void __iomem *ioaddr,struct stmmac_est *cfg, +unsigned int ptp_rate);#endif /* __DWMAC5_H__ */
drivers/net/ethernet/stmicro/stmmac/hwif.h +5 -0
@@ -274,6 +274,7 @@ struct stmmac_safety_stats;struct stmmac_tc_entry ;struct stmmac_pps_cfg ;struct stmmac_rss ; +struct stmmac_est ;/* Helpers to program the MAC core */ struct stmmac_ops {
@@ -371,6 +372,8 @@ struct stmmac_ops { bool en, bool udp, bool sa, bool inv, u32 match);void (*set_arp_offload)(struct mac_device_info *hw,bool en,u32 addr); +int (*est_configure)(void __iomem *ioaddr,struct stmmac_est *cfg, +unsigned int ptp_rate); }; #define stmmac_core_init(__priv, __args...) \
@@ -457,6 +460,8 @@ struct stmmac_ops { stmmac_do_callback(__priv, mac, config_l4_filter, __args) #define stmmac_set_arp_offload(__priv, __args...) \ stmmac_do_void_callback(__priv, mac, set_arp_offload, __args) +#define stmmac_est_configure(__priv, __args...) \ + stmmac_do_callback(__priv, mac, est_configure, __args)/* PTP and HW Timer helpers */ struct stmmac_hwtimestamp {
include/linux/stmmac.h +13 -0
@@ -109,6 +109,18 @@ struct stmmac_axi {bool axi_rb; }; +#define EST_GCL 1024 +struct stmmac_est { +int enable; +u32 btr_offset[2 ]; +u32 btr[2 ]; +u32 ctr[2 ]; +u32 ter; +u32 gcl_unaligned[EST_GCL ]; +u32 gcl[EST_GCL ]; +u32 gcl_size; +}; +struct stmmac_rxq_cfg {u8 mode_to_use;u32 chan;
@@ -139,6 +151,7 @@ struct plat_stmmacenet_data {struct device_node *phylink_node;struct device_node *mdio_node;struct stmmac_dma_cfg *dma_cfg; +struct stmmac_est *est;int clk_csr;int has_gmac;int enh_desc;
Signature · 1 line
2.7.4
PATCH 2/7 net: stmmac: Add basic EST support for XGMAC
In reply to Jose AbreuAdds the support for EST in XGMAC cores. This feature allows to offload scheduling of queues opening time to the IP.
---
Cc: Giuseppe Cavallaro <[email protected]>
Cc: Alexandre Torgue <[email protected]>
Cc: Jose Abreu <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Maxime Coquelin <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
--- drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 19 ++++++++ .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 52 ++++++++++++++++++++++ drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 3 ++ 3 files changed, 74 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h +19 -0
@@ -136,6 +136,9 @@#define XGMAC_HWFEAT_TXQCNT GENMASK(9, 6)#define XGMAC_HWFEAT_RXQCNT GENMASK(3, 0)#define XGMAC_HW_FEATURE3 0x00000128 +#define XGMAC_HWFEAT_ESTWID GENMASK(24, 23) +#define XGMAC_HWFEAT_ESTDEP GENMASK(22, 20) +#define XGMAC_HWFEAT_ESTSEL BIT(19)#define XGMAC_HWFEAT_ASP GENMASK(15, 14)#define XGMAC_HWFEAT_DVLAN BIT(13)#define XGMAC_HWFEAT_FRPES GENMASK(12, 11)
@@ -237,6 +240,22 @@#define XGMAC_TC_PRTY_MAP1 0x00001044#define XGMAC_PSTC (x) GENMASK((x) * 8 + 7, (x) * 8)#define XGMAC_PSTC_SHIFT (x) ((x) * 8) +#define XGMAC_MTL_EST_CONTROL 0x00001050 +#define XGMAC_PTOV GENMASK(31, 23) +#define XGMAC_PTOV_SHIFT 23 +#define XGMAC_SSWL BIT(1) +#define XGMAC_EEST BIT(0) +#define XGMAC_MTL_EST_GCL_CONTROL 0x00001080 +#define XGMAC_BTR_LOW 0x0 +#define XGMAC_BTR_HIGH 0x1 +#define XGMAC_CTR_LOW 0x2 +#define XGMAC_CTR_HIGH 0x3 +#define XGMAC_TER 0x4 +#define XGMAC_LLR 0x5 +#define XGMAC_ADDR_SHIFT 8 +#define XGMAC_GCRR BIT(2) +#define XGMAC_SRWO BIT(0) +#define XGMAC_MTL_EST_GCL_DATA 0x00001084#define XGMAC_MTL_RXP_CONTROL_STATUS 0x000010a0#define XGMAC_RXPI BIT(31)#define XGMAC_NPE GENMASK(23, 16)
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c +52 -0
64 lines not on this page · raw message
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c +3 -0
@@ -413,6 +413,9 @@ static void dwxgmac2_get_hw_feature(void __iomem *ioaddr,/* MAC HW feature 3 */ hw_cap =readl (ioaddr +XGMAC_HW_FEATURE3 ); + dma_cap->estwid = (hw_cap &XGMAC_HWFEAT_ESTWID ) >>23 ; + dma_cap->estdep = (hw_cap &XGMAC_HWFEAT_ESTDEP ) >>20 ; + dma_cap->estsel = (hw_cap &XGMAC_HWFEAT_ESTSEL ) >>19 ; dma_cap->asp = (hw_cap &XGMAC_HWFEAT_ASP ) >>14 ; dma_cap->dvlan = (hw_cap &XGMAC_HWFEAT_DVLAN ) >>13 ; dma_cap->frpes = (hw_cap &XGMAC_HWFEAT_FRPES ) >>11 ;
Signature · 1 line
2.7.4
PATCH 3/7 net: stmmac: Integrate EST with TAPRIO scheduler API
In reply to Jose AbreuNow that we have the EST code for XGMAC and QoS we can use it with the TAPRIO scheduler. Integrate it into the main driver and use the API to configure the EST feature.
---
Cc: Giuseppe Cavallaro <[email protected]>
Cc: Alexandre Torgue <[email protected]>
Cc: Jose Abreu <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Maxime Coquelin <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
--- drivers/net/ethernet/stmicro/stmmac/hwif.h | 5 + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 108 ++++++++++++++++++++++ 3 files changed, 115 insertions(+)
drivers/net/ethernet/stmicro/stmmac/hwif.h +5 -0
@@ -519,6 +519,7 @@ struct stmmac_priv;struct tc_cls_u32_offload ;struct tc_cbs_qopt_offload ;struct flow_cls_offload ; +struct tc_taprio_qopt_offload ;struct stmmac_tc_ops {int (*init)(struct stmmac_priv *priv);
@@ -528,6 +529,8 @@ struct stmmac_tc_ops { struct tc_cbs_qopt_offload *qopt);int (*setup_cls)(struct stmmac_priv *priv,struct flow_cls_offload *cls); +int (*setup_taprio)(struct stmmac_priv *priv, +struct tc_taprio_qopt_offload *qopt); }; #define stmmac_tc_init(__priv, __args...) \
@@ -538,6 +541,8 @@ struct stmmac_tc_ops { stmmac_do_callback(__priv, tc, setup_cbs, __args) #define stmmac_tc_setup_cls(__priv, __args...) \ stmmac_do_callback(__priv, tc, setup_cls, __args) +#define stmmac_tc_setup_taprio(__priv, __args...) \ + stmmac_do_callback(__priv, tc, setup_taprio, __args)struct stmmac_counters ;
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +2 -0
@@ -4066,6 +4066,8 @@ static int stmmac_setup_tc(struct net_device *ndev, enum tc_setup_type type, priv, priv, true);case TC_SETUP_QDISC_CBS :return stmmac_tc_setup_cbs (priv, priv, type_data); +case TC_SETUP_QDISC_TAPRIO : +return stmmac_tc_setup_taprio (priv, priv, type_data);default :return -EOPNOTSUPP ; }
drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c +108 -0
117 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 4/7 net: stmmac: Add Frame Preemption support using TAPRIO API
In reply to Jose AbreuAdds the support for Frame Preemption using TAPRIO API. This works along with EST feature and allows to select if preemptable traffic shall be sent during specific queues opening time.
---
Cc: Giuseppe Cavallaro <[email protected]>
Cc: Alexandre Torgue <[email protected]>
Cc: Jose Abreu <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Maxime Coquelin <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
--- drivers/net/ethernet/stmicro/stmmac/common.h | 1 + drivers/net/ethernet/stmicro/stmmac/hwif.h | 4 ++++ drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 29 ++++++++++++++++++++++++- 3 files changed, 33 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/common.h +1 -0
@@ -367,6 +367,7 @@ struct dma_features {unsigned int estwid;unsigned int estdep;unsigned int estsel; +unsigned int fpesel; };/* GMAC TX FIFO is 8K, Rx FIFO is 16K */
drivers/net/ethernet/stmicro/stmmac/hwif.h +4 -0
@@ -374,6 +374,8 @@ struct stmmac_ops {void (*set_arp_offload)(struct mac_device_info *hw,bool en,u32 addr);int (*est_configure)(void __iomem *ioaddr,struct stmmac_est *cfg,unsigned int ptp_rate); +void (*fpe_configure)(void __iomem *ioaddr,u32 num_txq,u32 num_rxq, +bool enable); }; #define stmmac_core_init(__priv, __args...) \
@@ -462,6 +464,8 @@ struct stmmac_ops { stmmac_do_void_callback(__priv, mac, set_arp_offload, __args) #define stmmac_est_configure(__priv, __args...) \ stmmac_do_callback(__priv, mac, est_configure, __args) +#define stmmac_fpe_configure(__priv, __args...) \ + stmmac_do_void_callback(__priv, mac, fpe_configure, __args)/* PTP and HW Timer helpers */ struct stmmac_hwtimestamp {
drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c +28 -1
@@ -597,6 +597,7 @@ static int tc_setup_taprio(struct stmmac_priv *priv,u32 size, wid = priv->dma_cap.estwid, dep = priv->dma_cap.estdep;struct plat_stmmacenet_data *plat = priv->plat;struct timespec64 time; +bool fpe = false;int i, ret =0 ;if (!priv->dma_cap.estsel)
@@ -667,8 +668,23 @@ static int tc_setup_taprio(struct stmmac_priv *priv,return -ERANGE ;if (gates >GENMASK (31 - wid,0 ))return -ERANGE ; -if (qopt->entries[i].command !=TC_TAPRIO_CMD_SET_GATES ) + +switch (qopt->entries[i].command) { +case TC_TAPRIO_CMD_SET_GATES : +if (fpe) +return -EINVAL ; +break ; +case TC_TAPRIO_CMD_SET_AND_HOLD : + gates |=BIT (0 ); + fpe = true; +break ; +case TC_TAPRIO_CMD_SET_AND_RELEASE : + gates &= ~BIT (0 ); + fpe = true; +break ; +default :return -EOPNOTSUPP ; + } priv->plat->est->gcl[i] = delta_ns | (gates << wid); }
@@ -681,6 +697,17 @@ static int tc_setup_taprio(struct stmmac_priv *priv, priv->plat->est->ctr[0 ] = (u32)(qopt->cycle_time %NSEC_PER_SEC ); priv->plat->est->ctr[1 ] = (u32)(qopt->cycle_time /NSEC_PER_SEC ); +if (fpe && !priv->dma_cap.fpesel) +return -EOPNOTSUPP ; + + ret =stmmac_fpe_configure (priv, priv->ioaddr, + priv->plat->tx_queues_to_use, + priv->plat->rx_queues_to_use, fpe); +if (ret && fpe) { +netdev_err (priv->dev,"failed to enable Frame Preemption\n" ); +return ret; + } + ret =stmmac_est_configure (priv, priv->ioaddr, priv->plat->est, priv->plat->clk_ptp_rate);if (ret) {
Signature · 1 line
2.7.4
PATCH 5/7 net: stmmac: gmac5+: Add support for Frame Preemption
In reply to Jose AbreuAdds the HW specific support for Frame Preemption on GMAC5+ cores.
---
Cc: Giuseppe Cavallaro <[email protected]>
Cc: Alexandre Torgue <[email protected]>
Cc: Jose Abreu <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Maxime Coquelin <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
--- drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 3 +++ drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 ++ drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 1 + drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 23 +++++++++++++++++++++++ drivers/net/ethernet/stmicro/stmmac/dwmac5.h | 5 +++++ 5 files changed, 34 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac4.h +3 -0
@@ -64,6 +64,8 @@#define GMAC_RXQCTRL_MCBCQEN_SHIFT 20#define GMAC_RXQCTRL_TACPQE BIT(21)#define GMAC_RXQCTRL_TACPQE_SHIFT 21 +#define GMAC_RXQCTRL_FPRQ GENMASK(26, 24) +#define GMAC_RXQCTRL_FPRQ_SHIFT 24/* MAC Packet Filtering */ #define GMAC_PACKET_FILTER_PR BIT(0)
@@ -237,6 +239,7 @@ enum power_event {/* MAC HW features3 bitmap */ #define GMAC_HW_FEAT_ASP GENMASK(29, 28) +#define GMAC_HW_FEAT_FPESEL BIT(26)#define GMAC_HW_FEAT_ESTWID GENMASK(21, 20)#define GMAC_HW_FEAT_ESTDEP GENMASK(19, 17)#define GMAC_HW_FEAT_ESTSEL BIT(16)
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +2 -0
@@ -985,6 +985,7 @@ const struct stmmac_ops dwmac410_ops = { .config_l3_filter = dwmac4_config_l3_filter, .config_l4_filter = dwmac4_config_l4_filter, .est_configure = dwmac5_est_configure, + .fpe_configure = dwmac5_fpe_configure, };const struct stmmac_ops dwmac510_ops = {
@@ -1029,6 +1030,7 @@ const struct stmmac_ops dwmac510_ops = { .config_l3_filter = dwmac4_config_l3_filter, .config_l4_filter = dwmac4_config_l4_filter, .est_configure = dwmac5_est_configure, + .fpe_configure = dwmac5_fpe_configure, };int dwmac4_setup (struct stmmac_priv *priv)
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c +1 -0
@@ -404,6 +404,7 @@ static void dwmac4_get_hw_feature(void __iomem *ioaddr,/* 5.10 Features */ dma_cap->asp = (hw_cap &GMAC_HW_FEAT_ASP ) >>28 ; + dma_cap->fpesel = (hw_cap &GMAC_HW_FEAT_FPESEL ) >>26 ; dma_cap->estwid = (hw_cap &GMAC_HW_FEAT_ESTWID ) >>20 ; dma_cap->estdep = (hw_cap &GMAC_HW_FEAT_ESTDEP ) >>17 ; dma_cap->estsel = (hw_cap &GMAC_HW_FEAT_ESTSEL ) >>16 ;
drivers/net/ethernet/stmicro/stmmac/dwmac5.c +23 -0
@@ -645,3 +645,26 @@ int dwmac5_est_configure(void __iomem *ioaddr, struct stmmac_est *cfg,writel (ctrl, ioaddr +MTL_EST_CONTROL );return 0 ; } + +void dwmac5_fpe_configure (void __iomem *ioaddr,u32 num_txq,u32 num_rxq, +bool enable) +{ +u32 value; + +if (!enable) { + value =readl (ioaddr +MAC_FPE_CTRL_STS ); + + value &= ~EFPE ; + +writel (value, ioaddr +MAC_FPE_CTRL_STS ); + } + + value =readl (ioaddr +GMAC_RXQ_CTRL1 ); + value &= ~GMAC_RXQCTRL_FPRQ ; + value |= (num_rxq -1 ) <<GMAC_RXQCTRL_FPRQ_SHIFT ; +writel (value, ioaddr +GMAC_RXQ_CTRL1 ); + + value =readl (ioaddr +MAC_FPE_CTRL_STS ); + value |=EFPE ; +writel (value, ioaddr +MAC_FPE_CTRL_STS ); +}
drivers/net/ethernet/stmicro/stmmac/dwmac5.h +5 -0
@@ -11,6 +11,9 @@#define PRTYEN BIT(1)#define TMOUTEN BIT(0) +#define MAC_FPE_CTRL_STS 0x00000234 +#define EFPE BIT(0) +#define MAC_PPS_CONTROL 0x00000b70#define PPS_MAXIDX (x) ((((x) + 1) * 8) - 1)#define PPS_MINIDX (x) ((x) * 8)
@@ -102,5 +105,7 @@ int dwmac5_flex_pps_config(void __iomem *ioaddr, int index, u32 sub_second_inc, u32 systime_flags);int dwmac5_est_configure (void __iomem *ioaddr,struct stmmac_est *cfg,unsigned int ptp_rate); +void dwmac5_fpe_configure (void __iomem *ioaddr,u32 num_txq,u32 num_rxq, +bool enable);#endif /* __DWMAC5_H__ */
Signature · 1 line
2.7.4
PATCH 6/7 net: stmmac: xgmac3+: Add support for Frame Preemption
In reply to Jose AbreuAdds the HW specific support for Frame Preemption on XGMAC3+ cores.
---
Cc: Giuseppe Cavallaro <[email protected]>
Cc: Alexandre Torgue <[email protected]>
Cc: Jose Abreu <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Maxime Coquelin <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
--- drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 6 ++++++ .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 24 ++++++++++++++++++++++ drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 1 + 3 files changed, 31 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h +6 -0
@@ -73,6 +73,9 @@#define XGMAC_RXQ_CTRL0 0x000000a0#define XGMAC_RXQEN (x) GENMASK((x) * 2 + 1, (x) * 2)#define XGMAC_RXQEN_SHIFT (x) ((x) * 2) +#define XGMAC_RXQ_CTRL1 0x000000a4 +#define XGMAC_RQ GENMASK(7, 4) +#define XGMAC_RQ_SHIFT 4#define XGMAC_RXQ_CTRL2 0x000000a8#define XGMAC_RXQ_CTRL3 0x000000ac#define XGMAC_PSRQ (x) GENMASK((x) * 8 + 7, (x) * 8)
@@ -136,6 +139,7 @@#define XGMAC_HWFEAT_TXQCNT GENMASK(9, 6)#define XGMAC_HWFEAT_RXQCNT GENMASK(3, 0)#define XGMAC_HW_FEATURE3 0x00000128 +#define XGMAC_HWFEAT_FPESEL BIT(26)#define XGMAC_HWFEAT_ESTWID GENMASK(24, 23)#define XGMAC_HWFEAT_ESTDEP GENMASK(22, 20)#define XGMAC_HWFEAT_ESTSEL BIT(19)
@@ -151,6 +155,8 @@#define XGMAC_MDIO_ADDR 0x00000200#define XGMAC_MDIO_DATA 0x00000204#define XGMAC_MDIO_C22P 0x00000220 +#define XGMAC_FPE_CTRL_STS 0x00000280 +#define XGMAC_EFPE BIT(0)#define XGMAC_ADDRx_HIGH (x) (0x00000300 + (x) * 0x8)#define XGMAC_ADDR_MAX 32#define XGMAC_AE BIT(31)
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c +24 -0
@@ -1410,6 +1410,29 @@ static int dwxgmac3_est_configure(void __iomem *ioaddr, struct stmmac_est *cfg,return 0 ; } +static void dwxgmac3_fpe_configure (void __iomem *ioaddr,u32 num_txq, +u32 num_rxq,bool enable) +{ +u32 value; + +if (!enable) { + value =readl (ioaddr +XGMAC_FPE_CTRL_STS ); + + value &= ~XGMAC_EFPE ; + +writel (value, ioaddr +XGMAC_FPE_CTRL_STS ); + } + + value =readl (ioaddr +XGMAC_RXQ_CTRL1 ); + value &= ~XGMAC_RQ ; + value |= (num_rxq -1 ) <<XGMAC_RQ_SHIFT ; +writel (value, ioaddr +XGMAC_RXQ_CTRL1 ); + + value =readl (ioaddr +XGMAC_FPE_CTRL_STS ); + value |=XGMAC_EFPE ; +writel (value, ioaddr +XGMAC_FPE_CTRL_STS ); +} +const struct stmmac_ops dwxgmac210_ops = { .core_init = dwxgmac2_core_init, .set_mac = dwxgmac2_set_mac,
@@ -1454,6 +1477,7 @@ const struct stmmac_ops dwxgmac210_ops = { .config_l4_filter = dwxgmac2_config_l4_filter, .set_arp_offload = dwxgmac2_set_arp_offload, .est_configure = dwxgmac3_est_configure, + .fpe_configure = dwxgmac3_fpe_configure, };int dwxgmac2_setup (struct stmmac_priv *priv)
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c +1 -0
@@ -413,6 +413,7 @@ static void dwxgmac2_get_hw_feature(void __iomem *ioaddr,/* MAC HW feature 3 */ hw_cap =readl (ioaddr +XGMAC_HW_FEATURE3 ); + dma_cap->fpesel = (hw_cap &XGMAC_HWFEAT_FPESEL ) >>26 ; dma_cap->estwid = (hw_cap &XGMAC_HWFEAT_ESTWID ) >>23 ; dma_cap->estdep = (hw_cap &XGMAC_HWFEAT_ESTDEP ) >>20 ; dma_cap->estsel = (hw_cap &XGMAC_HWFEAT_ESTSEL ) >>19 ;
Signature · 1 line
2.7.4
PATCH 7/7 net: stmmac: mmc: Add Frame Preemption counters on GMAC5+ cores
In reply to Jose AbreuThis can be useful for debug. Add these counters on GMAC5+ cores just like we did for XGMAC.
---
Cc: Giuseppe Cavallaro <[email protected]>
Cc: Alexandre Torgue <[email protected]>
Cc: Jose Abreu <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Maxime Coquelin <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
--- drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/net/ethernet/stmicro/stmmac/mmc_core.c +16 -0
@@ -119,6 +119,13 @@#define MMC_RX_ICMP_GD_OCTETS 0x180#define MMC_RX_ICMP_ERR_OCTETS 0x184 +#define MMC_TX_FPE_FRAG 0x1a8 +#define MMC_TX_HOLD_REQ 0x1ac +#define MMC_RX_PKT_ASSEMBLY_ERR 0x1c8 +#define MMC_RX_PKT_SMD_ERR 0x1cc +#define MMC_RX_PKT_ASSEMBLY_OK 0x1d0 +#define MMC_RX_FPE_FRAG 0x1d4 +/* XGMAC MMC Registers */ #define MMC_XGMAC_TX_OCTET_GB 0x14#define MMC_XGMAC_TX_PKT_GB 0x1c
@@ -315,6 +322,15 @@ static void dwmac_mmc_read(void __iomem *mmcaddr, struct stmmac_counters *mmc) mmc->mmc_rx_tcp_err_octets +=readl (mmcaddr +MMC_RX_TCP_ERR_OCTETS ); mmc->mmc_rx_icmp_gd_octets +=readl (mmcaddr +MMC_RX_ICMP_GD_OCTETS ); mmc->mmc_rx_icmp_err_octets +=readl (mmcaddr +MMC_RX_ICMP_ERR_OCTETS ); + + mmc->mmc_tx_fpe_fragment_cntr +=readl (mmcaddr +MMC_TX_FPE_FRAG ); + mmc->mmc_tx_hold_req_cntr +=readl (mmcaddr +MMC_TX_HOLD_REQ ); + mmc->mmc_rx_packet_assembly_err_cntr += +readl (mmcaddr +MMC_RX_PKT_ASSEMBLY_ERR ); + mmc->mmc_rx_packet_smd_err_cntr +=readl (mmcaddr +MMC_RX_PKT_SMD_ERR ); + mmc->mmc_rx_packet_assembly_ok_cntr += +readl (mmcaddr +MMC_RX_PKT_ASSEMBLY_OK ); + mmc->mmc_rx_fpe_fragment_cntr +=readl (mmcaddr +MMC_RX_FPE_FRAG ); }const struct stmmac_mmc_ops dwmac_mmc_ops = {
Signature · 1 line
2.7.4
David Miller
maintainerFrom: Jose Abreu <[email protected]>
Date: Wed, 18 Dec 2019 11:33:04 +0100
Quoted 8 lines
This series adds TSN support (EST and Frame Preemption) for stmmac driver.
1) Adds the HW specific support for EST in GMAC5+ cores.
2) Adds the HW specific support for EST in XGMAC3+ cores.
3) Integrates EST HW specific support with TAPRIO scheduler API.
Quoted 8 lines
4) Adds the Frame Preemption suppor on stmmac TAPRIO implementation.
5) Adds the HW specific support for Frame Preemption in GMAC5+ cores.
6) Adds the HW specific support for Frame Preemption in XGMAC3+ cores.
7) Adds support for HW debug counters for Frame Preemption available in GMAC5+ cores.
Series applied, thanks.