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 9363F42910; Mon, 10 Apr 2023 13:01:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5B6B242D3F; Mon, 10 Apr 2023 13:01:08 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2135.outbound.protection.outlook.com [40.107.243.135]) by mails.dpdk.org (Postfix) with ESMTP id 3592242D36 for ; Mon, 10 Apr 2023 13:01:04 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CiuMcA9GAo7os41RvG/86/KNlRj3ApDFSqBKJZWACPYRP320hDIRAyT5rlEDjWxKpC0zeX+OiVFqGfMzO+PwrofR9ehjLUM3ikmKxfKRYF/fK+QbbW0a5ZbTRCe/m/ODskNG+P8OmdoJHdGJLPeyDnTzqOtjoJlQfwYy60qR8aNMsHVwx2UJ6SSAqfjE4MwZRSKqnxDqEV/bTy+UgcPFRdKRihbLAsv8Ps2tFm3cfklUh4vXtUULsTdu+SBf6Jgje3HopEfsEFbZL+WcdcReldO0eSvcduAOXkTWug5Rz7qzUksOl0MqZa0GTcfFKN2ZLviUdFGqhKfk504IMKzRQQ== 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=YVZ45tvmQc1LGLAjbi9hhXaWwRnNu7cpq6FvTeoyDP8=; b=QZRGUmP52lQJJPdGSTClUVy+QZS9P8Et/ileGmWHAnQZfPES22bwGL2rNKb5mZhAMF5uyNGXxg++qQE45WvpmUfo0W8xB3q/Gl41wSkS0pSfObvEqGPO6D+iipI9Hw6StKkmMh0tTKzMrGZAvOJSHaFOc94Dchsnx/WzfxrBmnaPw6sAPxoHASsn0vPaK0+Khok7L1Xnu8ZWyeCZgfnlLi3WzNcQfSYFW1rJDgUWSNCgY00QkUL+QgHAv3870G6yhUq+pWvFqHiQiqF/yqq7MS0Frn9cqR+0Vi6Lue3JglkJ05NeTgpCWOAytMu1WPpwDmwGN7DZV0lHB/LtoOL7wQ== 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=YVZ45tvmQc1LGLAjbi9hhXaWwRnNu7cpq6FvTeoyDP8=; b=X9RDjkMUGd+WVl4zk83ypPt8V6mbk2Lp0gnwDo9rvZgEEDzuEXb7UUMNTnFFQnTJpBXgJ6ER7I5afC6Yk1jZZl9oI4PwdTcvaMufRo5nkFogDTUtU5/umRpe0eGy7cCrQWt1C8VvXdvxVUGVtYpIEWL6h41aXPZIlGpJlnog2bs= 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 DM6PR13MB3882.namprd13.prod.outlook.com (2603:10b6:5:22a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.31; Mon, 10 Apr 2023 11:01:02 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::baa6:b49:d2f4:c60e]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::baa6:b49:d2f4:c60e%4]) with mapi id 15.20.6277.036; Mon, 10 Apr 2023 11:01:02 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 07/13] net/nfp: remove duplicated nffw defines Date: Mon, 10 Apr 2023 19:00:09 +0800 Message-Id: <20230410110015.2973660-8-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230410110015.2973660-1-chaoyong.he@corigine.com> References: <20230410110015.2973660-1-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SI2PR01CA0040.apcprd01.prod.exchangelabs.com (2603:1096:4:193::14) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DM6PR13MB3882:EE_ X-MS-Office365-Filtering-Correlation-Id: 380ff856-cd4a-4923-f554-08db39b2dfc1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WFga8mkq+QmSx6l1A+M2lDjwNY4bhJwGlC31rUyrbDossmWXV24WBU1bHWva93lBwLkn6IHjKdcYfviED8fbL1MC5YvyWkscP5Ey3pEMZDwmlpCll+CCbuvpuZ2NGoeD3kGRXKmU86dSwUY/QzAz2BQ1WfqAHaOHPBsOmlE05Le+vgLv1P6mOvEijhKC1Kwgo2/PDk6+JgdedgQmVqvixEZkuRIoAR514RDdnt9J54/c0RfQfuIrZZRFnb7ReahqL2nsy7KebsDdvCnTujCe/aAjoNvFFvnQf0XxBNxN/s+fHA4JHMny3hQc6MybfKK7GWCe9BvEQAdmX3V4ViX3vRkGbmAnhwCpkOoyqg27Mb1OgtHB8nAZY5ag7cHjhdXrhyA7I23CJC0RBCOuOJXDfOpFoE94D7tD8PJBVPi0wHb37qzYa+O6oG75d72ojU2Zn12NmBFEFpPMc55F5uPu+UaDMnelZFNkrrL4wMhkMuLvXoYTmVdzE+zhrGM322IOoX1MYmEipxIzjVSbsSX5+WqMPpRFPwGGI8K+eyLtztB6CjFgWNGmV1o1xdcugBwm2DDUx22Plh85lQF4WS2e+lvYfiC6RW/Z7p1ZA34u3GyBB0j5lKKkOwUZXyk1FtFi 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:(13230028)(4636009)(396003)(39840400004)(366004)(376002)(136003)(346002)(451199021)(316002)(86362001)(66556008)(66476007)(478600001)(83380400001)(66946007)(38100700002)(38350700002)(36756003)(186003)(6512007)(4326008)(8676002)(2616005)(6916009)(41300700001)(2906002)(1076003)(6506007)(26005)(107886003)(8936002)(52116002)(4744005)(5660300002)(6486002)(44832011); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Y2RWZEFmRGlJUThlOXRXRDZUVTRtcUNHYkQrdmlaZFZ4M1hDUnhhNE4ydWlD?= =?utf-8?B?TGJiS3JPVlRXR3ZMUzJkY3REK0JnWE5ybUh4ajFiUWF5T25SZ0FNVWlnNUNE?= =?utf-8?B?Z0tTcE9sZGl3RzFONGNkaWZjOWRNakM1M3VESnBHdEVsck55bzlGbUhNenNj?= =?utf-8?B?dVptS0VZK3ZaazNrZmVJcVdSZVRDTGJWTzduV1RzdUVVOGUwaVJMZzdlRFVi?= =?utf-8?B?dFBqZzBTRzVMVHFiKy9rOWlvUzdBNGpTbTJ6SGNqVXk4aGltM0pXaHBwVlJB?= =?utf-8?B?Mlp3WVZTWll2R3lJa2RhVnVCci9iOXQ3eTlJb2JHZ2Ywa0Q3YitqaDA0eEpk?= =?utf-8?B?MFZEZ2pSYWhkR2lVZno0MENaMHowSEo1UHE1aisyZThNZ3FScERMcUQ4RE5N?= =?utf-8?B?TmFuaE5yK2FGUkdBbDJxaXl4RmhvcUw2TTRVTHJWcTJDdFNCNnZ3Q093SmxC?= =?utf-8?B?b2x4d3pxZVY1NEJqZmowK0wydG16NEhtb0oxekhuSHpVazJrbjRjUDliWENM?= =?utf-8?B?NFA4RlhiTVRHaFlNTUNiY0orMC9sZzFsenN1QVVDbkNVSGphbFhIOWl4OHNH?= =?utf-8?B?NXJiRHRHeGVFTHZQWU1XRUl1a2xERVRPaEQrR1Q1YWxkM1lHUmVranFqZmxl?= =?utf-8?B?Ym9KT0x6cktIemo3bjB4WG90b0hmZ3I3MVdSRDUrMEZnR25JSktNeWE0UUhV?= =?utf-8?B?bXNtTnJMNHRPM2NmcXJseFp0T25WUWtDcm0yMzBJYTIzMDhVVWtEYVFFajBM?= =?utf-8?B?ZkJYTXFwbmM1YjJoeEpaQk9KNFhyd2FqWHkxNGZuaVBQUUF0bHQvNE1KRGZs?= =?utf-8?B?ajRaOWxnWDU1NUdTYnpaMGdWWXRLKy9uLzR1MFUzRUtoMUNXWUNaeWdQYXl5?= =?utf-8?B?QUJ0ck1xbmtoVGJSOEhFWXdsdGtQd1g5YmlhRktIMFRTaVRqSitFYzU3M1B6?= =?utf-8?B?M2xiVWMxR1dldHR6ZEZWeTkvVFA3d3luSS9HQVZuRHZZQUpjdzhTMkh3RTYw?= =?utf-8?B?ZUVPbXpYd0hsYS80dTdrcFloZVFyelhKejBpWUJCeURjSTZqN2ZkSmZqbith?= =?utf-8?B?cHlMUGVoeVhpT0Q4NUlCQWM2UmVoaWo0TkpTT2RXQ1NXME54ZmNBaXFndVYx?= =?utf-8?B?T1BRakNjaHBwZ1VRRHpkMkRpL3NnbmtPclVHbHRpV25SWi9jY3IweHl6ZnhV?= =?utf-8?B?RjkrUTVvZmlzclI2TTJVM3A4dHYxTUNhY0lPbWRzL1k5a1FUaDRhUlY0UUdZ?= =?utf-8?B?WE8xWFRWR3JZeTJxTDA5SDZ2b1RKRnhRZlB4MHVZTS9JS3NXSVlPVWcxUWxZ?= =?utf-8?B?MEZraTdoRW5SRFRXK2N2OXdLTlovbitVc3AzaThzdFFLSHVqT2FaVlBGeDRw?= =?utf-8?B?WmVXZ2dxTFdMbHc0RlpoZ1R2NjFWcEZXOWJ4bk1xRnBZSjd5Qnp0UmprNWdn?= =?utf-8?B?L2NIS3BLc3dycFh5RVB1M1hTOXo5QW14K3VqMkY4WEl4TW43OGlhOTR3dnhJ?= =?utf-8?B?VElNZHJ3U1FmaGFJbWowOEZabloxaTZHTDRub2NOd0pzZExCSGNPd2VsVndt?= =?utf-8?B?RXFtc3RDR3E2Tk9vZkFDNVNYTVJSckJNMHQrN0ZVcjJjWVIrS1dUTjZIK1hI?= =?utf-8?B?djN3ekpRUzJqWUo1aGpSbDVzaVpSWTRYM3BjNDN5eUNURnF6MTVsNk5QVFdB?= =?utf-8?B?NitxcU9RQU5lU3hVWkpqV1N3VlVWeUY4MzY4WkRGejdEM3EyNDU4QnRNOEtG?= =?utf-8?B?aTVlZHA2S1NXRHFqazFNOTAvRjZnM2NEQUQ5Z1ZiNnd1Uis4V1BoVmQ2d0xm?= =?utf-8?B?SExpMHAzNzdwR0JCeXlKZCtBZ0Q5WjJpbXZhbkpwaEFRdlRMTzdoRzZxU2lm?= =?utf-8?B?aFZwajJheHF0SDhVcFZLS2M1ZTk4NEpWQ2RydTB4RjVwZUNqTi9WTmRoUzJ5?= =?utf-8?B?blphNDI4dWNVejVTNWhQT2Z0TmFZRXNBYXE5bElyeldpZ1Z4SndkVi9JUm5Q?= =?utf-8?B?MUNlMFluTTg1ajIzeDBCWkNMTjNEb0V0T0tlWXAya0FLbXJwcUt4OE9rSXFj?= =?utf-8?B?dS9UNDR2T2dEMHM4RDZDMkdrMGkwOWRnYmowNXV3cDV2SGt6QmdMbDh6ejlu?= =?utf-8?B?UmFyekZObGtha0t4WHhKbHUvUU5udjEwa05WejRWb0xWT1JWTHVhYlJMUERt?= =?utf-8?B?Ymc9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 380ff856-cd4a-4923-f554-08db39b2dfc1 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2023 11:01:02.7974 (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: px+xeI7tpxARPR1s4xll4W0n+5lMb+1nZ2szZRo7nwXlbQmhXqFN0BugkNh/T2/5bgOopNpdKIRpWUVYQYuSP3e9pYJrWHurKDEYcraKsv0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB3882 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 The defines NFFW_FWID_EXT, NFFW_FWID_BASE and NFFW_FWID_ALL are defined two times, with the same values, in nfp_nffw.h. Drop one instance of the definitions. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfpcore/nfp_nffw.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/net/nfp/nfpcore/nfp_nffw.h b/drivers/net/nfp/nfpcore/nfp_nffw.h index 9f24bd2269..46ac8a8d07 100644 --- a/drivers/net/nfp/nfpcore/nfp_nffw.h +++ b/drivers/net/nfp/nfpcore/nfp_nffw.h @@ -8,15 +8,6 @@ #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 - /* Init-CSR owner IDs for firmware map to firmware IDs which start at 4. * Lower IDs are reserved for target and loader IDs. */ -- 2.39.1