net: stmmac: Improvements for -next
Subsystems (4)
cover net: stmmac: Improvements for -next
Misc improvements for stmmac.
Patch 1/3, adds the support for Split Header feature in GMAC4+ cores. This was already available for XGMAC and now with this change it is supported in all relevant cores.
Patch 2/3, adds the support for C45 MDIO callbacks in XGMAC cores.
Patch 3/3, removes the speed dependency in TC CBS callbacks because XGMAC3 supports CBS feature at speeds up to 10Gbps
---
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 (3):
net: stmmac: gmac4+: Add Split Header support
net: stmmac: xgmac: Add C45 PHY support in the MDIO callbacks
net: stmmac: tc: Remove the speed dependency
drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 7 ++++ drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 21 ++++++++-- drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.h | 1 + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 19 +++++++++ drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h | 1 + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 47 ++++++++++++++++++++-- drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 2 - 7 files changed, 89 insertions(+), 9 deletions(-)
Signature · 1 line
2.7.4
PATCH 1/3 net: stmmac: gmac4+: Add Split Header support
GMAC4+ cores also support the Split Header feature.
Add the support for Split Header feature in the RX path following the same implementation logic that XGMAC followed.
---
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 | 7 +++++++ drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 21 ++++++++++++++++++--- drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.h | 1 + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 19 +++++++++++++++++++ drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h | 1 + 5 files changed, 46 insertions(+), 3 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac4.h +7 -0
@@ -14,6 +14,7 @@/* MAC registers */ #define GMAC_CONFIG 0x00000000 +#define GMAC_EXT_CONFIG 0x00000004#define GMAC_PACKET_FILTER 0x00000008#define GMAC_HASH_TAB (x) (0x10 + (x) * 4)#define GMAC_VLAN_TAG 0x00000050
@@ -188,6 +189,11 @@ enum power_event {#define GMAC_CONFIG_TE BIT(1)#define GMAC_CONFIG_RE BIT(0) +/* MAC extended config */ +#define GMAC_CONFIG_HDSMS GENMASK(22, 20) +#define GMAC_CONFIG_HDSMS_SHIFT 20 +#define GMAC_CONFIG_HDSMS_256 (0x2 << GMAC_CONFIG_HDSMS_SHIFT) +/* MAC HW features0 bitmap */ #define GMAC_HW_FEAT_SAVLANINS BIT(27)#define GMAC_HW_FEAT_ADDMAC BIT(18)
@@ -211,6 +217,7 @@ enum power_event {#define GMAC_HW_HASH_TB_SZ GENMASK(25, 24)#define GMAC_HW_FEAT_AVSEL BIT(20)#define GMAC_HW_TSOEN BIT(18) +#define GMAC_HW_FEAT_SPHEN BIT(17)#define GMAC_HW_ADDR64 GENMASK(15, 14)#define GMAC_HW_TXFIFOSIZE GENMASK(10, 6)#define GMAC_HW_RXFIFOSIZE GENMASK(4, 0)
drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c +18 -3
@@ -83,9 +83,10 @@ static int dwmac4_wrback_get_rx_status(void *data, struct stmmac_extra_stats *x,if (unlikely (rdes3 &RDES3_OWN ))return dma_own; -/* Verify rx error by looking at the last segment. */ -if (likely (!(rdes3 &RDES3_LAST_DESCRIPTOR ))) +if (unlikely (rdes3 &RDES3_CONTEXT_DESCRIPTOR ))return discard_frame; +if (likely (!(rdes3 &RDES3_LAST_DESCRIPTOR ))) +return rx_not_ls;if (unlikely (rdes3 &RDES3_ERROR_SUMMARY )) {if (unlikely (rdes3 &RDES3_GIANT_PACKET ))
@@ -188,7 +189,7 @@ static void dwmac4_set_tx_owner(struct dma_desc *p)static void dwmac4_set_rx_owner (struct dma_desc *p,int disable_rx_ic) { - p->des3 =cpu_to_le32 (RDES3_OWN |RDES3_BUFFER1_VALID_ADDR ); + p->des3 |=cpu_to_le32 (RDES3_OWN |RDES3_BUFFER1_VALID_ADDR );if (!disable_rx_ic) p->des3 |=cpu_to_le32 (RDES3_INT_ON_COMPLETION_EN );
@@ -492,6 +493,18 @@ static void dwmac4_set_vlan(struct dma_desc *p, u32 type) p->des2 |=cpu_to_le32 (type &TDES2_VLAN_TAG_MASK ); } +static int dwmac4_get_rx_header_len (struct dma_desc *p,unsigned int *len) +{ + *len =le32_to_cpu (p->des2) &RDES2_HL ; +return 0 ; +} + +static void dwmac4_set_sec_addr (struct dma_desc *p,dma_addr_t addr) +{ + p->des2 =cpu_to_le32 (lower_32_bits (addr)); + p->des3 =cpu_to_le32 (upper_32_bits (addr) |RDES3_BUFFER2_VALID_ADDR ); +} +const struct stmmac_desc_ops dwmac4_desc_ops = { .tx_status = dwmac4_wrback_get_tx_status, .rx_status = dwmac4_wrback_get_rx_status,
@@ -519,6 +532,8 @@ const struct stmmac_desc_ops dwmac4_desc_ops = { .set_sarc = dwmac4_set_sarc, .set_vlan_tag = dwmac4_set_vlan_tag, .set_vlan = dwmac4_set_vlan, + .get_rx_header_len = dwmac4_get_rx_header_len, + .set_sec_addr = dwmac4_set_sec_addr, };const struct stmmac_mode_ops dwmac4_ring_mode_ops = {
drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.h +1 -0
@@ -109,6 +109,7 @@#define RDES2_L4_FILTER_MATCH BIT(28)#define RDES2_L3_L4_FILT_NB_MATCH_MASK GENMASK(27, 26)#define RDES2_L3_L4_FILT_NB_MATCH_SHIFT 26 +#define RDES2_HL GENMASK(9, 0)/* RDES3 (write back format) */ #define RDES3_PACKET_SIZE_MASK GENMASK(14, 0)
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c +19 -0
@@ -368,6 +368,7 @@ static void dwmac4_get_hw_feature(void __iomem *ioaddr, dma_cap->hash_tb_sz = (hw_cap &GMAC_HW_HASH_TB_SZ ) >>24 ; dma_cap->av = (hw_cap &GMAC_HW_FEAT_AVSEL ) >>20 ; dma_cap->tsoen = (hw_cap &GMAC_HW_TSOEN ) >>18 ; + dma_cap->sphen = (hw_cap &GMAC_HW_FEAT_SPHEN ) >>17 ; dma_cap->addr64 = (hw_cap &GMAC_HW_ADDR64 ) >>14 ;switch (dma_cap->addr64) {
@@ -460,6 +461,22 @@ static void dwmac4_set_bfsize(void __iomem *ioaddr, int bfsize, u32 chan)writel (value, ioaddr +DMA_CHAN_RX_CONTROL (chan)); } +static void dwmac4_enable_sph (void __iomem *ioaddr,bool en,u32 chan) +{ +u32 value =readl (ioaddr +GMAC_EXT_CONFIG ); + + value &= ~GMAC_CONFIG_HDSMS ; + value |=GMAC_CONFIG_HDSMS_256 ;/* Segment max 256 bytes */ +writel (value, ioaddr +GMAC_EXT_CONFIG ); + + value =readl (ioaddr +DMA_CHAN_CONTROL (chan)); +if (en) + value |=DMA_CONTROL_SPH ; +else + value &= ~DMA_CONTROL_SPH ; +writel (value, ioaddr +DMA_CHAN_CONTROL (chan)); +} +const struct stmmac_dma_ops dwmac4_dma_ops = { .reset = dwmac4_dma_reset, .init = dwmac4_dma_init,
@@ -486,6 +503,7 @@ const struct stmmac_dma_ops dwmac4_dma_ops = { .enable_tso = dwmac4_enable_tso, .qmode = dwmac4_qmode, .set_bfsize = dwmac4_set_bfsize, + .enable_sph = dwmac4_enable_sph, };const struct stmmac_dma_ops dwmac410_dma_ops = {
@@ -514,4 +532,5 @@ const struct stmmac_dma_ops dwmac410_dma_ops = { .enable_tso = dwmac4_enable_tso, .qmode = dwmac4_qmode, .set_bfsize = dwmac4_set_bfsize, + .enable_sph = dwmac4_enable_sph, };
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h +1 -0
@@ -110,6 +110,7 @@#define DMA_CHAN_STATUS (x) (DMA_CHANX_BASE_ADDR(x) + 0x60)/* DMA Control X */ +#define DMA_CONTROL_SPH BIT(24)#define DMA_CONTROL_MSS_MASK GENMASK(13, 0)/* DMA Tx Channel X Control register defines */
Signature · 1 line
2.7.4
PATCH 2/3 net: stmmac: xgmac: Add C45 PHY support in the MDIO callbacks
In reply to Jose AbreuAdd the support for C45 PHYs in the MDIO callbacks for XGMAC. This was tested using Synopsys DesignWare XPCS.
---
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/stmmac_mdio.c | 47 +++++++++++++++++++++-- 1 file changed, 43 insertions(+), 4 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c +43 -4
@@ -41,6 +41,29 @@#define MII_XGMAC_BUSY BIT(22)#define MII_XGMAC_MAX_C22ADDR 3#define MII_XGMAC_C22P_MASK GENMASK(MII_XGMAC_MAX_C22ADDR, 0) +#define MII_XGMAC_PA_SHIFT 16 +#define MII_XGMAC_DA_SHIFT 21 + +static int stmmac_xgmac2_c45_format (struct stmmac_priv *priv,int phyaddr, +int phyreg,u32 *hw_addr) +{ +unsigned int mii_data = priv->hw->mii.data; +u32 tmp; + +/* Wait until any existing MII operation is complete */ +if (readl_poll_timeout (priv->ioaddr + mii_data, tmp, + !(tmp &MII_XGMAC_BUSY ),100 ,10000 )) +return -EBUSY ; + +/* Set port as Clause 45 */ + tmp =readl (priv->ioaddr +XGMAC_MDIO_C22P ); + tmp &= ~BIT (phyaddr); +writel (tmp, priv->ioaddr +XGMAC_MDIO_C22P ); + + *hw_addr = (phyaddr <<MII_XGMAC_PA_SHIFT ) | (phyreg &0xffff ); + *hw_addr |= (phyreg >>MII_DEVADDR_C45_SHIFT ) <<MII_XGMAC_DA_SHIFT ; +return 0 ; +}static int stmmac_xgmac2_c22_format (struct stmmac_priv *priv,int phyaddr,int phyreg,u32 *hw_addr)
@@ -76,16 +99,22 @@ static int stmmac_xgmac2_mdio_read(struct mii_bus *bus, int phyaddr, int phyreg)int ret;if (phyreg &MII_ADDR_C45 ) { -return -EOPNOTSUPP ; + phyreg &= ~MII_ADDR_C45 ; + + ret =stmmac_xgmac2_c45_format (priv, phyaddr, phyreg, &addr); +if (ret) +return ret; }else { ret =stmmac_xgmac2_c22_format (priv, phyaddr, phyreg, &addr);if (ret)return ret; + + value |=MII_XGMAC_SADDR ; } value |= (priv->clk_csr << priv->hw->mii.clk_csr_shift) & priv->hw->mii.clk_csr_mask; - value |=MII_XGMAC_SADDR |MII_XGMAC_READ ; + value |=MII_XGMAC_READ ;/* Wait until any existing MII operation is complete */ if (readl_poll_timeout(priv->ioaddr + mii_data, tmp,
@@ -116,16 +145,22 @@ static int stmmac_xgmac2_mdio_write(struct mii_bus *bus, int phyaddr,int ret;if (phyreg &MII_ADDR_C45 ) { -return -EOPNOTSUPP ; + phyreg &= ~MII_ADDR_C45 ; + + ret =stmmac_xgmac2_c45_format (priv, phyaddr, phyreg, &addr); +if (ret) +return ret; }else { ret =stmmac_xgmac2_c22_format (priv, phyaddr, phyreg, &addr);if (ret)return ret; + + value |=MII_XGMAC_SADDR ; } value |= (priv->clk_csr << priv->hw->mii.clk_csr_shift) & priv->hw->mii.clk_csr_mask; - value |= phydata |MII_XGMAC_SADDR ; + value |= phydata; value |=MII_XGMAC_WRITE ;/* Wait until any existing MII operation is complete */
@@ -363,6 +398,10 @@ int stmmac_mdio_register(struct net_device *ndev) goto bus_register_fail; } +/* Looks like we need a dummy read for XGMAC only and C45 PHYs */ +if (priv->plat->has_xgmac) +stmmac_xgmac2_mdio_read (new_bus,0 ,MII_ADDR_C45 ); +if (priv->plat->phy_node || mdio_node) goto bus_register_done;
Signature · 1 line
2.7.4
Re: [PATCH net-next 2/3] net: stmmac: xgmac: Add C45 PHY support in the MDIO callbacks
Quoted 30 lines · Jose Abreu
Add the support for C45 PHYs in the MDIO callbacks for XGMAC. This was tested using Synopsys DesignWare XPCS.
Signed-off-by Jose Abreu <[email protected]>---
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/stmmac_mdio.c | 47 +++++++++++++++++++++-- 1 file changed, 43 insertions(+), 4 deletions(-)drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c +3
-0@@ -41,6 +41,29 @@#define MII_XGMAC_BUSY BIT(22)#define MII_XGMAC_MAX_C22ADDR 3#define MII_XGMAC_C22P_MASK GENMASK(MII_XGMAC_MAX_C22ADDR, 0) +#define MII_XGMAC_PA_SHIFT 16 +#define MII_XGMAC_DA_SHIFT 21 +
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c line 56
Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c +10
-0+static int stmmac_xgmac2_c45_format (struct stmmac_priv *priv,int phyaddr, +int phyreg,u32 *hw_addr) +{ +unsigned int mii_data = priv->hw->mii.data; +u32 tmp; + +/* Wait until any existing MII operation is complete */ +if (readl_poll_timeout (priv->ioaddr + mii_data, tmp, + !(tmp &MII_XGMAC_BUSY ),100 ,10000 )) +return -EBUSY ;
Hi Jose
The stmmac_xgmac2_c22_format function does the same. Maybe the call can be pulled out into stmmac_xgmac2_mdio_write() and stmmac_xgmac2_mdio_read()?
Andrew
PATCH 3/3 net: stmmac: tc: Remove the speed dependency
In reply to Jose AbreuXGMAC3 supports full CBS features with speeds that can go up to 10G so we can now remove the maximum speed check of CBS.
---
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/stmmac_tc.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c +0 -2
@@ -321,8 +321,6 @@ static int tc_setup_cbs(struct stmmac_priv *priv,return -EINVAL ;if (!priv->dma_cap.av)return -EOPNOTSUPP ; -if (priv->speed !=SPEED_100 && priv->speed !=SPEED_1000 ) -return -EOPNOTSUPP ; mode_to_use = priv->plat->tx_queues_cfg[queue].mode_to_use;if (mode_to_use ==MTL_QUEUE_DCB && qopt->enable) {
Signature · 1 line
2.7.4