Skip to contentSkip to conversation

stmmac: Add Loongson platform support

PATCH Superseded Feiyang Chen 7 participants 43 messages Jul 27, 2023 – Aug 3, 2023

Subsystems (6)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v2 cover stmmac: Add Loongson platform support

Extend stmmac functions and macros for Loongson DWMAC. Add LS7A support for dwmac_loongson.

Feiyang Chen (10):
net: stmmac: Pass stmmac_priv and chan in some callbacks
net: stmmac: dwmac1000: Allow platforms to choose some register
offsets
net: stmmac: dwmac1000: Add multi-channel support
net: stmmac: dwmac1000: Add 64-bit DMA support
net: stmmac: dwmac1000: Add Loongson register definitions
net: stmmac: Add Loongson HWIF entry
net: stmmac: dwmac-loongson: Add LS7A support
net: stmmac: dwmac-loongson: Disable flow control for GMAC
net: stmmac: dwmac-loongson: Add 64-bit DMA and multi-vector support
net: stmmac: dwmac-loongson: Add GNET support

 .../net/ethernet/stmicro/stmmac/chain_mode.c  |  28 +-
 drivers/net/ethernet/stmicro/stmmac/common.h  |   3 +
 drivers/net/ethernet/stmicro/stmmac/descs.h   |   7 +
 .../net/ethernet/stmicro/stmmac/descs_com.h   |  49 +++-
 .../ethernet/stmicro/stmmac/dwmac-loongson.c  | 246 +++++++++++++-----
 .../net/ethernet/stmicro/stmmac/dwmac-sun8i.c |  20 +-
 .../net/ethernet/stmicro/stmmac/dwmac1000.h   |   4 +-
 .../ethernet/stmicro/stmmac/dwmac1000_core.c  |  63 +++--
 .../ethernet/stmicro/stmmac/dwmac1000_dma.c   | 110 +++++++-
 .../ethernet/stmicro/stmmac/dwmac100_core.c   |  12 +-
 .../ethernet/stmicro/stmmac/dwmac100_dma.c    |   2 +-
 .../net/ethernet/stmicro/stmmac/dwmac4_core.c |  11 +-
 .../ethernet/stmicro/stmmac/dwmac4_descs.c    |  19 +-
 .../net/ethernet/stmicro/stmmac/dwmac4_dma.c  |   8 +-
 .../net/ethernet/stmicro/stmmac/dwmac_dma.h   | 210 ++++++++-------
 .../net/ethernet/stmicro/stmmac/dwmac_lib.c   | 156 +++++++++--
 .../ethernet/stmicro/stmmac/dwxgmac2_core.c   |  11 +-
 .../ethernet/stmicro/stmmac/dwxgmac2_descs.c  |  17 +-
 .../ethernet/stmicro/stmmac/dwxgmac2_dma.c    |   8 +-
 .../net/ethernet/stmicro/stmmac/enh_desc.c    |  38 ++-
 drivers/net/ethernet/stmicro/stmmac/hwif.c    |  48 +++-
 drivers/net/ethernet/stmicro/stmmac/hwif.h    |  77 +++---
 .../net/ethernet/stmicro/stmmac/norm_desc.c   |  17 +-
 .../net/ethernet/stmicro/stmmac/ring_mode.c   | 105 ++++++--
 .../ethernet/stmicro/stmmac/stmmac_ethtool.c  |   6 +
 .../net/ethernet/stmicro/stmmac/stmmac_main.c |  38 ++-
 include/linux/stmmac.h                        |  54 ++++
 27 files changed, 997 insertions(+), 370 deletions(-)
Signature · 1 line
2.39.3
#1 lore raw

PATCH v2 1/10 net: stmmac: Pass stmmac_priv and chan in some callbacks

Loongson GMAC and GNET have many extended features. To prepare for that, pass stmmac_priv and chan to more callbacks, and adjust the callbacks accordingly.

---
 .../net/ethernet/stmicro/stmmac/chain_mode.c  |  5 +-
 .../net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 20 +++--
 .../ethernet/stmicro/stmmac/dwmac1000_core.c  |  9 ++-
 .../ethernet/stmicro/stmmac/dwmac1000_dma.c   |  8 +-
 .../ethernet/stmicro/stmmac/dwmac100_core.c   |  9 ++-
 .../ethernet/stmicro/stmmac/dwmac100_dma.c    |  2 +-
 .../net/ethernet/stmicro/stmmac/dwmac4_core.c | 11 ++-
 .../ethernet/stmicro/stmmac/dwmac4_descs.c    | 19 ++---
 .../net/ethernet/stmicro/stmmac/dwmac4_dma.c  |  8 +-
 .../net/ethernet/stmicro/stmmac/dwmac_dma.h   |  3 +-
 .../net/ethernet/stmicro/stmmac/dwmac_lib.c   |  3 +-
 .../ethernet/stmicro/stmmac/dwxgmac2_core.c   | 11 ++-
 .../ethernet/stmicro/stmmac/dwxgmac2_descs.c  | 17 ++--
 .../ethernet/stmicro/stmmac/dwxgmac2_dma.c    |  8 +-
 .../net/ethernet/stmicro/stmmac/enh_desc.c    | 17 ++--
 drivers/net/ethernet/stmicro/stmmac/hwif.h    | 77 ++++++++++---------
 .../net/ethernet/stmicro/stmmac/norm_desc.c   | 17 ++--
 .../net/ethernet/stmicro/stmmac/ring_mode.c   |  4 +-
 .../net/ethernet/stmicro/stmmac/stmmac_main.c |  6 +-
 19 files changed, 145 insertions(+), 109 deletions(-)
drivers/net/ethernet/stmicro/stmmac/chain_mode.c +3 -2
index fb55efd52240..a95866871f3e 100644
@@ -95,8 +95,9 @@ static unsigned int is_jumbo_frm(int len, int enh_desc)
 	return ret;
 }
 
-static void init_dma_chain(void *des, dma_addr_t phy_addr,
-				  unsigned int size, unsigned int extend_desc)
+static void init_dma_chain(struct stmmac_priv *priv, void *des,
+			   dma_addr_t phy_addr, unsigned int size,
+			   unsigned int extend_desc)
 {
 	/*
 	 * In chained mode the des3 points to the next element in the ring.
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +12 -8
index 1e714380d125..e4e1624f81f3 100644
@@ -297,7 +297,7 @@ static int sun8i_dwmac_dma_reset(void __iomem *ioaddr)
 /* sun8i_dwmac_dma_init() - initialize the EMAC
  * Called from stmmac via stmmac_dma_ops->init
  */
-static void sun8i_dwmac_dma_init(void __iomem *ioaddr,
+static void sun8i_dwmac_dma_init(struct stmmac_priv *priv, void __iomem *ioaddr,
 				 struct stmmac_dma_cfg *dma_cfg, int atds)
 {
 	writel(EMAC_RX_INT | EMAC_TX_INT, ioaddr + EMAC_INT_EN);
@@ -394,7 +394,8 @@ static void sun8i_dwmac_dma_start_tx(struct stmmac_priv *priv,
 	writel(v, ioaddr + EMAC_TX_CTL1);
 }
 
-static void sun8i_dwmac_enable_dma_transmission(void __iomem *ioaddr)
+static void sun8i_dwmac_enable_dma_transmission(struct stmmac_priv *priv,
+						void __iomem *ioaddr, u32 chan)
 {
 	u32 v;
 
@@ -636,7 +637,8 @@ static void sun8i_dwmac_set_mac(void __iomem *ioaddr, bool enable)
  * All slot > 0 need to be enabled with MAC_ADDR_TYPE_DST
  * If addr is NULL, clear the slot
  */
-static void sun8i_dwmac_set_umac_addr(struct mac_device_info *hw,
+static void sun8i_dwmac_set_umac_addr(struct stmmac_priv *priv,
+				      struct mac_device_info *hw,
 				      const unsigned char *addr,
 				      unsigned int reg_n)
 {
@@ -657,7 +659,8 @@ static void sun8i_dwmac_set_umac_addr(struct mac_device_info *hw,
 	}
 }
 
-static void sun8i_dwmac_get_umac_addr(struct mac_device_info *hw,
+static void sun8i_dwmac_get_umac_addr(struct stmmac_priv *priv,
+				      struct mac_device_info *hw,
 				      unsigned char *addr,
 				      unsigned int reg_n)
 {
@@ -680,7 +683,8 @@ static int sun8i_dwmac_rx_ipc_enable(struct mac_device_info *hw)
 	return 1;
 }
 
-static void sun8i_dwmac_set_filter(struct mac_device_info *hw,
+static void sun8i_dwmac_set_filter(struct stmmac_priv *priv,
+				   struct mac_device_info *hw,
 				   struct net_device *dev)
 {
 	void __iomem *ioaddr = hw->pcsr;
@@ -698,13 +702,13 @@ static void sun8i_dwmac_set_filter(struct mac_device_info *hw,
 	} else if (macaddrs <= hw->unicast_filter_entries) {
 		if (!netdev_mc_empty(dev)) {
 			netdev_for_each_mc_addr(ha, dev) {
-				sun8i_dwmac_set_umac_addr(hw, ha->addr, i);
+				sun8i_dwmac_set_umac_addr(priv, hw, ha->addr, i);
 				i++;
 			}
 		}
 		if (!netdev_uc_empty(dev)) {
 			netdev_for_each_uc_addr(ha, dev) {
-				sun8i_dwmac_set_umac_addr(hw, ha->addr, i);
+				sun8i_dwmac_set_umac_addr(priv, hw, ha->addr, i);
 				i++;
 			}
 		}
@@ -716,7 +720,7 @@ static void sun8i_dwmac_set_filter(struct mac_device_info *hw,
 
 	/* Disable unused address filter slots */
 	while (i < hw->unicast_filter_entries)
-		sun8i_dwmac_set_umac_addr(hw, NULL, i++);
+		sun8i_dwmac_set_umac_addr(priv, hw, NULL, i++);
 
 	writel(v, ioaddr + EMAC_RX_FRM_FLT);
 }
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c +6 -3
index 3927609abc44..b52793edf62f 100644
@@ -94,7 +94,8 @@ static void dwmac1000_dump_regs(struct mac_device_info *hw, u32 *reg_space)
 		reg_space[i] = readl(ioaddr + i * 4);
 }
 
-static void dwmac1000_set_umac_addr(struct mac_device_info *hw,
+static void dwmac1000_set_umac_addr(struct stmmac_priv *priv,
+				    struct mac_device_info *hw,
 				    const unsigned char *addr,
 				    unsigned int reg_n)
 {
@@ -103,7 +104,8 @@ static void dwmac1000_set_umac_addr(struct mac_device_info *hw,
 			    GMAC_ADDR_LOW(reg_n));
 }
 
-static void dwmac1000_get_umac_addr(struct mac_device_info *hw,
+static void dwmac1000_get_umac_addr(struct stmmac_priv *priv,
+				    struct mac_device_info *hw,
 				    unsigned char *addr,
 				    unsigned int reg_n)
 {
@@ -137,7 +139,8 @@ static void dwmac1000_set_mchash(void __iomem *ioaddr, u32 *mcfilterbits,
 		       ioaddr + GMAC_EXTHASH_BASE + regs * 4);
 }
 
-static void dwmac1000_set_filter(struct mac_device_info *hw,
+static void dwmac1000_set_filter(struct stmmac_priv *priv,
+				 struct mac_device_info *hw,
 				 struct net_device *dev)
 {
 	void __iomem *ioaddr = (void __iomem *)dev->base_addr;
drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c +5 -3
index daf79cdbd3ec..ce0e6ca6f3a2 100644
@@ -16,7 +16,8 @@
 #include "dwmac1000.h"
 #include "dwmac_dma.h"
 
-static void dwmac1000_dma_axi(void __iomem *ioaddr, struct stmmac_axi *axi)
+static void dwmac1000_dma_axi(struct stmmac_priv *priv, void __iomem *ioaddr,
+			      struct stmmac_axi *axi)
 {
 	u32 value = readl(ioaddr + DMA_AXI_BUS_MODE);
 	int i;
@@ -70,7 +71,7 @@ static void dwmac1000_dma_axi(void __iomem *ioaddr, struct stmmac_axi *axi)
 	writel(value, ioaddr + DMA_AXI_BUS_MODE);
 }
 
-static void dwmac1000_dma_init(void __iomem *ioaddr,
+static void dwmac1000_dma_init(struct stmmac_priv *priv, void __iomem *ioaddr,
 			       struct stmmac_dma_cfg *dma_cfg, int atds)
 {
 	u32 value = readl(ioaddr + DMA_BUS_MODE);
@@ -223,7 +224,8 @@ static void dwmac1000_dump_dma_regs(struct stmmac_priv *priv,
 				readl(ioaddr + DMA_BUS_MODE + i * 4);
 }
 
-static int dwmac1000_get_hw_feature(void __iomem *ioaddr,
+static int dwmac1000_get_hw_feature(struct stmmac_priv *priv,
+				    void __iomem *ioaddr,
 				    struct dma_features *dma_cap)
 {
 	u32 hw_cap = readl(ioaddr + DMA_HW_FEATURE);
drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c +6 -3
index a6e8d7bd9588..c03623edeb75 100644
@@ -59,7 +59,8 @@ static int dwmac100_irq_status(struct mac_device_info *hw,
 	return 0;
 }
 
-static void dwmac100_set_umac_addr(struct mac_device_info *hw,
+static void dwmac100_set_umac_addr(struct stmmac_priv *priv,
+				   struct mac_device_info *hw,
 				   const unsigned char *addr,
 				   unsigned int reg_n)
 {
@@ -67,7 +68,8 @@ static void dwmac100_set_umac_addr(struct mac_device_info *hw,
 	stmmac_set_mac_addr(ioaddr, addr, MAC_ADDR_HIGH, MAC_ADDR_LOW);
 }
 
-static void dwmac100_get_umac_addr(struct mac_device_info *hw,
+static void dwmac100_get_umac_addr(struct stmmac_priv *priv,
+				   struct mac_device_info *hw,
 				   unsigned char *addr,
 				   unsigned int reg_n)
 {
@@ -75,7 +77,8 @@ static void dwmac100_get_umac_addr(struct mac_device_info *hw,
 	stmmac_get_mac_addr(ioaddr, addr, MAC_ADDR_HIGH, MAC_ADDR_LOW);
 }
 
-static void dwmac100_set_filter(struct mac_device_info *hw,
+static void dwmac100_set_filter(struct stmmac_priv *priv,
+				struct mac_device_info *hw,
 				struct net_device *dev)
 {
 	void __iomem *ioaddr = (void __iomem *)dev->base_addr;
drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c +1 -1
index 1c32b1788f02..e6ae230fa453 100644
@@ -18,7 +18,7 @@
 #include "dwmac100.h"
 #include "dwmac_dma.h"
 
-static void dwmac100_dma_init(void __iomem *ioaddr,
+static void dwmac100_dma_init(struct stmmac_priv *priv, void __iomem *ioaddr,
 			      struct stmmac_dma_cfg *dma_cfg, int atds)
 {
 	/* Enable Application Access by writing to DMA CSR0 */
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +7 -4
index 03b1c5a97826..536928ccacf9 100644
@@ -330,7 +330,8 @@ static void dwmac4_pmt(struct mac_device_info *hw, unsigned long mode)
 	writel(pmt, ioaddr + GMAC_PMT);
 }
 
-static void dwmac4_set_umac_addr(struct mac_device_info *hw,
+static void dwmac4_set_umac_addr(struct stmmac_priv *priv,
+				 struct mac_device_info *hw,
 				 const unsigned char *addr, unsigned int reg_n)
 {
 	void __iomem *ioaddr = hw->pcsr;
@@ -339,7 +340,8 @@ static void dwmac4_set_umac_addr(struct mac_device_info *hw,
 				   GMAC_ADDR_LOW(reg_n));
 }
 
-static void dwmac4_get_umac_addr(struct mac_device_info *hw,
+static void dwmac4_get_umac_addr(struct stmmac_priv *priv,
+				 struct mac_device_info *hw,
 				 unsigned char *addr, unsigned int reg_n)
 {
 	void __iomem *ioaddr = hw->pcsr;
@@ -588,7 +590,8 @@ static void dwmac4_restore_hw_vlan_rx_fltr(struct net_device *dev,
 	}
 }
 
-static void dwmac4_set_filter(struct mac_device_info *hw,
+static void dwmac4_set_filter(struct stmmac_priv *priv,
+			      struct mac_device_info *hw,
 			      struct net_device *dev)
 {
 	void __iomem *ioaddr = (void __iomem *)dev->base_addr;
@@ -664,7 +667,7 @@ static void dwmac4_set_filter(struct mac_device_info *hw,
 		int reg = 1;
 
 		netdev_for_each_uc_addr(ha, dev) {
-			dwmac4_set_umac_addr(hw, ha->addr, reg);
+			dwmac4_set_umac_addr(priv, hw, ha->addr, reg);
 			reg++;
 		}
 
drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c +10 -9
index 6a011d8633e8..98061986c5f4 100644
@@ -175,7 +175,7 @@ static int dwmac4_wrback_get_rx_status(struct net_device_stats *stats,
 	return ret;
 }
 
-static int dwmac4_rd_get_tx_len(struct dma_desc *p)
+static int dwmac4_rd_get_tx_len(struct stmmac_priv *priv, struct dma_desc *p)
 {
 	return (le32_to_cpu(p->des2) & TDES2_BUFFER1_SIZE_MASK);
 }
@@ -296,8 +296,8 @@ static int dwmac4_wrback_get_rx_timestamp_status(void *desc, void *next_desc,
 	return 0;
 }
 
-static void dwmac4_rd_init_rx_desc(struct dma_desc *p, int disable_rx_ic,
-				   int mode, int end, int bfsize)
+static void dwmac4_rd_init_rx_desc(struct stmmac_priv *priv, struct dma_desc *p,
+				   int disable_rx_ic, int mode, int end, int bfsize)
 {
 	dwmac4_set_rx_owner(p, disable_rx_ic);
 }
@@ -310,9 +310,9 @@ static void dwmac4_rd_init_tx_desc(struct dma_desc *p, int mode, int end)
 	p->des3 = 0;
 }
 
-static void dwmac4_rd_prepare_tx_desc(struct dma_desc *p, int is_fs, int len,
-				      bool csum_flag, int mode, bool tx_own,
-				      bool ls, unsigned int tot_pkt_len)
+static void dwmac4_rd_prepare_tx_desc(struct stmmac_priv *priv, struct dma_desc *p,
+				      int is_fs, int len, bool csum_flag, int mode,
+				      bool tx_own, bool ls, unsigned int tot_pkt_len)
 {
 	unsigned int tdes3 = le32_to_cpu(p->des3);
 
@@ -462,13 +462,14 @@ static void dwmac4_set_mss_ctxt(struct dma_desc *p, unsigned int mss)
 	p->des3 = cpu_to_le32(TDES3_CONTEXT_TYPE | TDES3_CTXT_TCMSSV);
 }
 
-static void dwmac4_set_addr(struct dma_desc *p, dma_addr_t addr)
+static void dwmac4_set_addr(struct stmmac_priv *priv, struct dma_desc *p,
+			    dma_addr_t addr)
 {
 	p->des0 = cpu_to_le32(lower_32_bits(addr));
 	p->des1 = cpu_to_le32(upper_32_bits(addr));
 }
 
-static void dwmac4_clear(struct dma_desc *p)
+static void dwmac4_clear(struct stmmac_priv *priv, struct dma_desc *p)
 {
 	p->des0 = 0;
 	p->des1 = 0;
@@ -483,7 +484,7 @@ static void dwmac4_set_sarc(struct dma_desc *p, u32 sarc_type)
 	p->des3 |= cpu_to_le32(sarc_type & TDES3_SA_INSERT_CTRL_MASK);
 }
 
-static int set_16kib_bfsize(int mtu)
+static int set_16kib_bfsize(struct stmmac_priv *priv, int mtu)
 {
 	int ret = 0;
 
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c +5 -3
index 84d3a8551b03..97dad00dc850 100644
@@ -15,7 +15,8 @@
 #include "dwmac4_dma.h"
 #include "stmmac.h"
 
-static void dwmac4_dma_axi(void __iomem *ioaddr, struct stmmac_axi *axi)
+static void dwmac4_dma_axi(struct stmmac_priv *priv, void __iomem *ioaddr,
+			   struct stmmac_axi *axi)
 {
 	u32 value = readl(ioaddr + DMA_SYS_BUS_MODE);
 	int i;
@@ -152,7 +153,7 @@ static void dwmac410_dma_init_channel(struct stmmac_priv *priv,
 	       ioaddr + DMA_CHAN_INTR_ENA(dwmac4_addrs, chan));
 }
 
-static void dwmac4_dma_init(void __iomem *ioaddr,
+static void dwmac4_dma_init(struct stmmac_priv *priv, void __iomem *ioaddr,
 			    struct stmmac_dma_cfg *dma_cfg, int atds)
 {
 	u32 value = readl(ioaddr + DMA_SYS_BUS_MODE);
@@ -374,7 +375,8 @@ static void dwmac4_dma_tx_chan_op_mode(struct stmmac_priv *priv,
 	writel(mtl_tx_op, ioaddr +  MTL_CHAN_TX_OP_MODE(dwmac4_addrs, channel));
 }
 
-static int dwmac4_get_hw_feature(void __iomem *ioaddr,
+static int dwmac4_get_hw_feature(struct stmmac_priv *priv,
+				 void __iomem *ioaddr,
 				 struct dma_features *dma_cap)
 {
 	u32 hw_cap = readl(ioaddr + GMAC_HW_FEATURE0);
drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h +2 -1
index 72672391675f..e7aef136824b 100644
@@ -152,7 +152,8 @@
 #define NUM_DWMAC1000_DMA_REGS	23
 #define NUM_DWMAC4_DMA_REGS	27
 
-void dwmac_enable_dma_transmission(void __iomem *ioaddr);
+void dwmac_enable_dma_transmission(struct stmmac_priv *priv,
+				   void __iomem *ioaddr, u32 chan);
 void dwmac_enable_dma_irq(struct stmmac_priv *priv, void __iomem *ioaddr,
 			  u32 chan, bool rx, bool tx);
 void dwmac_disable_dma_irq(struct stmmac_priv *priv, void __iomem *ioaddr,
drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c +2 -1
index 0b6f999a8305..2dd457032187 100644
@@ -27,7 +27,8 @@ int dwmac_dma_reset(void __iomem *ioaddr)
 }
 
 /* CSR1 enables the transmit DMA to check for new descriptor */
-void dwmac_enable_dma_transmission(void __iomem *ioaddr)
+void dwmac_enable_dma_transmission(struct stmmac_priv *priv,
+				   void __iomem *ioaddr, u32 chan)
 {
 	writel(1, ioaddr + DMA_XMT_POLL_DEMAND);
 }
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c +7 -4
index a0c2ef8bb0ac..640c1b4a0c14 100644
@@ -337,7 +337,8 @@ static void dwxgmac2_pmt(struct mac_device_info *hw, unsigned long mode)
 	writel(val, ioaddr + XGMAC_PMT);
 }
 
-static void dwxgmac2_set_umac_addr(struct mac_device_info *hw,
+static void dwxgmac2_set_umac_addr(struct stmmac_priv *priv,
+				   struct mac_device_info *hw,
 				   const unsigned char *addr,
 				   unsigned int reg_n)
 {
@@ -351,7 +352,8 @@ static void dwxgmac2_set_umac_addr(struct mac_device_info *hw,
 	writel(value, ioaddr + XGMAC_ADDRx_LOW(reg_n));
 }
 
-static void dwxgmac2_get_umac_addr(struct mac_device_info *hw,
+static void dwxgmac2_get_umac_addr(struct stmmac_priv *priv,
+				   struct mac_device_info *hw,
 				   unsigned char *addr, unsigned int reg_n)
 {
 	void __iomem *ioaddr = hw->pcsr;
@@ -440,7 +442,8 @@ static void dwxgmac2_set_mchash(void __iomem *ioaddr, u32 *mcfilterbits,
 		writel(mcfilterbits[regs], ioaddr + XGMAC_HASH_TABLE(regs));
 }
 
-static void dwxgmac2_set_filter(struct mac_device_info *hw,
+static void dwxgmac2_set_filter(struct stmmac_priv *priv,
+				struct mac_device_info *hw,
 				struct net_device *dev)
 {
 	void __iomem *ioaddr = (void __iomem *)dev->base_addr;
@@ -485,7 +488,7 @@ static void dwxgmac2_set_filter(struct mac_device_info *hw,
 		int reg = 1;
 
 		netdev_for_each_uc_addr(ha, dev) {
-			dwxgmac2_set_umac_addr(hw, ha->addr, reg);
+			dwxgmac2_set_umac_addr(priv, hw, ha->addr, reg);
 			reg++;
 		}
 
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c +9 -8
index 13c347ee8be9..e6fb47563fc0 100644
@@ -41,7 +41,7 @@ static int dwxgmac2_get_rx_status(struct net_device_stats *stats,
 	return good_frame;
 }
 
-static int dwxgmac2_get_tx_len(struct dma_desc *p)
+static int dwxgmac2_get_tx_len(struct stmmac_priv *priv, struct dma_desc *p)
 {
 	return (le32_to_cpu(p->des2) & XGMAC_TDES2_B1L);
 }
@@ -128,8 +128,8 @@ static int dwxgmac2_get_rx_timestamp_status(void *desc, void *next_desc,
 	return !ret;
 }
 
-static void dwxgmac2_init_rx_desc(struct dma_desc *p, int disable_rx_ic,
-				  int mode, int end, int bfsize)
+static void dwxgmac2_init_rx_desc(struct stmmac_priv *priv, struct dma_desc *p,
+				  int disable_rx_ic, int mode, int end, int bfsize)
 {
 	dwxgmac2_set_rx_owner(p, disable_rx_ic);
 }
@@ -142,9 +142,9 @@ static void dwxgmac2_init_tx_desc(struct dma_desc *p, int mode, int end)
 	p->des3 = 0;
 }
 
-static void dwxgmac2_prepare_tx_desc(struct dma_desc *p, int is_fs, int len,
-				     bool csum_flag, int mode, bool tx_own,
-				     bool ls, unsigned int tot_pkt_len)
+static void dwxgmac2_prepare_tx_desc(struct stmmac_priv *priv, struct dma_desc *p,
+				     int is_fs, int len, bool csum_flag, int mode,
+				     bool tx_own, bool ls, unsigned int tot_pkt_len)
 {
 	unsigned int tdes3 = le32_to_cpu(p->des3);
 
@@ -241,13 +241,14 @@ static void dwxgmac2_set_mss(struct dma_desc *p, unsigned int mss)
 	p->des3 = cpu_to_le32(XGMAC_TDES3_CTXT | XGMAC_TDES3_TCMSSV);
 }
 
-static void dwxgmac2_set_addr(struct dma_desc *p, dma_addr_t addr)
+static void dwxgmac2_set_addr(struct stmmac_priv *priv, struct dma_desc *p,
+			      dma_addr_t addr)
 {
 	p->des0 = cpu_to_le32(lower_32_bits(addr));
 	p->des1 = cpu_to_le32(upper_32_bits(addr));
 }
 
-static void dwxgmac2_clear(struct dma_desc *p)
+static void dwxgmac2_clear(struct stmmac_priv *priv, struct dma_desc *p)
 {
 	p->des0 = 0;
 	p->des1 = 0;
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c +5 -3
index 070bd912580b..08b305f95f97 100644
@@ -19,7 +19,7 @@ static int dwxgmac2_dma_reset(void __iomem *ioaddr)
 				  !(value & XGMAC_SWR), 0, 100000);
 }
 
-static void dwxgmac2_dma_init(void __iomem *ioaddr,
+static void dwxgmac2_dma_init(struct stmmac_priv *priv, void __iomem *ioaddr,
 			      struct stmmac_dma_cfg *dma_cfg, int atds)
 {
 	u32 value = readl(ioaddr + XGMAC_DMA_SYSBUS_MODE);
@@ -81,7 +81,8 @@ static void dwxgmac2_dma_init_tx_chan(struct stmmac_priv *priv,
 	writel(lower_32_bits(phy), ioaddr + XGMAC_DMA_CH_TxDESC_LADDR(chan));
 }
 
-static void dwxgmac2_dma_axi(void __iomem *ioaddr, struct stmmac_axi *axi)
+static void dwxgmac2_dma_axi(struct stmmac_priv *priv, void __iomem *ioaddr,
+			     struct stmmac_axi *axi)
 {
 	u32 value = readl(ioaddr + XGMAC_DMA_SYSBUS_MODE);
 	int i;
@@ -384,7 +385,8 @@ static int dwxgmac2_dma_interrupt(struct stmmac_priv *priv,
 	return ret;
 }
 
-static int dwxgmac2_get_hw_feature(void __iomem *ioaddr,
+static int dwxgmac2_get_hw_feature(struct stmmac_priv *priv,
+				   void __iomem *ioaddr,
 				   struct dma_features *dma_cap)
 {
 	u32 hw_cap;
drivers/net/ethernet/stmicro/stmmac/enh_desc.c +9 -8
index a91d8f13a931..1932a3a8e03c 100644
@@ -79,7 +79,7 @@ static int enh_desc_get_tx_status(struct net_device_stats *stats,
 	return ret;
 }
 
-static int enh_desc_get_tx_len(struct dma_desc *p)
+static int enh_desc_get_tx_len(struct stmmac_priv *priv, struct dma_desc *p)
 {
 	return (le32_to_cpu(p->des1) & ETDES1_BUFFER1_SIZE_MASK);
 }
@@ -255,8 +255,8 @@ static int enh_desc_get_rx_status(struct net_device_stats *stats,
 	return ret;
 }
 
-static void enh_desc_init_rx_desc(struct dma_desc *p, int disable_rx_ic,
-				  int mode, int end, int bfsize)
+static void enh_desc_init_rx_desc(struct stmmac_priv *priv, struct dma_desc *p,
+				  int disable_rx_ic, int mode, int end, int bfsize)
 {
 	int bfsize1;
 
@@ -314,9 +314,9 @@ static void enh_desc_release_tx_desc(struct dma_desc *p, int mode)
 		enh_desc_end_tx_desc_on_ring(p, ter);
 }
 
-static void enh_desc_prepare_tx_desc(struct dma_desc *p, int is_fs, int len,
-				     bool csum_flag, int mode, bool tx_own,
-				     bool ls, unsigned int tot_pkt_len)
+static void enh_desc_prepare_tx_desc(struct stmmac_priv *priv, struct dma_desc *p,
+				     int is_fs, int len, bool csum_flag, int mode,
+				     bool tx_own, bool ls, unsigned int tot_pkt_len)
 {
 	unsigned int tdes0 = le32_to_cpu(p->des0);
 
@@ -441,12 +441,13 @@ static void enh_desc_display_ring(void *head, unsigned int size, bool rx,
 	pr_info("\n");
 }
 
-static void enh_desc_set_addr(struct dma_desc *p, dma_addr_t addr)
+static void enh_desc_set_addr(struct stmmac_priv *priv, struct dma_desc *p,
+			      dma_addr_t addr)
 {
 	p->des2 = cpu_to_le32(addr);
 }
 
-static void enh_desc_clear(struct dma_desc *p)
+static void enh_desc_clear(struct stmmac_priv *priv, struct dma_desc *p)
 {
 	p->des2 = 0;
 }
drivers/net/ethernet/stmicro/stmmac/hwif.h +42 -35

215 lines not on this page · raw message

drivers/net/ethernet/stmicro/stmmac/norm_desc.c +9 -8
index 350e6670a576..22b8f27edfab 100644
@@ -61,7 +61,7 @@ static int ndesc_get_tx_status(struct net_device_stats *stats,
 	return ret;
 }
 
-static int ndesc_get_tx_len(struct dma_desc *p)
+static int ndesc_get_tx_len(struct stmmac_priv *priv, struct dma_desc *p)
 {
 	return (le32_to_cpu(p->des1) & RDES1_BUFFER1_SIZE_MASK);
 }
@@ -122,8 +122,8 @@ static int ndesc_get_rx_status(struct net_device_stats *stats,
 	return ret;
 }
 
-static void ndesc_init_rx_desc(struct dma_desc *p, int disable_rx_ic, int mode,
-			       int end, int bfsize)
+static void ndesc_init_rx_desc(struct stmmac_priv *priv, struct dma_desc *p,
+			       int disable_rx_ic, int mode, int end, int bfsize)
 {
 	int bfsize1;
 
@@ -181,9 +181,9 @@ static void ndesc_release_tx_desc(struct dma_desc *p, int mode)
 		ndesc_end_tx_desc_on_ring(p, ter);
 }
 
-static void ndesc_prepare_tx_desc(struct dma_desc *p, int is_fs, int len,
-				  bool csum_flag, int mode, bool tx_own,
-				  bool ls, unsigned int tot_pkt_len)
+static void ndesc_prepare_tx_desc(struct stmmac_priv *priv, struct dma_desc *p,
+				  int is_fs, int len, bool csum_flag, int mode,
+				  bool tx_own, bool ls, unsigned int tot_pkt_len)
 {
 	unsigned int tdes1 = le32_to_cpu(p->des1);
 
@@ -292,12 +292,13 @@ static void ndesc_display_ring(void *head, unsigned int size, bool rx,
 	pr_info("\n");
 }
 
-static void ndesc_set_addr(struct dma_desc *p, dma_addr_t addr)
+static void ndesc_set_addr(struct stmmac_priv *priv, struct dma_desc *p,
+			   dma_addr_t addr)
 {
 	p->des2 = cpu_to_le32(addr);
 }
 
-static void ndesc_clear(struct dma_desc *p)
+static void ndesc_clear(struct stmmac_priv *priv, struct dma_desc *p)
 {
 	p->des2 = 0;
 }
drivers/net/ethernet/stmicro/stmmac/ring_mode.c +2 -2
index d218412ca832..49dd6ea07416 100644
@@ -111,7 +111,7 @@ static void refill_desc3(struct stmmac_rx_queue *rx_q, struct dma_desc *p)
 }
 
 /* In ring mode we need to fill the desc3 because it is used as buffer */
-static void init_desc3(struct dma_desc *p)
+static void init_desc3(struct stmmac_priv *priv, struct dma_desc *p)
 {
 	p->des3 = cpu_to_le32(le32_to_cpu(p->des2) + BUF_SIZE_8KiB);
 }
@@ -128,7 +128,7 @@ static void clean_desc3(struct stmmac_tx_queue *tx_q, struct dma_desc *p)
 		p->des3 = 0;
 }
 
-static int set_16kib_bfsize(int mtu)
+static int set_16kib_bfsize(struct stmmac_priv *priv, int mtu)
 {
 	int ret = 0;
 	if (unlikely(mtu > BUF_SIZE_8KiB))
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +3 -3
index 4727f7be4f86..e8619853b6d6 100644
@@ -2499,7 +2499,7 @@ static bool stmmac_xdp_xmit_zc(struct stmmac_priv *priv, u32 queue, u32 budget)
 				       true, priv->mode, true, true,
 				       xdp_desc.len);
 
-		stmmac_enable_dma_transmission(priv, priv->ioaddr);
+		stmmac_enable_dma_transmission(priv, priv->ioaddr, queue);
 
 		tx_q->cur_tx = STMMAC_GET_ENTRY(tx_q->cur_tx, priv->dma_conf.dma_tx_size);
 		entry = tx_q->cur_tx;
@@ -4559,7 +4559,7 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
 
 	netdev_tx_sent_queue(netdev_get_tx_queue(dev, queue), skb->len);
 
-	stmmac_enable_dma_transmission(priv, priv->ioaddr);
+	stmmac_enable_dma_transmission(priv, priv->ioaddr, queue);
 
 	stmmac_flush_tx_descriptors(priv, queue);
 	stmmac_tx_timer_arm(priv, queue);
@@ -4775,7 +4775,7 @@ static int stmmac_xdp_xmit_xdpf(struct stmmac_priv *priv, int queue,
 		priv->xstats.tx_set_ic_bit++;
 	}
 
-	stmmac_enable_dma_transmission(priv, priv->ioaddr);
+	stmmac_enable_dma_transmission(priv, priv->ioaddr, queue);
 
 	entry = STMMAC_GET_ENTRY(entry, priv->dma_conf.dma_tx_size);
 	tx_q->cur_tx = entry;
Signature · 1 line
2.39.3
#2 lore raw

PATCH v2 2/10 net: stmmac: dwmac1000: Allow platforms to choose some register offsets

In reply to Feiyang Chen

Some platforms have dwmac1000 implementations that have a different address space layout than the default. Extend the macro to allow a platform driver to choose the appropriate register offsets.

---
 .../ethernet/stmicro/stmmac/dwmac1000_core.c  |  14 +-
 .../ethernet/stmicro/stmmac/dwmac100_core.c   |   3 +
 .../net/ethernet/stmicro/stmmac/dwmac_dma.h   | 205 +++++++++---------
 .../net/ethernet/stmicro/stmmac/dwmac_lib.c   |  41 ++++
 include/linux/stmmac.h                        |  48 ++++
 5 files changed, 210 insertions(+), 101 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c +11 -3
index b52793edf62f..9015a61f804c 100644
@@ -19,6 +19,7 @@
 #include "stmmac.h"
 #include "stmmac_pcs.h"
 #include "dwmac1000.h"
+#include "dwmac_dma.h"
 
 static void dwmac1000_core_init(struct mac_device_info *hw,
 				struct net_device *dev)
@@ -527,12 +528,10 @@ const struct stmmac_ops dwmac1000_ops = {
 	.set_mac_loopback = dwmac1000_set_mac_loopback,
 };
 
-int dwmac1000_setup(struct stmmac_priv *priv)
+static int _dwmac1000_setup(struct stmmac_priv *priv)
 {
 	struct mac_device_info *mac = priv->hw;
 
-	dev_info(priv->device, "\tDWMAC1000\n");
-
 	priv->dev->priv_flags |= IFF_UNICAST_FLT;
 	mac->pcsr = priv->ioaddr;
 	mac->multicast_filter_bins = priv->plat->multicast_filter_bins;
@@ -558,3 +557,12 @@ int dwmac1000_setup(struct stmmac_priv *priv)
 
 	return 0;
 }
+
+int dwmac1000_setup(struct stmmac_priv *priv)
+{
+	dev_info(priv->device, "\tDWMAC1000\n");
+
+	priv->plat->dwmac_regs = &dwmac_default_dma_regs;
+
+	return _dwmac1000_setup(priv);
+}
drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c +3 -0
index c03623edeb75..73ee16549775 100644
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include "stmmac.h"
 #include "dwmac100.h"
+#include "dwmac_dma.h"
 
 static void dwmac100_core_init(struct mac_device_info *hw,
 			       struct net_device *dev)
@@ -177,6 +178,8 @@ int dwmac100_setup(struct stmmac_priv *priv)
 
 	dev_info(priv->device, "\tDWMAC100\n");
 
+	priv->plat->dwmac_regs = &dwmac_default_dma_regs;
+
 	mac->pcsr = priv->ioaddr;
 	mac->link.duplex = MAC_CONTROL_F;
 	mac->link.speed10 = 0;
drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h +107 -98

241 lines not on this page · raw message

drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c +41 -0

47 lines not on this page · raw message

include/linux/stmmac.h +48 -0

59 lines not on this page · raw message

Signature · 1 line
2.39.3
#3 lore raw

Re: [PATCH v2 02/10] net: stmmac: dwmac1000: Allow platforms to choose some register offsets

drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h line 19

Quoted 5 lines
drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h +3 -1
+#define _REGS			(priv->plat->dwmac_regs)
 
-/* Rx watchdog register */
+/* DMA CRS Control and Status Register Mapping */
+#define DMA_CHAN_OFFSET		(_REGS->addrs->chan_offset)

It is thought to be bad practice for a macro to access things not passed to it. Please try to make a cleaner solution.

Andrew

#4 lore raw

Re: [PATCH v2 02/10] net: stmmac: dwmac1000: Allow platforms to choose some register offsets

Quoted 10 lines · Andrew Lunn

drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h line 19

Quoted 6 lines
drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h +3 -1
+#define _REGS                        (priv->plat->dwmac_regs)
 
-/* Rx watchdog register */
+/* DMA CRS Control and Status Register Mapping */
+#define DMA_CHAN_OFFSET              (_REGS->addrs->chan_offset)

It is thought to be bad practice for a macro to access things not passed to it. Please try to make a cleaner solution.

Hi, Andrew,

OK. I will try.

Thanks,
Feiyang

Quoted 1 line

Andrew

#5 lore raw

PATCH v2 3/10 net: stmmac: dwmac1000: Add multi-channel support

In reply to Feiyang Chen

Some platforms have dwmac1000 implementations that support multi- channel. Extend the functions to add multi-channel support.

---
 .../ethernet/stmicro/stmmac/dwmac1000_core.c  |  1 +
 .../ethernet/stmicro/stmmac/dwmac1000_dma.c   | 64 +++++++++++++++++--
 .../net/ethernet/stmicro/stmmac/dwmac_lib.c   | 28 ++++----
 include/linux/stmmac.h                        |  1 +
 4 files changed, 73 insertions(+), 21 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c +1 -0
index 9015a61f804c..a9b42a122ed6 100644
@@ -562,6 +562,7 @@ int dwmac1000_setup(struct stmmac_priv *priv)
 {
 	dev_info(priv->device, "\tDWMAC1000\n");
 
+	priv->plat->dwmac_is_loongson = false;
 	priv->plat->dwmac_regs = &dwmac_default_dma_regs;
 
 	return _dwmac1000_setup(priv);
drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c +57 -7

117 lines not on this page · raw message

drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c +14 -14
index 266f64148c1a..99838497b183 100644
@@ -71,63 +71,63 @@ int dwmac_dma_reset(void __iomem *ioaddr)
 void dwmac_enable_dma_transmission(struct stmmac_priv *priv,
 				   void __iomem *ioaddr, u32 chan)
 {
-	writel(1, ioaddr + DMA_XMT_POLL_DEMAND);
+	writel(1, ioaddr + DMA_XMT_POLL_DEMAND + chan * DMA_CHAN_OFFSET);
 }
 
 void dwmac_enable_dma_irq(struct stmmac_priv *priv, void __iomem *ioaddr,
 			  u32 chan, bool rx, bool tx)
 {
-	u32 value = readl(ioaddr + DMA_INTR_ENA);
+	u32 value = readl(ioaddr + DMA_INTR_ENA + chan * DMA_CHAN_OFFSET);
 
 	if (rx)
 		value |= DMA_INTR_DEFAULT_RX;
 	if (tx)
 		value |= DMA_INTR_DEFAULT_TX;
 
-	writel(value, ioaddr + DMA_INTR_ENA);
+	writel(value, ioaddr + DMA_INTR_ENA + chan * DMA_CHAN_OFFSET);
 }
 
 void dwmac_disable_dma_irq(struct stmmac_priv *priv, void __iomem *ioaddr,
 			   u32 chan, bool rx, bool tx)
 {
-	u32 value = readl(ioaddr + DMA_INTR_ENA);
+	u32 value = readl(ioaddr + DMA_INTR_ENA + chan * DMA_CHAN_OFFSET);
 
 	if (rx)
 		value &= ~DMA_INTR_DEFAULT_RX;
 	if (tx)
 		value &= ~DMA_INTR_DEFAULT_TX;
 
-	writel(value, ioaddr + DMA_INTR_ENA);
+	writel(value, ioaddr + DMA_INTR_ENA + chan * DMA_CHAN_OFFSET);
 }
 
 void dwmac_dma_start_tx(struct stmmac_priv *priv, void __iomem *ioaddr,
 			u32 chan)
 {
-	u32 value = readl(ioaddr + DMA_CONTROL);
+	u32 value = readl(ioaddr + DMA_CONTROL + chan * DMA_CHAN_OFFSET);
 	value |= DMA_CONTROL_ST;
-	writel(value, ioaddr + DMA_CONTROL);
+	writel(value, ioaddr + DMA_CONTROL + chan * DMA_CHAN_OFFSET);
 }
 
 void dwmac_dma_stop_tx(struct stmmac_priv *priv, void __iomem *ioaddr, u32 chan)
 {
-	u32 value = readl(ioaddr + DMA_CONTROL);
+	u32 value = readl(ioaddr + DMA_CONTROL + chan * DMA_CHAN_OFFSET);
 	value &= ~DMA_CONTROL_ST;
-	writel(value, ioaddr + DMA_CONTROL);
+	writel(value, ioaddr + DMA_CONTROL + chan * DMA_CHAN_OFFSET);
 }
 
 void dwmac_dma_start_rx(struct stmmac_priv *priv, void __iomem *ioaddr,
 			u32 chan)
 {
-	u32 value = readl(ioaddr + DMA_CONTROL);
+	u32 value = readl(ioaddr + DMA_CONTROL + chan * DMA_CHAN_OFFSET);
 	value |= DMA_CONTROL_SR;
-	writel(value, ioaddr + DMA_CONTROL);
+	writel(value, ioaddr + DMA_CONTROL + chan * DMA_CHAN_OFFSET);
 }
 
 void dwmac_dma_stop_rx(struct stmmac_priv *priv, void __iomem *ioaddr, u32 chan)
 {
-	u32 value = readl(ioaddr + DMA_CONTROL);
+	u32 value = readl(ioaddr + DMA_CONTROL + chan * DMA_CHAN_OFFSET);
 	value &= ~DMA_CONTROL_SR;
-	writel(value, ioaddr + DMA_CONTROL);
+	writel(value, ioaddr + DMA_CONTROL + chan * DMA_CHAN_OFFSET);
 }
 
 #ifdef DWMAC_DMA_DEBUG
@@ -205,7 +205,7 @@ int dwmac_dma_interrupt(struct stmmac_priv *priv, void __iomem *ioaddr,
 {
 	int ret = 0;
 	/* read the status register (CSR5) */
-	u32 intr_status = readl(ioaddr + DMA_STATUS);
+	u32 intr_status = readl(ioaddr + DMA_STATUS + chan * DMA_CHAN_OFFSET);
 
 #ifdef DWMAC_DMA_DEBUG
 	/* Enable it to monitor DMA rx/tx status in case of critical problems */
include/linux/stmmac.h +1 -0
index db61dc7c931d..5e68553433a7 100644
@@ -342,5 +342,6 @@ struct plat_stmmacenet_data {
 	const struct dwmac4_addrs *dwmac4_addrs;
 	bool has_integrated_pcs;
 	const struct dwmac_regs *dwmac_regs;
+	bool dwmac_is_loongson;
 };
 #endif
Signature · 1 line
2.39.3
#6 lore raw

Re: [PATCH v2 03/10] net: stmmac: dwmac1000: Add multi-channel support

drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c int dwmac1000_setup(struct stmmac_priv *priv) · line 565

Quoted 4 lines · Feiyang Chen

Some platforms have dwmac1000 implementations that support multi- channel. Extend the functions to add multi-channel support.

drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c +1 -0
+	priv->plat->dwmac_is_loongson = false;

I don't know this driver, so my comments could be wrong...

Is this specific to loongson, or multi-channel? If you look at the other bool in plat, they are all for features, not machines? Could this actually be called priv->multi_chan_en ?

Andrew

#7 lore raw

Re: [PATCH v2 03/10] net: stmmac: dwmac1000: Add multi-channel support

Quoted 5 lines · Andrew Lunn
Quoted 3 lines · Feiyang Chen

Some platforms have dwmac1000 implementations that support multi- channel. Extend the functions to add multi-channel support.

Quoted 8 lines
Quoted 1 line

+ priv->plat->dwmac_is_loongson = false;

I don't know this driver, so my comments could be wrong...

Is this specific to loongson, or multi-channel? If you look at the other bool in plat, they are all for features, not machines? Could this actually be called priv->multi_chan_en ?

Hi, Andrew,

It is specific to loongson. I think I can add some features instead of using dwmac_is_loongson.

Thanks,
Feiyang

Quoted 1 line

Andrew

#8 lore raw

Re: [PATCH v2 03/10] net: stmmac: dwmac1000: Add multi-channel support

In reply to Feiyang Chen
kernel test robot noticed the following build warnings:

Hi Feiyang,

kernel test robot noticed the following build warnings:

[auto build test WARNING on net/main]
[also build test WARNING on linus/master v6.5-rc3]
[cannot apply to sunxi/sunxi/for-next net-next/main horms-ipvs/master next-20230727] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Feiyang-Chen/net-stmmac-Pass-stmmac_priv-and-chan-in-some-callbacks/20230727-155954
base:   net/main
patch link:    https://lore.kernel.org/r/373259d4ac9ac0b9e1e64ad96d60a9bbd35b85aa.1690439335.git.chenfeiyang%40loongson.cn
patch subject: [PATCH v2 03/10] net: stmmac: dwmac1000: Add multi-channel support
config: alpha-randconfig-r012-20230727 (https://download.01.org/0day-ci/archive/20230727/[email protected]/config)
compiler: alpha-linux-gcc (GCC) 12.3.0
reproduce: (https://download.01.org/0day-ci/archive/20230727/[email protected]/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/

All warnings (new ones prefixed by >>):

>> drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c:114:6: warning: no previous prototype for 'dwmac1000_dma_init_channel' [-Wmissing-prototypes]

114 | void dwmac1000_dma_init_channel(struct stmmac_priv *priv, void __iomem *ioaddr,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~

vim +/dwmac1000_dma_init_channel +114 drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c

113

 > 114	void dwmac1000_dma_init_channel(struct stmmac_priv *priv, void __iomem *ioaddr,

115 struct stmmac_dma_cfg *dma_cfg,
116 u32 chan)
117 {
118 u32 value;
119 int txpbl = dma_cfg->txpbl ?: dma_cfg->pbl;
120 int rxpbl = dma_cfg->rxpbl ?: dma_cfg->pbl;
121
122 if (!priv->plat->dwmac_is_loongson)
123 return;
124
125 /* common channel control register config */
126 value = readl(ioaddr + DMA_BUS_MODE + chan * DMA_CHAN_OFFSET);
127
128 /*
129 * Set the DMA PBL (Programmable Burst Length) mode.
130 *
131 * Note: before stmmac core 3.50 this mode bit was 4xPBL, and
132 * post 3.5 mode bit acts as 8*PBL.
133 */
134 if (dma_cfg->pblx8)
135 value |= DMA_BUS_MODE_MAXPBL;
136 value |= DMA_BUS_MODE_USP;
137 value &= ~(DMA_BUS_MODE_PBL_MASK | DMA_BUS_MODE_RPBL_MASK);
138 value |= (txpbl << DMA_BUS_MODE_PBL_SHIFT);
139 value |= (rxpbl << DMA_BUS_MODE_RPBL_SHIFT);
140
141 /* Set the Fixed burst mode */
142 if (dma_cfg->fixed_burst)
143 value |= DMA_BUS_MODE_FB;
144
145 /* Mixed Burst has no effect when fb is set */
146 if (dma_cfg->mixed_burst)
147 value |= DMA_BUS_MODE_MB;
148
149 value |= DMA_BUS_MODE_ATDS;
150
151 if (dma_cfg->aal)
152 value |= DMA_BUS_MODE_AAL;
153
154 writel(value, ioaddr + DMA_BUS_MODE + chan * DMA_CHAN_OFFSET);
155
156 /* Mask interrupts by writing to CSR7 */
157 writel(DMA_INTR_DEFAULT_MASK,
158 ioaddr + DMA_INTR_ENA + chan * DMA_CHAN_OFFSET);
159 }
160

Signature · 2 lines
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
#9 lore raw

Re: [PATCH v2 03/10] net: stmmac: dwmac1000: Add multi-channel support

In reply to Feiyang Chen
kernel test robot noticed the following build warnings:

Hi Feiyang,

kernel test robot noticed the following build warnings:

[auto build test WARNING on net/main]
[also build test WARNING on linus/master v6.5-rc3]
[cannot apply to sunxi/sunxi/for-next net-next/main horms-ipvs/master next-20230727] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Feiyang-Chen/net-stmmac-Pass-stmmac_priv-and-chan-in-some-callbacks/20230727-155954
base:   net/main
patch link:    https://lore.kernel.org/r/373259d4ac9ac0b9e1e64ad96d60a9bbd35b85aa.1690439335.git.chenfeiyang%40loongson.cn
patch subject: [PATCH v2 03/10] net: stmmac: dwmac1000: Add multi-channel support
config: i386-buildonly-randconfig-r006-20230727 (https://download.01.org/0day-ci/archive/20230728/[email protected]/config)
compiler: clang version 16.0.4 (https://github.com/llvm/llvm-project.git ae42196bc493ffe877a7e3dff8be32035dea4d07)
reproduce: (https://download.01.org/0day-ci/archive/20230728/[email protected]/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/

All warnings (new ones prefixed by >>):

>> drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c:114:6: warning: no previous prototype for function 'dwmac1000_dma_init_channel' [-Wmissing-prototypes]
   void dwmac1000_dma_init_channel(struct stmmac_priv *priv, void __iomem *ioaddr,
        ^

drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c:114:1: note: declare 'static' if the function is not intended to be used outside of this translation unit void dwmac1000_dma_init_channel(struct stmmac_priv *priv, void __iomem *ioaddr,
^
static
1 warning generated.

vim +/dwmac1000_dma_init_channel +114 drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c

113

 > 114	void dwmac1000_dma_init_channel(struct stmmac_priv *priv, void __iomem *ioaddr,

115 struct stmmac_dma_cfg *dma_cfg,
116 u32 chan)
117 {
118 u32 value;
119 int txpbl = dma_cfg->txpbl ?: dma_cfg->pbl;
120 int rxpbl = dma_cfg->rxpbl ?: dma_cfg->pbl;
121
122 if (!priv->plat->dwmac_is_loongson)
123 return;
124
125 /* common channel control register config */
126 value = readl(ioaddr + DMA_BUS_MODE + chan * DMA_CHAN_OFFSET);
127
128 /*
129 * Set the DMA PBL (Programmable Burst Length) mode.
130 *
131 * Note: before stmmac core 3.50 this mode bit was 4xPBL, and
132 * post 3.5 mode bit acts as 8*PBL.
133 */
134 if (dma_cfg->pblx8)
135 value |= DMA_BUS_MODE_MAXPBL;
136 value |= DMA_BUS_MODE_USP;
137 value &= ~(DMA_BUS_MODE_PBL_MASK | DMA_BUS_MODE_RPBL_MASK);
138 value |= (txpbl << DMA_BUS_MODE_PBL_SHIFT);
139 value |= (rxpbl << DMA_BUS_MODE_RPBL_SHIFT);
140
141 /* Set the Fixed burst mode */
142 if (dma_cfg->fixed_burst)
143 value |= DMA_BUS_MODE_FB;
144
145 /* Mixed Burst has no effect when fb is set */
146 if (dma_cfg->mixed_burst)
147 value |= DMA_BUS_MODE_MB;
148
149 value |= DMA_BUS_MODE_ATDS;
150
151 if (dma_cfg->aal)
152 value |= DMA_BUS_MODE_AAL;
153
154 writel(value, ioaddr + DMA_BUS_MODE + chan * DMA_CHAN_OFFSET);
155
156 /* Mask interrupts by writing to CSR7 */
157 writel(DMA_INTR_DEFAULT_MASK,
158 ioaddr + DMA_INTR_ENA + chan * DMA_CHAN_OFFSET);
159 }
160

Signature · 2 lines
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
#10 lore raw

PATCH v2 4/10 net: stmmac: dwmac1000: Add 64-bit DMA support

In reply to Feiyang Chen

Some platforms have dwmac1000 implementations that support 64-bit DMA. Extend the functions to add 64-bit DMA support.

---
 .../net/ethernet/stmicro/stmmac/chain_mode.c  |  23 +++-
 drivers/net/ethernet/stmicro/stmmac/descs.h   |   7 ++
 .../net/ethernet/stmicro/stmmac/descs_com.h   |  49 ++++++---
 .../ethernet/stmicro/stmmac/dwmac1000_dma.c   |  30 ++++--
 .../net/ethernet/stmicro/stmmac/enh_desc.c    |  21 +++-
 .../net/ethernet/stmicro/stmmac/ring_mode.c   | 101 ++++++++++++++----
 include/linux/stmmac.h                        |   1 +
 7 files changed, 183 insertions(+), 49 deletions(-)
drivers/net/ethernet/stmicro/stmmac/chain_mode.c +21 -2
index a95866871f3e..c8d77cbd51bc 100644
@@ -36,6 +36,9 @@ static int jumbo_frm(struct stmmac_tx_queue *tx_q, struct sk_buff *skb,
 	des2 = dma_map_single(priv->device, skb->data,
 			      bmax, DMA_TO_DEVICE);
 	desc->des2 = cpu_to_le32(des2);
+	if (priv->plat->dma_cfg->dma64)
+		desc->des3 = cpu_to_le32(upper_32_bits(des2));
+
 	if (dma_mapping_error(priv->device, des2))
 		return -1;
 	tx_q->tx_skbuff_dma[entry].buf = des2;
@@ -54,12 +57,16 @@ static int jumbo_frm(struct stmmac_tx_queue *tx_q, struct sk_buff *skb,
 					      (skb->data + bmax * i),
 					      bmax, DMA_TO_DEVICE);
 			desc->des2 = cpu_to_le32(des2);
+			if (priv->plat->dma_cfg->dma64)
+				desc->des3 = cpu_to_le32(upper_32_bits(des2));
 			if (dma_mapping_error(priv->device, des2))
 				return -1;
 			tx_q->tx_skbuff_dma[entry].buf = des2;
 			tx_q->tx_skbuff_dma[entry].len = bmax;
 			stmmac_prepare_tx_desc(priv, desc, 0, bmax, csum,
-					STMMAC_CHAIN_MODE, 1, false, skb->len);
+					       STMMAC_CHAIN_MODE,
+					       !priv->plat->dma_cfg->dma64,
+					       false, skb->len);
 			len -= bmax;
 			i++;
 		} else {
@@ -67,6 +74,8 @@ static int jumbo_frm(struct stmmac_tx_queue *tx_q, struct sk_buff *skb,
 					      (skb->data + bmax * i), len,
 					      DMA_TO_DEVICE);
 			desc->des2 = cpu_to_le32(des2);
+			if (priv->plat->dma_cfg->dma64)
+				desc->des3 = cpu_to_le32(upper_32_bits(des2));
 			if (dma_mapping_error(priv->device, des2))
 				return -1;
 			tx_q->tx_skbuff_dma[entry].buf = des2;
@@ -110,7 +119,11 @@ static void init_dma_chain(struct stmmac_priv *priv, void *des,
 		struct dma_extended_desc *p = (struct dma_extended_desc *)des;
 		for (i = 0; i < (size - 1); i++) {
 			dma_phy += sizeof(struct dma_extended_desc);
-			p->basic.des3 = cpu_to_le32((unsigned int)dma_phy);
+			if (priv->plat->dma_cfg->dma64) {
+				p->des6 = cpu_to_le32((unsigned int)dma_phy);
+				p->des7 = cpu_to_le32(upper_32_bits(dma_phy));
+			} else
+				p->basic.des3 = cpu_to_le32((unsigned int)dma_phy);
 			p++;
 		}
 		p->basic.des3 = cpu_to_le32((unsigned int)phy_addr);
@@ -130,6 +143,9 @@ static void refill_desc3(struct stmmac_rx_queue *rx_q, struct dma_desc *p)
 {
 	struct stmmac_priv *priv = rx_q->priv_data;
 
+	if (priv->plat->dma_cfg->dma64)
+		return;
+
 	if (priv->hwts_rx_en && !priv->extend_desc)
 		/* NOTE: Device will overwrite des3 with timestamp value if
 		 * 1588-2002 time stamping is enabled, hence reinitialize it
@@ -146,6 +162,9 @@ static void clean_desc3(struct stmmac_tx_queue *tx_q, struct dma_desc *p)
 	struct stmmac_priv *priv = tx_q->priv_data;
 	unsigned int entry = tx_q->dirty_tx;
 
+	if (priv->plat->dma_cfg->dma64)
+		return;
+
 	if (tx_q->tx_skbuff_dma[entry].last_segment && !priv->extend_desc &&
 	    priv->hwts_tx_en)
 		/* NOTE: Device will overwrite des3 with timestamp value if
drivers/net/ethernet/stmicro/stmmac/descs.h +7 -0
index 49d6a866244f..223b77f0271c 100644
@@ -56,6 +56,9 @@
 #define ERDES1_BUFFER2_SIZE_SHIFT	16
 #define	ERDES1_DISABLE_IC		BIT(31)
 
+#define	E64RDES1_BUFFER1_SIZE_MASK	GENMASK(13, 0)
+#define	E64RDES1_BUFFER2_SIZE_MASK	GENMASK(29, 16)
+
 /* Normal transmit descriptor defines */
 /* TDES0 */
 #define	TDES0_DEFERRED			BIT(0)
@@ -122,6 +125,10 @@
 #define	ETDES1_BUFFER2_SIZE_MASK	GENMASK(28, 16)
 #define	ETDES1_BUFFER2_SIZE_SHIFT	16
 
+#define	E64TDES1_BUFFER1_SIZE_MASK	GENMASK(13, 0)
+#define	E64TDES1_BUFFER2_SIZE_MASK	GENMASK(28, 15)
+#define	E64TDES1_BUFFER2_SIZE_SHIFT	15
+
 /* Extended Receive descriptor definitions */
 #define	ERDES4_IP_PAYLOAD_TYPE_MASK	GENMASK(6, 2)
 #define	ERDES4_IP_HDR_ERR		BIT(3)
drivers/net/ethernet/stmicro/stmmac/descs_com.h +35 -14

71 lines not on this page · raw message

drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c +24 -6
index efb219999a20..632c4f110d01 100644
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include "dwmac1000.h"
 #include "dwmac_dma.h"
+#include "stmmac.h"
 
 static void dwmac1000_dma_axi(struct stmmac_priv *priv, void __iomem *ioaddr,
 			      struct stmmac_axi *axi)
@@ -109,6 +110,9 @@ static void dwmac1000_dma_init(struct stmmac_priv *priv, void __iomem *ioaddr,
 
 	/* Mask interrupts by writing to CSR7 */
 	writel(DMA_INTR_DEFAULT_MASK, ioaddr + DMA_INTR_ENA);
+
+	if (dma_cfg->dma64)
+		writel(0x100, ioaddr + DMA_FUNC_CONFIG);
 }
 
 void dwmac1000_dma_init_channel(struct stmmac_priv *priv, void __iomem *ioaddr,
@@ -163,9 +167,16 @@ static void dwmac1000_dma_init_rx(struct stmmac_priv *priv,
 				  struct stmmac_dma_cfg *dma_cfg,
 				  dma_addr_t dma_rx_phy, u32 chan)
 {
-	/* RX descriptor base address list must be written into DMA CSR3 */
-	writel(lower_32_bits(dma_rx_phy), ioaddr + DMA_RCV_BASE_ADDR +
-		chan * DMA_CHAN_OFFSET);
+	if (dma_cfg->dma64) {
+		writel(lower_32_bits(dma_rx_phy), ioaddr + DMA_RCV_BASE_ADDR +
+		       chan * DMA_CHAN_OFFSET);
+		writel(upper_32_bits(dma_rx_phy), ioaddr + DMA_RCV_BASE_ADDR_HI +
+		       chan * DMA_CHAN_OFFSET);
+	} else {
+		/* RX descriptor base address list must be written into DMA CSR3 */
+		writel(lower_32_bits(dma_rx_phy), ioaddr + DMA_RCV_BASE_ADDR +
+		       chan * DMA_CHAN_OFFSET);
+	}
 }
 
 static void dwmac1000_dma_init_tx(struct stmmac_priv *priv,
@@ -173,9 +184,16 @@ static void dwmac1000_dma_init_tx(struct stmmac_priv *priv,
 				  struct stmmac_dma_cfg *dma_cfg,
 				  dma_addr_t dma_tx_phy, u32 chan)
 {
-	/* TX descriptor base address list must be written into DMA CSR4 */
-	writel(lower_32_bits(dma_tx_phy), ioaddr + DMA_TX_BASE_ADDR +
-		chan * DMA_CHAN_OFFSET);
+	if (dma_cfg->dma64) {
+		writel(lower_32_bits(dma_tx_phy), ioaddr + DMA_TX_BASE_ADDR +
+		       chan * DMA_CHAN_OFFSET);
+		writel(upper_32_bits(dma_tx_phy), ioaddr + DMA_TX_BASE_ADDR_HI +
+		       chan * DMA_CHAN_OFFSET);
+	} else {
+		/* TX descriptor base address list must be written into DMA CSR4 */
+		writel(lower_32_bits(dma_tx_phy), ioaddr + DMA_TX_BASE_ADDR +
+		       chan * DMA_CHAN_OFFSET);
+	}
 }
 
 static u32 dwmac1000_configure_fc(u32 csr6, int rxfifosz)
drivers/net/ethernet/stmicro/stmmac/enh_desc.c +16 -5
index 1932a3a8e03c..ee07006c97c1 100644
@@ -11,6 +11,7 @@
 #include <linux/stmmac.h>
 #include "common.h"
 #include "descs_com.h"
+#include "stmmac.h"
 
 static int enh_desc_get_tx_status(struct net_device_stats *stats,
 				  struct stmmac_extra_stats *x,
@@ -81,7 +82,10 @@ static int enh_desc_get_tx_status(struct net_device_stats *stats,
 
 static int enh_desc_get_tx_len(struct stmmac_priv *priv, struct dma_desc *p)
 {
-	return (le32_to_cpu(p->des1) & ETDES1_BUFFER1_SIZE_MASK);
+	if (priv->plat->dma_cfg->dma64)
+		return (le32_to_cpu(p->des1) & E64TDES1_BUFFER1_SIZE_MASK);
+	else
+		return (le32_to_cpu(p->des1) & ETDES1_BUFFER1_SIZE_MASK);
 }
 
 static int enh_desc_coe_rdes0(int ipc_err, int type, int payload_err)
@@ -263,12 +267,15 @@ static void enh_desc_init_rx_desc(struct stmmac_priv *priv, struct dma_desc *p,
 	p->des0 |= cpu_to_le32(RDES0_OWN);
 
 	bfsize1 = min(bfsize, BUF_SIZE_8KiB);
-	p->des1 |= cpu_to_le32(bfsize1 & ERDES1_BUFFER1_SIZE_MASK);
+	if (priv->plat->dma_cfg->dma64)
+		p->des1 |= cpu_to_le32(bfsize1 & E64RDES1_BUFFER1_SIZE_MASK);
+	else
+		p->des1 |= cpu_to_le32(bfsize1 & ERDES1_BUFFER1_SIZE_MASK);
 
 	if (mode == STMMAC_CHAIN_MODE)
 		ehn_desc_rx_set_on_chain(p);
 	else
-		ehn_desc_rx_set_on_ring(p, end, bfsize);
+		ehn_desc_rx_set_on_ring(p, end, bfsize, priv->plat->dma_cfg->dma64);
 
 	if (disable_rx_ic)
 		p->des1 |= cpu_to_le32(ERDES1_DISABLE_IC);
@@ -321,9 +328,9 @@ static void enh_desc_prepare_tx_desc(struct stmmac_priv *priv, struct dma_desc *
 	unsigned int tdes0 = le32_to_cpu(p->des0);
 
 	if (mode == STMMAC_CHAIN_MODE)
-		enh_set_tx_desc_len_on_chain(p, len);
+		enh_set_tx_desc_len_on_chain(p, len, priv->plat->dma_cfg->dma64);
 	else
-		enh_set_tx_desc_len_on_ring(p, len);
+		enh_set_tx_desc_len_on_ring(p, len, priv->plat->dma_cfg->dma64);
 
 	if (is_fs)
 		tdes0 |= ETDES0_FIRST_SEGMENT;
@@ -445,11 +452,15 @@ static void enh_desc_set_addr(struct stmmac_priv *priv, struct dma_desc *p,
 			      dma_addr_t addr)
 {
 	p->des2 = cpu_to_le32(addr);
+	if (priv->plat->dma_cfg->dma64)
+		p->des3 = cpu_to_le32(upper_32_bits(addr));
 }
 
 static void enh_desc_clear(struct stmmac_priv *priv, struct dma_desc *p)
 {
 	p->des2 = 0;
+	if (priv->plat->dma_cfg->dma64)
+		p->des3 = 0;
 }
 
 const struct stmmac_desc_ops enh_desc_ops = {
drivers/net/ethernet/stmicro/stmmac/ring_mode.c +79 -22

169 lines not on this page · raw message

include/linux/stmmac.h +1 -0
index 5e68553433a7..46bccc34814d 100644
@@ -98,6 +98,7 @@ struct stmmac_dma_cfg {
 	bool eame;
 	bool multi_msi_en;
 	bool dche;
+	bool dma64;
 };
 
 #define AXI_BLEN	7
Signature · 1 line
2.39.3
#11 lore raw

Re: [PATCH v2 04/10] net: stmmac: dwmac1000: Add 64-bit DMA support

Quoted 2 lines · Feiyang Chen

Some platforms have dwmac1000 implementations that support 64-bit DMA. Extend the functions to add 64-bit DMA support.

I wounder if it would be cleaner to implement a new struct stmmac_dma_ops for 64 bit DMA support?

Andrew

#12 lore raw

Re: [PATCH v2 04/10] net: stmmac: dwmac1000: Add 64-bit DMA support

Quoted 8 lines · Andrew Lunn
Quoted 2 lines · Feiyang Chen

Some platforms have dwmac1000 implementations that support 64-bit DMA. Extend the functions to add 64-bit DMA support.

I wounder if it would be cleaner to implement a new struct stmmac_dma_ops for 64 bit DMA support?

Hi, Andrew,

Yes. I will implement a new struct stmmac_dma_ops in the next version.

Thanks,
Feiyang

Quoted 1 line

Andrew

#13 lore raw

PATCH v2 5/10 net: stmmac: dwmac1000: Add Loongson register definitions

In reply to Feiyang Chen

Add definitions for Loongson platform.

---
 .../net/ethernet/stmicro/stmmac/dwmac1000.h   |  4 +-
 .../ethernet/stmicro/stmmac/dwmac1000_core.c  | 43 +++++++---
 .../ethernet/stmicro/stmmac/dwmac1000_dma.c   | 10 ++-
 .../net/ethernet/stmicro/stmmac/dwmac_dma.h   |  2 +
 .../net/ethernet/stmicro/stmmac/dwmac_lib.c   | 84 +++++++++++++++++--
 5 files changed, 119 insertions(+), 24 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac1000.h +2 -2
index 4296ddda8aaa..f827bf8f30a9 100644
@@ -76,9 +76,9 @@ enum power_event {
 #define LPI_CTRL_STATUS_TLPIEN	0x00000001	/* Transmit LPI Entry */
 
 /* GMAC HW ADDR regs */
-#define GMAC_ADDR_HIGH(reg)	((reg > 15) ? 0x00000800 + (reg - 16) * 8 : \
+#define GMAC_ADDR_HIGH(reg, x)	((reg > 15) ? 0x00000800 + (reg - 16) * 8 * (x) : \
 				 0x00000040 + (reg * 8))
-#define GMAC_ADDR_LOW(reg)	((reg > 15) ? 0x00000804 + (reg - 16) * 8 : \
+#define GMAC_ADDR_LOW(reg, x)	((reg > 15) ? 0x00000804 + (reg - 16) * 8 * (x) : \
 				 0x00000044 + (reg * 8))
 #define GMAC_MAX_PERFECT_ADDRESSES	1
 
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c +32 -11

97 lines not on this page · raw message

drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c +8 -2
index 632c4f110d01..7aa450d6a81a 100644
@@ -329,8 +329,14 @@ static int dwmac1000_get_hw_feature(struct stmmac_priv *priv,
 	dma_cap->rx_coe_type2 = (hw_cap & DMA_HW_FEAT_RXTYP2COE) >> 18;
 	dma_cap->rxfifo_over_2048 = (hw_cap & DMA_HW_FEAT_RXFIFOSIZE) >> 19;
 	/* TX and RX number of channels */
-	dma_cap->number_rx_channel = (hw_cap & DMA_HW_FEAT_RXCHCNT) >> 20;
-	dma_cap->number_tx_channel = (hw_cap & DMA_HW_FEAT_TXCHCNT) >> 22;
+	if (priv->plat->dwmac_is_loongson &&
+	    ((hw_cap & (DMA_HW_FEAT_RXCHCNT | DMA_HW_FEAT_TXCHCNT)) >> 20) == 0) {
+		dma_cap->number_rx_channel = 8;
+		dma_cap->number_tx_channel = 8;
+	} else {
+		dma_cap->number_rx_channel = (hw_cap & DMA_HW_FEAT_RXCHCNT) >> 20;
+		dma_cap->number_tx_channel = (hw_cap & DMA_HW_FEAT_TXCHCNT) >> 22;
+	}
 	/* Alternate (enhanced) DESC mode */
 	dma_cap->enh_desc = (hw_cap & DMA_HW_FEAT_ENHDESSEL) >> 24;
 
drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h +2 -0
index 915a4d70fd3b..3828902baa80 100644
@@ -160,6 +160,8 @@
 #define NUM_DWMAC4_DMA_REGS	27
 
 extern const struct dwmac_regs dwmac_default_dma_regs;
+extern const struct dwmac_regs dwmac_loongson_dma_regs;
+extern const struct dwmac_regs dwmac_loongson64_dma_regs;
 
 void dwmac_enable_dma_transmission(struct stmmac_priv *priv,
 				   void __iomem *ioaddr, u32 chan);
drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c +75 -9

127 lines not on this page · raw message

Signature · 1 line
2.39.3
#14 lore raw

Re: [PATCH v2 05/10] net: stmmac: dwmac1000: Add Loongson register definitions

drivers/net/ethernet/stmicro/stmmac/dwmac1000.h enum power_event { · line 80

Quoted 4 lines

/* GMAC HW ADDR regs */

drivers/net/ethernet/stmicro/stmmac/dwmac1000.h +1 -1
-#define GMAC_ADDR_HIGH(reg)	((reg > 15) ? 0x00000800 + (reg - 16) * 8 : \
+#define GMAC_ADDR_HIGH(reg, x)	((reg > 15) ? 0x00000800 + (reg - 16) * 8 * (x) : \
 				 0x00000040 + (reg * 8))

please give x a more descriptive name.

Andrew

#15 lore raw

Re: [PATCH v2 05/10] net: stmmac: dwmac1000: Add Loongson register definitions

Quoted 8 lines · Andrew Lunn

drivers/net/ethernet/stmicro/stmmac/dwmac1000.h enum power_event { · line 80

Quoted 5 lines

/* GMAC HW ADDR regs */

drivers/net/ethernet/stmicro/stmmac/dwmac1000.h +1 -1
-#define GMAC_ADDR_HIGH(reg)  ((reg > 15) ? 0x00000800 + (reg - 16) * 8 : \
+#define GMAC_ADDR_HIGH(reg, x)       ((reg > 15) ? 0x00000800 + (reg - 16) * 8 * (x) : \
                               0x00000040 + (reg * 8))

please give x a more descriptive name.

Hi, Andrew,

The x is now related to the dwmac_is_loongson flag. I'll try to use another method.

Thanks,
Feiyang

Quoted 1 line

Andrew

#16 lore raw

Re: [PATCH v2 05/10] net: stmmac: dwmac1000: Add Loongson register definitions

Quoted 10 lines · Feiyang Chen
Quoted 8 lines · Andrew Lunn

drivers/net/ethernet/stmicro/stmmac/dwmac1000.h enum power_event { · line 80

Quoted 5 lines

/* GMAC HW ADDR regs */

drivers/net/ethernet/stmicro/stmmac/dwmac1000.h +1 -1
-#define GMAC_ADDR_HIGH(reg)  ((reg > 15) ? 0x00000800 + (reg - 16) * 8 : \
+#define GMAC_ADDR_HIGH(reg, x)       ((reg > 15) ? 0x00000800 + (reg - 16) * 8 * (x) : \
                               0x00000040 + (reg * 8))

please give x a more descriptive name.

Quoted 4 lines

Hi, Andrew,

The x is now related to the dwmac_is_loongson flag. I'll try to use another method.

Rather than 'dwmac_is_longson', make it represent a feature of the MAC.

Andrew

#17 lore raw

Re: [PATCH v2 05/10] net: stmmac: dwmac1000: Add Loongson register definitions

Quoted 12 lines · Andrew Lunn
Quoted 10 lines · Feiyang Chen
Quoted 8 lines · Andrew Lunn

drivers/net/ethernet/stmicro/stmmac/dwmac1000.h enum power_event { · line 80

Quoted 5 lines

/* GMAC HW ADDR regs */

drivers/net/ethernet/stmicro/stmmac/dwmac1000.h +1 -1
-#define GMAC_ADDR_HIGH(reg)  ((reg > 15) ? 0x00000800 + (reg - 16) * 8 : \
+#define GMAC_ADDR_HIGH(reg, x)       ((reg > 15) ? 0x00000800 + (reg - 16) * 8 * (x) : \
                               0x00000040 + (reg * 8))

please give x a more descriptive name.

Quoted 8 lines
Quoted 4 lines

Hi, Andrew,

The x is now related to the dwmac_is_loongson flag. I'll try to use another method.

Rather than 'dwmac_is_longson', make it represent a feature of the MAC.

Hi, Andrew,

OK.

Thanks,
Feiyang

Quoted 1 line

Andrew

#18 lore raw

PATCH v2 6/10 net: stmmac: Add Loongson HWIF entry

In reply to Feiyang Chen

Add a new entry to HWIF table for Loongson.

---
 drivers/net/ethernet/stmicro/stmmac/common.h  |  3 ++
 .../ethernet/stmicro/stmmac/dwmac1000_dma.c   |  6 +++
 drivers/net/ethernet/stmicro/stmmac/hwif.c    | 48 ++++++++++++++++++-
 .../net/ethernet/stmicro/stmmac/stmmac_main.c | 25 ++++++----
 include/linux/stmmac.h                        |  1 +
 5 files changed, 73 insertions(+), 10 deletions(-)
drivers/net/ethernet/stmicro/stmmac/common.h +3 -0
index 16e67c18b6f7..267f9a7913ac 100644
@@ -29,11 +29,13 @@
 /* Synopsys Core versions */
 #define	DWMAC_CORE_3_40		0x34
 #define	DWMAC_CORE_3_50		0x35
+#define	DWMAC_CORE_3_70		0x37
 #define	DWMAC_CORE_4_00		0x40
 #define DWMAC_CORE_4_10		0x41
 #define DWMAC_CORE_5_00		0x50
 #define DWMAC_CORE_5_10		0x51
 #define DWMAC_CORE_5_20		0x52
+#define DWLGMAC_CORE_1_00	0x10
 #define DWXGMAC_CORE_2_10	0x21
 #define DWXLGMAC_CORE_2_00	0x20
 
@@ -547,6 +549,7 @@ int dwmac1000_setup(struct stmmac_priv *priv);
 int dwmac4_setup(struct stmmac_priv *priv);
 int dwxgmac2_setup(struct stmmac_priv *priv);
 int dwxlgmac2_setup(struct stmmac_priv *priv);
+int dwmac_loongson_setup(struct stmmac_priv *priv);
 
 void stmmac_set_mac_addr(void __iomem *ioaddr, const u8 addr[6],
 			 unsigned int high, unsigned int low);
drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c +6 -0
index 7aa450d6a81a..5da5f111d7e0 100644
@@ -172,6 +172,12 @@ static void dwmac1000_dma_init_rx(struct stmmac_priv *priv,
 		       chan * DMA_CHAN_OFFSET);
 		writel(upper_32_bits(dma_rx_phy), ioaddr + DMA_RCV_BASE_ADDR_HI +
 		       chan * DMA_CHAN_OFFSET);
+		if (priv->plat->has_lgmac) {
+			writel(upper_32_bits(dma_rx_phy),
+			       ioaddr + DMA_RCV_BASE_ADDR_SHADOW1);
+			writel(upper_32_bits(dma_rx_phy),
+			       ioaddr + DMA_RCV_BASE_ADDR_SHADOW2);
+		}
 	} else {
 		/* RX descriptor base address list must be written into DMA CSR3 */
 		writel(lower_32_bits(dma_rx_phy), ioaddr + DMA_RCV_BASE_ADDR +
drivers/net/ethernet/stmicro/stmmac/hwif.c +47 -1

114 lines not on this page · raw message

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +16 -9
index e8619853b6d6..829de274e75d 100644
@@ -3505,17 +3505,21 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev)
 {
 	struct stmmac_priv *priv = netdev_priv(dev);
 	enum request_irq_err irq_err;
+	unsigned long flags = 0;
 	cpumask_t cpu_mask;
 	int irq_idx = 0;
 	char *int_name;
 	int ret;
 	int i;
 
+	if (priv->plat->has_lgmac)
+		flags |= IRQF_TRIGGER_RISING;
+
 	/* For common interrupt */
 	int_name = priv->int_name_mac;
 	sprintf(int_name, "%s:%s", dev->name, "mac");
 	ret = request_irq(dev->irq, stmmac_mac_interrupt,
-			  0, int_name, dev);
+			  flags, int_name, dev);
 	if (unlikely(ret < 0)) {
 		netdev_err(priv->dev,
 			   "%s: alloc mac MSI %d (error: %d)\n",
@@ -3532,7 +3536,7 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev)
 		sprintf(int_name, "%s:%s", dev->name, "wol");
 		ret = request_irq(priv->wol_irq,
 				  stmmac_mac_interrupt,
-				  0, int_name, dev);
+				  flags, int_name, dev);
 		if (unlikely(ret < 0)) {
 			netdev_err(priv->dev,
 				   "%s: alloc wol MSI %d (error: %d)\n",
@@ -3550,7 +3554,7 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev)
 		sprintf(int_name, "%s:%s", dev->name, "lpi");
 		ret = request_irq(priv->lpi_irq,
 				  stmmac_mac_interrupt,
-				  0, int_name, dev);
+				  flags, int_name, dev);
 		if (unlikely(ret < 0)) {
 			netdev_err(priv->dev,
 				   "%s: alloc lpi MSI %d (error: %d)\n",
@@ -3568,7 +3572,7 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev)
 		sprintf(int_name, "%s:%s", dev->name, "safety-ce");
 		ret = request_irq(priv->sfty_ce_irq,
 				  stmmac_safety_interrupt,
-				  0, int_name, dev);
+				  flags, int_name, dev);
 		if (unlikely(ret < 0)) {
 			netdev_err(priv->dev,
 				   "%s: alloc sfty ce MSI %d (error: %d)\n",
@@ -3586,7 +3590,7 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev)
 		sprintf(int_name, "%s:%s", dev->name, "safety-ue");
 		ret = request_irq(priv->sfty_ue_irq,
 				  stmmac_safety_interrupt,
-				  0, int_name, dev);
+				  flags, int_name, dev);
 		if (unlikely(ret < 0)) {
 			netdev_err(priv->dev,
 				   "%s: alloc sfty ue MSI %d (error: %d)\n",
@@ -3607,7 +3611,7 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev)
 		sprintf(int_name, "%s:%s-%d", dev->name, "rx", i);
 		ret = request_irq(priv->rx_irq[i],
 				  stmmac_msi_intr_rx,
-				  0, int_name, &priv->dma_conf.rx_queue[i]);
+				  flags, 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",
@@ -3632,7 +3636,7 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev)
 		sprintf(int_name, "%s:%s-%d", dev->name, "tx", i);
 		ret = request_irq(priv->tx_irq[i],
 				  stmmac_msi_intr_tx,
-				  0, int_name, &priv->dma_conf.tx_queue[i]);
+				  flags, 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",
@@ -6057,8 +6061,10 @@ static u16 stmmac_select_queue(struct net_device *dev, struct sk_buff *skb,
 			       struct net_device *sb_dev)
 {
 	int gso = skb_shinfo(skb)->gso_type;
+	struct stmmac_priv *priv = netdev_priv(dev);
 
-	if (gso & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6 | SKB_GSO_UDP_L4)) {
+	if ((gso & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6 | SKB_GSO_UDP_L4)) ||
+	    priv->plat->has_lgmac) {
 		/*
 		 * There is no way to determine the number of TSO/USO
 		 * capable Queues. Let's use always the Queue 0
@@ -6936,7 +6942,8 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
 	 * riwt_off field from the platform.
 	 */
 	if (((priv->synopsys_id >= DWMAC_CORE_3_50) ||
-	    (priv->plat->has_xgmac)) && (!priv->plat->riwt_off)) {
+	    (priv->plat->has_xgmac) || (priv->plat->has_lgmac)) &&
+	    (!priv->plat->riwt_off)) {
 		priv->use_riwt = 1;
 		dev_info(priv->device,
 			 "Enable RX Mitigation via HW Watchdog Timer\n");
include/linux/stmmac.h +1 -0
index 46bccc34814d..e21076f57205 100644
@@ -344,5 +344,6 @@ struct plat_stmmacenet_data {
 	bool has_integrated_pcs;
 	const struct dwmac_regs *dwmac_regs;
 	bool dwmac_is_loongson;
+	int has_lgmac;
 };
 #endif
Signature · 1 line
2.39.3
#19 lore raw

Re: [PATCH v2 06/10] net: stmmac: Add Loongson HWIF entry

Quoted 68 lines · Feiyang Chen

Add a new entry to HWIF table for Loongson.

---
 drivers/net/ethernet/stmicro/stmmac/common.h  |  3 ++
 .../ethernet/stmicro/stmmac/dwmac1000_dma.c   |  6 +++
 drivers/net/ethernet/stmicro/stmmac/hwif.c    | 48 ++++++++++++++++++-
 .../net/ethernet/stmicro/stmmac/stmmac_main.c | 25 ++++++----
 include/linux/stmmac.h                        |  1 +
 5 files changed, 73 insertions(+), 10 deletions(-)
drivers/net/ethernet/stmicro/stmmac/common.h +3 -0
index 16e67c18b6f7..267f9a7913ac 100644
@@ -29,11 +29,13 @@
 /* Synopsys Core versions */
 #define	DWMAC_CORE_3_40		0x34
 #define	DWMAC_CORE_3_50		0x35
+#define	DWMAC_CORE_3_70		0x37
 #define	DWMAC_CORE_4_00		0x40
 #define DWMAC_CORE_4_10		0x41
 #define DWMAC_CORE_5_00		0x50
 #define DWMAC_CORE_5_10		0x51
 #define DWMAC_CORE_5_20		0x52
+#define DWLGMAC_CORE_1_00	0x10
 #define DWXGMAC_CORE_2_10	0x21
 #define DWXLGMAC_CORE_2_00	0x20
 
@@ -547,6 +549,7 @@ int dwmac1000_setup(struct stmmac_priv *priv);
 int dwmac4_setup(struct stmmac_priv *priv);
 int dwxgmac2_setup(struct stmmac_priv *priv);
 int dwxlgmac2_setup(struct stmmac_priv *priv);
+int dwmac_loongson_setup(struct stmmac_priv *priv);
 
 void stmmac_set_mac_addr(void __iomem *ioaddr, const u8 addr[6],
 			 unsigned int high, unsigned int low);
drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c +6 -0
index 7aa450d6a81a..5da5f111d7e0 100644
@@ -172,6 +172,12 @@ static void dwmac1000_dma_init_rx(struct stmmac_priv *priv,
 		       chan * DMA_CHAN_OFFSET);
 		writel(upper_32_bits(dma_rx_phy), ioaddr + DMA_RCV_BASE_ADDR_HI +
 		       chan * DMA_CHAN_OFFSET);
+		if (priv->plat->has_lgmac) {
+			writel(upper_32_bits(dma_rx_phy),
+			       ioaddr + DMA_RCV_BASE_ADDR_SHADOW1);
+			writel(upper_32_bits(dma_rx_phy),
+			       ioaddr + DMA_RCV_BASE_ADDR_SHADOW2);
+		}
 	} else {
 		/* RX descriptor base address list must be written into DMA CSR3 */
 		writel(lower_32_bits(dma_rx_phy), ioaddr + DMA_RCV_BASE_ADDR +
drivers/net/ethernet/stmicro/stmmac/hwif.c +2 -1
index b8ba8f2d8041..b376ac4f80d5 100644
@@ -58,7 +58,8 @@ static int stmmac_dwmac1_quirks(struct stmmac_priv *priv)
 		dev_info(priv->device, "Enhanced/Alternate descriptors\n");
 
 		/* GMAC older than 3.50 has no extended descriptors */
-		if (priv->synopsys_id >= DWMAC_CORE_3_50) {
+		if (priv->synopsys_id >= DWMAC_CORE_3_50 ||
+		    priv->plat->has_lgmac) {>  			dev_info(priv->device, "Enabled extended descriptors\n");
 			priv->extend_desc = 1;
 		} else {

drivers/net/ethernet/stmicro/stmmac/hwif.c static const struct stmmac_hwif_entry { · line 108

Quoted 4 lines
drivers/net/ethernet/stmicro/stmmac/hwif.c +1 -0
@@ -104,6 +105,7 @@ static const struct stmmac_hwif_entry {
 	bool gmac;
 	bool gmac4;
 	bool xgmac;
+	bool lgmac;

Similar to Andrew's comment on dwmac_is_loongson, can lgmac also be renamed to some other name?

I believe the 'gmac' and 'xgmac' refer to 1Gbps and 10Gbps which sounds generic, while 'lgmac' sounds vendor specific.

Quoted 3 lines
drivers/net/ethernet/stmicro/stmmac/hwif.c +0 -0
 	u32 min_id;
 	u32 dev_id;
 	const struct stmmac_regs_off regs;

[...]

Quoted 46 lines
drivers/net/ethernet/stmicro/stmmac/hwif.c +36 -0
+	}, {
+		.gmac = true,
+		.gmac4 = false,
+		.xgmac = false,
+		.lgmac = true,
+		.min_id = DWLGMAC_CORE_1_00,
+		.regs = {
+			.ptp_off = PTP_GMAC3_X_OFFSET,
+			.mmc_off = MMC_GMAC3_X_OFFSET,
+		},
+		.desc = NULL,
+		.dma = &dwmac1000_dma_ops,
+		.mac = &dwmac1000_ops,
+		.hwtimestamp = &stmmac_ptp,
+		.mode = NULL,
+		.tc = NULL,
+		.setup = dwmac_loongson_setup,
+		.quirks = stmmac_dwmac1_quirks,
+	}, {
+		.gmac = true,
+		.gmac4 = false,
+		.xgmac = false,
+		.lgmac = true,
+		.min_id = DWMAC_CORE_3_50,
+		.regs = {
+			.ptp_off = PTP_GMAC3_X_OFFSET,
+			.mmc_off = MMC_GMAC3_X_OFFSET,
+		},
+		.desc = NULL,
+		.dma = &dwmac1000_dma_ops,
+		.mac = &dwmac1000_ops,
+		.hwtimestamp = &stmmac_ptp,
+		.mode = NULL,
+		.tc = NULL,
+		.setup = dwmac1000_setup,
+		.quirks = stmmac_dwmac1_quirks,
 	},
 };
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +0 -0
index e8619853b6d6..829de274e75d 100644
@@ -3505,17 +3505,21 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev)
 {
 	struct stmmac_priv *priv = netdev_priv(dev);

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c static int stmmac_request_irq_multi_msi(struct net_device *dev) · line 3516

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +3 -0
 	enum request_irq_err irq_err;
+	unsigned long flags = 0;
 	cpumask_t cpu_mask;
 	int irq_idx = 0;
 	char *int_name;
 	int ret;
 	int i;
 
+	if (priv->plat->has_lgmac)
+		flags |= IRQF_TRIGGER_RISING;

How about introducing a struct member such as "irq_flags"?

Quoted 7 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +2 -1
+
 	/* For common interrupt */
 	int_name = priv->int_name_mac;
 	sprintf(int_name, "%s:%s", dev->name, "mac");
 	ret = request_irq(dev->irq, stmmac_mac_interrupt,
-			  0, int_name, dev);
+			  flags, int_name, dev);

[...]

Quoted 11 lines
include/linux/stmmac.h +1 -0
index 46bccc34814d..e21076f57205 100644
@@ -344,5 +344,6 @@ struct plat_stmmacenet_data {
 	bool has_integrated_pcs;
 	const struct dwmac_regs *dwmac_regs;
 	bool dwmac_is_loongson;
+	int has_lgmac;
 };
 #endif
Signature · 2 lines
Regards,
Ravi
#20 lore raw

Re: [PATCH v2 06/10] net: stmmac: Add Loongson HWIF entry

Quoted 144 lines · Ravi Gunasekaran
Quoted 68 lines · Feiyang Chen

Add a new entry to HWIF table for Loongson.

---
 drivers/net/ethernet/stmicro/stmmac/common.h  |  3 ++
 .../ethernet/stmicro/stmmac/dwmac1000_dma.c   |  6 +++
 drivers/net/ethernet/stmicro/stmmac/hwif.c    | 48 ++++++++++++++++++-
 .../net/ethernet/stmicro/stmmac/stmmac_main.c | 25 ++++++----
 include/linux/stmmac.h                        |  1 +
 5 files changed, 73 insertions(+), 10 deletions(-)
drivers/net/ethernet/stmicro/stmmac/common.h +3 -0
index 16e67c18b6f7..267f9a7913ac 100644
@@ -29,11 +29,13 @@
 /* Synopsys Core versions */
 #define      DWMAC_CORE_3_40         0x34
 #define      DWMAC_CORE_3_50         0x35
+#define      DWMAC_CORE_3_70         0x37
 #define      DWMAC_CORE_4_00         0x40
 #define DWMAC_CORE_4_10              0x41
 #define DWMAC_CORE_5_00              0x50
 #define DWMAC_CORE_5_10              0x51
 #define DWMAC_CORE_5_20              0x52
+#define DWLGMAC_CORE_1_00    0x10
 #define DWXGMAC_CORE_2_10    0x21
 #define DWXLGMAC_CORE_2_00   0x20
 
@@ -547,6 +549,7 @@ int dwmac1000_setup(struct stmmac_priv *priv);
 int dwmac4_setup(struct stmmac_priv *priv);
 int dwxgmac2_setup(struct stmmac_priv *priv);
 int dwxlgmac2_setup(struct stmmac_priv *priv);
+int dwmac_loongson_setup(struct stmmac_priv *priv);
 
 void stmmac_set_mac_addr(void __iomem *ioaddr, const u8 addr[6],
                       unsigned int high, unsigned int low);
drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c +6 -0
index 7aa450d6a81a..5da5f111d7e0 100644
@@ -172,6 +172,12 @@ static void dwmac1000_dma_init_rx(struct stmmac_priv *priv,
                     chan * DMA_CHAN_OFFSET);
              writel(upper_32_bits(dma_rx_phy), ioaddr + DMA_RCV_BASE_ADDR_HI +
                     chan * DMA_CHAN_OFFSET);
+             if (priv->plat->has_lgmac) {
+                     writel(upper_32_bits(dma_rx_phy),
+                            ioaddr + DMA_RCV_BASE_ADDR_SHADOW1);
+                     writel(upper_32_bits(dma_rx_phy),
+                            ioaddr + DMA_RCV_BASE_ADDR_SHADOW2);
+             }
      } else {
              /* RX descriptor base address list must be written into DMA CSR3 */
              writel(lower_32_bits(dma_rx_phy), ioaddr + DMA_RCV_BASE_ADDR +
drivers/net/ethernet/stmicro/stmmac/hwif.c +2 -1
index b8ba8f2d8041..b376ac4f80d5 100644
@@ -58,7 +58,8 @@ static int stmmac_dwmac1_quirks(struct stmmac_priv *priv)
              dev_info(priv->device, "Enhanced/Alternate descriptors\n");
 
              /* GMAC older than 3.50 has no extended descriptors */
-             if (priv->synopsys_id >= DWMAC_CORE_3_50) {
+             if (priv->synopsys_id >= DWMAC_CORE_3_50 ||
+                 priv->plat->has_lgmac) {>                   dev_info(priv->device, "Enabled extended descriptors\n");
                      priv->extend_desc = 1;
              } else {

drivers/net/ethernet/stmicro/stmmac/hwif.c static const struct stmmac_hwif_entry { · line 108

Quoted 4 lines
drivers/net/ethernet/stmicro/stmmac/hwif.c +1 -0
@@ -104,6 +105,7 @@ static const struct stmmac_hwif_entry {
      bool gmac;
      bool gmac4;
      bool xgmac;
+     bool lgmac;

Similar to Andrew's comment on dwmac_is_loongson, can lgmac also be renamed to some other name?

I believe the 'gmac' and 'xgmac' refer to 1Gbps and 10Gbps which sounds generic, while 'lgmac' sounds vendor specific.

Quoted 3 lines
drivers/net/ethernet/stmicro/stmmac/hwif.c +0 -0
      u32 min_id;
      u32 dev_id;
      const struct stmmac_regs_off regs;

[...]

Quoted 54 lines
drivers/net/ethernet/stmicro/stmmac/hwif.c +36 -0
+     }, {
+             .gmac = true,
+             .gmac4 = false,
+             .xgmac = false,
+             .lgmac = true,
+             .min_id = DWLGMAC_CORE_1_00,
+             .regs = {
+                     .ptp_off = PTP_GMAC3_X_OFFSET,
+                     .mmc_off = MMC_GMAC3_X_OFFSET,
+             },
+             .desc = NULL,
+             .dma = &dwmac1000_dma_ops,
+             .mac = &dwmac1000_ops,
+             .hwtimestamp = &stmmac_ptp,
+             .mode = NULL,
+             .tc = NULL,
+             .setup = dwmac_loongson_setup,
+             .quirks = stmmac_dwmac1_quirks,
+     }, {
+             .gmac = true,
+             .gmac4 = false,
+             .xgmac = false,
+             .lgmac = true,
+             .min_id = DWMAC_CORE_3_50,
+             .regs = {
+                     .ptp_off = PTP_GMAC3_X_OFFSET,
+                     .mmc_off = MMC_GMAC3_X_OFFSET,
+             },
+             .desc = NULL,
+             .dma = &dwmac1000_dma_ops,
+             .mac = &dwmac1000_ops,
+             .hwtimestamp = &stmmac_ptp,
+             .mode = NULL,
+             .tc = NULL,
+             .setup = dwmac1000_setup,
+             .quirks = stmmac_dwmac1_quirks,
      },
 };
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1 -0
index e8619853b6d6..829de274e75d 100644
@@ -3505,17 +3505,21 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev)
 {
      struct stmmac_priv *priv = netdev_priv(dev);
      enum request_irq_err irq_err;
+     unsigned long flags = 0;
      cpumask_t cpu_mask;
      int irq_idx = 0;
      char *int_name;
      int ret;
      int i;
 
Quoted 5 lines

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c static int stmmac_request_irq_multi_msi(struct net_device *dev) · line 3516

Quoted 2 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +2 -0
+     if (priv->plat->has_lgmac)
+             flags |= IRQF_TRIGGER_RISING;

How about introducing a struct member such as "irq_flags"?

Hi, Ravi,

OK.

Thanks,
Feiyang

Quoted 25 lines
Quoted 7 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +2 -1
+
      /* For common interrupt */
      int_name = priv->int_name_mac;
      sprintf(int_name, "%s:%s", dev->name, "mac");
      ret = request_irq(dev->irq, stmmac_mac_interrupt,
-                       0, int_name, dev);
+                       flags, int_name, dev);

[...]

include/linux/stmmac.h struct plat_stmmacenet_data { · line 349

Quoted 11 lines
include/linux/stmmac.h +1 -0
index 46bccc34814d..e21076f57205 100644
@@ -344,5 +344,6 @@ struct plat_stmmacenet_data {
      bool has_integrated_pcs;
      const struct dwmac_regs *dwmac_regs;
      bool dwmac_is_loongson;
+     int has_lgmac;
 };
 #endif

--
Regards,
Ravi

#21 lore raw

Re: [PATCH v2 06/10] net: stmmac: Add Loongson HWIF entry

In reply to Feiyang Chen
Quoted 7 lines · Feiyang Chen
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +0 -0
index e8619853b6d6..829de274e75d 100644
@@ -3505,17 +3505,21 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev)
 {
 	struct stmmac_priv *priv = netdev_priv(dev);

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c static int stmmac_request_irq_multi_msi(struct net_device *dev) · line 3516

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +3 -0
 	enum request_irq_err irq_err;
+	unsigned long flags = 0;
 	cpumask_t cpu_mask;
 	int irq_idx = 0;
 	char *int_name;
 	int ret;
 	int i;
 
+	if (priv->plat->has_lgmac)
+		flags |= IRQF_TRIGGER_RISING;

Can this be described in firmware?

Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
#22 lore raw

Re: [PATCH v2 06/10] net: stmmac: Add Loongson HWIF entry

Quoted 17 lines · Russell King (Oracle)
Quoted 15 lines · Feiyang Chen
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1 -0
index e8619853b6d6..829de274e75d 100644
@@ -3505,17 +3505,21 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev)
 {
      struct stmmac_priv *priv = netdev_priv(dev);
      enum request_irq_err irq_err;
+     unsigned long flags = 0;
      cpumask_t cpu_mask;
      int irq_idx = 0;
      char *int_name;
      int ret;
      int i;
 
Quoted 5 lines

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c static int stmmac_request_irq_multi_msi(struct net_device *dev) · line 3516

Quoted 2 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +2 -0
+     if (priv->plat->has_lgmac)
+             flags |= IRQF_TRIGGER_RISING;

Can this be described in firmware?

Hi, Russell,

I'm not sure, could you explain what you mean?

Thanks,
Feiyang

Quoted 3 lines

--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!

#23 lore raw

Re: [PATCH v2 06/10] net: stmmac: Add Loongson HWIF entry

Quoted 25 lines · Feiyang Chen
Quoted 17 lines · Russell King (Oracle)
Quoted 15 lines · Feiyang Chen
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1 -0
index e8619853b6d6..829de274e75d 100644
@@ -3505,17 +3505,21 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev)
 {
      struct stmmac_priv *priv = netdev_priv(dev);
      enum request_irq_err irq_err;
+     unsigned long flags = 0;
      cpumask_t cpu_mask;
      int irq_idx = 0;
      char *int_name;
      int ret;
      int i;
 
Quoted 5 lines

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c static int stmmac_request_irq_multi_msi(struct net_device *dev) · line 3516

Quoted 2 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +2 -0
+     if (priv->plat->has_lgmac)
+             flags |= IRQF_TRIGGER_RISING;

Can this be described in firmware?

Quoted 3 lines

Hi, Russell,

I'm not sure, could you explain what you mean?

Modern systems describe the IRQ triggering in firmware for the OS such as DT. Does your implementation have any firmware that can do this kind of description for you (e.g. DT, ACPI?)

Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
#24 lore raw

Re: [PATCH v2 06/10] net: stmmac: Add Loongson HWIF entry

Quoted 27 lines · Russell King (Oracle)
Quoted 25 lines · Feiyang Chen
Quoted 22 lines · Russell King (Oracle)
Quoted 7 lines · Feiyang Chen
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +0 -0
index e8619853b6d6..829de274e75d 100644
@@ -3505,17 +3505,21 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev)
 {
      struct stmmac_priv *priv = netdev_priv(dev);

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c static int stmmac_request_irq_multi_msi(struct net_device *dev) · line 3516

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +3 -0
      enum request_irq_err irq_err;
+     unsigned long flags = 0;
      cpumask_t cpu_mask;
      int irq_idx = 0;
      char *int_name;
      int ret;
      int i;
 
+     if (priv->plat->has_lgmac)
+             flags |= IRQF_TRIGGER_RISING;

Can this be described in firmware?

Quoted 8 lines
Quoted 3 lines

Hi, Russell,

I'm not sure, could you explain what you mean?

Modern systems describe the IRQ triggering in firmware for the OS such as DT. Does your implementation have any firmware that can do this kind of description for you (e.g. DT, ACPI?)

Hi, Russell,

I see. I think I can get this from DT.

Thanks,
Feiyang

Quoted 3 lines

--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!

#25 lore raw

PATCH v2 7/10 net: stmmac: dwmac-loongson: Add LS7A support

In reply to Feiyang Chen

Current dwmac-loongson only support LS2K in the "probed with PCI and configured with DT" manner. Add LS7A support on which the devices are fully PCI (non-DT).

---
 .../ethernet/stmicro/stmmac/dwmac-loongson.c  | 149 ++++++++++--------
 1 file changed, 85 insertions(+), 64 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +85 -64
index a25c187d3185..3ab55340a6b8 100644
@@ -9,14 +9,21 @@
 #include <linux/of_irq.h>
 #include "stmmac.h"
 
-static int loongson_default_data(struct plat_stmmacenet_data *plat)
+struct stmmac_pci_info {
+	int (*setup)(struct pci_dev *pdev, struct plat_stmmacenet_data *plat);
+};
+
+static void common_default_data(struct pci_dev *pdev,
+				struct plat_stmmacenet_data *plat)
 {
+	plat->bus_id = (pci_domain_nr(pdev->bus) << 16) | PCI_DEVID(pdev->bus->number, pdev->devfn);
+
 	plat->clk_csr = 2;	/* clk_csr_i = 20-35MHz & MDC = clk_csr_i/16 */
 	plat->has_gmac = 1;
 	plat->force_sf_dma_mode = 1;
 
 	/* Set default value for multicast hash bins */
-	plat->multicast_filter_bins = HASH_TABLE_SIZE;
+	plat->multicast_filter_bins = 256;
 
 	/* Set default value for unicast filter entries */
 	plat->unicast_filter_entries = 1;
@@ -35,59 +42,61 @@ static int loongson_default_data(struct plat_stmmacenet_data *plat)
 	/* Disable RX queues routing by default */
 	plat->rx_queues_cfg[0].pkt_route = 0x0;
 
-	/* Default to phy auto-detection */
-	plat->phy_addr = -1;
-
 	plat->dma_cfg->pbl = 32;
 	plat->dma_cfg->pblx8 = true;
 
-	plat->multicast_filter_bins = 256;
+	plat->clk_ref_rate = 125000000;
+	plat->clk_ptp_rate = 125000000;
+
+	plat->has_lgmac = 1;
+}
+
+static int loongson_gmac_data(struct pci_dev *pdev,
+			      struct plat_stmmacenet_data *plat)
+{
+	common_default_data(pdev, plat);
+
+	plat->mdio_bus_data->phy_mask = 0;
+
+	plat->phy_addr = -1;
+	plat->phy_interface = PHY_INTERFACE_MODE_RGMII_ID;
+
 	return 0;
 }
 
-static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+static struct stmmac_pci_info loongson_gmac_pci_info = {
+	.setup = loongson_gmac_data,
+};
+
+static int loongson_dwmac_probe(struct pci_dev *pdev,
+				const struct pci_device_id *id)
 {
+	int ret, i, bus_id, phy_mode;
 	struct plat_stmmacenet_data *plat;
+	struct stmmac_pci_info *info;
 	struct stmmac_resources res;
 	struct device_node *np;
-	int ret, i, phy_mode;
-
-	np = dev_of_node(&pdev->dev);
-
-	if (!np) {
-		pr_info("dwmac_loongson_pci: No OF node\n");
-		return -ENODEV;
-	}
-
-	if (!of_device_is_compatible(np, "loongson, pci-gmac")) {
-		pr_info("dwmac_loongson_pci: Incompatible OF node\n");
-		return -ENODEV;
-	}
 
 	plat = devm_kzalloc(&pdev->dev, sizeof(*plat), GFP_KERNEL);
 	if (!plat)
 		return -ENOMEM;
 
+	plat->mdio_bus_data = devm_kzalloc(&pdev->dev,
+				   sizeof(*plat->mdio_bus_data), GFP_KERNEL);
+	if (!plat->mdio_bus_data)
+		return -ENOMEM;
+
+	plat->dma_cfg = devm_kzalloc(&pdev->dev, sizeof(*plat->dma_cfg), GFP_KERNEL);
+	if (!plat->dma_cfg)
+		return -ENOMEM;
+
+	np = dev_of_node(&pdev->dev);
 	plat->mdio_node = of_get_child_by_name(np, "mdio");
 	if (plat->mdio_node) {
 		dev_info(&pdev->dev, "Found MDIO subnode\n");
-
-		plat->mdio_bus_data = devm_kzalloc(&pdev->dev,
-						   sizeof(*plat->mdio_bus_data),
-						   GFP_KERNEL);
-		if (!plat->mdio_bus_data) {
-			ret = -ENOMEM;
-			goto err_put_node;
-		}
 		plat->mdio_bus_data->needs_reset = true;
 	}
 
-	plat->dma_cfg = devm_kzalloc(&pdev->dev, sizeof(*plat->dma_cfg), GFP_KERNEL);
-	if (!plat->dma_cfg) {
-		ret = -ENOMEM;
-		goto err_put_node;
-	}
-
 	/* Enable pci device */
 	ret = pci_enable_device(pdev);
 	if (ret) {
@@ -105,45 +114,55 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id
 		break;
 	}
 
-	plat->bus_id = of_alias_get_id(np, "ethernet");
-	if (plat->bus_id < 0)
-		plat->bus_id = pci_dev_id(pdev);
+	pci_set_master(pdev);
 
-	phy_mode = device_get_phy_mode(&pdev->dev);
-	if (phy_mode < 0) {
-		dev_err(&pdev->dev, "phy_mode not found\n");
-		ret = phy_mode;
+	info = (struct stmmac_pci_info *)id->driver_data;
+	ret = info->setup(pdev, plat);
+	if (ret)
 		goto err_disable_device;
-	}
 
-	plat->phy_interface = phy_mode;
-	plat->interface = PHY_INTERFACE_MODE_GMII;
+	if (np) {
+		bus_id = of_alias_get_id(np, "ethernet");
+		if (bus_id >= 0)
+			plat->bus_id = bus_id;
 
-	pci_set_master(pdev);
+		phy_mode = device_get_phy_mode(&pdev->dev);
+		if (phy_mode < 0) {
+			dev_err(&pdev->dev, "phy_mode not found\n");
+			ret = phy_mode;
+			goto err_disable_device;
+		}
+		plat->phy_interface = phy_mode;
+	}
 
-	loongson_default_data(plat);
 	pci_enable_msi(pdev);
+
 	memset(&res, 0, sizeof(res));
 	res.addr = pcim_iomap_table(pdev)[0];
+	if (np) {
+		res.irq = of_irq_get_byname(np, "macirq");
+		if (res.irq < 0) {
+			dev_err(&pdev->dev, "IRQ macirq not found\n");
+			ret = -ENODEV;
+			goto err_disable_msi;
+		}
 
-	res.irq = of_irq_get_byname(np, "macirq");
-	if (res.irq < 0) {
-		dev_err(&pdev->dev, "IRQ macirq not found\n");
-		ret = -ENODEV;
-		goto err_disable_msi;
-	}
-
-	res.wol_irq = of_irq_get_byname(np, "eth_wake_irq");
-	if (res.wol_irq < 0) {
-		dev_info(&pdev->dev, "IRQ eth_wake_irq not found, using macirq\n");
-		res.wol_irq = res.irq;
-	}
+		res.wol_irq = of_irq_get_byname(np, "eth_wake_irq");
+		if (res.wol_irq < 0) {
+			dev_info(&pdev->dev,
+				 "IRQ eth_wake_irq not found, using macirq\n");
+			res.wol_irq = res.irq;
+		}
 
-	res.lpi_irq = of_irq_get_byname(np, "eth_lpi");
-	if (res.lpi_irq < 0) {
-		dev_err(&pdev->dev, "IRQ eth_lpi not found\n");
-		ret = -ENODEV;
-		goto err_disable_msi;
+		res.lpi_irq = of_irq_get_byname(np, "eth_lpi");
+		if (res.lpi_irq < 0) {
+			dev_err(&pdev->dev, "IRQ eth_lpi not found\n");
+			ret = -ENODEV;
+			goto err_disable_msi;
+		}
+	} else {
+		res.irq = pdev->irq;
+		res.wol_irq = pdev->irq;
 	}
 
 	ret = stmmac_dvr_probe(&pdev->dev, plat, &res);
@@ -219,8 +238,10 @@ static int __maybe_unused loongson_dwmac_resume(struct device *dev)
 static SIMPLE_DEV_PM_OPS(loongson_dwmac_pm_ops, loongson_dwmac_suspend,
 			 loongson_dwmac_resume);
 
+#define PCI_DEVICE_ID_LOONGSON_GMAC	0x7a03
+
 static const struct pci_device_id loongson_dwmac_id_table[] = {
-	{ PCI_VDEVICE(LOONGSON, 0x7a03) },
+	{ PCI_DEVICE_DATA(LOONGSON, GMAC, &loongson_gmac_pci_info) },
 	{}
 };
 MODULE_DEVICE_TABLE(pci, loongson_dwmac_id_table);
Signature · 1 line
2.39.3
#26 lore raw

Re: [PATCH v2 07/10] net: stmmac: dwmac-loongson: Add LS7A support

drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c line 26

Quoted 12 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +5 -1
+static void common_default_data(struct pci_dev *pdev,
+				struct plat_stmmacenet_data *plat)
 {
+	plat->bus_id = (pci_domain_nr(pdev->bus) << 16) | PCI_DEVID(pdev->bus->number, pdev->devfn);
+
 	plat->clk_csr = 2;	/* clk_csr_i = 20-35MHz & MDC = clk_csr_i/16 */
 	plat->has_gmac = 1;
 	plat->force_sf_dma_mode = 1;
 
 	/* Set default value for multicast hash bins */
-	plat->multicast_filter_bins = HASH_TABLE_SIZE;
+	plat->multicast_filter_bins = 256;

HASH_TABLE_SIZE is 64. You appear to be changing it to 256 for everybody, not just your platform. I would expect something like common_default_data() is called first, and then you change values in a loongson specific function.

Andrew

#27 lore raw

Re: [PATCH v2 07/10] net: stmmac: dwmac-loongson: Add LS7A support

Quoted 10 lines · Andrew Lunn
Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +4 -0
+static void common_default_data(struct pci_dev *pdev,
+                             struct plat_stmmacenet_data *plat)
 {
+     plat->bus_id = (pci_domain_nr(pdev->bus) << 16) | PCI_DEVID(pdev->bus->number, pdev->devfn);
+
      plat->clk_csr = 2;      /* clk_csr_i = 20-35MHz & MDC = clk_csr_i/16 */
      plat->has_gmac = 1;
      plat->force_sf_dma_mode = 1;
Quoted 9 lines

drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c line 26

Quoted 3 lines
      /* Set default value for multicast hash bins */
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +1 -1
-     plat->multicast_filter_bins = HASH_TABLE_SIZE;
+     plat->multicast_filter_bins = 256;

HASH_TABLE_SIZE is 64. You appear to be changing it to 256 for everybody, not just your platform. I would expect something like common_default_data() is called first, and then you change values in a loongson specific function.

Hi, Andrew,

The common_default_data() here is defined in our platform driver. We have tested on our platforms (LS7A and LS2K) and it can be safely changed to 256.

Thanks,
Feiyang

Quoted 1 line

Andrew

#28 lore raw

Re: [PATCH v2 07/10] net: stmmac: dwmac-loongson: Add LS7A support

Quoted 21 lines · Feiyang Chen
Quoted 10 lines · Andrew Lunn
Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +4 -0
+static void common_default_data(struct pci_dev *pdev,
+                             struct plat_stmmacenet_data *plat)
 {
+     plat->bus_id = (pci_domain_nr(pdev->bus) << 16) | PCI_DEVID(pdev->bus->number, pdev->devfn);
+
      plat->clk_csr = 2;      /* clk_csr_i = 20-35MHz & MDC = clk_csr_i/16 */
      plat->has_gmac = 1;
      plat->force_sf_dma_mode = 1;
Quoted 9 lines

drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c line 26

Quoted 3 lines
      /* Set default value for multicast hash bins */
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +1 -1
-     plat->multicast_filter_bins = HASH_TABLE_SIZE;
+     plat->multicast_filter_bins = 256;

HASH_TABLE_SIZE is 64. You appear to be changing it to 256 for everybody, not just your platform. I would expect something like common_default_data() is called first, and then you change values in a loongson specific function.

Quoted 5 lines

Hi, Andrew,

The common_default_data() here is defined in our platform driver. We have tested on our platforms (LS7A and LS2K) and it can be safely changed to 256.

Then add a new #define.

Andrew

#29 lore raw

Re: [PATCH v2 07/10] net: stmmac: dwmac-loongson: Add LS7A support

Quoted 23 lines · Andrew Lunn
Quoted 21 lines · Feiyang Chen
Quoted 19 lines · Andrew Lunn

drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c line 26

Quoted 13 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +5 -1
+static void common_default_data(struct pci_dev *pdev,
+                             struct plat_stmmacenet_data *plat)
 {
+     plat->bus_id = (pci_domain_nr(pdev->bus) << 16) | PCI_DEVID(pdev->bus->number, pdev->devfn);
+
      plat->clk_csr = 2;      /* clk_csr_i = 20-35MHz & MDC = clk_csr_i/16 */
      plat->has_gmac = 1;
      plat->force_sf_dma_mode = 1;
 
      /* Set default value for multicast hash bins */
-     plat->multicast_filter_bins = HASH_TABLE_SIZE;
+     plat->multicast_filter_bins = 256;

HASH_TABLE_SIZE is 64. You appear to be changing it to 256 for everybody, not just your platform. I would expect something like common_default_data() is called first, and then you change values in a loongson specific function.

Quoted 8 lines
Quoted 5 lines

Hi, Andrew,

The common_default_data() here is defined in our platform driver. We have tested on our platforms (LS7A and LS2K) and it can be safely changed to 256.

Then add a new #define.

Hi, Andrew,

Should I add the new #define in our platform driver or in common.h?

Thanks,
Feiyang

Quoted 1 line

Andrew

#30 lore raw

Re: [PATCH v2 07/10] net: stmmac: dwmac-loongson: Add LS7A support

In reply to Feiyang Chen
Quoted 11 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +4 -3
+static int loongson_dwmac_probe(struct pci_dev *pdev,
+				const struct pci_device_id *id)
 {
+	int ret, i, bus_id, phy_mode;
 	struct plat_stmmacenet_data *plat;
+	struct stmmac_pci_info *info;
 	struct stmmac_resources res;
 	struct device_node *np;
-	int ret, i, phy_mode;
-
-	np = dev_of_node(&pdev->dev);

drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c static int loongson_default_data(struct plat_stmmacenet_data *plat) · line 65

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +0 -10
-
-	if (!np) {
-		pr_info("dwmac_loongson_pci: No OF node\n");
-		return -ENODEV;
-	}
-
-	if (!of_device_is_compatible(np, "loongson, pci-gmac")) {
-		pr_info("dwmac_loongson_pci: Incompatible OF node\n");
-		return -ENODEV;
-	}

There are a lot of changes here, and it is not easy to review. I would suggest you first do a refactoring patch, moving all handling of DT into a helper. Since it is just moving code around, it should be easy to review. Then you can add support for platforms which don't support DT.

Andrew

#31 lore raw

Re: [PATCH v2 07/10] net: stmmac: dwmac-loongson: Add LS7A support

Quoted 20 lines · Andrew Lunn
Quoted 20 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +4 -11
+static int loongson_dwmac_probe(struct pci_dev *pdev,
+                             const struct pci_device_id *id)
 {
+     int ret, i, bus_id, phy_mode;
      struct plat_stmmacenet_data *plat;
+     struct stmmac_pci_info *info;
      struct stmmac_resources res;
      struct device_node *np;
-     int ret, i, phy_mode;
-
-     np = dev_of_node(&pdev->dev);
-
-     if (!np) {
-             pr_info("dwmac_loongson_pci: No OF node\n");
-             return -ENODEV;
-     }
-
-     if (!of_device_is_compatible(np, "loongson, pci-gmac")) {
-             pr_info("dwmac_loongson_pci: Incompatible OF node\n");
Quoted 9 lines

Review

Quoted 2 lines
(quoted diff) +0 -2
-             return -ENODEV;
-     }

There are a lot of changes here, and it is not easy to review. I would suggest you first do a refactoring patch, moving all handling of DT into a helper. Since it is just moving code around, it should be easy to review. Then you can add support for platforms which don't support DT.

Hi, Andrew,

OK.

Thanks,
Feiyang

Quoted 1 line

Andrew

#32 lore raw

PATCH v2 8/10 net: stmmac: dwmac-loongson: Disable flow control for GMAC

In reply to Feiyang Chen

Loongson GMAC does not support Flow Control featurei. Use disable_flow_control flag to disable it.

---
 drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 2 ++
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c    | 5 +++++
 include/linux/stmmac.h                               | 1 +
 3 files changed, 8 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +2 -0
index 3ab55340a6b8..439a5f8bcabe 100644
@@ -61,6 +61,8 @@ static int loongson_gmac_data(struct pci_dev *pdev,
 	plat->phy_addr = -1;
 	plat->phy_interface = PHY_INTERFACE_MODE_RGMII_ID;
 
+	plat->disable_flow_control = true;
+
 	return 0;
 }
 
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +5 -0
index 829de274e75d..4f69cad0be42 100644
@@ -3829,6 +3829,11 @@ static int __stmmac_open(struct net_device *dev,
 				   __func__, ret);
 			goto init_phy_error;
 		}
+
+		if (priv->plat->disable_flow_control) {
+			phy_support_sym_pause(dev->phydev);
+			phy_set_sym_pause(dev->phydev, false, false, true);
+		}
 	}
 
 	/* Extra statistics */
include/linux/stmmac.h +1 -0
index e21076f57205..54b9f308aabb 100644
@@ -345,5 +345,6 @@ struct plat_stmmacenet_data {
 	const struct dwmac_regs *dwmac_regs;
 	bool dwmac_is_loongson;
 	int has_lgmac;
+	bool disable_flow_control;
 };
 #endif
Signature · 1 line
2.39.3
#33 lore raw

Re: [PATCH v2 08/10] net: stmmac: dwmac-loongson: Disable flow control for GMAC

Quoted 1 line · Feiyang Chen

Loongson GMAC does not support Flow Control featurei. Use

No i in feature.

Andrew

#34 lore raw

Re: [PATCH v2 08/10] net: stmmac: dwmac-loongson: Disable flow control for GMAC

Quoted 6 lines · Andrew Lunn
Quoted 1 line · Feiyang Chen

Loongson GMAC does not support Flow Control featurei. Use

No i in feature.

Hi, Andrew,

Sorry for the typo.

Thanks,
Feiyang

Quoted 1 line

Andrew

#35 lore raw

PATCH v2 9/10 net: stmmac: dwmac-loongson: Add 64-bit DMA and multi-vector support

In reply to Feiyang Chen

Set 64-Bit DMA for specific versions. Request allocation for multi- vector interrupts for DWLGMAC_CORE_1_00. If it fails, fallback to request allocation for single interrupts.

---
 .../ethernet/stmicro/stmmac/dwmac-loongson.c  | 54 ++++++++++++++++++-
 1 file changed, 52 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +52 -2
index 439a5f8bcabe..2d6567f0da23 100644
@@ -73,11 +73,12 @@ static struct stmmac_pci_info loongson_gmac_pci_info = {
 static int loongson_dwmac_probe(struct pci_dev *pdev,
 				const struct pci_device_id *id)
 {
-	int ret, i, bus_id, phy_mode;
+	int ret, i, bus_id, phy_mode, ch_cnt, vecs;
 	struct plat_stmmacenet_data *plat;
 	struct stmmac_pci_info *info;
 	struct stmmac_resources res;
 	struct device_node *np;
+	u32 version;
 
 	plat = devm_kzalloc(&pdev->dev, sizeof(*plat), GFP_KERNEL);
 	if (!plat)
@@ -167,12 +168,60 @@ static int loongson_dwmac_probe(struct pci_dev *pdev,
 		res.wol_irq = pdev->irq;
 	}
 
+	version = readl(res.addr + GMAC_VERSION);
+	switch (version & 0xff) {
+	case DWLGMAC_CORE_1_00:
+		ch_cnt = 8;
+		plat->multi_msi_en = 1;
+		break;
+	case DWMAC_CORE_3_50:
+		fallthrough;
+	case DWMAC_CORE_3_70:
+		plat->multi_msi_en = 0;
+		if (version & 0x00008000) {
+			plat->host_dma_width = 64;
+			plat->dma_cfg->dma64 = true;
+		}
+		break;
+	default:
+		break;
+	}
+
+	if (plat->multi_msi_en) {
+		plat->rx_queues_to_use = ch_cnt;
+		plat->tx_queues_to_use = ch_cnt;
+
+		pci_disable_msi(pdev);
+
+		res.irq = pci_irq_vector(pdev, 0);
+		res.wol_irq = res.irq;
+		vecs = roundup_pow_of_two(ch_cnt * 2 + 1);
+		if (pci_alloc_irq_vectors(pdev, vecs, vecs, PCI_IRQ_MSI) < 0) {
+			dev_info(&pdev->dev,
+				 "MSI enable failed, Fallback to line interrupt\n");
+			plat->multi_msi_en = 0;
+		} else {
+			/*
+			 * INT NAME | MAC | CH7 rx | CH7 tx | ... | CH0 rx | CH0 tx |
+			 * --------- ----- -------- --------  ...  -------- --------
+			 * IRQ NUM  |  0  |   1    |   2    | ... |   15   |   16   |
+			 */
+			for (i = 0; i < ch_cnt; i++) {
+				res.rx_irq[ch_cnt - 1 - i] = pci_irq_vector(pdev, 1 + i * 2);
+				res.tx_irq[ch_cnt - 1 - i] = pci_irq_vector(pdev, 2 + i * 2);
+			}
+		}
+	}
+
 	ret = stmmac_dvr_probe(&pdev->dev, plat, &res);
 	if (ret)
-		goto err_disable_msi;
+		goto err_free_irq_vectors;
 
 	return ret;
 
+err_free_irq_vectors:
+	if (plat->multi_msi_en)
+		pci_free_irq_vectors(pdev);
 err_disable_msi:
 	pci_disable_msi(pdev);
 err_disable_device:
@@ -198,6 +247,7 @@ static void loongson_dwmac_remove(struct pci_dev *pdev)
 		break;
 	}
 
+	pci_free_irq_vectors(pdev);
 	pci_disable_msi(pdev);
 	pci_disable_device(pdev);
 }
Signature · 1 line
2.39.3
#36 lore raw

Re: [PATCH v2 09/10] net: stmmac: dwmac-loongson: Add 64-bit DMA and multi-vector support

drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c static int loongson_dwmac_probe(struct pci_dev *pdev, · line 179

Quoted 3 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +3 -0
+	case DWMAC_CORE_3_50:
+		fallthrough;
+	case DWMAC_CORE_3_70:

You don't need fallthrough here.

Andrew

#37 lore raw

Re: [PATCH v2 09/10] net: stmmac: dwmac-loongson: Add 64-bit DMA and multi-vector support

Quoted 7 lines · Andrew Lunn

drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c static int loongson_dwmac_probe(struct pci_dev *pdev, · line 179

Quoted 4 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +3 -0
+     case DWMAC_CORE_3_50:
+             fallthrough;
+     case DWMAC_CORE_3_70:

You don't need fallthrough here.

Hi, Andrew,

OK.

Thanks,
Feiyang

Quoted 1 line

Andrew

#38 lore raw

PATCH v2 10/10 net: stmmac: dwmac-loongson: Add GNET support

In reply to Feiyang Chen

Add GNET support. Current GNET does not support half duplex mode, and GNET on LS7A only supports ANE when speed is set to 1000M.

---
 .../ethernet/stmicro/stmmac/dwmac-loongson.c  | 51 +++++++++++++++++++
 .../ethernet/stmicro/stmmac/stmmac_ethtool.c  |  6 +++
 .../net/ethernet/stmicro/stmmac/stmmac_main.c |  2 +-
 include/linux/stmmac.h                        |  2 +
 4 files changed, 60 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +51 -0
index 2d6567f0da23..1519c90cf9cf 100644
@@ -70,6 +70,55 @@ static struct stmmac_pci_info loongson_gmac_pci_info = {
 	.setup = loongson_gmac_data,
 };
 
+static void loongson_gnet_fix_speed(void *priv, unsigned int speed)
+{
+	struct net_device *ndev = (struct net_device *)(*(unsigned long *)priv);
+	struct stmmac_priv *ptr = netdev_priv(ndev);
+
+	/*
+	 * The controller and PHY don't work well together.
+	 * We need to use the PS bit to check if the controller's status
+	 * is correct and reset PHY if necessary.
+	 */
+	if (speed == SPEED_1000)
+		if (readl(ptr->ioaddr + MAC_CTRL_REG) & (1 << 15) /* PS */)
+			phy_restart_aneg(ndev->phydev);
+}
+
+static int loongson_gnet_data(struct pci_dev *pdev,
+			      struct plat_stmmacenet_data *plat)
+{
+	common_default_data(pdev, plat);
+
+	plat->mdio_bus_data->phy_mask = 0xfffffffb;
+
+	plat->phy_addr = 2;
+	plat->phy_interface = PHY_INTERFACE_MODE_INTERNAL;
+
+	plat->fix_mac_speed = loongson_gnet_fix_speed;
+
+	/* Get netdev pointer address */
+	plat->bsp_priv = &(pdev->dev.driver_data);
+
+	switch (pdev->revision) {
+	case 0x00:
+		plat->disable_half_duplex = true;
+		plat->disable_force_1000 = true;
+		break;
+	case 0x01:
+		plat->disable_half_duplex = true;
+		break;
+	default:
+		break;
+	}
+
+	return 0;
+}
+
+static struct stmmac_pci_info loongson_gnet_pci_info = {
+	.setup = loongson_gnet_data,
+};
+
 static int loongson_dwmac_probe(struct pci_dev *pdev,
 				const struct pci_device_id *id)
 {
@@ -291,9 +340,11 @@ static SIMPLE_DEV_PM_OPS(loongson_dwmac_pm_ops, loongson_dwmac_suspend,
 			 loongson_dwmac_resume);
 
 #define PCI_DEVICE_ID_LOONGSON_GMAC	0x7a03
+#define PCI_DEVICE_ID_LOONGSON_GNET	0x7a13
 
 static const struct pci_device_id loongson_dwmac_id_table[] = {
 	{ PCI_DEVICE_DATA(LOONGSON, GMAC, &loongson_gmac_pci_info) },
+	{ PCI_DEVICE_DATA(LOONGSON, GNET, &loongson_gnet_pci_info) },
 	{}
 };
 MODULE_DEVICE_TABLE(pci, loongson_dwmac_id_table);
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +6 -0
index 2ae73ab842d4..066f42ecf832 100644
@@ -404,6 +404,12 @@ stmmac_ethtool_set_link_ksettings(struct net_device *dev,
 		return 0;
 	}
 
+	if (priv->plat->disable_force_1000) {
+		if (cmd->base.speed == SPEED_1000 &&
+		    cmd->base.autoneg != AUTONEG_ENABLE)
+			return -EOPNOTSUPP;
+	}
+
 	return phylink_ethtool_ksettings_set(priv->phylink, cmd);
 }
 
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1 -1
index 4f69cad0be42..d0248effdc2e 100644
@@ -1240,7 +1240,7 @@ static int stmmac_phy_setup(struct stmmac_priv *priv)
 	}
 
 	/* Half-Duplex can only work with single queue */
-	if (priv->plat->tx_queues_to_use > 1)
+	if (priv->plat->tx_queues_to_use > 1 || priv->plat->disable_half_duplex)
 		priv->phylink_config.mac_capabilities &=
 			~(MAC_10HD | MAC_100HD | MAC_1000HD);
 	priv->phylink_config.mac_managed_pm = true;
include/linux/stmmac.h +2 -0
index 54b9f308aabb..e6852dcfd0c0 100644
@@ -346,5 +346,7 @@ struct plat_stmmacenet_data {
 	bool dwmac_is_loongson;
 	int has_lgmac;
 	bool disable_flow_control;
+	bool disable_half_duplex;
+	bool disable_force_1000;
 };
 #endif
Signature · 1 line
2.39.3
#39 lore raw

Re: [PATCH v2 10/10] net: stmmac: dwmac-loongson: Add GNET support

drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c static struct stmmac_pci_info loongson_gmac_pci_info = { · line 75

Quoted 3 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +3 -0
+static void loongson_gnet_fix_speed(void *priv, unsigned int speed)
+{
+	struct net_device *ndev = (struct net_device *)(*(unsigned long *)priv);

priv is a void *, so you don't need any casts.

Andrew

#40 lore raw

Re: [PATCH v2 10/10] net: stmmac: dwmac-loongson: Add GNET support

Quoted 7 lines · Andrew Lunn

drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c static struct stmmac_pci_info loongson_gmac_pci_info = { · line 75

Quoted 4 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +3 -0
+static void loongson_gnet_fix_speed(void *priv, unsigned int speed)
+{
+     struct net_device *ndev = (struct net_device *)(*(unsigned long *)priv);

priv is a void *, so you don't need any casts.

Hi, Andrew,

OK.

Thanks,
Feiyang

Quoted 1 line

Andrew

#41 lore raw
In reply to Feiyang Chen

From: Feiyang Chen <[email protected]>
Date: Thu, Jul 27, 2023 at 08:15:44

Quoted 15 lines

Extend stmmac functions and macros for Loongson DWMAC. Add LS7A support for dwmac_loongson.

Feiyang Chen (10):
net: stmmac: Pass stmmac_priv and chan in some callbacks
net: stmmac: dwmac1000: Allow platforms to choose some register
offsets
net: stmmac: dwmac1000: Add multi-channel support
net: stmmac: dwmac1000: Add 64-bit DMA support
net: stmmac: dwmac1000: Add Loongson register definitions
net: stmmac: Add Loongson HWIF entry
net: stmmac: dwmac-loongson: Add LS7A support
net: stmmac: dwmac-loongson: Disable flow control for GMAC
net: stmmac: dwmac-loongson: Add 64-bit DMA and multi-vector support
net: stmmac: dwmac-loongson: Add GNET support

I took a quick look at your patches and I'm thinking whether this is the correct way to go. You are mixing up the stmmac generic layer by adding the Loongson HWIF entry. The whole idea of HWIF was to have it independent of vendor specific logic.

Can you devise another alternative without mixing up the HWIF?

Thanks,
Jose

#42 lore raw
Quoted 20 lines · Jose Abreu

From: Feiyang Chen <[email protected]>
Date: Thu, Jul 27, 2023 at 08:15:44

Quoted 15 lines

Extend stmmac functions and macros for Loongson DWMAC. Add LS7A support for dwmac_loongson.

Feiyang Chen (10):
net: stmmac: Pass stmmac_priv and chan in some callbacks
net: stmmac: dwmac1000: Allow platforms to choose some register
offsets
net: stmmac: dwmac1000: Add multi-channel support
net: stmmac: dwmac1000: Add 64-bit DMA support
net: stmmac: dwmac1000: Add Loongson register definitions
net: stmmac: Add Loongson HWIF entry
net: stmmac: dwmac-loongson: Add LS7A support
net: stmmac: dwmac-loongson: Disable flow control for GMAC
net: stmmac: dwmac-loongson: Add 64-bit DMA and multi-vector support
net: stmmac: dwmac-loongson: Add GNET support

Quoted 6 lines

I took a quick look at your patches and I'm thinking whether this is the correct way to go. You are mixing up the stmmac generic layer by adding the Loongson HWIF entry. The whole idea of HWIF was to have it independent of vendor specific logic.

Can you devise another alternative without mixing up the HWIF?

Hi, Jose,

OK, I will try.

Thanks,
Feiyang

Quoted 2 lines

Thanks,
Jose