net: stmmac: add new features to xgmac
Subsystems (5)
v3 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 v2:
- check per channel irq by (res->rx_irq[0] > 0 && res->tx_irq[0] > 0) rather than (res->rx_irq[0] && res->tx_irq[0])
- bypass if (irq <= 0) when request rx/tx 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 | 58 ++++++++++--------- .../net/ethernet/stmicro/stmmac/stmmac_mdio.c | 2 +- .../ethernet/stmicro/stmmac/stmmac_platform.c | 35 +++++++++++ include/linux/stmmac.h | 10 ++-- 10 files changed, 142 insertions(+), 53 deletions(-)
Signature · 1 line
2.40.1
PATCH v3 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
Re: [PATCH net-next v3 01/10] net: stmmac: correct RX COE parsing for xgmac
Quoted 22 lines · Jisheng Zhang
xgmac can support RX COE, but there's no two kinds of COE, I.E type 1 and type 2 COE.
Signed-off-by Jisheng Zhang <[email protected]>--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1
-1@@ -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 {
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c static int stmmac_hw_init(struct stmmac_priv *priv) · line 7019
Quoted 8 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1
-1@@ -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)
Regards
Alex
PATCH v3 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
Re: [PATCH net-next v3 02/10] net: stmmac: xgmac: add more feature parsing from hw cap
Quoted 42 lines · Jisheng Zhang
The
XGMAC_HWFEAT_GMIISELbit also indicates whether support 10/100Mbps or not.
TheXGMAC_HWFEAT_HDSELbit indicates whether support half duplex or not.
TheXGMAC_HWFEAT_ADDMACADRSELbit indicates whether support Multiple MAC address registers or not.
TheXGMAC_HWFEAT_SMASELbit indicates whether support SMA (MDIO) Interface or not.Signed-off-by Jisheng Zhang <[email protected]>--- 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 +0
-0
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c static int dwxgmac2_get_hw_feature(void __iomem *ioaddr, · line 415
Quoted 10 lines
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 );
Regards
Alex
PATCH v3 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
Re: [PATCH net-next v3 03/10] net: stmmac: mdio: enlarge the max XGMAC C22 ADDR to 31
Quoted 12 lines · Jisheng Zhang
The IP can support up to 31 xgmac c22 addresses now.
Signed-off-by Jisheng Zhang <[email protected]>--- drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c +0
-0
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c line 46
Quoted 8 lines
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
Regards
Alex
PATCH v3 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
Re: [PATCH net-next v3 04/10] net: stmmac: enlarge max rx/tx queues and channels to 16
Quoted 31 lines · Jisheng Zhang
xgmac supports up to 16 rx/tx queues and up to 16 channels.
Signed-off-by Jisheng Zhang <[email protected]>--- 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 +0
-0@@ -15,9 +15,9 @@#include <linux/platform_device.h> #include <linux/phy.h>
include/linux/stmmac.h line 23
Quoted 10 lines
include/linux/stmmac.h +3
-3-#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
Regards
Alex
PATCH v3 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
Alexandre TORGUE
maintainerRe: [PATCH net-next v3 05/10] net: stmmac: reflect multi irqs for tx/rx channels and mac and safety
Quoted 68 lines · Jisheng Zhang
The 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.
Signed-off-by Jisheng Zhang <[email protected]>--- .../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 +3
-3@@ -125,11 +125,11 @@ module_param(chain_mode, int, 0444);MODULE_PARM_DESC (chain_mode,"To use chain instead of ring mode" );static irqreturn_t stmmac_interrupt (int irq,void *dev_id); -/* For MSI interrupts handling */ +/* For multi interrupts handling */ static irqreturn_t stmmac_mac_interrupt (int irq,void *dev_id);static irqreturn_t stmmac_safety_interrupt (int irq,void *dev_id); -static irqreturn_t stmmac_msi_intr_tx (int irq,void *data); -static irqreturn_t stmmac_msi_intr_rx (int irq,void *data); +static irqreturn_t stmmac_queue_intr_tx (int irq,void *data); +static irqreturn_t stmmac_queue_intr_rx (int irq,void *data);static void stmmac_reset_rx_queue (struct stmmac_priv *priv,u32 queue);static void stmmac_reset_tx_queue (struct stmmac_priv *priv,u32 queue);static void stmmac_reset_queues_param (struct stmmac_priv *priv);
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c static void stmmac_free_irq(struct net_device *dev, · line 3516
Quoted 5 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1
-1@@ -3513,7 +3513,7 @@ static void stmmac_free_irq(struct net_device *dev, } } -static int stmmac_request_irq_multi_msi (struct net_device *dev) +static int stmmac_request_irq_multi (struct net_device *dev)
What mean "irq_multi". You change previously "multi_msi" by "perch_irq", maybe you could do something with this "perch" naming ?
Quoted 171 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +20
-20{struct stmmac_priv *priv =netdev_priv (dev);enum request_irq_err irq_err;@@ -3530,7 +3530,7 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev) 0, int_name, dev);if (unlikely (ret <0 )) {netdev_err (priv->dev, -"%s: alloc mac MSI %d (error: %d)\n" , +"%s: alloc mac irq %d (error: %d)\n" , __func__, dev->irq, ret); irq_err =REQ_IRQ_ERR_MAC ; goto irq_error;@@ -3547,7 +3547,7 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev) 0, int_name, dev);if (unlikely (ret <0 )) {netdev_err (priv->dev, -"%s: alloc wol MSI %d (error: %d)\n" , +"%s: alloc wol irq %d (error: %d)\n" , __func__, priv->wol_irq, ret); irq_err =REQ_IRQ_ERR_WOL ; goto irq_error;@@ -3565,7 +3565,7 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev) 0, int_name, dev);if (unlikely (ret <0 )) {netdev_err (priv->dev, -"%s: alloc lpi MSI %d (error: %d)\n" , +"%s: alloc lpi irq %d (error: %d)\n" , __func__, priv->lpi_irq, ret); irq_err =REQ_IRQ_ERR_LPI ; goto irq_error;@@ -3583,7 +3583,7 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev) 0, int_name, dev);if (unlikely (ret <0 )) {netdev_err (priv->dev, -"%s: alloc sfty ce MSI %d (error: %d)\n" , +"%s: alloc sfty ce irq %d (error: %d)\n" , __func__, priv->sfty_ce_irq, ret); irq_err =REQ_IRQ_ERR_SFTY_CE ; goto irq_error;@@ -3601,14 +3601,14 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev) 0, int_name, dev);if (unlikely (ret <0 )) {netdev_err (priv->dev, -"%s: alloc sfty ue MSI %d (error: %d)\n" , +"%s: alloc sfty ue irq %d (error: %d)\n" , __func__, priv->sfty_ue_irq, ret); irq_err =REQ_IRQ_ERR_SFTY_UE ; goto irq_error; } } -/* Request Rx MSI irq */ +/* Request Rx queue irq */ for (i =0 ; i < priv->plat->rx_queues_to_use; i++) {if (i >=MTL_MAX_RX_QUEUES )break ;@@ -3618,11 +3618,11 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev) int_name = priv->int_name_rx_irq[i];sprintf (int_name,"%s:%s-%d" , dev->name,"rx" , i); ret =request_irq (priv->rx_irq[i], - stmmac_msi_intr_rx, + stmmac_queue_intr_rx,0 , int_name, &priv->dma_conf.rx_queue[i]);if (unlikely (ret <0 )) {netdev_err (priv->dev, -"%s: alloc rx-%d MSI %d (error: %d)\n" , +"%s: alloc rx-%d irq %d (error: %d)\n" , __func__, i, priv->rx_irq[i], ret); irq_err =REQ_IRQ_ERR_RX ; irq_idx = i;@@ -3633,7 +3633,7 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev)irq_set_affinity_hint (priv->rx_irq[i], &cpu_mask); } -/* Request Tx MSI irq */ +/* Request Tx queue irq */ for (i =0 ; i < priv->plat->tx_queues_to_use; i++) {if (i >=MTL_MAX_TX_QUEUES )break ;@@ -3643,11 +3643,11 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev) int_name = priv->int_name_tx_irq[i];sprintf (int_name,"%s:%s-%d" , dev->name,"tx" , i); ret =request_irq (priv->tx_irq[i], - stmmac_msi_intr_tx, + stmmac_queue_intr_tx,0 , int_name, &priv->dma_conf.tx_queue[i]);if (unlikely (ret <0 )) {netdev_err (priv->dev, -"%s: alloc tx-%d MSI %d (error: %d)\n" , +"%s: alloc tx-%d irq %d (error: %d)\n" , __func__, i, priv->tx_irq[i], ret); irq_err =REQ_IRQ_ERR_TX ; irq_idx = i;@@ -3722,8 +3722,8 @@ static int stmmac_request_irq(struct net_device *dev)int ret;/* Request the IRQ lines */ -if (priv->plat->flags &STMMAC_FLAG_MULTI_MSI_EN ) - ret =stmmac_request_irq_multi_msi (dev); +if (priv->plat->flags &STMMAC_FLAG_PERCH_IRQ_EN ) + ret =stmmac_request_irq_multi (dev);else ret =stmmac_request_irq_single (dev);@@ -5938,7 +5938,7 @@ static irqreturn_t stmmac_safety_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static irqreturn_t stmmac_msi_intr_tx (int irq,void *data) +static irqreturn_t stmmac_queue_intr_tx (int irq,void *data) {struct stmmac_tx_queue *tx_q = (struct stmmac_tx_queue *)data;struct stmmac_dma_conf *dma_conf;@@ -5970,7 +5970,7 @@ static irqreturn_t stmmac_msi_intr_tx(int irq, void *data)return IRQ_HANDLED ; } -static irqreturn_t stmmac_msi_intr_rx (int irq,void *data) +static irqreturn_t stmmac_queue_intr_rx (int irq,void *data) {struct stmmac_rx_queue *rx_q = (struct stmmac_rx_queue *)data;struct stmmac_dma_conf *dma_conf;@@ -6007,12 +6007,12 @@ static void stmmac_poll_controller(struct net_device *dev)if (test_bit (STMMAC_DOWN , &priv->state))return ; -if (priv->plat->flags &STMMAC_FLAG_MULTI_MSI_EN ) { +if (priv->plat->flags &STMMAC_FLAG_PERCH_IRQ_EN ) {for (i =0 ; i < priv->plat->rx_queues_to_use; i++) -stmmac_msi_intr_rx (0 , &priv->dma_conf.rx_queue[i]); +stmmac_queue_intr_rx (0 , &priv->dma_conf.rx_queue[i]);for (i =0 ; i < priv->plat->tx_queues_to_use; i++) -stmmac_msi_intr_tx (0 , &priv->dma_conf.tx_queue[i]); +stmmac_queue_intr_tx (0 , &priv->dma_conf.tx_queue[i]); }else {disable_irq (dev->irq);stmmac_interrupt (dev->irq, dev);@@ -7278,8 +7278,8 @@ 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->multi_msi_en = - (priv->plat->flags &STMMAC_FLAG_MULTI_MSI_EN ); + priv->plat->dma_cfg->perch_irq_en = + (priv->plat->flags &STMMAC_FLAG_PERCH_IRQ_EN ); priv->dev->irq = res->irq; priv->wol_irq = res->wol_irq;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)
Re: [PATCH net-next v3 05/10] net: stmmac: reflect multi irqs for tx/rx channels and mac and safety
Quoted 61 lines · Alexandre TORGUE
Quoted 60 lines · Jisheng Zhang
The 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.
Signed-off-by Jisheng Zhang <[email protected]>--- .../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 +3
-3@@ -125,11 +125,11 @@ module_param(chain_mode, int, 0444);MODULE_PARM_DESC (chain_mode,"To use chain instead of ring mode" );static irqreturn_t stmmac_interrupt (int irq,void *dev_id); -/* For MSI interrupts handling */ +/* For multi interrupts handling */ static irqreturn_t stmmac_mac_interrupt (int irq,void *dev_id);static irqreturn_t stmmac_safety_interrupt (int irq,void *dev_id); -static irqreturn_t stmmac_msi_intr_tx (int irq,void *data); -static irqreturn_t stmmac_msi_intr_rx (int irq,void *data); +static irqreturn_t stmmac_queue_intr_tx (int irq,void *data); +static irqreturn_t stmmac_queue_intr_rx (int irq,void *data);static void stmmac_reset_rx_queue (struct stmmac_priv *priv,u32 queue);static void stmmac_reset_tx_queue (struct stmmac_priv *priv,u32 queue);static void stmmac_reset_queues_param (struct stmmac_priv *priv);
Quoted 8 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c static void stmmac_free_irq(struct net_device *dev, · line 3515
Quoted 5 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1
-1@@ -3513,7 +3513,7 @@ static void stmmac_free_irq(struct net_device *dev, } } -static int stmmac_request_irq_multi_msi (struct net_device *dev) +static int stmmac_request_irq_multi (struct net_device *dev)What mean "
irq_multi". You change previously "multi_msi" by "perch_irq", maybe you could do something with this "perch" naming ?
The function request irq for all channels for STMMAC_FLAG_PERCH_IRQ_EN case, so what about stmmac_request_irq_multi_channel?
Quoted 163 lines
Quoted 162 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +20
-20{struct stmmac_priv *priv =netdev_priv (dev);enum request_irq_err irq_err;@@ -3530,7 +3530,7 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev) 0, int_name, dev);if (unlikely (ret <0 )) {netdev_err (priv->dev, -"%s: alloc mac MSI %d (error: %d)\n" , +"%s: alloc mac irq %d (error: %d)\n" , __func__, dev->irq, ret); irq_err =REQ_IRQ_ERR_MAC ; goto irq_error;@@ -3547,7 +3547,7 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev) 0, int_name, dev);if (unlikely (ret <0 )) {netdev_err (priv->dev, -"%s: alloc wol MSI %d (error: %d)\n" , +"%s: alloc wol irq %d (error: %d)\n" , __func__, priv->wol_irq, ret); irq_err =REQ_IRQ_ERR_WOL ; goto irq_error;@@ -3565,7 +3565,7 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev) 0, int_name, dev);if (unlikely (ret <0 )) {netdev_err (priv->dev, -"%s: alloc lpi MSI %d (error: %d)\n" , +"%s: alloc lpi irq %d (error: %d)\n" , __func__, priv->lpi_irq, ret); irq_err =REQ_IRQ_ERR_LPI ; goto irq_error;@@ -3583,7 +3583,7 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev) 0, int_name, dev);if (unlikely (ret <0 )) {netdev_err (priv->dev, -"%s: alloc sfty ce MSI %d (error: %d)\n" , +"%s: alloc sfty ce irq %d (error: %d)\n" , __func__, priv->sfty_ce_irq, ret); irq_err =REQ_IRQ_ERR_SFTY_CE ; goto irq_error;@@ -3601,14 +3601,14 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev) 0, int_name, dev);if (unlikely (ret <0 )) {netdev_err (priv->dev, -"%s: alloc sfty ue MSI %d (error: %d)\n" , +"%s: alloc sfty ue irq %d (error: %d)\n" , __func__, priv->sfty_ue_irq, ret); irq_err =REQ_IRQ_ERR_SFTY_UE ; goto irq_error; } } -/* Request Rx MSI irq */ +/* Request Rx queue irq */ for (i =0 ; i < priv->plat->rx_queues_to_use; i++) {if (i >=MTL_MAX_RX_QUEUES )break ;@@ -3618,11 +3618,11 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev) int_name = priv->int_name_rx_irq[i];sprintf (int_name,"%s:%s-%d" , dev->name,"rx" , i); ret =request_irq (priv->rx_irq[i], - stmmac_msi_intr_rx, + stmmac_queue_intr_rx,0 , int_name, &priv->dma_conf.rx_queue[i]);if (unlikely (ret <0 )) {netdev_err (priv->dev, -"%s: alloc rx-%d MSI %d (error: %d)\n" , +"%s: alloc rx-%d irq %d (error: %d)\n" , __func__, i, priv->rx_irq[i], ret); irq_err =REQ_IRQ_ERR_RX ; irq_idx = i;@@ -3633,7 +3633,7 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev)irq_set_affinity_hint (priv->rx_irq[i], &cpu_mask); } -/* Request Tx MSI irq */ +/* Request Tx queue irq */ for (i =0 ; i < priv->plat->tx_queues_to_use; i++) {if (i >=MTL_MAX_TX_QUEUES )break ;@@ -3643,11 +3643,11 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev) int_name = priv->int_name_tx_irq[i];sprintf (int_name,"%s:%s-%d" , dev->name,"tx" , i); ret =request_irq (priv->tx_irq[i], - stmmac_msi_intr_tx, + stmmac_queue_intr_tx,0 , int_name, &priv->dma_conf.tx_queue[i]);if (unlikely (ret <0 )) {netdev_err (priv->dev, -"%s: alloc tx-%d MSI %d (error: %d)\n" , +"%s: alloc tx-%d irq %d (error: %d)\n" , __func__, i, priv->tx_irq[i], ret); irq_err =REQ_IRQ_ERR_TX ; irq_idx = i;@@ -3722,8 +3722,8 @@ static int stmmac_request_irq(struct net_device *dev)int ret;/* Request the IRQ lines */ -if (priv->plat->flags &STMMAC_FLAG_MULTI_MSI_EN ) - ret =stmmac_request_irq_multi_msi (dev); +if (priv->plat->flags &STMMAC_FLAG_PERCH_IRQ_EN ) + ret =stmmac_request_irq_multi (dev);else ret =stmmac_request_irq_single (dev);@@ -5938,7 +5938,7 @@ static irqreturn_t stmmac_safety_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static irqreturn_t stmmac_msi_intr_tx (int irq,void *data) +static irqreturn_t stmmac_queue_intr_tx (int irq,void *data) {struct stmmac_tx_queue *tx_q = (struct stmmac_tx_queue *)data;struct stmmac_dma_conf *dma_conf;@@ -5970,7 +5970,7 @@ static irqreturn_t stmmac_msi_intr_tx(int irq, void *data)return IRQ_HANDLED ; } -static irqreturn_t stmmac_msi_intr_rx (int irq,void *data) +static irqreturn_t stmmac_queue_intr_rx (int irq,void *data) {struct stmmac_rx_queue *rx_q = (struct stmmac_rx_queue *)data;struct stmmac_dma_conf *dma_conf;@@ -6007,12 +6007,12 @@ static void stmmac_poll_controller(struct net_device *dev)if (test_bit (STMMAC_DOWN , &priv->state))return ; -if (priv->plat->flags &STMMAC_FLAG_MULTI_MSI_EN ) { +if (priv->plat->flags &STMMAC_FLAG_PERCH_IRQ_EN ) {for (i =0 ; i < priv->plat->rx_queues_to_use; i++) -stmmac_msi_intr_rx (0 , &priv->dma_conf.rx_queue[i]); +stmmac_queue_intr_rx (0 , &priv->dma_conf.rx_queue[i]);for (i =0 ; i < priv->plat->tx_queues_to_use; i++) -stmmac_msi_intr_tx (0 , &priv->dma_conf.tx_queue[i]); +stmmac_queue_intr_tx (0 , &priv->dma_conf.tx_queue[i]); }else {disable_irq (dev->irq);stmmac_interrupt (dev->irq, dev);@@ -7278,8 +7278,8 @@ 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->multi_msi_en = - (priv->plat->flags &STMMAC_FLAG_MULTI_MSI_EN ); + priv->plat->dma_cfg->perch_irq_en = + (priv->plat->flags &STMMAC_FLAG_PERCH_IRQ_EN ); priv->dev->irq = res->irq; priv->wol_irq = res->wol_irq;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)
PATCH v3 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
Alexandre TORGUE
maintainerRe: [PATCH net-next v3 06/10] net: stmmac: xgmac: support per-channel irq
Quoted 40 lines · Jisheng Zhang
The IP supports per channel interrupt, add support for this usage case.
Signed-off-by Jisheng Zhang <[email protected]>--- .../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 +7
-0@@ -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,
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c static int dwxgmac2_dma_interrupt(struct stmmac_priv *priv, · line 368
Quoted 4 lines
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c +0
-1@@ -365,20 +372,20 @@ static int dwxgmac2_dma_interrupt(struct stmmac_priv *priv, }/* TX/RX NORMAL interrupts */ -if (likely (intr_status &XGMAC_NIS )) {
No longer need to check NIS bit ?
Quoted 29 lines
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c +13
-12-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));
Re: [PATCH net-next v3 06/10] net: stmmac: xgmac: support per-channel irq
Quoted 35 lines · Alexandre TORGUE
Quoted 34 lines · Jisheng Zhang
The IP supports per channel interrupt, add support for this usage case.
Signed-off-by Jisheng Zhang <[email protected]>--- .../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 +7
-0@@ -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 ); + }
Quoted 8 lines
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c static int dwxgmac2_dma_interrupt(struct stmmac_priv *priv, · line 367
Quoted 6 lines
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c +0
-1} 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 )) {No longer need to check NIS bit ?
Hi Alexandre,
NIS is RI | TI | TBU, since we have checked these three bits we can ignore NIS. And dwmac4 behaves similarly.
Thanks
Quoted 30 lines
Quoted 29 lines
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c +13
-12-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));
PATCH v3 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 v3 07/10] dt-bindings: net: snps,dwmac: add safety irq support
Quoted 5 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]>---
Please share, how did you address comment from Conor on v2?
Best regards,
Krzysztof
PATCH v3 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
Re: [PATCH net-next v3 08/10] net: stmmac: platform: support parsing safety irqs from DT
Quoted 22 lines · Jisheng Zhang
The 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.
Signed-off-by Jisheng Zhang <[email protected]>--- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +5
-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 ; + }
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c int stmmac_get_platform_resources(struct platform_device *pdev, · line 755
Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +7
-0+ + 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);
Regards
Alex
PATCH v3 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 v3 09/10] dt-bindings: net: snps,dwmac: add per channel irq support
Quoted 3 lines · Jisheng Zhang
The IP supports per channel interrupt, add support for this usage case.
Signed-off-by Jisheng Zhang <[email protected]>
I do not see a response to
<https://lore.kernel.org/all/20230808-clapper-corncob-0af7afa65752@spud/>
in my mailbox or on lore, nor is there any changes in v3 on this front.
Thanks,
Conor.
Quoted 58 lines
--- .../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: 1Signature · 1 line
2.40.1
Re: [PATCH net-next v3 09/10] dt-bindings: net: snps,dwmac: add per channel irq support
Quoted 8 lines · Conor Dooley
Quoted 3 lines · Jisheng Zhang
The IP supports per channel interrupt, add support for this usage case.
Signed-off-by Jisheng Zhang <[email protected]>I do not see a response to
<https://lore.kernel.org/all/20230808-clapper-corncob-0af7afa65752@spud/>
in my mailbox or on lore, nor is there any changes in v3 on this front.
oops, sorry, I didn't mbsync to fetch my inbox before sending out v3, so I missed your review comments ;)
I will reply in the thread
Quoted 62 lines
Thanks,
Conor.Quoted 58 lines
--- .../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: 1Signature · 1 line
2.40.1
PATCH v3 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 | 10 ++++---- .../ethernet/stmicro/stmmac/stmmac_platform.c | 23 +++++++++++++++++++ 2 files changed, 29 insertions(+), 4 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +6 -4
@@ -3612,7 +3612,7 @@ static int stmmac_request_irq_multi(struct net_device *dev)for (i =0 ; i < priv->plat->rx_queues_to_use; i++) {if (i >=MTL_MAX_RX_QUEUES )break ; -if (priv->rx_irq[i] ==0 ) +if (priv->rx_irq[i] <=0 )continue ; int_name = priv->int_name_rx_irq[i];
@@ -3637,7 +3637,7 @@ static int stmmac_request_irq_multi(struct net_device *dev)for (i =0 ; i < priv->plat->tx_queues_to_use; i++) {if (i >=MTL_MAX_TX_QUEUES )break ; -if (priv->tx_irq[i] ==0 ) +if (priv->tx_irq[i] <=0 )continue ; int_name = priv->int_name_tx_irq[i];
@@ -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 ] >0 && res->tx_irq[0 ] >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
Alexandre TORGUE
maintainerRe: [PATCH net-next v3 10/10] net: stmmac: platform: support parsing per channel irq from DT
Quoted 14 lines · Jisheng Zhang
The snps dwmac IP may support per channel interrupt. Add support to parse the per channel irq from DT.
Signed-off-by Jisheng Zhang <[email protected]>--- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 10 ++++---- .../ethernet/stmicro/stmmac/stmmac_platform.c | 23 +++++++++++++++++++ 2 files changed, 29 insertions(+), 4 deletions(-)drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +0
-0
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c static int stmmac_request_irq_multi(struct net_device *dev) · line 3615
Quoted 5 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1
-1@@ -3612,7 +3612,7 @@ static int stmmac_request_irq_multi(struct net_device *dev)for (i =0 ; i < priv->plat->rx_queues_to_use; i++) {if (i >=MTL_MAX_RX_QUEUES )break ; -if (priv->rx_irq[i] ==0 ) +if (priv->rx_irq[i] <=0 )
What do you fix here ?
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c static int stmmac_request_irq_multi(struct net_device *dev) · line 3640
Quoted 9 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1
-1continue ; int_name = priv->int_name_rx_irq[i];@@ -3637,7 +3637,7 @@ static int stmmac_request_irq_multi(struct net_device *dev)for (i =0 ; i < priv->plat->tx_queues_to_use; i++) {if (i >=MTL_MAX_TX_QUEUES )break ; -if (priv->tx_irq[i] ==0 ) +if (priv->tx_irq[i] <=0 )
same here
Quoted 57 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +4
-2continue ; int_name = priv->int_name_tx_irq[i];@@ -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 ] >0 && res->tx_irq[0 ] >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 )
Re: [PATCH net-next v3 10/10] net: stmmac: platform: support parsing per channel irq from DT
Quoted 10 lines · Alexandre TORGUE
Quoted 9 lines · Jisheng Zhang
The snps dwmac IP may support per channel interrupt. Add support to parse the per channel irq from DT.
Signed-off-by Jisheng Zhang <[email protected]>--- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 10 ++++---- .../ethernet/stmicro/stmmac/stmmac_platform.c | 23 +++++++++++++++++++ 2 files changed, 29 insertions(+), 4 deletions(-)
Quoted 12 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c static int stmmac_request_irq_multi(struct net_device *dev) · line 3615
Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1
-1@@ -3612,7 +3612,7 @@ static int stmmac_request_irq_multi(struct net_device *dev)for (i =0 ; i < priv->plat->rx_queues_to_use; i++) {if (i >=MTL_MAX_RX_QUEUES )break ; -if (priv->rx_irq[i] ==0 ) +if (priv->rx_irq[i] <=0 )What do you fix here ?
No bug to fix, but adjust for parsing optional channel irqs from DT:
rx_irq[i] and tx_irq[i] may come from platform_get_irq_byname_optional() so for !STMMAC_FLAG_PERCH_IRQ_EN platforms, they can be < 0. Before
Thanks
Quoted 65 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c static int stmmac_request_irq_multi(struct net_device *dev) · line 3640
Quoted 9 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1
-1continue ; int_name = priv->int_name_rx_irq[i];@@ -3637,7 +3637,7 @@ static int stmmac_request_irq_multi(struct net_device *dev)for (i =0 ; i < priv->plat->tx_queues_to_use; i++) {if (i >=MTL_MAX_TX_QUEUES )break ; -if (priv->tx_irq[i] ==0 ) +if (priv->tx_irq[i] <=0 )same here
Quoted 53 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +4
-2continue ; int_name = priv->int_name_tx_irq[i];@@ -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 ] >0 && res->tx_irq[0 ] >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 )
Re: [PATCH net-next v3 10/10] net: stmmac: platform: support parsing per channel irq from DT
Quoted 24 lines · Jisheng Zhang
Quoted 10 lines · Alexandre TORGUE
Quoted 9 lines · Jisheng Zhang
The snps dwmac IP may support per channel interrupt. Add support to parse the per channel irq from DT.
Signed-off-by Jisheng Zhang <[email protected]>--- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 10 ++++---- .../ethernet/stmicro/stmmac/stmmac_platform.c | 23 +++++++++++++++++++ 2 files changed, 29 insertions(+), 4 deletions(-)Quoted 12 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c static int stmmac_request_irq_multi(struct net_device *dev) · line 3615
Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1
-1@@ -3612,7 +3612,7 @@ static int stmmac_request_irq_multi(struct net_device *dev)for (i =0 ; i < priv->plat->rx_queues_to_use; i++) {if (i >=MTL_MAX_RX_QUEUES )break ; -if (priv->rx_irq[i] ==0 ) +if (priv->rx_irq[i] <=0 )What do you fix here ?
Quoted 4 lines
No bug to fix, but adjust for parsing optional channel irqs from DT:
rx_irq[i] and tx_irq[i] may come fromplatform_get_irq_byname_optional()so for !STMMAC_FLAG_PERCH_IRQ_EN platforms, they can be < 0. Before
oops, I sent this email too quick before I complete it.
After this patch(parse optional channel irqs from DT), rx_irq[i] and tx_irq[i] may come from platform_get_irq_byname_optional(), so for STMMAC_FLAG_PERCH_IRQ_EN platforms which support less than MTL_MAX_TX_QUEUES channels, for example 8 tx and 8 rx, the last tx_irq[i] or rx_irq[i] can be < 0.
Thanks
Quoted 64 lines
Quoted 64 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c static int stmmac_request_irq_multi(struct net_device *dev) · line 3640
Quoted 8 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1
-1continue ; int_name = priv->int_name_rx_irq[i];@@ -3637,7 +3637,7 @@ static int stmmac_request_irq_multi(struct net_device *dev)for (i =0 ; i < priv->plat->tx_queues_to_use; i++) {if (i >=MTL_MAX_TX_QUEUES )break ; -if (priv->tx_irq[i] ==0 ) +if (priv->tx_irq[i] <=0 )same here
Quoted 53 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +4
-2continue ; int_name = priv->int_name_tx_irq[i];@@ -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 ] >0 && res->tx_irq[0 ] >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 )