commit133466c3bb
("net: stmmac: use per-queue 64 bit statistics where necessary") caused one regression as found by Uwe, the backtrace looks like: INFO: trying to register non-static key. The code is fine but needs lockdep annotation, or maybe you didn't initialize this object before use? turning off the locking correctness validator. CPU: 0 PID: 1 Comm: swapper/0 Not tainted 6.5.0-rc1-00449-g133466c3bbe1-dirty #21 Hardware name: STM32 (Device Tree Support) unwind_backtrace from show_stack+0x18/0x1c show_stack from dump_stack_lvl+0x60/0x90 dump_stack_lvl from register_lock_class+0x98c/0x99c register_lock_class from __lock_acquire+0x74/0x293c __lock_acquire from lock_acquire+0x134/0x398 lock_acquire from stmmac_get_stats64+0x2ac/0x2fc stmmac_get_stats64 from dev_get_stats+0x44/0x130 dev_get_stats from rtnl_fill_stats+0x38/0x120 rtnl_fill_stats from rtnl_fill_ifinfo+0x834/0x17f4 rtnl_fill_ifinfo from rtmsg_ifinfo_build_skb+0xc0/0x144 rtmsg_ifinfo_build_skb from rtmsg_ifinfo+0x50/0x88 rtmsg_ifinfo from __dev_notify_flags+0xc0/0xec __dev_notify_flags from dev_change_flags+0x50/0x5c dev_change_flags from ip_auto_config+0x2f4/0x1260 ip_auto_config from do_one_initcall+0x70/0x35c do_one_initcall from kernel_init_freeable+0x2ac/0x308 kernel_init_freeable from kernel_init+0x1c/0x138 kernel_init from ret_from_fork+0x14/0x2c The reason is the rxq|txq_stats structures are not what expected because stmmac_open() -> __stmmac_open() the structure is overwritten by "memcpy(&priv->dma_conf, dma_conf, sizeof(*dma_conf));" This causes the well initialized syncp member of rxq|txq_stats is overwritten unexpectedly as pointed out by Johannes and Uwe. Fix this issue by moving rxq|txq_stats back to stmmac_extra_stats. For SMP cache friendly, we also mark stmmac_txq_stats and stmmac_rxq_stats as ____cacheline_aligned_in_smp. Fixes:133466c3bb
("net: stmmac: use per-queue 64 bit statistics where necessary") Signed-off-by: Jisheng Zhang <jszhang@kernel.org> Reported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Tested-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Link: https://lore.kernel.org/r/20230917165328.3403-1-jszhang@kernel.org Signed-off-by: Paolo Abeni <pabeni@redhat.com>
273 lines
7.9 KiB
C
273 lines
7.9 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright (C) 2007-2015 STMicroelectronics Ltd
|
|
*
|
|
* Author: Alexandre Torgue <alexandre.torgue@st.com>
|
|
*/
|
|
|
|
#include <linux/io.h>
|
|
#include <linux/iopoll.h>
|
|
#include <linux/delay.h>
|
|
#include "common.h"
|
|
#include "dwmac4_dma.h"
|
|
#include "dwmac4.h"
|
|
#include "stmmac.h"
|
|
|
|
int dwmac4_dma_reset(void __iomem *ioaddr)
|
|
{
|
|
u32 value = readl(ioaddr + DMA_BUS_MODE);
|
|
|
|
/* DMA SW reset */
|
|
value |= DMA_BUS_MODE_SFT_RESET;
|
|
writel(value, ioaddr + DMA_BUS_MODE);
|
|
|
|
return readl_poll_timeout(ioaddr + DMA_BUS_MODE, value,
|
|
!(value & DMA_BUS_MODE_SFT_RESET),
|
|
10000, 1000000);
|
|
}
|
|
|
|
void dwmac4_set_rx_tail_ptr(struct stmmac_priv *priv, void __iomem *ioaddr,
|
|
u32 tail_ptr, u32 chan)
|
|
{
|
|
const struct dwmac4_addrs *dwmac4_addrs = priv->plat->dwmac4_addrs;
|
|
|
|
writel(tail_ptr, ioaddr + DMA_CHAN_RX_END_ADDR(dwmac4_addrs, chan));
|
|
}
|
|
|
|
void dwmac4_set_tx_tail_ptr(struct stmmac_priv *priv, void __iomem *ioaddr,
|
|
u32 tail_ptr, u32 chan)
|
|
{
|
|
const struct dwmac4_addrs *dwmac4_addrs = priv->plat->dwmac4_addrs;
|
|
|
|
writel(tail_ptr, ioaddr + DMA_CHAN_TX_END_ADDR(dwmac4_addrs, chan));
|
|
}
|
|
|
|
void dwmac4_dma_start_tx(struct stmmac_priv *priv, void __iomem *ioaddr,
|
|
u32 chan)
|
|
{
|
|
const struct dwmac4_addrs *dwmac4_addrs = priv->plat->dwmac4_addrs;
|
|
u32 value = readl(ioaddr + DMA_CHAN_TX_CONTROL(dwmac4_addrs, chan));
|
|
|
|
value |= DMA_CONTROL_ST;
|
|
writel(value, ioaddr + DMA_CHAN_TX_CONTROL(dwmac4_addrs, chan));
|
|
|
|
value = readl(ioaddr + GMAC_CONFIG);
|
|
value |= GMAC_CONFIG_TE;
|
|
writel(value, ioaddr + GMAC_CONFIG);
|
|
}
|
|
|
|
void dwmac4_dma_stop_tx(struct stmmac_priv *priv, void __iomem *ioaddr,
|
|
u32 chan)
|
|
{
|
|
const struct dwmac4_addrs *dwmac4_addrs = priv->plat->dwmac4_addrs;
|
|
|
|
u32 value = readl(ioaddr + DMA_CHAN_TX_CONTROL(dwmac4_addrs, chan));
|
|
|
|
value &= ~DMA_CONTROL_ST;
|
|
writel(value, ioaddr + DMA_CHAN_TX_CONTROL(dwmac4_addrs, chan));
|
|
}
|
|
|
|
void dwmac4_dma_start_rx(struct stmmac_priv *priv, void __iomem *ioaddr,
|
|
u32 chan)
|
|
{
|
|
const struct dwmac4_addrs *dwmac4_addrs = priv->plat->dwmac4_addrs;
|
|
|
|
u32 value = readl(ioaddr + DMA_CHAN_RX_CONTROL(dwmac4_addrs, chan));
|
|
|
|
value |= DMA_CONTROL_SR;
|
|
|
|
writel(value, ioaddr + DMA_CHAN_RX_CONTROL(dwmac4_addrs, chan));
|
|
|
|
value = readl(ioaddr + GMAC_CONFIG);
|
|
value |= GMAC_CONFIG_RE;
|
|
writel(value, ioaddr + GMAC_CONFIG);
|
|
}
|
|
|
|
void dwmac4_dma_stop_rx(struct stmmac_priv *priv, void __iomem *ioaddr,
|
|
u32 chan)
|
|
{
|
|
const struct dwmac4_addrs *dwmac4_addrs = priv->plat->dwmac4_addrs;
|
|
u32 value = readl(ioaddr + DMA_CHAN_RX_CONTROL(dwmac4_addrs, chan));
|
|
|
|
value &= ~DMA_CONTROL_SR;
|
|
writel(value, ioaddr + DMA_CHAN_RX_CONTROL(dwmac4_addrs, chan));
|
|
}
|
|
|
|
void dwmac4_set_tx_ring_len(struct stmmac_priv *priv, void __iomem *ioaddr,
|
|
u32 len, u32 chan)
|
|
{
|
|
const struct dwmac4_addrs *dwmac4_addrs = priv->plat->dwmac4_addrs;
|
|
|
|
writel(len, ioaddr + DMA_CHAN_TX_RING_LEN(dwmac4_addrs, chan));
|
|
}
|
|
|
|
void dwmac4_set_rx_ring_len(struct stmmac_priv *priv, void __iomem *ioaddr,
|
|
u32 len, u32 chan)
|
|
{
|
|
const struct dwmac4_addrs *dwmac4_addrs = priv->plat->dwmac4_addrs;
|
|
|
|
writel(len, ioaddr + DMA_CHAN_RX_RING_LEN(dwmac4_addrs, chan));
|
|
}
|
|
|
|
void dwmac4_enable_dma_irq(struct stmmac_priv *priv, void __iomem *ioaddr,
|
|
u32 chan, bool rx, bool tx)
|
|
{
|
|
const struct dwmac4_addrs *dwmac4_addrs = priv->plat->dwmac4_addrs;
|
|
u32 value = readl(ioaddr + DMA_CHAN_INTR_ENA(dwmac4_addrs, chan));
|
|
|
|
if (rx)
|
|
value |= DMA_CHAN_INTR_DEFAULT_RX;
|
|
if (tx)
|
|
value |= DMA_CHAN_INTR_DEFAULT_TX;
|
|
|
|
writel(value, ioaddr + DMA_CHAN_INTR_ENA(dwmac4_addrs, chan));
|
|
}
|
|
|
|
void dwmac410_enable_dma_irq(struct stmmac_priv *priv, void __iomem *ioaddr,
|
|
u32 chan, bool rx, bool tx)
|
|
{
|
|
const struct dwmac4_addrs *dwmac4_addrs = priv->plat->dwmac4_addrs;
|
|
u32 value = readl(ioaddr + DMA_CHAN_INTR_ENA(dwmac4_addrs, chan));
|
|
|
|
if (rx)
|
|
value |= DMA_CHAN_INTR_DEFAULT_RX_4_10;
|
|
if (tx)
|
|
value |= DMA_CHAN_INTR_DEFAULT_TX_4_10;
|
|
|
|
writel(value, ioaddr + DMA_CHAN_INTR_ENA(dwmac4_addrs, chan));
|
|
}
|
|
|
|
void dwmac4_disable_dma_irq(struct stmmac_priv *priv, void __iomem *ioaddr,
|
|
u32 chan, bool rx, bool tx)
|
|
{
|
|
const struct dwmac4_addrs *dwmac4_addrs = priv->plat->dwmac4_addrs;
|
|
u32 value = readl(ioaddr + DMA_CHAN_INTR_ENA(dwmac4_addrs, chan));
|
|
|
|
if (rx)
|
|
value &= ~DMA_CHAN_INTR_DEFAULT_RX;
|
|
if (tx)
|
|
value &= ~DMA_CHAN_INTR_DEFAULT_TX;
|
|
|
|
writel(value, ioaddr + DMA_CHAN_INTR_ENA(dwmac4_addrs, chan));
|
|
}
|
|
|
|
void dwmac410_disable_dma_irq(struct stmmac_priv *priv, void __iomem *ioaddr,
|
|
u32 chan, bool rx, bool tx)
|
|
{
|
|
const struct dwmac4_addrs *dwmac4_addrs = priv->plat->dwmac4_addrs;
|
|
u32 value = readl(ioaddr + DMA_CHAN_INTR_ENA(dwmac4_addrs, chan));
|
|
|
|
if (rx)
|
|
value &= ~DMA_CHAN_INTR_DEFAULT_RX_4_10;
|
|
if (tx)
|
|
value &= ~DMA_CHAN_INTR_DEFAULT_TX_4_10;
|
|
|
|
writel(value, ioaddr + DMA_CHAN_INTR_ENA(dwmac4_addrs, chan));
|
|
}
|
|
|
|
int dwmac4_dma_interrupt(struct stmmac_priv *priv, void __iomem *ioaddr,
|
|
struct stmmac_extra_stats *x, u32 chan, u32 dir)
|
|
{
|
|
const struct dwmac4_addrs *dwmac4_addrs = priv->plat->dwmac4_addrs;
|
|
u32 intr_status = readl(ioaddr + DMA_CHAN_STATUS(dwmac4_addrs, chan));
|
|
u32 intr_en = readl(ioaddr + DMA_CHAN_INTR_ENA(dwmac4_addrs, chan));
|
|
struct stmmac_rxq_stats *rxq_stats = &priv->xstats.rxq_stats[chan];
|
|
struct stmmac_txq_stats *txq_stats = &priv->xstats.txq_stats[chan];
|
|
int ret = 0;
|
|
|
|
if (dir == DMA_DIR_RX)
|
|
intr_status &= DMA_CHAN_STATUS_MSK_RX;
|
|
else if (dir == DMA_DIR_TX)
|
|
intr_status &= DMA_CHAN_STATUS_MSK_TX;
|
|
|
|
/* ABNORMAL interrupts */
|
|
if (unlikely(intr_status & DMA_CHAN_STATUS_AIS)) {
|
|
if (unlikely(intr_status & DMA_CHAN_STATUS_RBU))
|
|
x->rx_buf_unav_irq++;
|
|
if (unlikely(intr_status & DMA_CHAN_STATUS_RPS))
|
|
x->rx_process_stopped_irq++;
|
|
if (unlikely(intr_status & DMA_CHAN_STATUS_RWT))
|
|
x->rx_watchdog_irq++;
|
|
if (unlikely(intr_status & DMA_CHAN_STATUS_ETI))
|
|
x->tx_early_irq++;
|
|
if (unlikely(intr_status & DMA_CHAN_STATUS_TPS)) {
|
|
x->tx_process_stopped_irq++;
|
|
ret = tx_hard_error;
|
|
}
|
|
if (unlikely(intr_status & DMA_CHAN_STATUS_FBE)) {
|
|
x->fatal_bus_error_irq++;
|
|
ret = tx_hard_error;
|
|
}
|
|
}
|
|
/* TX/RX NORMAL interrupts */
|
|
if (likely(intr_status & DMA_CHAN_STATUS_RI)) {
|
|
u64_stats_update_begin(&rxq_stats->syncp);
|
|
rxq_stats->rx_normal_irq_n++;
|
|
u64_stats_update_end(&rxq_stats->syncp);
|
|
ret |= handle_rx;
|
|
}
|
|
if (likely(intr_status & DMA_CHAN_STATUS_TI)) {
|
|
u64_stats_update_begin(&txq_stats->syncp);
|
|
txq_stats->tx_normal_irq_n++;
|
|
u64_stats_update_end(&txq_stats->syncp);
|
|
ret |= handle_tx;
|
|
}
|
|
|
|
if (unlikely(intr_status & DMA_CHAN_STATUS_TBU))
|
|
ret |= handle_tx;
|
|
if (unlikely(intr_status & DMA_CHAN_STATUS_ERI))
|
|
x->rx_early_irq++;
|
|
|
|
writel(intr_status & intr_en,
|
|
ioaddr + DMA_CHAN_STATUS(dwmac4_addrs, chan));
|
|
return ret;
|
|
}
|
|
|
|
void stmmac_dwmac4_set_mac_addr(void __iomem *ioaddr, const u8 addr[6],
|
|
unsigned int high, unsigned int low)
|
|
{
|
|
unsigned long data;
|
|
|
|
data = (addr[5] << 8) | addr[4];
|
|
/* For MAC Addr registers se have to set the Address Enable (AE)
|
|
* bit that has no effect on the High Reg 0 where the bit 31 (MO)
|
|
* is RO.
|
|
*/
|
|
data |= (STMMAC_CHAN0 << GMAC_HI_DCS_SHIFT);
|
|
writel(data | GMAC_HI_REG_AE, ioaddr + high);
|
|
data = (addr[3] << 24) | (addr[2] << 16) | (addr[1] << 8) | addr[0];
|
|
writel(data, ioaddr + low);
|
|
}
|
|
|
|
/* Enable disable MAC RX/TX */
|
|
void stmmac_dwmac4_set_mac(void __iomem *ioaddr, bool enable)
|
|
{
|
|
u32 value = readl(ioaddr + GMAC_CONFIG);
|
|
u32 old_val = value;
|
|
|
|
if (enable)
|
|
value |= GMAC_CONFIG_RE | GMAC_CONFIG_TE;
|
|
else
|
|
value &= ~(GMAC_CONFIG_TE | GMAC_CONFIG_RE);
|
|
|
|
if (value != old_val)
|
|
writel(value, ioaddr + GMAC_CONFIG);
|
|
}
|
|
|
|
void stmmac_dwmac4_get_mac_addr(void __iomem *ioaddr, unsigned char *addr,
|
|
unsigned int high, unsigned int low)
|
|
{
|
|
unsigned int hi_addr, lo_addr;
|
|
|
|
/* Read the MAC address from the hardware */
|
|
hi_addr = readl(ioaddr + high);
|
|
lo_addr = readl(ioaddr + low);
|
|
|
|
/* Extract the MAC address from the high and low words */
|
|
addr[0] = lo_addr & 0xff;
|
|
addr[1] = (lo_addr >> 8) & 0xff;
|
|
addr[2] = (lo_addr >> 16) & 0xff;
|
|
addr[3] = (lo_addr >> 24) & 0xff;
|
|
addr[4] = hi_addr & 0xff;
|
|
addr[5] = (hi_addr >> 8) & 0xff;
|
|
}
|