From patchwork Wed Feb 8 16:46:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 123468 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 CC0DD41C41; Wed, 8 Feb 2023 17:47:02 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C3D00410EE; Wed, 8 Feb 2023 17:47:02 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2097.outbound.protection.outlook.com [40.107.244.97]) by mails.dpdk.org (Postfix) with ESMTP id CBD7C40141 for ; Wed, 8 Feb 2023 17:47:01 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cTn9pEp7iYM2hL1xuFphLDhNZMVnn9LO6k+E+VcvX5utyhjN0fgvUE5SF6jqlmn9WGc/Wxodr34Efx1mBcuoy7MmNPMr8xa9nQW37AldPcCSJfzEK3IXKaZAfKLDTTC4oCpswtcZ9TKeon+w3/cNMksOY2x/8zIivSfOdK0ImrE2au/32aoXSgTnGQSLKAtKrwU/fTD2MPXBbZM3yn20+tMsu8dqrbV9tg8hr+qSGeSiRDOO5NJORm2vgaJJgGGUjndfv/F4k9kR6kuV7FoTVmQ3Q8Yj859tkhwDoFdcFJz/zJC5Lm6orI6hhF5EVhOCRAOXB3yxmVtMNErsaKASNA== 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=F3O+mpJDOWwrLawjXg0nLY6Oe0vni6ZOFn+JkzBxS7Q=; b=NBdiO17mkKERbM9BE8aro3H6Q3TDOcyDbe0a8g0919Y2CosaCXv0pwPhs7cd9T57vn55BOWF7sfxDk+k4WHH6fake5PsS1XJPTOy/g/nx11yOJj5/f2Aax0XyG9LTpDmo8YqOHDd0cRFUTm2dNO/JeZmvemifCbcYpVuHYBAw0LaRxeUBvm5jEYpYfh7CbyaC2yA/h1HSpKfianKTGyeiNJIbF+ZiFz4bICf9Up/4oKaxG3beT73SLnUNfWNEZQL2+0EiEUe6LydshvjJCpi+iUiZ38xi5rYK94xBXBu4NHzaYB1ERryrgKlS2UH+BLPGrlH5tYl3/MldqGLdMgdcw== 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=F3O+mpJDOWwrLawjXg0nLY6Oe0vni6ZOFn+JkzBxS7Q=; b=QyVgTTEHzPQouoNBJ3umnjpWb0fsAvxwMGRobg1WSL1n0VFAHblQb93zdi2oVw/LbVIplLS8/pXL1pJ95awfHZfc7HuBzr3VXieK/Qajm2+ToM2njwT8nCkvuKV91ttgMtNUeQeg1PlDxPtCXW1XZXkCNK058IotuENxUs67NZY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB6037.namprd13.prod.outlook.com (2603:10b6:a03:3e2::9) by DM4PR13MB5929.namprd13.prod.outlook.com (2603:10b6:8:4f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.34; Wed, 8 Feb 2023 16:46:59 +0000 Received: from SJ0PR13MB6037.namprd13.prod.outlook.com ([fe80::90b0:f667:bccd:64ba]) by SJ0PR13MB6037.namprd13.prod.outlook.com ([fe80::90b0:f667:bccd:64ba%9]) with mapi id 15.20.6086.017; Wed, 8 Feb 2023 16:46:59 +0000 From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: dts@dpdk.org Cc: oss-drivers@corigine.com, Qin Ke , =?utf-8?q?Niklas?= =?utf-8?q?_S=C3=B6derlund?= , Chaoyong He Subject: [PATCH 1/5] framework/dut: add support for restoring dual-port NIC with single PCI address Date: Wed, 8 Feb 2023 17:46:20 +0100 Message-Id: <20230208164624.2997614-2-niklas.soderlund@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230208164624.2997614-1-niklas.soderlund@corigine.com> References: <20230208164624.2997614-1-niklas.soderlund@corigine.com> X-ClientProxiedBy: FR3P281CA0122.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:94::6) To SJ0PR13MB6037.namprd13.prod.outlook.com (2603:10b6:a03:3e2::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB6037:EE_|DM4PR13MB5929:EE_ X-MS-Office365-Filtering-Correlation-Id: de673ac9-9848-4641-a0b9-08db09f418aa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bAbRC1K7/mhgD14AbgO2dbLbeny/7wr3Rv4j8pHt82FhRoO+bLiIWiYbqpIhGCua7dw+GHQr8Xlvk3kXnxegBtZehC68GfZLbWpy1vULvdIhEO1xyYnjv608R3MlqvTDnFWwIsHsgzz9K6P1gVSl6hBNAlVdItbMHWgVFchcqhDbkZNbGk5pVKteN11ah5SxIjrLWHxJskhH/JxjI5vA97IoHeN2t/C6glGVBSXQT1REwrMcbKGXFD3Y0S2JT7wgkxOOdTuJlevEYpEysyv5eqW+iert7thKsOXz5ybHegYnZknTCi+IAS+tmmyKBknqz+FU9Y5zCbB9LgcABXQeTuydsg1eKPAPlbm825ZVUjXexklh+odfGDyGzkmK7843/d5rUrcYgQ/WTP16WmOKCejvGhoovNKpsJTTVgM3xsEHP2UChO7a9+Nn2riLgtuaznxGl5x9M2Ha1CU31HGxtgn2LIjdgalbJIyPaPh3vz2hoXW3txjRZVyfRj5Fg6Aw5PYZUWB4yTHzXlfuXCdxksaUQmsLDcoOfeyYwBYIX4SJTBz2kl++oxziyeALm0wu/Mobj8wc6f4rkNUc4cUxf44HdN0QbIO2OCTG6M5ex363eThHwpGjZ9/5cH/Rg5JKef8bi+i+PS4ZqHzLHypX/FR8F57x8u22waoF0A6nIW4+RHzNgX2iN5flyFgGSGYAxqn6x4M1Qwsrr1tK5FFHOQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB6037.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(136003)(39840400004)(346002)(396003)(376002)(366004)(451199018)(6506007)(86362001)(5660300002)(66556008)(26005)(6512007)(186003)(66476007)(8936002)(6666004)(107886003)(2906002)(38350700002)(66946007)(6916009)(4326008)(8676002)(38100700002)(41300700001)(316002)(2616005)(66574015)(1076003)(478600001)(6486002)(52116002)(54906003)(36756003)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?5+67MX4Q7IIrvb11kkXD7/uHnADi?= =?utf-8?q?7gVRAiH0ZTX9l0SQKEDcAtu2A8y7i3Z3PMDwuzPeVfjSXCRlU0Au3OeuwyRWhgJ/p?= =?utf-8?q?dYtJFGB5Fs7rcSxypc9hZLRgOlxDqP35jWNdblSlqiwoF1WZVo4r4GIg3ug9kEKAc?= =?utf-8?q?rQNY+ovrVfZYfrATQWE+bWLX0QZTeKkCamlq47KNW8VZ5UHr+eMRTscatCWK9srp/?= =?utf-8?q?o87woCD17ohvkOLWKc0Rol20VF+m2XiR6VNhIAiHQc6i6YinyHBYqafIY1UjDBiEv?= =?utf-8?q?gacxQP5g+wtYNHLcwf7JI/cv6ALx9f86pxklojIA5ZlUdnDGfTvEXwYlagKQMsj1A?= =?utf-8?q?W7mNRf9q2P010DmrGME3CPjyMeHet/N+87YfbrpjTpYU42ikwbjtA3xjPZVyjFTiq?= =?utf-8?q?tRg/KOq89imGOA0jY0iK00TeHvmNJvfxDBlxiiwFJeoQW8QexOLj3WvGs+3l4tIjo?= =?utf-8?q?inFOFge+xN/IGMEcXzpHoNr9WazeaEkO5u5Wu1oJDNDdG24zRoEtxVteDl1aLj013?= =?utf-8?q?I2To2R/hUagEnJNT8fdTfturOVTf/H9pa3joPZULMsSTqKeF2chdagocwJKkrr5TD?= =?utf-8?q?OrbsE+2piaz3YCMevtCnCM/cd3tEzMDFraTjFxtdbbykLMot272UgnHQ/eJuVXKqK?= =?utf-8?q?76ZhCvfz2GBsZ1Rkd0i/IkEUQrUwLwmwk19WsPPYAv0/OQlMMSo3T90SCDniqfGnM?= =?utf-8?q?NJ5pdOEOkbU/mhYymdUxQHxwUCyJuQ1TuHTGgL5NzOnY77FY4JXcjeRfcmLVl3b0d?= =?utf-8?q?LQivZ1Gt5VJIl97QGOtOqEZQiUiTQVtsqWMbayKw9+lWv/WZlT6nfGe/BHQIlR/E1?= =?utf-8?q?1dlIE+02vmGVFB/AKae843NEV6wO3IWHKtv96tI5DDwXWO+JkM/jzj918U4HUQzb6?= =?utf-8?q?yRQ3zpL7b9PToS/xq/+9jumxpj6yH8PD51PnMBtGTx6plrMj319x6/dET4VIE0zbQ?= =?utf-8?q?oqK3fFoOOtGWcIcrKmUCnHYRxlsQL3LWTIsXJtcuGwtGgkDFPpmrgXhmsiofRGc/F?= =?utf-8?q?h5j+cMZMMXyfgS4RVvM4MrD5TbTIJD+rd8vxwEq3Y44Zly4k+sxOmC2HF6M9+dO5O?= =?utf-8?q?duHbk1vdyltbvnSWsWBbWSgKzg8pqxqMWpQVifMjJCKCfdww//Wvzt/nCrSx2U/VF?= =?utf-8?q?Z6nrUUYPVbd9HfFSm6uWyxcwJ9P544ZqMaGqmzKVe3gsP1YlmjOIO6ZpFl0ILXrAS?= =?utf-8?q?Q2QMCc5tx65dyi9LKPszj/Hh4rnG66Xeeyw+LP5Gjjcmce4CukBWC4WyLYRUA9KFB?= =?utf-8?q?Lm00Rx6ApRvJfBA88k9G8YR5ySPRCQpW+zZH/056VyopQsh+9wKpwHiVAVXQ86nqa?= =?utf-8?q?s61uu3G66Qxc63hE0tGUNCsN5nXKLSFyfbwqGPIuWjTN2MrsGGxkQd32Wh0MGUCc1?= =?utf-8?q?6knf0ocoFGh0WvXfEXhDZzGnqlRDBjztqZ8vpOZ/4DHbmn0YEGP9M9uoKfuCCILd5?= =?utf-8?q?QpAvVqWWJeSOzToGAZC6nJbW/dR+A3zpfPGTkY2Atn/RuYIg0qCTM39OZMTOgzw1A?= =?utf-8?q?54gSHPAvXAOfAX1Bkr9PEhKUvO+wCYLaTDs7QITf/h04BgQpNYpptq4=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: de673ac9-9848-4641-a0b9-08db09f418aa X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB6037.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2023 16:46:59.5125 (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: QY1LDZmm9HPBfZqoE8w1mw6SrANJfafz5F6wqCVSAPiFZqgyGQoscLGyStIZ/jynSx7Byy401svB40W99Rr0/8HFz4la2s/JjdHyS69Odps= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR13MB5929 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org From: Qin Ke The functions of restore_interfaces and rescan_ports get the incorrect interface and mac for the second port of the NIC which has two ports but single PCI address. Add support for it by adding the filed of port_id for port_info, then it can get correct interface and mac by distinguishing port_id. Signed-off-by: Qin Ke Reviewed-by: Niklas Söderlund Reviewed-by: Chaoyong He Signed-off-by: Niklas Söderlund --- framework/dut.py | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/framework/dut.py b/framework/dut.py index 481c0cb6abe8..eb988ac3e265 100644 --- a/framework/dut.py +++ b/framework/dut.py @@ -402,9 +402,9 @@ class Dut(Crb): """ Restore Linux interfaces. """ - for port in self.ports_info: - pci_bus = port["pci"] - pci_id = port["type"] + for port_info in self.ports_info: + pci_bus = port_info["pci"] + pci_id = port_info["type"] # get device driver driver = settings.get_nic_driver(pci_id) if driver is not None: @@ -431,7 +431,10 @@ class Dut(Crb): pull_retries = 5 itf = "N/A" while pull_retries > 0: - itf = port.get_interface_name() + if port_info["port_id"] == 1: + itf = port.get_interface_name() + else: + itf = port.get_interface2_name() if not itf or itf == "N/A": time.sleep(1) pull_retries -= 1 @@ -865,13 +868,19 @@ class Dut(Crb): for port_info in self.ports_info: port = port_info["port"] - intf = port.get_interface_name() + if port_info["port_id"] == 1: + intf = port.get_interface_name() + else: + intf = port.get_interface2_name() port_info["intf"] = intf out = self.send_expect("ip link show %s" % intf, "# ") if "DOWN" in out: self.send_expect("ip link set %s up" % intf, "# ") time.sleep(5) - port_info["mac"] = port.get_mac_addr() + if port_info["port_id"] == 1: + port_info["mac"] = port.get_mac_addr() + else: + port_info["mac"] = port.get_intf2_mac_addr() out = self.send_expect( "ip -family inet6 address show dev %s | awk '/inet6/ { print $2 }'" % intf, @@ -1017,6 +1026,7 @@ class Dut(Crb): "type": pci_id, "numa": numa, "intf": intf, + "port_id": 1, "mac": macaddr, } ) @@ -1035,6 +1045,7 @@ class Dut(Crb): "type": pci_id, "numa": numa, "intf": intf, + "port_id": 2, "mac": macaddr, } ) From patchwork Wed Feb 8 16:46:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 123469 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 EDD6A41C41; Wed, 8 Feb 2023 17:47:04 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E504B40EE1; Wed, 8 Feb 2023 17:47:04 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2098.outbound.protection.outlook.com [40.107.244.98]) by mails.dpdk.org (Postfix) with ESMTP id C73D140141 for ; Wed, 8 Feb 2023 17:47:03 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kLi9dvB6RK35gW+m/Td9s+McKTwZHWkflg+HGVi2QATyc/1FMYMqOmInhjemqgtxSqNNdiN2fxEZQGb4nPdfmJHmt0sPFIdq6QeW0RJCQ/1/gVVPXI0E52h9IaliwZx8CxUuQZXdQsZTKtGSEilGZNvUyl5xa2m5APRNcVakSE1WjZw4MyJFCbyLEzgS0FlNBFM1bqLS6CKZ0A5XiMd5j6D6lSm9zrmusRMxSx36u/qzFiHRIwgKqzsK87hPZ4nFyHWWzFl1SDTGv7S4wDpQuBoQQJM1/MKanQkZ4HCe6yrUz73fvzU6oDTX0Iit+0MW8t1X15/PblLhMDUiJPLYDg== 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=80wnwrFeDI69jr6B2uDeH7KjWxw9mVmiNF3JGTD1w2o=; b=Q99KdrEYH/IyB4t8UvJTFtDd3ZsONRhCKykrpWBX20pISnjNYvoshUUjbrCfbhKLBIfue0LiIniAedUuMGN3pZxqSkN0B1FkcbCvpAgktf1gQMD5kRYzErp/DLutZJVm2qk+krzGf+X3VWaIDvK5VAupQ1B3NfZ/W2nHmEAH+xS35zuT3I/NNQeKYDPIeKhRkNa/rw08JAjshqHpfU+TWbvd6HBcgHYNNwb0DwSkwj/LQVR0qts/4JygHcq6RdfbnvzeLyAykSdEMWh1BJOH2AwKzApRRKSTRNHt6pnR5WzJN3Aq29uekBiwIAUTY/HZOboTQtF4I/F0RmRtGbTUyQ== 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=80wnwrFeDI69jr6B2uDeH7KjWxw9mVmiNF3JGTD1w2o=; b=MnV4QXTz6yMUIN44CgohGXVx/44+XJ4c1VyMx4l0e6Y/2/pKQWhWEy6BEU4Y+6efl9Wg5rlSq9IDDJUUE2uU9EpDVUL1wDGRMF8kCX3NYhmpFDgcxsvVOPzN8gsDKXrgC7vnTdHza2k+GuspLqYXcBZuvjXGsKfGwtWg3N7bO+U= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB6037.namprd13.prod.outlook.com (2603:10b6:a03:3e2::9) by DM4PR13MB5929.namprd13.prod.outlook.com (2603:10b6:8:4f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.34; Wed, 8 Feb 2023 16:47:01 +0000 Received: from SJ0PR13MB6037.namprd13.prod.outlook.com ([fe80::90b0:f667:bccd:64ba]) by SJ0PR13MB6037.namprd13.prod.outlook.com ([fe80::90b0:f667:bccd:64ba%9]) with mapi id 15.20.6086.017; Wed, 8 Feb 2023 16:47:01 +0000 From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: dts@dpdk.org Cc: oss-drivers@corigine.com, Qin Ke , =?utf-8?q?Niklas?= =?utf-8?q?_S=C3=B6derlund?= , Chaoyong He Subject: [PATCH 2/5] framework/dut: only map ports not already matched Date: Wed, 8 Feb 2023 17:46:21 +0100 Message-Id: <20230208164624.2997614-3-niklas.soderlund@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230208164624.2997614-1-niklas.soderlund@corigine.com> References: <20230208164624.2997614-1-niklas.soderlund@corigine.com> X-ClientProxiedBy: FR3P281CA0122.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:94::6) To SJ0PR13MB6037.namprd13.prod.outlook.com (2603:10b6:a03:3e2::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB6037:EE_|DM4PR13MB5929:EE_ X-MS-Office365-Filtering-Correlation-Id: 74bc27b1-5c59-4736-57ef-08db09f419a0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fHvsYceaeXGkWWwV7K5WGUE3eQxFmHYV5HzvG3BWz5ju/o5syAtw7E4zr5bWCsD6f5twhI2PGP3oj6nWoakwoAzP4XuD3lc7JlhTWsS6aVRZ4Soa11AAVNmh9335/J+BZqE+hWuqUBm1ZqstestFAPzgF+r9e1LUnCs9uAsG0NTYpmW0a0qJH/FCBDeMd81Py9+x7OCtS5tQwo8h3730cPgwPpsBIma/K60mMkcwHSeGyeJ7tQ7UHSs4/Gl/3higWJ3u2O49slWjlLg59mLNXjXAlJ657ihwTT5VSzncxiHwb4YP0ecRBmc7bigHEvLc+ud/KpMh/pwl31i2iLYE+NcUWNM1Ht7gs6L4agD/hohjPl7LVtEcURATInvzPd2vAvK1f2egM4m3tRoaVe4sROIoNS0nBV7eCcfwbtwXNe164xFARu+nAucmXh4DKgxINxXWS1DG4heFJePv8LzX7WOF/lWdQdaixzA5Ag7GM+XhDWceFiWAZj9h3cPhuITIXIUaGb/HvqE2M6caz8leKK3V/86Neua/SmEGFFtME8UpE52x6HQr8jZccww3r7yJUd3ZDP3i0amLkh13ECfEqVdSwsZpOdxKuuv1KEQGPxaKOHQzq0srrc12b57WXw7APWGH7GU8Dre2brNCz47EsNrxmUvOASUjk0Uspfk1WZA5JePMXq7hVMVXGFAGmyg/Cc9+i1FCEeCKjEb2lRvkeQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB6037.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(136003)(39840400004)(346002)(396003)(376002)(366004)(451199018)(6506007)(86362001)(5660300002)(66556008)(26005)(6512007)(186003)(66476007)(8936002)(6666004)(107886003)(2906002)(38350700002)(66946007)(6916009)(4326008)(8676002)(38100700002)(41300700001)(316002)(2616005)(66574015)(1076003)(478600001)(6486002)(52116002)(54906003)(36756003)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?Ce2ir4KKc8UK+pWEjNxgsAwzvlce?= =?utf-8?q?cyqk78azA46t2wN1qMMNsFA0fYTQkap6YYVRJcuBrKwj+wiIBwJgkgrWzlZvFKRxU?= =?utf-8?q?NZWQiP9Ns4k21D8JbyHbU0+CtG5UNQdFUKU6ZGlHFlZXvD9CMPq3zVhGrFT1+Eaf6?= =?utf-8?q?63rVCaDNXGdKjlk8Ie82fTkX719PBhMxGQOOR09s8sw/1LaKDhWrAIhckWtoq2d12?= =?utf-8?q?o9ApHJsM8vJZeMzaJ3epDIKkk6i1KO6OLxZAr0bnoO/OZ1ND434Zs8VkrPwIihry8?= =?utf-8?q?E1YDsO2wFh6SeComIyYQEvYDC7v+CO4iLiLHdDhrwyMXTDzS585uU573vT2v2RoqR?= =?utf-8?q?X63n58yR5XQmsdGIPMrqM5goSDuYSXsPdxtufJyNMbUiwPk6lzEESbpeA/NNzYvqU?= =?utf-8?q?DzVmgAXR+Vv1HgWFnVQo2+YITJRUHHCatWYUWgL+FCcqQr4K6d1TQ33Qe2C8rM1aP?= =?utf-8?q?SBnu923944e2FfaLYx7D90EWlUjdMy2V4l7xxjIMxXkZtsKPEgF4whqn7QE+TMY/a?= =?utf-8?q?9kuKCzX9oAqOeXU/+GjhfurZMAcMNYDtoh0uk9nkf5z0Q+7/W7BbddsbFLsKy0y+R?= =?utf-8?q?JPh2Ne/e2jAty2f+wa9X+J/Eht2ztxpefXHeCfktGnCrcIXElS8I4hTXsgnF/6XHF?= =?utf-8?q?9FZjRXuLmS5wEvr1dE0W5jv+ssQO2GuJ7tMOQ3nQHbkU1daORpCYMxVcu+mDOpG3Q?= =?utf-8?q?MQpIwA8FGOGVcAsRIDwhME/jEwPXvoe3qHV0xlvi28BJh51rhWaAzZtkoqOMe0dKx?= =?utf-8?q?rpqTk/ly0C1z2gl3cBx9x9Y+hndXOCLjdXnmEXP65WGcK4EIwHFmzifBbL99CkM3t?= =?utf-8?q?3/XepN49nM5Xe3RsDXobw+zcJA+bgemmfXOQ5leitBZU7b1kttKTgS+GsMzOj8mpS?= =?utf-8?q?qRYbxGoO/RUXgWGB1cVWyx3SxFebkHuXVbRd9qBzW2iXd1Gz5+ayNNBVO6jmXDb+O?= =?utf-8?q?z9W/bssBlzNoseY7UGwsmbuXEIj1B68dlMWJLPA5GnRs00oigM1mWB7WRp5rIdTjZ?= =?utf-8?q?fIz5cDXcQbk8QvbYF07lizD26monAFZIUNVxM2mGWjLfJL4Fe/9N9SQN1AgfliRbc?= =?utf-8?q?Q9f9hyCVgx/A7x1/wpP1BqxAogTMQna1ytYslLDjwZbpaiIldNMFx2JLNm2S+Fa4V?= =?utf-8?q?rV2wqE/uSboxUVNH4wrdBlB6SFZo6mUfQg2eIFztPeoacTQITHrxy6LkALOtScf0V?= =?utf-8?q?wC+0TyAFtnyULUTFlzqFOA86klsCKTLSwLqVYFXUShEPzb9/e4QW2RVNHH/veG/1V?= =?utf-8?q?R1wv3MmcSWPgkIyZbIqhWlbBj/AX5lKVc6xLaBxV1UvknfbzdJ4xIaWhHwN1gm6NI?= =?utf-8?q?cwk8pEeaFP4EJmkaOnnlx2rgdR/52C2v5WFM7BfpVM+8EmAWs5knSmtYlsnSrT4Ew?= =?utf-8?q?gFT96Pg5jcmZxCxGkMkDFH0pI7XZTqis3ThI8XjMxPjUmIjoTbA3p0cyHtTZg6ZKh?= =?utf-8?q?T/SNaES/X4UEqm6LhS1Y4jAzLmIBulAzXagfKbZDLitxPmSFlA7WRKkZFHjpdKJTr?= =?utf-8?q?HfAVcOy442lW9sjB+LS6OJP1cplen6gmkLYGg06p4Drz3SqmbxnpJTA=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 74bc27b1-5c59-4736-57ef-08db09f419a0 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB6037.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2023 16:47:01.1384 (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: NDEI2JbfVVgmXlzd21yXIWujv95dSOGI24wet91Ue8puMFwTG8t/YcuG7wHVQLsm4sjbZ0YthXZWREVk+3GHA+v5dL9IF6YcnOLUf714WnU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR13MB5929 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org From: Qin Ke When NIC has two ports but single PCI address, the function of map_available_ports_uncached will match both the two dut ports with the first tester port beacause the two tester ports have the same PCI address as the only matching condition. Add support for it by only mapping ports not already matched. It ignores the tester port which has been matched and added to dut ports map, then the second tester port can be matched correctly. Signed-off-by: Qin Ke Reviewed-by: Niklas Söderlund Reviewed-by: Chaoyong He Signed-off-by: Niklas Söderlund --- framework/dut.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/dut.py b/framework/dut.py index eb988ac3e265..df6986ed450c 100644 --- a/framework/dut.py +++ b/framework/dut.py @@ -1249,7 +1249,7 @@ class Dut(Crb): break elif ( self.tester.ports_info[remotePort]["pci"].lower() - == peer.lower() + == peer.lower() and hits[remotePort] == False ): hits[remotePort] = True self.ports_map[dutPort] = remotePort From patchwork Wed Feb 8 16:46:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 123470 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 1C48141C41; Wed, 8 Feb 2023 17:47:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 13F7841153; Wed, 8 Feb 2023 17:47:07 +0100 (CET) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2112.outbound.protection.outlook.com [40.107.212.112]) by mails.dpdk.org (Postfix) with ESMTP id 072DB40141 for ; Wed, 8 Feb 2023 17:47:06 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U8MN6mgM+8/dZYwMY9CNhvS4n5CA3/ikwEbPnTD3UhGx5vLtFWrBPyd8/W01wQAnrCS5EDeT2v5EdJD7oTXpZYo4KOtiKYg7ZQQvABHYfimK+QXvDvuDiyohNqAtlsvaOR9a0IYbXLwsIqIgAHegugJq5SBxpb8dC7wC37ijoA1hfYnG51e7fe/B4GoEiKhmA5N0fFnygz5AnwJ1aqPjzSoey52DFrZVdF2aSicnxlAVIlFo0y4xfiz7xazNGxKNOZTUcKgU3A//C7tXxJjOXsZ+Ospqx6Hvn4d4hQXGmkZ+oSd8s6Bxtuf+OeuY54K2vMaN/E34F6upiR5W2HVwRA== 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=2gKDYImX448D2D8WaIF/6rX+oiM0ApweDHc2LL2mLKg=; b=AUzTWn7JCQZ8Dnevpg5WUJTUciO+tnqi+s+jkIhT1XhEbi7NBU2r+zBokJY1twTUbcNbvJ80pxWH5uL2Y7U+1S1rJtuKZ51OtuEkldU8j/DMtNskdX2FkfBz3hJpe3kyAefNodXuEjE6B6ZYm9jk+sc54oKhNYxGGdVvMAzcZBrqGNQab91fKl+c1nnPlUPquMT3u7ceQ2GTsQn6muRklKKYfMBH2P23vsiAKwmQ/a6ECAQjIFQ8aVPySLksfKp6JH7GYP0qH7O/iPIZ+vwru+juWk+DzkMzMiEqk0g5Ha3/K5USTn66/YUN2k6migUvaAkiXLQ0vhWpwDtihxdCeA== 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=2gKDYImX448D2D8WaIF/6rX+oiM0ApweDHc2LL2mLKg=; b=MZdJrrVeRO/HEOnc4cOnzjdGzr9XkEXvTHzG58BD9PHpw4P83cPdOSaKb0mrg+TPJR4TicJUriScvii13LaLBgBoJpanPKpVTELZYPjWrT68soifgcMElwlhvZgzq7LRBawg4kmvXDOHjtUkbKCFdWs+Jr9lTzXBnWCUxxnrqhU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB6037.namprd13.prod.outlook.com (2603:10b6:a03:3e2::9) by CO1PR13MB4917.namprd13.prod.outlook.com (2603:10b6:303:f8::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.36; Wed, 8 Feb 2023 16:47:03 +0000 Received: from SJ0PR13MB6037.namprd13.prod.outlook.com ([fe80::90b0:f667:bccd:64ba]) by SJ0PR13MB6037.namprd13.prod.outlook.com ([fe80::90b0:f667:bccd:64ba%9]) with mapi id 15.20.6086.017; Wed, 8 Feb 2023 16:47:03 +0000 From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: dts@dpdk.org Cc: oss-drivers@corigine.com, Qin Ke , =?utf-8?q?Niklas?= =?utf-8?q?_S=C3=B6derlund?= , Chaoyong He Subject: [PATCH 3/5] nics/net_device: add support for dual-port nfp NIC with single PCI address Date: Wed, 8 Feb 2023 17:46:22 +0100 Message-Id: <20230208164624.2997614-4-niklas.soderlund@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230208164624.2997614-1-niklas.soderlund@corigine.com> References: <20230208164624.2997614-1-niklas.soderlund@corigine.com> X-ClientProxiedBy: FR3P281CA0122.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:94::6) To SJ0PR13MB6037.namprd13.prod.outlook.com (2603:10b6:a03:3e2::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB6037:EE_|CO1PR13MB4917:EE_ X-MS-Office365-Filtering-Correlation-Id: b93e626e-03ba-4422-8f56-08db09f41ad8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GnwwvmFLwl/LXuvKtQMsgLkZ4/BUq751tw+192h94Ol5id3EF8zxo0kJsYqmn5/RRZoTgosJR8Hr+4NwZwxEd1ftyYvCpqodF7KAXKrPwanFsdesSH47V8wN+xYDP5tCZRF0dOH9gBpr7odbKM6NoroYMShtjkwfwqg+4Dq9yeRh3crzhW15uB/O1uNuSnJMOKiSxj0c+tBr3INGouwUlOeJoumxL94GsfJ/UGY3Vieynj8eCWSqTkSZPXCQ/U4h8UIhr8fwU5oVzE6ju6ShkBjd6QuhdKJnEOAq0LHZ4Eoz+P6s92aU1C5DmFASvJ6Ww+6KSCt3+0a33ZYFHKQASMKJgsMoXAMZNIFJVJAvY/QIXztBLirJrrNuuqo7feQs2jDuwUjolEUf2gWmEHOdWxvTRTar1GyPcTQ6kC31WhJzupNuoJDi3yq27fbdc6cSsHncvwd+dj+IW5o6r3OFhMY9JovqUBfI8A9SU5bCSeSuw6SjVg+3eME3UB0gLeUxoSmRzvruVH7gttrnZT//2mIkA0dXW7PQ9HvjviPVVedWsTO9rnTrVLEmx2ipZ4jhazTBIzcALfBGLBmLvds4AOCv0YPTJNI5tNRO6JXaW+edrxqxvGPyd4CnR7IRpRiaau6R06gm2cKZdsjvZixdqaYnKTnx4cnbKYUFepN4Bu6HIOdbbLoVO/XQI65sXrU/wr/DTxgRESET+smmwpIryQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB6037.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(376002)(366004)(136003)(396003)(39840400004)(346002)(451199018)(8936002)(2906002)(5660300002)(41300700001)(66946007)(66476007)(8676002)(66556008)(4326008)(6916009)(316002)(54906003)(83380400001)(186003)(6512007)(26005)(36756003)(107886003)(52116002)(6486002)(478600001)(6666004)(6506007)(1076003)(2616005)(38100700002)(86362001)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?fh2k3oSHm/iLL1YtARt7GBisB5xs?= =?utf-8?q?KXk7Ao0DcDea2zprBKKcJ70S0ihPZ1JIVXxl8i5Nr5alrP4ydinwWsSvbT4lBeCZK?= =?utf-8?q?3XhL1cib33oEJY5vBud3EsR2evQ1kTZruG2soQfg8nLPH209+H2cgnJGrHShHb5km?= =?utf-8?q?3y+q7t+13bHJutwtMqXP0PDVxtbnnIQdfZ8D4/i4QFkf3V9VhqHIv7dnJ71iynP7x?= =?utf-8?q?3Eg1QG1eJs6L4/fIcodSnckgyimp9TcZsSlIadIufP39q9ESAZyV37xmKiZ175ILf?= =?utf-8?q?esRHPemP41/d5h9vVpGV/MTQHZrJW24UlZt6lXC6Hy6fd4azBTkpdIfE8cGTk5FIY?= =?utf-8?q?780MPbPY1tjk+yE6+FaAIKa+/0IsvbBXyWbXlh3St+/Y4/maFX5hETGSo6UBd+5Zu?= =?utf-8?q?SdTLLnNsOFaxHCMrqi/BRjd7mqXYUOTK3uqWD0bCrL1q2MixQHaqHtBeZEth8IWuT?= =?utf-8?q?mK1RUg3gnbItgKXrejLzzEvV6mhro+LKy3qZn5qvhe89QXCnCrXmcpW44si3k0lOL?= =?utf-8?q?5cVrQ8wOakuYjSXuwwA69SpGFueYSa6OCPQlsU8t2MziCUYZ1f3lvHZ1CnY7verCk?= =?utf-8?q?TPgmhBuAhD2EItw0N9yArfWLWJtQL3M79Ceop+IalTXWTMJ8faRzuEBmooWmmpZA2?= =?utf-8?q?COo6CzWWEPVf3gV+LwcA+ZAvTPe6J80T4tAjsh2vy98YVA8UdR3N2i3Xi2Gnc8Td7?= =?utf-8?q?gLhGNdTgd6hnuGu0+sN4gra5cUsym2Rh0PrDfDmKy8jhtZfRXSQ4tx63o4ChCHuJv?= =?utf-8?q?RNXlFcsLezKZLiSrDdl+hzJllf2mOUZRs2oB626nt/zXqDXXi0wmO+UK5SVbIjwZq?= =?utf-8?q?mlqMgdVsucgn4Tuk0nwBHpa6xhAIm/dD//HsitX6SBeLrP/qIpyjSgS+nuMQ7Ct1M?= =?utf-8?q?5tMC6iTD9pFy5L9/X/11Mikp7miG1/BDITnPbZIO14k0XBXPOsr/pAaYCVO0jtG8C?= =?utf-8?q?2cguvx0HZvKL9USZYWSxwQYfpCJ1FXHZuVi8XYqvjUg7TdfSEZjW9eodU8Tzt9NS9?= =?utf-8?q?1tX/P7G+qbRsxS0dK+wReOo8EJdgeecp/w4pHVzI4OB10hJQYcxFqUpuIgngL9QiG?= =?utf-8?q?pdBzf3OaPB3YAaB/YReF6txAqnG+TeGacxKnp/YT6Cn9xHRePMih6vDjEEkZwNOmQ?= =?utf-8?q?5evCljuUdE/5+0zDhTgR0IcgGbDnQlireJS/X2iGbZ13xPRGNwe9TZWlkqN2C9YGx?= =?utf-8?q?f8eVYYzJiLfc8lDpDtOGN/gDuchXBKnD1bhTXf9DET9K5GRNJ/cIobTrgUAyRgohF?= =?utf-8?q?uwGoupcouLgKnDX3CsbpSSwGX/JhQ3H5BOu/RVt95fVZ5DV0w/rfvvjeleiq72pOB?= =?utf-8?q?36AfCEHs6aAmsw3FguZ+/llFCa2IQxvUlP0Wk+Ft0lW40vA59HKmPy38hjRPcRDvL?= =?utf-8?q?E9p6ULREmSTMDNWmMXzshWTVGKRLP1pqqEDVf2yR+ojIbtMD3vyu22IhuMVNleJz/?= =?utf-8?q?ZG+ZWZEy/y+paZoEeIEa44jUup6RXibMiCYewqNGV2gEnpuGLq+4mLWF+HoqHWru8?= =?utf-8?q?+XBIxu8svLUwADLGGO6ZKeQY25kcEkQBVSnkK8mo6fyFl5sXstsz0RY=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: b93e626e-03ba-4422-8f56-08db09f41ad8 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB6037.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2023 16:47:03.1845 (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: kH9UgaudNZ1RcCN+lrVDbGB+mtgTBzD3TvHwOaf6boFo58HQ4DLYHOJmriluQblst2QQOukEZauIEkpZ1o/8ZyZ91L6IG8KRGyIFgFytDBI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR13MB4917 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org From: Qin Ke Corigine and Netronome physical dual-port adapter which use driver of nfp share single PCI adress. This limits the dts framework to use both the two physical ports of nfp for testing Add support for it by utilizing both the fields of intf_name and intf2_name Signed-off-by: Qin Ke Reviewed-by: Niklas Söderlund Reviewed-by: Chaoyong He Signed-off-by: Niklas Söderlund --- framework/tester.py | 2 +- nics/net_device.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/tester.py b/framework/tester.py index 89f654d4019c..a8342a2f36c9 100644 --- a/framework/tester.py +++ b/framework/tester.py @@ -518,7 +518,7 @@ class Tester(Crb): } ) - # return if port is not connect x3 + # return if port does not have two interface if not port.get_interface2_name(): continue diff --git a/nics/net_device.py b/nics/net_device.py index 85245d2917db..3eec5c7f2f3d 100644 --- a/nics/net_device.py +++ b/nics/net_device.py @@ -194,8 +194,8 @@ class NetDevice(object): else: self.intf_name = out - # not a complete fix for CX3. - if len(out.split()) > 1 and self.default_driver == "mlx4_core": + # Incomplete fix for dual-ports adapters (CX3, NFP) which present both interfaces on a single PCI location + if len(out.split()) > 1 and self.default_driver in ['mlx4_core', 'nfp']: self.intf_name = out.split()[0] self.intf2_name = out.split()[1] From patchwork Wed Feb 8 16:46:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 123471 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 3FB3F41C42; Wed, 8 Feb 2023 17:47:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 37A814282D; Wed, 8 Feb 2023 17:47:08 +0100 (CET) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2112.outbound.protection.outlook.com [40.107.212.112]) by mails.dpdk.org (Postfix) with ESMTP id 62F0B40141 for ; Wed, 8 Feb 2023 17:47:06 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TPfZFfAJrA2/TjwPaMBaLkxQMlRlaxKcYg0yGSah5wMUmVunrbfuUhdplxNiiRNpfuRNHB5m6SBqnRLNpWwz6ZHxk7du7VU66VuqOG6aqcET5L1mTBdkmsQd221KRYBC3FXwkdj+Af8X3RzOa2UHPkjS9fOVInZ3me4qzzixZdVDly3oY3GHSMNW9dDILc7sFE/1xqrAlZdJtI0cZ5U4A4leB6ACT7atCPERl1kOTHvQd4fiUzlSH2kTk1SN4I3uoBgsmg8gKyCUT2N2/fV5SwbCAbyUgZgiQ42RhaZrDApcksWHHRjthLuz1rqn3tsin2i4E3mA6zaHfDb/YkPOUg== 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=G2xKnqZNlaHCWbJjV7XWKOjuWmlVIJTBnTj216ShYrU=; b=Ziw2GAC6egRMnZ84DDhkfmS+y7v8IWTbYdozsG5Z3JKavobRKuAle7cE+HIlAp3UOyvvWZeTIHPEwcUFl5e0BgthWU/xNVQ5exeZLPU9n5ucwYQxOVvKSSAjpQbK7kKkvTgNKe4GREBEOphr969Z1eo3LfkOuwqjjsvoqrS6YXR6O9iVNDUz9wkvIrKk64u6+Ki3QcKYVPu1L6wBHQHgSbOMyGWSewWF4KXC5GkaNTZO0HZGBwLg/XViicgrFtCE2L3OdygfOpLuN1I51UCDrom6kom3G6HLaJ6yU5htdjAlGVziovhwNpzMHFpGiwdMhKbg+PnktQ4LXfrgvPonmQ== 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=G2xKnqZNlaHCWbJjV7XWKOjuWmlVIJTBnTj216ShYrU=; b=UscxTAqlnQNd0xRfvPAYQ4B2/0GJ4qWrTGUUqgrfbXw3Hb2HpI18U7ECAd9Mup7y+ACCyvUl5iW7PPAbd72M1VUlkPAUEkyLXo2Udq4ypLANKM4AksfxihY0gmPTGgzAok794ybYphWXnJ4ZpuRPMNdq2GwqknLv1I8zlFdgb9o= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB6037.namprd13.prod.outlook.com (2603:10b6:a03:3e2::9) by CO1PR13MB4917.namprd13.prod.outlook.com (2603:10b6:303:f8::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.36; Wed, 8 Feb 2023 16:47:05 +0000 Received: from SJ0PR13MB6037.namprd13.prod.outlook.com ([fe80::90b0:f667:bccd:64ba]) by SJ0PR13MB6037.namprd13.prod.outlook.com ([fe80::90b0:f667:bccd:64ba%9]) with mapi id 15.20.6086.017; Wed, 8 Feb 2023 16:47:05 +0000 From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: dts@dpdk.org Cc: oss-drivers@corigine.com, Qin Ke , =?utf-8?q?Niklas?= =?utf-8?q?_S=C3=B6derlund?= , Chaoyong He Subject: [PATCH 4/5] framework/dut: add longer timeout for loading driver and firmware Date: Wed, 8 Feb 2023 17:46:23 +0100 Message-Id: <20230208164624.2997614-5-niklas.soderlund@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230208164624.2997614-1-niklas.soderlund@corigine.com> References: <20230208164624.2997614-1-niklas.soderlund@corigine.com> X-ClientProxiedBy: FR3P281CA0122.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:94::6) To SJ0PR13MB6037.namprd13.prod.outlook.com (2603:10b6:a03:3e2::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB6037:EE_|CO1PR13MB4917:EE_ X-MS-Office365-Filtering-Correlation-Id: b98bae83-c50b-4be8-bf2f-08db09f41be3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UYvQP4pScP8Y/RNZXAtBf46qBLQGdesimK0foExxlD4bM8Y9U48cZx22uljlTV5rTl2LTImV0/lCdSqc1IeDlgc38/EFu/J43utA4DYdF0CrD0chXe/TUrnyN7/hHclVcnbDo3+hkcZAx1+Bknw9jnR5VrEcH3aFb/LXxHRoQnFNQ0d6Fqjx9qBlK1p9J7tRN3jGXtq8iSMvsZ5jlTMvYYcPpk4X+6SbnU7oYOU7jcziDppNzbHHY2+F3a+CzlSZMo295LUMH2RbvEP3Z7RRDdZlBt+lV8zC3O2KW5irxp40c4vJ33v8v3I0JyOHdOs8XUao6ClOXnSaOlj6WIpuHiZK4R5EV3+c4U29oKSIU0ugNaU2ltYupsShwKzz2ADP/9BmErzyX+cBDzLS/iYU1fwEpkGAhkK5rMrYN9fbXhXMUpcr4wqDPgqg2KTOGT3FVVm19Q96yLPHqSUMON/bcsppNz3klmSyxdwDgc7brXJZbJhDRC5I1LYbg7o9Ar6/8R9sP0nDLB29Hc7Du9ErN5skN2w67XaproUNtU/LInqFAzbpWvRdQyy/xoz8Og6RGlBczgf6UsYaLR8Axt0SE11GTrydrL15K9v/5b/nv2YMaRGnyHYDZw4ublSU9A3xSSikM3IPkiNi6IrgP/UK4nsrLNmTKIvxFFCzH4EtNGlcPY9FrvxqFNWNoULbTHRHqPYEsefjgJAUbiO0RNURZPWTUSmU7U1V52XISm9Km5Q= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB6037.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(376002)(366004)(136003)(396003)(39840400004)(346002)(451199018)(8936002)(2906002)(5660300002)(41300700001)(66946007)(66476007)(8676002)(66556008)(4326008)(6916009)(316002)(54906003)(83380400001)(186003)(6512007)(26005)(36756003)(107886003)(52116002)(6486002)(478600001)(6666004)(6506007)(1076003)(2616005)(38100700002)(86362001)(38350700002)(148743002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?27M8u9CLUMhzbJvI7btfI+EsysUw?= =?utf-8?q?tfnMH/pibCWulyrNoME7FZy4C+K9PIJDIudoNlIg2Z5aoQkY8cpRZ51Xh0b6rfWNP?= =?utf-8?q?o9U8If1ChlOuT/5JREGRvT4PVn7d8ET0sVruseSr3JNiuvZbmw/+8hA9KsHTIrQik?= =?utf-8?q?BozWrwQZnXD3xQY4FqjuHIy8leVr3wqOwipZ8oxK9NoOhHDucDUsS9Q53wD/heZff?= =?utf-8?q?GG8Dyc4pR8vwMECJYd8Rc/dnTHh3seTIxANXLlPQgTBTMylHdVyF7Zm/hS78i/gsl?= =?utf-8?q?taGTpDT8U+3AGEoBOJ3ROTgHwn+sXgUc9XaR9VoJtUS0qsZMudqqtfDDsjCKuoV50?= =?utf-8?q?F+W6MuujGORh+fgFiRthuC5O4Gg196EU+ufi54LQ2n2W/tzHjIYxuP7QSHpNxMs9T?= =?utf-8?q?VBoKMNs+bsd3fkELgVEQSZpwyFeiljO1wIlt2gpWydIRTqB4iEbnmuOfu/PAHxwBN?= =?utf-8?q?XSjokIUPkzw1qQ/fYoTmK8ff5mRSI2inBs2B2OGCAX2h5aUSkakhrk8040tVup81n?= =?utf-8?q?dBry6vmFuaMP/i5p4F6PlVQYhu4Q/iCxjMe9RBxwW3+VbgyHxznl5kUKfpq3lgXuk?= =?utf-8?q?mlMCjpYyaKMchjJOvqaeVHkUswh0fsfwEvwzqvFGQm4YSGY4NZdraRoNcCytLY6vi?= =?utf-8?q?BkoVqIrRuzEKN4+ussE107ohqjGXV8JhIhgVbViDKiiH/IiJjJ1xDr5Iimethz76L?= =?utf-8?q?h0Vsj2F2JwcvN/r4WENVVhyNgv6Wfk0wvamO+LkDZynfeTv3fmO9f6yV3+HzFn1N5?= =?utf-8?q?mwL/H9V2OsHfcp4iliUjg/1IpvxmQ0UOMZQ5jOG/JEF48xw0w219jp1iZ2DpvqASm?= =?utf-8?q?6hkOEUMK7rhBLL2xScB9qxYMdm3TxCfi6edNNl35mP1QI9x1k3q04bQ/czqq32KOT?= =?utf-8?q?tI+jZkobtvt3ZOfUDnVvQcPUpwDHnGhjY04szGf3p+6WPu/wC6OM6Lou0gl7zDU7c?= =?utf-8?q?uA7CKg2k1CpcfTtXa2cZgv6xQwDED+KfdIANl2UA4fnqIU5cLzKYmdvel5M/itUa2?= =?utf-8?q?qTzVqAWvtOJNinhoeN3eDjuha4sV2KM9uFV2wkvMTaLdgxPVob7E0qqLzMpw4Ov87?= =?utf-8?q?ZzprMVi8ufftGVGeVCid3VSqCgRDV+5wpwicocQtgicKRwZvbqy8QQ9yebpwZjgIO?= =?utf-8?q?kZ7snvvw5OjmGMLqasDmbXzZ/es0+S+tHWctppdTk61bu8DmaHFoQh8nhJNHY5EtB?= =?utf-8?q?tcP6acp0MDYkPNAytT4fct11pknsn0HZl+liCyZPj22Bncwv65befwbKNQfPE8fcW?= =?utf-8?q?m3avtG2iDjC0KHFXzJ/MkyTb7zITE+Ix3mMqTGMdeIt6+Je+uE9PLrlxKdVyRijeo?= =?utf-8?q?BvLGUtBdcoNtXK14IKuglJnVvA34K1iV69bxfgLZq2Y9B76+FVdVCVBq2yn7s4tsV?= =?utf-8?q?m2q8NSeoNKBhzlB9rdb4cjsotAB2mNEQWjr7RikyR/8CHQbKesRGsEe43zlCmny6d?= =?utf-8?q?vO0szWGS04ALhhg0DXoiBu25Nc2iq/jJwMCmQD8rEvfFlR08F46kYIx3WtGTujjz3?= =?utf-8?q?5nnGKp+7hU1SdNiBZ2InNqegWHGtX8tZBsOEcV+SWDtAtEFZqpP1HO0=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: b98bae83-c50b-4be8-bf2f-08db09f41be3 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB6037.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2023 16:47:05.1230 (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: +R0hRg4MpZL1y9kLi1Mu6kwUGxe5YHCRqv5NgDHkDXN4FvIMBOgOBdBnp+7xxGF0USOEeYTKa6jjPmimho5LPyLXjJV7zNX3/MQMp0dpqiQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR13MB4917 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org From: Qin Ke Nfp NIC may take a long time whiling loading its driver and firmware at probe time. Add longer timeout to ensure that these operations can excutes successfully and stably for all NIC. Signed-off-by: Qin Ke Reviewed-by: Niklas Söderlund Reviewed-by: Chaoyong He Signed-off-by: Niklas Söderlund --- framework/dut.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/framework/dut.py b/framework/dut.py index df6986ed450c..ed69046db6a5 100644 --- a/framework/dut.py +++ b/framework/dut.py @@ -424,9 +424,10 @@ class Dut(Crb): ) # bind to linux kernel driver if not self.is_container: - self.send_expect("modprobe %s" % driver, "# ") + self.send_expect("modprobe %s" % driver, "# ", timeout=30) self.send_expect( - "echo %s > /sys/bus/pci/drivers/%s/bind" % (pci_bus, driver), "# " + "echo %s > /sys/bus/pci/drivers/%s/bind" % (pci_bus, driver), "# ", + timeout=30, ) pull_retries = 5 itf = "N/A" From patchwork Wed Feb 8 16:46:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 123472 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 68FD441C41; Wed, 8 Feb 2023 17:47:11 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 607C742B8E; Wed, 8 Feb 2023 17:47:11 +0100 (CET) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2131.outbound.protection.outlook.com [40.107.102.131]) by mails.dpdk.org (Postfix) with ESMTP id D833940141 for ; Wed, 8 Feb 2023 17:47:09 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MZb7axxEidRFkBV19KRs+xLGsIBq82i+TvWGMKI68hjbOPTv8HFEARs04SyU+wiQTQfVVlS+t8F6J635uykbUn7MExN3hujwN0ZEouyN682YVwjstg5l7DSXgkj3X2FZ7FqyXSlwfSt4s1vBKnjRhRC2T4/o1dsRRGKL6ok+UQzxagQT+rE+8R/XavF7qnxMYG3s2Lj4wBPXnpx9YUI/wwY+hiesI/2pLsVmFjFGbLCxp0dBJbTmNzRIFWIq8iI9y7mmjrm5jskRhMD7Uw5I+ldKcHGMkcyuwW6bCeVKj2zLHkwrjvG+h7f4+HNHy5BlfC+Xu7ITkXmdxmqhxJMHDA== 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=M6fs5h46p4juzIa8fxWB7zwsnDjvJSvgbp4sTx8rMUs=; b=Y0t4963vDOMKhFxvyCye23A9uFo0FweLrT7XVCjz3cDxztPIhFn7TTIZSH/bzn4Ax/k9xBLSpuxlc3+qOLZSxRHEKt6kWbOFSVXl+3VsDJl9zWBjmjCxAlRXgp4YdAxuhCiTes+rNWCdUnVXA+w3c563WFSPx1PMm8bK2fs34OSRDnAJC8o8MWsGx8os8ABsxMR5LvqAG7N/OurAgv2wqPE1YsNSUmYJz2JXBn8d2pMyLWJnOhDxH4BK7PRoaQozbQwXOrQvRTIDP27EoXV1K+u+wJV1aaNjzyuRln6akmYiFuyIUUJhAvmIDhaL7a3TUu1byrG92lcKbyZPgQUABA== 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=M6fs5h46p4juzIa8fxWB7zwsnDjvJSvgbp4sTx8rMUs=; b=rBASFYbSu7kjvn9c8fqWi+mCO0+v91TowLFiRtx7EPPAGLMIob7Y7c2bK0aoNNS5ih59kweDXDRazvYrX9LFxXKK8lBB318k2cH4546RoclZKCuQgzMvoF++2Ebviis7s0NERwdw1dPaCIi46GXPHXtBJJGn562G3gxizP7Da7g= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB6037.namprd13.prod.outlook.com (2603:10b6:a03:3e2::9) by SJ0PR13MB5917.namprd13.prod.outlook.com (2603:10b6:a03:437::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.25; Wed, 8 Feb 2023 16:47:06 +0000 Received: from SJ0PR13MB6037.namprd13.prod.outlook.com ([fe80::90b0:f667:bccd:64ba]) by SJ0PR13MB6037.namprd13.prod.outlook.com ([fe80::90b0:f667:bccd:64ba%9]) with mapi id 15.20.6086.017; Wed, 8 Feb 2023 16:47:06 +0000 From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: dts@dpdk.org Cc: oss-drivers@corigine.com, Qin Ke , =?utf-8?q?Niklas?= =?utf-8?q?_S=C3=B6derlund?= , Chaoyong He Subject: [PATCH 5/5] framework/setting: enable Corigine and Netronome NIC for dts Date: Wed, 8 Feb 2023 17:46:24 +0100 Message-Id: <20230208164624.2997614-6-niklas.soderlund@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230208164624.2997614-1-niklas.soderlund@corigine.com> References: <20230208164624.2997614-1-niklas.soderlund@corigine.com> X-ClientProxiedBy: FR3P281CA0122.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:94::6) To SJ0PR13MB6037.namprd13.prod.outlook.com (2603:10b6:a03:3e2::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB6037:EE_|SJ0PR13MB5917:EE_ X-MS-Office365-Filtering-Correlation-Id: 8852cc5c-c474-4716-1281-08db09f41cf6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NlOcqKjbDWPHfsGz99bwsHuIuglIKxTyFRWbQKItrozvbZ4lDC0xtyfkIo2bQMTWllV12gWkbZFLZ/aKJ7o7AbuISDEbVdcMnUgbEl4sg5XZqLyCsloTuV65YydNpDedwJVt0XCu0MetSMuU1Jx6oV6lG1xkBRrxAxS+MXDuiBtkl2BVan4TIEbQwFactO5SuweEmI0Dpb6u24h6uLXLAktet4JB29M3T9+yfti4DNe01daXpcm5sGD9vMqBqEemfYQ1wvJWb9lWIMuuD0D2mri3D0j+fsK0mrXEz+BHvxya9YYEgwrAyDrFjsdRzdt3a8FItNxROsXOAyEX8X9S0ypfEg+ncXihfRX+LzX3nDwoQPecYESMbmwiupwX84n5V4AHB32kHlkiFn7kfG9ckzre1/fdZqo9+piU/C15OTeDGiZ0yaAZNLuWcD07xY4f2Qef9GpRA1X+OoC7uyf3d8Ls+mVTow7lRMFtVvIpHYqBo+V9aXRAJC8ZbxDek3zSJ8VeCL1Nk6cNM/RuXvHv4K+k+uXVZwC8KLaNsDXj8D1QOaTrykC6CvuUh6McbN9biVhm8+sZABtzLenfCrBUBZm6IsLysMN6cLZRkotGd2WCTv8diFrx0q/lnBOKZE2ftz5J6m9e686tDHYEl7K8/s4z34wMBhmWrK/hfGBwtmGl0iNNwzeZxKW7HN6IRJK+MQ5JUvMeOXXK8nYOa9OfZg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB6037.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(136003)(39840400004)(346002)(396003)(376002)(366004)(451199018)(6506007)(86362001)(5660300002)(66556008)(26005)(6512007)(186003)(66476007)(8936002)(6666004)(107886003)(2906002)(38350700002)(66946007)(6916009)(4326008)(8676002)(38100700002)(41300700001)(316002)(2616005)(1076003)(478600001)(6486002)(52116002)(54906003)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?zGhCtv0ixKA/fp/9lTTYNM/XxHrK?= =?utf-8?q?nc2ylLgf9qYZuuOHIIlXEIXdTp/32DhQwIkRufeRwqsNiqRt2e+Ytx3QZCukS3QVw?= =?utf-8?q?Co2EOeS8xjnmi7ivzW33BTW2CQtddpnKQTjNMtr4Ip3e268snj5rR55MrPhRzGi8x?= =?utf-8?q?i1mbsVUIC66ze6o4gkKVFSbDp/ZgUmfLv5RhyfqfDZ7iCKu6dfCQyI7P5GhcXfymG?= =?utf-8?q?VNvvBKfiEBv0HIuuqsxQqjh8jJQuAANlPR6awT3/zHDX3APTG2oF2qKqHRsDShEIa?= =?utf-8?q?xGH7rJbTtSR2ZjqXs3Ue/y2GNLvlCXXaJGsCrw7Aa33iKX5jRA5UjShQAgWR6zPln?= =?utf-8?q?+VPgAiC3dfjoVJ02kyRwh77wDmzichYpgiaBIhe2LBmi9rva7K6q+E8XGm4uY8y18?= =?utf-8?q?r/7EBU7ITwOiv/70gMO39iSF5BN31V7yP+dVwoxiUz3zk5l0KozMqOEY5sfJgThP1?= =?utf-8?q?8YdQmYgXkMWKKn55sTqF7e8UrpPInHsrMfAGq3nSxAzz2aoHw4Uq99JubCfvfgBZg?= =?utf-8?q?aeZk4jhHNcWJzIlVbXZqxMmG/ttQR947RnHwutoVduu7Ol8K5aZeosG2HLxsnrdsX?= =?utf-8?q?xfCrRwrIWOWePEKvxHqkGQM0xmMugVXGAhnZ/tpBF6t1Voc/RplhzXF52I6j6vhUk?= =?utf-8?q?dKADw4w4T/wX5OMiMg9dxPcfsW5sHyu9dL8a3TM5QPTPCXkpA8/ZLquAdsSp7FKu3?= =?utf-8?q?x3WoFFti0UupgP/2UbGTDnhnSpg7f30mmVgeRWm1gZdlibCt1vCiZCTmBlfIbozQ2?= =?utf-8?q?oW5WQywzwJYFCqXiyRI1pbZuw1PYXywLeBmrSjNg/dQQAzA4ei+sfLHyyj4F7a8L1?= =?utf-8?q?yu7B70xzI4WyxT0s90rjkdTIlu64Sdp0BBUJXsK3gMRA4QzsxRUyBl8Ku3OvdumpS?= =?utf-8?q?B+Qu6rQpuQE8DQTijjUW1KQqB4TuyRc0/eAMegfqatKzxwBsvGSqy+snP7YplZdaG?= =?utf-8?q?buWhD/8jJHY1bOltKtaDiJO3OcXXkCHTD2PRgWQC3laPhWJG3y0JTrPSARXst2Paz?= =?utf-8?q?kVYihh4iEez5mQdBCOi2vtG8bdXc9GL3tdys3+RsQtSto4uJtNyyNlag0fMLk/pA6?= =?utf-8?q?e9SUeP8KeQpcyf0ynsl+1TOGc5jUmIfC39hb0oVhnDoWbYcV6rtRFOm7GZbUPhaOA?= =?utf-8?q?h/gLdWKDwwb5u53QPPQVbbeQ7MsiC70v4pbQ/H7uycYCkcz+CYmTI81qMlnqpq4YN?= =?utf-8?q?l611KAK2OwgqSzk8BRchATvCQSZgBVMGJr8Kgd+sOI5d3gUqxRPyVgN3gMMXaa6UX?= =?utf-8?q?BBzXV6eNUyc8WYu8hQ2IB8cLSSucOhcLRETslOmNBDBfQaPUZmcwsonJnkzT38k06?= =?utf-8?q?O4CulBbAqiJjrISG2JhStDykG1S7zpPQwL/Sf8vRUcqcJ3T0KN0HKQqEwFNqSvzQb?= =?utf-8?q?tzFR8ZQj58zJ9x3zE/Z+XXaXHw8Xe1EzFRimSNgLcTQKrrrOiak5Yug48P2NPXWXr?= =?utf-8?q?GT9xO7kAnxvxq3Tl7iecugF20HT4Y+hJ9Iub+Vj7RHe8Jsd2m5Vj7XO5BiQRqtWhY?= =?utf-8?q?Rju3P7rXoITsX4C4zkz07VMBMn6UPmRcIAQBeJMKne5lCEPZcPrDjrA=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8852cc5c-c474-4716-1281-08db09f41cf6 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB6037.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2023 16:47:06.7334 (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: UyLgY8OFJPPIcwVO7iEeASSW59g7zWrvtfHyHMYwBXnGyxWCqMm3+GdSVMTP0OheuiZQ9blvGuSoOsrcI/e8ypajlIAXBftAT0kDPiIUjr4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR13MB5917 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org From: Qin Ke Add the vendor id, device id and driver of Corigine and Netronome NIC to the support list of dts. Signed-off-by: Qin Ke Reviewed-by: Niklas Söderlund Reviewed-by: Chaoyong He Signed-off-by: Niklas Söderlund --- framework/settings.py | 20 ++++++++++++++++++++ framework/tester.py | 1 + 2 files changed, 21 insertions(+) diff --git a/framework/settings.py b/framework/settings.py index 48e6d4430937..5c8db15355fb 100644 --- a/framework/settings.py +++ b/framework/settings.py @@ -87,6 +87,16 @@ NICS = { "IGC-I226_LM": "8086:125b", "brcm_57414": "14e4:16d7", "brcm_P2100G": "14e4:1750", + "netronome_3800_pf": "19ee:3800", + "netronome_3800_vf": "19ee:3803", + "netronome_4000_pf": "19ee:4000", + "netronome_6000_pf": "19ee:6000", + "netronome_6000_vf": "19ee:6003", + "corigine_3800_pf": "1da8:3800", + "corigine_3800_vf": "1da8:3803", + "corigine_4000_pf": "1da8:4000", + "corigine_6000_pf": "1da8:6000", + "corigine_6000_vf": "1da8:6003", } ETH_700_SERIES = ( @@ -171,6 +181,16 @@ DRIVERS = { "IGC-I226_LM": "igc", "brcm_57414": "bnxt_en", "brcm_P2100G": "bnxt_en", + "netronome_3800_pf": "nfp", + "netronome_3800_vf": "nfp_vf", + "netronome_4000_pf": "nfp", + "netronome_6000_pf": "nfp", + "netronome_6000_vf": "nfp_vf", + "corigine_3800_pf": "nfp", + "corigine_3800_vf": "nfp_vf", + "corigine_4000_pf": "nfp", + "corigine_6000_pf": "nfp", + "corigine_6000_vf": "nfp_vf", } """ diff --git a/framework/tester.py b/framework/tester.py index a8342a2f36c9..5e6c72ad5d98 100644 --- a/framework/tester.py +++ b/framework/tester.py @@ -317,6 +317,7 @@ class Tester(Crb): self.send_expect("modprobe ixgbe", "# ", 20) self.send_expect("modprobe e1000e", "# ", 20) self.send_expect("modprobe e1000", "# ", 20) + self.send_expect("modprobe nfp", "# ", 20) try: for (pci_bus, pci_id) in self.pci_devices_info: