From patchwork Fri Mar 10 06:25:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 124926 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 4D68E41E29; Fri, 10 Mar 2023 07:26:21 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CE1BE41140; Fri, 10 Mar 2023 07:26:16 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2139.outbound.protection.outlook.com [40.107.92.139]) by mails.dpdk.org (Postfix) with ESMTP id 29AD940A81 for ; Fri, 10 Mar 2023 07:26:14 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QKwJ+GSLBHmp5BO14KDmWzGK3cdnXdfF7PgIw5s4s2yFDmXvHCpPx189sZmPVvIgXM7y0MlKQT6HxDaVU1IkrH++P3Ffu1rvnVbbBr8+wA9CQczC4c272Pt2Qp8fksDnH9T0pTu6WFWmq6ajIntcxCTCGf7SgLXRpTzqHXzWtFMuG2ok/pRVrnLWOutsWbZbwJj7O27vsTZ2fq8einpUjqVnpyQeGowlGnE1t2fhUieK9qdDdyY/lIpji/gkPAiogc7XQFjKzgTRfJB5kDLOCHlBWHhB/KuJ70WehfOG4YosHwV+2PnbCc9tAedlP3fZD9W4Kn5IHk/ccUbVo+VcKg== 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=+7c/6smN0e0M2AhHS/WGgmrpXLOjF4uABUe34Y6Acjw=; b=VDybU6rcnE+4qcSgIZxpBaE5xVWXfgLvnpgGavQqV/2QyOdLJU8al/AD5wBfpAlKDWujeg9NRAXqB5rFtQkEWosoZDqhrenlK9+nTVVHNmYFC+/9SUJDTASM3MPzZq4d1MzQgJdg6xJLM1SZK1saj3LehwF5m+LkSgfkGC+i6HX1asDvRoH7tKtEjbWFy2O2oEHZZ30+F/pdg/jWnEq/bRcFqjM+1uabnu1QA4TECaErsStisquPfYeoSbRloNffHClLcGd/quLBEslg+s6xjpf3yPd6PiXOJQmBaal/DTmUKi8D9fQjwRj14DGSaQHBqDYrmO1SyiUuriq/sZ0OEw== 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=+7c/6smN0e0M2AhHS/WGgmrpXLOjF4uABUe34Y6Acjw=; b=BPKBS1ZKE4dLRHyIJaej/rWTX1iY0bxsqU+TzcRGxvWt9j+9THdlrWWHEkYm4z/W8LXlwkomHo4KF7f780VSZpnYly/EdvkFCZMwAPq+SHtxK33NPgv8PBmMvjd7t/tfVfIYHLPbDTJ3m4D5V4SGby8OvO8t473OfO+7jwLQ6ok= 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 PH7PR13MB5913.namprd13.prod.outlook.com (2603:10b6:510:158::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.17; Fri, 10 Mar 2023 06:26:13 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::b19d:4343:f34f:a817]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::b19d:4343:f34f:a817%3]) with mapi id 15.20.6178.017; Fri, 10 Mar 2023 06:26:13 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, James Hershaw , Chaoyong He Subject: [PATCH v2 1/2] net/nfp: add helper functions for read/write 16b values Date: Fri, 10 Mar 2023 14:25:41 +0800 Message-Id: <20230310062542.817107-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230310062542.817107-1-chaoyong.he@corigine.com> References: <20230221062955.34210-1-chaoyong.he@corigine.com> <20230310062542.817107-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SI2PR06CA0007.apcprd06.prod.outlook.com (2603:1096:4:186::9) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH7PR13MB5913:EE_ X-MS-Office365-Filtering-Correlation-Id: c819aa4e-1d4c-4e05-dcce-08db2130585f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YZDJFBu0enLXzVdTIcBXj3jj7VCNCxx2zPUWWsRLHNzYrLfiz55Si4Ez7ivn8u3gC34dQf8xyS/FR/xdgHLcTGbHkgjdBxCWRublFBV6ocMfgPP8ZWmf3do9XLSbJoz9ArtxMitqqWC8FDwE4XWzxwX3ux2Aey6maCR6Tp1KZPu6QgQMLwbXam5r0suhIUcgZNOKoJQzg/1BrTMgcI7FDaWTAFUykSC237CVzNF8A6scm0GzxuDkmygN4OFtzzNW2dH4Jpj/ftNQRhwHRWGF+soNmkTKWjHpFdk3CUY4li1yIETJalqprX179K9D+rk04pZzmQ9UPyc3m5LSNA7EJ5xqFIBRPjPHDNkLeYQu8r5yHKyIjTEowsYdh6LDfPatgBZxjqiulOkGa1qZe22/w+LH26A+1CxDxJoB5CI7BNFZOxnStE6QI5u1mvMYOUOcEJQTCaKOQe35C/bZVJ/4qx8qo3CDxSiBbW7392BeKLKdwRjNPhgg4Y6JSKWBF/vOPcCLgvy4wuCUE3LB7ncsoNMl7Ir7n4ken3Vo8f8Qw/4KFx8zfhdrXWg4Ux4i2WWonCT/YFGxgBRTcQA1A2FRrg7YGEc9fGXMtLdwM/lRdb5rbswfZeXq76AW4mTBUS8j7SY3T6sQVCtuzfBhDj76fu6IYZ8S7CGDBCOaUdPnmg0/jkVi3BtzboRiVTh9DxtF7uJWKuDnuV8+IYn38aA5/w== 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:(13230025)(4636009)(346002)(366004)(39840400004)(396003)(136003)(376002)(451199018)(54906003)(36756003)(478600001)(44832011)(66476007)(107886003)(6486002)(52116002)(316002)(5660300002)(8936002)(2906002)(66946007)(66556008)(6916009)(8676002)(4326008)(41300700001)(1076003)(6512007)(38350700002)(38100700002)(86362001)(186003)(6666004)(2616005)(6506007)(26005)(66574015); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?/lQsnaUfQ4uH+7G8w2a2mSuNAuRB?= =?utf-8?q?UMq2Q71J3KMnX/KUewSY8N3HAbCB5imFEzG/t9XzesdTXXmMfHZSTwIG1/0SOLtPV?= =?utf-8?q?a7g6v9Sgl1NqK3+tO2VT+ziOCIyQTrNtH1EmA0pzDmW6CeTLsgqZPsirDz1dw0X1N?= =?utf-8?q?TFCj1Fh3I+/bdGuR3/GKqnEeuCldBqAHxQKXm8AIHAOwL/vP45WRby9bIRf1ClVBM?= =?utf-8?q?Wo1cbD8febCYPpzf6Us/NLMzLUGFGdgr0r7HDdDH0uVDijsLd9In3dylqSKRMqbIt?= =?utf-8?q?4BYdtaLaLJfmQUgwfbLjKa5LZwqUGNNV126jzAfHzcG0fJpIqFPY9Oz+uJz0PNabw?= =?utf-8?q?GOYty16TfhkdRO59txoimu0lj8ib53zDLGMbiK0bpQeiTfyXH+xuuRJk/2w5WF/uK?= =?utf-8?q?NhXZeLkifAZWVPqNAvDMwoi904STB0TmFFYMaXaZQxmFJxiSgQcsUUMvFtfseW/iV?= =?utf-8?q?RClyFrCT0+nSYCO13dGbPcB52ybqkpxmrrjrJH10VRJe9CEgxq6j3IIDKMT0fPgXU?= =?utf-8?q?UysJy4cekP08lgYbuo8nKtAIZ0ghFSxJbTYHc8PjHH0M+zqCJZyRdx0Hg7xneGEe/?= =?utf-8?q?RDXLtZDOlPxemviY4rfdNipmQ3ooFeAKpAWND30sFrYIsIdeLzY50ehmrsGdLPD1f?= =?utf-8?q?ni+nipuk7MYQOQSt4fDFJG3NiucqkCk3tJNcJHt4cPJvNDxEDVb0FBJDrblZRTHbh?= =?utf-8?q?BIQof43XVIZO1CjR/ti46ZnceIKUZiAOUK3DC4LSusePi4O8SNrpWOuTUfeDODib7?= =?utf-8?q?/Hjr8camw8/EgvrLkNl1Nx8JzRJLWyZztAL1DdVS0OY6FSzmCbDEpFov10Q6XQAry?= =?utf-8?q?VsHk4ssaJjtfM1vnfmDCn7YratZbVniadIG8KeQ7OnqaCf0Js0Yaz2yMA5HSETMmX?= =?utf-8?q?CVuAFUQOH326WK4eK1OJyNUEO3ZZGOxMEAt2WNVHv1/GQRT4tqe9qmC+nfIfWk4Dc?= =?utf-8?q?43vy4GADT7GiXp2R60f3KKafha8AEQIWHdPetjpaTa5BJKOH/cNoEHMnDogu77SNt?= =?utf-8?q?jEMwpFHRJfxn+40lvGnsbRkNF/WzlT8XAecXUhaEsaLnimoN+bBWbqPFq2kHa8P00?= =?utf-8?q?P0oCZ/idqvlX5lYGCb31RpRWj9IChx/OGNT6ZnhrMFhbGEZZrlFIlPcjPkHbWwGWj?= =?utf-8?q?nEsjijitNDQKmJBXB0UYCZ2V9wZhbb3A2V56/LHPVyzoLFc8rtHVNyoam1YirUW5i?= =?utf-8?q?LFehNTPi/SZmpPBddiZoRKOtE9nAIiFXbiiJtI9ncJ+vjxU3bn0of4OxZUiCAwE1L?= =?utf-8?q?6ebkIg739atvZb/fz156YbbWHHDVqbHLrISuvOHyJiSJHvEWmug11res1CCHtMpJc?= =?utf-8?q?ecYRfTlTolKnBCDfcycZHWHf4whYjIUsVoANOL+2CxcWNM047fYi/2JVn+dCIN7M3?= =?utf-8?q?S59Isu4BiYI3p4cCS3M7aPjPkTEO6J5BUjKdRgGOZrRLj3zeCFaplzdRoFfRGSX31?= =?utf-8?q?3Z4TCYLsTXjmcyUGrhQ3jIy8C498rYlPluyxAhyUZOk2hl3rK2nJj0jfq58c2Oj9D?= =?utf-8?q?dTEVfAJZ1rpIiqsuQNR760UEPXl0w69Rfg=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: c819aa4e-1d4c-4e05-dcce-08db2130585f X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2023 06:26:13.0693 (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: zYPbZ7YUCd/pSk9i7OkY4Jry+HEpSPDA4y9F5qWS7tL5EFVVJZredTQ/oaf9hK6iQPxRgsp0d+MXpEjy4L9qLrqf92OpsmAr0AHJPRYEXrE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR13MB5913 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: James Hershaw Expand the selection of read/write helper functions to include values of 16 bits. Signed-off-by: James Hershaw Reviewed-by: Niklas Söderlund Reviewed-by: Chaoyong He --- drivers/net/nfp/nfp_common.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/net/nfp/nfp_common.h b/drivers/net/nfp/nfp_common.h index 4486ffa72c..3a8b023c75 100644 --- a/drivers/net/nfp/nfp_common.h +++ b/drivers/net/nfp/nfp_common.h @@ -283,6 +283,11 @@ static inline void nn_writel(uint32_t val, volatile void *addr) rte_write32(val, addr); } +static inline uint16_t nn_readw(volatile const void *addr) +{ + return rte_read16(addr); +} + static inline void nn_writew(uint16_t val, volatile void *addr) { rte_write16(val, addr); @@ -321,6 +326,18 @@ nn_cfg_writeb(struct nfp_net_hw *hw, int off, uint8_t val) nn_writeb(val, hw->ctrl_bar + off); } +static inline uint16_t +nn_cfg_readw(struct nfp_net_hw *hw, int off) +{ + return rte_le_to_cpu_16(nn_readw(hw->ctrl_bar + off)); +} + +static inline void +nn_cfg_writew(struct nfp_net_hw *hw, int off, uint16_t val) +{ + nn_writew(rte_cpu_to_le_16(val), hw->ctrl_bar + off); +} + static inline uint32_t nn_cfg_readl(struct nfp_net_hw *hw, int off) { From patchwork Fri Mar 10 06:25:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 124927 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 8D2A841E29; Fri, 10 Mar 2023 07:26:28 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4E5AD42B71; Fri, 10 Mar 2023 07:26:18 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2107.outbound.protection.outlook.com [40.107.92.107]) by mails.dpdk.org (Postfix) with ESMTP id 2BB9041144 for ; Fri, 10 Mar 2023 07:26:17 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lRFQotB9pdopP6XkEi33RcQ4WabaEuf22sACmiDp3IHQrOaVXvOKMqHIW3zGxYlZZc4QhyT2K300Axh4UZG3NsIggxC5rG+NfDF+uNoslcFMq+2NUA6SD5Qbn8fMRIpaxDZwmLuOn/K464UtI7aNEnbKpJZO8o/T2UYP/hSuUqwZopD60LNlf+YUHFjhd+9mGVYz1gvzCk8/REvqQDaWSZ9sXRHm9izUXM/tZzewZBR1DxOUxs97wVeU2fs+fLlx+WLtH+ZgrrwiZLhKLyHTVjtm7Woe1nFnmIE/EhU/a0XCPbkhBQueBHaCooYCwG2fs/APymU4NxMkkFfAOp6FHg== 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=MvzxUBHp9I3+fIhKY8Q+4HWSdxwFWpYLRBuID1woCz0=; b=W+47tVXfgH0fk/un8z0LYP+WgPT3Me0sl1ws7CZYW3CmN8Uha7kl60ubAEq6tWQ+r4SsfO93Xi16WB/maZkDDeQLEBlnr77PPvo/12ltRpGpFuQkK4tG0E6jq8wkk3qmXDUWJLfRLuqL7Js12vlscv3nxImgpb37nTbWeowAqZPcGl+wL12yWDfsOTq9h94vJP445aPk9jhVqy9asstKvpOiUYM029oWIJGPF/91sA+uUj0+7st4dj08RZmsCrfiFynt9DEsrnEbOkPNz712n1p/fUTJpxy88QeF1RhBtGgklDoLC9ANFz6AkuV57/LkGMaOnfnzjhR++EHJi0o65w== 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=MvzxUBHp9I3+fIhKY8Q+4HWSdxwFWpYLRBuID1woCz0=; b=auoPJx9xAJgwZ/Uxpvb4tnu4iD8Q9O9sI+KP8uw6lpnPm0vSrd+9N18214oSpdEaUWvBFS4Wvj9d57aygX6MwCVFLVCOERJSs6H3jAU/tH5cm07mKZz5bMk7Uliu8tWkHkqqjVCSjk6JT9OM3ypVmKpzM7ZR1CutMZ2mNa1I5iw= 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 PH7PR13MB5913.namprd13.prod.outlook.com (2603:10b6:510:158::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.17; Fri, 10 Mar 2023 06:26:15 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::b19d:4343:f34f:a817]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::b19d:4343:f34f:a817%3]) with mapi id 15.20.6178.017; Fri, 10 Mar 2023 06:26:15 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, James Hershaw , Chaoyong He Subject: [PATCH v2 2/2] net/nfp: write link speed to control BAR Date: Fri, 10 Mar 2023 14:25:42 +0800 Message-Id: <20230310062542.817107-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230310062542.817107-1-chaoyong.he@corigine.com> References: <20230221062955.34210-1-chaoyong.he@corigine.com> <20230310062542.817107-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SI2PR06CA0007.apcprd06.prod.outlook.com (2603:1096:4:186::9) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH7PR13MB5913:EE_ X-MS-Office365-Filtering-Correlation-Id: 8bafc7ce-ca01-49b9-247c-08db213059f3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: y1X8wLVYKjQkpd2vZ9u/VXVjfAuK05PZdjzsduOIjxnHyK3CBJy6rgE7S/Z7LvRASlQwIsdokEJqqmkHuhTMegzkfwhZJURqtzceNP895gRmxuMBPzegmcubVEyD9gksSzFjJ2wOZLgq5AQ/21F5ncPyZEpBVt1Vt0mXqGV33wN3+U7+jdYNa6zJgsdziJvINASvFm+NIUmCNpzkeA9JiX1LmVd09RIVIfkrV3bvkhy0FT3k2biLtuPFwrEVQM8eOjEahhwGORyZuNRymTIZnE3VxJaMuN3mHhLlIQA/RQD9j8CPQJqNcsqRSQtpd1x8kOVL9aoTclNXJh0aptuN0PUrWPMvv5t2SRwWWyhLkvyWHOaERAtRyCXDIouURoxFmSWJAS+ov5RZu7Lb+PcIAOqAAIimlgjznRVhndIf1lzVbQsjJsFHi/ouaBm0JODTqG/YGcDcLt3VZ1/RRwXRRMdHEwNqi0iCKvOYc7Qu17PEVa5Hcmf/LMyYdxOYN8OwmS1m8Fu+414OkiE0PDNIseRDQpRUp9Nc7vF4c3irgqKu6dflplAwNOgXL2nhNMHpBynG3ipguNfetiauvtd4dvjfWZit20S2YOEPa8k88FHaRkKk5WvE/Mmwg1Sz/yIjBwM9cs77FsUq/AREPVh4fOXi2O+6poWgixsNgcKIDRAqSQ0p4G/dgFU0DPBPD9QfQu3PqLYHyXrD/KvLO+I+6w== 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:(13230025)(4636009)(346002)(366004)(39840400004)(396003)(136003)(376002)(451199018)(54906003)(36756003)(478600001)(44832011)(66476007)(107886003)(6486002)(52116002)(316002)(5660300002)(8936002)(2906002)(66946007)(66556008)(6916009)(8676002)(4326008)(41300700001)(1076003)(6512007)(38350700002)(38100700002)(86362001)(186003)(6666004)(2616005)(6506007)(83380400001)(26005)(66574015); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?RjnWpeLr50ctapRgFiIITxDTXEUm?= =?utf-8?q?ZlF/SWkcNS5zOCec4OYiKkBD3QYs3TZKidaDg3xz+R9u8H44bNvaPg4dOuqqMRKeF?= =?utf-8?q?mkVlyXYpx8fRdoRBjT6qCW5f1xGsWHzpAOR76iOnGfFynmV9iYyQzFL4rZhCr9jnv?= =?utf-8?q?REayJHEcD3uICoSJbnIHVDXJCtWe/OXJRUXuf6GfPP9NqXI7OQ3dmOw+ytiE4aR1u?= =?utf-8?q?GLQjAeiZ47fYkzZ6oQ1QRwq0AoolfkhU+0vmA//y/kHOZ4XN52okTlcb3DNWg2p0Z?= =?utf-8?q?gJKMnhisgUkXNrZ8fERVQ+vfYV6ilpesilan8Ksr1nW4BvDt6/GOXGwnhnaZqJuUa?= =?utf-8?q?DAfZlyVnPGQSP/BSZTtgZyao62oZp1Luxvs2+6c08pqhH3z2tVAYuPjxtLwmIdCDg?= =?utf-8?q?F+klHhJq+dnflb1XavHR5d9GDc/MADSALCwnaKTd1b3uGEBNeAjxJ5gQt5zEK8BYZ?= =?utf-8?q?VowIj1kU3YHO7LST3yeoxhgow4JlFq3FAOpQftP+6i3dQxyGNfvxupQCaKoNwZblz?= =?utf-8?q?G9+rV+2iAVR2+nK+oHiDKINAGfuzMwFJgfV9la6gBBeqeCIxFykQB0cl7iT7A8Juz?= =?utf-8?q?WNZNYqu8Gd/aKu7m96a7Qqu4DjO4m7GvTkVu6pX1NDlehSPJ5Bov598IeSEhfa7BC?= =?utf-8?q?7sZwbUf4F5H7gMAkjbJuf6CBkeloEFJU8t/gpkgmzkZb8PgifnJOGgMPgerwmvoNl?= =?utf-8?q?U+vkvO5xRVxwKxBZOQ3Dopc8YLX05nJXkjwRHoC7GPp1/VAtuW1zMzpNorGA39sFh?= =?utf-8?q?U2z6usrZUh/cy/JmGtHuUtZrYNVnNy4w9K/AT6d5v0ZhV3j5KfSw8iYO9ckLLeEpN?= =?utf-8?q?z7X6ioBtDRuQIJmLNEpEglaxWo8obk7pFeXlMpS6CwE38JdsDLqLJsEZrDYXo3l/i?= =?utf-8?q?Qe5CUlXs1Hod1Z32XgYuDD76z2cyHSC7Nu2TMQW9sYx+42sQGlj15TQc3qogUjekf?= =?utf-8?q?hP7dSMYpYCp7vSN1isbkhQ7f4A8d13jvFrgvm1/daaLTLWBt7uFMQA2u/6+lR47vI?= =?utf-8?q?/FvZscsikFQh8O+WiFUtmBXFEElQcP3Cd/BHt/UHqA5ZHc9eqGvbCJMKxtfGhTvpb?= =?utf-8?q?KNe8g/7EJz8AzEt3eTkf5PVwNozPlchnzIglhaKxhKjAKRKlsaC1gI8k368Kg1qum?= =?utf-8?q?+2wym+0pXMV9pjcKhwfmjTJniFaxb/Bsn0o3OwAklLusJRrx5R0CDk/ciOK6tiuI4?= =?utf-8?q?G1c6UNSnFKiyPo132f//i2inyHfrUzmeLQbrGbCfIFTIi28j8PYsBSHny6OgDWhp/?= =?utf-8?q?0JyhrK0SOHEkEiHkJ92tzun/B8VgW9pQOo4GSuBxu0UOI4bXarT69fl212CZBFAHy?= =?utf-8?q?ReB9NjldS+iDvaLt7/x5eAsPEbZVkPRq4xKMwELWsASMa/zHtEyQUKtCgqWVa9iCz?= =?utf-8?q?U5ZcG1FmfFsn4H483yFF3rw6wKS3ybWiT+KuQy3jGId+lcUeccondcl8AMg2CLyI1?= =?utf-8?q?ydc+T1vuklq+8OND4XS+fwBJK3aDlXAx5jFZ6bISsmQ/mLyttVXn0BQW8IZ+vodvJ?= =?utf-8?q?+GvKB5s9xyQS/HWAz2G6pcyp/0iUQCB1dg=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8bafc7ce-ca01-49b9-247c-08db213059f3 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2023 06:26:15.6199 (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: DurJTK9mAv+ILXYjBIN/A79KHPexZs1UiEDEejo+9JgCsQj5/U5Bg3oWxDTH8HQLbhQD2VKMS03+1jtctPMs4IoVDWKdKDetSzS8pSekjso= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR13MB5913 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: James Hershaw Due to changes in the firmware for NFPs, firmware will no longer write the link speed of a port to the control BAR. In line with the behaviour of the kernel NFP driver, this is now handled by the PMD by reading the value provided by the NSP in the nfp_eth_table struct within the pf_dev of the port and subsequently writing this value to the control BAR. Signed-off-by: James Hershaw Reviewed-by: Niklas Söderlund Reviewed-by: Chaoyong He --- drivers/net/nfp/nfp_common.c | 104 +++++++++++++++++++++++------------ drivers/net/nfp/nfp_ctrl.h | 9 +++ 2 files changed, 77 insertions(+), 36 deletions(-) diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c index 5d92b476e2..2261d955c8 100644 --- a/drivers/net/nfp/nfp_common.c +++ b/drivers/net/nfp/nfp_common.c @@ -52,6 +52,58 @@ #include #include +static const uint32_t nfp_net_link_speed_nfp2rte[] = { + [NFP_NET_CFG_STS_LINK_RATE_UNSUPPORTED] = RTE_ETH_SPEED_NUM_NONE, + [NFP_NET_CFG_STS_LINK_RATE_UNKNOWN] = RTE_ETH_SPEED_NUM_NONE, + [NFP_NET_CFG_STS_LINK_RATE_1G] = RTE_ETH_SPEED_NUM_1G, + [NFP_NET_CFG_STS_LINK_RATE_10G] = RTE_ETH_SPEED_NUM_10G, + [NFP_NET_CFG_STS_LINK_RATE_25G] = RTE_ETH_SPEED_NUM_25G, + [NFP_NET_CFG_STS_LINK_RATE_40G] = RTE_ETH_SPEED_NUM_40G, + [NFP_NET_CFG_STS_LINK_RATE_50G] = RTE_ETH_SPEED_NUM_50G, + [NFP_NET_CFG_STS_LINK_RATE_100G] = RTE_ETH_SPEED_NUM_100G, +}; + +static uint16_t +nfp_net_link_speed_rte2nfp(uint16_t speed) +{ + uint16_t i; + + for (i = 0; i < RTE_DIM(nfp_net_link_speed_nfp2rte); i++) { + if (speed == nfp_net_link_speed_nfp2rte[i]) + return i; + } + + return NFP_NET_CFG_STS_LINK_RATE_UNKNOWN; +} + +static void +nfp_net_notify_port_speed(struct rte_eth_dev *dev) +{ + struct nfp_net_hw *hw; + struct nfp_eth_table *eth_table; + uint32_t nn_link_status; + + hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + eth_table = hw->pf_dev->nfp_eth_table; + + /** + * Read the link status from NFP_NET_CFG_STS. If the link is down + * then write the link speed NFP_NET_CFG_STS_LINK_RATE_UNKNOWN to + * NFP_NET_CFG_STS_NSP_LINK_RATE. + */ + nn_link_status = nn_cfg_readw(hw, NFP_NET_CFG_STS); + if ((nn_link_status & NFP_NET_CFG_STS_LINK) == 0) { + nn_cfg_writew(hw, NFP_NET_CFG_STS_NSP_LINK_RATE, NFP_NET_CFG_STS_LINK_RATE_UNKNOWN); + return; + } + /** + * Link is up so read the link speed from the eth_table and write to + * NFP_NET_CFG_STS_NSP_LINK_RATE. + */ + nn_cfg_writew(hw, NFP_NET_CFG_STS_NSP_LINK_RATE, + nfp_net_link_speed_rte2nfp(eth_table->ports[hw->idx].speed)); +} + static int __nfp_net_reconfig(struct nfp_net_hw *hw, uint32_t update) { @@ -111,6 +163,9 @@ nfp_net_reconfig(struct nfp_net_hw *hw, uint32_t ctrl, uint32_t update) PMD_DRV_LOG(DEBUG, "nfp_net_reconfig: ctrl=%08x update=%08x", ctrl, update); + if (hw->pf_dev != NULL && hw->pf_dev->app_fw_id == NFP_APP_FW_CORE_NIC) + nfp_net_notify_port_speed(hw->eth_dev); + rte_spinlock_lock(&hw->reconfig_lock); nn_cfg_writel(hw, NFP_NET_CFG_CTRL, ctrl); @@ -538,27 +593,15 @@ nfp_net_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete) { struct nfp_net_hw *hw; struct rte_eth_link link; - struct nfp_eth_table *nfp_eth_table; - uint32_t nn_link_status; - uint32_t i; + uint16_t nn_link_status; int ret; - static const uint32_t ls_to_ethtool[] = { - [NFP_NET_CFG_STS_LINK_RATE_UNSUPPORTED] = RTE_ETH_SPEED_NUM_NONE, - [NFP_NET_CFG_STS_LINK_RATE_UNKNOWN] = RTE_ETH_SPEED_NUM_NONE, - [NFP_NET_CFG_STS_LINK_RATE_1G] = RTE_ETH_SPEED_NUM_1G, - [NFP_NET_CFG_STS_LINK_RATE_10G] = RTE_ETH_SPEED_NUM_10G, - [NFP_NET_CFG_STS_LINK_RATE_25G] = RTE_ETH_SPEED_NUM_25G, - [NFP_NET_CFG_STS_LINK_RATE_40G] = RTE_ETH_SPEED_NUM_40G, - [NFP_NET_CFG_STS_LINK_RATE_50G] = RTE_ETH_SPEED_NUM_50G, - [NFP_NET_CFG_STS_LINK_RATE_100G] = RTE_ETH_SPEED_NUM_100G, - }; - PMD_DRV_LOG(DEBUG, "Link update"); hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); - nn_link_status = nn_cfg_readl(hw, NFP_NET_CFG_STS); + /* Read link status */ + nn_link_status = nn_cfg_readw(hw, NFP_NET_CFG_STS); memset(&link, 0, sizeof(struct rte_eth_link)); @@ -567,28 +610,17 @@ nfp_net_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete) link.link_duplex = RTE_ETH_LINK_FULL_DUPLEX; - if (hw->pf_dev != NULL) { - nfp_eth_table = hw->pf_dev->nfp_eth_table; - if (nfp_eth_table != NULL) { - link.link_speed = nfp_eth_table->ports[hw->idx].speed; - for (i = 0; i < RTE_DIM(ls_to_ethtool); i++) { - if (ls_to_ethtool[i] == link.link_speed) - break; - } - if (i == RTE_DIM(ls_to_ethtool)) - link.link_speed = RTE_ETH_SPEED_NUM_NONE; - } else { - link.link_speed = RTE_ETH_SPEED_NUM_NONE; - } - } else { - nn_link_status = (nn_link_status >> NFP_NET_CFG_STS_LINK_RATE_SHIFT) & - NFP_NET_CFG_STS_LINK_RATE_MASK; + /** + * Shift and mask nn_link_status so that it is effectively the value + * at offset NFP_NET_CFG_STS_NSP_LINK_RATE. + */ + nn_link_status = (nn_link_status >> NFP_NET_CFG_STS_LINK_RATE_SHIFT) & + NFP_NET_CFG_STS_LINK_RATE_MASK; - if (nn_link_status >= RTE_DIM(ls_to_ethtool)) - link.link_speed = RTE_ETH_SPEED_NUM_NONE; - else - link.link_speed = ls_to_ethtool[nn_link_status]; - } + if (nn_link_status >= RTE_DIM(nfp_net_link_speed_nfp2rte)) + link.link_speed = RTE_ETH_SPEED_NUM_NONE; + else + link.link_speed = nfp_net_link_speed_nfp2rte[nn_link_status]; ret = rte_eth_linkstatus_set(dev, &link); if (ret == 0) { diff --git a/drivers/net/nfp/nfp_ctrl.h b/drivers/net/nfp/nfp_ctrl.h index 75e4458a1b..244048796c 100644 --- a/drivers/net/nfp/nfp_ctrl.h +++ b/drivers/net/nfp/nfp_ctrl.h @@ -178,6 +178,15 @@ #define NFP_NET_CFG_STS_LINK_RATE_40G 5 #define NFP_NET_CFG_STS_LINK_RATE_50G 6 #define NFP_NET_CFG_STS_LINK_RATE_100G 7 + +/* + * NSP Link rate is a 16-bit word. It is no longer determined by + * firmware, instead it is read from the nfp_eth_table of the + * associated pf_dev and written to the NFP_NET_CFG_STS_NSP_LINK_RATE + * address by the PMD each time the port is reconfigured. + */ +#define NFP_NET_CFG_STS_NSP_LINK_RATE 0x0036 + #define NFP_NET_CFG_CAP 0x0038 #define NFP_NET_CFG_MAX_TXRINGS 0x003c #define NFP_NET_CFG_MAX_RXRINGS 0x0040