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 23F2942CD8; Fri, 16 Jun 2023 10:57:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F41D040DDB; Fri, 16 Jun 2023 10:57:48 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2133.outbound.protection.outlook.com [40.107.243.133]) by mails.dpdk.org (Postfix) with ESMTP id F37074021E; Fri, 16 Jun 2023 10:57:47 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S/hkVFQc8VZamDJXOhfGZNFfHgNOo8Hq46kpcx+E/5Xc+4SZKJ7BCA3YYh8l3xY9KT2BfBMK6t79Gg+ArbIvo7cly3UZc5giI5edDI8slVcQt+1qK6TvCPHxI0hlWuYGEFSzv1pa6vtyGj5IlEwBol1wsGo+xHyG7/RxkH12n+ic6Q0b3ndYqlqtbtreJux0aIFq54M4f/+bZeg+7L9Tv1NStBoibDG7SzNluyK4ZDA62VLUXUsPqdih1e89oTCTvCPRXle95VogifiGtDDh1tZtFe6yBWhV754xKcEwkyKxUBYECh9sojsdbOGoj/fcvAHdnuuv6dqZthwkqf13Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8JmpAgL4K1z9UTbpQ1gPCoj1j3GJ26hOWNAVIi4hBSU=; b=IqMx2ybIjstntP4zdEK8J7rRy7M/oF/NCJI4F5ZG8zdvpn9ajYTboBRABDi43vbzJJ3/w5TCD0N47zMWfk62BDssQXtwvslkyiKKM8YyPQCoH+swp8TRLzrqIt8L6vSl4aj0qSsWgL2IGf0BBle8RtbiYfPLtMCmCSQCvTFuZIM1emzmPS5PCAWQADyrEl43CB6YkNlt7v5ZtXka5pOEJ39VgSUgfZOOLE/RruG18Gkr2cgj7enV1DVcyQ1e3tzRvHP1CrAtxhYhtTP6xI8HDxN5jMtMIcpBdEw6aNeHV1rZnIrah13L1LvxOJGuzSxAT1epmtAxk3T17+Uqet7W/w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8JmpAgL4K1z9UTbpQ1gPCoj1j3GJ26hOWNAVIi4hBSU=; b=hVKgrpYiLUHrEv5ZQgJAmUJKj4QdkSEyJILovaDN48rzZtqAI5Zbf1U+He5LQrBjVumVoS0cvFGayu+d+icQSqrERvUJfAGcIOO7cM8dnr/quGjeiHDC9PeCKJ+shPRx1N58wxLsSxYC+4KQO/VHrzlE1Dr/8QxVG6V2JEeXbhQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by SJ0PR13MB5451.namprd13.prod.outlook.com (2603:10b6:a03:425::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6477.37; Fri, 16 Jun 2023 08:57:45 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::d2cb:a650:e1ce:2174]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::d2cb:a650:e1ce:2174%4]) with mapi id 15.20.6500.029; Fri, 16 Jun 2023 08:57:44 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Peng Zhang , stable@dpdk.org, Chaoyong He , Long Wu Subject: [PATCH] net/nfp: fix the address always related with PF ID 0 Date: Fri, 16 Jun 2023 16:57:23 +0800 Message-Id: <20230616085723.1308924-1-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SGXP274CA0007.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::19) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SJ0PR13MB5451:EE_ X-MS-Office365-Filtering-Correlation-Id: 1140b053-5ccb-494d-97ff-08db6e47bfc0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: o9CI7MPVrolrzNpwfx7j73y61shCDapHACvbfJLlTfQJXNckvnWyKYNW483BttqBZTXm99YD5TjrwB04ByL0QuqX52UxadRmOz0En9uyL1zpBIY9/wqC3pvpftBbWbm8xqjOVQyqBc4oUm6c/IxXZPd2o4ZPqAqCOz6zwY4BhdeZZ8t9yiezFt3QdSgxOsDNu9sS4SP6DOfH4djlb2ZqJz8vHBDv1ALxtZHsCdb7C79ntDdGZHk311BHApEhcz+QxNql95Dq5BMPH46yfn2ARdejpAtpjtuAMiwzyOvYAyD6RAdC16tAsfsRWsT/Gzfn7SjkY4sXy1Jz7dmxiGrG9YyF0q+5+J/eatcN5X09i4IH56vNY44Zvpl/LA+1oymHQKxyuPPk/HUKY950yi5JcZ9feJvoMRd4P+7PkNykuhdz2/Nh76R2gsUtnhUYZG6vSF1I93uTIG8fEp4DAwvJYj5oklNygcCpTw2PjVCyDAbqszwQfmerLr0ztQ80r3y9/ykTWfNyLCyAWgtN1SpclGRQdRBOInABk0LmlBYZYvJ2UC+6HEEc+ycfCQtqc5aYQdGtqWqDO2RUbiw34gHnmSx0NvBh+sRGKU+6DKf8bzDnAziAxXFQA6WmsBB1yhZlrScZoDM6a5QG31FlgVUV829xP6QaHfUGw46NfhzZnv4= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(346002)(366004)(376002)(136003)(396003)(39840400004)(451199021)(41300700001)(8936002)(8676002)(6666004)(478600001)(38350700002)(38100700002)(2616005)(83380400001)(186003)(6512007)(107886003)(6506007)(1076003)(26005)(52116002)(6486002)(54906003)(86362001)(36756003)(4326008)(316002)(450100002)(6916009)(66476007)(66946007)(5660300002)(66556008)(44832011)(2906002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?exAhB7bwopdk+hLk3WBa7atFmHNNjXxxnBObjpurYEwoUIqSuOPDEac2ZSaP?= =?us-ascii?Q?jmRmJlXQI7JT/T6W/ibailNlKuseugcFNJiyUZoQ8ahTlZTHP1Zc0kdkIRlN?= =?us-ascii?Q?5IYERs1KZ+Oft0APMokZA2xIb7GMQ1id2oPs0eaJeAD/iRHA6uUgcyiEOmhv?= =?us-ascii?Q?ceCXJred6F+safY5V9PD/NuNsYenb964x5hxGqGVMo3LgiSAwctcXlbwOIAX?= =?us-ascii?Q?VpxtUAsCobX9F0M0BSbO8Imu323aZC7NCZduaBMbIuS7Z8nDifxBCrfXNugc?= =?us-ascii?Q?DNOd0/OIl/o8D6KY+6++IiV8cWVX7q8BeJZGrdA6pXSkuXtoWFNj0gYqAA8o?= =?us-ascii?Q?TQzUD6/NIlNs8GAcJvgIzccXfDH+Lmla3GSIo3sdtv6RTAdI80M/JxGHfa+a?= =?us-ascii?Q?fC3VbP8fsehOv5cMuGQhV/CAudLJy9rrX3jjYJCg39kJNYwbZtKohdbmftl9?= =?us-ascii?Q?6cB0YPMKTs8Dc9XeCrly9y4aro+XAeqls3dSoI7H5pfBk72N8jl5nZ9hi305?= =?us-ascii?Q?2OiIKMtrpNCrVukTnQQSMqs1PoJ2TQ0wjgSMJkbqlknRtbIGmg2TlmsTXhFn?= =?us-ascii?Q?wwihTqddyhtIub7I9dQVfs4jhhf0DcUQkOiB0xjxNuEh/N0+rfkLwBUDSzCB?= =?us-ascii?Q?OlkQ3NxhPrjp45TB6+MKqzDmWQ5G+3jd2ysUoNUvrK9D9tV+RBgNlfzEsffN?= =?us-ascii?Q?7hw8W3wBjNaCk7gazea5GoxmzZg1Pah25WzNlrCzM8Ha/CgeMT2hw1Tp7h0R?= =?us-ascii?Q?FZoExxuCrUJ94cHmZ93qOuA5ypiqXRZwefZSSr0kPbNOsBbK1DTIbdIn79KD?= =?us-ascii?Q?I1YZIp37nlpP6WpbnW3RfKpuUBZaeZXshZaIIIYrztqcWIBAJM4uAzaYq+L1?= =?us-ascii?Q?vkfHSTmEenfQMNTEe3TAdaCGYSkd8ko0mzG/ASk3b5RSy0FrBp95YqJFhZQG?= =?us-ascii?Q?JBic+Ahd+zDcqiGz89uEx8oSc+jAaKpIzxSHZVM9jlF8ad01Ar9tgLKlAXzV?= =?us-ascii?Q?CchpVqY3EWMtFVJAz/IbjrfaKukRZHjngvs4/m8uBhCzeNU9PEf9IRbgQVhq?= =?us-ascii?Q?RpdAwLDf1B4hoJ6bQqnCogQojP7PjKaxQFDzdV1w9nDBJVk+yAM3r5qLsHQf?= =?us-ascii?Q?/gykgT6iYEJgSPTBmp/JFW2FjB3+6+TR1BUVc5MxkI99DLoKUVlUiOwePsCl?= =?us-ascii?Q?WVuufL/bQDznLr7ZudidE+E4hxHzIv8bumOGRTQIEJ0ZNIhs3BNAV9MOwWR1?= =?us-ascii?Q?Vq2TiRHD730vWlN6nywCtPnQNCP28ahnRbU32bK3fKQS//xtdUKpVb8GFMSR?= =?us-ascii?Q?+1Z7ZDvZJapG6XZm+rtNW5bejo/ElU9vam9hZDbw88uhE0D/+PzVA8Ktf25W?= =?us-ascii?Q?wmouanS8igG9S6HWE73nybmygPVa/iEDiN+saGtI9CpNlnCSzHNAV+iQYINn?= =?us-ascii?Q?QCvd9sj02u4B5oaYTIKU1UogqGoTTQCjqwdLcvUP9zOh366s88IFX3CNFicw?= =?us-ascii?Q?4ASzfQrIoVqJy5mr1aqV1mJPx7FLf3SM0AEHhNVJCoBWYyT/t7aKIKSr8K3/?= =?us-ascii?Q?vPMR8ld6tD3dSLdk3pw4qi7xMTCxe5rFEdKRpvBroxlSqPxQRc62IARedkYG?= =?us-ascii?Q?9A=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1140b053-5ccb-494d-97ff-08db6e47bfc0 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2023 08:57:44.4591 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: uoScFoCxUoUCXsZU6t9kLwXasAphuauE+3PSqgzB+pph75/zKMIeLuMkC3hiTi5y+2YIW9groIiqeefFWvQ+9FjMGDpQ6WT5yaBAGMqM8ls= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR13MB5451 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Peng Zhang 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") Cc: stable@dpdk.org 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 9d63e0ee73..d1c6f823b6 100644 --- a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c +++ b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c @@ -66,8 +66,8 @@ #define NFP_PCIE_P2C_GENERAL_TOKEN_OFFSET(bar, x) ((x) << ((bar)->bitsize - 4)) #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) \ (((bar) * 8 + (slot)) * 4) @@ -117,6 +117,7 @@ struct nfp_pcie_user { int secondary_lock; char busdev[BUSDEV_SZ]; int barsz; + int dev_id; char *cfg; }; @@ -246,7 +247,7 @@ nfp_bar_write(struct nfp_pcie_user *nfp, struct nfp_bar *bar, return (-ENOMEM); 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; @@ -318,10 +319,8 @@ nfp_enable_bars(struct nfp_pcie_user *nfp) bar->base = 0; 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); } return 0; @@ -836,6 +835,7 @@ nfp6000_init(struct nfp_cpp *cpp, struct rte_pci_device *dev) goto error; desc->cfg = dev->mem_resource[0].addr; + desc->dev_id = dev->addr.function & 0x7; nfp_enable_bars(desc); -- 2.39.1