From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B72ADA00BE for ; Tue, 19 May 2020 15:10:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 822E91D6D8; Tue, 19 May 2020 15:10:15 +0200 (CEST) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id A2B551D6A4 for ; Tue, 19 May 2020 15:10:14 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id e16so15835315wra.7 for ; Tue, 19 May 2020 06:10:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=F0k/CxcASAnGrGi13D8Vbr8gPTs41neJAN56SQ2+FAM=; b=Ecu5Ar2ZvY9E0FudlYQ7YjSbu2kWDTy7YZx1BGLAz1gzOxeRqYzgW/PYIJlg6wYjPA FALGMaNmyvZOMTKlpHC1YOApf33zvNOm17gu5FyZRkR3yL2Hc5l1rbl1mgOMWzNWaoJN oDXmv9M+oaU09rmS5RXfQP/SV8hqyfxbF8mTvDeuZMv23bsGal2A4+kczoPyRpFeKbZd V5Xxdd57oGMIHti6zGL7v5ldwqqY5Nk6n/YXrKdcwA3znJctJymeWrI/6CWdZoa5IGvE HtFv9/LRdV6cKikV3hTSeLPKlBWqPchsCsdHL2YxVBu5OwGuzA1aV76Bm2eRX2Uyvm6s UBBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=F0k/CxcASAnGrGi13D8Vbr8gPTs41neJAN56SQ2+FAM=; b=g8x9wiEItgqWpP5biArvnIMtpDMf5iRuI49TdqDXSB961+uUyQ7Rpgd+80CdzIEAlY d0S6HexarOZfG5l1wrHKTPHxw23+tHEprBFkn94cBVltWqEyzFEoCZs9DWXyf0biBKC5 dE7uHUs1dmNoiWlBw0/CrDY9ubqRHrS0DoH1GaHN+9ydWN236mfr4JkZ922vHP+GH5tw Ve9JzMpOsNwnt0/AdH3musULTpUDvH9ZeIRaupIPI0LGVaBUERUYCzr1/9Q6ZVIf4e5b WKOmiFDTb2zQCkHrHJnoTYtTrK8Sq4K2WVg2iIJHaAErlzz8lXme17VedVRE5Vvpm/1O pk8g== X-Gm-Message-State: AOAM531trvT/CUtbGKkTO66S025MpAzNahTtC3vhk+/l6RgDYnsmqswZ wE1FIEEG6FWA6XN3fOitaeoe7d9FlsNWCPXJ X-Google-Smtp-Source: ABdhPJx+j11iWitwbRBvzcdkPQSipzP6XdydDYRA3xak3qJ6xSHG1smgRO80eMuRcIUuWJhdhfjB9Q== X-Received: by 2002:a5d:6401:: with SMTP id z1mr27387522wru.226.1589893814113; Tue, 19 May 2020 06:10:14 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id p17sm3936268wmi.3.2020.05.19.06.10.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:10:13 -0700 (PDT) From: luca.boccassi@gmail.com To: Nithin Dabilpuram Cc: Jerin Jacob , dpdk stable Date: Tue, 19 May 2020 14:03:38 +0100 Message-Id: <20200519130549.112823-83-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/octeontx2: disable unnecessary error interrupts' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 85897fd567efec8e63eb73d498dc4a468443a451 Mon Sep 17 00:00:00 2001 From: Nithin Dabilpuram Date: Mon, 13 Apr 2020 19:15:40 +0530 Subject: [PATCH] net/octeontx2: disable unnecessary error interrupts [ upstream commit c3d30e9d753ef3121c25b9403bf56ee09f2a2086 ] Disable CQ_DISABLED error interrupt in NIX_LF_ERR_INT to fix spurious interrupts in event dev mode. Also skip configuring RSS when RQ count is '0' because RSS table initialization is done incorrectly due to divide-by-zero error and it is leading to RQ_OOR error in NIX_LF_ERR_INT. Fixes: 83ce2880e22e ("net/octeontx2: support RSS") Signed-off-by: Nithin Dabilpuram Acked-by: Jerin Jacob --- drivers/net/octeontx2/otx2_ethdev_irq.c | 7 +++++-- drivers/net/octeontx2/otx2_rss.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/octeontx2/otx2_ethdev_irq.c b/drivers/net/octeontx2/otx2_ethdev_irq.c index 96b848a919..b121488faf 100644 --- a/drivers/net/octeontx2/otx2_ethdev_irq.c +++ b/drivers/net/octeontx2/otx2_ethdev_irq.c @@ -472,9 +472,12 @@ otx2_nix_err_intr_enb_dis(struct rte_eth_dev *eth_dev, bool enb) { struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev); - /* Enable all nix lf error interrupts except for RQ_DISABLED */ + /* Enable all nix lf error interrupts except + * RQ_DISABLED and CQ_DISABLED. + */ if (enb) - otx2_write64(~BIT_ULL(11), dev->base + NIX_LF_ERR_INT_ENA_W1S); + otx2_write64(~(BIT_ULL(11) | BIT_ULL(24)), + dev->base + NIX_LF_ERR_INT_ENA_W1S); else otx2_write64(~0ull, dev->base + NIX_LF_ERR_INT_ENA_W1C); } diff --git a/drivers/net/octeontx2/otx2_rss.c b/drivers/net/octeontx2/otx2_rss.c index bc7b64387a..d80579725a 100644 --- a/drivers/net/octeontx2/otx2_rss.c +++ b/drivers/net/octeontx2/otx2_rss.c @@ -341,7 +341,7 @@ otx2_nix_rss_config(struct rte_eth_dev *eth_dev) int rc; /* Skip further configuration if selected mode is not RSS */ - if (eth_dev->data->dev_conf.rxmode.mq_mode != ETH_MQ_RX_RSS) + if (eth_dev->data->dev_conf.rxmode.mq_mode != ETH_MQ_RX_RSS || !qcnt) return 0; /* Update default RSS key and cfg */ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:47.831912175 +0100 +++ 0083-net-octeontx2-disable-unnecessary-error-interrupts.patch 2020-05-19 14:04:44.252649025 +0100 @@ -1,8 +1,10 @@ -From c3d30e9d753ef3121c25b9403bf56ee09f2a2086 Mon Sep 17 00:00:00 2001 +From 85897fd567efec8e63eb73d498dc4a468443a451 Mon Sep 17 00:00:00 2001 From: Nithin Dabilpuram Date: Mon, 13 Apr 2020 19:15:40 +0530 Subject: [PATCH] net/octeontx2: disable unnecessary error interrupts +[ upstream commit c3d30e9d753ef3121c25b9403bf56ee09f2a2086 ] + Disable CQ_DISABLED error interrupt in NIX_LF_ERR_INT to fix spurious interrupts in event dev mode. Also skip configuring RSS when RQ count is '0' because @@ -11,7 +13,6 @@ in NIX_LF_ERR_INT. Fixes: 83ce2880e22e ("net/octeontx2: support RSS") -Cc: stable@dpdk.org Signed-off-by: Nithin Dabilpuram Acked-by: Jerin Jacob @@ -40,10 +41,10 @@ otx2_write64(~0ull, dev->base + NIX_LF_ERR_INT_ENA_W1C); } diff --git a/drivers/net/octeontx2/otx2_rss.c b/drivers/net/octeontx2/otx2_rss.c -index a29441e6c9..5e3f866819 100644 +index bc7b64387a..d80579725a 100644 --- a/drivers/net/octeontx2/otx2_rss.c +++ b/drivers/net/octeontx2/otx2_rss.c -@@ -358,7 +358,7 @@ otx2_nix_rss_config(struct rte_eth_dev *eth_dev) +@@ -341,7 +341,7 @@ otx2_nix_rss_config(struct rte_eth_dev *eth_dev) int rc; /* Skip further configuration if selected mode is not RSS */