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 178F241C54; Thu, 9 Feb 2023 16:28:02 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D8FEE42BAC; Thu, 9 Feb 2023 16:28:01 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2096.outbound.protection.outlook.com [40.107.223.96]) by mails.dpdk.org (Postfix) with ESMTP id EF125427F2 for ; Thu, 9 Feb 2023 16:27:59 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AUNBHu2W6aYMtQPhR5CPaEbS3kB1FvCt2kLLScJouYIy7oEbJPFCEXbgwraEO/fLNTNEw5zYxldUzDU0HjrUkXHen4osYZS8nnVpdLfKCP1d7VTBr8j8xfUOPh2wrt/TKTbUyIoS4arTZ8+UWmjbfQr4iBDIrz9tIjwAcZ2ZOlnZry+/h6ozPyf0I/J/dg73v51Ie+5GXIcjDTPf6Xrpng/m9pzoycTXoFhJHmoWgjOlfJuMYM/oZxmpHopxDuSNG3CPh+p/waijTKpEyiaoKG7oB7G2M/KZLNVQzpdaONeJWDmqFraPxjcQl2v39oF6OH5BzIfRx98LUobtrhdvQg== 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=gJSlAbxyjSKfkrympRweentLJ4dIdmLYFEjVsXLuGyI=; b=mUv2rTONXPPlBOBpf/z3A8JA+bbBupJ+frNHCTLcy4vjVUs0xZxqw54gkRbH7boqxKL9Dk/zHQWSwRVak7gJ5dM8f9oe6wZMHeEiMVX90rMetJrw2eROC8gNIGzcXLkG6KFtHzhOrFW8i4Ok4lCKzbcz5au+3g6xckhsVBA9u1Rqib1gdEgtTNOr/1gKmn28qSx8e80Dg3CCNIpIi8ZoUGGClMiVSlV1GjxW1VShXlzMQG0PIJGwVW3JIlv7pMIAQ/fKp/cWfCP327gQWjxiS2PYeJV3thdwLh9fdncvSGKuqA+F7njEvhwbKW4pIxRH4s0y1FHgT6hwvemT8IlzrQ== 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=gJSlAbxyjSKfkrympRweentLJ4dIdmLYFEjVsXLuGyI=; b=rgmYpxw7ghe0xPT5e3M0pwzScFjxIOFP+coBm8l+eqk18ZyNj2Zm8eSZLv+713YSXLXHnizOgFXpbtoKt3F/9MPgBCDrmDMTc8qedxYabYciGTSGv4RmggLXOXNqCPHmdV0P+tcOQ7BU+onRsWvj1elxqudtUNe+BQY83dkuD24= 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 CH0PR13MB4586.namprd13.prod.outlook.com (2603:10b6:610:c6::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.19; Thu, 9 Feb 2023 15:27:58 +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; Thu, 9 Feb 2023 15:27:58 +0000 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= To: dts@dpdk.org Cc: oss-drivers@corigine.com, Qin Ke , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Chaoyong He Subject: [PATCH v2 3/5] nics/net_device: add support for dual-port nfp NIC with single PCI address Date: Thu, 9 Feb 2023 16:27:15 +0100 Message-Id: <20230209152717.4057220-4-niklas.soderlund@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230209152717.4057220-1-niklas.soderlund@corigine.com> References: <20230208164624.2997614-1-niklas.soderlund@corigine.com> <20230209152717.4057220-1-niklas.soderlund@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: FR3P281CA0127.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:94::13) To SJ0PR13MB6037.namprd13.prod.outlook.com (2603:10b6:a03:3e2::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB6037:EE_|CH0PR13MB4586:EE_ X-MS-Office365-Filtering-Correlation-Id: ee178add-c67f-48c6-3510-08db0ab23843 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tuVBx1I2wR45BkJ6Utzpb9Srn70eKPM0Mt1JyPvFsHTj3HnLoe+gFNG+ZXNY2BdiuWiN2fjsbDotnT/t8Iymxd6zRnlmaV0tLHCm8RTtxyVvXJeChxJ/jzwNKoEkx6BTak4eARHQj8Uj8XPetwT6Jf7mffSZ2ZUFbktKUvryTREBJDQOQ9+qa9LpdzFMtySfkw5nWCVY6JkidvrrOWOqUYwm8lws6QfPZPPg2L+W+gJ3j5x5wwUCf7VBETAFmzAGXJD7o8XSNMyPCNkG2aNLZFVJraci33wlMy0XXxDe0LOc+wdj5AS3Pm5pHbWhO55Mc1Kw5V0zbY8iSlM3vx6uruFugX5Z3sQElBONiYwe964Ose7HYHtHJfpOLVP497u5JxM1ITRC4mQSy+5h9x9fgTjIcmphW9BWmX4fj1n1Aah/b8kGb+qiHfkkhA7hMJhFOjUjv5Cf5CmzXKrSvzFlITPaAISPJV8QAIb0HjlfHBsscvVq0egX7Ou5tYtsBqIwBS9nb6NhFR5k9P7+jozpNK4EltK3x9ByKeZlywm2WNDyoMS+9UZwv4NxpFIvZjF0l+BNpHHnZkwdy2R4AoGb6XvkAwI4c/h99XwBt3B985nr/WH5izFwBlhP7YoQ1S7QO3ok8xTkmbd9/48YO0rSfCPHYDAbnYxQFJ0Z2GrThOM+Wbee92gGk0pk3bVgzrazofyvtcvAfA9+zjDvWqeu7A== 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)(39840400004)(346002)(376002)(136003)(366004)(396003)(451199018)(6666004)(26005)(6506007)(107886003)(186003)(1076003)(6512007)(86362001)(38350700002)(36756003)(66476007)(66556008)(66946007)(316002)(38100700002)(8676002)(52116002)(54906003)(83380400001)(478600001)(6486002)(4326008)(6916009)(41300700001)(2906002)(2616005)(5660300002)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UHdyaURQcGFvVUdEZ20wRTFQa1liSkNUTnVjak0yeHRCYzdRSFdVUWNnSHRM?= =?utf-8?B?UTBRczhUQktZbjVYVlliTmVNVWlDN0JIeWExRXp0MmdRYmZ0aHRZeGl3aXF2?= =?utf-8?B?MVN2azFFUHlxRUxVWXNWaXZTekpVR2lvcW5JUGtORlJXSGVUVTdJcjFGc3VB?= =?utf-8?B?RnlSMHdwR1h6bVhDMWUrcU1uWjVVVEg2U3JqUXdoUUxOOU94Y2U3WjYyT3BO?= =?utf-8?B?cmUrSWF1dGpiZHZOVzdienpFTjhJOVBnakZQSE9SWnc4TlRRd2RlQkY2WFFk?= =?utf-8?B?Y29TLyt1ckxCR3d6UllCMTdZeVNPS3ZBUVQwdFlQNkZzK3hCQ3QyMkQ2OFVH?= =?utf-8?B?ZTh3ZVYwZktncGFLQm9VbHY1cmhMWGVtelhSSHVKZXMwVHNUV29Lejg1Wk5n?= =?utf-8?B?eFQvUjh3YXQ0V3l4MXgrT21KbVZSTUc1cUNKM0hibVQvYkZnWXN4cVpPWjNk?= =?utf-8?B?MmtDN052dit5TENkNDdEYjZSR3RoUExGRmQza1AxMmVtNEE3eFg3dUN2WHAv?= =?utf-8?B?U3ZsRzhuaUtuck9HS1FRYVlKVXl0SWNmak1uRTN1Tk1zQ281UjNpbXFkZTM1?= =?utf-8?B?dTA5ejZ5dnppdmxFK3ZhMnZYSURDTXI0Sk56c2JWRDNncnU5Ui91eEprOEp1?= =?utf-8?B?NmZ5RnZ6T21MRlAwZ24wSWx2TisrS2Z2ZmN6Mlh2VGFFYWJKbDU2YkV6N3R3?= =?utf-8?B?MFgzZU14Z05iK0xDbGZoWnE2ZVp3b3BRMTF5eGRGbzNyYWhVbFFyQzQzeVo0?= =?utf-8?B?Y0gyd3pUbzZzOFZOclFJVi9CRFlMQ0N0YWxGU2FyUnNydXB5MW10OGd1Rkdx?= =?utf-8?B?cHNIbldJMjVNOUFuL1Nsa3JObUJqZEZPRTRJQmJHMmt3c0pkK1BydlJQTE5T?= =?utf-8?B?QXhzenQvQ2hxQTJrN0ZRSi9qR1MxUHBsVmo5cHVNRWZPQ29TN1lwcm5aOVRI?= =?utf-8?B?RktOMjVjTXczZDRhL0tEaVg0cFRuY2NiOFRKV2pPeDQ3TkZpWUdiNjZ1QWlq?= =?utf-8?B?bSszNHFFTmNUcHVjc0ZxVmpvZWszeExTMWFSVjVibHZ5aG5QSEx6UTlhSEV5?= =?utf-8?B?U1pIWXlid1NZTHdadU5HZzVuenp5K2ltN25oRER4cDJGb2JzcGV6S2N1M0Yw?= =?utf-8?B?eElidURRSnVuS05wS0wwOUF3Znh3L1phM3Izc2ZjVldYZFgzODlPZlBJclRn?= =?utf-8?B?dnlsWGlIeHZ5K2pJQ3NTcXM3VGpwVi90NUhWSGlLdWFSRmZCRXEzam5uUmN6?= =?utf-8?B?eFkybTZYbTNSbEFtWlFFTzhzaXhBN0VtYmJZVVNmQUdUSHE1L0NsMXBSUE94?= =?utf-8?B?TU9mOFBtY0NZeUYzT2dVYUs2Vmw2dnUvcE1UMjBtLzFHMEhRdE80dE43UWdS?= =?utf-8?B?VVhsRnZidXBzcUp0NkRJYzVIdlBtWElaWnlmUmdMNXE4QUYrd2RRSlRJRlVI?= =?utf-8?B?UkRIZktVdDNUNDhMeExuVm8wV3VTZjk2TnVrTmZFcDlMQ0E1c0xlNGc5TXlU?= =?utf-8?B?YlpoYjB4RHZXK0xaRDV3RUhtVVZFVEJVMHltSHRUbDk2WnY0MU5RQ1o0VG9Q?= =?utf-8?B?VmxWZGVJRjJ4azB4Q0Z5aVoyVmFtNWtaU05ZN3g2TURSMGs5Y2tpOFh6eUp6?= =?utf-8?B?Ly9Yb0VYYk1Ed0RyOHNVZEFRdG5nSFc3WUF5MEhHaWhSeHFQWnlJOGYydkd2?= =?utf-8?B?M1h3UEhoQytwejlDVVZqVEJVQ2lNRURtY21Va2dKR1E3YllLaVJTc29zRGtl?= =?utf-8?B?aWZ6MXpEQzFSMlM1aEp1RkFCWEZnRkhGNzN3Y2laOVN1cGRDcmpWS1NNWDFN?= =?utf-8?B?WWlqQWllODNkWmpDVmxjU1c5TjQxQUFpc2p2SW9RLzVtQjhQOEplZW01dWpK?= =?utf-8?B?WFR3V2pFUHAxd3RSSzAxakVOVUdIWVZsTTNlRVB0ZkRTR05QRXpMNXM4UEVY?= =?utf-8?B?eUZabGdQbXFZdGJRQXBIS2lXTXViODVFYkN1cktkdVdDc0h3M2xqb2RNOGRu?= =?utf-8?B?N0hpdk5hbVZOeFh0c25hanIrWmV1eHZMa2ljY2kvdit3WktvZkIvNXpPVDlU?= =?utf-8?B?aUtWc2I1ZjQvSkIzWERIaFEraSthQS9ncmYya2dMNHg0YzRRV0JtQ3BJQ1E2?= =?utf-8?B?OFJBZWZMMFJOUUhsZ0laU0lrU29xOHNsakFsK1MwUnN1Q3p4cXIwNHh3VEtt?= =?utf-8?Q?AOF8ccubGL/qAgYg0fm9SJk=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee178add-c67f-48c6-3510-08db0ab23843 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB6037.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2023 15:27:56.9473 (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: XaP0Dipcxy/u6XhvL2E5sD6y55ws4Ahy1PJlBQnLBObSrof9QoQSPQ6abfUT7GQbd6rgUTogJs3/A62WNYidFKXXJAaK0YYuUHAL8N230WE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR13MB4586 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..0f9c1af46a77 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] -- 2.39.1