| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <fkhshxyt6efa2pykqnkr2kcib6vdzavse3blrwbhlf2efgzfa7@lvcmfnglvc56>
Date: Tue, 6 Feb 2024 12:48:41 +0300
From: Serge Semin <fancer.lancer@...il.com>
To: Yanteng Si <siyanteng@...ngson.cn>
Cc: andrew@...n.ch, hkallweit1@...il.com, peppe.cavallaro@...com,
alexandre.torgue@...s.st.com, joabreu@...opsys.com, Jose.Abreu@...opsys.com,
chenhuacai@...ngson.cn, linux@...linux.org.uk, guyinggang@...ngson.cn,
netdev@...r.kernel.org, chris.chenfeiyang@...il.com
Subject: Re: [PATCH net-next v8 01/11] net: stmmac: Add multi-channel support
On Tue, Feb 06, 2024 at 05:02:29PM +0800, Yanteng Si wrote:
>
> 在 2024/2/5 07:28, Serge Semin 写道:
> > On Tue, Jan 30, 2024 at 04:43:21PM +0800, Yanteng Si wrote:
> > > 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.
> > >
> > > Signed-off-by: Yanteng Si <siyanteng@...ngson.cn>
> > > Signed-off-by: Feiyang Chen <chenfeiyang@...ngson.cn>
> > > Signed-off-by: Yinggang Gu <guyinggang@...ngson.cn>
> > > ---
> > > .../net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2 +-
> > > .../ethernet/stmicro/stmmac/dwmac1000_dma.c | 36 ++++++++++---------
> > > .../net/ethernet/stmicro/stmmac/dwmac_dma.h | 19 +++++++++-
> > > .../net/ethernet/stmicro/stmmac/dwmac_lib.c | 32 ++++++++---------
> > > drivers/net/ethernet/stmicro/stmmac/hwif.h | 2 +-
> > > .../net/ethernet/stmicro/stmmac/stmmac_main.c | 6 ++--
> > > 6 files changed, 58 insertions(+), 39 deletions(-)
> > >
> > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
> > > index 137741b94122..7cdfa0bdb93a 100644
> > > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
> > > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
> > > @@ -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;
> > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
> > > index daf79cdbd3ec..5f7b82ad3ec2 100644
> > > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
> > > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
> > > @@ -70,15 +70,18 @@ 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);
> > > + u32 value;
> > > int txpbl = dma_cfg->txpbl ?: dma_cfg->pbl;
> > > int rxpbl = dma_cfg->rxpbl ?: dma_cfg->pbl;
> > Reverse xmas tree please.
> OK!
> >
> > > - /*
> > > - * Set the DMA PBL (Programmable Burst Length) mode.
> > > + /* common channel control register config */
> > Redundant comment. Please drop.
> OK!
> >
> > > + 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 +101,15 @@ static void dwmac1000_dma_init(void __iomem *ioaddr,
> > > if (dma_cfg->mixed_burst)
> > > value |= DMA_BUS_MODE_MB;
> > > - if (atds)
> > > - value |= DMA_BUS_MODE_ATDS;
> > > + value |= DMA_BUS_MODE_ATDS;
> > No, just convert the stmmac_dma_ops.dma_init_channel() to accepting
> > the atds flag as I suggested in v7:
> > https://lore.kernel.org/netdev/vxcfrxtbfu4pya56m22icnizsyjzqqha5blzb7zpexqcur56uh@uv6vsjf77npa/
> >
> > In order to simplify this patch you can provide the
> > stmmac_dma_ops.dma_init_channel() and
> > stmmac_dma_ops.enable_dma_transmission() prototype updates in a
> > pre-requisite/preparation patch.
> OK.
> >
> > > 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,
> > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h b/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h
> > > index 72672391675f..593be79c46e1 100644
> > > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h
> > > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h
> > > @@ -148,11 +148,14 @@
> > > DMA_STATUS_TI | \
> > > DMA_STATUS_MSK_COMMON)
> > > +/* Following DMA defines are chanels oriented */ \
> > > +#define DMA_CHAN_OFFSET 0x100 |-------------+
> > > + / |
> > |
> > Please move all of these ---------------------------------------------+-------------------------+
> > to being defined just below the DMA_MISSED_FRAME_CTR macros definition. |
> > The point is to keep a coherency between dwmac_dma.h and dwmac4_dma.h. |
> > The later header file has first generic DMA-related macros defined |
> > (CSR addresses and flags) and then the channel-specific ones (CSR |
> > addresses and flags). Since in case of the DW GMAC v3.x the |
> > multi-channels are implemented as a copy of all the DMA CSRs let's |
> > preserve the logic of having all CSR address defined first, then the |
> > CSR flags. |
> > |
> > > #define NUM_DWMAC100_DMA_REGS 9 |
> > > #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, |
> > > @@ -169,4 +172,18 @@ 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); |
> > > |
> > |
> > > +static inline u32 dma_chan_base_addr(u32 base, u32 chan) \ |
> > > +{ | |
> > > + return base + chan * DMA_CHAN_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) |
> > > + /
> OK.
> > > #endif /* __DWMAC_DMA_H__ */
> > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c b/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c
> > > index 7907d62d3437..b37368137810 100644
> > > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c
> > > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c
> > > @@ -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
> > > @@ -166,7 +166,7 @@ int dwmac_dma_interrupt(struct stmmac_priv *priv, void __iomem *ioaddr,
> > > struct stmmac_txq_stats *txq_stats = &priv->xstats.txq_stats[chan];
> > > 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 */
> > > @@ -236,7 +236,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));
> > Isn't the mask change going to be implemented in the framework of the
> > Loongson-specific DMA-interrupt handler in some of the further patches?
> Yes!
> >
> > I'll get back to reviewing the series tomorrow (later today)...
>
> OK, Thanks for your review! I have read all your comments in others patch.
>
>
> I will modify the code as soon as possible according to your comments,
>
> but in the next two weeks (Spring Festival), I will not be able to test on
> all devices.
Ok. Whenever you are ready I'll keep reviewing your series. Even at
the current state the patchset looks much much better than it was
initially. Some reordering, commit logs elaboration, a few more cycle
to polish out some details and I guess it will be ready for merging at
least from my point of view.
-Serge(y)
>
>
> Thanks,
>
> Yanteng
>
> >
> > -Serge(y)
> >
> > > return ret;
> > > }
> > > diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h
> > > index 7be04b54738b..b0db38396171 100644
> > > --- a/drivers/net/ethernet/stmicro/stmmac/hwif.h
> > > +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h
> > > @@ -198,7 +198,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,
> > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> > > index b334eb16da23..5617b40abbe4 100644
> > > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> > > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> > > @@ -2558,7 +2558,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);
> > > @@ -4706,7 +4706,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);
> > > @@ -4926,7 +4926,7 @@ static int stmmac_xdp_xmit_xdpf(struct stmmac_priv *priv, int queue,
> > > u64_stats_update_end_irqrestore(&txq_stats->syncp, flags);
> > > }
> > > - 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;
> > > --
> > > 2.31.4
> > >
>
Powered by blists - more mailing lists