net: stmmac: add new features to xgmac
Subsystems (5)
v2 cover net: stmmac: add new features to xgmac
This series add below new features to xgmac:
correct RX COE parsing
add more feature parsing from hw cap enlarge C22 ADDR and rx/tx channels support parse safety ce/ue irq from DT support per channel irq
Since v1:
- remove "_irq" suffix from safety irqs dt binding
- remove "snps,per-channel-interrupt" dt binding, check the channel irq instead.
- more renaming about "msi" to reflect per channel irq isn't MSI specific
Jisheng Zhang (10):
net: stmmac: correct RX COE parsing for xgmac
net: stmmac: xgmac: add more feature parsing from hw cap
net: stmmac: mdio: enlarge the max XGMAC C22 ADDR to 31
net: stmmac: enlarge max rx/tx queues and channels to 16
net: stmmac: reflect multi irqs for tx/rx channels and mac and safety
net: stmmac: xgmac: support per-channel irq
dt-bindings: net: snps,dwmac: add safety irq support
net: stmmac: platform: support parsing safety irqs from DT
dt-bindings: net: snps,dwmac: add per channel irq support
net: stmmac: platform: support parsing per channel irq from DT
.../devicetree/bindings/net/snps,dwmac.yaml | 37 +++++++++++++ .../net/ethernet/stmicro/stmmac/dwmac-intel.c | 4 +- .../net/ethernet/stmicro/stmmac/dwmac4_dma.c | 2 +- .../net/ethernet/stmicro/stmmac/dwxgmac2.h | 5 ++ .../ethernet/stmicro/stmmac/dwxgmac2_core.c | 5 +- .../ethernet/stmicro/stmmac/dwxgmac2_dma.c | 37 ++++++++----- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 54 ++++++++++--------- .../net/ethernet/stmicro/stmmac/stmmac_mdio.c | 2 +- .../ethernet/stmicro/stmmac/stmmac_platform.c | 35 ++++++++++++ include/linux/stmmac.h | 10 ++-- 10 files changed, 140 insertions(+), 51 deletions(-)
Signature · 1 line
2.40.1
PATCH v2 1/10 net: stmmac: correct RX COE parsing for xgmac
xgmac can support RX COE, but there's no two kinds of COE, I.E type 1 and type 2 COE.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +2 -2
@@ -6271,7 +6271,7 @@ static int stmmac_dma_cap_show(struct seq_file *seq, void *v)seq_printf (seq,"\tAV features: %s\n" , (priv->dma_cap.av) ?"Y" :"N" );seq_printf (seq,"\tChecksum Offload in TX: %s\n" , (priv->dma_cap.tx_coe) ?"Y" :"N" ); -if (priv->synopsys_id >=DWMAC_CORE_4_00 ) { +if (priv->synopsys_id >=DWMAC_CORE_4_00 || priv->plat->has_xgmac) {seq_printf (seq,"\tIP Checksum Offload in RX: %s\n" , (priv->dma_cap.rx_coe) ?"Y" :"N" ); }else {
@@ -7013,7 +7013,7 @@ static int stmmac_hw_init(struct stmmac_priv *priv)if (priv->plat->rx_coe) { priv->hw->rx_csum = priv->plat->rx_coe;dev_info (priv->device,"RX Checksum Offload Engine supported\n" ); -if (priv->synopsys_id <DWMAC_CORE_4_00 ) +if (priv->synopsys_id <DWMAC_CORE_4_00 && !priv->plat->has_xgmac)dev_info (priv->device,"COE Type %d\n" , priv->hw->rx_csum); }if (priv->plat->tx_coe)
Signature · 1 line
2.40.1
PATCH v2 2/10 net: stmmac: xgmac: add more feature parsing from hw cap
In reply to Jisheng ZhangThe XGMAC_HWFEAT_GMIISEL bit also indicates whether support 10/100Mbps or not.
The XGMAC_HWFEAT_HDSEL bit indicates whether support half duplex or not.
The XGMAC_HWFEAT_ADDMACADRSEL bit indicates whether support Multiple MAC address registers or not.
The XGMAC_HWFEAT_SMASEL bit indicates whether support SMA (MDIO) Interface or not.
--- drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 3 +++ drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 4 ++++ 2 files changed, 7 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h +3 -0
@@ -111,6 +111,7 @@#define XGMAC_LPI_TIMER_CTRL 0x000000d4#define XGMAC_HW_FEATURE0 0x0000011c#define XGMAC_HWFEAT_SAVLANINS BIT(27) +#define XGMAC_HWFEAT_ADDMACADRSEL GENMASK(22, 18)#define XGMAC_HWFEAT_RXCOESEL BIT(16)#define XGMAC_HWFEAT_TXCOESEL BIT(14)#define XGMAC_HWFEAT_EEESEL BIT(13)
@@ -121,7 +122,9 @@#define XGMAC_HWFEAT_MMCSEL BIT(8)#define XGMAC_HWFEAT_MGKSEL BIT(7)#define XGMAC_HWFEAT_RWKSEL BIT(6) +#define XGMAC_HWFEAT_SMASEL BIT(5)#define XGMAC_HWFEAT_VLHASH BIT(4) +#define XGMAC_HWFEAT_HDSEL BIT(3)#define XGMAC_HWFEAT_GMIISEL BIT(1)#define XGMAC_HW_FEATURE1 0x00000120#define XGMAC_HWFEAT_L3L4FNUM GENMASK(30, 27)
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c +4 -0
@@ -406,6 +406,10 @@ static int dwxgmac2_get_hw_feature(void __iomem *ioaddr, dma_cap->pmt_remote_wake_up = (hw_cap &XGMAC_HWFEAT_RWKSEL ) >>6 ; dma_cap->vlhash = (hw_cap &XGMAC_HWFEAT_VLHASH ) >>4 ; dma_cap->mbps_1000 = (hw_cap &XGMAC_HWFEAT_GMIISEL ) >>1 ; + dma_cap->mbps_10_100 = (hw_cap &XGMAC_HWFEAT_GMIISEL ) >>1 ; + dma_cap->half_duplex = (hw_cap &XGMAC_HWFEAT_HDSEL ) >>3 ; + dma_cap->multi_addr = (hw_cap &XGMAC_HWFEAT_ADDMACADRSEL ) >>18 ; + dma_cap->sma_mdio = (hw_cap &XGMAC_HWFEAT_SMASEL ) >>5 ;/* MAC HW feature 1 */ hw_cap =readl (ioaddr +XGMAC_HW_FEATURE1 );
Signature · 1 line
2.40.1
PATCH v2 3/10 net: stmmac: mdio: enlarge the max XGMAC C22 ADDR to 31
In reply to Jisheng ZhangThe IP can support up to 31 xgmac c22 addresses now.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c +1 -1
@@ -40,7 +40,7 @@#define MII_XGMAC_WRITE (1 << MII_XGMAC_CMD_SHIFT)#define MII_XGMAC_READ (3 << MII_XGMAC_CMD_SHIFT)#define MII_XGMAC_BUSY BIT(22) -#define MII_XGMAC_MAX_C22ADDR 3 +#define MII_XGMAC_MAX_C22ADDR 31#define MII_XGMAC_C22P_MASK GENMASK(MII_XGMAC_MAX_C22ADDR, 0)#define MII_XGMAC_PA_SHIFT 16#define MII_XGMAC_DA_SHIFT 21
Signature · 1 line
2.40.1
PATCH v2 4/10 net: stmmac: enlarge max rx/tx queues and channels to 16
In reply to Jisheng Zhangxgmac supports up to 16 rx/tx queues and up to 16 channels.
--- drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 5 ++--- include/linux/stmmac.h | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c +2 -3
@@ -202,9 +202,8 @@ static void dwxgmac2_map_mtl_to_dma(struct mac_device_info *hw, u32 queue,void __iomem *ioaddr = hw->pcsr;u32 value, reg; - reg = (queue <4 ) ?XGMAC_MTL_RXQ_DMA_MAP0 :XGMAC_MTL_RXQ_DMA_MAP1 ; -if (queue >=4 ) - queue -=4 ; + reg =XGMAC_MTL_RXQ_DMA_MAP0 + (queue & ~0x3 ); + queue &=0x3 ; value =readl (ioaddr + reg); value &= ~XGMAC_QxMDMACH (queue);
include/linux/stmmac.h +3 -3
@@ -15,9 +15,9 @@#include <linux/platform_device.h> #include <linux/phy.h> -#define MTL_MAX_RX_QUEUES 8 -#define MTL_MAX_TX_QUEUES 8 -#define STMMAC_CH_MAX 8 +#define MTL_MAX_RX_QUEUES 16 +#define MTL_MAX_TX_QUEUES 16 +#define STMMAC_CH_MAX 16#define STMMAC_RX_COE_NONE 0#define STMMAC_RX_COE_TYPE1 1
Signature · 1 line
2.40.1
PATCH v2 5/10 net: stmmac: reflect multi irqs for tx/rx channels and mac and safety
In reply to Jisheng ZhangThe IP supports per channel interrupt, when intel adds the per channel interrupt support, the per channel irq is from MSI vector, but this feature can also be supported on non-MSI platforms. Do some necessary renaming to reflects this fact.
--- .../net/ethernet/stmicro/stmmac/dwmac-intel.c | 4 +- .../net/ethernet/stmicro/stmmac/dwmac4_dma.c | 2 +- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 48 +++++++++---------- include/linux/stmmac.h | 4 +- 4 files changed, 29 insertions(+), 29 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c +2 -2
@@ -953,7 +953,7 @@ static int stmmac_config_single_msi(struct pci_dev *pdev, res->irq =pci_irq_vector (pdev,0 ); res->wol_irq = res->irq; - plat->flags &= ~STMMAC_FLAG_MULTI_MSI_EN ; + plat->flags &= ~STMMAC_FLAG_PERCH_IRQ_EN ;dev_info (&pdev->dev,"%s: Single IRQ enablement successful\n" , __func__);
@@ -1005,7 +1005,7 @@ static int stmmac_config_multi_msi(struct pci_dev *pdev,if (plat->msi_sfty_ue_vec <STMMAC_MSI_VEC_MAX ) res->sfty_ue_irq =pci_irq_vector (pdev, plat->msi_sfty_ue_vec); - plat->flags |=STMMAC_FLAG_MULTI_MSI_EN ; + plat->flags |=STMMAC_FLAG_PERCH_IRQ_EN ;dev_info (&pdev->dev,"%s: multi MSI enablement successful\n" , __func__);return 0 ;
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c +1 -1
@@ -175,7 +175,7 @@ static void dwmac4_dma_init(void __iomem *ioaddr, value =readl (ioaddr +DMA_BUS_MODE ); -if (dma_cfg->multi_msi_en) { +if (dma_cfg->perch_irq_en) { value &= ~DMA_BUS_MODE_INTM_MASK ; value |= (DMA_BUS_MODE_INTM_MODE1 <<DMA_BUS_MODE_INTM_SHIFT ); }
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +24 -24
155 lines not on this page · raw message
include/linux/stmmac.h +2 -2
@@ -96,7 +96,7 @@ struct stmmac_dma_cfg {int mixed_burst;bool aal;bool eame; -bool multi_msi_en; +bool perch_irq_en;bool dche; };
@@ -211,7 +211,7 @@ struct dwmac4_addrs {#define STMMAC_FLAG_TSO_EN BIT(4)#define STMMAC_FLAG_SERDES_UP_AFTER_PHY_LINKUP BIT(5)#define STMMAC_FLAG_VLAN_FAIL_Q_EN BIT(6) -#define STMMAC_FLAG_MULTI_MSI_EN BIT(7) +#define STMMAC_FLAG_PERCH_IRQ_EN BIT(7)#define STMMAC_FLAG_EXT_SNAPSHOT_EN BIT(8)#define STMMAC_FLAG_INT_SNAPSHOT_EN BIT(9)#define STMMAC_FLAG_RX_CLK_RUNS_IN_LPI BIT(10)
Signature · 1 line
2.40.1
PATCH v2 6/10 net: stmmac: xgmac: support per-channel irq
In reply to Jisheng ZhangThe IP supports per channel interrupt, add support for this usage case.
--- .../net/ethernet/stmicro/stmmac/dwxgmac2.h | 2 ++ .../ethernet/stmicro/stmmac/dwxgmac2_dma.c | 33 +++++++++++-------- 2 files changed, 22 insertions(+), 13 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h +2 -0
@@ -327,6 +327,8 @@/* DMA Registers */ #define XGMAC_DMA_MODE 0x00003000 +#define XGMAC_INTM GENMASK(13, 12) +#define XGMAC_INTM_MODE1 0x1#define XGMAC_SWR BIT(0)#define XGMAC_DMA_SYSBUS_MODE 0x00003004#define XGMAC_WR_OSR_LMT GENMASK(29, 24)
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c +20 -13
@@ -31,6 +31,13 @@ static void dwxgmac2_dma_init(void __iomem *ioaddr, value |=XGMAC_EAME ;writel (value, ioaddr +XGMAC_DMA_SYSBUS_MODE ); + +if (dma_cfg->perch_irq_en) { + value =readl (ioaddr +XGMAC_DMA_MODE ); + value &= ~XGMAC_INTM ; + value |=FIELD_PREP (XGMAC_INTM ,XGMAC_INTM_MODE1 ); +writel (value, ioaddr +XGMAC_DMA_MODE ); + } } static void dwxgmac2_dma_init_chan(struct stmmac_priv *priv,
@@ -365,20 +372,20 @@ static int dwxgmac2_dma_interrupt(struct stmmac_priv *priv, }/* TX/RX NORMAL interrupts */ -if (likely (intr_status &XGMAC_NIS )) { -if (likely (intr_status &XGMAC_RI )) { -u64_stats_update_begin (&rx_q->rxq_stats.syncp); - rx_q->rxq_stats.rx_normal_irq_n++; -u64_stats_update_end (&rx_q->rxq_stats.syncp); - ret |= handle_rx; - } -if (likely (intr_status & (XGMAC_TI |XGMAC_TBU ))) { -u64_stats_update_begin (&tx_q->txq_stats.syncp); - tx_q->txq_stats.tx_normal_irq_n++; -u64_stats_update_end (&tx_q->txq_stats.syncp); - ret |= handle_tx; - } +if (likely (intr_status &XGMAC_RI )) { +u64_stats_update_begin (&rx_q->rxq_stats.syncp); + rx_q->rxq_stats.rx_normal_irq_n++; +u64_stats_update_end (&rx_q->rxq_stats.syncp); + ret |= handle_rx; + } +if (likely (intr_status &XGMAC_TI )) { +u64_stats_update_begin (&tx_q->txq_stats.syncp); + tx_q->txq_stats.tx_normal_irq_n++; +u64_stats_update_end (&tx_q->txq_stats.syncp); + ret |= handle_tx; } +if (unlikely (intr_status &XGMAC_TBU )) + ret |= handle_tx;/* Clear interrupts */ writel (intr_en & intr_status, ioaddr +XGMAC_DMA_CH_STATUS (chan));
Signature · 1 line
2.40.1
PATCH v2 7/10 dt-bindings: net: snps,dwmac: add safety irq support
In reply to Jisheng ZhangThe snps dwmac IP support safety features, and those Safety Feature Correctible Error and Uncorrectible Error irqs may be separate irqs.
--- Documentation/devicetree/bindings/net/snps,dwmac.yaml | 4 ++++ 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/net/snps,dwmac.yaml +4 -0
@@ -107,6 +107,8 @@ properties: - description: Combined signal for various interrupt events - description: The interrupt to manage the remote wake-up packet detection - description: The interrupt that occurs when Rx exits the LPI state + - description: The interrupt that occurs when Safety Feature Correctible Errors happen + - description: The interrupt that occurs when Safety Feature Uncorrectible Errors happen interrupt-names: minItems: 1
@@ -114,6 +116,8 @@ properties: - const: macirq - enum: [eth_wake_irq, eth_lpi] - const: eth_lpi + - const: sfty_ce + - const: sfty_ue clocks: minItems: 1
Signature · 1 line
2.40.1
Re: [PATCH net-next v2 07/10] dt-bindings: net: snps,dwmac: add safety irq support
Quoted 22 lines · Jisheng Zhang
The snps dwmac IP support safety features, and those Safety Feature Correctible Error and Uncorrectible Error irqs may be separate irqs.
Signed-off-by Jisheng Zhang <[email protected]>--- Documentation/devicetree/bindings/net/snps,dwmac.yaml | 4 ++++ 1 file changed, 4 insertions(+)Documentation/devicetree/bindings/net/snps,dwmac.yaml +2
-0@@ -107,6 +107,8 @@ properties: - description: Combined signal for various interrupt events - description: The interrupt to manage the remote wake-up packet detection - description: The interrupt that occurs when Rx exits the LPI state + - description: The interrupt that occurs when Safety Feature Correctible Errors happen + - description: The interrupt that occurs when Safety Feature Uncorrectible Errors happen interrupt-names: minItems: 1
Documentation/devicetree/bindings/net/snps,dwmac.yaml properties: · line 120
Quoted 5 lines
Documentation/devicetree/bindings/net/snps,dwmac.yaml +2
-0@@ -114,6 +116,8 @@ properties: - const: macirq - enum: [eth_wake_irq, eth_lpi] - const: eth_lpi + - const: sfty_ce + - const: sfty_ue
Did I not already ack this?
PATCH v2 8/10 net: stmmac: platform: support parsing safety irqs from DT
In reply to Jisheng ZhangThe snps dwmac IP may support safety features, and those Safety Feature Correctible Error and Uncorrectible Error irqs may be separate irqs. Add support to parse the safety irqs from DT.
--- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +12 -0
@@ -738,6 +738,18 @@ int stmmac_get_platform_resources(struct platform_device *pdev,dev_info (&pdev->dev,"IRQ eth_lpi not found\n" ); } + stmmac_res->sfty_ce_irq =platform_get_irq_byname_optional (pdev,"sfty_ce" ); +if (stmmac_res->sfty_ce_irq <0 ) { +if (stmmac_res->sfty_ce_irq == -EPROBE_DEFER ) +return -EPROBE_DEFER ; + } + + stmmac_res->sfty_ue_irq =platform_get_irq_byname_optional (pdev,"sfty_ue" ); +if (stmmac_res->sfty_ue_irq <0 ) { +if (stmmac_res->sfty_ue_irq == -EPROBE_DEFER ) +return -EPROBE_DEFER ; + } + stmmac_res->addr =devm_platform_ioremap_resource (pdev,0 );return PTR_ERR_OR_ZERO (stmmac_res->addr);
Signature · 1 line
2.40.1
PATCH v2 9/10 dt-bindings: net: snps,dwmac: add per channel irq support
In reply to Jisheng ZhangThe IP supports per channel interrupt, add support for this usage case.
--- .../devicetree/bindings/net/snps,dwmac.yaml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+)
Documentation/devicetree/bindings/net/snps,dwmac.yaml +33 -0
@@ -109,6 +109,7 @@ properties: - description: The interrupt that occurs when Rx exits the LPI state - description: The interrupt that occurs when Safety Feature Correctible Errors happen - description: The interrupt that occurs when Safety Feature Uncorrectible Errors happen + - description: All of the rx/tx per-channel interrupts interrupt-names: minItems: 1
@@ -118,6 +119,38 @@ properties: - const: eth_lpi - const: sfty_ce - const: sfty_ue + - const: rx0 + - const: rx1 + - const: rx2 + - const: rx3 + - const: rx4 + - const: rx5 + - const: rx6 + - const: rx7 + - const: rx8 + - const: rx9 + - const: rx10 + - const: rx11 + - const: rx12 + - const: rx13 + - const: rx14 + - const: rx15 + - const: tx0 + - const: tx1 + - const: tx2 + - const: tx3 + - const: tx4 + - const: tx5 + - const: tx6 + - const: tx7 + - const: tx8 + - const: tx9 + - const: tx10 + - const: tx11 + - const: tx12 + - const: tx13 + - const: tx14 + - const: tx15 clocks: minItems: 1
Signature · 1 line
2.40.1
Re: [PATCH net-next v2 09/10] dt-bindings: net: snps,dwmac: add per channel irq support
Quoted 45 lines · Jisheng Zhang
The IP supports per channel interrupt, add support for this usage case.
Signed-off-by Jisheng Zhang <[email protected]>--- .../devicetree/bindings/net/snps,dwmac.yaml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+)Documentation/devicetree/bindings/net/snps,dwmac.yaml +23
-0@@ -109,6 +109,7 @@ properties: - description: The interrupt that occurs when Rx exits the LPI state - description: The interrupt that occurs when Safety Feature Correctible Errors happen - description: The interrupt that occurs when Safety Feature Uncorrectible Errors happen + - description: All of the rx/tx per-channel interrupts interrupt-names: minItems: 1@@ -118,6 +119,38 @@ properties: - const: eth_lpi - const: sfty_ce - const: sfty_ue + - const: rx0 + - const: rx1 + - const: rx2 + - const: rx3 + - const: rx4 + - const: rx5 + - const: rx6 + - const: rx7 + - const: rx8 + - const: rx9 + - const: rx10 + - const: rx11 + - const: rx12 + - const: rx13 + - const: rx14 + - const: rx15 + - const: tx0 + - const: tx1 + - const: tx2 + - const: tx3 + - const: tx4 + - const: tx5
Documentation/devicetree/bindings/net/snps,dwmac.yaml properties: · line 153
Quoted 10 lines
Documentation/devicetree/bindings/net/snps,dwmac.yaml +10
-0+ - const: tx6 + - const: tx7 + - const: tx8 + - const: tx9 + - const: tx10 + - const: tx11 + - const: tx12 + - const: tx13 + - const: tx14 + - const: tx15
I don't think Rob's comment about having added 2 interrupts but 32 interrupt names has been resolved.
Did you actually test putting this many interrupts into a node? AFAICT, any more than 6 will cause complaints.
Thanks,
Conor.
Re: [PATCH net-next v2 09/10] dt-bindings: net: snps,dwmac: add per channel irq support
Quoted 51 lines · Conor Dooley
Quoted 50 lines · Jisheng Zhang
The IP supports per channel interrupt, add support for this usage case.
Signed-off-by Jisheng Zhang <[email protected]>--- .../devicetree/bindings/net/snps,dwmac.yaml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+)Documentation/devicetree/bindings/net/snps,dwmac.yaml +28
-0@@ -109,6 +109,7 @@ properties: - description: The interrupt that occurs when Rx exits the LPI state - description: The interrupt that occurs when Safety Feature Correctible Errors happen - description: The interrupt that occurs when Safety Feature Uncorrectible Errors happen + - description: All of the rx/tx per-channel interrupts interrupt-names: minItems: 1@@ -118,6 +119,38 @@ properties: - const: eth_lpi - const: sfty_ce - const: sfty_ue + - const: rx0 + - const: rx1 + - const: rx2 + - const: rx3 + - const: rx4 + - const: rx5 + - const: rx6 + - const: rx7 + - const: rx8 + - const: rx9 + - const: rx10 + - const: rx11 + - const: rx12 + - const: rx13 + - const: rx14 + - const: rx15 + - const: tx0 + - const: tx1 + - const: tx2 + - const: tx3 + - const: tx4 + - const: tx5 + - const: tx6 + - const: tx7 + - const: tx8 + - const: tx9 + - const: tx10
Quoted 8 lines
Documentation/devicetree/bindings/net/snps,dwmac.yaml properties: · line 153
Quoted 5 lines
Documentation/devicetree/bindings/net/snps,dwmac.yaml +5
-0+ - const: tx11 + - const: tx12 + - const: tx13 + - const: tx14 + - const: tx15I don't think Rob's comment about having added 2 interrupts but 32 interrupt names has been resolved.
I misunderstood Rob's comment. Now I'm not sure whether dt-binding can support regex or something or not, or let ask for advice in the following way: how could I write the dt-binding in this case? I didn't find similar examples so far. I'm not sure listing possible description and const properties for all channel interrupts is suitable.
Quoted 2 lines
Did you actually test putting this many interrupts into a node? AFAICT, any more than 6 will cause complaints.
I tried 12rx and 12tx interrupts in a node, didn't see dtc warning. so I guess the complaints are from dtb check? I will try to reproduce them.
Quoted 3 lines
Thanks,
Conor.
Re: [PATCH net-next v2 09/10] dt-bindings: net: snps,dwmac: add per channel irq support
Quoted 61 lines · Jisheng Zhang
Quoted 51 lines · Conor Dooley
Quoted 50 lines · Jisheng Zhang
The IP supports per channel interrupt, add support for this usage case.
Signed-off-by Jisheng Zhang <[email protected]>--- .../devicetree/bindings/net/snps,dwmac.yaml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+)Documentation/devicetree/bindings/net/snps,dwmac.yaml +28
-0@@ -109,6 +109,7 @@ properties: - description: The interrupt that occurs when Rx exits the LPI state - description: The interrupt that occurs when Safety Feature Correctible Errors happen - description: The interrupt that occurs when Safety Feature Uncorrectible Errors happen + - description: All of the rx/tx per-channel interrupts interrupt-names: minItems: 1@@ -118,6 +119,38 @@ properties: - const: eth_lpi - const: sfty_ce - const: sfty_ue + - const: rx0 + - const: rx1 + - const: rx2 + - const: rx3 + - const: rx4 + - const: rx5 + - const: rx6 + - const: rx7 + - const: rx8 + - const: rx9 + - const: rx10 + - const: rx11 + - const: rx12 + - const: rx13 + - const: rx14 + - const: rx15 + - const: tx0 + - const: tx1 + - const: tx2 + - const: tx3 + - const: tx4 + - const: tx5 + - const: tx6 + - const: tx7 + - const: tx8 + - const: tx9 + - const: tx10Quoted 8 lines
Documentation/devicetree/bindings/net/snps,dwmac.yaml properties: · line 153
Quoted 5 lines
Documentation/devicetree/bindings/net/snps,dwmac.yaml +5
-0+ - const: tx11 + - const: tx12 + - const: tx13 + - const: tx14 + - const: tx15I don't think Rob's comment about having added 2 interrupts but 32 interrupt names has been resolved.
Quoted 5 lines
I misunderstood Rob's comment. Now I'm not sure whether dt-binding can support regex or something or not, or let ask for advice in the following way: how could I write the dt-binding in this case? I didn't find similar examples so far. I'm not sure listing possible description and const properties for all channel interrupts is suitable.
I'm not sure that there is a better way. Rob maybe has a suggestion.
Quoted 6 lines
Quoted 2 lines
Did you actually test putting this many interrupts into a node? AFAICT, any more than 6 will cause complaints.
I tried 12rx and 12tx interrupts in a node, didn't see dtc warning. so I guess the complaints are from dtb check? I will try to reproduce them.
I triggered some by putting more entries into the example in this binding & doing dt binding check.
Re: [PATCH net-next v2 09/10] dt-bindings: net: snps,dwmac: add per channel irq support
Quoted 73 lines · Conor Dooley
Quoted 61 lines · Jisheng Zhang
Quoted 51 lines · Conor Dooley
Quoted 50 lines · Jisheng Zhang
The IP supports per channel interrupt, add support for this usage case.
Signed-off-by Jisheng Zhang <[email protected]>--- .../devicetree/bindings/net/snps,dwmac.yaml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+)Documentation/devicetree/bindings/net/snps,dwmac.yaml +28
-0@@ -109,6 +109,7 @@ properties: - description: The interrupt that occurs when Rx exits the LPI state - description: The interrupt that occurs when Safety Feature Correctible Errors happen - description: The interrupt that occurs when Safety Feature Uncorrectible Errors happen + - description: All of the rx/tx per-channel interrupts interrupt-names: minItems: 1@@ -118,6 +119,38 @@ properties: - const: eth_lpi - const: sfty_ce - const: sfty_ue + - const: rx0 + - const: rx1 + - const: rx2 + - const: rx3 + - const: rx4 + - const: rx5 + - const: rx6 + - const: rx7 + - const: rx8 + - const: rx9 + - const: rx10 + - const: rx11 + - const: rx12 + - const: rx13 + - const: rx14 + - const: rx15 + - const: tx0 + - const: tx1 + - const: tx2 + - const: tx3 + - const: tx4 + - const: tx5 + - const: tx6 + - const: tx7 + - const: tx8 + - const: tx9 + - const: tx10Quoted 8 lines
Documentation/devicetree/bindings/net/snps,dwmac.yaml properties: · line 153
Quoted 5 lines
Documentation/devicetree/bindings/net/snps,dwmac.yaml +5
-0+ - const: tx11 + - const: tx12 + - const: tx13 + - const: tx14 + - const: tx15I don't think Rob's comment about having added 2 interrupts but 32 interrupt names has been resolved.
Quoted 5 lines
I misunderstood Rob's comment. Now I'm not sure whether dt-binding can support regex or something or not, or let ask for advice in the following way: how could I write the dt-binding in this case? I didn't find similar examples so far. I'm not sure listing possible description and const properties for all channel interrupts is suitable.
I'm not sure that there is a better way. Rob maybe has a suggestion.
Quoted 3 lines
Quoted 2 lines
Did you actually test putting this many interrupts into a node? AFAICT, any more than 6 will cause complaints.
Quoted 6 lines
Quoted 3 lines
I tried 12rx and 12tx interrupts in a node, didn't see dtc warning. so I guess the complaints are from dtb check? I will try to reproduce them.
I triggered some by putting more entries into the example in this binding & doing dt binding check.
I reproduced the complaints and fixed them by adding additionalItems and maxItems.
PS: those per-channel and safety irqs are optional.
PATCH v2 10/10 net: stmmac: platform: support parsing per channel irq from DT
In reply to Jisheng ZhangThe snps dwmac IP may support per channel interrupt. Add support to parse the per channel irq from DT.
--- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++-- .../ethernet/stmicro/stmmac/stmmac_platform.c | 23 +++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +4 -2
@@ -7278,8 +7278,10 @@ int stmmac_dvr_probe(struct device *device, priv->plat = plat_dat; priv->ioaddr = res->addr; priv->dev->base_addr = (unsigned long )res->addr; - priv->plat->dma_cfg->perch_irq_en = - (priv->plat->flags &STMMAC_FLAG_PERCH_IRQ_EN ); +if (res->rx_irq[0 ] && res->tx_irq[0 ]) { + priv->plat->flags |=STMMAC_FLAG_PERCH_IRQ_EN ; + priv->plat->dma_cfg->perch_irq_en = true; + } priv->dev->irq = res->irq; priv->wol_irq = res->wol_irq;
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +23 -0
@@ -705,6 +705,9 @@ EXPORT_SYMBOL_GPL(stmmac_remove_config_dt);int stmmac_get_platform_resources (struct platform_device *pdev,struct stmmac_resources *stmmac_res) { +char irq_name[8 ]; +int i; +memset (stmmac_res,0 ,sizeof (*stmmac_res));/* Get IRQ information early to have an ability to ask for deferred
@@ -738,6 +741,26 @@ int stmmac_get_platform_resources(struct platform_device *pdev,dev_info (&pdev->dev,"IRQ eth_lpi not found\n" ); } +for (i =0 ; i <MTL_MAX_RX_QUEUES ; i++) { +snprintf (irq_name,sizeof (irq_name),"rx%i" , i); + stmmac_res->rx_irq[i] =platform_get_irq_byname_optional (pdev, irq_name); +if (stmmac_res->rx_irq[i] <0 ) { +if (stmmac_res->rx_irq[i] == -EPROBE_DEFER ) +return -EPROBE_DEFER ; +break ; + } + } + +for (i =0 ; i <MTL_MAX_TX_QUEUES ; i++) { +snprintf (irq_name,sizeof (irq_name),"tx%i" , i); + stmmac_res->tx_irq[i] =platform_get_irq_byname_optional (pdev, irq_name); +if (stmmac_res->tx_irq[i] <0 ) { +if (stmmac_res->tx_irq[i] == -EPROBE_DEFER ) +return -EPROBE_DEFER ; +break ; + } + } + stmmac_res->sfty_ce_irq =platform_get_irq_byname_optional (pdev,"sfty_ce" );if (stmmac_res->sfty_ce_irq <0 ) {if (stmmac_res->sfty_ce_irq == -EPROBE_DEFER )
Signature · 1 line
2.40.1