From patchwork Tue Oct 3 11:39:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sebastian, Selwin" X-Patchwork-Id: 132281 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 44DFA426AE; Tue, 3 Oct 2023 13:40:18 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1BA454026C; Tue, 3 Oct 2023 13:40:18 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2045.outbound.protection.outlook.com [40.107.93.45]) by mails.dpdk.org (Postfix) with ESMTP id 737584026B; Tue, 3 Oct 2023 13:40:16 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UkSZNHwcWAizKcAXnU7RLRnD9lq5dY9YQzvY+k+t0dz25m8bgCRnRDc9IkE7CMMsMtlN49hWJ+ziSGeryHp8bOKAi4E9V2mLC2J+jnqBuft17cL+KVmHSsLVxHJlbnGjzsB7H/8XRhOWt6i5FiWCqR15yrhPzQ2C/gKlaGApPbOkMvRMJVTYqktCJM49Q3i79XiJu4o0fLrVqF92tbY6YX8DSVJwci187dIJ4pKwfXECFBE4YYdSDnaS9metnMvGkA2XaybHIREHBirGVwxCN6OgtXwv2EQ1C0RV5DEYG6PURB/TYwi/h6xYHmj8zuX2yCOwd99JIkvbmcYuLJGI7A== 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=JTNLRxzkBQQ3Tf9p19mihL7E6p+o1VGDRBf+sJxGMtU=; b=KXr2PHT3/auVwtl63UaEDuZbPlwavYnthy2mnKgm9RB3K22Io128Il22xk4pLLuQdHLtlwsuYB6wln+5Kt2VFJDt5dTvd9IFlqoKol9KjZ2Patz8yVIwidfvg4OOfya8ACSTddxzCArglN1idR6Va1DXcd4d4t967EDhLyu/c9NE/tKM6Z9YeISwALVmTqbUGDCLubi+OieGAzXEK7HJY4mvICP/EEDyY78MQ8QZ7F+tje0aq0Q0/kO5gNzbUGNm3Alls3D1BmuGz+feT+dTbVmVSP7RhpUiDTEDXObSAG6mlcl1oPyMrYi8aJDSIV0DdtCwN+luMkg4lGpfpJxTrw== 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=JTNLRxzkBQQ3Tf9p19mihL7E6p+o1VGDRBf+sJxGMtU=; b=gSe368wo2eX3//dgrgVzUfz+QNRGAz4bmXz/aApNZYYwyvGTQpKeStuDr+CYPNVFz4JJWrplQfcd4TmIAeHrYLf0b+BF8tiFJR7Ik+masNMiKJhnK1KTCc5aOEAik5geQd1fIdb0ElndOyydOsbEWC+SzjfhEtjIVp2izSez4vs= Received: from CY5PR15CA0192.namprd15.prod.outlook.com (2603:10b6:930:82::18) by MN0PR12MB5906.namprd12.prod.outlook.com (2603:10b6:208:37a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.33; Tue, 3 Oct 2023 11:40:13 +0000 Received: from CY4PEPF0000EDD1.namprd03.prod.outlook.com (2603:10b6:930:82:cafe::fe) by CY5PR15CA0192.outlook.office365.com (2603:10b6:930:82::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.34 via Frontend Transport; Tue, 3 Oct 2023 11:40:13 +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 CY4PEPF0000EDD1.mail.protection.outlook.com (10.167.241.205) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6838.22 via Frontend Transport; Tue, 3 Oct 2023 11:40:13 +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; Tue, 3 Oct 2023 06:40:11 -0500 From: Selwin Sebastian To: CC: , Selwin Sebastian , Subject: [PATCH v2] net/axgbe: use CPUID to identify cpu Date: Tue, 3 Oct 2023 17:09:38 +0530 Message-ID: <20231003113938.42959-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: CY4PEPF0000EDD1:EE_|MN0PR12MB5906:EE_ X-MS-Office365-Filtering-Correlation-Id: a5bba627-0372-405c-cc25-08dbc40581bc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: z5HnGv51iRi6MGpTQuCB8vc+RLVezwO06OYL72kWv7bxZya5eGK4kCriAXu4ugASLv/G9qIUnqY4yvOxTmHlhTfLA8tvqexZKUxzByM4+SrWElzhZp6vKZD6TZ/qbKdU7fCUEB2rLJxSk2tEmyqmJDdP3TYKK2Hl6s7f5l0Dweap/6dJvYIRfwRp6oLc9WHp+nNfV73KxwWvoCyJXOqRnfR+r3BXgF5k3JKqzVLBsaw2PiqhB3ufdZ20AsuqCKgslW5Qt/mf6GnnnWP1MQbsucQr016CKFaDkiG3NrpSp6vBDLvJpOMIuHjRtl41XV0LHtDjPDnw+IqRR+EIN3ppJeA5YkOyzggHW2VJGJdVKu5ZU3A0dpHbs67kSyGwzYxQfE8lLWblIE/L+0+5cx5IrQOqcXvJf/afpEyui8Fydmyi7lbLgXeASOvSu21F58fZjeAfgJE8VGAyvnEP//k9+abRo/r79gnPVBl7+aItFmUCUvrOIjGN90EpbW0lJ8W0T1UzwaRMaG0yfAUDV/hJ/pMAPu22vNJCgM0EqOwHK3ziPa0cw18cL+nOCbxe0xzF2uCq7PkVWsS1WOB63mbWX5gP6Ly3ijCrdhNrVa681cInco/nICLcDG57vCcggJB56up2qk0sVULytJrKzM148l+NhG2SVwfZYiLQRidqu4CI3xz2k9PNBmH49tl1dr64bl0WP4SN7n+ugUDsjaAJeQGzkkC3IciLXdvJ1E703ZH68hhQElyuPYXlMn3NoB2tEBOGw8sW5tFCcgwXN1EK2A== 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)(346002)(376002)(396003)(136003)(39860400002)(230922051799003)(82310400011)(64100799003)(451199024)(1800799009)(186009)(36840700001)(46966006)(40470700004)(478600001)(40460700003)(36756003)(6666004)(7696005)(41300700001)(6916009)(316002)(450100002)(8676002)(4326008)(8936002)(44832011)(54906003)(70206006)(70586007)(5660300002)(40480700001)(86362001)(47076005)(426003)(336012)(83380400001)(36860700001)(356005)(1076003)(2906002)(81166007)(2616005)(82740400003)(16526019)(26005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2023 11:40:13.2477 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a5bba627-0372-405c-cc25-08dbc40581bc 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: CY4PEPF0000EDD1.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5906 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 --- 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..4fdb0ae168 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 */