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 1BF2A42D46 for ; Sun, 25 Jun 2023 08:45:27 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1726440ED8; Sun, 25 Jun 2023 08:45:27 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2069.outbound.protection.outlook.com [40.107.243.69]) by mails.dpdk.org (Postfix) with ESMTP id 95D4840A7F for ; Sun, 25 Jun 2023 08:45:25 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hAEUzqVBV4uMD4VfZsU+sHJk/8VCWjGzvjOe0yqlCE8tenzOzfWM2e45hGggu7zwQppQAi4v2n+/PE+jRYKVXuHavsl9DeypfhZixiU7nh1OHWoSTzRXD5br2Y8vuq3LKY53BU1CQ6RoWYdX5wmrkNvS5GSRlNUsm7x3OiEaWT1BPfATYIFOw7O4gBF5T1IE+7joimw2iTTYhWnnVRZFjxCtcqik+Y/JTbZtT+e2vndipeirAIUJyU2nRxFkb5hNbPMo+Y3vTo+9XFavBYJeCDn4NFRA5RSS7Yn7+wOppRaiRVdntHaEL8ckIu7if6L96p4av79tsyrORLKCwGTmsQ== 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=79+IiOHrO4+LjoHQoaHl01i5LuKx7c7PINgVot2FebU=; b=QyoRNCQar7w5eRsjfdjI5z5wU2ScxPaYLqOEURxVCyFkERQN3pjuxeWA1bYK7JgHNnNUl8yFdT0jy17p2r7/kCfyyzccDS/KNpcd2TeMMQzGD88KUJ5sFq2m77+6gbwhYT3IgBdfDxW6bCNNSeR9OCsnT8uU3iPAWaKVo7+fSjEld9YJ9uY+Q1QCv+VmS40ampxtPMUs8DrlJbPL/Wt/rkmwdenmJQy5NTtEX/b1MDZl8vdw+TmylewbHkXbZAy3EMFnu7QUUoizUV7xC2HxB6DNvHGAgS4N2Lkpe+Dr39APXnDokqLlaJGDh1yNW8fKwnGPgoyxRuRcSZM6Gt//Qw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=79+IiOHrO4+LjoHQoaHl01i5LuKx7c7PINgVot2FebU=; b=ONEVoffntvvmDQNSSDRgUpDVu8/UCHBE0IDrHJrMQVjNCFxY/YTWN1/CHYQTNF11pbqVBzxrRbrEaUyIKPCVcmeOx4DPw6GPHTceat+2/qqwK8cPduEzG5BIFv/5yLtGAkJ/SjwFVmaKijT9JlKr0IeqxIaJmheS0cV6h7niTWmN/T/1UqoobolMqVvcQF45Vv6OYsc6D2uhbMOAmSIF2Ee7xwlqFDoF1mem5LJr75Zcsm8xwWJi0L4mMPb5QoXKsoXAjRsyiSIUsS2sZLBccHQgPEMJhagFISaiF894qqAJSECyfL+MduMjiWAr9YJpwOAA5fCSNzOCNVa1cguWJQ== Received: from BN0PR04CA0077.namprd04.prod.outlook.com (2603:10b6:408:ea::22) by MN0PR12MB5929.namprd12.prod.outlook.com (2603:10b6:208:37c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Sun, 25 Jun 2023 06:45:23 +0000 Received: from BN8NAM11FT031.eop-nam11.prod.protection.outlook.com (2603:10b6:408:ea:cafe::df) by BN0PR04CA0077.outlook.office365.com (2603:10b6:408:ea::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.32 via Frontend Transport; Sun, 25 Jun 2023 06:45:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN8NAM11FT031.mail.protection.outlook.com (10.13.177.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.47 via Frontend Transport; Sun, 25 Jun 2023 06:45:23 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sat, 24 Jun 2023 23:45:09 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sat, 24 Jun 2023 23:45:07 -0700 From: Xueming Li To: Wenjing Qiao CC: Priyalee Kushwaha , Qi Zhang , dpdk stable Subject: patch 'common/idpf/base: fix ITR register definitions for AVF' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:35:27 +0800 Message-ID: <20230625063544.11183-110-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT031:EE_|MN0PR12MB5929:EE_ X-MS-Office365-Filtering-Correlation-Id: 15c29c2c-b5d9-49e4-ada2-08db7547c062 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Pl7eN1hBA5VLVZSJAcj8RZV4gpDvUX4S29m4xl5JPZYDS692PshunMPIHqfcsB/ONLcLhHVOOAsABXIDnHY5rxwLSteZMhRJ601Wgu34HurkfGQhQDynY6dIasPyPkZsoNJ9EA70055pBUwx7gGyWltbJ4FOkL38ZB6ViRkB7S3s/D3g+9zBNRt+n2Cf7FaIEsA/ePtFRHwaxw2miZtPSBzn0nMKIjz8coJ+oOlahCUatv7FMQTr3KEvVPi7Kz9RcwFp5/n64E7zy6i+MBmk0eeltWrIs4wUboJ3IsSskYUpD1g8DSoEV0tD1bv3Zqj7XU35+BGKnbW1o2Pa4ZGTggpBpEFgfL7ttmcUdO8AodVdjBZKsd/Gu6fwtpGKsVMNgaRjflQsRo/wTopWEgLsI7zXKJ+Xo19vSI5aErgT9k3NySHgkTQkg6B2PbhXiO2tCujfcA2LjHJHKI//ad/L72I4EVIgjSHEJC8oimJQTn7VDXrgCKe/AfHCn4J5Q8zNN4dnDLPLBAz5CvMxdf2WHkeNBQvyaJC72MaIZ3wLE7RbxJbCjPuqXMyS+tkhYMZ2bEjwQdJdShSecpDN/W7W1H1VS9CzjyaJt00qHYy7eGbZbMcKfDLQBAPjmfDynTmpCoDK35P7bZYpd1iBdcjtw/lBfbG21JTveJRuJmwOpkfETkK65nalkZj0kVgIAN5P6rKw6kMUL5ASuzTt12I2ctkEZ0C3piFfMloA8nBlwdxO0RD0FMzeA634/mnHP1ocxvmCGjcqMsoo7gnMop1bLQ== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(346002)(39860400002)(396003)(376002)(136003)(451199021)(36840700001)(40470700004)(46966006)(82310400005)(356005)(7636003)(82740400003)(55016003)(40480700001)(86362001)(1076003)(53546011)(5660300002)(2616005)(26005)(6286002)(16526019)(186003)(2906002)(478600001)(70586007)(70206006)(6916009)(54906003)(4326008)(8676002)(8936002)(6666004)(316002)(966005)(7696005)(41300700001)(336012)(426003)(47076005)(83380400001)(36860700001)(36756003)(40460700003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:45:23.1846 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 15c29c2c-b5d9-49e4-ada2-08db7547c062 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT031.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5929 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 22.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 06/27/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=e5868f66487b1e7f1009e245c613b24584a1d7b5 Thanks. Xueming Li --- >From e5868f66487b1e7f1009e245c613b24584a1d7b5 Mon Sep 17 00:00:00 2001 From: Wenjing Qiao Date: Wed, 26 Apr 2023 06:22:47 -0400 Subject: [PATCH] common/idpf/base: fix ITR register definitions for AVF Cc: Xueming Li [ upstream commit 1ce244efe0765554531f450380d6c887cd92dfab ] Fix ITR register definitions for AVF1.0 and AVF2.0 Fixes: fb4ac04e9bfa ("common/idpf: introduce common library") Signed-off-by: Priyalee Kushwaha Signed-off-by: Wenjing Qiao Acked-by: Qi Zhang --- .mailmap | 1 + drivers/common/idpf/base/idpf_lan_pf_regs.h | 9 +++++++-- drivers/common/idpf/base/idpf_lan_vf_regs.h | 17 ++++++++++++----- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.mailmap b/.mailmap index 642bb987d0..6b38c488c2 100644 --- a/.mailmap +++ b/.mailmap @@ -1066,6 +1066,7 @@ Prashant Upadhyaya Prateek Agarwal Praveen Shetty Pravin Pathak +Priyalee Kushwaha Priyanka Jain Przemyslaw Ciesielski Przemyslaw Czesnowicz diff --git a/drivers/common/idpf/base/idpf_lan_pf_regs.h b/drivers/common/idpf/base/idpf_lan_pf_regs.h index 3df2347bd7..7f731ec3d6 100644 --- a/drivers/common/idpf/base/idpf_lan_pf_regs.h +++ b/drivers/common/idpf/base/idpf_lan_pf_regs.h @@ -77,8 +77,13 @@ #define PF_GLINT_DYN_CTL_WB_ON_ITR_M BIT(PF_GLINT_DYN_CTL_WB_ON_ITR_S) #define PF_GLINT_DYN_CTL_INTENA_MSK_S 31 #define PF_GLINT_DYN_CTL_INTENA_MSK_M BIT(PF_GLINT_DYN_CTL_INTENA_MSK_S) -#define PF_GLINT_ITR_V2(_i, _reg_start) (((_i) * 4) + (_reg_start)) -#define PF_GLINT_ITR(_i, _INT) (PF_GLINT_BASE + (((_i) + 1) * 4) + ((_INT) * 0x1000)) +/* _ITR is ITR index, _INT is interrupt index, _itrn_indx_spacing is + * spacing b/w itrn registers of the same vector. + */ +#define PF_GLINT_ITR_ADDR(_ITR, _reg_start, _itrn_indx_spacing) \ + ((_reg_start) + (((_ITR)) * (_itrn_indx_spacing))) +/* For PF, itrn_indx_spacing is 4 and itrn_reg_spacing is 0x1000 */ +#define PF_GLINT_ITR(_ITR, _INT) (PF_GLINT_BASE + (((_ITR) + 1) * 4) + ((_INT) * 0x1000)) #define PF_GLINT_ITR_MAX_INDEX 2 #define PF_GLINT_ITR_INTERVAL_S 0 #define PF_GLINT_ITR_INTERVAL_M MAKEMASK(0xFFF, PF_GLINT_ITR_INTERVAL_S) diff --git a/drivers/common/idpf/base/idpf_lan_vf_regs.h b/drivers/common/idpf/base/idpf_lan_vf_regs.h index 9cd4f757d9..13c5c5a7da 100644 --- a/drivers/common/idpf/base/idpf_lan_vf_regs.h +++ b/drivers/common/idpf/base/idpf_lan_vf_regs.h @@ -90,11 +90,18 @@ #define VF_INT_DYN_CTLN_WB_ON_ITR_M BIT(VF_INT_DYN_CTLN_WB_ON_ITR_S) #define VF_INT_DYN_CTLN_INTENA_MSK_S 31 #define VF_INT_DYN_CTLN_INTENA_MSK_M BIT(VF_INT_DYN_CTLN_INTENA_MSK_S) -#define VF_INT_ITR0(_i) (0x00004C00 + ((_i) * 4)) -#define VF_INT_ITRN_V2(_i, _reg_start) ((_reg_start) + (((_i)) * 4)) -#define VF_INT_ITRN(_i, _INT) (0x00002800 + ((_i) * 4) + ((_INT) * 0x40)) -#define VF_INT_ITRN_64(_i, _INT) (0x00002C00 + ((_i) * 4) + ((_INT) * 0x100)) -#define VF_INT_ITRN_2K(_i, _INT) (0x00072000 + ((_i) * 4) + ((_INT) * 0x100)) +/* _ITR is ITR index, _INT is interrupt index, _itrn_indx_spacing is spacing + * b/w itrn registers of the same vector + */ +#define VF_INT_ITR0(_ITR) (0x00004C00 + ((_ITR) * 4)) +#define VF_INT_ITRN_ADDR(_ITR, _reg_start, _itrn_indx_spacing) \ + ((_reg_start) + (((_ITR)) * (_itrn_indx_spacing))) +/* For VF with 16 vector support, itrn_reg_spacing is 0x4 and itrn_indx_spacing is 0x40 */ +#define VF_INT_ITRN(_INT, _ITR) (0x00002800 + ((_INT) * 4) + ((_ITR) * 0x40)) +/* For VF with 64 vector support, itrn_reg_spacing is 0x4 and itrn_indx_spacing is 0x100 */ +#define VF_INT_ITRN_64(_INT, _ITR) (0x00002C00 + ((_INT) * 4) + ((_ITR) * 0x100)) +/* For VF with 2k vector support, itrn_reg_spacing is 0x4 and itrn_indx_spacing is 0x2000 */ +#define VF_INT_ITRN_2K(_INT, _ITR) (0x00072000 + ((_INT) * 4) + ((_ITR) * 0x2000)) #define VF_INT_ITRN_MAX_INDEX 2 #define VF_INT_ITRN_INTERVAL_S 0 #define VF_INT_ITRN_INTERVAL_M MAKEMASK(0xFFF, VF_INT_ITRN_INTERVAL_S) -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:01.414887400 +0800 +++ 0109-common-idpf-base-fix-ITR-register-definitions-for-AV.patch 2023-06-25 14:31:58.565773900 +0800 @@ -1 +1 @@ -From 1ce244efe0765554531f450380d6c887cd92dfab Mon Sep 17 00:00:00 2001 +From e5868f66487b1e7f1009e245c613b24584a1d7b5 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 1ce244efe0765554531f450380d6c887cd92dfab ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index c5fb28ad86..da4aad001d 100644 +index 642bb987d0..6b38c488c2 100644 @@ -24 +26,2 @@ -@@ -1085,6 +1085,7 @@ Prateek Agarwal +@@ -1066,6 +1066,7 @@ Prashant Upadhyaya + Prateek Agarwal @@ -27 +29,0 @@ - Prince Takkar