Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/132298/?format=api
{ "id": 132298, "url": "http://patches.dpdk.org/api/patches/132298/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20231004100754.111493-1-selwin.sebastian@amd.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20231004100754.111493-1-selwin.sebastian@amd.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231004100754.111493-1-selwin.sebastian@amd.com", "date": "2023-10-04T10:07:54", "name": "[v3] net/axgbe: use CPUID to identify cpu", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "bac642cc051eda988df6ff0a6b874f88d17d4bd1", "submitter": { "id": 1436, "url": "http://patches.dpdk.org/api/people/1436/?format=api", "name": "Sebastian, Selwin", "email": "selwin.sebastian@amd.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20231004100754.111493-1-selwin.sebastian@amd.com/mbox/", "series": [ { "id": 29731, "url": "http://patches.dpdk.org/api/series/29731/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=29731", "date": "2023-10-04T10:07:54", "name": "[v3] net/axgbe: use CPUID to identify cpu", "version": 3, "mbox": "http://patches.dpdk.org/series/29731/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/132298/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/132298/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 85A644266F;\n\tWed, 4 Oct 2023 12:08:25 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 759134067B;\n\tWed, 4 Oct 2023 12:08:25 +0200 (CEST)", "from NAM11-BN8-obe.outbound.protection.outlook.com\n (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41])\n by mails.dpdk.org (Postfix) with ESMTP id EBAC84027C;\n Wed, 4 Oct 2023 12:08:23 +0200 (CEST)", "from DS7PR07CA0009.namprd07.prod.outlook.com (2603:10b6:5:3af::9) by\n BL1PR12MB5064.namprd12.prod.outlook.com (2603:10b6:208:30a::16) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.21; Wed, 4 Oct\n 2023 10:08:19 +0000", "from CY4PEPF0000E9D8.namprd05.prod.outlook.com\n (2603:10b6:5:3af:cafe::2c) by DS7PR07CA0009.outlook.office365.com\n (2603:10b6:5:3af::9) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.33 via Frontend\n Transport; Wed, 4 Oct 2023 10:08:19 +0000", "from SATLEXMB04.amd.com (165.204.84.17) by\n CY4PEPF0000E9D8.mail.protection.outlook.com (10.167.241.83) with Microsoft\n SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id\n 15.20.6838.14 via Frontend Transport; Wed, 4 Oct 2023 10:08:19 +0000", "from cae-fox.amd.com (10.180.168.240) by SATLEXMB04.amd.com\n (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Wed, 4 Oct\n 2023 05:08:17 -0500" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=JXjkDKp+NWYuAmqxi0qoyAljuYQls+8DWw6e75ZZ/CzqbGcFoMaqUz4YsuuxmcwxM2U2MDBj0k6mwI+dkyqDRT3odyBI0xQ8h08a/mxwdh9yKzFC91pKhV50a61iJX0f9hDCAvcYVoWnucHOzGl1WvQIv2b0Sl2k6FUAmgit0PifP2aLT1Q3ILZAKHd2/y2M3mI5dNE1egJLJU1Sdg6R2xot6VIvReKv6eGODarGIXWnfGjzTGqmkOWdK4FWDRyLJQxT70ogfvEsXul02JYw/weGIxwBp/8yrnZBeRKrRFdJ62IwaHRvaxYFpEEJaJ3npWzETSY4mjbjGmSGlxnjDA==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n 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;\n bh=0yKAYkYzIqQ+OVgu0AHklu/w0tCTqBRGDO5VE4EiQ4M=;\n 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\n 165.204.84.17) smtp.rcpttodomain=dpdk.org smtp.mailfrom=amd.com; dmarc=pass\n (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com;\n dkim=none (message not signed); arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=0yKAYkYzIqQ+OVgu0AHklu/w0tCTqBRGDO5VE4EiQ4M=;\n b=cksfMt5a+D2/K3cc2YBgDmSyTCuoz30hIlL3dMlB+PfJ/gQ61aAvCMISN2/kBOTROFJJnkYeL4fxzkaj2Et6BMLUxwPdKVXKDIzoO3LqYnCnvyi5IUZ+b8NHJw2mUk/vAPeCnn6W8ZFybkkgVIlOX3coVo6IYknhMXgND/tYmwE=", "X-MS-Exchange-Authentication-Results": "spf=pass (sender IP is 165.204.84.17)\n smtp.mailfrom=amd.com; dkim=none (message not signed)\n header.d=none;dmarc=pass action=none header.from=amd.com;", "Received-SPF": "Pass (protection.outlook.com: domain of amd.com designates\n 165.204.84.17 as permitted sender) receiver=protection.outlook.com;\n client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C", "From": "Selwin Sebastian <selwin.sebastian@amd.com>", "To": "<dev@dpdk.org>", "CC": "<Ferruh.Yigit@amd.com>, Selwin Sebastian <selwin.sebastian@amd.com>,\n <stable@dpdk.org>", "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", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Originating-IP": "[10.180.168.240]", "X-ClientProxiedBy": "SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com\n (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": "\n 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:;\n IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE;\n 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);\n 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": "\n 4c5f1dee-b92f-44ed-32ba-08dbc4c1d5bd", "X-MS-Exchange-CrossTenant-Id": "3dd8961f-e488-4e60-8e11-a82d994e183d", "X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp": "\n TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17];\n Helo=[SATLEXMB04.amd.com]", "X-MS-Exchange-CrossTenant-AuthSource": "\n 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 <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Using root complex to identify cpu will not work for vm passthrough.\nCPUID is used to get family and modelid to identify cpu\n\nFixes: b0db927b5eba (\"net/axgbe: use PCI root complex device to distinguish device\")\nCc: stable@dpdk.org\n\nSigned-off-by: Selwin Sebastian <selwin.sebastian@amd.com>\n---\n drivers/net/axgbe/axgbe_ethdev.c | 106 ++++++++++++++++++-------------\n 1 file changed, 63 insertions(+), 43 deletions(-)", "diff": "diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_ethdev.c\nindex 48714eebe6..d08ea4893c 100644\n--- a/drivers/net/axgbe/axgbe_ethdev.c\n+++ b/drivers/net/axgbe/axgbe_ethdev.c\n@@ -12,6 +12,12 @@\n \n #include \"eal_filesystem.h\"\n \n+#ifdef RTE_ARCH_X86\n+#include <cpuid.h>\n+#else\n+#define __cpuid(n, a, b, c, d)\n+#endif\n+\n static int eth_axgbe_dev_init(struct rte_eth_dev *eth_dev);\n static int axgbe_dev_configure(struct rte_eth_dev *dev);\n static int axgbe_dev_start(struct rte_eth_dev *dev);\n@@ -172,9 +178,14 @@ static const struct axgbe_xstats axgbe_xstats_strings[] = {\n \n /* The set of PCI devices this driver supports */\n #define AMD_PCI_VENDOR_ID 0x1022\n-#define AMD_PCI_RV_ROOT_COMPLEX_ID\t0x15d0\n-#define AMD_PCI_YC_ROOT_COMPLEX_ID\t0x14b5\n-#define AMD_PCI_SNOWY_ROOT_COMPLEX_ID\t0x1450\n+\n+#define\tFam17h\t0x17\n+#define\tFam19h\t0x19\n+\n+#define\tCPUID_VENDOR_AuthenticAMD_ebx\t0x68747541\n+#define\tCPUID_VENDOR_AuthenticAMD_ecx\t0x444d4163\n+#define\tCPUID_VENDOR_AuthenticAMD_edx\t0x69746e65\n+\n #define AMD_PCI_AXGBE_DEVICE_V2A 0x1458\n #define AMD_PCI_AXGBE_DEVICE_V2B 0x1459\n \n@@ -2111,29 +2122,6 @@ static void axgbe_default_config(struct axgbe_port *pdata)\n \tpdata->power_down = 0;\n }\n \n-/*\n- * Return PCI root complex device id on success else 0\n- */\n-static uint16_t\n-get_pci_rc_devid(void)\n-{\n-\tchar pci_sysfs[PATH_MAX];\n-\tconst struct rte_pci_addr pci_rc_addr = {0, 0, 0, 0};\n-\tunsigned long device_id;\n-\n-\tsnprintf(pci_sysfs, sizeof(pci_sysfs), \"%s/\" PCI_PRI_FMT \"/device\",\n-\t\t rte_pci_get_sysfs_path(), pci_rc_addr.domain,\n-\t\t pci_rc_addr.bus, pci_rc_addr.devid, pci_rc_addr.function);\n-\n-\t/* get device id */\n-\tif (eal_parse_sysfs_value(pci_sysfs, &device_id) < 0) {\n-\t\tPMD_INIT_LOG(ERR, \"Error in reading PCI sysfs\\n\");\n-\t\treturn 0;\n-\t}\n-\n-\treturn (uint16_t)device_id;\n-}\n-\n /* Used in dev_start by primary process and then\n * in dev_init by secondary process when attaching to an existing ethdev.\n */\n@@ -2186,6 +2174,9 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)\n \tuint32_t len;\n \tint ret;\n \n+\tunsigned int eax = 0, ebx = 0, ecx = 0, edx = 0;\n+\tunsigned char cpu_family = 0, cpu_model = 0;\n+\n \teth_dev->dev_ops = &axgbe_eth_dev_ops;\n \n \teth_dev->rx_descriptor_status = axgbe_dev_rx_descriptor_status;\n@@ -2230,26 +2221,55 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)\n \t\tpdata->vdata = &axgbe_v2b;\n \n \t/*\n-\t * Use PCI root complex device ID to identify the CPU\n+\t * Use CPUID to get Family and model ID to identify the CPU\n \t */\n-\tswitch (get_pci_rc_devid()) {\n-\tcase AMD_PCI_RV_ROOT_COMPLEX_ID:\n-\t\tpdata->xpcs_window_def_reg = PCS_V2_RV_WINDOW_DEF;\n-\t\tpdata->xpcs_window_sel_reg = PCS_V2_RV_WINDOW_SELECT;\n-\t\tbreak;\n-\tcase AMD_PCI_YC_ROOT_COMPLEX_ID:\n-\t\tpdata->xpcs_window_def_reg = PCS_V2_YC_WINDOW_DEF;\n-\t\tpdata->xpcs_window_sel_reg = PCS_V2_YC_WINDOW_SELECT;\n-\t\t/* Yellow Carp devices do not need cdr workaround */\n-\t\tpdata->vdata->an_cdr_workaround = 0;\n+\t__cpuid(0x0, eax, ebx, ecx, edx);\n+\n+\tif (ebx == CPUID_VENDOR_AuthenticAMD_ebx &&\n+\t\tedx == CPUID_VENDOR_AuthenticAMD_edx &&\n+\t\tecx == CPUID_VENDOR_AuthenticAMD_ecx) {\n+\t\tint unknown_cpu = 0;\n+\t\teax = 0, ebx = 0, ecx = 0, edx = 0;\n+\n+\t\t__cpuid(0x1, eax, ebx, ecx, edx);\n+\n+\t\tcpu_family = ((GET_BITS(eax, 8, 4)) + (GET_BITS(eax, 20, 8)));\n+\t\tcpu_model = ((GET_BITS(eax, 4, 4)) | (((GET_BITS(eax, 16, 4)) << 4) & 0xF0));\n+\n+\t\tswitch (cpu_family) {\n+\t\tcase Fam17h:\n+\t\t/* V1000/R1000 */\n+\t\tif (cpu_model >= 0x10 && cpu_model <= 0x1F) {\n+\t\t\tpdata->xpcs_window_def_reg = PCS_V2_RV_WINDOW_DEF;\n+\t\t\tpdata->xpcs_window_sel_reg = PCS_V2_RV_WINDOW_SELECT;\n+\t\t/* EPYC 3000 */\n+\t\t} else if (cpu_model >= 0x01 && cpu_model <= 0x0F) {\n+\t\t\tpdata->xpcs_window_def_reg = PCS_V2_WINDOW_DEF;\n+\t\t\tpdata->xpcs_window_sel_reg = PCS_V2_WINDOW_SELECT;\n+\t\t} else {\n+\t\t\tunknown_cpu = 1;\n+\t\t}\n \t\tbreak;\n-\tcase AMD_PCI_SNOWY_ROOT_COMPLEX_ID:\n-\t\tpdata->xpcs_window_def_reg = PCS_V2_WINDOW_DEF;\n-\t\tpdata->xpcs_window_sel_reg = PCS_V2_WINDOW_SELECT;\n+\t\tcase Fam19h:\n+\t\t/* V3000 (Yellow Carp) */\n+\t\tif (cpu_model >= 0x44 && cpu_model <= 0x47) {\n+\t\t\tpdata->xpcs_window_def_reg = PCS_V2_YC_WINDOW_DEF;\n+\t\t\tpdata->xpcs_window_sel_reg = PCS_V2_YC_WINDOW_SELECT;\n+\n+\t\t\t/* Yellow Carp devices do not need cdr workaround */\n+\t\t\tpdata->vdata->an_cdr_workaround = 0;\n+\t\t} else {\n+\t\t\tunknown_cpu = 1;\n+\t\t}\n \t\tbreak;\n-\tdefault:\n-\t\tPMD_DRV_LOG(ERR, \"No supported devices found\\n\");\n-\t\treturn -ENODEV;\n+\t\tdefault:\n+\t\t\tunknown_cpu = 1;\n+\t\t\tbreak;\n+\t\t}\n+\t\tif (unknown_cpu) {\n+\t\t\tPMD_DRV_LOG(ERR, \"Unknown CPU family, no supported axgbe device found\\n\");\n+\t\t\treturn -ENODEV;\n+\t\t}\n \t}\n \n \t/* Configure the PCS indirect addressing support */\n", "prefixes": [ "v3" ] }