Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp1064606ybl; Wed, 29 Jan 2020 14:41:27 -0800 (PST) X-Google-Smtp-Source: APXvYqzzk04cIx08W+4Y60XLMtD7q3kzS5p7LykQAzpaMfJF0jyn89+7iEX3nziTKrdspgFHgDp2 X-Received: by 2002:a9d:66c1:: with SMTP id t1mr1135301otm.73.1580337687791; Wed, 29 Jan 2020 14:41:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580337687; cv=none; d=google.com; s=arc-20160816; b=UlH5pASdE1erHDlVkpIDp19AbYNnAFpJ1Hj0DTgTFIOHJOifvR/DKMLqhHzjeeNhdY pol0CioZ7CqsR9Zz2DBDSscpalwlE44bZS40m4OMSE7npasthRpu1H2A20ZGvPM02X+a Ptvs7MdqP7Z4xidNAhKikz0OOlPWvZVh3JugtgQUu6FGykw75r8Nf36wAijN/o8t3r8h dJKuNfGuevcvMKf0A8LFhmkVI0JtWuAS0SidDj6s0D3GYh32GQJwDhPJ/YTuUq/MzIds 0beqr2s73r5pGHw/Rqx1vLgDRUoIfyLT+j3cD4BUFO3bd+wd4c5V+iyhTg3Q11CONnPJ dXCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=afnbAXfGXcSS3Z6e0exZz6bALeUyak6PlHGMqQkGc+0=; b=P8IfMl5kGG8lnU5UMgM//MiNwxM2+lMSXcufj8MVb9g/KnU0clknF1w7TVpI97YIU+ 2Pd7b0Uq62dYWcduWOHNJRrQmkAZIcnbUhBLbjnLdIytZs9/bqksmH8SxTJt/RBTdFSG HsxURvwA06Qr+n/Sv7hk4FJ2Zz7tQsVGjwOA0yOwYwH7W5ORaV80Zm47RBhrYEW4ed/t scRJCdQtqkxl2iuNT4kd8Hb//7OpOnUyI6pCQl3YbXRyQEhnDeueDo+kkcLFT7ovWiJT UWO5rByKl/9hZdKs4nzwpC4xNLSJrvMCq0ILM2NC1Cixk6vJM9p5tO5AXNAuOecGttRU FwCQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m26si1715267otr.159.2020.01.29.14.41.14; Wed, 29 Jan 2020 14:41:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726750AbgA2WjO (ORCPT + 99 others); Wed, 29 Jan 2020 17:39:14 -0500 Received: from lists.gateworks.com ([108.161.130.12]:33891 "EHLO lists.gateworks.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726283AbgA2WjO (ORCPT ); Wed, 29 Jan 2020 17:39:14 -0500 Received: from 68-189-91-139.static.snlo.ca.charter.com ([68.189.91.139] helo=rjones.pdc.gateworks.com) by lists.gateworks.com with esmtp (Exim 4.82) (envelope-from ) id 1iwvxA-0007j9-Ne; Wed, 29 Jan 2020 22:36:56 +0000 From: Robert Jones To: Sunil Goutham , Robert Richter , David Miller Cc: linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Tim Harvey Subject: [PATCH net] net: thunderx: workaround BGX TX Underflow issue Date: Wed, 29 Jan 2020 14:36:09 -0800 Message-Id: <20200129223609.9327-1-rjones@gateworks.com> X-Mailer: git-send-email 2.9.2 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tim Harvey While it is not yet understood why a TX underflow can easily occur for SGMII interfaces resulting in a TX wedge. It has been found that disabling/re-enabling the LMAC resolves the issue. Signed-off-by: Tim Harvey Reviewed-by: Robert Jones --- drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 54 +++++++++++++++++++++++ drivers/net/ethernet/cavium/thunder/thunder_bgx.h | 9 ++++ 2 files changed, 63 insertions(+) diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c index c4f6ec0..078ecea 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c @@ -74,6 +74,7 @@ struct bgx { struct pci_dev *pdev; bool is_dlm; bool is_rgx; + char irq_name[7]; }; static struct bgx *bgx_vnic[MAX_BGX_THUNDER]; @@ -1535,6 +1536,53 @@ static int bgx_init_phy(struct bgx *bgx) return bgx_init_of_phy(bgx); } +static irqreturn_t bgx_intr_handler(int irq, void *data) +{ + struct bgx *bgx = (struct bgx *)data; + struct device *dev = &bgx->pdev->dev; + u64 status, val; + int lmac; + + for (lmac = 0; lmac < bgx->lmac_count; lmac++) { + status = bgx_reg_read(bgx, lmac, BGX_GMP_GMI_TXX_INT); + if (status & GMI_TXX_INT_UNDFLW) { + dev_err(dev, "BGX%d lmac%d UNDFLW\n", bgx->bgx_id, + lmac); + val = bgx_reg_read(bgx, lmac, BGX_CMRX_CFG); + val &= ~CMR_EN; + bgx_reg_write(bgx, lmac, BGX_CMRX_CFG, val); + val |= CMR_EN; + bgx_reg_write(bgx, lmac, BGX_CMRX_CFG, val); + } + /* clear interrupts */ + bgx_reg_write(bgx, lmac, BGX_GMP_GMI_TXX_INT, status); + } + + return IRQ_HANDLED; +} + +static int bgx_register_intr(struct pci_dev *pdev) +{ + struct bgx *bgx = pci_get_drvdata(pdev); + struct device *dev = &pdev->dev; + int num_vec, ret; + + /* Enable MSI-X */ + num_vec = pci_msix_vec_count(pdev); + ret = pci_alloc_irq_vectors(pdev, num_vec, num_vec, PCI_IRQ_MSIX); + if (ret < 0) { + dev_err(dev, "Req for #%d msix vectors failed\n", num_vec); + return 1; + } + sprintf(bgx->irq_name, "BGX%d", bgx->bgx_id); + ret = request_irq(pci_irq_vector(pdev, GMPX_GMI_TX_INT), + bgx_intr_handler, 0, bgx->irq_name, bgx); + if (ret) + return 1; + + return 0; +} + static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { int err; @@ -1604,6 +1652,8 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) bgx_init_hw(bgx); + bgx_register_intr(pdev); + /* Enable all LMACs */ for (lmac = 0; lmac < bgx->lmac_count; lmac++) { err = bgx_lmac_enable(bgx, lmac); @@ -1614,6 +1664,10 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) bgx_lmac_disable(bgx, --lmac); goto err_enable; } + + /* enable TX FIFO Underflow interrupt */ + bgx_reg_modify(bgx, lmac, BGX_GMP_GMI_TXX_INT_ENA_W1S, + GMI_TXX_INT_UNDFLW); } return 0; diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h index 2588870..cdea493 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h @@ -180,6 +180,15 @@ #define BGX_GMP_GMI_TXX_BURST 0x38228 #define BGX_GMP_GMI_TXX_MIN_PKT 0x38240 #define BGX_GMP_GMI_TXX_SGMII_CTL 0x38300 +#define BGX_GMP_GMI_TXX_INT 0x38500 +#define BGX_GMP_GMI_TXX_INT_W1S 0x38508 +#define BGX_GMP_GMI_TXX_INT_ENA_W1C 0x38510 +#define BGX_GMP_GMI_TXX_INT_ENA_W1S 0x38518 +#define GMI_TXX_INT_PTP_LOST BIT_ULL(4) +#define GMI_TXX_INT_LATE_COL BIT_ULL(3) +#define GMI_TXX_INT_XSDEF BIT_ULL(2) +#define GMI_TXX_INT_XSCOL BIT_ULL(1) +#define GMI_TXX_INT_UNDFLW BIT_ULL(0) #define BGX_MSIX_VEC_0_29_ADDR 0x400000 /* +(0..29) << 4 */ #define BGX_MSIX_VEC_0_29_CTL 0x400008 -- 2.9.2