From patchwork Wed Oct 4 10:07:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sebastian, Selwin" X-Patchwork-Id: 132298 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 85A644266F; Wed, 4 Oct 2023 12:08:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 759134067B; Wed, 4 Oct 2023 12:08:25 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by mails.dpdk.org (Postfix) with ESMTP id EBAC84027C; Wed, 4 Oct 2023 12:08:23 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JXjkDKp+NWYuAmqxi0qoyAljuYQls+8DWw6e75ZZ/CzqbGcFoMaqUz4YsuuxmcwxM2U2MDBj0k6mwI+dkyqDRT3odyBI0xQ8h08a/mxwdh9yKzFC91pKhV50a61iJX0f9hDCAvcYVoWnucHOzGl1WvQIv2b0Sl2k6FUAmgit0PifP2aLT1Q3ILZAKHd2/y2M3mI5dNE1egJLJU1Sdg6R2xot6VIvReKv6eGODarGIXWnfGjzTGqmkOWdK4FWDRyLJQxT70ogfvEsXul02JYw/weGIxwBp/8yrnZBeRKrRFdJ62IwaHRvaxYFpEEJaJ3npWzETSY4mjbjGmSGlxnjDA== 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=0yKAYkYzIqQ+OVgu0AHklu/w0tCTqBRGDO5VE4EiQ4M=; b=XdfvfmlxL1znL5J0ME2hKTZXF/9T+ptA8PEavMLfui4ZIiOYqUi0dduf4pFgnKWcOanuuwS5cM730AXGXHK2TRnWiR0KrOdAVJWCErCgbh/7G9ulDbQ3JmvWIUmRwxuLZCJR1ioaaubCO7BLw/R+l6SCMlOCpoCgJG22sC0WMarxn6fCO6zNANyHKqsZbyD98FehXumpL5KuUiF0vBX36l83o6/2T6kN8XHaXOOGaVePiy9FkCMCdux7O9ORR+h4D7La5lcCBySyp/GOAc+WugtjikcPzuXHFDHJKldqSfk52SuKMMljv9KSaOeIXa8O0xpqWc+UXbibiZHikRcdcg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=dpdk.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0yKAYkYzIqQ+OVgu0AHklu/w0tCTqBRGDO5VE4EiQ4M=; b=cksfMt5a+D2/K3cc2YBgDmSyTCuoz30hIlL3dMlB+PfJ/gQ61aAvCMISN2/kBOTROFJJnkYeL4fxzkaj2Et6BMLUxwPdKVXKDIzoO3LqYnCnvyi5IUZ+b8NHJw2mUk/vAPeCnn6W8ZFybkkgVIlOX3coVo6IYknhMXgND/tYmwE= Received: from DS7PR07CA0009.namprd07.prod.outlook.com (2603:10b6:5:3af::9) by BL1PR12MB5064.namprd12.prod.outlook.com (2603:10b6:208:30a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.21; Wed, 4 Oct 2023 10:08:19 +0000 Received: from CY4PEPF0000E9D8.namprd05.prod.outlook.com (2603:10b6:5:3af:cafe::2c) by DS7PR07CA0009.outlook.office365.com (2603:10b6:5:3af::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.33 via Frontend Transport; Wed, 4 Oct 2023 10:08:19 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CY4PEPF0000E9D8.mail.protection.outlook.com (10.167.241.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6838.14 via Frontend Transport; Wed, 4 Oct 2023 10:08:19 +0000 Received: from cae-fox.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Wed, 4 Oct 2023 05:08:17 -0500 From: Selwin Sebastian To: CC: , Selwin Sebastian , Subject: [PATCH v3] net/axgbe: use CPUID to identify cpu Date: Wed, 4 Oct 2023 15:37:54 +0530 Message-ID: <20231004100754.111493-1-selwin.sebastian@amd.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000E9D8:EE_|BL1PR12MB5064:EE_ X-MS-Office365-Filtering-Correlation-Id: 4c5f1dee-b92f-44ed-32ba-08dbc4c1d5bd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iCyCuguPKANQhwLvoM1pgTH+sIU2rGEsMlZchTnz8DQLVTKOIPsWrENuaFFC1259Mn+ltntUiPmoh3UQzQNR7c0s+zMTfxFNGL93UuWMST9XvYGGkiQQ6NGoXLiFIxS4oVQ3SXj/3vVmnlVwpFW2MavtTY6vbceGv4pHGM1nvMPBhHuhSsC9eqdrD5Lm99jXaNhhfo7WtZ+5sd7aBJaT/vqiak4rO+y6rD0cKp9/3/XFmEf9iqIKajJaIrzByZxqrB+dK6lRjfW3LogeiiF3ZYPTavnkXha4NLIch4kZbM3Ifx546aaOaeU3qkkpQUSETtRbaHR3/sLr0pPCkA699WyIUaO60TdWaxNjDHI0A1wK+mmF2DkpE+Ns2ondxyRWs0yyP3R+cciP57JjaSZp7oED+RA3UANmVs/wL7QQMrxco5Yslz97Ubaav/Sjwkz1Ued2DCos16AEbhAmUvYtVhUHH/ZuEn4o/xnG20jWz+A06WFQfFtb+TBvQzv/CNgFAlr8xDBE9YwD4gwV9VtUsskfj6xXbUzYI2QOjadulTy+K+V3b9zBjE5BRi0vmOD3XFQBL05tEv6qyTWVNMEGqqEqf4QuRj1oGHhW0t1OEKikt4tjEcDBqE+H7wYNAPFd6gt+e+NdTtxSoV1UruQuM4HlMaljUgYooCNb3hPlofl4lprPaQ/U/Zfgr/gs4GtijYTk0nVxjjXhQQhz6mWKS7KTP2+EWM/MRK/0yMDmqh+wxRMlyk2cIukM+PxH91ROjVQL9KODKg45fO0Mu6qsog== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(4636009)(376002)(346002)(396003)(39860400002)(136003)(230922051799003)(186009)(1800799009)(82310400011)(64100799003)(451199024)(36840700001)(40470700004)(46966006)(478600001)(7696005)(6666004)(47076005)(83380400001)(26005)(336012)(426003)(1076003)(2616005)(16526019)(2906002)(6916009)(316002)(54906003)(70206006)(70586007)(8676002)(8936002)(4326008)(41300700001)(5660300002)(44832011)(450100002)(36756003)(36860700001)(82740400003)(86362001)(356005)(81166007)(40480700001)(40460700003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2023 10:08:19.5640 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4c5f1dee-b92f-44ed-32ba-08dbc4c1d5bd X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000E9D8.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5064 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 Using root complex to identify cpu will not work for vm passthrough. CPUID is used to get family and modelid to identify cpu Fixes: b0db927b5eba ("net/axgbe: use PCI root complex device to distinguish device") Cc: stable@dpdk.org Signed-off-by: Selwin Sebastian Acked-by: Ferruh Yigit Acked-by: Ferruh Yigit --- drivers/net/axgbe/axgbe_ethdev.c | 106 ++++++++++++++++++------------- 1 file changed, 63 insertions(+), 43 deletions(-) diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_ethdev.c index 48714eebe6..d08ea4893c 100644 --- a/drivers/net/axgbe/axgbe_ethdev.c +++ b/drivers/net/axgbe/axgbe_ethdev.c @@ -12,6 +12,12 @@ #include "eal_filesystem.h" +#ifdef RTE_ARCH_X86 +#include +#else +#define __cpuid(n, a, b, c, d) +#endif + static int eth_axgbe_dev_init(struct rte_eth_dev *eth_dev); static int axgbe_dev_configure(struct rte_eth_dev *dev); static int axgbe_dev_start(struct rte_eth_dev *dev); @@ -172,9 +178,14 @@ static const struct axgbe_xstats axgbe_xstats_strings[] = { /* The set of PCI devices this driver supports */ #define AMD_PCI_VENDOR_ID 0x1022 -#define AMD_PCI_RV_ROOT_COMPLEX_ID 0x15d0 -#define AMD_PCI_YC_ROOT_COMPLEX_ID 0x14b5 -#define AMD_PCI_SNOWY_ROOT_COMPLEX_ID 0x1450 + +#define Fam17h 0x17 +#define Fam19h 0x19 + +#define CPUID_VENDOR_AuthenticAMD_ebx 0x68747541 +#define CPUID_VENDOR_AuthenticAMD_ecx 0x444d4163 +#define CPUID_VENDOR_AuthenticAMD_edx 0x69746e65 + #define AMD_PCI_AXGBE_DEVICE_V2A 0x1458 #define AMD_PCI_AXGBE_DEVICE_V2B 0x1459 @@ -2111,29 +2122,6 @@ static void axgbe_default_config(struct axgbe_port *pdata) pdata->power_down = 0; } -/* - * Return PCI root complex device id on success else 0 - */ -static uint16_t -get_pci_rc_devid(void) -{ - char pci_sysfs[PATH_MAX]; - const struct rte_pci_addr pci_rc_addr = {0, 0, 0, 0}; - unsigned long device_id; - - snprintf(pci_sysfs, sizeof(pci_sysfs), "%s/" PCI_PRI_FMT "/device", - rte_pci_get_sysfs_path(), pci_rc_addr.domain, - pci_rc_addr.bus, pci_rc_addr.devid, pci_rc_addr.function); - - /* get device id */ - if (eal_parse_sysfs_value(pci_sysfs, &device_id) < 0) { - PMD_INIT_LOG(ERR, "Error in reading PCI sysfs\n"); - return 0; - } - - return (uint16_t)device_id; -} - /* Used in dev_start by primary process and then * in dev_init by secondary process when attaching to an existing ethdev. */ @@ -2186,6 +2174,9 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev) uint32_t len; int ret; + unsigned int eax = 0, ebx = 0, ecx = 0, edx = 0; + unsigned char cpu_family = 0, cpu_model = 0; + eth_dev->dev_ops = &axgbe_eth_dev_ops; eth_dev->rx_descriptor_status = axgbe_dev_rx_descriptor_status; @@ -2230,26 +2221,55 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev) pdata->vdata = &axgbe_v2b; /* - * Use PCI root complex device ID to identify the CPU + * Use CPUID to get Family and model ID to identify the CPU */ - switch (get_pci_rc_devid()) { - case AMD_PCI_RV_ROOT_COMPLEX_ID: - pdata->xpcs_window_def_reg = PCS_V2_RV_WINDOW_DEF; - pdata->xpcs_window_sel_reg = PCS_V2_RV_WINDOW_SELECT; - break; - case AMD_PCI_YC_ROOT_COMPLEX_ID: - pdata->xpcs_window_def_reg = PCS_V2_YC_WINDOW_DEF; - pdata->xpcs_window_sel_reg = PCS_V2_YC_WINDOW_SELECT; - /* Yellow Carp devices do not need cdr workaround */ - pdata->vdata->an_cdr_workaround = 0; + __cpuid(0x0, eax, ebx, ecx, edx); + + if (ebx == CPUID_VENDOR_AuthenticAMD_ebx && + edx == CPUID_VENDOR_AuthenticAMD_edx && + ecx == CPUID_VENDOR_AuthenticAMD_ecx) { + int unknown_cpu = 0; + eax = 0, ebx = 0, ecx = 0, edx = 0; + + __cpuid(0x1, eax, ebx, ecx, edx); + + cpu_family = ((GET_BITS(eax, 8, 4)) + (GET_BITS(eax, 20, 8))); + cpu_model = ((GET_BITS(eax, 4, 4)) | (((GET_BITS(eax, 16, 4)) << 4) & 0xF0)); + + switch (cpu_family) { + case Fam17h: + /* V1000/R1000 */ + if (cpu_model >= 0x10 && cpu_model <= 0x1F) { + pdata->xpcs_window_def_reg = PCS_V2_RV_WINDOW_DEF; + pdata->xpcs_window_sel_reg = PCS_V2_RV_WINDOW_SELECT; + /* EPYC 3000 */ + } else if (cpu_model >= 0x01 && cpu_model <= 0x0F) { + pdata->xpcs_window_def_reg = PCS_V2_WINDOW_DEF; + pdata->xpcs_window_sel_reg = PCS_V2_WINDOW_SELECT; + } else { + unknown_cpu = 1; + } break; - case AMD_PCI_SNOWY_ROOT_COMPLEX_ID: - pdata->xpcs_window_def_reg = PCS_V2_WINDOW_DEF; - pdata->xpcs_window_sel_reg = PCS_V2_WINDOW_SELECT; + case Fam19h: + /* V3000 (Yellow Carp) */ + if (cpu_model >= 0x44 && cpu_model <= 0x47) { + pdata->xpcs_window_def_reg = PCS_V2_YC_WINDOW_DEF; + pdata->xpcs_window_sel_reg = PCS_V2_YC_WINDOW_SELECT; + + /* Yellow Carp devices do not need cdr workaround */ + pdata->vdata->an_cdr_workaround = 0; + } else { + unknown_cpu = 1; + } break; - default: - PMD_DRV_LOG(ERR, "No supported devices found\n"); - return -ENODEV; + default: + unknown_cpu = 1; + break; + } + if (unknown_cpu) { + PMD_DRV_LOG(ERR, "Unknown CPU family, no supported axgbe device found\n"); + return -ENODEV; + } } /* Configure the PCS indirect addressing support */