From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 21D2142ECF for ; Thu, 20 Jul 2023 17:38:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1DD5140685; Thu, 20 Jul 2023 17:38:03 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id D2402400D6 for ; Thu, 20 Jul 2023 17:38:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689867476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ASw5KHRUBdhBDCBk2Xcb1FqePufQXdIjX7n88XVybXM=; b=YVUGwMjq5ryOcLpL8yqqDd2Ebwq42e3Lzz17LqULpwp9Ma20G2Il/vzdu4Uym2SK7NSrwc 2nRnDgCoOToCnWpKhH1eyxIWJ96ve4dRXyPbkQ70G+F4lHsp+4P/TRlDZ9folMuI06GxZM xiJuMYLnjh+mttGqPFtfZx+r5diZSOU= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-145-uVOpmSFmPhWHEouRpzrjyw-1; Thu, 20 Jul 2023 11:22:53 -0400 X-MC-Unique: uVOpmSFmPhWHEouRpzrjyw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B88793C1352A; Thu, 20 Jul 2023 15:22:26 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 72BAC4A9004; Thu, 20 Jul 2023 15:22:23 +0000 (UTC) From: Kevin Traynor To: Peng Zhang Cc: Chaoyong He , Long Wu , dpdk stable Subject: patch 'net/nfp: fix address always related with PF ID 0' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:18:47 +0100 Message-ID: <20230720151942.262154-96-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/23. 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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/95e5d439e02b5834ddd53f7688349d9da2479a7e Thanks. Kevin --- >From 95e5d439e02b5834ddd53f7688349d9da2479a7e Mon Sep 17 00:00:00 2001 From: Peng Zhang Date: Fri, 16 Jun 2023 16:57:23 +0800 Subject: [PATCH] net/nfp: fix address always related with PF ID 0 [ upstream commit 467370c93d73267c1d4417bff975cf812b878f48 ] Now the PCIE configure bar address is always related with PF ID 0. For the NIC with multiple PCI device, this will lead the host crash. Fix this problem by make the PCIE configure bar address related with the PF ID. Fixes: c7e9729da6b5 ("net/nfp: support CPP") Signed-off-by: Peng Zhang Reviewed-by: Chaoyong He Reviewed-by: Long Wu --- drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c index 08bc4e8ef2..978c91f6b0 100644 --- a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c +++ b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c @@ -67,6 +67,6 @@ #define NFP_PCIE_P2C_GENERAL_SIZE(bar) (1 << ((bar)->bitsize - 4)) -#define NFP_PCIE_CFG_BAR_PCIETOCPPEXPBAR(bar, slot) \ - (NFP_PCIE_BAR(0) + ((bar) * 8 + (slot)) * 4) +#define NFP_PCIE_CFG_BAR_PCIETOCPPEXPBAR(id, bar, slot) \ + (NFP_PCIE_BAR(id) + ((bar) * 8 + (slot)) * 4) #define NFP_PCIE_CPP_BAR_PCIETOCPPEXPBAR(bar, slot) \ @@ -115,4 +115,5 @@ struct nfp_pcie_user { char busdev[BUSDEV_SZ]; int barsz; + int dev_id; char *cfg; }; @@ -256,5 +257,5 @@ nfp_bar_write(struct nfp_pcie_user *nfp, struct nfp_bar *bar, bar->csr = nfp->cfg + - NFP_PCIE_CFG_BAR_PCIETOCPPEXPBAR(base, slot); + NFP_PCIE_CFG_BAR_PCIETOCPPEXPBAR(nfp->dev_id, base, slot); *(uint32_t *)(bar->csr) = newcfg; @@ -326,8 +327,6 @@ nfp_enable_bars(struct nfp_pcie_user *nfp) bar->iomem = NULL; bar->lock = 0; - bar->csr = nfp->cfg + - NFP_PCIE_CFG_BAR_PCIETOCPPEXPBAR(bar->index >> 3, - bar->index & 7); - + bar->csr = nfp->cfg + NFP_PCIE_CFG_BAR_PCIETOCPPEXPBAR(nfp->dev_id, + bar->index >> 3, bar->index & 7); bar->iomem = nfp->cfg + (bar->index << bar->bitsize); } @@ -844,4 +843,5 @@ nfp6000_init(struct nfp_cpp *cpp, struct rte_pci_device *dev) desc->cfg = (char *)dev->mem_resource[0].addr; + desc->dev_id = dev->addr.function & 0x7; nfp_enable_bars(desc); -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:06.686627578 +0100 +++ 0096-net-nfp-fix-address-always-related-with-PF-ID-0.patch 2023-07-20 16:17:55.025751994 +0100 @@ -1 +1 @@ -From 467370c93d73267c1d4417bff975cf812b878f48 Mon Sep 17 00:00:00 2001 +From 95e5d439e02b5834ddd53f7688349d9da2479a7e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 467370c93d73267c1d4417bff975cf812b878f48 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index e230c40051..658c618ee6 100644 +index 08bc4e8ef2..978c91f6b0 100644 @@ -34 +35 @@ -@@ -117,4 +117,5 @@ struct nfp_pcie_user { +@@ -115,4 +115,5 @@ struct nfp_pcie_user { @@ -40 +41 @@ -@@ -246,5 +247,5 @@ nfp_bar_write(struct nfp_pcie_user *nfp, struct nfp_bar *bar, +@@ -256,5 +257,5 @@ nfp_bar_write(struct nfp_pcie_user *nfp, struct nfp_bar *bar, @@ -47 +48 @@ -@@ -315,8 +316,6 @@ nfp_enable_bars(struct nfp_pcie_user *nfp) +@@ -326,8 +327,6 @@ nfp_enable_bars(struct nfp_pcie_user *nfp) @@ -58 +59 @@ -@@ -780,4 +779,5 @@ nfp6000_init(struct nfp_cpp *cpp, struct rte_pci_device *dev) +@@ -844,4 +843,5 @@ nfp6000_init(struct nfp_cpp *cpp, struct rte_pci_device *dev) @@ -60 +61 @@ - desc->cfg = dev->mem_resource[0].addr; + desc->cfg = (char *)dev->mem_resource[0].addr;