stmmac: Add Loongson platform support
Subsystems (5)
v17 cover stmmac: Add Loongson platform support
v17:
* As Serge's comments:
Add return 0 for _dt_config().
Get back the conditional MSI-clear method execution.
v16:
* As Serge's comments:
Move the of_node_put(plat->mdio_node) call to the DT-config/clear methods. Drop 'else if'.
* Modify the commit message of 7/14. (LS2K CPU -> LS2K SOC)
V15:
* Drop return that will not be executed.
* Move pdev from patch 12 to patch 13 to pass W=1 builds.
RFC v15:
* As Serge's comments:
Extend the commit message.(patch 7 and patch 11) Add fixes tag for patch 8.
Add loongson_dwmac_dt_clear() patch.
Modify loongson_dwmac_msi_config().
...
* Pick Huacai's Acked-by tag.
* Pick Serge's Reviewed-by tag.
* I have already contacted the author(ZhangQing) of the module, so I copied her valid email: [email protected].
Note:
I replied to the comments on v14 last Sunday, but all of Loongson's email servers failed to deliver. The network administrator told me today that he has fixed the problem and re-delivered all the failed emails, but I did not see them on the mailing list. I hope they will not suddenly appear in everyone's mailbox one day. I apologize for this. (The email content mainly agrees with Serge's suggestion.)
v14:
Because Loongson GMAC can be also found with the 8-channels AV feature
enabled, we'll need to reconsider the patches logic and thus the
commit logs too. As Serge's comments and Russell's comments:
[PATCH net-next v14 01/15] net: stmmac: Move the atds flag to the stmmac_dma_cfg structure [PATCH net-next v14 02/15] net: stmmac: Add multi-channel support
[PATCH net-next v14 03/15] net: stmmac: Export dwmac1000_dma_ops
[PATCH net-next v14 04/15] net: stmmac: dwmac-loongson: Drop duplicated hash-based filter size init [PATCH net-next v14 05/15] net: stmmac: dwmac-loongson: Drop pci_enable/disable_msi calls [PATCH net-next v14 06/15] net: stmmac: dwmac-loongson: Use PCI_DEVICE_DATA() macro for device identification [PATCH net-next v14 07/15] net: stmmac: dwmac-loongson: Detach GMAC-specific platform data init +-> Init the plat_stmmacenet_data::{tx_queues_to_use,rx_queues_to_use}
in the loongson_gmac_data() method.
[PATCH net-next v14 08/15] net: stmmac: dwmac-loongson: Init ref and PTP clocks rate
[PATCH net-next v14 09/15] net: stmmac: dwmac-loongson: Add phy_interface for Loongson GMAC [PATCH net-next v14 10/15] net: stmmac: dwmac-loongson: Introduce PCI device info data
+-> Make sure the setup() method is called after the pci_enable_device()
invocation.
[PATCH net-next v14 11/15] net: stmmac: dwmac-loongson: Add DT-less GMAC PCI-device support +-> Introduce the loongson_dwmac_dt_config() method here instead of
doing that in a separate patch.
+-> Add loongson_dwmac_acpi_config() which would just get the IRQ from
the pdev->irq field and make sure it is valid.
[PATCH net-next v14 12/15] net: stmmac: Fixed failure to set network speed to 1000. +-> Drop the patch as Russell's comments, At the same time, he provided another
better repair suggestion, and I decided to send it separately after the patch set was merged. See:
<https://lore.kernel.org/netdev/[email protected]/>
[PATCH net-next v14 13/15] net: stmmac: dwmac-loongson: Add Loongson Multi-channels GMAC support +-> This is former "net: stmmac: dwmac-loongson: Add Loongson GNET
support" patch, but which adds the support of the Loongson GMAC with the 8-channels AV-feature available.
+-> loongson_dwmac_intx_config() shall be dropped due to the
loongson_dwmac_acpi_config() method added in the PATCH 11/15.
+-> Make sure loongson_data::loongson_id is initialized before the
stmmac_pci_info::setup() is called.
+-> Move the rx_queues_to_use/tx_queues_to_use and coe_unsupported
fields initialization to the loongson_gmac_data() method.
+-> As before, call the loongson_dwmac_msi_config() method if the multi-channels
Loongson MAC has been detected.
+-> Move everything GNET-specific to the next patch.
[PATCH net-next v14 14/15] net: stmmac: dwmac-loongson: Add Loongson GNET support +-> Everything Loonsgson GNET-specific is supposed to be added in the
framework of this patch:
+ PCI_DEVICE_ID_LOONGSON_GNET macro
+ loongson_gnet_fix_speed() method
+ loongson_gnet_data() method
+ loongson_gnet_pci_info data
+ The GNET-specific part of the loongson_dwmac_setup() method.
+ ...
[PATCH net-next v14 15/15] net: stmmac: dwmac-loongson: Add loongson module author
Other's:
Pick Serge's Reviewed-by tag.
v13:
* Sorry, we have clarified some things in the past 10 days. I did not give you a clear reply to the following questions in v12, so I need to reply again:
1. The current LS2K2000 also have a GMAC(and two GNET) that supports 8 channels, so we have to reconsider the initialization of tx/rx_queues_to_use into probe();
2. In v12, we disagreed on the loongson_dwmac_msi_config method, but I changed
it based on Serge's comments(If I understand correctly):
if (dev_of_node(&pdev->dev)) {
ret = loongson_dwmac_dt_config(pdev, plat, &res);
}
if (ld->loongson_id == DWMAC_CORE_LS2K2000) {
ret = loongson_dwmac_msi_config(pdev, plat, &res);
} else {
ret = loongson_dwmac_intx_config(pdev, plat, &res);
} 3. Our priv->dma_cap.pcs is false, so let's use PHY_INTERFACE_MODE_NA;
4. Our GMAC does not support Delay, so let's use PHY_INTERFACE_MODE_RGMII_ID, the current dts is wrong, a fix patch will be sent to the LoongArch list later.
Others:
* Re-split a part of the patch (it seems we do this with every version);
* Copied Serge's comments into the commit message of patch;
* Fixed the stmmac_dma_operation_mode() method;
* Changed some code comments.
v12:
* The biggest change is the re-splitting of patches.
* Add a "gmac_version" in loongson_data, then we only read it once in the _probe().
* Drop Serge's patch.
* Rebase to the latest code state.
* Fixed the gnet commit message.
v11:
* Break loongson_phylink_get_caps(), fix bad logic.
* Remove a unnecessary ";".
* Remove some unnecessary "{}".
* add a blank.
* Move the code of fix _force_1000 to patch 6/6.
The main changes occur in these two functions:loongson_dwmac_probe();loongson_dwmac_setup();
v10:
As Andrew's comment:
* Add a #define for the 0x37.
* Add a #define for Port Select.
others:
* Pick Serge's patch, This patch resulted from the process of reviewing our patch set.
* Based on Serge's patch, modify our loongson_phylink_get_caps().
* Drop patch 3/6, we need mac_interface.
* Adjusted the code layout of gnet patch.
* Corrected several errata in commit message.
* Move DISABLE_FORCE flag to loongson_gnet_data().
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 0x35/0x37 ls2k1000 gmac 7a03 0x35/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 (14):
net: stmmac: Move the atds flag to the stmmac_dma_cfg structure
net: stmmac: Add multi-channel support
net: stmmac: Export dwmac1000_dma_ops
net: stmmac: dwmac-loongson: Drop duplicated hash-based filter size
init
net: stmmac: dwmac-loongson: Drop pci_enable/disable_msi calls
net: stmmac: dwmac-loongson: Use PCI_DEVICE_DATA() macro for device
identification
net: stmmac: dwmac-loongson: Detach GMAC-specific platform data init
net: stmmac: dwmac-loongson: Init ref and PTP clocks rate
net: stmmac: dwmac-loongson: Add phy_interface for Loongson GMAC
net: stmmac: dwmac-loongson: Introduce PCI device info data
net: stmmac: dwmac-loongson: Add DT-less GMAC PCI-device support
net: stmmac: dwmac-loongson: Add Loongson Multi-channels GMAC support
net: stmmac: dwmac-loongson: Add Loongson GNET support
net: stmmac: dwmac-loongson: Add loongson module author
drivers/net/ethernet/stmicro/stmmac/common.h | 1 + .../ethernet/stmicro/stmmac/dwmac-loongson.c | 597 +++++++++++++++--- .../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 | 27 +- .../net/ethernet/stmicro/stmmac/dwmac_lib.c | 30 +- .../ethernet/stmicro/stmmac/dwxgmac2_dma.c | 2 +- drivers/net/ethernet/stmicro/stmmac/hwif.h | 5 +- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 19 +- include/linux/stmmac.h | 1 + 12 files changed, 605 insertions(+), 120 deletions(-)
Signature · 1 line
2.31.4
PATCH v17 1/14 net: stmmac: Move the atds flag to the stmmac_dma_cfg structure
ATDS (Alternate Descriptor Size) is a part of the DMA Bus Mode configs (together with PBL, ALL, EME, etc) of the DW GMAC controllers. Seeing it's not changed at runtime but is activated as long as the IP-core has it supported (at least due to the Type 2 Full Checksum Offload Engine feature), move the respective parameter from the stmmac_dma_ops::init() callback argument to the stmmac_dma_cfg structure, which already have the rest of the DMA-related configs defined.
Besides the being added in the next commit DW GMAC multi-channels support will require to add the stmmac_dma_ops::init_chan() callback and have the ATDS flag set/cleared for each channel in there. Having the atds-flag in the stmmac_dma_cfg structure will make the parameter accessible from stmmac_dma_ops::init_chan() callback too.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 4 ++-- drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 2 +- drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 2 +- drivers/net/ethernet/stmicro/stmmac/hwif.h | 3 +-- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 ++--- include/linux/stmmac.h | 1 + 8 files changed, 10 insertions(+), 11 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +1 -1
@@ -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 );
drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c +2 -2
@@ -71,7 +71,7 @@ static void dwmac1000_dma_axi(void __iomem *ioaddr, struct stmmac_axi *axi) }static void dwmac1000_dma_init (void __iomem *ioaddr, -struct stmmac_dma_cfg *dma_cfg,int atds) +struct stmmac_dma_cfg *dma_cfg) {u32 value =readl (ioaddr +DMA_BUS_MODE );int txpbl = dma_cfg->txpbl ?: dma_cfg->pbl;
@@ -98,7 +98,7 @@ 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)
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/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 +1 -2
@@ -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,
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +2 -3
@@ -3003,7 +3003,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) {
@@ -3012,7 +3011,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) {
@@ -3021,7 +3020,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);
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
PATCH v17 2/14 net: stmmac: Add multi-channel support
In reply to Yanteng SiDW GMAC v3.73 can be equipped with the Audio Video (AV) feature which enables transmission of time-sensitive traffic over bridged local area networks (DWC Ethernet QoS Product). In that case there can be up to two additional DMA-channels available with no Tx COE support (unless there is vendor-specific IP-core alterations). Each channel is implemented as a separate Control and Status register (CSR) for managing the transmit and receive functions, descriptor handling, and interrupt handling.
Add the multi-channels DW GMAC controllers support just by making sure the already implemented DMA-configs are performed on the per-channel basis.
Note the only currently known instance of the multi-channel DW GMAC IP-core is the LS2K2000 GNET controller, which has been released with the vendor-specific feature extension of having eight DMA-channels. The device support will be added in one of the following up commits.
--- .../net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2 +- .../ethernet/stmicro/stmmac/dwmac1000_dma.c | 32 ++++++++++--------- .../net/ethernet/stmicro/stmmac/dwmac_dma.h | 27 +++++++++++++++- .../net/ethernet/stmicro/stmmac/dwmac_lib.c | 30 ++++++++--------- drivers/net/ethernet/stmicro/stmmac/hwif.h | 2 +- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 14 ++++---- 6 files changed, 68 insertions(+), 39 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +1 -1
@@ -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 +17 -15
@@ -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) +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.
@@ -104,10 +106,10 @@ static void dwmac1000_dma_init(void __iomem *ioaddr,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/dwmac_dma.h +26 -1
@@ -22,6 +22,31 @@#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_BUS_MODE (chan) dma_chan_base_addr(DMA_BUS_MODE, chan) +#define DMA_CHAN_XMT_POLL_DEMAND (chan) \ + dma_chan_base_addr(DMA_XMT_POLL_DEMAND, chan) +#define DMA_CHAN_RCV_POLL_DEMAND (chan) \ + dma_chan_base_addr(DMA_RCV_POLL_DEMAND, 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_STATUS (chan) dma_chan_base_addr(DMA_STATUS, chan) +#define DMA_CHAN_CONTROL (chan) dma_chan_base_addr(DMA_CONTROL, chan) +#define DMA_CHAN_INTR_ENA (chan) dma_chan_base_addr(DMA_INTR_ENA, chan) +#define DMA_CHAN_MISSED_FRAME_CTR (chan) \ + dma_chan_base_addr(DMA_MISSED_FRAME_CTR, 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 +177,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,
drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c +15 -15
@@ -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 */
drivers/net/ethernet/stmicro/stmmac/hwif.h +1 -1
@@ -197,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_main.c +8 -6
@@ -2367,9 +2367,11 @@ static void stmmac_dma_operation_mode(struct stmmac_priv *priv)if (txfifosz ==0 ) txfifosz = priv->dma_cap.tx_fifo_size; -/* Adjust for real per queue fifo size */ - rxfifosz /= rx_channels_count; - txfifosz /= tx_channels_count; +/* Split up the shared Tx/Rx FIFO memory on DW QoS Eth and DW XGMAC */ +if (priv->plat->has_gmac4 || priv->plat->has_xgmac) { + rxfifosz /= rx_channels_count; + txfifosz /= tx_channels_count; + }if (priv->plat->force_thresh_dma_mode) { txmode = tc;
@@ -2553,7 +2555,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);
@@ -4753,7 +4755,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);
@@ -4980,7 +4982,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;
Signature · 1 line
2.31.4
PATCH v17 3/14 net: stmmac: Export dwmac1000_dma_ops
In reply to Yanteng SiExport the DW GMAC DMA-ops descriptor so one could be available in the low-level platform drivers. It will be utilized to override some callbacks in order to handle the LS2K2000 GNET device specifics. The GNET controller support is being added in one of the following up commits.
--- drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 1 + 1 file changed, 1 insertion(+)
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);
Signature · 1 line
2.31.4
PATCH v17 4/14 net: stmmac: dwmac-loongson: Drop duplicated hash-based filter size init
In reply to Yanteng SiThe plat_stmmacenet_data::multicast_filter_bins field is twice initialized in the loongson_default_data() method. Drop the redundant initialization, but for the readability sake keep the filters init statements defined in the same place of the method.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +1 -2
@@ -16,7 +16,7 @@ static int loongson_default_data(struct plat_stmmacenet_data *plat) 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 ;
@@ -41,7 +41,6 @@ static int loongson_default_data(struct plat_stmmacenet_data *plat) plat->dma_cfg->pbl =32 ; plat->dma_cfg->pblx8 = true; - plat->multicast_filter_bins =256 ;return 0 ; }
Signature · 1 line
2.31.4
PATCH v17 5/14 net: stmmac: dwmac-loongson: Drop pci_enable/disable_msi calls
In reply to Yanteng SiThe Loongson GMAC driver currently doesn't utilize the MSI IRQs, but retrieves the IRQs specified in the device DT-node. Let's drop the direct pci_enable_msi()/pci_disable_msi() calls then as redundant
--- drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +3 -7
@@ -114,7 +114,6 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_idpci_set_master (pdev);loongson_default_data (plat); -pci_enable_msi (pdev);memset (&res,0 ,sizeof (res)); res.addr =pcim_iomap_table (pdev)[0 ];
@@ -122,7 +121,7 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_idif (res.irq <0 ) {dev_err (&pdev->dev,"IRQ macirq not found\n" ); ret = -ENODEV ; - goto err_disable_msi; + goto err_disable_device; } res.wol_irq =of_irq_get_byname (np,"eth_wake_irq" );
@@ -135,17 +134,15 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_idif (res.lpi_irq <0 ) {dev_err (&pdev->dev,"IRQ eth_lpi not found\n" ); ret = -ENODEV ; - goto err_disable_msi; + goto err_disable_device; } 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:
@@ -169,7 +166,6 @@ static void loongson_dwmac_remove(struct pci_dev *pdev)break ; } -pci_disable_msi (pdev);pci_disable_device (pdev); }
Signature · 1 line
2.31.4
PATCH v17 6/14 net: stmmac: dwmac-loongson: Use PCI_DEVICE_DATA() macro for device identification
In reply to Yanteng SiFor the readability sake convert the hard-coded Loongson GMAC PCI ID to the respective macro and use the PCI_DEVICE_DATA() macro-function to create the pci_device_id array entry. The later change will be specifically useful in order to assign the device-specific data for the currently supported device and for about to be added Loongson GNET controller.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +3 -1
@@ -9,6 +9,8 @@#include <linux/of_irq.h> #include "stmmac.h" +#define PCI_DEVICE_ID_LOONGSON_GMAC 0x7a03 +static int loongson_default_data (struct plat_stmmacenet_data *plat) { plat->clk_csr =2 ;/* clk_csr_i = 20-35MHz & MDC = clk_csr_i/16 */
@@ -208,7 +210,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 ,NULL ) }, {} };MODULE_DEVICE_TABLE (pci, loongson_dwmac_id_table);
Signature · 1 line
2.31.4
PATCH v17 7/14 net: stmmac: dwmac-loongson: Detach GMAC-specific platform data init
In reply to Yanteng SiLoongson delivers two types of the network devices: Loongson GMAC and Loongson GNET in the framework of four SOC/Chipsets revisions:
Chip Network PCI Dev ID Synopys Version DMA-channel
LS2K1000 SOC GMAC 0x7a03 v3.50a/v3.73a 1 LS7A1000 Chipset GMAC 0x7a03 v3.50a/v3.73a 1 LS2K2000 SOC GMAC 0x7a03 v3.73a 8 LS2K2000 SOC GNET 0x7a13 v3.73a 8 LS7A2000 Chipset GNET 0x7a13 v3.73a 1
The driver currently supports the chips with the Loongson GMAC network device synthesized with a single DMA-channel available. As a preparation before adding the Loongson GNET support detach the Loongson GMAC-specific platform data initializations to the loongson_gmac_data() method and preserve the common settings in the loongson_default_data().
While at it drop the return value statement from the loongson_default_data() method as redundant.
Note there is no intermediate vendor-specific PCS in between the MAC and PHY on Loongson GMAC and GNET. So the plat->mac_interface field can be freely initialized with the PHY_INTERFACE_MODE_NA value.
--- .../ethernet/stmicro/stmmac/dwmac-loongson.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +12 -7
@@ -11,7 +11,7 @@#define PCI_DEVICE_ID_LOONGSON_GMAC 0x7a03 -static int loongson_default_data (struct plat_stmmacenet_data *plat) +static void loongson_default_data (struct plat_stmmacenet_data *plat) { plat->clk_csr =2 ;/* clk_csr_i = 20-35MHz & MDC = clk_csr_i/16 */ plat->has_gmac =1 ;
@@ -20,16 +20,14 @@ static int loongson_default_data(struct plat_stmmacenet_data *plat)/* Set default value for multicast hash bins */ plat->multicast_filter_bins =256 ; + plat->mac_interface =PHY_INTERFACE_MODE_NA ; +/* Set default value for unicast filter entries */ plat->unicast_filter_entries =1 ;/* 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;
@@ -42,6 +40,14 @@ static int loongson_default_data(struct plat_stmmacenet_data *plat) plat->dma_cfg->pbl =32 ; plat->dma_cfg->pblx8 = true; +} + +static int loongson_gmac_data (struct plat_stmmacenet_data *plat) +{ +loongson_default_data (plat); + + plat->tx_queues_to_use =1 ; + plat->rx_queues_to_use =1 ;return 0 ; }
@@ -111,11 +117,10 @@ 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); -loongson_default_data (plat); +loongson_gmac_data (plat);memset (&res,0 ,sizeof (res)); res.addr =pcim_iomap_table (pdev)[0 ];
Signature · 1 line
2.31.4
PATCH v17 8/14 net: stmmac: dwmac-loongson: Init ref and PTP clocks rate
In reply to Yanteng SiReference and PTP clocks rate of the Loongson GMAC devices is 125MHz. (So is in the GNET devices which support is about to be added.) Set the respective plat_stmmacenet_data field up in accordance with that so to have the coalesce command and timestamping work correctly.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +3 -0
@@ -35,6 +35,9 @@ static void loongson_default_data(struct plat_stmmacenet_data *plat)/* Disable RX queues routing by default */ plat->rx_queues_cfg[0 ].pkt_route =0x0 ; + plat->clk_ref_rate =125000000 ; + plat->clk_ptp_rate =125000000 ; +/* Default to phy auto-detection */ plat->phy_addr =-1 ;
Signature · 1 line
2.31.4
PATCH v17 9/14 net: stmmac: dwmac-loongson: Add phy_interface for Loongson GMAC
In reply to Yanteng SiPHY-interface of the Loongson GMAC device is RGMII with no internal delays added to the data lines signal. So to comply with that let's pre-initialize the platform-data field with the respective enum constant.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +2 -0
@@ -52,6 +52,8 @@ static int loongson_gmac_data(struct plat_stmmacenet_data *plat) plat->tx_queues_to_use =1 ; plat->rx_queues_to_use =1 ; + plat->phy_interface =PHY_INTERFACE_MODE_RGMII_ID ; +return 0 ; }
Signature · 1 line
2.31.4
PATCH v17 10/14 net: stmmac: dwmac-loongson: Introduce PCI device info data
In reply to Yanteng SiThe Loongson GNET device support is about to be added in one of the next commits. As another preparation for that introduce the PCI device info data with a setup() callback performing the device-specific platform data initializations. Currently it is utilized for the already supported Loongson GMAC device only.
--- .../ethernet/stmicro/stmmac/dwmac-loongson.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +15 -2
@@ -11,6 +11,10 @@#define PCI_DEVICE_ID_LOONGSON_GMAC 0x7a03 +struct stmmac_pci_info { +int (*setup)(struct plat_stmmacenet_data *plat); +}; +static void loongson_default_data (struct plat_stmmacenet_data *plat) { plat->clk_csr =2 ;/* clk_csr_i = 20-35MHz & MDC = clk_csr_i/16 */
@@ -57,9 +61,14 @@ static int loongson_gmac_data(struct plat_stmmacenet_data *plat)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; +struct stmmac_pci_info *info;struct stmmac_resources res;struct device_node *np;int ret, i, phy_mode;
@@ -125,10 +134,14 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_idpci_set_master (pdev); -loongson_gmac_data (plat);memset (&res,0 ,sizeof (res)); res.addr =pcim_iomap_table (pdev)[0 ]; + info = (struct stmmac_pci_info *)id->driver_data; + ret = info->setup (plat); +if (ret) + goto err_disable_device; + res.irq =of_irq_get_byname (np,"macirq" );if (res.irq <0 ) {dev_err (&pdev->dev,"IRQ macirq not found\n" );
@@ -220,7 +233,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_DEVICE_DATA (LOONGSON ,GMAC ,NULL ) }, + {PCI_DEVICE_DATA (LOONGSON ,GMAC , &loongson_gmac_pci_info) }, {} };MODULE_DEVICE_TABLE (pci, loongson_dwmac_id_table);
Signature · 1 line
2.31.4
PATCH v17 11/14 net: stmmac: dwmac-loongson: Add DT-less GMAC PCI-device support
In reply to Yanteng SiThe Loongson GMAC driver currently supports the network controllers installed on the LS2K1000 SoC and LS7A1000 chipset, for which the GMAC devices are required to be defined in the platform device tree source. But Loongson machines may have UEFI (implies ACPI) or PMON/UBOOT (implies FDT) as the system bootloaders. In order to have both system configurations support let's extend the driver functionality with the case of having the Loongson GMAC probed on the PCI bus with no device tree node defined for it. That requires to make the device DT-node optional, to rely on the IRQ line detected by the PCI core and to have the MDIO bus ID calculated using the PCIe Domain+BDF numbers.
In order to have the device probe() and remove() methods less complicated let's move the DT- and ACPI-specific code to the respective sub-functions.
--- .../ethernet/stmicro/stmmac/dwmac-loongson.c | 165 +++++++++++------- 1 file changed, 102 insertions(+), 63 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +102 -63
@@ -12,11 +12,15 @@#define PCI_DEVICE_ID_LOONGSON_GMAC 0x7a03struct stmmac_pci_info { -int (*setup)(struct plat_stmmacenet_data *plat); +int (*setup)(struct pci_dev *pdev,struct plat_stmmacenet_data *plat); }; -static void loongson_default_data (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 overwritten later */ + plat->bus_id =pci_dev_id (pdev); + plat->clk_csr =2 ;/* clk_csr_i = 20-35MHz & MDC = clk_csr_i/16 */ plat->has_gmac =1 ; plat->force_sf_dma_mode =1 ;
@@ -49,9 +53,10 @@ static void loongson_default_data(struct plat_stmmacenet_data *plat) plat->dma_cfg->pblx8 = true; } -static int loongson_gmac_data (struct plat_stmmacenet_data *plat) +static int loongson_gmac_data (struct pci_dev *pdev, +struct plat_stmmacenet_data *plat) { -loongson_default_data (plat); +loongson_default_data (pdev, plat); plat->tx_queues_to_use =1 ; plat->rx_queues_to_use =1 ;
@@ -65,20 +70,85 @@ static struct stmmac_pci_info loongson_gmac_pci_info = { .setup = loongson_gmac_data, }; +static int loongson_dwmac_dt_config (struct pci_dev *pdev, +struct plat_stmmacenet_data *plat, +struct stmmac_resources *res) +{ +struct device_node *np =dev_of_node (&pdev->dev); +int ret; + + 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; + } + + ret =of_alias_get_id (np,"ethernet" ); +if (ret >=0 ) + plat->bus_id = ret; + + 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_put_node; + } + + 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_put_node; + } + + ret =device_get_phy_mode (&pdev->dev); +if (ret <0 ) { +dev_err (&pdev->dev,"phy_mode not found\n" ); + ret = -ENODEV ; + goto err_put_node; + } + + plat->phy_interface = ret; + +return 0 ; + +err_put_node: +of_node_put (plat->mdio_node); + +return ret; +} + +static void loongson_dwmac_dt_clear (struct pci_dev *pdev, +struct plat_stmmacenet_data *plat) +{ +of_node_put (plat->mdio_node); +} + +static int loongson_dwmac_acpi_config (struct pci_dev *pdev, +struct plat_stmmacenet_data *plat, +struct stmmac_resources *res) +{ +if (!pdev->irq) +return -EINVAL ; + + res->irq = pdev->irq; + +return 0 ; +} +static int loongson_dwmac_probe (struct pci_dev *pdev,const struct pci_device_id *id) {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 ; - } +int ret, i; plat =devm_kzalloc (&pdev->dev,sizeof (*plat),GFP_KERNEL );if (!plat)
@@ -90,25 +160,19 @@ 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 ; - goto err_put_node; - } +if (!plat->dma_cfg) +return -ENOMEM ;/* Enable pci device */ ret =pci_enable_device (pdev);if (ret) {dev_err (&pdev->dev,"%s: ERROR: failed to enable device\n" , __func__); - goto err_put_node; +return ret; } +pci_set_master (pdev); +/* Get the base address of device */ for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {if (pci_resource_len (pdev, i) ==0 )
@@ -119,59 +183,32 @@ 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" ); - ret = phy_mode; - goto err_disable_device; - } - - plat->phy_interface = phy_mode; - -pci_set_master (pdev); -memset (&res,0 ,sizeof (res)); res.addr =pcim_iomap_table (pdev)[0 ]; info = (struct stmmac_pci_info *)id->driver_data; - ret = info->setup (plat); + ret = info->setup (pdev, plat);if (ret) goto err_disable_device; - 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_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; - } - - 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 ; +if (dev_of_node (&pdev->dev)) + ret =loongson_dwmac_dt_config (pdev, plat, &res); +else + ret =loongson_dwmac_acpi_config (pdev, plat, &res); +if (ret) goto err_disable_device; - } ret =stmmac_dvr_probe (&pdev->dev, plat, &res);if (ret) - goto err_disable_device; + goto err_plat_clear; -return ret; +return 0 ; +err_plat_clear: +if (dev_of_node (&pdev->dev)) +loongson_dwmac_dt_clear (pdev, plat); err_disable_device:pci_disable_device (pdev); -err_put_node: -of_node_put (plat->mdio_node);return ret; }
@@ -181,9 +218,11 @@ static void loongson_dwmac_remove(struct pci_dev *pdev)struct stmmac_priv *priv =netdev_priv (ndev);int i; -of_node_put (priv->plat->mdio_node);stmmac_dvr_remove (&pdev->dev); +if (dev_of_node (&pdev->dev)) +loongson_dwmac_dt_clear (pdev, priv->plat); +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {if (pci_resource_len (pdev, i) ==0 )continue ;
Signature · 1 line
2.31.4
Re: [PATCH net-next v17 11/14] net: stmmac: dwmac-loongson: Add DT-less GMAC PCI-device support
Quoted 11 lines · Yanteng Si
The Loongson GMAC driver currently supports the network controllers installed on the LS2K1000 SoC and LS7A1000 chipset, for which the GMAC devices are required to be defined in the platform device tree source. But Loongson machines may have UEFI (implies ACPI) or PMON/UBOOT (implies FDT) as the system bootloaders. In order to have both system configurations support let's extend the driver functionality with the case of having the Loongson GMAC probed on the PCI bus with no device tree node defined for it. That requires to make the device DT-node optional, to rely on the IRQ line detected by the PCI core and to have the MDIO bus ID calculated using the PCIe Domain+BDF numbers.
Quoted 8 lines
In order to have the device
probe()andremove()methods less complicated let's move the DT- and ACPI-specific code to the respective sub-functions.Signed-off-by Feiyang Chen <[email protected]>Signed-off-by Yinggang Gu <[email protected]>Acked-by Huacai Chen <[email protected]>Signed-off-by Yanteng Si <[email protected]>
No more comments from my side. Thanks.
-Serge(y)
Quoted 252 lines
--- .../ethernet/stmicro/stmmac/dwmac-loongson.c | 165 +++++++++++------- 1 file changed, 102 insertions(+), 63 deletions(-)drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +102
-63@@ -12,11 +12,15 @@#define PCI_DEVICE_ID_LOONGSON_GMAC 0x7a03struct stmmac_pci_info { -int (*setup)(struct plat_stmmacenet_data *plat); +int (*setup)(struct pci_dev *pdev,struct plat_stmmacenet_data *plat); }; -static void loongson_default_data (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 overwritten later */ + plat->bus_id =pci_dev_id (pdev); + plat->clk_csr =2 ;/* clk_csr_i = 20-35MHz & MDC = clk_csr_i/16 */ plat->has_gmac =1 ; plat->force_sf_dma_mode =1 ;@@ -49,9 +53,10 @@ static void loongson_default_data(struct plat_stmmacenet_data *plat) plat->dma_cfg->pblx8 = true; } -static int loongson_gmac_data (struct plat_stmmacenet_data *plat) +static int loongson_gmac_data (struct pci_dev *pdev, +struct plat_stmmacenet_data *plat) { -loongson_default_data (plat); +loongson_default_data (pdev, plat); plat->tx_queues_to_use =1 ; plat->rx_queues_to_use =1 ;@@ -65,20 +70,85 @@ static struct stmmac_pci_info loongson_gmac_pci_info = { .setup = loongson_gmac_data, }; +static int loongson_dwmac_dt_config (struct pci_dev *pdev, +struct plat_stmmacenet_data *plat, +struct stmmac_resources *res) +{ +struct device_node *np =dev_of_node (&pdev->dev); +int ret; + + 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; + } + + ret =of_alias_get_id (np,"ethernet" ); +if (ret >=0 ) + plat->bus_id = ret; + + 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_put_node; + } + + 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_put_node; + } + + ret =device_get_phy_mode (&pdev->dev); +if (ret <0 ) { +dev_err (&pdev->dev,"phy_mode not found\n" ); + ret = -ENODEV ; + goto err_put_node; + } + + plat->phy_interface = ret; + +return 0 ; + +err_put_node: +of_node_put (plat->mdio_node); + +return ret; +} + +static void loongson_dwmac_dt_clear (struct pci_dev *pdev, +struct plat_stmmacenet_data *plat) +{ +of_node_put (plat->mdio_node); +} + +static int loongson_dwmac_acpi_config (struct pci_dev *pdev, +struct plat_stmmacenet_data *plat, +struct stmmac_resources *res) +{ +if (!pdev->irq) +return -EINVAL ; + + res->irq = pdev->irq; + +return 0 ; +} +static int loongson_dwmac_probe (struct pci_dev *pdev,const struct pci_device_id *id) {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 ; - } +int ret, i; plat =devm_kzalloc (&pdev->dev,sizeof (*plat),GFP_KERNEL );if (!plat)@@ -90,25 +160,19 @@ 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 ; - goto err_put_node; - } +if (!plat->dma_cfg) +return -ENOMEM ;/* Enable pci device */ ret =pci_enable_device (pdev);if (ret) {dev_err (&pdev->dev,"%s: ERROR: failed to enable device\n" , __func__); - goto err_put_node; +return ret; } +pci_set_master (pdev); +/* Get the base address of device */ for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {if (pci_resource_len (pdev, i) ==0 )@@ -119,59 +183,32 @@ 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" ); - ret = phy_mode; - goto err_disable_device; - } - - plat->phy_interface = phy_mode; - -pci_set_master (pdev); -memset (&res,0 ,sizeof (res)); res.addr =pcim_iomap_table (pdev)[0 ]; info = (struct stmmac_pci_info *)id->driver_data; - ret = info->setup (plat); + ret = info->setup (pdev, plat);if (ret) goto err_disable_device; - 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_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; - } - - 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 ; +if (dev_of_node (&pdev->dev)) + ret =loongson_dwmac_dt_config (pdev, plat, &res); +else + ret =loongson_dwmac_acpi_config (pdev, plat, &res); +if (ret) goto err_disable_device; - } ret =stmmac_dvr_probe (&pdev->dev, plat, &res);if (ret) - goto err_disable_device; + goto err_plat_clear; -return ret; +return 0 ; +err_plat_clear: +if (dev_of_node (&pdev->dev)) +loongson_dwmac_dt_clear (pdev, plat); err_disable_device:pci_disable_device (pdev); -err_put_node: -of_node_put (plat->mdio_node);return ret; }@@ -181,9 +218,11 @@ static void loongson_dwmac_remove(struct pci_dev *pdev)struct stmmac_priv *priv =netdev_priv (ndev);int i; -of_node_put (priv->plat->mdio_node);stmmac_dvr_remove (&pdev->dev); +if (dev_of_node (&pdev->dev)) +loongson_dwmac_dt_clear (pdev, priv->plat); +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {if (pci_resource_len (pdev, i) ==0 )continue ;Signature · 1 line
2.31.4
PATCH v17 12/14 net: stmmac: dwmac-loongson: Add Loongson Multi-channels GMAC support
In reply to Yanteng SiThe Loongson DWMAC driver currently supports the Loongson GMAC devices (based on the DW GMAC v3.50a/v3.73a IP-core) installed to the LS2K1000 SoC and LS7A1000 chipset. But recently a new generation LS2K2000 SoC was released with the new version of the Loongson GMAC synthesized in. The new controller is based on the DW GMAC v3.73a IP-core with the AV-feature enabled, which implies the multi DMA-channels support. The multi DMA-channels feature has the next vendor-specific peculiarities:
1. Split up Tx and Rx DMA IRQ status/mask bits:
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;
2. Custom Synopsys ID hardwired into the GMAC_VERSION.SNPSVER register field. It's 0x10 while it should have been 0x37 in accordance with the actual DW GMAC IP-core version.
3. There are eight DMA-channels available meanwhile the Synopsys DW GMAC IP-core supports up to three DMA-channels.
4. It's possible to have each DMA-channel IRQ independently delivered. The MSI IRQs must be utilized for that.
Thus in order to have the multi-channels Loongson GMAC controllers supported let's modify the Loongson DWMAC driver in accordance with all the peculiarities described above:
1. Create the multi-channels Loongson GMAC-specific stmmac_dma_ops::dma_interrupt() stmmac_dma_ops::init_chan()
callbacks due to the non-standard DMA IRQ CSR flags layout.
2. Create the Loongson DWMAC-specific platform setup() method which gets to initialize the DMA-ops with the dwmac1000_dma_ops instance and overrides the callbacks described in 1. The method also overrides the custom Synopsys ID with the real one in order to have the rest of the HW-specific callbacks correctly detected by the driver core.
3. Make sure the platform setup() method enables the flow control and duplex modes supported by the controller.
--- drivers/net/ethernet/stmicro/stmmac/common.h | 1 + .../ethernet/stmicro/stmmac/dwmac-loongson.c | 328 +++++++++++++++++- 2 files changed, 327 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/common.h +1 -0
@@ -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
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +326 -2
393 lines not on this page · raw message
Signature · 1 line
2.31.4
Re: [PATCH net-next v17 12/14] net: stmmac: dwmac-loongson: Add Loongson Multi-channels GMAC support
Quoted 41 lines · Yanteng Si
The Loongson DWMAC driver currently supports the Loongson GMAC devices (based on the DW GMAC v3.50a/v3.73a IP-core) installed to the LS2K1000 SoC and LS7A1000 chipset. But recently a new generation LS2K2000 SoC was released with the new version of the Loongson GMAC synthesized in. The new controller is based on the DW GMAC v3.73a IP-core with the AV-feature enabled, which implies the multi DMA-channels support. The multi DMA-channels feature has the next vendor-specific peculiarities:
1. Split up Tx and Rx DMA IRQ status/mask bits:
Name Tx RxDMA_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;2. Custom Synopsys ID hardwired into the GMAC_VERSION.SNPSVER register field. It's
0x10while it should have been0x37in accordance with the actual DW GMAC IP-core version.
3. There are eight DMA-channels available meanwhile the Synopsys DW GMAC IP-core supports up to three DMA-channels.
4. It's possible to have each DMA-channel IRQ independently delivered. The MSI IRQs must be utilized for that.Thus in order to have the multi-channels Loongson GMAC controllers supported let's modify the Loongson DWMAC driver in accordance with all the peculiarities described above:
1. Create the multi-channels Loongson GMAC-specific
stmmac_dma_ops::dma_interrupt()stmmac_dma_ops::init_chan()
callbacks due to the non-standard DMA IRQ CSR flags layout.
2. Create the Loongson DWMAC-specific platformsetup()method which gets to initialize the DMA-ops with thedwmac1000_dma_opsinstance and overrides the callbacks described in 1. The method also overrides the custom Synopsys ID with the real one in order to have the rest of the HW-specific callbacks correctly detected by the driver core.
3. Make sure the platformsetup()method enables the flow control and duplex modes supported by the controller.
Quoted 4 lines
Signed-off-by Feiyang Chen <[email protected]>Signed-off-by Yinggang Gu <[email protected]>Acked-by Huacai Chen <[email protected]>Signed-off-by Yanteng Si <[email protected]>
Looking good now. Thanks.
-Serge(y)
Quoted 1 line
...
PATCH v17 13/14 net: stmmac: dwmac-loongson: Add Loongson GNET support
In reply to Yanteng SiThe new generation Loongson LS2K2000 SoC and LS7A2000 chipset are equipped with the network controllers called Loongson GNET. It's the single and multi DMA-channels Loongson GMAC but with a PHY attached. Here is the summary of the DW GMAC features the controller has:
DW GMAC IP-core: v3.73a
Speeds: 10/100/1000Mbps
Duplex: Full (both versions), Half (LS2K2000 GNET only) DMA-descriptors type: enhanced
L3/L4 filters availability: Y
VLAN hash table filter: Y
PHY-interface: GMII (PHY is integrated into the chips) Remote Wake-up support: Y
Mac Management Counters (MMC): Y
Number of additional MAC addresses: 5
MAC Hash-based filter: Y
Hash Table Size: 256
AV feature: Y (LS2K2000 GNET only)
DMA channels: 8 (LS2K2000 GNET), 1 (LS7A2000 GNET)
Let's update the Loongson DWMAC driver to supporting the new Loongson GNET controller. The change is mainly trivial: the driver shall be bound to the PCIe device with DID 0x7a13, and the device-specific setup() method shall be called for it. The only peculiarity concerns the integrated PHY speed change procedure. The PHY has a weird problem with switching from the low speeds to 1000Mbps mode. The speedup procedure requires the PHY-link re-negotiation. So the suggested change provide the device-specific fix_mac_speed() method to overcome the problem.
--- .../ethernet/stmicro/stmmac/dwmac-loongson.c | 77 ++++++++++++++++++- 1 file changed, 74 insertions(+), 3 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +74 -3
@@ -65,11 +65,13 @@ DMA_STATUS_MSK_COMMON_LOONGSON)#define PCI_DEVICE_ID_LOONGSON_GMAC 0x7a03 +#define PCI_DEVICE_ID_LOONGSON_GNET 0x7a13#define DWMAC_CORE_LS_MULTICHAN 0x10/* Loongson custom ID */ #define CHANNEL_NUM 8struct loongson_data {u32 loongson_id; +struct device *dev; };struct stmmac_pci_info {
@@ -147,6 +149,60 @@ static struct stmmac_pci_info loongson_gmac_pci_info = { .setup = loongson_gmac_data, }; +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 integrated PHY has a weird problem with switching from the low +* speeds to 1000Mbps mode. The speedup procedure requires the PHY-link +* re-negotiation. +*/ +if (speed ==SPEED_1000 ) { +if (readl (ptr->ioaddr +MAC_CTRL_REG ) & +GMAC_CONTROL_PS ) +/* Word around hardware bug, restart autoneg */ +phy_restart_aneg (ndev->phydev); + } +} + +static int loongson_gnet_data (struct pci_dev *pdev, +struct plat_stmmacenet_data *plat) +{ +struct loongson_data *ld; +int i; + + ld = plat->bsp_priv; + +loongson_default_data (pdev, plat); + +if (ld->loongson_id ==DWMAC_CORE_LS_MULTICHAN ) { + plat->rx_queues_to_use =CHANNEL_NUM ; + plat->tx_queues_to_use =CHANNEL_NUM ; + +/* Only channel 0 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 ; + }else { + plat->tx_queues_to_use =1 ; + plat->rx_queues_to_use =1 ; + } + + plat->phy_interface =PHY_INTERFACE_MODE_GMII ; + plat->mdio_bus_data->phy_mask = ~(u32 )BIT (2 ); + plat->fix_mac_speed = loongson_gnet_fix_speed; + +return 0 ; +} + +static struct stmmac_pci_info loongson_gnet_pci_info = { + .setup = loongson_gnet_data, +}; + static void loongson_dwmac_dma_init_channel(struct stmmac_priv *priv, void __iomem *ioaddr, struct stmmac_dma_cfg *dma_cfg,
@@ -279,8 +335,10 @@ static struct mac_device_info *loongson_dwmac_setup(void *apriv)struct mac_device_info *mac;struct stmmac_dma_ops *dma;struct loongson_data *ld; +struct pci_dev *pdev; ld = priv->plat->bsp_priv; + pdev =to_pci_dev (priv->device); mac =devm_kzalloc (priv->device,sizeof (*mac),GFP_KERNEL );if (!mac)
@@ -290,7 +348,7 @@ static struct mac_device_info *loongson_dwmac_setup(void *apriv)if (!dma)return NULL ; -/* The Loongson GMAC devices are based on the DW GMAC +/* The Loongson GMAC and GNET devices are based on the DW GMAC * v3.50a and v3.73a IP-cores. But the HW designers have changed the * GMAC_VERSION.SNPSVER field to the custom 0x10 value on the * network controllers with the multi-channels feature
@@ -319,8 +377,19 @@ static struct mac_device_info *loongson_dwmac_setup(void *apriv)if (mac->multicast_filter_bins) mac->mcast_bits_log2 =ilog2 (mac->multicast_filter_bins); -/* Loongson GMAC doesn't support the flow control. */ - mac->link.caps =MAC_10 |MAC_100 |MAC_1000 ; +/* Loongson GMAC doesn't support the flow control. LS2K2000 +* GNET doesn't support the half-duplex link mode. +*/ +if (pdev->device ==PCI_DEVICE_ID_LOONGSON_GMAC ) { + mac->link.caps =MAC_10 |MAC_100 |MAC_1000 ; + }else { +if (ld->loongson_id ==DWMAC_CORE_LS_MULTICHAN ) + mac->link.caps =MAC_ASYM_PAUSE |MAC_SYM_PAUSE | +MAC_10 |MAC_100 |MAC_1000 ; +else + mac->link.caps =MAC_ASYM_PAUSE |MAC_SYM_PAUSE | +MAC_10FD |MAC_100FD |MAC_1000FD ; + } mac->link.duplex =GMAC_CONTROL_DM ; mac->link.speed10 =GMAC_CONTROL_PS ;
@@ -497,6 +566,7 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id plat->bsp_priv = ld; plat->setup = loongson_dwmac_setup; + ld->dev = &pdev->dev; ld->loongson_id =readl (res.addr +GMAC_VERSION ) &0xff ; info = (struct stmmac_pci_info *)id->driver_data;
@@ -597,6 +667,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);
Signature · 1 line
2.31.4
PATCH v17 14/14 net: stmmac: dwmac-loongson: Add loongson module author
In reply to Yanteng SiAdd Yanteng Si as MODULE_AUTHOR of Loongson DWMAC PCI driver.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +1 -0
@@ -686,4 +686,5 @@ module_pci_driver(loongson_dwmac_driver);MODULE_DESCRIPTION ("Loongson DWMAC PCI driver" );MODULE_AUTHOR ("Qing Zhang <[email protected]>" ); +MODULE_AUTHOR ("Yanteng Si <[email protected]>" );MODULE_LICENSE ("GPL v2" );
Signature · 1 line
2.31.4
Hi Yanteng
Quoted 4 lines · Yanteng Si
v17:
* As Serge's comments:
Add return 0 for_dt_config().
Get back the conditional MSI-clear method execution.
Thank you very much for your patience in such a long review and firm determination to bring the series to the final goal. From my point of view the patch set is ready to be merged in.
I've got it tested on my relatively standard DW GMAC v3.73a controller. No immediate problems or impacts on the interface performance have been spotted. So for the entire series:
-Serge(y)
Quoted 350 lines
v16:
* As Serge's comments:
Move theof_node_put(plat->mdio_node)call to the DT-config/clear methods. Drop 'else if'.
* Modify the commit message of 7/14. (LS2K CPU -> LS2K SOC)V15:
* Drop return that will not be executed.
* Move pdev from patch 12 to patch 13 to pass W=1 builds.RFC v15:
* As Serge's comments:
Extend the commit message.(patch 7 and patch 11) Add fixes tag for patch 8.
Addloongson_dwmac_dt_clear()patch.
Modifyloongson_dwmac_msi_config().
...
* Pick Huacai's Acked-by tag.
* Pick Serge's Reviewed-by tag.
* I have already contacted the author(ZhangQing) of the module, so I copied her valid email: [email protected].Note:
I replied to the comments on v14 last Sunday, but all of Loongson's email servers failed to deliver. The network administrator told me today that he has fixed the problem and re-delivered all the failed emails, but I did not see them on the mailing list. I hope they will not suddenly appear in everyone's mailbox one day. I apologize for this. (The email content mainly agrees with Serge's suggestion.)v14:
Because Loongson GMAC can be also found with the 8-channels AV feature
enabled, we'll need to reconsider the patches logic and thus the
commit logs too. As Serge's comments and Russell's comments:
[PATCH net-next v14 01/15] net: stmmac: Move the atds flag to thestmmac_dma_cfgstructure [PATCH net-next v14 02/15] net: stmmac: Add multi-channel support
[PATCH net-next v14 03/15] net: stmmac: Exportdwmac1000_dma_ops
[PATCH net-next v14 04/15] net: stmmac: dwmac-loongson: Drop duplicated hash-based filter size init [PATCH net-next v14 05/15] net: stmmac: dwmac-loongson: Drop pci_enable/disable_msi calls [PATCH net-next v14 06/15] net: stmmac: dwmac-loongson: UsePCI_DEVICE_DATA()macro for device identification [PATCH net-next v14 07/15] net: stmmac: dwmac-loongson: Detach GMAC-specific platform data init +-> Init the plat_stmmacenet_data::{tx_queues_to_use,rx_queues_to_use}
in theloongson_gmac_data()method.
[PATCH net-next v14 08/15] net: stmmac: dwmac-loongson: Init ref and PTP clocks rate
[PATCH net-next v14 09/15] net: stmmac: dwmac-loongson: Addphy_interfacefor Loongson GMAC [PATCH net-next v14 10/15] net: stmmac: dwmac-loongson: Introduce PCI device info data
+-> Make sure thesetup()method is called after thepci_enable_device()
invocation.
[PATCH net-next v14 11/15] net: stmmac: dwmac-loongson: Add DT-less GMAC PCI-device support +-> Introduce theloongson_dwmac_dt_config()method here instead of
doing that in a separate patch.
+-> Addloongson_dwmac_acpi_config()which would just get the IRQ fromthe pdev->irq field and make sure it is valid.[PATCH net-next v14 12/15] net: stmmac: Fixed failure to set network speed to 1000. +-> Drop the patch as Russell's comments, At the same time, he provided another
better repair suggestion, and I decided to send it separately after the patch set was merged. See:
<https://lore.kernel.org/netdev/[email protected]/>
[PATCH net-next v14 13/15] net: stmmac: dwmac-loongson: Add Loongson Multi-channels GMAC support +-> This is former "net: stmmac: dwmac-loongson: Add Loongson GNET
support" patch, but which adds the support of the Loongson GMAC with the 8-channels AV-feature available.
+->loongson_dwmac_intx_config()shall be dropped due to the
loongson_dwmac_acpi_config()method added in the PATCH 11/15.
+-> Make sureloongson_data::loongson_idis initialized before the
stmmac_pci_info::setup()is called.
+-> Move the rx_queues_to_use/tx_queues_to_use andcoe_unsupported
fields initialization to theloongson_gmac_data()method.
+-> As before, call theloongson_dwmac_msi_config()method if the multi-channels
Loongson MAC has been detected.
+-> Move everything GNET-specific to the next patch.
[PATCH net-next v14 14/15] net: stmmac: dwmac-loongson: Add Loongson GNET support +-> Everything Loonsgson GNET-specific is supposed to be added in the
framework of this patch:
+PCI_DEVICE_ID_LOONGSON_GNETmacro
+loongson_gnet_fix_speed()method
+loongson_gnet_data()method
+loongson_gnet_pci_infodata
+ The GNET-specific part of theloongson_dwmac_setup()method.
+ ...
[PATCH net-next v14 15/15] net: stmmac: dwmac-loongson: Add loongson module authorOther's:
Pick Serge's Reviewed-by tag.v13:
* Sorry, we have clarified some things in the past 10 days. I did not give you a clear reply to the following questions in v12, so I need to reply again:
1. The current LS2K2000 also have a GMAC(and two GNET) that supports 8 channels, so we have to reconsider the initialization of tx/rx_queues_to_use into
probe();2. In v12, we disagreed on the
loongson_dwmac_msi_configmethod, but I changedit based on Serge's comments(If I understand correctly): if (dev_of_node(&pdev->dev)) { ret = loongson_dwmac_dt_config(pdev, plat, &res); } if (ld->loongson_id == DWMAC_CORE_LS2K2000) { ret = loongson_dwmac_msi_config(pdev, plat, &res); } else { ret = loongson_dwmac_intx_config(pdev, plat, &res); }3. Our
priv->dma_cap.pcsis false, so let's usePHY_INTERFACE_MODE_NA;4. Our GMAC does not support Delay, so let's use
PHY_INTERFACE_MODE_RGMII_ID, the current dts is wrong, a fix patch will be sent to the LoongArch list later.Others:
* Re-split a part of the patch (it seems we do this with every version);
* Copied Serge's comments into the commit message of patch;
* Fixed thestmmac_dma_operation_mode()method;
* Changed some code comments.v12:
* The biggest change is the re-splitting of patches.
* Add a "gmac_version" inloongson_data, then we only read it once in the_probe().
* Drop Serge's patch.
* Rebase to the latest code state.
* Fixed the gnet commit message.v11:
* Breakloongson_phylink_get_caps(), fix bad logic.
* Remove a unnecessary ";".
* Remove some unnecessary "{}".
* add a blank.
* Move the code of fix_force_1000to patch 6/6.The main changes occur in these two functions:
loongson_dwmac_probe();loongson_dwmac_setup();v10:
As Andrew's comment:
* Add a #define for the0x37.
* Add a #define for Port Select.others:
* Pick Serge's patch, This patch resulted from the process of reviewing our patch set.
* Based on Serge's patch, modify ourloongson_phylink_get_caps().
* Drop patch 3/6, we needmac_interface.
* Adjusted the code layout of gnet patch.
* Corrected several errata in commit message.
* MoveDISABLE_FORCEflag toloongson_gnet_data().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 is0x37, similar to dwmac1000; The other is0x10. Compared to0x37, 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 overwritingpriv->synopsys_id=0x37andmac->dma= <LS_dma_ops>.1.1. Some more detailed information
The number of DMA channels for0x37is 1; The number of DMA channels for0x10is 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 is0x10, while the IP cores of other devices are0x37.3. TABLE
device type pci_id ip_core ls7a1000 gmac 7a03 0x35/0x37 ls2k1000 gmac 7a03 0x35/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 aredwmac_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 fixedstmmac_dma_opsdescriptor. 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 thedwmac-loongson.cdriver. Don't forget to move all the Loongson-specific macros fromdwmac_dma.htodwmac-loongson.c.3. Create a Loongson GNET-specific platform setup method with the next semantics:
+ allocatestmmac_dma_opsinstance and initialize it withdwmac1000_dma_ops.
+ override the stmmac_dma_ops.{dma_interrupt,init_chan} with the pointers to the methods defined in 2.
+ allocatemac_device_infoinstance and initialize the mac_device_info.dma field with a pointer to the newstmmac_dma_opsinstance.
+ calldwmac1000_setup()or initializemac_device_infoin a way it's done indwmac1000_setup()(the later might be better so you wouldn't need to export thedwmac1000_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:
- AddDMA_INTR_ENA_NIE_RXandDMA_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_privpointer.* 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
- Dropirq_flagschanges.
- 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 thedwmac1000_dma.cto 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 (14):
net: stmmac: Move the atds flag to thestmmac_dma_cfgstructure
net: stmmac: Add multi-channel support
net: stmmac: Exportdwmac1000_dma_ops
net: stmmac: dwmac-loongson: Drop duplicated hash-based filter size
init
net: stmmac: dwmac-loongson: Drop pci_enable/disable_msi calls
net: stmmac: dwmac-loongson: UsePCI_DEVICE_DATA()macro for device
identification
net: stmmac: dwmac-loongson: Detach GMAC-specific platform data init
net: stmmac: dwmac-loongson: Init ref and PTP clocks rate
net: stmmac: dwmac-loongson: Addphy_interfacefor Loongson GMAC
net: stmmac: dwmac-loongson: Introduce PCI device info data
net: stmmac: dwmac-loongson: Add DT-less GMAC PCI-device support
net: stmmac: dwmac-loongson: Add Loongson Multi-channels GMAC support
net: stmmac: dwmac-loongson: Add Loongson GNET support
net: stmmac: dwmac-loongson: Add loongson module authordrivers/net/ethernet/stmicro/stmmac/common.h | 1 + .../ethernet/stmicro/stmmac/dwmac-loongson.c | 597 +++++++++++++++--- .../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 | 27 +- .../net/ethernet/stmicro/stmmac/dwmac_lib.c | 30 +- .../ethernet/stmicro/stmmac/dwxgmac2_dma.c | 2 +- drivers/net/ethernet/stmicro/stmmac/hwif.h | 5 +- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 19 +- include/linux/stmmac.h | 1 + 12 files changed, 605 insertions(+), 120 deletions(-)Signature · 1 line
2.31.4
This series was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:
Quoted 5 lines · On Wed, 7 Aug 2024 21:45:27 +0800 you wrote:
v17:
* As Serge's comments:
Add return 0 for_dt_config().
Get back the conditional MSI-clear method execution.
Quoted 7 lines
v16:
* As Serge's comments:
Move theof_node_put(plat->mdio_node)call to the DT-config/clear methods. Drop 'else if'.
* Modify the commit message of 7/14. (LS2K CPU -> LS2K SOC)[...]
Here is the summary with links:
- [net-next,v17,01/14] net: stmmac: Move the atds flag to the stmmac_dma_cfg structure
https://git.kernel.org/netdev/net-next/c/12dbc67c3b0b - [net-next,v17,02/14] net: stmmac: Add multi-channel support https://git.kernel.org/netdev/net-next/c/ad72f783de06 - [net-next,v17,03/14] net: stmmac: Export dwmac1000_dma_ops https://git.kernel.org/netdev/net-next/c/005c0f071bc1 - [net-next,v17,04/14] net: stmmac: dwmac-loongson: Drop duplicated hash-based filter size init https://git.kernel.org/netdev/net-next/c/393ea68bf154 - [net-next,v17,05/14] net: stmmac: dwmac-loongson: Drop pci_enable/disable_msi calls https://git.kernel.org/netdev/net-next/c/0c979e6b55f9 - [net-next,v17,06/14] net: stmmac: dwmac-loongson: Use PCI_DEVICE_DATA() macro for device identification https://git.kernel.org/netdev/net-next/c/324d96b46520 - [net-next,v17,07/14] net: stmmac: dwmac-loongson: Detach GMAC-specific platform data init https://git.kernel.org/netdev/net-next/c/79afc70002c2 - [net-next,v17,08/14] net: stmmac: dwmac-loongson: Init ref and PTP clocks rate https://git.kernel.org/netdev/net-next/c/c70f31636813 - [net-next,v17,09/14] net: stmmac: dwmac-loongson: Add phy_interface for Loongson GMAC https://git.kernel.org/netdev/net-next/c/849dc7341d1f - [net-next,v17,10/14] net: stmmac: dwmac-loongson: Introduce PCI device info data https://git.kernel.org/netdev/net-next/c/0ec04d32b5e7 - [net-next,v17,11/14] net: stmmac: dwmac-loongson: Add DT-less GMAC PCI-device support https://git.kernel.org/netdev/net-next/c/126f4f96c41d - [net-next,v17,12/14] net: stmmac: dwmac-loongson: Add Loongson Multi-channels GMAC support https://git.kernel.org/netdev/net-next/c/803fc61df261 - [net-next,v17,13/14] net: stmmac: dwmac-loongson: Add Loongson GNET support https://git.kernel.org/netdev/net-next/c/56dbe2c290bc - [net-next,v17,14/14] net: stmmac: dwmac-loongson: Add loongson module author https://git.kernel.org/netdev/net-next/c/930df0990d06
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html