* [PATCH 0/6] ethernet: fixes for stmmac driver
@ 2021-01-11 11:35 Joakim Zhang
2021-01-11 11:35 ` [PATCH 1/6] ethernet: stmmac: remove redundant null check for ptp clock Joakim Zhang
` (5 more replies)
0 siblings, 6 replies; 12+ messages in thread
From: Joakim Zhang @ 2021-01-11 11:35 UTC (permalink / raw)
To: peppe.cavallaro, alexandre.torgue, joabreu, davem, kuba; +Cc: netdev, linux-imx
Fixes for stmmac driver.
Joakim Zhang (6):
ethernet: stmmac: remove redundant null check for ptp clock
ethernet: stmmac: stop each tx channal independently
ethernet: stmmac: fix watchdog timeout during suspend/resume stress
test
ethernet: stmmac: fix dma physical address of descriptor when display
ring
ethernet: stmmac: fix wrongly set buffer2 valid when sph unsupport
ethernet: stmmac: re-init rx buffers when mac resume back
.../ethernet/stmicro/stmmac/dwmac4_descs.c | 14 +-
.../net/ethernet/stmicro/stmmac/dwmac4_lib.c | 4 -
.../ethernet/stmicro/stmmac/dwxgmac2_descs.c | 2 +-
.../net/ethernet/stmicro/stmmac/enh_desc.c | 5 +-
drivers/net/ethernet/stmicro/stmmac/hwif.h | 5 +-
.../net/ethernet/stmicro/stmmac/norm_desc.c | 5 +-
.../net/ethernet/stmicro/stmmac/stmmac_main.c | 136 +++++++++++++++---
7 files changed, 134 insertions(+), 37 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/6] ethernet: stmmac: remove redundant null check for ptp clock
2021-01-11 11:35 [PATCH 0/6] ethernet: fixes for stmmac driver Joakim Zhang
@ 2021-01-11 11:35 ` Joakim Zhang
2021-01-11 17:13 ` Andrew Lunn
2021-01-11 11:35 ` [PATCH 2/6] ethernet: stmmac: stop each tx channal independently Joakim Zhang
` (4 subsequent siblings)
5 siblings, 1 reply; 12+ messages in thread
From: Joakim Zhang @ 2021-01-11 11:35 UTC (permalink / raw)
To: peppe.cavallaro, alexandre.torgue, joabreu, davem, kuba; +Cc: netdev, linux-imx
Remove redundant null check for ptp clock.
Fixes: 1c35cc9cf6a0 ("net: stmmac: remove redundant null check before clk_disable_unprepare()")
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 5b1c12ff98c0..a0bd064a8421 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -5290,8 +5290,7 @@ int stmmac_resume(struct device *dev)
/* enable the clk previously disabled */
clk_prepare_enable(priv->plat->stmmac_clk);
clk_prepare_enable(priv->plat->pclk);
- if (priv->plat->clk_ptp_ref)
- clk_prepare_enable(priv->plat->clk_ptp_ref);
+ clk_prepare_enable(priv->plat->clk_ptp_ref);
/* reset the phy so that it's ready */
if (priv->mii)
stmmac_mdio_reset(priv->mii);
--
2.17.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/6] ethernet: stmmac: stop each tx channal independently
2021-01-11 11:35 [PATCH 0/6] ethernet: fixes for stmmac driver Joakim Zhang
2021-01-11 11:35 ` [PATCH 1/6] ethernet: stmmac: remove redundant null check for ptp clock Joakim Zhang
@ 2021-01-11 11:35 ` Joakim Zhang
2021-01-11 17:28 ` Florian Fainelli
2021-01-11 11:35 ` [PATCH 3/6] ethernet: stmmac: fix watchdog timeout during suspend/resume stress test Joakim Zhang
` (3 subsequent siblings)
5 siblings, 1 reply; 12+ messages in thread
From: Joakim Zhang @ 2021-01-11 11:35 UTC (permalink / raw)
To: peppe.cavallaro, alexandre.torgue, joabreu, davem, kuba; +Cc: netdev, linux-imx
If clear GMAC_CONFIG_TE bit, it would stop all tx channals, but users
may only want to stop secific tx channel.
Fixes: 48863ce5940f ("stmmac: add DMA support for GMAC 4.xx")
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
---
drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c
index 0b4ee2dbb691..71e50751ef2d 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c
@@ -53,10 +53,6 @@ void dwmac4_dma_stop_tx(void __iomem *ioaddr, u32 chan)
value &= ~DMA_CONTROL_ST;
writel(value, ioaddr + DMA_CHAN_TX_CONTROL(chan));
-
- value = readl(ioaddr + GMAC_CONFIG);
- value &= ~GMAC_CONFIG_TE;
- writel(value, ioaddr + GMAC_CONFIG);
}
void dwmac4_dma_start_rx(void __iomem *ioaddr, u32 chan)
--
2.17.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/6] ethernet: stmmac: fix watchdog timeout during suspend/resume stress test
2021-01-11 11:35 [PATCH 0/6] ethernet: fixes for stmmac driver Joakim Zhang
2021-01-11 11:35 ` [PATCH 1/6] ethernet: stmmac: remove redundant null check for ptp clock Joakim Zhang
2021-01-11 11:35 ` [PATCH 2/6] ethernet: stmmac: stop each tx channal independently Joakim Zhang
@ 2021-01-11 11:35 ` Joakim Zhang
2021-01-11 11:35 ` [PATCH 4/6] ethernet: stmmac: fix dma physical address of descriptor when display ring Joakim Zhang
` (2 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Joakim Zhang @ 2021-01-11 11:35 UTC (permalink / raw)
To: peppe.cavallaro, alexandre.torgue, joabreu, davem, kuba; +Cc: netdev, linux-imx
stmmac_xmit() call stmmac_tx_timer_arm() at the end to modify tx timer to
do the transmission cleanup work. Imagine such a situation, stmmac enters
suspend immediately after tx timer modified, it's expire callback
stmmac_tx_clean() would not be invoked. This could affect BQL, since
netdev_tx_sent_queue() has been called, but netdev_tx_completed_queue()
have not been involved, as a result, dql_avail(&dev_queue->dql) finally always
return a negative value.
__dev_queue_xmit->__dev_xmit_skb->qdisc_run->__qdisc_run->qdisc_restart->dequeue_skb:
if ((q->flags & TCQ_F_ONETXQUEUE) &&
netif_xmit_frozen_or_stopped(txq)) // __QUEUE_STATE_STACK_XOFF is set
Net core will stop transmitting any more. Finillay, net watchdong would timeout.
To fix this issue, we should call netdev_tx_reset_queue() in stmmac_resume().
Fixes: 54139cf3bb33 ("net: stmmac: adding multiple buffers for rx")
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index a0bd064a8421..41d9a5a3cc9a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -5256,6 +5256,8 @@ static void stmmac_reset_queues_param(struct stmmac_priv *priv)
tx_q->cur_tx = 0;
tx_q->dirty_tx = 0;
tx_q->mss = 0;
+
+ netdev_tx_reset_queue(netdev_get_tx_queue(priv->dev, queue));
}
}
--
2.17.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 4/6] ethernet: stmmac: fix dma physical address of descriptor when display ring
2021-01-11 11:35 [PATCH 0/6] ethernet: fixes for stmmac driver Joakim Zhang
` (2 preceding siblings ...)
2021-01-11 11:35 ` [PATCH 3/6] ethernet: stmmac: fix watchdog timeout during suspend/resume stress test Joakim Zhang
@ 2021-01-11 11:35 ` Joakim Zhang
2021-01-11 17:30 ` Florian Fainelli
2021-01-11 11:35 ` [PATCH 5/6] ethernet: stmmac: fix wrongly set buffer2 valid when sph unsupport Joakim Zhang
2021-01-11 11:35 ` [PATCH 6/6] ethernet: stmmac: re-init rx buffers when mac resume back Joakim Zhang
5 siblings, 1 reply; 12+ messages in thread
From: Joakim Zhang @ 2021-01-11 11:35 UTC (permalink / raw)
To: peppe.cavallaro, alexandre.torgue, joabreu, davem, kuba; +Cc: netdev, linux-imx
Driver uses dma_alloc_coherent to allocate dma memory for descriptors,
dma_alloc_coherent will return both the virtual address and physical
address. AFAIK, virt_to_phys could not convert virtual address to
physical address, for which memory is allocated by dma_alloc_coherent.
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
---
.../ethernet/stmicro/stmmac/dwmac4_descs.c | 5 +-
.../net/ethernet/stmicro/stmmac/enh_desc.c | 5 +-
drivers/net/ethernet/stmicro/stmmac/hwif.h | 3 +-
.../net/ethernet/stmicro/stmmac/norm_desc.c | 5 +-
.../net/ethernet/stmicro/stmmac/stmmac_main.c | 50 ++++++++++++-------
5 files changed, 44 insertions(+), 24 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
index c6540b003b43..8e1ee33ba1e6 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
@@ -402,7 +402,8 @@ static void dwmac4_rd_set_tx_ic(struct dma_desc *p)
p->des2 |= cpu_to_le32(TDES2_INTERRUPT_ON_COMPLETION);
}
-static void dwmac4_display_ring(void *head, unsigned int size, bool rx)
+static void dwmac4_display_ring(void *head, unsigned int size, bool rx,
+ unsigned int dma_rx_phy, unsigned int desc_size)
{
struct dma_desc *p = (struct dma_desc *)head;
int i;
@@ -411,7 +412,7 @@ static void dwmac4_display_ring(void *head, unsigned int size, bool rx)
for (i = 0; i < size; i++) {
pr_info("%03d [0x%x]: 0x%x 0x%x 0x%x 0x%x\n",
- i, (unsigned int)virt_to_phys(p),
+ i, (unsigned int)(dma_rx_phy + i * desc_size),
le32_to_cpu(p->des0), le32_to_cpu(p->des1),
le32_to_cpu(p->des2), le32_to_cpu(p->des3));
p++;
diff --git a/drivers/net/ethernet/stmicro/stmmac/enh_desc.c b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
index d02cec296f51..a7324b9c1a02 100644
--- a/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
+++ b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
@@ -417,7 +417,8 @@ static int enh_desc_get_rx_timestamp_status(void *desc, void *next_desc,
}
}
-static void enh_desc_display_ring(void *head, unsigned int size, bool rx)
+static void enh_desc_display_ring(void *head, unsigned int size, bool rx,
+ unsigned int dma_rx_phy, unsigned int desc_size)
{
struct dma_extended_desc *ep = (struct dma_extended_desc *)head;
int i;
@@ -429,7 +430,7 @@ static void enh_desc_display_ring(void *head, unsigned int size, bool rx)
x = *(u64 *)ep;
pr_info("%03d [0x%x]: 0x%x 0x%x 0x%x 0x%x\n",
- i, (unsigned int)virt_to_phys(ep),
+ i, (unsigned int)(dma_rx_phy + i * desc_size),
(unsigned int)x, (unsigned int)(x >> 32),
ep->basic.des2, ep->basic.des3);
ep++;
diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h
index b40b2e0667bb..fc5260cf27ea 100644
--- a/drivers/net/ethernet/stmicro/stmmac/hwif.h
+++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h
@@ -78,7 +78,8 @@ struct stmmac_desc_ops {
/* get rx timestamp status */
int (*get_rx_timestamp_status)(void *desc, void *next_desc, u32 ats);
/* Display ring */
- void (*display_ring)(void *head, unsigned int size, bool rx);
+ void (*display_ring)(void *head, unsigned int size, bool rx,
+ unsigned int dma_rx_phy, unsigned int desc_size);
/* set MSS via context descriptor */
void (*set_mss)(struct dma_desc *p, unsigned int mss);
/* get descriptor skbuff address */
diff --git a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
index f083360e4ba6..c26544de0766 100644
--- a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
+++ b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
@@ -269,7 +269,8 @@ static int ndesc_get_rx_timestamp_status(void *desc, void *next_desc, u32 ats)
return 1;
}
-static void ndesc_display_ring(void *head, unsigned int size, bool rx)
+static void ndesc_display_ring(void *head, unsigned int size, bool rx,
+ unsigned int dma_rx_phy, unsigned int desc_size)
{
struct dma_desc *p = (struct dma_desc *)head;
int i;
@@ -281,7 +282,7 @@ static void ndesc_display_ring(void *head, unsigned int size, bool rx)
x = *(u64 *)p;
pr_info("%03d [0x%x]: 0x%x 0x%x 0x%x 0x%x",
- i, (unsigned int)virt_to_phys(p),
+ i, (unsigned int)(dma_rx_phy + i * desc_size),
(unsigned int)x, (unsigned int)(x >> 32),
p->des2, p->des3);
p++;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 41d9a5a3cc9a..ca24e268f49a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1133,6 +1133,7 @@ static int stmmac_phy_setup(struct stmmac_priv *priv)
static void stmmac_display_rx_rings(struct stmmac_priv *priv)
{
u32 rx_cnt = priv->plat->rx_queues_to_use;
+ unsigned int desc_size;
void *head_rx;
u32 queue;
@@ -1142,19 +1143,24 @@ static void stmmac_display_rx_rings(struct stmmac_priv *priv)
pr_info("\tRX Queue %u rings\n", queue);
- if (priv->extend_desc)
+ if (priv->extend_desc) {
head_rx = (void *)rx_q->dma_erx;
- else
+ desc_size = sizeof(struct dma_extended_desc);
+ } else {
head_rx = (void *)rx_q->dma_rx;
+ desc_size = sizeof(struct dma_desc);
+ }
/* Display RX ring */
- stmmac_display_ring(priv, head_rx, priv->dma_rx_size, true);
+ stmmac_display_ring(priv, head_rx, priv->dma_rx_size, true,
+ rx_q->dma_rx_phy, desc_size);
}
}
static void stmmac_display_tx_rings(struct stmmac_priv *priv)
{
u32 tx_cnt = priv->plat->tx_queues_to_use;
+ unsigned int desc_size;
void *head_tx;
u32 queue;
@@ -1164,14 +1170,19 @@ static void stmmac_display_tx_rings(struct stmmac_priv *priv)
pr_info("\tTX Queue %d rings\n", queue);
- if (priv->extend_desc)
+ if (priv->extend_desc) {
head_tx = (void *)tx_q->dma_etx;
- else if (tx_q->tbs & STMMAC_TBS_AVAIL)
+ desc_size = sizeof(struct dma_extended_desc);
+ } else if (tx_q->tbs & STMMAC_TBS_AVAIL) {
head_tx = (void *)tx_q->dma_entx;
- else
+ desc_size = sizeof(struct dma_edesc);
+ } else {
head_tx = (void *)tx_q->dma_tx;
+ desc_size = sizeof(struct dma_desc);
+ }
- stmmac_display_ring(priv, head_tx, priv->dma_tx_size, false);
+ stmmac_display_ring(priv, head_tx, priv->dma_tx_size, false,
+ tx_q->dma_tx_phy, desc_size);
}
}
@@ -3736,18 +3747,23 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)
unsigned int count = 0, error = 0, len = 0;
int status = 0, coe = priv->hw->rx_csum;
unsigned int next_entry = rx_q->cur_rx;
+ unsigned int desc_size;
struct sk_buff *skb = NULL;
if (netif_msg_rx_status(priv)) {
void *rx_head;
netdev_dbg(priv->dev, "%s: descriptor ring:\n", __func__);
- if (priv->extend_desc)
+ if (priv->extend_desc) {
rx_head = (void *)rx_q->dma_erx;
- else
+ desc_size = sizeof(struct dma_extended_desc);
+ } else {
rx_head = (void *)rx_q->dma_rx;
+ desc_size = sizeof(struct dma_desc);
+ }
- stmmac_display_ring(priv, rx_head, priv->dma_rx_size, true);
+ stmmac_display_ring(priv, rx_head, priv->dma_rx_size, true,
+ rx_q->dma_rx_phy, desc_size);
}
while (count < limit) {
unsigned int buf1_len = 0, buf2_len = 0;
@@ -4314,7 +4330,7 @@ static int stmmac_set_mac_address(struct net_device *ndev, void *addr)
static struct dentry *stmmac_fs_dir;
static void sysfs_display_ring(void *head, int size, int extend_desc,
- struct seq_file *seq)
+ struct seq_file *seq, unsigned int dma_phy_addr)
{
int i;
struct dma_extended_desc *ep = (struct dma_extended_desc *)head;
@@ -4323,7 +4339,7 @@ static void sysfs_display_ring(void *head, int size, int extend_desc,
for (i = 0; i < size; i++) {
if (extend_desc) {
seq_printf(seq, "%d [0x%x]: 0x%x 0x%x 0x%x 0x%x\n",
- i, (unsigned int)virt_to_phys(ep),
+ i, (unsigned int)(dma_phy_addr + i * sizeof(ep)),
le32_to_cpu(ep->basic.des0),
le32_to_cpu(ep->basic.des1),
le32_to_cpu(ep->basic.des2),
@@ -4331,7 +4347,7 @@ static void sysfs_display_ring(void *head, int size, int extend_desc,
ep++;
} else {
seq_printf(seq, "%d [0x%x]: 0x%x 0x%x 0x%x 0x%x\n",
- i, (unsigned int)virt_to_phys(p),
+ i, (unsigned int)(dma_phy_addr + i * sizeof(p)),
le32_to_cpu(p->des0), le32_to_cpu(p->des1),
le32_to_cpu(p->des2), le32_to_cpu(p->des3));
p++;
@@ -4359,11 +4375,11 @@ static int stmmac_rings_status_show(struct seq_file *seq, void *v)
if (priv->extend_desc) {
seq_printf(seq, "Extended descriptor ring:\n");
sysfs_display_ring((void *)rx_q->dma_erx,
- priv->dma_rx_size, 1, seq);
+ priv->dma_rx_size, 1, seq, rx_q->dma_rx_phy);
} else {
seq_printf(seq, "Descriptor ring:\n");
sysfs_display_ring((void *)rx_q->dma_rx,
- priv->dma_rx_size, 0, seq);
+ priv->dma_rx_size, 0, seq, rx_q->dma_rx_phy);
}
}
@@ -4375,11 +4391,11 @@ static int stmmac_rings_status_show(struct seq_file *seq, void *v)
if (priv->extend_desc) {
seq_printf(seq, "Extended descriptor ring:\n");
sysfs_display_ring((void *)tx_q->dma_etx,
- priv->dma_tx_size, 1, seq);
+ priv->dma_tx_size, 1, seq, tx_q->dma_tx_phy);
} else if (!(tx_q->tbs & STMMAC_TBS_AVAIL)) {
seq_printf(seq, "Descriptor ring:\n");
sysfs_display_ring((void *)tx_q->dma_tx,
- priv->dma_tx_size, 0, seq);
+ priv->dma_tx_size, 0, seq, tx_q->dma_tx_phy);
}
}
--
2.17.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 5/6] ethernet: stmmac: fix wrongly set buffer2 valid when sph unsupport
2021-01-11 11:35 [PATCH 0/6] ethernet: fixes for stmmac driver Joakim Zhang
` (3 preceding siblings ...)
2021-01-11 11:35 ` [PATCH 4/6] ethernet: stmmac: fix dma physical address of descriptor when display ring Joakim Zhang
@ 2021-01-11 11:35 ` Joakim Zhang
2021-01-11 22:24 ` Jakub Kicinski
2021-01-11 11:35 ` [PATCH 6/6] ethernet: stmmac: re-init rx buffers when mac resume back Joakim Zhang
5 siblings, 1 reply; 12+ messages in thread
From: Joakim Zhang @ 2021-01-11 11:35 UTC (permalink / raw)
To: peppe.cavallaro, alexandre.torgue, joabreu, davem, kuba; +Cc: netdev, linux-imx
In current driver, buffer2 available only when hardware supports split
header. Wrongly set buffer2 valid in stmmac_rx_refill when refill buffer
address. You can see that desc3 is 0x81000000 after initialization, but
turn out to be 0x83000000 after refill.
Fixes: 67afd6d1cfdf ("net: stmmac: Add Split Header support and enable it in XGMAC cores")
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
---
drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 9 +++++++--
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 2 +-
drivers/net/ethernet/stmicro/stmmac/hwif.h | 2 +-
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 8 ++++++--
4 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
index 8e1ee33ba1e6..aecba8b1302f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
@@ -500,10 +500,15 @@ static void dwmac4_get_rx_header_len(struct dma_desc *p, unsigned int *len)
*len = le32_to_cpu(p->des2) & RDES2_HL;
}
-static void dwmac4_set_sec_addr(struct dma_desc *p, dma_addr_t addr)
+static void dwmac4_set_sec_addr(struct dma_desc *p, dma_addr_t addr, bool buf2_valid)
{
p->des2 = cpu_to_le32(lower_32_bits(addr));
- p->des3 = cpu_to_le32(upper_32_bits(addr) | RDES3_BUFFER2_VALID_ADDR);
+ p->des3 = cpu_to_le32(upper_32_bits(addr));
+
+ if (buf2_valid)
+ p->des3 |= RDES3_BUFFER2_VALID_ADDR;
+ else
+ p->des3 &= ~RDES3_BUFFER2_VALID_ADDR;
}
static void dwmac4_set_tbs(struct dma_edesc *p, u32 sec, u32 nsec)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c
index 0aaf19ab5672..ccfb0102dde4 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c
@@ -292,7 +292,7 @@ static void dwxgmac2_get_rx_header_len(struct dma_desc *p, unsigned int *len)
*len = le32_to_cpu(p->des2) & XGMAC_RDES2_HL;
}
-static void dwxgmac2_set_sec_addr(struct dma_desc *p, dma_addr_t addr)
+static void dwxgmac2_set_sec_addr(struct dma_desc *p, dma_addr_t addr, bool is_valid)
{
p->des2 = cpu_to_le32(lower_32_bits(addr));
p->des3 = cpu_to_le32(upper_32_bits(addr));
diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h
index fc5260cf27ea..6423dd5ef45a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/hwif.h
+++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h
@@ -92,7 +92,7 @@ struct stmmac_desc_ops {
int (*get_rx_hash)(struct dma_desc *p, u32 *hash,
enum pkt_hash_types *type);
void (*get_rx_header_len)(struct dma_desc *p, unsigned int *len);
- void (*set_sec_addr)(struct dma_desc *p, dma_addr_t addr);
+ void (*set_sec_addr)(struct dma_desc *p, dma_addr_t addr, bool buf2_valid);
void (*set_sarc)(struct dma_desc *p, u32 sarc_type);
void (*set_vlan_tag)(struct dma_desc *p, u16 tag, u16 inner_tag,
u32 inner_type);
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index ca24e268f49a..e30529b8f40a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1314,9 +1314,10 @@ static int stmmac_init_rx_buffers(struct stmmac_priv *priv, struct dma_desc *p,
return -ENOMEM;
buf->sec_addr = page_pool_get_dma_addr(buf->sec_page);
- stmmac_set_desc_sec_addr(priv, p, buf->sec_addr);
+ stmmac_set_desc_sec_addr(priv, p, buf->sec_addr, true);
} else {
buf->sec_page = NULL;
+ stmmac_set_desc_sec_addr(priv, p, buf->sec_addr, false);
}
buf->addr = page_pool_get_dma_addr(buf->page);
@@ -3659,7 +3660,10 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv, u32 queue)
DMA_FROM_DEVICE);
stmmac_set_desc_addr(priv, p, buf->addr);
- stmmac_set_desc_sec_addr(priv, p, buf->sec_addr);
+ if (priv->sph)
+ stmmac_set_desc_sec_addr(priv, p, buf->sec_addr, true);
+ else
+ stmmac_set_desc_sec_addr(priv, p, buf->sec_addr, false);
stmmac_refill_desc3(priv, rx_q, p);
rx_q->rx_count_frames++;
--
2.17.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 6/6] ethernet: stmmac: re-init rx buffers when mac resume back
2021-01-11 11:35 [PATCH 0/6] ethernet: fixes for stmmac driver Joakim Zhang
` (4 preceding siblings ...)
2021-01-11 11:35 ` [PATCH 5/6] ethernet: stmmac: fix wrongly set buffer2 valid when sph unsupport Joakim Zhang
@ 2021-01-11 11:35 ` Joakim Zhang
5 siblings, 0 replies; 12+ messages in thread
From: Joakim Zhang @ 2021-01-11 11:35 UTC (permalink / raw)
To: peppe.cavallaro, alexandre.torgue, joabreu, davem, kuba; +Cc: netdev, linux-imx
During suspend/resume stress test, we found descriptor write back by DMA
could exhibit unusual behavior, e.g.:
003 [0xc4310030]: 0x0 0x40 0x0 0xb5010040
We can see that desc3 write back is 0xb5010040, it is still ownd by DMA,
so application would not recycle this buffer. It will trigger fatal bus
error when DMA try to use this descriptor again. To fix this issue, we
should re-init all rx buffers when mac resume back.
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
---
.../net/ethernet/stmicro/stmmac/stmmac_main.c | 73 ++++++++++++++++++-
1 file changed, 72 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index e30529b8f40a..e02d798e605b 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1328,6 +1328,77 @@ static int stmmac_init_rx_buffers(struct stmmac_priv *priv, struct dma_desc *p,
return 0;
}
+/**
+ * stmmac_reinit_rx_buffers - reinit the RX descriptor buffer.
+ * @priv: driver private structure
+ * Description: this function is called to re-allocate a receive buffer, perform
+ * the DMA mapping and init the descriptor.
+ */
+static int stmmac_reinit_rx_buffers(struct stmmac_priv *priv)
+{
+ u32 rx_count = priv->plat->rx_queues_to_use;
+ u32 queue;
+ int i;
+
+ for (queue = 0; queue < rx_count; queue++) {
+ struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue];
+
+ for (i = 0; i < priv->dma_rx_size; i++) {
+ struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
+
+ if (buf->page) {
+ page_pool_recycle_direct(rx_q->page_pool, buf->page);
+ buf->page = NULL;
+ }
+
+ if (priv->sph && buf->sec_page) {
+ page_pool_recycle_direct(rx_q->page_pool, buf->sec_page);
+ buf->sec_page = NULL;
+ }
+ }
+ }
+
+ for (queue = 0; queue < rx_count; queue++) {
+ struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue];
+
+ for (i = 0; i < priv->dma_rx_size; i++) {
+ struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
+ struct dma_desc *p;
+
+ if (priv->extend_desc)
+ p = &((rx_q->dma_erx + i)->basic);
+ else
+ p = rx_q->dma_rx + i;
+
+ if (!buf->page) {
+ buf->page = page_pool_dev_alloc_pages(rx_q->page_pool);
+ if (!buf->page)
+ break;
+
+ buf->addr = page_pool_get_dma_addr(buf->page);
+ }
+
+ if (priv->sph && !buf->sec_page) {
+ buf->sec_page = page_pool_dev_alloc_pages(rx_q->page_pool);
+ if (!buf->sec_page)
+ break;
+
+ buf->sec_addr = page_pool_get_dma_addr(buf->sec_page);
+ }
+
+ stmmac_set_desc_addr(priv, p, buf->addr);
+ if (priv->sph)
+ stmmac_set_desc_sec_addr(priv, p, buf->sec_addr, true);
+ else
+ stmmac_set_desc_sec_addr(priv, p, buf->sec_addr, false);
+ if (priv->dma_buf_sz == BUF_SIZE_16KiB)
+ stmmac_init_desc3(priv, p);
+ }
+ }
+
+ return 0;
+}
+
/**
* stmmac_free_rx_buffer - free RX dma buffers
* @priv: private structure
@@ -5338,7 +5409,7 @@ int stmmac_resume(struct device *dev)
mutex_lock(&priv->lock);
stmmac_reset_queues_param(priv);
-
+ stmmac_reinit_rx_buffers(priv);
stmmac_free_tx_skbufs(priv);
stmmac_clear_descriptors(priv);
--
2.17.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 1/6] ethernet: stmmac: remove redundant null check for ptp clock
2021-01-11 11:35 ` [PATCH 1/6] ethernet: stmmac: remove redundant null check for ptp clock Joakim Zhang
@ 2021-01-11 17:13 ` Andrew Lunn
0 siblings, 0 replies; 12+ messages in thread
From: Andrew Lunn @ 2021-01-11 17:13 UTC (permalink / raw)
To: Joakim Zhang
Cc: peppe.cavallaro, alexandre.torgue, joabreu, davem, kuba, netdev,
linux-imx
On Mon, Jan 11, 2021 at 07:35:33PM +0800, Joakim Zhang wrote:
> Remove redundant null check for ptp clock.
>
> Fixes: 1c35cc9cf6a0 ("net: stmmac: remove redundant null check before clk_disable_unprepare()")
> Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/6] ethernet: stmmac: stop each tx channal independently
2021-01-11 11:35 ` [PATCH 2/6] ethernet: stmmac: stop each tx channal independently Joakim Zhang
@ 2021-01-11 17:28 ` Florian Fainelli
0 siblings, 0 replies; 12+ messages in thread
From: Florian Fainelli @ 2021-01-11 17:28 UTC (permalink / raw)
To: Joakim Zhang, peppe.cavallaro, alexandre.torgue, joabreu, davem, kuba
Cc: netdev, linux-imx
On 1/11/21 3:35 AM, Joakim Zhang wrote:
> If clear GMAC_CONFIG_TE bit, it would stop all tx channals, but users
> may only want to stop secific tx channel.
>
> Fixes: 48863ce5940f ("stmmac: add DMA support for GMAC 4.xx")
> Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
You have a typo in your subject:channal vs. channel. You should also
prefix your patches with "net: stmmac" to be consistent. Finally, since
these are fixes, please indicate clearly which networking tree you are
targeting:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/networking/netdev-FAQ.rst#n28
Thanks
--
Florian
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 4/6] ethernet: stmmac: fix dma physical address of descriptor when display ring
2021-01-11 11:35 ` [PATCH 4/6] ethernet: stmmac: fix dma physical address of descriptor when display ring Joakim Zhang
@ 2021-01-11 17:30 ` Florian Fainelli
2021-01-12 1:41 ` Joakim Zhang
0 siblings, 1 reply; 12+ messages in thread
From: Florian Fainelli @ 2021-01-11 17:30 UTC (permalink / raw)
To: Joakim Zhang, peppe.cavallaro, alexandre.torgue, joabreu, davem, kuba
Cc: netdev, linux-imx
On 1/11/21 3:35 AM, Joakim Zhang wrote:
> Driver uses dma_alloc_coherent to allocate dma memory for descriptors,
> dma_alloc_coherent will return both the virtual address and physical
> address. AFAIK, virt_to_phys could not convert virtual address to
> physical address, for which memory is allocated by dma_alloc_coherent.
>
> Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
> ---
> .../ethernet/stmicro/stmmac/dwmac4_descs.c | 5 +-
> .../net/ethernet/stmicro/stmmac/enh_desc.c | 5 +-
> drivers/net/ethernet/stmicro/stmmac/hwif.h | 3 +-
> .../net/ethernet/stmicro/stmmac/norm_desc.c | 5 +-
> .../net/ethernet/stmicro/stmmac/stmmac_main.c | 50 ++++++++++++-------
> 5 files changed, 44 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
> index c6540b003b43..8e1ee33ba1e6 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
> @@ -402,7 +402,8 @@ static void dwmac4_rd_set_tx_ic(struct dma_desc *p)
> p->des2 |= cpu_to_le32(TDES2_INTERRUPT_ON_COMPLETION);
> }
>
> -static void dwmac4_display_ring(void *head, unsigned int size, bool rx)
> +static void dwmac4_display_ring(void *head, unsigned int size, bool rx,
> + unsigned int dma_rx_phy, unsigned int desc_size)
> {
> struct dma_desc *p = (struct dma_desc *)head;
> int i;
> @@ -411,7 +412,7 @@ static void dwmac4_display_ring(void *head, unsigned int size, bool rx)
>
> for (i = 0; i < size; i++) {
> pr_info("%03d [0x%x]: 0x%x 0x%x 0x%x 0x%x\n",
> - i, (unsigned int)virt_to_phys(p),
> + i, (unsigned int)(dma_rx_phy + i * desc_size),
This code will probably not work correctly on a machine with physical
addresses greater than 32-bit anyway and the address bits would be
truncated then, cannot you use a phy_addr_t or dma_addr_t and use %pa as
far as the printk format goes?
--
Florian
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 5/6] ethernet: stmmac: fix wrongly set buffer2 valid when sph unsupport
2021-01-11 11:35 ` [PATCH 5/6] ethernet: stmmac: fix wrongly set buffer2 valid when sph unsupport Joakim Zhang
@ 2021-01-11 22:24 ` Jakub Kicinski
0 siblings, 0 replies; 12+ messages in thread
From: Jakub Kicinski @ 2021-01-11 22:24 UTC (permalink / raw)
To: Joakim Zhang
Cc: peppe.cavallaro, alexandre.torgue, joabreu, davem, netdev, linux-imx
On Mon, 11 Jan 2021 19:35:37 +0800 Joakim Zhang wrote:
> In current driver, buffer2 available only when hardware supports split
> header. Wrongly set buffer2 valid in stmmac_rx_refill when refill buffer
> address. You can see that desc3 is 0x81000000 after initialization, but
> turn out to be 0x83000000 after refill.
>
> Fixes: 67afd6d1cfdf ("net: stmmac: Add Split Header support and enable it in XGMAC cores")
> Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Please make sure there are no new sparse warnings (build flags: W=1 C=1):
drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c:509:25: warning: invalid assignment: |=
drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c:509:25: left side has type restricted __le32
drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c:509:25: right side has type unsigned long
drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c:511:25: warning: invalid assignment: &=
drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c:511:25: left side has type restricted __le32
drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c:511:25: right side has type unsigned long
^ permalink raw reply [flat|nested] 12+ messages in thread
* RE: [PATCH 4/6] ethernet: stmmac: fix dma physical address of descriptor when display ring
2021-01-11 17:30 ` Florian Fainelli
@ 2021-01-12 1:41 ` Joakim Zhang
0 siblings, 0 replies; 12+ messages in thread
From: Joakim Zhang @ 2021-01-12 1:41 UTC (permalink / raw)
To: Florian Fainelli, peppe.cavallaro, alexandre.torgue, joabreu,
davem, kuba
Cc: netdev, dl-linux-imx
> -----Original Message-----
> From: Florian Fainelli <f.fainelli@gmail.com>
> Sent: 2021年1月12日 1:30
> To: Joakim Zhang <qiangqing.zhang@nxp.com>; peppe.cavallaro@st.com;
> alexandre.torgue@st.com; joabreu@synopsys.com; davem@davemloft.net;
> kuba@kernel.org
> Cc: netdev@vger.kernel.org; dl-linux-imx <linux-imx@nxp.com>
> Subject: Re: [PATCH 4/6] ethernet: stmmac: fix dma physical address of
> descriptor when display ring
>
> On 1/11/21 3:35 AM, Joakim Zhang wrote:
> > Driver uses dma_alloc_coherent to allocate dma memory for descriptors,
> > dma_alloc_coherent will return both the virtual address and physical
> > address. AFAIK, virt_to_phys could not convert virtual address to
> > physical address, for which memory is allocated by dma_alloc_coherent.
> >
> > Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
> > ---
> > .../ethernet/stmicro/stmmac/dwmac4_descs.c | 5 +-
> > .../net/ethernet/stmicro/stmmac/enh_desc.c | 5 +-
> > drivers/net/ethernet/stmicro/stmmac/hwif.h | 3 +-
> > .../net/ethernet/stmicro/stmmac/norm_desc.c | 5 +-
> > .../net/ethernet/stmicro/stmmac/stmmac_main.c | 50
> > ++++++++++++-------
> > 5 files changed, 44 insertions(+), 24 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
> > b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
> > index c6540b003b43..8e1ee33ba1e6 100644
> > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
> > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
> > @@ -402,7 +402,8 @@ static void dwmac4_rd_set_tx_ic(struct dma_desc
> *p)
> > p->des2 |= cpu_to_le32(TDES2_INTERRUPT_ON_COMPLETION);
> > }
> >
> > -static void dwmac4_display_ring(void *head, unsigned int size, bool
> > rx)
> > +static void dwmac4_display_ring(void *head, unsigned int size, bool rx,
> > + unsigned int dma_rx_phy, unsigned int desc_size)
> > {
> > struct dma_desc *p = (struct dma_desc *)head;
> > int i;
> > @@ -411,7 +412,7 @@ static void dwmac4_display_ring(void *head,
> > unsigned int size, bool rx)
> >
> > for (i = 0; i < size; i++) {
> > pr_info("%03d [0x%x]: 0x%x 0x%x 0x%x 0x%x\n",
> > - i, (unsigned int)virt_to_phys(p),
> > + i, (unsigned int)(dma_rx_phy + i * desc_size),
>
> This code will probably not work correctly on a machine with physical addresses
> greater than 32-bit anyway and the address bits would be truncated then,
> cannot you use a phy_addr_t or dma_addr_t and use %pa as far as the printk
> format goes?
Thanks, I will fix it.
Best Regards,
Joakim Zhang
> --
> Florian
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2021-01-12 1:42 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-11 11:35 [PATCH 0/6] ethernet: fixes for stmmac driver Joakim Zhang
2021-01-11 11:35 ` [PATCH 1/6] ethernet: stmmac: remove redundant null check for ptp clock Joakim Zhang
2021-01-11 17:13 ` Andrew Lunn
2021-01-11 11:35 ` [PATCH 2/6] ethernet: stmmac: stop each tx channal independently Joakim Zhang
2021-01-11 17:28 ` Florian Fainelli
2021-01-11 11:35 ` [PATCH 3/6] ethernet: stmmac: fix watchdog timeout during suspend/resume stress test Joakim Zhang
2021-01-11 11:35 ` [PATCH 4/6] ethernet: stmmac: fix dma physical address of descriptor when display ring Joakim Zhang
2021-01-11 17:30 ` Florian Fainelli
2021-01-12 1:41 ` Joakim Zhang
2021-01-11 11:35 ` [PATCH 5/6] ethernet: stmmac: fix wrongly set buffer2 valid when sph unsupport Joakim Zhang
2021-01-11 22:24 ` Jakub Kicinski
2021-01-11 11:35 ` [PATCH 6/6] ethernet: stmmac: re-init rx buffers when mac resume back Joakim Zhang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).