From patchwork Fri Sep 15 09:15:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 131488 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 B1068425A3; Fri, 15 Sep 2023 11:18:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A41A041144; Fri, 15 Sep 2023 11:16:44 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2119.outbound.protection.outlook.com [40.107.237.119]) by mails.dpdk.org (Postfix) with ESMTP id 7DCFF41611 for ; Fri, 15 Sep 2023 11:16:42 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EOVNLBb359H1cKLIPTgITMmZyeWYK6efv2m9ehBFVUAPdrZzIXFbDLkLd7bK0nE8ThyWFlKaxVCg9nh7VNPFRzwrRo46P2M+qPF6pMIZwpJIK9ovryZVUTNRZeUr/AWYwpL7M8ET+C0yJCYdaeYdmjZWQnwyx1FMnoEB1OT1ushGoLq8MmUTHD7feZjSkU3NMQXWj2iPkG1ZT1ICyZMXn3MHXNkQJEXRD3duGBHnUxqvmfSidGmYYtm4g3gOs8uCxgjXDU6wBo5ccoeoiB7F1lGMzuXrglXG5ndNRptYb1VzmDMzJ1CQRu5EWD++RMG2RHFq2DLW427lHpm0PXNQsg== 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=bQ2x2GLMRxYwDFcgHzgZ9xx0WHYYtSLbqMV0IvycA7s=; b=MFp3wSN4EmYKgoiO2OO+d0xuofX5kuXIhfnRdaTNFgaPZRrowVi17XOE0vlK+/E5EwKjFA5kR1Yy92soNwuCAbNm+IPc2L0yoG9hwj99ndRF+6EMK6uIa/CoBubNqJDeTTa26uhQtaJOlMSRwJsDl24ag7DKyF/SBazfZeDUhV6LjuJpyyaI9kHSV1++8xlRg2I7tFvOj/96TzoaQFqTlkoiHJgWynAE70OWdCUDSKia8y3w5IZYBYiEzM6BnAGwKsmEtImd6PUc3DJg9/2n0R184MRNepNSzDRn5mPl09wQQajEJ3l5/d8yTwiSv3pt/Yz5UB8JhosE/8Ekus4N/A== 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=bQ2x2GLMRxYwDFcgHzgZ9xx0WHYYtSLbqMV0IvycA7s=; b=ZvgiwK6yXEA0QxMFj/ryrmSFS1ZSqF1Ox+7KCrCv7xFSYrOAeMjBsAywgLNplW34neOuThQEPoc3/rUE9zV7oF3h3yZgYQuTmjrXdqClywLVy6Sam3fi4LcHR1IYUq3tPu2EOZn+BoC/q/YDnpwFQsejDctmzSG+ZHyum2kW/KE= 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 CO1PR13MB4773.namprd13.prod.outlook.com (2603:10b6:303:fb::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.21; Fri, 15 Sep 2023 09:16:41 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::c05c:6915:1628:70c4]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::c05c:6915:1628:70c4%7]) with mapi id 15.20.6768.029; Fri, 15 Sep 2023 09:16:41 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , =?utf-8?q?Niklas_S=C3=B6derlund?= Subject: [PATCH v3 13/27] net/nfp: refact the nffw module Date: Fri, 15 Sep 2023 17:15:37 +0800 Message-Id: <20230915091551.1459606-14-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230915091551.1459606-1-chaoyong.he@corigine.com> References: <20230830021457.2064750-1-chaoyong.he@corigine.com> <20230915091551.1459606-1-chaoyong.he@corigine.com> X-ClientProxiedBy: PH7PR10CA0017.namprd10.prod.outlook.com (2603:10b6:510:23d::10) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|CO1PR13MB4773:EE_ X-MS-Office365-Filtering-Correlation-Id: 576751d4-cf71-45de-2abf-08dbb5cc78c8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MVbeX/5Zh3KHPxhEelG3kaidGtYSSC1wypnkrrraEUec1r2xpB/HNdIfCx01y4z3BYKXzOwLQiNXFMojxtjsZ425JkyeSd0CGvFSafL1f2ursfOR6wIQJW8SONn7rlDw7F8CK5qZLUaL8TRi0ZxFVGDsRFxA9X5/REMEj4enCnKKQTj/MEPPdU4tBvE9N2vFzVIO9Jtk19YJb+KuQXL7dG5RcgUnpJ/og5fiKHSiwdjfR+OaHYes9VOculH3bd8c2E5pqgVX58/4oKtTKvHXBCRIVx+cpxxSEGOHmX808ylWPNoi21gIiSdQ6lRfJxMScQkL0SULjsCK1xD5F/W8pSdBHuKhnyJEk3uuPGtQuT1ewDCeXEYL96OB1Pd4DGanqMibtwpwV8X2mexELIV7bDkFzaopKKl3OMquIHedY4en512xpu66ZsPve8CfAOzbyrxJxKzjbZ/35kGMhTS5BndNzMguY1I+BH4topOzNIUQHCbEM4gdhb7TX9SeX9LS5DF2VHJS94VjNOc5ClEppGUcmmx+W4L+VGNzBWiBwaJbSPie8VHbpa315gJEqm11SzXgD+sw6ZlijtKpmOybi3fvFjebOxLrDWNgKLdU4TWxJ+1fTmcTT1G4BHWAOll8sQ/f1oGCYEIqdhrj17sExVF6MLffNqqSD6IT7UxDa48= 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)(39840400004)(346002)(136003)(376002)(396003)(366004)(451199024)(186009)(1800799009)(6512007)(107886003)(1076003)(2616005)(6666004)(52116002)(6506007)(6486002)(66946007)(26005)(316002)(41300700001)(66476007)(66556008)(6916009)(54906003)(5660300002)(4326008)(8676002)(38350700002)(8936002)(38100700002)(478600001)(66574015)(83380400001)(36756003)(44832011)(86362001)(2906002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?PHi90TOcMC0Pf1aaFPxGjKutsHES?= =?utf-8?q?bjbN4hxFAfK+9ykr9n2wL/TLHdp41xbIsJVuZDyXSw8X1PnxobBX09MawXdwFHt6C?= =?utf-8?q?ouZqGOXaIeQxQYbPUm58jZsFHXt+PX3/7lh+NaJVvu7Da+wAyENgb9d0A5i17AEig?= =?utf-8?q?uzk6WIVChVVoZQhpCT2N5jA6kUYBEhuS5Nl7lz5s3s8lp25UouaLlOB9miaHZNKBc?= =?utf-8?q?DDsuB8AqNoIjfj+cyaxaG/IK5L5j6L/9TelYRSJ76jCVHizBNJ9cs2v2/z4atiH0f?= =?utf-8?q?6ZJNlsfJfI24SITl45rD3WcJGvr567V3xr55r8vs5JeyAu4OzTD4t9l9U3bihFOwC?= =?utf-8?q?SvEcSc5jVi2RzL2UngQs2cFpoJNqXWMKACuye5TFeET1tls6WnzIH+wlO5aA/YDSF?= =?utf-8?q?uAKhivyq7J4D/9aXqit64MZ36vQqUautJUD3JVUOZkdFS09jQDQFpxfTaFO7t4i0A?= =?utf-8?q?39+woprJDR/6YEDz9pSBXywRml9YhgEp3WxMo+PY/kEbzXDb3PyXgwcb0/RQnvdkb?= =?utf-8?q?S3rQpQ/M+Dnwcr2Y9XZAy3jxMnQpOFy0b0eUNFVmqrd8drGnh15X14IxsDStEa8h5?= =?utf-8?q?jpUl819ZCafyFXYnVjYEpQTtDrHCsjFinvEMliFM5dVXG3oQDJ+7m+If//yrhWbjZ?= =?utf-8?q?QwfXhIoOEqz29R/4bcxbNzaJnRubfAjxun+R/61CrnwQVp0btgaHjr4tsJmrOBFXL?= =?utf-8?q?BCmZzDW5vLOsfV4TtUb+S3Y4vK5x8K+/cRPUmhR0fvvIto65w24XCOV909acl7D7M?= =?utf-8?q?DvGhjDx5iD8P5kt5W5BKcdbVdl/NEesDVRwodtK/UlaIVfwtJpHKLxBKhs+YnEzKn?= =?utf-8?q?St6KvUXVTufT4GB3VyCNZdin9CFfbQyqQBxr/NFylUWwEppXGhfhNihfZNyylq0bN?= =?utf-8?q?wTm93QzfD2YmEarm0hyOHWBIuzpX2FacbfFAFkmoyzYpPFdPeV8cGQ07tXyMMfu6w?= =?utf-8?q?cFOyGbGN4NxImQFRRWlevIGKDCkxT8hescGTweO7rGg/jGqJV5OvGvQb+Se2b8BfJ?= =?utf-8?q?7WP1pEs0tG6WpKLOU2lp9qrrKXrJc7fQrjDUin06Q7FFIcZe0Mhw8JanizYrK6Hk3?= =?utf-8?q?HI3XJLBYiUKGGybOQ1Utj1iCthFQCGQlqe+Ck9XxJilCaz8N6oFtbDQlnjmXGVATO?= =?utf-8?q?6WwtqOKSvPHKLjHhKrrWtrEfSqSK4Ipp4clu0NTYd8qPQyGFDsk1Lp0IAdpcGwR9R?= =?utf-8?q?0uNrD/1O4hYIu1bAFiJ41HeNv6agH62TocFObNB0f1qyZ0rha9Ic3bPwRe6kqgPZl?= =?utf-8?q?oPwQSBdW710e4dtWWzc7QJgPqrWF0yeGLthtTomXOnnpiIOhcSMijc1JKMgWVW7pr?= =?utf-8?q?k0hdSbIrPXKsWqg4hbYLzNhfrQl/38tbU8XGW0Y+d+/QKBjZ26G49hsd0w5ZjbEet?= =?utf-8?q?6QzfsvPEQhp8GA31bRQNMii8M1OFoJc7l4fA6wJDwP3XwFPKuVesnEKvSvkT/HgW6?= =?utf-8?q?BM/SZ3pqr3hKuHWvAhqwu1dIXQ1HqnGz1NNprRFp8qqyivzM9AeHUT8uNplLGTSMq?= =?utf-8?q?Pr56FOG8l/aKsxckoB0GCdqfK2oxqIkl3w=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 576751d4-cf71-45de-2abf-08dbb5cc78c8 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2023 09:16:41.0417 (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: +59xnVmbAq4jKzHevDHjaBIJTJGpregV4MjTZUNIYUTVYavtVx5Osao2dilxnZmn4elNnlpQK+hJ5I75tAMhgxSOe3sHDIHtzpNs7hnlBx8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR13MB4773 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 Move the definition of data structure and macro into the implement file. Also sync the logic from kernel driver and remove the unneeded header file include statements. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfpcore/nfp_mip.h | 4 +- drivers/net/nfp/nfpcore/nfp_nffw.c | 105 +++++++++++++++++++---------- drivers/net/nfp/nfpcore/nfp_nffw.h | 66 +----------------- 3 files changed, 72 insertions(+), 103 deletions(-) diff --git a/drivers/net/nfp/nfpcore/nfp_mip.h b/drivers/net/nfp/nfpcore/nfp_mip.h index 7fa09ee575..dbd9af31ed 100644 --- a/drivers/net/nfp/nfpcore/nfp_mip.h +++ b/drivers/net/nfp/nfpcore/nfp_mip.h @@ -6,7 +6,7 @@ #ifndef __NFP_MIP_H__ #define __NFP_MIP_H__ -#include "nfp_nffw.h" +#include "nfp_cpp.h" struct nfp_mip; @@ -16,7 +16,5 @@ void nfp_mip_close(struct nfp_mip *mip); const char *nfp_mip_name(const struct nfp_mip *mip); void nfp_mip_symtab(const struct nfp_mip *mip, uint32_t *addr, uint32_t *size); void nfp_mip_strtab(const struct nfp_mip *mip, uint32_t *addr, uint32_t *size); -int nfp_nffw_info_mip_first(struct nfp_nffw_info *state, uint32_t *cpp_id, - uint64_t *offset); #endif /* __NFP_MIP_H__ */ diff --git a/drivers/net/nfp/nfpcore/nfp_nffw.c b/drivers/net/nfp/nfpcore/nfp_nffw.c index 7811363796..585b1103aa 100644 --- a/drivers/net/nfp/nfpcore/nfp_nffw.c +++ b/drivers/net/nfp/nfpcore/nfp_nffw.c @@ -3,12 +3,76 @@ * All rights reserved. */ -#include "../nfp_logs.h" -#include "nfp_cpp.h" #include "nfp_nffw.h" + +#include "../nfp_logs.h" #include "nfp_mip.h" -#include "nfp6000/nfp6000.h" #include "nfp_resource.h" +#include "nfp6000/nfp6000.h" + +/* + * Init-CSR owner IDs for firmware map to firmware IDs which start at 4. + * Lower IDs are reserved for target and loader IDs. + */ +#define NFFW_FWID_EXT 3 /* For active MEs that we didn't load. */ +#define NFFW_FWID_BASE 4 + +#define NFFW_FWID_ALL 255 + +/* + * NFFW_INFO_VERSION history: + * 0: This was never actually used (before versioning), but it refers to + * the previous struct which had FWINFO_CNT = MEINFO_CNT = 120 that later + * changed to 200. + * 1: First versioned struct, with + * FWINFO_CNT = 120 + * MEINFO_CNT = 120 + * 2: FWINFO_CNT = 200 + * MEINFO_CNT = 200 + */ +#define NFFW_INFO_VERSION_CURRENT 2 + +/* Enough for all current chip families */ +#define NFFW_MEINFO_CNT_V1 120 +#define NFFW_FWINFO_CNT_V1 120 +#define NFFW_MEINFO_CNT_V2 200 +#define NFFW_FWINFO_CNT_V2 200 + +/* nfp.nffw meinfo */ +struct nffw_meinfo { + uint32_t ctxmask_fwid_meid; +}; + +struct nffw_fwinfo { + uint32_t loaded_mu_da_mip_off_hi; + uint32_t mip_cppid; /**< 0 means no MIP */ + uint32_t mip_offset_lo; +}; + +struct nfp_nffw_info_v1 { + struct nffw_meinfo meinfo[NFFW_MEINFO_CNT_V1]; + struct nffw_fwinfo fwinfo[NFFW_FWINFO_CNT_V1]; +}; + +struct nfp_nffw_info_v2 { + struct nffw_meinfo meinfo[NFFW_MEINFO_CNT_V2]; + struct nffw_fwinfo fwinfo[NFFW_FWINFO_CNT_V2]; +}; + +struct nfp_nffw_info_data { + uint32_t flags[2]; + union { + struct nfp_nffw_info_v1 v1; + struct nfp_nffw_info_v2 v2; + } info; +}; + +struct nfp_nffw_info { + struct nfp_cpp *cpp; + struct nfp_resource *res; + + struct nfp_nffw_info_data fwinf; +}; /* * flg_info_version = flags[0]<27:16> @@ -61,32 +125,6 @@ nffw_fwinfo_mip_offset_get(const struct nffw_fwinfo *fi) return (mip_off_hi & 0xFF) << 32 | fi->mip_offset_lo; } -#define NFP_IMB_TGTADDRESSMODECFG_MODE_of(_x) (((_x) >> 13) & 0x7) -#define NFP_IMB_TGTADDRESSMODECFG_ADDRMODE RTE_BIT32(12) -#define NFP_IMB_TGTADDRESSMODECFG_ADDRMODE_32_BIT 0 -#define NFP_IMB_TGTADDRESSMODECFG_ADDRMODE_40_BIT RTE_BIT32(12) - -static int -nfp_mip_mu_locality_lsb(struct nfp_cpp *cpp) -{ - int err; - uint32_t mode; - uint32_t addr40; - uint32_t xpbaddr; - uint32_t imbcppat; - - /* Hardcoded XPB IMB Base, island 0 */ - xpbaddr = 0x000a0000 + NFP_CPP_TARGET_MU * 4; - err = nfp_xpb_readl(cpp, xpbaddr, &imbcppat); - if (err < 0) - return err; - - mode = NFP_IMB_TGTADDRESSMODECFG_MODE_of(imbcppat); - addr40 = !!(imbcppat & NFP_IMB_TGTADDRESSMODECFG_ADDRMODE); - - return nfp_cppat_mu_locality_lsb(mode, addr40); -} - static uint32_t nffw_res_fwinfos(struct nfp_nffw_info_data *fwinf, struct nffw_fwinfo **arr) @@ -237,14 +275,7 @@ nfp_nffw_info_mip_first(struct nfp_nffw_info *state, *offset = nffw_fwinfo_mip_offset_get(fwinfo); if (nffw_fwinfo_mip_mu_da_get(fwinfo) != 0) { - int locality_off; - - if (NFP_CPP_ID_TARGET_of(*cpp_id) != NFP_CPP_TARGET_MU) - return 0; - - locality_off = nfp_mip_mu_locality_lsb(state->cpp); - if (locality_off < 0) - return locality_off; + int locality_off = nfp_cpp_mu_locality_lsb(state->cpp); *offset &= ~(NFP_MU_ADDR_ACCESS_TYPE_MASK << locality_off); *offset |= NFP_MU_ADDR_ACCESS_TYPE_DIRECT << locality_off; diff --git a/drivers/net/nfp/nfpcore/nfp_nffw.h b/drivers/net/nfp/nfpcore/nfp_nffw.h index 52e25c090a..fd46009d37 100644 --- a/drivers/net/nfp/nfpcore/nfp_nffw.h +++ b/drivers/net/nfp/nfpcore/nfp_nffw.h @@ -8,71 +8,11 @@ #include "nfp_cpp.h" -/* - * Init-CSR owner IDs for firmware map to firmware IDs which start at 4. - * Lower IDs are reserved for target and loader IDs. - */ -#define NFFW_FWID_EXT 3 /* For active MEs that we didn't load. */ -#define NFFW_FWID_BASE 4 - -#define NFFW_FWID_ALL 255 - -/* - * NFFW_INFO_VERSION history: - * 0: This was never actually used (before versioning), but it refers to - * the previous struct which had FWINFO_CNT = MEINFO_CNT = 120 that later - * changed to 200. - * 1: First versioned struct, with - * FWINFO_CNT = 120 - * MEINFO_CNT = 120 - * 2: FWINFO_CNT = 200 - * MEINFO_CNT = 200 - */ -#define NFFW_INFO_VERSION_CURRENT 2 - -/* Enough for all current chip families */ -#define NFFW_MEINFO_CNT_V1 120 -#define NFFW_FWINFO_CNT_V1 120 -#define NFFW_MEINFO_CNT_V2 200 -#define NFFW_FWINFO_CNT_V2 200 - -/* nfp.nffw meinfo */ -struct nffw_meinfo { - uint32_t ctxmask_fwid_meid; -}; - -struct nffw_fwinfo { - uint32_t loaded_mu_da_mip_off_hi; - uint32_t mip_cppid; /* 0 means no MIP */ - uint32_t mip_offset_lo; -}; - -struct nfp_nffw_info_v1 { - struct nffw_meinfo meinfo[NFFW_MEINFO_CNT_V1]; - struct nffw_fwinfo fwinfo[NFFW_FWINFO_CNT_V1]; -}; - -struct nfp_nffw_info_v2 { - struct nffw_meinfo meinfo[NFFW_MEINFO_CNT_V2]; - struct nffw_fwinfo fwinfo[NFFW_FWINFO_CNT_V2]; -}; - -struct nfp_nffw_info_data { - uint32_t flags[2]; - union { - struct nfp_nffw_info_v1 v1; - struct nfp_nffw_info_v2 v2; - } info; -}; - -struct nfp_nffw_info { - struct nfp_cpp *cpp; - struct nfp_resource *res; - - struct nfp_nffw_info_data fwinf; -}; +struct nfp_nffw_info; struct nfp_nffw_info *nfp_nffw_info_open(struct nfp_cpp *cpp); void nfp_nffw_info_close(struct nfp_nffw_info *state); +int nfp_nffw_info_mip_first(struct nfp_nffw_info *state, uint32_t *cpp_id, + uint64_t *offset); #endif /* __NFP_NFFW_H__ */