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 A579C41D8D for ; Mon, 27 Feb 2023 08:16:47 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9E6EA41140; Mon, 27 Feb 2023 08:16:47 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2066.outbound.protection.outlook.com [40.107.220.66]) by mails.dpdk.org (Postfix) with ESMTP id DA95A40ED6 for ; Mon, 27 Feb 2023 08:16:45 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZmKkcU77LmwsqjZnoUjE4GNFS5Tbk7kCbJ8vcRK0ywcI0VyYwTLlhtOn13s57Of7uQ0QcqBYZTQom6HC4e3r3/HGvKitka7MyMPvhvZ2CgbrFSfqt7+bWVRlycyNhiIGnADwTwNqn+zN9O26m82ENmu/q3HlsUjRghBKLsujeR0wKB/5D31w0kLXSGIiHPkbAayyzQlJMuEk5kLBaECwg719DSdhZFl2F834jpI1+46XDx9hsoeMQGpUndOdKi/mK2PoM9Bu0okX86Xurc2xl2qFH1lU6vhcJx6dOykmm4n152K7NElXNXaD4IPzJdAvedyAJk2f/pXle/YqXWvRJA== 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=L2pym5R1Gkqb7lT57DNObCOlt7RtdbKd6EyqaITim9o=; b=PYDYcCMmYBgKZmOGBuYYMMvEuY5g8jJmTKN8Fmxudn7flHtXzANcPrXuouTcOyEvgNOBMEiKdsh+QqRS7nxh967ebWyTBok4Lu8vACvGZd4a6E6d8Hn2R9oyKyzI5ds+AHuMAV5vJ/52OQdlmXMvGDs2zjgPaXd1mqS7Ec50JLmf3I5uE4xDRCq6/USg4nqlOsY/ckacKbAb7pSJD9i4jD3NNDWWnJxNM1wE1i7rTbSkRoUAbL+JBhPJxkG0nGJW335hrhau07TTGINjemDn3cHeAdzVhrsInnyZ8/kNkhZptqAr4lyLkXKH9etigFdzdN97PWt7jCTOQXT50ITc4g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=marvell.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=L2pym5R1Gkqb7lT57DNObCOlt7RtdbKd6EyqaITim9o=; b=uYiNGSoynp4T/eXkTRtlVj1rnHKptnkGazyXa722gIiIvvff8bQiYLY6zaTdR9Dm5xNhl6PuirnmDbfxQqw0mwIp14u9WLO8ihidmWAbemgTKkOMQtUPvafRpU3VxXCuNH9+y1D469NAQ6c/JWn9AfyGfiDC7z3GUtCYlTRLbsjcPxsj6wXHcGrvO65wE9PfN7Dfh1P8FwX45u4AIV1fwMJl1tAbYWDc3pD5D84/TQ/72gxqmZmGwtnxDYqRfKnQTqFJB5zL3vE1BpH0k16ZAl9zfNPrDk0eM2vdpcHgu9I7BGQCjghZCwi5IjTS2PkUYv179fTxHoPNpM8UDwQjew== Received: from DS7PR05CA0015.namprd05.prod.outlook.com (2603:10b6:5:3b9::20) by IA1PR12MB6627.namprd12.prod.outlook.com (2603:10b6:208:3a1::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.25; Mon, 27 Feb 2023 07:16:43 +0000 Received: from DM6NAM11FT108.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3b9:cafe::da) by DS7PR05CA0015.outlook.office365.com (2603:10b6:5:3b9::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.16 via Frontend Transport; Mon, 27 Feb 2023 07:16:43 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DM6NAM11FT108.mail.protection.outlook.com (10.13.172.95) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.16 via Frontend Transport; Mon, 27 Feb 2023 07:16:42 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 26 Feb 2023 23:16:35 -0800 Received: from nvidia.com (10.126.231.37) 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; Sun, 26 Feb 2023 23:16:32 -0800 From: Xueming Li To: Satheesh Paul CC: Kiran Kumar K , dpdk stable Subject: patch 'common/cnxk: fix channel mask for SDP interfaces' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 15:00:52 +0800 Message-ID: <20230227070107.15664-144-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.37] 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: DM6NAM11FT108:EE_|IA1PR12MB6627:EE_ X-MS-Office365-Filtering-Correlation-Id: 4bc70509-0378-4f5d-7e1d-08db189293e6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: S1AsHpfuvqvVIZIy77NdyTB14ngRis1RQPiCfxTYJxWxPfnWMiWBtr5BeaDU+LWqScFoYRp2T/UFGwLcUrJVuCc9mIzMl/3jV3tB6vuto8IwS4QB3gxm2qIxeKk50x+flh2cGWjQqYLyn66Nq2Eos+TjYZx8Ecrnmoj29+jfNPU45XQIaKjhLRzn+lN/oRT7sf53M2NKGayxFTGK3pxn+Ju6IeLRIMZ35X/ng9npiMsc7GJqHAwhFkJ1v2NocomP+i5vyQkHGzi57ipZZEOd2L9FyJx3rGe9PEhCkn/D8V6gNr0PqknDb1V5DrbAtGGVfZc1h56QRE8g1moTmgt8nYTAMNcNk+0wLbPTcknZJhbPT4MqVnvCyjwjxjEcQAEpLV5jAAsfcCbkhnssfppSZ7hZ6/RjUV9ZqYn0enHrwSkIOTuUJHJqmMm6ucUAJTDdpWAOiROZ5dOhb6vM0CvBCV2yMcoLwJQehan2wUWa62Zo4EYct++U/ZzhzH4NWAE3sgDzdImJjDLxL/4DB62eAFQ6NQbKq/QoiT7X8zXsozP526CTHFJZp+6e5NarMw66GzuOr2XIg6cPzNSN5Kw+dwxfWEj7l77kRcPW8UXQpfZTaBpnWS8tTTOoOVixpXbPCuckJNlaxyMOkZn2QxQETaCJncA7qFULkXbqTw1vwBrQJJ24bYfuBRR/njwXS1+RwD/htwS1ITtY10Q7lXZHtQR67CJei1t9pfFUw+XTQgWb0rGv8KZcE2gubRLohJV1M7W+z9cFL95MWoaljh/p1gMikG2b2DuhqgB/+jTFzjZRf6QqKZ/dtw/HPAxlAVV/ X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(346002)(39860400002)(396003)(376002)(136003)(451199018)(36840700001)(40470700004)(46966006)(55016003)(36756003)(40480700001)(40460700003)(86362001)(478600001)(41300700001)(6916009)(356005)(8936002)(4326008)(2616005)(70206006)(7696005)(82310400005)(8676002)(70586007)(966005)(316002)(54906003)(5660300002)(6286002)(186003)(2906002)(36860700001)(34020700004)(83380400001)(7636003)(82740400003)(6666004)(47076005)(16526019)(26005)(53546011)(1076003)(426003)(336012); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:16:42.7142 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4bc70509-0378-4f5d-7e1d-08db189293e6 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT108.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6627 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/01/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=fd1ff4fecb285b989c85ee1f578b3bbc5439a2a2 Thanks. Xueming Li --- >From fd1ff4fecb285b989c85ee1f578b3bbc5439a2a2 Mon Sep 17 00:00:00 2001 From: Satheesh Paul Date: Fri, 10 Feb 2023 13:56:14 +0530 Subject: [PATCH] common/cnxk: fix channel mask for SDP interfaces Cc: Xueming Li [ upstream commit b182b227e70b9065bafc6a9baad5e101fd866fcb ] Fix channel mask of SDP interfaces on CN10K. Fixes: f13756633330 ("common/cnxk: support setting channel mask for SDP interfaces") Signed-off-by: Satheesh Paul Reviewed-by: Kiran Kumar K --- drivers/common/cnxk/roc_npc.c | 9 +++++++-- drivers/common/cnxk/roc_npc_priv.h | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/common/cnxk/roc_npc.c b/drivers/common/cnxk/roc_npc.c index b38389b18a..bf7fb90f17 100644 --- a/drivers/common/cnxk/roc_npc.c +++ b/drivers/common/cnxk/roc_npc.c @@ -1263,8 +1263,13 @@ roc_npc_flow_create(struct roc_npc *roc_npc, const struct roc_npc_attr *attr, /* By default set the channel and mask to cover * the whole SDP channel range. */ - npc->sdp_channel = (uint16_t)NIX_CHAN_SDP_CH_START; - npc->sdp_channel_mask = (uint16_t)NIX_CHAN_SDP_CH_START; + if (roc_model_is_cn10k()) { + npc->sdp_channel = (uint16_t)CN10K_SDP_CH_START; + npc->sdp_channel_mask = (uint16_t)CN10K_SDP_CH_MASK; + } else { + npc->sdp_channel = (uint16_t)NIX_CHAN_SDP_CH_START; + npc->sdp_channel_mask = (uint16_t)NIX_CHAN_SDP_CH_START; + } } } diff --git a/drivers/common/cnxk/roc_npc_priv.h b/drivers/common/cnxk/roc_npc_priv.h index 23acb7b01d..f034f72a04 100644 --- a/drivers/common/cnxk/roc_npc_priv.h +++ b/drivers/common/cnxk/roc_npc_priv.h @@ -77,6 +77,9 @@ #define NPC_LFLAG_LC_OFFSET (NPC_LTYPE_OFFSET_START + 6) #define NPC_LTYPE_LC_OFFSET (NPC_LTYPE_OFFSET_START + 8) +#define CN10K_SDP_CH_START 0x80 +#define CN10K_SDP_CH_MASK 0xF80 + struct npc_action_vtag_info { uint16_t vlan_id; uint16_t vlan_ethtype; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:45.497224100 +0800 +++ 0145-common-cnxk-fix-channel-mask-for-SDP-interfaces.patch 2023-02-27 14:08:40.939237000 +0800 @@ -1 +1 @@ -From b182b227e70b9065bafc6a9baad5e101fd866fcb Mon Sep 17 00:00:00 2001 +From fd1ff4fecb285b989c85ee1f578b3bbc5439a2a2 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit b182b227e70b9065bafc6a9baad5e101fd866fcb ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index c872548230..9edccb5258 100644 +index b38389b18a..bf7fb90f17 100644 @@ -22 +24 @@ -@@ -1380,8 +1380,13 @@ roc_npc_flow_create(struct roc_npc *roc_npc, const struct roc_npc_attr *attr, +@@ -1263,8 +1263,13 @@ roc_npc_flow_create(struct roc_npc *roc_npc, const struct roc_npc_attr *attr, @@ -39 +41 @@ -index 2a7d3137fb..aa27228354 100644 +index 23acb7b01d..f034f72a04 100644