From patchwork Wed Dec 13 03:24:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 135105 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E3E49436D9; Wed, 13 Dec 2023 04:25:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5018A42EAA; Wed, 13 Dec 2023 04:24:48 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2103.outbound.protection.outlook.com [40.107.93.103]) by mails.dpdk.org (Postfix) with ESMTP id D789C42EB6 for ; Wed, 13 Dec 2023 04:24:46 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kpqLEag60s3kh0QUPzIvzrPJIRWOz/pSLVC8Vza0A0aAHbiiW8QyNpY1cIEO7O6Ds/5SK1YGBNfPT4Rl+j7IQvl5vBVKl3DWneTOl3AC5LgxlE5KQB/Z93jtCesageuklVk1023aTnhFwmI4b533kwYQ4qMGOPNBNzImBZ/lHqVtr1vptCj2Ap8J5M4/tMvwrWZlGdbSeZKoiUaSA3IwluYD/0jwxLprTcBIVNpxQrKNF/TQDmHAOgjRI9JAz1Rf0wy2HlBLc7xu/AjGitWEzKwrD0XjLyDQQXTLW2zp7OJehfRvsNiVkKyQXCYwipxFCfqEdM6jIuBpySgYBp/5Tg== 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=vrN+Wc4Jo9MSspw3dinuE6wXwEbnXYKeJaQXxUVUlg4=; b=MfB59xioGMlDLFdJ30/o5dwb3AiAqlimROMCCOBLToDf/D1/B+9RWaNe62ivV9nhD+L43pdBmYxXzzoBjxg1LqSmuWIEob/Ds9gbASZb6DH6tsnVGd50lrxaD4iwZEl1Nd2ObD8zZ8cfKqjq1pgnCS0TJAW1SK800Rac9970iwf4PhUG93BQVyoT0kGGLHgDRCskT2s9GQx5gexYp2FZFha+UiwYYsBJLKmDYSOO0deEBV2xIb46WTEvTP04VG7+FGb92U64oXcAijpGIdWsc5oF4ZqjLQP8xLOG1kSraveg0d4xkvE7s/qqwAyDKIUCAo44R9ePtyY17qLwpaj2tg== 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=vrN+Wc4Jo9MSspw3dinuE6wXwEbnXYKeJaQXxUVUlg4=; b=Zqybhx749oKJYiH4son5lTSRUSJZrASlAL7UIwlA1Hjb+wSrlfKdRuYSpFECsmbqHhFM+kyqBqBklXEpaQFdtkGFKpAKVieApXpH7GgD5cHxBScj3hYNVXoumOe2EInTj6xdTiFaBLyDrorIqUNjVjbbaeEjEZq/9Dwwil68Hys= 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 SA3PR13MB6259.namprd13.prod.outlook.com (2603:10b6:806:2f3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33; Wed, 13 Dec 2023 03:24:45 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.7091.022; Wed, 13 Dec 2023 03:24:45 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang , Long Wu Subject: [PATCH 5/5] net/nfp: use ctrl extend to check the mode of features Date: Wed, 13 Dec 2023 11:24:16 +0800 Message-Id: <20231213032416.1988817-6-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231213032416.1988817-1-chaoyong.he@corigine.com> References: <20231213032416.1988817-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SJ0PR03CA0351.namprd03.prod.outlook.com (2603:10b6:a03:39c::26) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA3PR13MB6259:EE_ X-MS-Office365-Filtering-Correlation-Id: 8b8337a2-112a-4060-81f3-08dbfb8b0db8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2hL4oQKmVm8FZ+DBvkdHhwiZEwCOIPaFqex/5z9edzWoQMLL55nGQATb7eHzTK+kQG8BdKsZZ3irD1UQf+mLax4KgN6kDq2pZcAFlWc8aU5EwTOk0ZxzABXC9NKx+nt4ZZZqBZIYJnpCtlxJPyr6aQNVzPS1o3ovD4UHuG6N9s//JKAfTdbZAZvvrlRZ7obpe3u9Av/Ww+cHr1d4veNn9lA+MkNJJea6oUS29IugrVYVE5LRygUEkVwnQUa1Wly/o92kGJsLbl4fdJeOIx5Oh3fiHu62z7nfFRS0vcs5Uly9pO7k/+JQmZuK5kgCEiR2vijSHPVu3Gf88Gs/RJoroVe1Be/no5/Tgm+FjweXrnKfguJUipruIy8ix0qBf/noL7N67jdLhE3HaPG0mpn3ON3ZjBnbwMce6EF7D9ioK4/WO5gl6Y14sBbmilmQyCS1yb3DZtpC7cuB66O5bDzhFt07kzVJT6njIdnA4BwZPHjVSqkf24Pe1UPzds20sbaPc/ANghdeKM189GSm64JynfYL/uqPa8eRX4Efz5gkqEGdnmwWEZooc78JhcY6p1j2VrWTQNAOcVBikOr8L1TmLBcb2Gk0hnnq9eLIn9xRa8g5Dexuuw8X2OLs9IH0pmV5vVr2G3zuDv9cxaozEPgFR488nlWslameyjyxsyZJ+j4= 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:(13230031)(39830400003)(136003)(376002)(396003)(366004)(346002)(230922051799003)(64100799003)(451199024)(186009)(1800799012)(54906003)(66556008)(66946007)(66476007)(41300700001)(1076003)(6506007)(2616005)(107886003)(26005)(6666004)(6512007)(36756003)(38350700005)(38100700002)(52116002)(86362001)(83380400001)(478600001)(6486002)(44832011)(8676002)(8936002)(2906002)(4326008)(5660300002)(6916009)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: N8apJyZkqpHscg3ZIKRzuK8XsY+bPHdvoqkrPhwJk+tnwjfNwiAStxiVnAQ84fpSiVgO1JTCn09f8a/2CPXz9EQADHUkInlkQ111K/kzMWkjfEjtdQpzkTA4XXUJBsTExUZho0OKj/+UqfqABt2lO9ti5+b6a2VG+7m0Ta7E/PPO6KoVPBFcYjBpr+PKFIKscfR8RDhJ7aA4nuLmf/mIdTE/itievoNfyfKeIc3dAkhw/4YGy1QFYQWuH8x9WrlKw7Kz+jpUK7YO0+1WZAKW9b0QUzFX6rdfFPv2SbeR7peW2/RkFyk0XXjdq8fu9A4KdVhIfV+sYwRreB8EnEaeHpbojWwWMCA8Mv1TPnTvDWgZ9wd5QLtPBxjx6AVA/UNU+Y2ddHfZTAJmiwmkE/gYgbETkUITsClpAnKh4s8MwH6YwOxsH71fFq+hwktKc5eKSZKKvrkL52ythMEZIbyaiX3xiE0D9fK9DW43pjhevy7/RRDslC3rIuwDDDLksAig9ZKEeySYzIjnblQCEv0PfnN9dvZ0CjiYJZHNVfMvsFDDm9kduG9PDV0k6nt+iK60XHRKhyAOOZlzZw7sQrJLpNT/xHUEZUHNt2ZR9yOjHXNM52HOYY9TLeZWmHhhnEO0ByiRhZExx/M219MW7yz2rel6wpIQE03v39mh0logBRtorm6DT6xJlMHPfogImHLj2gBgpC8s4oXQGDPAy5o1Hj+M1uZAq0hgRKUmq4YR4+Ma1gE7Y7YJ7jlN62L/WLpMuNkTFCSXMkkp8rQmn2KZzL1PW4RFYxFOFEqHo+cY14+dg6FYvMVT2JSVXMZUEfPvHmA5VkdwurNdT0PxOxjdfA4xqL9xhYJ1YokGn8PICZP/jJnGu5MsO43jr0G8l2+EInSOSvBox/pea1UO+IQDmSdqxDbXC5blWgsgFqUbqMawfZ8viejvnOKpKYF/wdCIzIHN3ysVOog5JCXsdFQm78Z0vfAfoLnoxadZtFN2/J6ndYU7C6Wp9ZasoPfYgDToyLUa46LDnEulHYvBFM0oZTAi64GamdX3RcL0DZdmsIl425NDt31xJMBQDboNYzsLfz9iUIhX6lCFxZJlh/jwJNHAhYtsvSpQ+YCSQSP2ViqpyIUqWKL++7Dq3j0HzUIEM8An+myOtV7SBAtwtAHy/7z5EKBQMPshW/sM46G1fVjUzkMdY+YKKdfpM0nSmHe9B5hJN3QoAI5p+Q8QTXa2yyCSjOW9Nt/4iCkCYognWdoih8fX7+tsP9AeV4gLOtm9w7kATk2Mec3D19YjFrYh4K26/gL5xiK9SrOqsV2NdksFu50i+ivBi+NwMAZqKb9n8MyijK/e7P8NYV/c5z1n7sThQsskhxgvIVqyu2Cj8CDRrtQhSpd6KqAs23orIuMzlL1LQbGMcS9HE4WPh7DTgp7dN3fz1fW+mLpWpcHMgbcExcpDM7FP10408KrM0vB32hAfK8/Kx894y8qCrHi0ButF+MfmaZwIbbPasvcFGU2eOx5ExC9twXN3+ByOEwuzGi8FfGMrbE+JGJI8HGAl+RB+T7ynyLpqp/mJqltQMGGqmFX/tPLhs0WM05yDIiAtthGbHbyiGcvYZ8IrTA7yHg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8b8337a2-112a-4060-81f3-08dbfb8b0db8 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2023 03:24:45.4818 (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: M/pyi5AuoBh89uwYuDS4dqQh3wqOi2Kgutq+YtcKdti/qnl69WaKyTXSpIQ8wK6+FColT0a1JOgYNLwQH9E7lVsTbCLLhFiNW+XqDB0XAJk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR13MB6259 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 Use the 'ctrl_extend' rather than 'cap_extend' to check the switch mode of features. Signed-off-by: Chaoyong He Reviewed-by: Peng Zhang Reviewed-by: Long Wu --- drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 4 +--- drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 4 +--- drivers/net/nfp/nfp_ethdev.c | 5 +++-- drivers/net/nfp/nfp_net_common.c | 2 +- drivers/net/nfp/nfp_rxtx.c | 2 +- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c index 56e57abacb..fbc2dbedf4 100644 --- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c +++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c @@ -145,13 +145,11 @@ nfp_net_nfd3_set_meta_data(struct nfp_net_meta_raw *meta_data, char *meta; uint8_t layer = 0; uint32_t meta_info; - uint32_t cap_extend; struct nfp_net_hw *hw; uint8_t vlan_layer = 0; uint8_t ipsec_layer = 0; hw = txq->hw; - cap_extend = hw->super.cap_ext; if ((pkt->ol_flags & RTE_MBUF_F_TX_VLAN) != 0 && (hw->super.ctrl & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0) { @@ -162,7 +160,7 @@ nfp_net_nfd3_set_meta_data(struct nfp_net_meta_raw *meta_data, } if ((pkt->ol_flags & RTE_MBUF_F_TX_SEC_OFFLOAD) != 0 && - (cap_extend & NFP_NET_CFG_CTRL_IPSEC) != 0) { + (hw->super.ctrl_ext & NFP_NET_CFG_CTRL_IPSEC) != 0) { uint32_t ipsec_type = NFP_NET_META_IPSEC | NFP_NET_META_IPSEC << NFP_NET_META_FIELD_SIZE | NFP_NET_META_IPSEC << (2 * NFP_NET_META_FIELD_SIZE); diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c index fbf132347d..72efbffb42 100644 --- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c +++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c @@ -175,7 +175,6 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt, char *meta; uint8_t layer = 0; uint32_t meta_type; - uint32_t cap_extend; struct nfp_net_hw *hw; uint32_t header_offset; uint8_t vlan_layer = 0; @@ -184,7 +183,6 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt, memset(&meta_data, 0, sizeof(meta_data)); hw = txq->hw; - cap_extend = hw->super.cap_ext; if ((pkt->ol_flags & RTE_MBUF_F_TX_VLAN) != 0 && (hw->super.ctrl & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0) { @@ -195,7 +193,7 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt, } if ((pkt->ol_flags & RTE_MBUF_F_TX_SEC_OFFLOAD) != 0 && - (cap_extend & NFP_NET_CFG_CTRL_IPSEC) != 0) { + (hw->super.ctrl_ext & NFP_NET_CFG_CTRL_IPSEC) != 0) { uint32_t ipsec_type = NFP_NET_META_IPSEC | NFP_NET_META_IPSEC << NFP_NET_META_FIELD_SIZE | NFP_NET_META_IPSEC << (2 * NFP_NET_META_FIELD_SIZE); diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 185b570892..886b568d96 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -303,8 +303,9 @@ nfp_net_start(struct rte_eth_dev *dev) ctrl_extend = NFP_NET_CFG_CTRL_PKT_TYPE; if ((cap_extend & NFP_NET_CFG_CTRL_IPSEC) != 0) - ctrl_extend |= NFP_NET_CFG_CTRL_IPSEC_SM_LOOKUP - | NFP_NET_CFG_CTRL_IPSEC_LM_LOOKUP; + ctrl_extend |= NFP_NET_CFG_CTRL_IPSEC | + NFP_NET_CFG_CTRL_IPSEC_SM_LOOKUP | + NFP_NET_CFG_CTRL_IPSEC_LM_LOOKUP; /* Enable flow steer by extend ctrl word1. */ if ((cap_extend & NFP_NET_CFG_CTRL_FLOW_STEER) != 0) diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index fed36dac53..a438eb5871 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -1371,7 +1371,7 @@ nfp_net_supported_ptypes_get(struct rte_eth_dev *dev) return NULL; net_hw = dev->data->dev_private; - if ((net_hw->super.cap_ext & NFP_NET_CFG_CTRL_PKT_TYPE) == 0) + if ((net_hw->super.ctrl_ext & NFP_NET_CFG_CTRL_PKT_TYPE) == 0) return NULL; return ptypes; diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index f775f25cb2..cbcf57d769 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -617,7 +617,7 @@ nfp_net_parse_ptype(struct nfp_net_rxq *rxq, struct nfp_ptype_parsed nfp_ptype; uint16_t rxd_ptype = rxds->rxd.offload_info; - if ((hw->super.cap_ext & NFP_NET_CFG_CTRL_PKT_TYPE) == 0) + if ((hw->super.ctrl_ext & NFP_NET_CFG_CTRL_PKT_TYPE) == 0) return; if (rxd_ptype == 0 || (rxds->rxd.flags & PCIE_DESC_RX_VLAN) != 0)