[v3] net/axgbe: use CPUID to identify cpu
Checks
Commit Message
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 <selwin.sebastian@amd.com>
---
drivers/net/axgbe/axgbe_ethdev.c | 106 ++++++++++++++++++-------------
1 file changed, 63 insertions(+), 43 deletions(-)
Comments
On 10/4/2023 11:07 AM, Selwin Sebastian wrote:
> 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 <selwin.sebastian@amd.com>
>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
Applied to dpdk-next-net/main, thanks.
Progressing with this patch for now, to not block the functionality, but
when cpuid abstraction by David [1] is matured, can you please support
porting this patch to new API?
[1]
[Introduce x86 specific identification
API](https://patchwork.dpdk.org/project/dpdk/list/?series=29605)
[AMD Official Use Only - General]
Hi Ferruh,
Thank you. Yes, once David's patch is accepted, I will make changes to use new API.
Regards
Selwin
-----Original Message-----
From: Yigit, Ferruh <Ferruh.Yigit@amd.com>
Sent: Tuesday, October 10, 2023 6:24 PM
To: Sebastian, Selwin <Selwin.Sebastian@amd.com>; dev@dpdk.org
Cc: stable@dpdk.org; David Marchand <david.marchand@redhat.com>
Subject: Re: [PATCH v3] net/axgbe: use CPUID to identify cpu
On 10/4/2023 11:07 AM, Selwin Sebastian wrote:
> 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 <selwin.sebastian@amd.com>
>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
Applied to dpdk-next-net/main, thanks.
Progressing with this patch for now, to not block the functionality, but when cpuid abstraction by David [1] is matured, can you please support porting this patch to new API?
[1]
[Introduce x86 specific identification
API](https://patchwork.dpdk.org/project/dpdk/list/?series=29605)
@@ -12,6 +12,12 @@
#include "eal_filesystem.h"
+#ifdef RTE_ARCH_X86
+#include <cpuid.h>
+#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 */