Commit 58f3240b authored by Rohan G Thomas's avatar Rohan G Thomas Committed by Jakub Kicinski

net: stmmac: xgmac: EST interrupts handling

Enabled the following EST related interrupts:
  1) Constant Gate Control Error (CGCE)
  2) Head-of-Line Blocking due to Scheduling (HLBS)
  3) Head-of-Line Blocking due to Frame Size (HLBF)
  4) Base Time Register error (BTRE)
  5) Switch to S/W owned list Complete (SWLC)
Also, add EST errors into the ethtool statistic.

The commit e49aa315 ("net: stmmac: EST interrupts handling and
error reporting") and commit 9f298959 ("net: stmmac: Add EST
errors into ethtool statistic") add EST interrupts handling and error
reporting support to DWMAC4 core. This patch enables the same support
for XGMAC.
Signed-off-by: default avatarRohan G Thomas <rohan.g.thomas@intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20231201055252.1302-2-rohan.g.thomas@intel.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent be5fc78a
......@@ -289,6 +289,33 @@
#define XGMAC_PTOV_SHIFT 23
#define XGMAC_SSWL BIT(1)
#define XGMAC_EEST BIT(0)
#define XGMAC_MTL_EST_STATUS 0x00001058
#define XGMAC_BTRL GENMASK(15, 8)
#define XGMAC_BTRL_SHIFT 8
#define XGMAC_BTRL_MAX GENMASK(15, 8)
#define XGMAC_CGCE BIT(4)
#define XGMAC_HLBS BIT(3)
#define XGMAC_HLBF BIT(2)
#define XGMAC_BTRE BIT(1)
#define XGMAC_SWLC BIT(0)
#define XGMAC_MTL_EST_SCH_ERR 0x00001060
#define XGMAC_MTL_EST_FRM_SZ_ERR 0x00001064
#define XGMAC_MTL_EST_FRM_SZ_CAP 0x00001068
#define XGMAC_SZ_CAP_HBFS_MASK GENMASK(14, 0)
#define XGMAC_SZ_CAP_HBFQ_SHIFT 16
#define XGMAC_SZ_CAP_HBFQ_MASK(val) \
({ \
typeof(val) _val = (val); \
(_val > 4 ? GENMASK(18, 16) : \
_val > 2 ? GENMASK(17, 16) : \
BIT(16)); \
})
#define XGMAC_MTL_EST_INT_EN 0x00001070
#define XGMAC_IECGCE BIT(4)
#define XGMAC_IEHS BIT(3)
#define XGMAC_IEHF BIT(2)
#define XGMAC_IEBE BIT(1)
#define XGMAC_IECC BIT(0)
#define XGMAC_MTL_EST_GCL_CONTROL 0x00001080
#define XGMAC_BTR_LOW 0x0
#define XGMAC_BTR_HIGH 0x1
......
......@@ -1481,9 +1481,97 @@ static int dwxgmac3_est_configure(void __iomem *ioaddr, struct stmmac_est *cfg,
ctrl &= ~XGMAC_EEST;
writel(ctrl, ioaddr + XGMAC_MTL_EST_CONTROL);
/* Configure EST interrupt */
if (cfg->enable)
ctrl = XGMAC_IECGCE | XGMAC_IEHS | XGMAC_IEHF | XGMAC_IEBE |
XGMAC_IECC;
else
ctrl = 0;
writel(ctrl, ioaddr + XGMAC_MTL_EST_INT_EN);
return 0;
}
static void dwxgmac3_est_irq_status(void __iomem *ioaddr,
struct net_device *dev,
struct stmmac_extra_stats *x, u32 txqcnt)
{
u32 status, value, feqn, hbfq, hbfs, btrl;
u32 txqcnt_mask = BIT(txqcnt) - 1;
status = readl(ioaddr + XGMAC_MTL_EST_STATUS);
value = XGMAC_CGCE | XGMAC_HLBS | XGMAC_HLBF | XGMAC_BTRE | XGMAC_SWLC;
/* Return if there is no error */
if (!(status & value))
return;
if (status & XGMAC_CGCE) {
/* Clear Interrupt */
writel(XGMAC_CGCE, ioaddr + XGMAC_MTL_EST_STATUS);
x->mtl_est_cgce++;
}
if (status & XGMAC_HLBS) {
value = readl(ioaddr + XGMAC_MTL_EST_SCH_ERR);
value &= txqcnt_mask;
x->mtl_est_hlbs++;
/* Clear Interrupt */
writel(value, ioaddr + XGMAC_MTL_EST_SCH_ERR);
/* Collecting info to shows all the queues that has HLBS
* issue. The only way to clear this is to clear the
* statistic.
*/
if (net_ratelimit())
netdev_err(dev, "EST: HLB(sched) Queue 0x%x\n", value);
}
if (status & XGMAC_HLBF) {
value = readl(ioaddr + XGMAC_MTL_EST_FRM_SZ_ERR);
feqn = value & txqcnt_mask;
value = readl(ioaddr + XGMAC_MTL_EST_FRM_SZ_CAP);
hbfq = (value & XGMAC_SZ_CAP_HBFQ_MASK(txqcnt)) >>
XGMAC_SZ_CAP_HBFQ_SHIFT;
hbfs = value & XGMAC_SZ_CAP_HBFS_MASK;
x->mtl_est_hlbf++;
/* Clear Interrupt */
writel(feqn, ioaddr + XGMAC_MTL_EST_FRM_SZ_ERR);
if (net_ratelimit())
netdev_err(dev, "EST: HLB(size) Queue %u Size %u\n",
hbfq, hbfs);
}
if (status & XGMAC_BTRE) {
if ((status & XGMAC_BTRL) == XGMAC_BTRL_MAX)
x->mtl_est_btrlm++;
else
x->mtl_est_btre++;
btrl = (status & XGMAC_BTRL) >> XGMAC_BTRL_SHIFT;
if (net_ratelimit())
netdev_info(dev, "EST: BTR Error Loop Count %u\n",
btrl);
writel(XGMAC_BTRE, ioaddr + XGMAC_MTL_EST_STATUS);
}
if (status & XGMAC_SWLC) {
writel(XGMAC_SWLC, ioaddr + XGMAC_MTL_EST_STATUS);
netdev_info(dev, "EST: SWOL has been switched\n");
}
}
static void dwxgmac3_fpe_configure(void __iomem *ioaddr, u32 num_txq,
u32 num_rxq, bool enable)
{
......@@ -1553,6 +1641,7 @@ const struct stmmac_ops dwxgmac210_ops = {
.config_l4_filter = dwxgmac2_config_l4_filter,
.set_arp_offload = dwxgmac2_set_arp_offload,
.est_configure = dwxgmac3_est_configure,
.est_irq_status = dwxgmac3_est_irq_status,
.fpe_configure = dwxgmac3_fpe_configure,
};
......@@ -1615,6 +1704,7 @@ const struct stmmac_ops dwxlgmac2_ops = {
.config_l4_filter = dwxgmac2_config_l4_filter,
.set_arp_offload = dwxgmac2_set_arp_offload,
.est_configure = dwxgmac3_est_configure,
.est_irq_status = dwxgmac3_est_irq_status,
.fpe_configure = dwxgmac3_fpe_configure,
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment