stmmac: Add Loongson platform support
Subsystems (5)
v9 cover stmmac: Add Loongson platform support
v9:
We have not provided a detailed list of equipment for a long time, and I apologize for this. During this period, I have collected some information and now present it to you, hoping to alleviate the pressure of review.
1. IP core
We now have two types of IP cores, one is 0x37, similar to dwmac1000; The other is 0x10. Compared to 0x37, we split several DMA registers from one to two, and it is not worth adding a new entry for this. According to Serge's comment, we made these devices work by overwriting priv->synopsys_id = 0x37 and mac->dma = <LS_dma_ops>.
1.1. Some more detailed information
The number of DMA channels for 0x37 is 1; The number of DMA channels for 0x10 is 8. Except for channel 0, otherchannels do not support sending hardware checksums. Supported AV features are Qav, Qat, and Qas, and the rest are consistent with 3.73.
2. DEVICE
We have two types of devices,
one is GMAC, which only has a MAC chip inside and needs an external PHY chip;
the other is GNET, which integrates both MAC and PHY chips inside.
2.1. Some more detailed information
GMAC device: LS7A1000, LS2K1000, these devices do not support any pause mode.
gnet device: LS7A2000, LS2K2000, the chip connection between the mac and
phy of these devices is not normal and requires two rounds of negotiation; LS7A2000 does not support half-duplex and
multi-channel;
to enable multi-channel on LS2K2000, you need to turn off
hardware checksum.
**Note**: Only the LS2K2000's IP core is 0x10, while the IP cores of other devices are 0x37.
3. TABLE
device type pci_id ip_core ls7a1000 gmac 7a03 0x37 ls2k1000 gmac 7a03 0x37 ls7a2000 gnet 7a13 0x37 ls2k2000 gnet 7a13 0x10
-----------------------------------------------
Changes:
* passed the CI
<https://github.com/linux-netdev/nipa/blob/main/tests/patch/checkpatch
/checkpatch.sh>
* reverse xmas tree order.
* Silence build warning.
* Re-split the patch.
* Add more detailed commit message.
* Add more code comment.
* Reduce modification of generic code.
* using the GNET-specific prefix.
* define a new macro for the GNET MAC.
* Use an easier way to overwrite mac.
* Removed some useless printk.
v8:
* The biggest change is according to Serge's comment in the previous edition:
Seeing the patch in the current state would overcomplicate the generic code and the only functions you need to update are dwmac_dma_interrupt()
dwmac1000_dma_init_channel()
you can have these methods re-defined with all the Loongson GNET specifics in the low-level platform driver (dwmac-loongson.c). After that you can just override the mac_device_info.dma pointer with a fixed stmmac_dma_ops descriptor. Here is what should be done for that:
1. Keep the Patch 4/9 with my comments fixed. First it will be partly useful for your GNET device. Second in general it's a correct implementation of the normal DW GMAC v3.x multi-channels feature and will be useful for the DW GMACs with that feature enabled.
2. Create the Loongson GNET-specific stmmac_dma_ops.dma_interrupt()
stmmac_dma_ops.init_chan()
methods in the dwmac-loongson.c driver. Don't forget to move all the Loongson-specific macros from dwmac_dma.h to dwmac-loongson.c.
3. Create a Loongson GNET-specific platform setup method with the next semantics:
+ allocate stmmac_dma_ops instance and initialize it with dwmac1000_dma_ops.
+ override the stmmac_dma_ops.{dma_interrupt, init_chan} with the pointers to the methods defined in 2.
+ allocate mac_device_info instance and initialize the mac_device_info.dma field with a pointer to the new stmmac_dma_ops instance.
+ call dwmac1000_setup() or initialize mac_device_info in a way it's done in dwmac1000_setup() (the later might be better so you wouldn't need to export the dwmac1000_setup() function).
+ override stmmac_priv.synopsys_id with a correct value.
4. Initialize plat_stmmacenet_data.setup() with the pointer to the method created in 3.
* Others:
Re-split the patch.
Passed checkpatch.pl test.
v7:
* Refer to andrew's suggestion:
- Add DMA_INTR_ENA_NIE_RX and DMA_INTR_ENA_NIE_TX #define's, etc.
* Others:
- Using --subject-prefix="PATCH net-next vN" to indicate that the patches are for the networking tree.
- Rebase to the latest networking tree:
<git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git>
v6:
* Refer to Serge's suggestion:
- Add new platform feature flag:
include/linux/stmmac.h:
+#define STMMAC_FLAG_HAS_LGMAC BIT(13)- Add the IRQs macros specific to the Loongson Multi-channels GMAC:
drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h:
+#define DMA_INTR_ENA_NIE_LOONGSON 0x00060000 /* ...*/
#define DMA_INTR_ENA_NIE 0x00010000 /* Normal Summary */
... - Drop all of redundant changes that don't require the prototypes being converted to accepting the stmmac_priv pointer.
* Refer to andrew's suggestion:
- Drop white space changes.
- break patch up into lots of smaller parts.
Some small patches have been put into another series as a preparation see <https://lore.kernel.org/loongarch/[email protected]/T/#t>
*note* : This series of patches relies on the three small patches above.
* others
- Drop irq_flags changes.
- Changed patch order.
v4 -> v5:
* Remove an ugly and useless patch (fix channel number).
* Remove the non-standard dma64 driver code, and also remove the HWIF entries, since the associated custom callbacks no longer exist.
* Refer to Serge's suggestion: Update the dwmac1000_dma.c to support the multi-DMA-channels controller setup.
See:
v4: <https://lore.kernel.org/loongarch/[email protected]/>
v3: <https://lore.kernel.org/loongarch/[email protected]/>
v2: <https://lore.kernel.org/loongarch/[email protected]/>
v1: <https://lore.kernel.org/loongarch/[email protected]/>
Yanteng Si (6):
net: stmmac: Add multi-channel support
net: stmmac: dwmac-loongson: Use PCI_DEVICE_DATA() macro for device
identification
net: stmmac: dwmac-loongson: Drop mac-interface initialization
net: stmmac: dwmac-loongson: Introduce gmac setup
net: stmmac: dwmac-loongson: Add full PCI support
net: stmmac: dwmac-loongson: Add GNET support
.../ethernet/stmicro/stmmac/dwmac-loongson.c | 569 ++++++++++++++++-- .../net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 4 +- .../ethernet/stmicro/stmmac/dwmac1000_dma.c | 35 +- .../ethernet/stmicro/stmmac/dwmac100_dma.c | 2 +- .../net/ethernet/stmicro/stmmac/dwmac4_dma.c | 2 +- .../net/ethernet/stmicro/stmmac/dwmac_dma.h | 20 +- .../net/ethernet/stmicro/stmmac/dwmac_lib.c | 32 +- .../ethernet/stmicro/stmmac/dwxgmac2_dma.c | 2 +- drivers/net/ethernet/stmicro/stmmac/hwif.h | 5 +- .../ethernet/stmicro/stmmac/stmmac_ethtool.c | 6 + .../net/ethernet/stmicro/stmmac/stmmac_main.c | 11 +- include/linux/stmmac.h | 2 + 12 files changed, 583 insertions(+), 107 deletions(-)
Signature · 1 line
2.31.4
PATCH v9 1/6 net: stmmac: Add multi-channel support
DW GMAC v3.x multi-channels feature is implemented as multiple sets of the same CSRs. Here is only preliminary support, it will be useful for the driver further evolution and for the users having multi-channel DWGMAC v3.x devices.
--- .../net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 4 +-- .../ethernet/stmicro/stmmac/dwmac1000_dma.c | 34 ++++++++++--------- .../ethernet/stmicro/stmmac/dwmac100_dma.c | 2 +- .../net/ethernet/stmicro/stmmac/dwmac4_dma.c | 2 +- .../net/ethernet/stmicro/stmmac/dwmac_dma.h | 20 +++++++++-- .../net/ethernet/stmicro/stmmac/dwmac_lib.c | 32 ++++++++--------- .../ethernet/stmicro/stmmac/dwxgmac2_dma.c | 2 +- drivers/net/ethernet/stmicro/stmmac/hwif.h | 5 ++- .../ethernet/stmicro/stmmac/stmmac_ethtool.c | 6 ++++ .../net/ethernet/stmicro/stmmac/stmmac_main.c | 11 +++--- include/linux/stmmac.h | 1 + 11 files changed, 71 insertions(+), 48 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +2 -2
@@ -299,7 +299,7 @@ static int sun8i_dwmac_dma_reset(void __iomem *ioaddr)* Called from stmmac via stmmac_dma_ops->init */ static void sun8i_dwmac_dma_init (void __iomem *ioaddr, -struct stmmac_dma_cfg *dma_cfg,int atds) +struct stmmac_dma_cfg *dma_cfg) {writel (EMAC_RX_INT |EMAC_TX_INT , ioaddr +EMAC_INT_EN );writel (0x1FFFFFF , ioaddr +EMAC_INT_STA );
@@ -395,7 +395,7 @@ 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 (void __iomem *ioaddr,u32 chan) {u32 v;
drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c +18 -16
@@ -70,15 +70,17 @@ 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, -struct stmmac_dma_cfg *dma_cfg,int atds) +static void dwmac1000_dma_init_channel (struct stmmac_priv *priv, +void __iomem *ioaddr, +struct stmmac_dma_cfg *dma_cfg,u32 chan) { -u32 value =readl (ioaddr +DMA_BUS_MODE );int txpbl = dma_cfg->txpbl ?: dma_cfg->pbl;int rxpbl = dma_cfg->rxpbl ?: dma_cfg->pbl; +u32 value; -/* -* Set the DMA PBL (Programmable Burst Length) mode. + value =readl (ioaddr +DMA_CHAN_BUS_MODE (chan)); + +/* Set the DMA PBL (Programmable Burst Length) mode. * * Note: before stmmac core 3.50 this mode bit was 4xPBL, and * post 3.5 mode bit acts as 8*PBL.
@@ -98,16 +100,16 @@ static void dwmac1000_dma_init(void __iomem *ioaddr,if (dma_cfg->mixed_burst) value |=DMA_BUS_MODE_MB ; -if (atds) +if (dma_cfg->atds) value |=DMA_BUS_MODE_ATDS ;if (dma_cfg->aal) value |=DMA_BUS_MODE_AAL ; -writel (value, ioaddr +DMA_BUS_MODE ); +writel (value, ioaddr +DMA_CHAN_BUS_MODE (chan));/* Mask interrupts by writing to CSR7 */ -writel (DMA_INTR_DEFAULT_MASK , ioaddr +DMA_INTR_ENA ); +writel (DMA_INTR_DEFAULT_MASK , ioaddr +DMA_CHAN_INTR_ENA (chan)); } static void dwmac1000_dma_init_rx(struct stmmac_priv *priv,
@@ -116,7 +118,7 @@ static void dwmac1000_dma_init_rx(struct stmmac_priv *priv, 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); + writel(lower_32_bits(dma_rx_phy), ioaddr + DMA_CHAN_RCV_BASE_ADDR(chan)); } static void dwmac1000_dma_init_tx(struct stmmac_priv *priv,
@@ -125,7 +127,7 @@ static void dwmac1000_dma_init_tx(struct stmmac_priv *priv, 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); + writel(lower_32_bits(dma_tx_phy), ioaddr + DMA_CHAN_TX_BASE_ADDR(chan)); }static u32 dwmac1000_configure_fc (u32 csr6,int rxfifosz)
@@ -153,7 +155,7 @@ static void dwmac1000_dma_operation_mode_rx(struct stmmac_priv *priv, void __iomem *ioaddr, int mode, u32 channel, int fifosz, u8 qmode) { - u32 csr6 = readl(ioaddr + DMA_CONTROL); + u32 csr6 = readl(ioaddr + DMA_CHAN_CONTROL(channel));if (mode ==SF_DMA_MODE ) {pr_debug ("GMAC: enable RX store and forward mode\n" );
@@ -175,14 +177,14 @@ static void dwmac1000_dma_operation_mode_rx(struct stmmac_priv *priv,/* Configure flow control based on rx fifo size */ csr6 =dwmac1000_configure_fc (csr6, fifosz); -writel (csr6, ioaddr +DMA_CONTROL ); +writel (csr6, ioaddr +DMA_CHAN_CONTROL (channel)); }static void dwmac1000_dma_operation_mode_tx (struct stmmac_priv *priv,void __iomem *ioaddr,int mode,u32 channel,int fifosz,u8 qmode) { -u32 csr6 =readl (ioaddr +DMA_CONTROL ); +u32 csr6 =readl (ioaddr +DMA_CHAN_CONTROL (channel));if (mode ==SF_DMA_MODE ) {pr_debug ("GMAC: enable TX store and forward mode\n" );
@@ -209,7 +211,7 @@ static void dwmac1000_dma_operation_mode_tx(struct stmmac_priv *priv, csr6 |=DMA_CONTROL_TTC_256 ; } -writel (csr6, ioaddr +DMA_CONTROL ); +writel (csr6, ioaddr +DMA_CHAN_CONTROL (channel)); } static void dwmac1000_dump_dma_regs(struct stmmac_priv *priv,
@@ -271,12 +273,12 @@ static int dwmac1000_get_hw_feature(void __iomem *ioaddr,static void dwmac1000_rx_watchdog (struct stmmac_priv *priv,void __iomem *ioaddr,u32 riwt,u32 queue) { -writel (riwt, ioaddr +DMA_RX_WATCHDOG ); +writel (riwt, ioaddr +DMA_CHAN_RX_WATCHDOG (queue)); }const struct stmmac_dma_ops dwmac1000_dma_ops = { .reset = dwmac_dma_reset, - .init = dwmac1000_dma_init, + .init_chan = dwmac1000_dma_init_channel, .init_rx_chan = dwmac1000_dma_init_rx, .init_tx_chan = dwmac1000_dma_init_tx, .axi = dwmac1000_dma_axi,
drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c +1 -1
@@ -19,7 +19,7 @@#include "dwmac_dma.h" static void dwmac100_dma_init (void __iomem *ioaddr, -struct stmmac_dma_cfg *dma_cfg,int atds) +struct stmmac_dma_cfg *dma_cfg) {/* Enable Application Access by writing to DMA CSR0 */ writel(DMA_BUS_MODE_DEFAULT | (dma_cfg->pbl << DMA_BUS_MODE_PBL_SHIFT),
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c +1 -1
@@ -153,7 +153,7 @@ static void dwmac410_dma_init_channel(struct stmmac_priv *priv, }static void dwmac4_dma_init (void __iomem *ioaddr, -struct stmmac_dma_cfg *dma_cfg,int atds) +struct stmmac_dma_cfg *dma_cfg) {u32 value =readl (ioaddr +DMA_SYS_BUS_MODE );
drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h +18 -2
@@ -22,6 +22,23 @@#define DMA_INTR_ENA 0x0000101c/* Interrupt Enable */ #define DMA_MISSED_FRAME_CTR 0x00001020/* Missed Frame Counter */ +/* Following DMA defines are channels oriented */ +#define DMA_CHAN_BASE_OFFSET 0x100 + +static inline u32 dma_chan_base_addr (u32 base,u32 chan) +{ +return base + chan *DMA_CHAN_BASE_OFFSET ; +} + +#define DMA_CHAN_XMT_POLL_DEMAND (chan) dma_chan_base_addr(DMA_XMT_POLL_DEMAND, chan) +#define DMA_CHAN_INTR_ENA (chan) dma_chan_base_addr(DMA_INTR_ENA, chan) +#define DMA_CHAN_CONTROL (chan) dma_chan_base_addr(DMA_CONTROL, chan) +#define DMA_CHAN_STATUS (chan) dma_chan_base_addr(DMA_STATUS, chan) +#define DMA_CHAN_BUS_MODE (chan) dma_chan_base_addr(DMA_BUS_MODE, chan) +#define DMA_CHAN_RCV_BASE_ADDR (chan) dma_chan_base_addr(DMA_RCV_BASE_ADDR, chan) +#define DMA_CHAN_TX_BASE_ADDR (chan) dma_chan_base_addr(DMA_TX_BASE_ADDR, chan) +#define DMA_CHAN_RX_WATCHDOG (chan) dma_chan_base_addr(DMA_RX_WATCHDOG, chan) +/* SW Reset */ #define DMA_BUS_MODE_SFT_RESET 0x00000001/* Software Reset */
@@ -152,7 +169,7 @@#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 (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,
@@ -168,5 +185,4 @@ void dwmac_dma_stop_rx(struct stmmac_priv *priv, void __iomem *ioaddr,int dwmac_dma_interrupt (struct stmmac_priv *priv,void __iomem *ioaddr,struct stmmac_extra_stats *x,u32 chan,u32 dir);int dwmac_dma_reset (void __iomem *ioaddr); -#endif /* __DWMAC_DMA_H__ */
drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c +16 -16
@@ -28,65 +28,65 @@ 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 (void __iomem *ioaddr,u32 chan) { -writel (1 , ioaddr +DMA_XMT_POLL_DEMAND ); +writel (1 , ioaddr +DMA_CHAN_XMT_POLL_DEMAND (chan)); }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_CHAN_INTR_ENA (chan));if (rx) value |=DMA_INTR_DEFAULT_RX ;if (tx) value |=DMA_INTR_DEFAULT_TX ; -writel (value, ioaddr +DMA_INTR_ENA ); +writel (value, ioaddr +DMA_CHAN_INTR_ENA (chan)); }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_CHAN_INTR_ENA (chan));if (rx) value &= ~DMA_INTR_DEFAULT_RX ;if (tx) value &= ~DMA_INTR_DEFAULT_TX ; -writel (value, ioaddr +DMA_INTR_ENA ); +writel (value, ioaddr +DMA_CHAN_INTR_ENA (chan)); }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_CHAN_CONTROL (chan)); value |=DMA_CONTROL_ST ; -writel (value, ioaddr +DMA_CONTROL ); +writel (value, ioaddr +DMA_CHAN_CONTROL (chan)); }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_CHAN_CONTROL (chan)); value &= ~DMA_CONTROL_ST ; -writel (value, ioaddr +DMA_CONTROL ); +writel (value, ioaddr +DMA_CHAN_CONTROL (chan)); }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_CHAN_CONTROL (chan)); value |=DMA_CONTROL_SR ; -writel (value, ioaddr +DMA_CONTROL ); +writel (value, ioaddr +DMA_CHAN_CONTROL (chan)); }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_CHAN_CONTROL (chan)); value &= ~DMA_CONTROL_SR ; -writel (value, ioaddr +DMA_CONTROL ); +writel (value, ioaddr +DMA_CHAN_CONTROL (chan)); }#ifdef DWMAC_DMA_DEBUG
@@ -165,7 +165,7 @@ int dwmac_dma_interrupt(struct stmmac_priv *priv, void __iomem *ioaddr,struct stmmac_pcpu_stats *stats =this_cpu_ptr (priv->xstats.pcpu_stats);int ret =0 ;/* read the status register (CSR5) */ -u32 intr_status =readl (ioaddr +DMA_STATUS ); +u32 intr_status =readl (ioaddr +DMA_CHAN_STATUS (chan));#ifdef DWMAC_DMA_DEBUG /* Enable it to monitor DMA rx/tx status in case of critical problems */
@@ -235,7 +235,7 @@ int dwmac_dma_interrupt(struct stmmac_priv *priv, void __iomem *ioaddr,pr_warn ("%s: unexpected status %08x\n" , __func__, intr_status);/* Clear the interrupt by writing a logic 1 to the CSR5[15-0] */ -writel ((intr_status &0x1ffff ), ioaddr +DMA_STATUS ); +writel ((intr_status &0x7ffff ), ioaddr +DMA_CHAN_STATUS (chan));return ret; }
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c +1 -1
@@ -20,7 +20,7 @@ static int dwxgmac2_dma_reset(void __iomem *ioaddr) }static void dwxgmac2_dma_init (void __iomem *ioaddr, -struct stmmac_dma_cfg *dma_cfg,int atds) +struct stmmac_dma_cfg *dma_cfg) {u32 value =readl (ioaddr +XGMAC_DMA_SYSBUS_MODE );
drivers/net/ethernet/stmicro/stmmac/hwif.h +2 -3
@@ -175,8 +175,7 @@ struct dma_features;struct stmmac_dma_ops {/* DMA core initialization */ int (*reset)(void __iomem *ioaddr); -void (*init)(void __iomem *ioaddr,struct stmmac_dma_cfg *dma_cfg, -int atds); +void (*init)(void __iomem *ioaddr,struct stmmac_dma_cfg *dma_cfg);void (*init_chan)(struct stmmac_priv *priv,void __iomem *ioaddr,struct stmmac_dma_cfg *dma_cfg,u32 chan); void (*init_rx_chan)(struct stmmac_priv *priv, void __iomem *ioaddr,
@@ -198,7 +197,7 @@ struct stmmac_dma_ops {/* To track extra statistic (if supported) */ void (*dma_diagnostic_fr)(struct stmmac_extra_stats *x,void __iomem *ioaddr); -void (*enable_dma_transmission) (void __iomem *ioaddr); +void (*enable_dma_transmission)(void __iomem *ioaddr,u32 chan);void (*enable_dma_irq)(struct stmmac_priv *priv,void __iomem *ioaddr,u32 chan,bool rx,bool tx); void (*disable_dma_irq)(struct stmmac_priv *priv, void __iomem *ioaddr,
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +6 -0
@@ -420,6 +420,12 @@ stmmac_ethtool_set_link_ksettings(struct net_device *dev,return 0 ; } +if (priv->plat->flags &STMMAC_FLAG_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 +5 -6
@@ -2564,7 +2564,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);xsk_tx_metadata_to_compl (meta, &tx_q->tx_skbuff_dma[entry].xsk_meta);
@@ -3014,7 +3014,6 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv)struct stmmac_rx_queue *rx_q;struct stmmac_tx_queue *tx_q;u32 chan =0 ; -int atds =0 ;int ret =0 ;if (!priv->plat->dma_cfg || !priv->plat->dma_cfg->pbl) {
@@ -3023,7 +3022,7 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv) }if (priv->extend_desc && (priv->mode ==STMMAC_RING_MODE )) - atds =1 ; + priv->plat->dma_cfg->atds =1 ; ret =stmmac_reset (priv, priv->ioaddr);if (ret) {
@@ -3032,7 +3031,7 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv) }/* DMA Configuration */ -stmmac_dma_init (priv, priv->ioaddr, priv->plat->dma_cfg, atds); +stmmac_dma_init (priv, priv->ioaddr, priv->plat->dma_cfg);if (priv->plat->axi)stmmac_axi (priv, priv->ioaddr, priv->plat->axi);
@@ -4761,7 +4760,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);
@@ -4988,7 +4987,7 @@ static int stmmac_xdp_xmit_xdpf(struct stmmac_priv *priv, int queue,u64_stats_update_end (&txq_stats->q_syncp); } -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;
include/linux/stmmac.h +1 -0
@@ -100,6 +100,7 @@ struct stmmac_dma_cfg {bool eame;bool multi_msi_en;bool dche; +bool atds; };#define AXI_BLEN 7
Signature · 1 line
2.31.4
Re: [PATCH net-next v9 1/6] net: stmmac: Add multi-channel support
Hello Yanteng,
Quoted 6 lines · Yanteng Si
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +0
-0@@ -420,6 +420,12 @@ stmmac_ethtool_set_link_ksettings(struct net_device *dev,return 0 ;
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c stmmac_ethtool_set_link_ksettings(struct net_device *dev, · line 430
Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +6
-0} +if (priv->plat->flags &STMMAC_FLAG_DISABLE_FORCE_1000 ) { +if (cmd->base.speed ==SPEED_1000 && + cmd->base.autoneg !=AUTONEG_ENABLE ) +return -EOPNOTSUPP ; + } +return phylink_ethtool_ksettings_set (priv->phylink, cmd); }
This doesn't seem like it belongs with the rest of the changes in this patch. Maybe you could move it to a separate patch?
Best Regards,
Signature · 3 lines
Romain Gantois, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Re: [PATCH net-next v9 1/6] net: stmmac: Add multi-channel support
Quoted 12 lines · Romain Gantois
Hello Yanteng,
Quoted 8 lines · Yanteng Si
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +0
-0@@ -420,6 +420,12 @@ stmmac_ethtool_set_link_ksettings(struct net_device *dev,return 0 ; }
Quoted 11 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c stmmac_ethtool_set_link_ksettings(struct net_device *dev, · line 430
Quoted 8 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +6
-0+if (priv->plat->flags &STMMAC_FLAG_DISABLE_FORCE_1000 ) { +if (cmd->base.speed ==SPEED_1000 && + cmd->base.autoneg !=AUTONEG_ENABLE ) +return -EOPNOTSUPP ; + } +return phylink_ethtool_ksettings_set (priv->phylink, cmd); }This doesn't seem like it belongs with the rest of the changes in this patch. Maybe you could move it to a separate patch?
Yeah, I will move it to patch 6/6, because it is a bug fix for some gnet.
BTW, The issue was also discussed in v10, I will send v11 today, let us continue to review in v11, thank you.
Thanks,
Yanteng
Quoted 1 line
PATCH v9 2/6 net: stmmac: dwmac-loongson: Use PCI_DEVICE_DATA() macro for device identification
In reply to Yanteng SiJust use PCI_DEVICE_DATA() macro for device identification, No changes to function functionality.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +1 -1
@@ -213,7 +213,7 @@ static SIMPLE_DEV_PM_OPS(loongson_dwmac_pm_ops, loongson_dwmac_suspend, loongson_dwmac_resume);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.31.4
PATCH v9 3/6 net: stmmac: dwmac-loongson: Drop mac-interface initialization
In reply to Yanteng SiWe don't need to initialize mac_interface, just need to get the phy_interface.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +0 -1
@@ -110,7 +110,6 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id } plat->phy_interface = phy_mode; - plat->mac_interface =PHY_INTERFACE_MODE_GMII ;pci_set_master (pdev);
Signature · 1 line
2.31.4
PATCH v9 4/6 net: stmmac: dwmac-loongson: Introduce gmac setup
In reply to Yanteng SiBased on IP core classification, loongson has two devices, 0x37 is gmac, 0x10 is gnet, and the current device is gmac.
Difference:
device type pci_id ip_core ls7a1000 gmac 7a03 0x35/0x37 ls2k1000 gmac 7a03 0x37 ls7a2000 gnet 7a13 0x37 ls2k2000 gnet 7a13 0x10
The ref/ptp clock of gmac is 125000000. gmac device only has a MAC chip inside and needs an external PHY chip;
--- .../ethernet/stmicro/stmmac/dwmac-loongson.c | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +15 -6
@@ -9,7 +9,8 @@#include <linux/of_irq.h> #include "stmmac.h" -static int loongson_default_data (struct plat_stmmacenet_data *plat) +static void loongson_default_data (struct pci_dev *pdev, +struct plat_stmmacenet_data *plat) { plat->clk_csr =2 ;/* clk_csr_i = 20-35MHz & MDC = clk_csr_i/16 */ plat->has_gmac =1 ;
@@ -24,16 +25,18 @@ static int loongson_default_data(struct plat_stmmacenet_data *plat)/* Set the maxmtu to a default of JUMBO_LEN */ plat->maxmtu =JUMBO_LEN ; -/* Set default number of RX and TX queues to use */ - plat->tx_queues_to_use =1 ; - plat->rx_queues_to_use =1 ; -/* Disable Priority config by default */ plat->tx_queues_cfg[0 ].use_prio = false; plat->rx_queues_cfg[0 ].use_prio = false;/* Disable RX queues routing by default */ plat->rx_queues_cfg[0 ].pkt_route =0x0 ; +} + +static int loongson_gmac_data (struct pci_dev *pdev, +struct plat_stmmacenet_data *plat) +{ +loongson_default_data (pdev, plat);/* Default to phy auto-detection */ plat->phy_addr =-1 ;
@@ -42,6 +45,12 @@ static int loongson_default_data(struct plat_stmmacenet_data *plat) plat->dma_cfg->pblx8 = true; plat->multicast_filter_bins =256 ; + plat->clk_ref_rate =125000000 ; + plat->clk_ptp_rate =125000000 ; + + plat->tx_queues_to_use =1 ; + plat->rx_queues_to_use =1 ; +return 0 ; }
@@ -113,7 +122,7 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_idpci_set_master (pdev); -loongson_default_data (plat); +loongson_gmac_data (pdev, plat);pci_enable_msi (pdev);memset (&res,0 ,sizeof (res)); res.addr =pcim_iomap_table (pdev)[0 ];
Signature · 1 line
2.31.4
PATCH v9 5/6 net: stmmac: dwmac-loongson: Add full PCI support
In reply to Yanteng SiCurrent 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).
Others:
LS2K is a SoC and LS7A is a bridge chip. In the current driving state, they are both gmac and phy_interface is RGMII.
--- .../ethernet/stmicro/stmmac/dwmac-loongson.c | 103 +++++++++++------- 1 file changed, 64 insertions(+), 39 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +64 -39
@@ -9,9 +9,19 @@#include <linux/of_irq.h> #include "stmmac.h" +#define PCI_DEVICE_ID_LOONGSON_GMAC 0x7a03 + +struct stmmac_pci_info { +int (*setup)(struct pci_dev *pdev,struct plat_stmmacenet_data *plat); +}; +static void loongson_default_data (struct pci_dev *pdev,struct plat_stmmacenet_data *plat) { +/* Get bus_id, this can be overloaded later */ + 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 ;
@@ -40,6 +50,7 @@ static int loongson_gmac_data(struct pci_dev *pdev,/* Default to phy auto-detection */ plat->phy_addr =-1 ; + plat->phy_interface =PHY_INTERFACE_MODE_RGMII_ID ; plat->dma_cfg->pbl =32 ; plat->dma_cfg->pblx8 = true;
@@ -54,19 +65,17 @@ static int loongson_gmac_data(struct pci_dev *pdev,return 0 ; } +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) {struct plat_stmmacenet_data *plat; +int ret, i, bus_id, phy_mode; +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 ; - } plat =devm_kzalloc (&pdev->dev,sizeof (*plat),GFP_KERNEL );if (!plat)
@@ -78,12 +87,6 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_idif (!plat->mdio_bus_data)return -ENOMEM ; - 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->needs_reset = true; - } - plat->dma_cfg =devm_kzalloc (&pdev->dev,sizeof (*plat->dma_cfg),GFP_KERNEL );if (!plat->dma_cfg) { ret = -ENOMEM ;
@@ -107,10 +110,6 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_idbreak ; } - plat->bus_id =of_alias_get_id (np,"ethernet" ); -if (plat->bus_id <0 ) - plat->bus_id =pci_dev_id (pdev); - phy_mode =device_get_phy_mode (&pdev->dev);if (phy_mode <0 ) {dev_err (&pdev->dev,"phy_mode not found\n" );
@@ -122,30 +121,56 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_idpci_set_master (pdev); -loongson_gmac_data (pdev, plat); -pci_enable_msi (pdev); -memset (&res,0 ,sizeof (res)); - res.addr =pcim_iomap_table (pdev)[0 ]; - - 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; - } + info = (struct stmmac_pci_info *)id->driver_data; + ret = info->setup (pdev, plat); +if (ret) + goto err_disable_device; - 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; +if (np) { + 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->needs_reset = true; + } + + bus_id =of_alias_get_id (np,"ethernet" ); +if (bus_id >=0 ) + plat->bus_id = bus_id; + + 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; + + 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.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.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; - } +pci_enable_msi (pdev); +memset (&res,0 ,sizeof (res)); + res.addr =pcim_iomap_table (pdev)[0 ]; ret =stmmac_dvr_probe (&pdev->dev, plat, &res);if (ret)
Signature · 1 line
2.31.4
PATCH v9 6/6 net: stmmac: dwmac-loongson: Add GNET support
In reply to Yanteng SiThere are two types of Loongson DWGMAC. The first type shares the same register definitions and has similar logic as dwmac1000. The second type uses several different register definitions, we think it is necessary to distinguish rx and tx, so we split these bits into two.
Simply put, we split some single bit fields into double bits fileds:
Name Tx Rx
DMA_INTR_ENA_NIE = 0x00040000 | 0x00020000; DMA_INTR_ENA_AIE = 0x00010000 | 0x00008000; DMA_STATUS_NIS = 0x00040000 | 0x00020000; DMA_STATUS_AIS = 0x00010000 | 0x00008000; DMA_STATUS_FBI = 0x00002000 | 0x00001000;
Therefore, when using, TX and RX must be set at the same time.
How to use them:
1. Create the Loongson GNET-specific stmmac_dma_ops.dma_interrupt() stmmac_dma_ops.init_chan()
methods in the dwmac-loongson.c driver. Adding all the Loongson-specific macros
2. Create a Loongson GNET-specific platform setup method with the next semantics:
+ allocate stmmac_dma_ops instance and initialize it with dwmac1000_dma_ops.
+ override the stmmac_dma_ops.{dma_interrupt, init_chan} with the pointers to the methods defined in 2.
+ allocate mac_device_info instance and initialize the mac_device_info.dma field with a pointer to the new stmmac_dma_ops instance.
+ initialize mac_device_info in a way it's done in dwmac1000_setup().
3. Initialize plat_stmmacenet_data.setup() with the pointer to the method created in 2.
GNET features:
Speeds: 10/100/1000Mbps
DMA-descriptors type: normal and enhanced
L3/L4 filters availability: support
VLAN hash table filter: support
PHY-interface: GMII
Remote Wake-up support: support
Mac Management Counters (MMC): support
DMA chennel number: 0x10 device is 8 and 0x37 device is 1
Others:
GNET integrates both MAC and PHY chips inside.
gnet device: LS7A2000, LS2K2000, the chip connection between the mac and
phy of these devices is not normal and requires two rounds of negotiation; LS7A2000 does not support half-duplex and multi-channel;
To enable multi-channel on LS2K2000, you need to turn off hardware checksum.
**Note**: Only the LS2K2000's IP core is 0x10, while the IP cores of other devices are 0x37.
--- .../ethernet/stmicro/stmmac/dwmac-loongson.c | 502 ++++++++++++++++-- .../ethernet/stmicro/stmmac/dwmac1000_dma.c | 1 + include/linux/stmmac.h | 1 + 3 files changed, 462 insertions(+), 42 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +460 -42
@@ -8,8 +8,70 @@#include <linux/device.h> #include <linux/of_irq.h> #include "stmmac.h" +#include "dwmac_dma.h" +#include "dwmac1000.h" + +/* Normal Loongson Tx Summary */ +#define DMA_INTR_ENA_NIE_TX_LOONGSON 0x00040000 +/* Normal Loongson Rx Summary */ +#define DMA_INTR_ENA_NIE_RX_LOONGSON 0x00020000 +#define DMA_INTR_NORMAL_LOONGSON (DMA_INTR_ENA_NIE_TX_LOONGSON | \ + DMA_INTR_ENA_NIE_RX_LOONGSON | \ + DMA_INTR_ENA_RIE | DMA_INTR_ENA_TIE) + +/* Abnormal Loongson Tx Summary */ +#define DMA_INTR_ENA_AIE_TX_LOONGSON 0x00010000 +/* Abnormal Loongson Rx Summary */ +#define DMA_INTR_ENA_AIE_RX_LOONGSON 0x00008000 + +#define DMA_INTR_ABNORMAL_LOONGSON (DMA_INTR_ENA_AIE_TX_LOONGSON | \ + DMA_INTR_ENA_AIE_RX_LOONGSON | \ + DMA_INTR_ENA_FBE | DMA_INTR_ENA_UNE) + +#define DMA_INTR_DEFAULT_MASK_LOONGSON (DMA_INTR_NORMAL_LOONGSON | \ + DMA_INTR_ABNORMAL_LOONGSON) + +/* Normal Loongson Tx Interrupt Summary */ +#define DMA_STATUS_NIS_TX_LOONGSON 0x00040000 +/* Normal Loongson Rx Interrupt Summary */ +#define DMA_STATUS_NIS_RX_LOONGSON 0x00020000 + +/* Abnormal Loongson Tx Interrupt Summary */ +#define DMA_STATUS_AIS_TX_LOONGSON 0x00010000 +/* Abnormal Loongson Rx Interrupt Summary */ +#define DMA_STATUS_AIS_RX_LOONGSON 0x00008000 + +/* Fatal Loongson Tx Bus Error Interrupt */ +#define DMA_STATUS_FBI_TX_LOONGSON 0x00002000 +/* Fatal Loongson Rx Bus Error Interrupt */ +#define DMA_STATUS_FBI_RX_LOONGSON 0x00001000 + +#define DMA_STATUS_MSK_COMMON_LOONGSON (DMA_STATUS_NIS_TX_LOONGSON | \ + DMA_STATUS_NIS_RX_LOONGSON | \ + DMA_STATUS_AIS_TX_LOONGSON | \ + DMA_STATUS_AIS_RX_LOONGSON | \ + DMA_STATUS_FBI_TX_LOONGSON | \ + DMA_STATUS_FBI_RX_LOONGSON) + +#define DMA_STATUS_MSK_RX_LOONGSON (DMA_STATUS_ERI | DMA_STATUS_RWT | \ + DMA_STATUS_RPS | DMA_STATUS_RU | \ + DMA_STATUS_RI | DMA_STATUS_OVF | \ + DMA_STATUS_MSK_COMMON_LOONGSON) + +#define DMA_STATUS_MSK_TX_LOONGSON (DMA_STATUS_ETI | DMA_STATUS_UNF | \ + DMA_STATUS_TJT | DMA_STATUS_TU | \ + DMA_STATUS_TPS | DMA_STATUS_TI | \ + DMA_STATUS_MSK_COMMON_LOONGSON)#define PCI_DEVICE_ID_LOONGSON_GMAC 0x7a03 +#define PCI_DEVICE_ID_LOONGSON_GNET 0x7a13 +#define LOONGSON_DWMAC_CORE_1_00 0x10/* Loongson custom ip */ +#define LOONGSON_DWMAC_CORE_3_70 0x37 +#define CHANNEL_NUM 8/*gnet of 2k2000 has 8 channel*/ + +struct loongson_data { +struct device *dev; +};struct stmmac_pci_info {int (*setup)(struct pci_dev *pdev,struct plat_stmmacenet_data *plat);
@@ -43,6 +105,362 @@ static void loongson_default_data(struct pci_dev *pdev, plat->rx_queues_cfg[0 ].pkt_route =0x0 ; } +static int loongson_dwmac_config_legacy (struct pci_dev *pdev, +struct plat_stmmacenet_data *plat, +struct stmmac_resources *res, +struct device_node *np) +{ +if (np) { + res->irq =of_irq_get_byname (np,"macirq" ); +if (res->irq <0 ) { +dev_err (&pdev->dev,"IRQ macirq not found\n" ); +return -ENODEV ; + } + + 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" ); +return -ENODEV ; + } + }else { + res->irq = pdev->irq; + res->wol_irq = res->irq; + } + +return 0 ; +} + +static void loongson_gnet_dma_init_channel (struct stmmac_priv *priv, +void __iomem *ioaddr, +struct stmmac_dma_cfg *dma_cfg, +u32 chan) +{ +int txpbl = dma_cfg->txpbl ?: dma_cfg->pbl; +int rxpbl = dma_cfg->rxpbl ?: dma_cfg->pbl; +u32 value; + +/* common channel control register config */ + value =readl (ioaddr +DMA_CHAN_BUS_MODE (chan)); + +/* Set the DMA PBL (Programmable Burst Length) mode. +* +* Note: before stmmac core 3.50 this mode bit was 4xPBL, and +* post 3.5 mode bit acts as 8*PBL. +*/ +if (dma_cfg->pblx8) + value |=DMA_BUS_MODE_MAXPBL ; + value |=DMA_BUS_MODE_USP ; + value &= ~(DMA_BUS_MODE_PBL_MASK |DMA_BUS_MODE_RPBL_MASK ); + value |= (txpbl <<DMA_BUS_MODE_PBL_SHIFT ); + value |= (rxpbl <<DMA_BUS_MODE_RPBL_SHIFT ); + +/* Set the Fixed burst mode */ +if (dma_cfg->fixed_burst) + value |=DMA_BUS_MODE_FB ; + +/* Mixed Burst has no effect when fb is set */ +if (dma_cfg->mixed_burst) + value |=DMA_BUS_MODE_MB ; + +if (dma_cfg->atds) + value |=DMA_BUS_MODE_ATDS ; + +if (dma_cfg->aal) + value |=DMA_BUS_MODE_AAL ; + +writel (value, ioaddr +DMA_CHAN_BUS_MODE (chan)); + +/* Mask interrupts by writing to CSR7 */ +writel (DMA_INTR_DEFAULT_MASK_LOONGSON , ioaddr + +DMA_CHAN_INTR_ENA (chan)); +} + +static int loongson_gnet_dma_interrupt (struct stmmac_priv *priv, +void __iomem *ioaddr, +struct stmmac_extra_stats *x, +u32 chan,u32 dir) +{ +struct stmmac_pcpu_stats *stats =this_cpu_ptr (priv->xstats.pcpu_stats); +u32 abnor_intr_status; +u32 nor_intr_status; +u32 fb_intr_status; +u32 intr_status; +int ret =0 ; + +/* read the status register (CSR5) */ + intr_status =readl (ioaddr +DMA_CHAN_STATUS (chan)); + +if (dir ==DMA_DIR_RX ) + intr_status &=DMA_STATUS_MSK_RX_LOONGSON ; +else if (dir ==DMA_DIR_TX ) + intr_status &=DMA_STATUS_MSK_TX_LOONGSON ; + + nor_intr_status = intr_status & (DMA_STATUS_NIS_TX_LOONGSON | +DMA_STATUS_NIS_RX_LOONGSON ); + abnor_intr_status = intr_status & (DMA_STATUS_AIS_TX_LOONGSON | +DMA_STATUS_AIS_RX_LOONGSON ); + fb_intr_status = intr_status & (DMA_STATUS_FBI_TX_LOONGSON | +DMA_STATUS_FBI_RX_LOONGSON ); + +/* ABNORMAL interrupts */ +if (unlikely (abnor_intr_status)) { +if (unlikely (intr_status &DMA_STATUS_UNF )) { + ret = tx_hard_error_bump_tc; + x->tx_undeflow_irq++; + } +if (unlikely (intr_status &DMA_STATUS_TJT )) + x->tx_jabber_irq++; + +if (unlikely (intr_status &DMA_STATUS_OVF )) + x->rx_overflow_irq++; + +if (unlikely (intr_status &DMA_STATUS_RU )) + x->rx_buf_unav_irq++; +if (unlikely (intr_status &DMA_STATUS_RPS )) + x->rx_process_stopped_irq++; +if (unlikely (intr_status &DMA_STATUS_RWT )) + x->rx_watchdog_irq++; +if (unlikely (intr_status &DMA_STATUS_ETI )) + x->tx_early_irq++; +if (unlikely (intr_status &DMA_STATUS_TPS )) { + x->tx_process_stopped_irq++; + ret = tx_hard_error; + } +if (unlikely (intr_status & fb_intr_status)) { + x->fatal_bus_error_irq++; + ret = tx_hard_error; + } + } +/* TX/RX NORMAL interrupts */ +if (likely (nor_intr_status)) { +if (likely (intr_status &DMA_STATUS_RI )) { +u32 value =readl (ioaddr +DMA_INTR_ENA ); +/* to schedule NAPI on real RIE event. */ +if (likely (value &DMA_INTR_ENA_RIE )) { +u64_stats_update_begin (&stats->syncp); +u64_stats_inc (&stats->rx_normal_irq_n[chan]); +u64_stats_update_end (&stats->syncp); + ret |= handle_rx; + } + } +if (likely (intr_status &DMA_STATUS_TI )) { +u64_stats_update_begin (&stats->syncp); +u64_stats_inc (&stats->tx_normal_irq_n[chan]); +u64_stats_update_end (&stats->syncp); + ret |= handle_tx; + } +if (unlikely (intr_status &DMA_STATUS_ERI )) + x->rx_early_irq++; + } +/* Optional hardware blocks, interrupts should be disabled */ +if (unlikely (intr_status & + (DMA_STATUS_GPI |DMA_STATUS_GMI |DMA_STATUS_GLI ))) +pr_warn ("%s: unexpected status %08x\n" , __func__, intr_status); + +/* Clear the interrupt by writing a logic 1 to the CSR5[15-0] */ +writel ((intr_status &0x7ffff ), ioaddr +DMA_CHAN_STATUS (chan)); + +return ret; +} + +static void loongson_phylink_get_caps (struct stmmac_priv *priv) +{ +struct pci_dev *pdev =to_pci_dev (priv->device); +struct stmmac_resources res; +u32 loongson_gmac; + +memset (&res,0 ,sizeof (res)); + res.addr =pcim_iomap_table (pdev)[0 ]; + loongson_gmac =readl (res.addr +GMAC_VERSION ) &0xff ; + +/* The GMAC device with PCI ID 7a03 does not support any pause mode. +* The GNET device (only 7A2000) does not support half-duplex. +*/ +if (pdev->vendor ==0x7a03 ) { + priv->phylink_config.mac_capabilities =MAC_10FD |MAC_100FD | +MAC_1000FD ; + }else { + priv->phylink_config.mac_capabilities = (MAC_ASYM_PAUSE | +MAC_SYM_PAUSE |MAC_10FD |MAC_100FD |MAC_1000FD ); + +if (loongson_gmac ==LOONGSON_DWMAC_CORE_3_70 ) { + priv->phylink_config.mac_capabilities &= ~(MAC_10HD | +MAC_100HD |MAC_1000HD ); + }; + }; +} + +static void loongson_gnet_fix_speed (void *priv,unsigned int speed, +unsigned int mode) +{ +struct loongson_data *ld = (struct loongson_data *)priv; +struct net_device *ndev =dev_get_drvdata (ld->dev); +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. +* MAC_CTRL_REG.15 is defined by the GMAC_CONTROL_PS macro. +*/ +if (speed ==SPEED_1000 ) { +if (readl (ptr->ioaddr +MAC_CTRL_REG ) & (1 <<15 )) +phy_restart_aneg (ndev->phydev); + } +} + +static struct mac_device_info *loongson_gnet_setup (void *apriv) +{ +struct stmmac_ops *loongson_dwmac_ops; +struct stmmac_priv *priv = apriv; +struct mac_device_info *mac; +struct stmmac_dma_ops *dma; + + mac =devm_kzalloc (priv->device,sizeof (*mac),GFP_KERNEL ); +if (!mac) +return NULL ; + + dma =devm_kzalloc (priv->device,sizeof (*dma),GFP_KERNEL ); +if (!dma) +return NULL ; + + loongson_dwmac_ops =devm_kzalloc (priv->device, +sizeof (*loongson_dwmac_ops), +GFP_KERNEL ); +if (!loongson_dwmac_ops) +return NULL ; + +/* The original IP-core version is 0x37 in all Loongson GNET +* (2k2000 and 7a2000), but the GNET HW designers have changed the +* GMAC_VERSION.SNPSVER field to the custom 0x10 value on the Loongson +* 2k2000 MAC to emphasize the differences: multiple DMA-channels, AV +* feature and GMAC_INT_STATUS CSR flags layout. Get back the +* original value so the correct HW-interface would be +* selected. +*/ + priv->synopsys_id =0x37 ; + priv->dev->priv_flags |=IFF_UNICAST_FLT ; + + *dma = dwmac1000_dma_ops; + dma->init_chan = loongson_gnet_dma_init_channel; + dma->dma_interrupt = loongson_gnet_dma_interrupt; + mac->dma = dma; + + *loongson_dwmac_ops = dwmac1000_ops; + loongson_dwmac_ops->phylink_get_caps = loongson_phylink_get_caps; + mac->mac = loongson_dwmac_ops; + +/* Pre-initialize the respective "mac" fields as it's done in +* dwmac1000_setup() +*/ + mac->pcsr = priv->ioaddr; + mac->multicast_filter_bins = priv->plat->multicast_filter_bins; + mac->unicast_filter_entries = priv->plat->unicast_filter_entries; + mac->mcast_bits_log2 =0 ; + +if (mac->multicast_filter_bins) + mac->mcast_bits_log2 =ilog2 (mac->multicast_filter_bins); + + mac->link.duplex =GMAC_CONTROL_DM ; + mac->link.speed10 =GMAC_CONTROL_PS ; + mac->link.speed100 =GMAC_CONTROL_PS |GMAC_CONTROL_FES ; + mac->link.speed1000 =0 ; + mac->link.speed_mask =GMAC_CONTROL_PS |GMAC_CONTROL_FES ; + mac->mii.addr =GMAC_MII_ADDR ; + mac->mii.data =GMAC_MII_DATA ; + mac->mii.addr_shift =11 ; + mac->mii.addr_mask =0x0000F800 ; + mac->mii.reg_shift =6 ; + mac->mii.reg_mask =0x000007C0 ; + mac->mii.clk_csr_shift =2 ; + mac->mii.clk_csr_mask =GENMASK (5 ,2 ); + +return mac; +} + +static int loongson_gnet_config_multi_msi (struct pci_dev *pdev, +struct plat_stmmacenet_data *plat, +struct stmmac_resources *res, +struct device_node *np) +{ +int i, ret, vecs; + + vecs =roundup_pow_of_two (CHANNEL_NUM *2 +1 ); + ret =pci_alloc_irq_vectors (pdev, vecs, vecs,PCI_IRQ_MSI ); +if (ret <0 ) { +dev_info (&pdev->dev, +"MSI enable failed, Fallback to legacy interrupt\n" ); +return loongson_dwmac_config_legacy (pdev, plat, res, np); + } + + res->irq =pci_irq_vector (pdev,0 ); + res->wol_irq =0 ; + +/* INT NAME | MAC | CH7 rx | CH7 tx | ... | CH0 rx | CH0 tx | +* --------- ----- -------- -------- ... -------- -------- +* IRQ NUM | 0 | 1 | 2 | ... | 15 | 16 | +*/ +for (i =0 ; i <CHANNEL_NUM ; i++) { + res->rx_irq[CHANNEL_NUM -1 - i] = +pci_irq_vector (pdev,1 + i *2 ); + res->tx_irq[CHANNEL_NUM -1 - i] = +pci_irq_vector (pdev,2 + i *2 ); + } + + plat->flags |=STMMAC_FLAG_MULTI_MSI_EN ; + +return 0 ; +} + +static int loongson_gnet_data (struct pci_dev *pdev, +struct plat_stmmacenet_data *plat) +{ +struct stmmac_resources res; +u32 loongson_gmac; + +loongson_default_data (pdev, plat); + + plat->multicast_filter_bins =256 ; + + plat->mdio_bus_data->phy_mask = ~(u32 )BIT (2 ); + + plat->phy_addr =-1 ; + plat->phy_interface =PHY_INTERFACE_MODE_GMII ; + + plat->fix_mac_speed = loongson_gnet_fix_speed; + + plat->dma_cfg->pbl =32 ; + plat->dma_cfg->pblx8 = true; + + plat->clk_ref_rate =125000000 ; + plat->clk_ptp_rate =125000000 ; + +memset (&res,0 ,sizeof (res)); + res.addr =pcim_iomap_table (pdev)[0 ]; + + loongson_gmac =readl (res.addr +GMAC_VERSION ) &0xff ; + +if (loongson_gmac ==LOONGSON_DWMAC_CORE_1_00 ) { + plat->rx_queues_to_use =CHANNEL_NUM ; + plat->tx_queues_to_use =CHANNEL_NUM ; + }else { + plat->tx_queues_to_use =1 ; + plat->rx_queues_to_use =1 ; + } + +return 0 ; +} + +static struct stmmac_pci_info loongson_gnet_pci_info = { + .setup = loongson_gnet_data, +}; +static int loongson_gmac_data (struct pci_dev *pdev,struct plat_stmmacenet_data *plat) {
@@ -69,13 +487,16 @@ 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) +static int loongson_dwmac_probe (struct pci_dev *pdev, +const struct pci_device_id *id) {struct plat_stmmacenet_data *plat;int ret, i, bus_id, phy_mode;struct stmmac_pci_info *info;struct stmmac_resources res; +struct loongson_data *ld;struct device_node *np; +u32 loongson_gmac; plat =devm_kzalloc (&pdev->dev,sizeof (*plat),GFP_KERNEL );if (!plat)
@@ -87,11 +508,16 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_idif (!plat->mdio_bus_data)return -ENOMEM ; - plat->dma_cfg =devm_kzalloc (&pdev->dev,sizeof (*plat->dma_cfg),GFP_KERNEL ); -if (!plat->dma_cfg) { - ret = -ENOMEM ; - goto err_put_node; - } + plat->dma_cfg =devm_kzalloc (&pdev->dev,sizeof (*plat->dma_cfg), +GFP_KERNEL ); +if (!plat->dma_cfg) +return -ENOMEM ; + + ld =devm_kzalloc (&pdev->dev,sizeof (*ld),GFP_KERNEL ); +if (!ld) +return -ENOMEM ; + + np =dev_of_node (&pdev->dev);/* Enable pci device */ ret =pci_enable_device (pdev);
@@ -110,15 +536,6 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_idbreak ; } - 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; -pci_set_master (pdev); info = (struct stmmac_pci_info *)id->driver_data;
@@ -132,7 +549,6 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_iddev_info (&pdev->dev,"Found MDIO subnode\n" ); plat->mdio_bus_data->needs_reset = true; } - bus_id =of_alias_get_id (np,"ethernet" );if (bus_id >=0 ) plat->bus_id = bus_id;
@@ -144,42 +560,43 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id goto err_disable_device; } plat->phy_interface = phy_mode; - - 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.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; } -pci_enable_msi (pdev);memset (&res,0 ,sizeof (res)); res.addr =pcim_iomap_table (pdev)[0 ]; + ld->dev = &pdev->dev; + plat->bsp_priv = ld; + loongson_gmac =readl (res.addr +GMAC_VERSION ) &0xff ; + +switch (loongson_gmac) { +case LOONGSON_DWMAC_CORE_1_00 : + plat->setup = loongson_gnet_setup; +/* Only channel 0 of the 0x10 device supports checksum, +* so turn off checksum to enable multiple channels. +*/ +for (i =1 ; i <CHANNEL_NUM ; i++) { + plat->tx_queues_cfg[i].coe_unsupported =1 ; + }; + ret =loongson_gnet_config_multi_msi (pdev, plat, &res, np); +break ; +default :/*0x35 device and 0x37 device.*/ + ret =loongson_dwmac_config_legacy (pdev, plat, &res, np); +break ; + } + +/* Devices with dev revision 0x00 do not support manually +* setting the speed to 1000. +*/ +if (pdev->revision ==0x00 ) + plat->flags |=STMMAC_FLAG_DISABLE_FORCE_1000 ; + ret =stmmac_dvr_probe (&pdev->dev, plat, &res);if (ret) - goto err_disable_msi; + goto err_disable_device;return ret; -err_disable_msi: -pci_disable_msi (pdev); err_disable_device:pci_disable_device (pdev); err_put_node:
@@ -247,6 +664,7 @@ static SIMPLE_DEV_PM_OPS(loongson_dwmac_pm_ops, loongson_dwmac_suspend,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/dwmac1000_dma.c +1 -0
@@ -296,3 +296,4 @@ const struct stmmac_dma_ops dwmac1000_dma_ops = { .get_hw_feature = dwmac1000_get_hw_feature, .rx_watchdog = dwmac1000_rx_watchdog, }; +EXPORT_SYMBOL_GPL (dwmac1000_dma_ops);
include/linux/stmmac.h +1 -0
@@ -223,6 +223,7 @@ struct dwmac4_addrs {#define STMMAC_FLAG_RX_CLK_RUNS_IN_LPI BIT(10)#define STMMAC_FLAG_EN_TX_LPI_CLOCKGATING BIT(11)#define STMMAC_FLAG_HWTSTAMP_CORRECT_LATENCY BIT(12) +#define STMMAC_FLAG_DISABLE_FORCE_1000 BIT(13)struct plat_stmmacenet_data {int bus_id;
Signature · 1 line
2.31.4
Re: [PATCH net-next v9 6/6] net: stmmac: dwmac-loongson: Add GNET support
Quoted 4 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +4
-0+static void loongson_gnet_fix_speed (void *priv,unsigned int speed, +unsigned int mode) +{ +struct loongson_data *ld = (struct loongson_data *)priv;
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c static void loongson_default_data(struct pci_dev *pdev, · line 313
Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +10
-0+struct net_device *ndev =dev_get_drvdata (ld->dev); +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. +* MAC_CTRL_REG.15 is defined by the GMAC_CONTROL_PS macro. +*/ +if (speed ==SPEED_1000 ) { +if (readl (ptr->ioaddr +MAC_CTRL_REG ) & (1 <<15 ))
It would be good to add a #define using BIT(15) for this PS bit. Also, what does PS actually mean?
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c static void loongson_default_data(struct pci_dev *pdev, · line 347
Quoted 1 line
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +1
-0+ priv->synopsys_id =0x37 ;
hwif.c: if (priv->synopsys_id >= DWMAC_CORE_3_50) {hwif.c: priv->synopsys_id = id;hwif.c: /* Use synopsys_id var because some setups can override this */hwif.c: if (priv->synopsys_id < entry->min_id)stmmac_ethtool.c: if (priv->synopsys_id >= DWMAC_CORE_3_50)stmmac.h: int synopsys_id;stmmac_main.c: if (priv->synopsys_id < DWMAC_CORE_4_10)stmmac_main.c: if (priv->synopsys_id >= DWMAC_CORE_4_00 ||stmmac_main.c: if (priv->synopsys_id < DWMAC_CORE_4_00)stmmac_main.c: if (((priv->synopsys_id >= DWMAC_CORE_3_50) ||stmmac_main.c: if (priv->synopsys_id < DWMAC_CORE_5_20)stmmac_main.c: else if ((priv->plat->enh_desc) || (priv->synopsys_id >= DWMAC_CORE_4_00))stmmac_mdio.c: if (priv->synopsys_id < DWXGMAC_CORE_2_20) {stmmac_mdio.c: if (priv->synopsys_id < DWXGMAC_CORE_2_20 &&stmmac_mdio.c: if (priv->synopsys_id < DWXGMAC_CORE_2_20 &&stmmac_mdio.c: if (priv->synopsys_id < DWXGMAC_CORE_2_20) {
Please add a #define for this 0x37.
Who allocated this value? Synopsys?
/* Synopsys Core versions */
#define DWMAC_CORE_3_40 0x34 #define DWMAC_CORE_3_50 0x35 #define DWMAC_CORE_4_00 0x40 #define DWMAC_CORE_4_10 0x41
0x37 makes it somewhere between a 3.5 and 4.0.
stmmac_ethtool.c: if (priv->synopsys_id >= DWMAC_CORE_3_50)stmmac_main.c: if (((priv->synopsys_id >= DWMAC_CORE_3_50) ||
Does the hardware actually provide what these two bits of code require? Have you reviewed all similar bits of code to confirm they are correct for your hardware?
Andrew
Re: [PATCH net-next v9 6/6] net: stmmac: dwmac-loongson: Add GNET support
Quoted 4 lines · Andrew Lunn
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c static void loongson_default_data(struct pci_dev *pdev, · line 313
Quoted 3 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +3
-0+*/ +if (speed ==SPEED_1000 ) { +if (readl (ptr->ioaddr +MAC_CTRL_REG ) & (1 <<15 ))It would be good to add a #define using BIT(15) for this PS bit. Also,
OK.
Quoted 1 line
what does PS actually mean?
In DW GMAC v3.73a:
It is the bit 15 of MAC Configuration Register
Port Select
This bit selects the Ethernet line speed.
* 0: For 1000 Mbps operations
* 1: For 10 or 100 Mbps operations
In 10 or 100 Mbps operations, this bit, along with FES bit, selects the exact line speed. In the 10/100 Mbps-only (always 1) or 1000 Mbps-only (always 0) configurations, this bit is read-only with the appropriate value. In default 10/100/1000 Mbps configuration, this bit is R_W. The mac_portselect_o or mac_speed_o[1] signal reflects the value of this bit.
Quoted 19 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c static void loongson_default_data(struct pci_dev *pdev, · line 347
Quoted 2 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +1
-0+ priv->synopsys_id =0x37 ;
hwif.c: if (priv->synopsys_id>=DWMAC_CORE_3_50) {hwif.c:priv->synopsys_id= id;hwif.c: /* Usesynopsys_idvar because some setups can override this */hwif.c: if (priv->synopsys_id<entry->min_id)stmmac_ethtool.c: if (priv->synopsys_id>=DWMAC_CORE_3_50)stmmac.h: intsynopsys_id;stmmac_main.c: if (priv->synopsys_id<DWMAC_CORE_4_10)stmmac_main.c: if (priv->synopsys_id>=DWMAC_CORE_4_00||stmmac_main.c: if (priv->synopsys_id<DWMAC_CORE_4_00)stmmac_main.c: if (((priv->synopsys_id>=DWMAC_CORE_3_50) ||stmmac_main.c: if (priv->synopsys_id<DWMAC_CORE_5_20)stmmac_main.c: else if ((priv->plat->enh_desc) || (priv->synopsys_id>=DWMAC_CORE_4_00))stmmac_mdio.c: if (priv->synopsys_id<DWXGMAC_CORE_2_20) {stmmac_mdio.c: if (priv->synopsys_id<DWXGMAC_CORE_2_20&&stmmac_mdio.c: if (priv->synopsys_id<DWXGMAC_CORE_2_20&&stmmac_mdio.c: if (priv->synopsys_id<DWXGMAC_CORE_2_20) {
Quoted 3 lines
Please add a #define for this
0x37.Who allocated this value? Synopsys?
It look like this.
Quoted 8 lines
/* Synopsys Core versions */
#define DWMAC_CORE_3_40 0x34 #define DWMAC_CORE_3_50 0x35 #define DWMAC_CORE_4_00 0x40 #define DWMAC_CORE_4_10 0x41
0x37makes it somewhere between a 3.5 and 4.0.
Yeah,
How about defining it in drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c?
Quoted 7 lines
stmmac_ethtool.c: if (priv->synopsys_id>=DWMAC_CORE_3_50)stmmac_main.c: if (((priv->synopsys_id>=DWMAC_CORE_3_50) ||Does the hardware actually provide what these two bits of code require? Have you reviewed all similar bits of code to confirm they are correct for your hardware?
Yes, because in fact the IP core of our gnet is 0x37, but some chips (2k2000) split
the rx/tx register definition from one into two. In order to distinguish them, 0x10
was created. it is not worth adding a new entry for this.
According to Serge's comment, we made these devices work by overwriting priv->synopsys_id = 0x37 and mac->dma = <LS_dma_ops>.
Thanks,
Yanteng
Re: [PATCH net-next v9 6/6] net: stmmac: dwmac-loongson: Add GNET support
Quoted 7 lines · Yanteng Si
Quoted 4 lines · Andrew Lunn
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c static void loongson_default_data(struct pci_dev *pdev, · line 313
Quoted 3 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +3
-0+*/ +if (speed ==SPEED_1000 ) { +if (readl (ptr->ioaddr +MAC_CTRL_REG ) & (1 <<15 ))It would be good to add a #define using BIT(15) for this PS bit. Also,
OK.
Quoted 8 lines
Quoted 1 line
what does PS actually mean?
In DW GMAC v3.73a:
It is the bit 15 of MAC Configuration Register
Port Select
Since this is a standard bit in a register, please add a #define for it. Something like
#define MAC_CTRL_PORT_SELECT_10_100 BIT(15)
maybe in commom.h? I don't know this driver too well, so it might have a different naming convention.
if (speed == SPEED_1000) {
if (readl(ptr->ioaddr + MAC_CTRL_REG) & MAC_CTRL_PORT_SELECT_10_100)
/* Word around hardware bug, restart autoneg */is more obvious what is going on.
Quoted 18 lines
Quoted 18 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c static void loongson_default_data(struct pci_dev *pdev, · line 347
Quoted 1 line
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +1
-0+ priv->synopsys_id =0x37 ;
hwif.c: if (priv->synopsys_id>=DWMAC_CORE_3_50) {hwif.c:priv->synopsys_id= id;hwif.c: /* Usesynopsys_idvar because some setups can override this */hwif.c: if (priv->synopsys_id<entry->min_id)stmmac_ethtool.c: if (priv->synopsys_id>=DWMAC_CORE_3_50)stmmac.h: intsynopsys_id;stmmac_main.c: if (priv->synopsys_id<DWMAC_CORE_4_10)stmmac_main.c: if (priv->synopsys_id>=DWMAC_CORE_4_00||stmmac_main.c: if (priv->synopsys_id<DWMAC_CORE_4_00)stmmac_main.c: if (((priv->synopsys_id>=DWMAC_CORE_3_50) ||stmmac_main.c: if (priv->synopsys_id<DWMAC_CORE_5_20)stmmac_main.c: else if ((priv->plat->enh_desc) || (priv->synopsys_id>=DWMAC_CORE_4_00))stmmac_mdio.c: if (priv->synopsys_id<DWXGMAC_CORE_2_20) {stmmac_mdio.c: if (priv->synopsys_id<DWXGMAC_CORE_2_20&&stmmac_mdio.c: if (priv->synopsys_id<DWXGMAC_CORE_2_20&&stmmac_mdio.c: if (priv->synopsys_id<DWXGMAC_CORE_2_20) {
Quoted 4 lines
Quoted 3 lines
Please add a #define for this
0x37.Who allocated this value? Synopsys?
It look like this.
That did not answer my question. Did Synopsys allocate this value? If not, what happens when Synopsys does produce a version which makes use of this value?
Quoted 7 lines
Quoted 7 lines
/* Synopsys Core versions */
#define DWMAC_CORE_3_40 0x34 #define DWMAC_CORE_3_50 0x35 #define DWMAC_CORE_4_00 0x40 #define DWMAC_CORE_4_10 0x41
Quoted 6 lines
Quoted 1 line
0x37makes it somewhere between a 3.5 and 4.0.Yeah,
How about defining it in
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c?
No, because of the version comparisons within the code, developers need to know what versions actually exist. So you should include it along side all the other values.
Andrew
Re: [PATCH net-next v9 6/6] net: stmmac: dwmac-loongson: Add GNET support
Quoted 13 lines · Andrew Lunn
Quoted 12 lines · Yanteng Si
Quoted 4 lines · Andrew Lunn
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c static void loongson_default_data(struct pci_dev *pdev, · line 313
Quoted 3 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +3
-0+*/ +if (speed ==SPEED_1000 ) { +if (readl (ptr->ioaddr +MAC_CTRL_REG ) & (1 <<15 ))It would be good to add a #define using BIT(15) for this PS bit. Also,
OK.
Quoted 1 line
what does PS actually mean?
In DW GMAC v3.73a:
It is the bit 15 of MAC Configuration Register
Quoted 7 lines
Quoted 1 line
Port Select
Since this is a standard bit in a register, please add a #define for it. Something like
#define
MAC_CTRL_PORT_SELECT_10_100BIT(15)maybe in
commom.h? I don't know this driver too well, so it might have
OK.
Quoted 7 lines
a different naming convention.
if (speed == SPEED_1000) { if (readl(ptr->ioaddr + MAC_CTRL_REG) & MAC_CTRL_PORT_SELECT_10_100) /* Word around hardware bug, restart autoneg */is more obvious what is going on.
great!
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c static void loongson_default_data(struct pci_dev *pdev, · line 347
Quoted 2 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +1
-0+ priv->synopsys_id =0x37 ;
hwif.c: if (priv->synopsys_id>=DWMAC_CORE_3_50) {stmmac_mdio.c: if (priv->synopsys_id<DWXGMAC_CORE_2_20&&stmmac_mdio.c: if (priv->synopsys_id<DWXGMAC_CORE_2_20) {
Quoted 7 lines
Quoted 4 lines
Quoted 3 lines
Please add a #define for this
0x37.Who allocated this value? Synopsys?
It look like this.
That did not answer my question. Did Synopsys allocate this value? If not, what happens when Synopsys does produce a version which makes use of this value?
Hmm, that will not happen, because the value already exists, and we can find it in the code.
title: Synopsys DesignWare MAC
maintainers:
- Alexandre Torgue <[email protected]>
- Giuseppe Cavallaro <[email protected]>
- Jose Abreu <[email protected]>
# Select every compatible, including the deprecated ones. This way, we
# will be able to report a warning when we have that compatible, since # we will validate the node thanks to the select, but won't report it # as a valid value in the compatible property description select: properties: compatible: contains: enum: - snps,dwmac - snps,dwmac-3.40a - snps,dwmac-3.50a - snps,dwmac-3.610 - snps,dwmac-3.70a - snps,dwmac-3.710 - snps,dwmac-4.00 - snps,dwmac-4.10a - snps,dwmac-4.20a - snps,dwmac-5.10a - snps,dwmac-5.20 - snps,dwxgmac - snps,dwxgmac-2.10
# Deprecated
- st,spear600-gmac
There are a lot of calls like that. Let's grep -rn dwmac-3.70a:
drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c:57: { .compatible = "snps,dwmac-3.70a"}, drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c:524: of_device_is_compatible(np, "snps,dwmac-3.70a") ||
arch/arm64/boot/dts/amlogic/meson-axg.dtsi:279: "snps,dwmac-3.70a", arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi:171: "snps,dwmac-3.70a", arch/arm64/boot/dts/amlogic/meson-gx.dtsi:585: "snps,dwmac-3.70a", arch/arm64/boot/dts/amlogic/meson-s4.dtsi:489: "snps,dwmac-3.70a", arch/loongarch/boot/dts/.loongson-2k0500-ref.dtb.dts.tmp:114: compatible = "snps,dwmac-3.70a";
......
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
/* Synopsys Core versions */
#define DWMAC_CORE_3_40 0x34 #define DWMAC_CORE_3_50 0x35 #define DWMAC_CORE_4_00 0x40 #define DWMAC_CORE_4_10 0x41
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
0x37makes it somewhere between a 3.5 and 4.0.Yeah,
How about defining it in
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c?No, because of the version comparisons within the code, developers need to know what versions actually exist. So you should include it along side all the other values.
OK, Let's:
@@ -29,6 +29,7 @@
/* 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
Thanks,
Yanteng