From patchwork Thu Oct 26 06:43:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133346 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 6F48C43204; Thu, 26 Oct 2023 08:44:41 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4D5E142831; Thu, 26 Oct 2023 08:44:02 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2107.outbound.protection.outlook.com [40.107.244.107]) by mails.dpdk.org (Postfix) with ESMTP id 0013D40E13 for ; Thu, 26 Oct 2023 08:43:56 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JnxhZETY247Q/KQ4lF5dh011312El0CqhybGIMPaeT3NPbxvhBBCQm7t7nJND9A9Ie77Is0Q6c9gl/ba6IQ2LveK9x3YRIwHlgdVM6Lz3wvxNQwSbI5kcO7uclK/a6P82T+vkZVnekMUYA0m82v+myBplachCeipSTi+0hSRQ1ZYSZVnSkrxjqRbPnRzXARMDMtFq4+lb1ijsKCWyhm9wOgq1iVcwqzwZvY3uep1APVbE8o07a1nAUN/DgjmmLva7MTJH33TgyBhbiJeaSR25itdfFRt7RlWJPX9gKCOJ8s2ABusHlOJIHC8DIa6+xJvNrLeKvUSchEnJbJwCgzalw== 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=R156Gls60QxOU7qWGoYnxXX00gHa1vcJCkb2LgmRnYg=; b=ImT3dc7gLr/Y8qJCDKp9Qc3AK7d3SabrWSfy0DC77t/MBEKnnp/5BRAvEg+DCziZKNxCf3Vld1yrGQnjVn+nua6b1bsJdrNrbZRKbGzbw71zzerW8Fk4/WnOmJtHXNVSNOqDmeeLxiQsRy84JN6UTPvrthhi9orkMn6/oDROYhra0wAJExHcMPApAX0tBy79fBa6T4SOFHcvq8axaoJPTd6xM2yuH9O0UNLrU7WFkvs0WCuPdVsfSC7VP6sqahPjDaJAdkwicdZIDZRRqgJkhTfI9GoTQ8iim3VqGX39D435ZkuLdCsjyaFdIG4gsR79XGwnR1yCoOsArDDM0O+Vvg== 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=R156Gls60QxOU7qWGoYnxXX00gHa1vcJCkb2LgmRnYg=; b=GKJ3SNBsjx2/UXJIZiWArtiZzHg3ISF5t0l7UAkbyAE2tF9JNCFF3haCAqYgra8h2vxUra005+VRLn6OMh/cAppp+V4J0uCVyxml+6u+MmaHw+0abX5NstlxCBa7Sm8wZVgmtvLbbkFT/zlYxgWb1lYjhY3FWE9wfvi5/fQxn0U= 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 SJ0PR13MB5965.namprd13.prod.outlook.com (2603:10b6:a03:43d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Thu, 26 Oct 2023 06:43:55 +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.6933.022; Thu, 26 Oct 2023 06:43:55 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH v3 06/25] net/nfp: extract the qcp data field Date: Thu, 26 Oct 2023 14:43:05 +0800 Message-Id: <20231026064324.177531-7-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231026064324.177531-1-chaoyong.he@corigine.com> References: <20231024022849.3092506-1-chaoyong.he@corigine.com> <20231026064324.177531-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BYAPR07CA0034.namprd07.prod.outlook.com (2603:10b6:a02:bc::47) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SJ0PR13MB5965:EE_ X-MS-Office365-Filtering-Correlation-Id: 1d9545cd-bbb2-4b00-e9b6-08dbd5eeeca5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SAKrosLvevmNY59Sep30y0J+dnEFwZbEyaZpV+arcyvJsPycj3MWCgdpDWXhbathlVqbk6w1+TSuLZpxaEKrk36fsXSiW7w+nQOK2qGSSWt2Wpw0mDDoPhfw1YfMEm2pn6LJt+ONRF8EVZJzLOaTXO9Q92ph1GHzRw3jkxXZLQtCc7EAXmeRolIrH9Mpiq/Uvee0ntk6K4PQFLfslduxFdnqCB+peUIfOl4DjDzTk7FaJ78/kattmgkBE5mUgbKE8Y3Rk0p412mSvOuO90AbGZA4rk57EaZvSJfyVFskof95vUPGB481tSUU478YGNcK49+yUO3eOLoOp18BzyCFcVk5P5X6jAr1xwnS/SLoBGdlnsAHTxz+yBWcTW1K/ET58rw0e77N2DYTYy28JBn+94oCz1Y4cpaAEm21Ay+QUn7YDiH6Y/cZr6huWdo7085572tB01UAY8Ap981NKRgRftibkTcXJEmRgqs9dHn78cbex1lHnBMMZED3fK7MSFFIhK6XkJFhopH+dlR3zdSn2I+w2QzaGC/i+l/QWTPwjn1P+QSPYf393uI7A3cGQtpl1cLjpLLr8u7eKTUBPNMNWx4H3utjCG2eIanHWv4YhOtHc/jpdU23uGrN4hc3shKGaNRQu06Rykvuz20roPMFC6XAG6r3jhTdzCok6e6vG2o= 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)(346002)(39830400003)(136003)(366004)(376002)(396003)(230922051799003)(64100799003)(186009)(1800799009)(451199024)(6512007)(478600001)(6506007)(52116002)(2616005)(8676002)(83380400001)(107886003)(41300700001)(26005)(1076003)(6486002)(5660300002)(6666004)(44832011)(6916009)(316002)(66556008)(54906003)(66476007)(66946007)(2906002)(4326008)(8936002)(38350700005)(38100700002)(86362001)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +FzNIeL1pcBBQ8aH8Nx/80c9L1vXpSw+jbJ58uvm5PJUmen2W+HLhXbAL8EHI9TK1nXWCkjR7Nv7Cf/iujz6yf2AA9I+GMN+lv93S4iV46V75QtF/YrZIXvidIy8V9mmGCgD0QhhGy70fBiN1FW2Z1BVFUYL80hyH1N6GC0LIlXaALDdQEKkR3Uy0npHFSIpUx3ybJ+o6ms5CvIMwm6PJMhYjJAKQVS6ixWoey1w838kRNLj5UaWu0mLyZAjhPoxWFkZvrXhawsVFuKAEhMKkSYlnLw7ZXwWQmA5xEw0F5lOTpd1aZZDbcsflte+UDb5/ANiHuxIX3nlEFUPlRQSScJ7cidsPhvVohC65Bch4DdjChSgvwcHMa9K1pWblj1aHw2ZfMCPn9NSdQe1xj8d8NuIim0w1OAFbgUXQiX2VYD7F+YUQI1IWWsxoT5wAu5u14RHPpPx0dX1WDYEHFE6Do2mu2KdUHwPPkU49PaQcan1P4V6QDg/ZQ5eql1F/GS3MnhbpM4ibvLcUzHWfGGUHon1+dN4vhBZMu1PRPh/iDo+A3ddHGGLRr2p2oJvYNQPhVilocKNs6gQkixoTz4+Xr9D721QoiUELFfubKpuxjBjw7goisbq60grWFS72/yhaavEP4SoceJGcwp44645HRmup8Hu1tzvVyLklstMiJR8C3yadDVFoyN8Cqcc94bkvs8Q1Py6XJx9A+uZ/uLs07XwdGZY0W5LxqBv5By8HmQLFoif4jS3ajN4tIsmPH9osS03ys2yRhZOABpK/js+OAprYtgs6xQgCyZ9h0s31ZBymzId6U4MYYWXpMX2nO2TM+TGN3TV1CWYlZEEFakA2b2H0o/M6katcwmnWwVRd2kM6jKh3lZmRlRMw9WQDocebJsOTPJAocbe0jgklD5BGTENkgGrxKrgvzmPRUXBRn+MGdG4oPCmGOiDp0z6G2v+GLP+0LpisgyNE1DtWxD7ceMx5dS+hBpDzXE/njym1AJBD4Fzp4n9yChITrTnSlsGmMpxPVx2dT/KoTdlZJ/vEaggS/aO5vXJ6cZGHVr6co8lOS68hvOjYcXWXC/s37RwdHR+Z1kdsDYXPiyj0Biy87texc/KlAGciY34PKR/Zt6yuoyKrMr/LcE46erVUlEjwFHFFJ9AqEelRNzBSdQl8K/M3dlvQvQyo619o+OWC5IAKE1jJSx3kWBT9hqGFaTPTDfHPItMVOxDs0XUPdny/f4d94VO/gVVpwOS1xUZEEvYKezwy3EGlJ3XdaEfWx7ZEjUkQNd6rIsrc8vYiL1zvAuSSFSO9KCx0Whs7MQ/ii7/MLE2YFAKEKnvNGQ4LpMi6XwYjlw7V0iqlD5xKQ47asFoiRbbSiu4pn+6CxPutL9vrfwocXHKOXOi1Udvfwa+uB0pwaHam9yUYF064zhlXVhQU8rNVQHTwCP1sI7K/GNCGohraUhhgZ85zMgqpKS2hPyuwCW09zpxpyN/Wdam+px//r0RfOVx3eBfPJK0rvu5Mrj3hjrhon/Z1qiykImjLJgo7WvT8+z+pnABa6B+/VUFstSdO5tG6+HHEq5rEFBWVXF6eWsvtJ2lZT7MxciI+KTg+wMHEAIwg7LF2/dVLA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1d9545cd-bbb2-4b00-e9b6-08dbd5eeeca5 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2023 06:43:55.5294 (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: +0nijCLGxhBoPvq6ym5N/I43XiQF194usd1EHvgPGjjgIdNBL06xfJBa1WI60iEXuIDFoMrd0hEbHejNWOeF5PuMfko8t6go5404CGIekik= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR13MB5965 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 Extract the 'qcp_cfg' data field into the super class, prepare for the upcoming common library. Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_net_common.c | 8 ++++---- drivers/net/nfp/nfp_net_common.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index 77c0652642..cb64fa13c5 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -206,14 +206,14 @@ __nfp_net_reconfig(struct nfp_net_hw *hw, struct timespec wait; PMD_DRV_LOG(DEBUG, "Writing to the configuration queue (%p)...", - hw->qcp_cfg); + hw->super.qcp_cfg); - if (hw->qcp_cfg == NULL) { + if (hw->super.qcp_cfg == NULL) { PMD_DRV_LOG(ERR, "Bad configuration queue pointer"); return -ENXIO; } - nfp_qcp_ptr_add(hw->qcp_cfg, NFP_QCP_WRITE_PTR, 1); + nfp_qcp_ptr_add(hw->super.qcp_cfg, NFP_QCP_WRITE_PTR, 1); wait.tv_sec = 0; wait.tv_nsec = 1000000; /* 1ms */ @@ -525,7 +525,7 @@ nfp_net_params_setup(struct nfp_net_hw *hw) void nfp_net_cfg_queue_setup(struct nfp_net_hw *hw) { - hw->qcp_cfg = hw->tx_bar + NFP_QCP_QUEUE_ADDR_SZ; + hw->super.qcp_cfg = hw->tx_bar + NFP_QCP_QUEUE_ADDR_SZ; } void diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h index 7bcdd9295f..4bfb3174b0 100644 --- a/drivers/net/nfp/nfp_net_common.h +++ b/drivers/net/nfp/nfp_net_common.h @@ -113,6 +113,7 @@ struct nfp_app_fw_nic { }; struct nfp_hw { + uint8_t *qcp_cfg; uint32_t cap; uint32_t cap_ext; }; @@ -150,7 +151,6 @@ struct nfp_net_hw { uint16_t vxlan_ports[NFP_NET_N_VXLAN_PORTS]; uint8_t vxlan_usecnt[NFP_NET_N_VXLAN_PORTS]; - uint8_t *qcp_cfg; rte_spinlock_t reconfig_lock; uint32_t max_tx_queues;