Skip to contentSkip to conversation

net/axgbe: Add support for Yellow Carp ethernet

PATCH In review [email protected] 4 participants 10 messages Jan 31, 2022 – Feb 3, 2022 Network drivers

lore
Share & tools
lore
#0 lore raw

cover net/axgbe: Add support for Yellow Carp ethernet

From: Selwin Sebastian <[email protected]>

Adding support for Yellow Carp ethernet device

Selwin Sebastian (2):
net/axgbe: add support for Yellow Carp ethernet device net/axgbe: disable the CDR wa for Yellow Carp devices

 drivers/net/axgbe/axgbe_common.h |  2 ++
 drivers/net/axgbe/axgbe_ethdev.c | 36 ++++++++++++++++++++++----------
 2 files changed, 27 insertions(+), 11 deletions(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/2 net/axgbe: add support for Yellow Carp ethernet device

From: Selwin Sebastian <[email protected]>

Yellow Carp ethernet devices (V3xxx) use the existing PCI ID but the window settings for the indirect PCS access have been altered. Add the check for Yellow Carp Ethernet devices to use the new register values.

---
 drivers/net/axgbe/axgbe_common.h |  2 ++
 drivers/net/axgbe/axgbe_ethdev.c | 34 +++++++++++++++++++++-----------
 2 files changed, 25 insertions(+), 11 deletions(-)
drivers/net/axgbe/axgbe_common.h +2 -0
index 5310ac54f5..b9ebf64fb8 100644
@@ -901,6 +901,8 @@
 #define PCS_V2_WINDOW_SELECT		0x9064
 #define PCS_V2_RV_WINDOW_DEF		0x1060
 #define PCS_V2_RV_WINDOW_SELECT		0x1064
+#define PCS_V2_YC_WINDOW_DEF		0x18060
+#define PCS_V2_YC_WINDOW_SELECT		0x18064
 
 /* PCS register entry bit positions and sizes */
 #define PCS_V2_WINDOW_DEF_OFFSET_INDEX	6
drivers/net/axgbe/axgbe_ethdev.c +23 -11
index e9546469f3..2be9387f98 100644
@@ -173,6 +173,8 @@ 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 AMD_PCI_AXGBE_DEVICE_V2A 0x1458
 #define AMD_PCI_AXGBE_DEVICE_V2B 0x1459
 
@@ -2178,17 +2180,6 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
 	pci_dev = RTE_DEV_TO_PCI(eth_dev->device);
 	pdata->pci_dev = pci_dev;
 
-	/*
-	 * Use root complex device ID to differentiate RV AXGBE vs SNOWY AXGBE
-	 */
-	if ((get_pci_rc_devid()) == 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;
-	} else {
-		pdata->xpcs_window_def_reg = PCS_V2_WINDOW_DEF;
-		pdata->xpcs_window_sel_reg = PCS_V2_WINDOW_SELECT;
-	}
-
 	pdata->xgmac_regs =
 		(void *)pci_dev->mem_resource[AXGBE_AXGMAC_BAR].addr;
 	pdata->xprop_regs = (void *)((uint8_t *)pdata->xgmac_regs
@@ -2203,6 +2194,27 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
 	else
 		pdata->vdata = &axgbe_v2b;
 
+	/*
+	 * Use PCI root complex device 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;
+		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;
+		break;
+	default:
+		PMD_DRV_LOG(ERR, "No supported devices found\n");
+		return -ENODEV;
+	}
+
 	/* Configure the PCS indirect addressing support */
 	reg = XPCS32_IOREAD(pdata, pdata->xpcs_window_def_reg);
 	pdata->xpcs_window = XPCS_GET_BITS(reg, PCS_V2_WINDOW_DEF, OFFSET);
Signature · 1 line
2.25.1
Acked-by on v1 1/2
#2 lore raw

RE: [PATCH v1 1/2] net/axgbe: add support for Yellow Carp ethernet device

[Public]

-----Original Message-----
From: Sebastian, Selwin <[email protected]>
Sent: Monday, January 31, 2022 11:09 AM
To: [email protected]
Cc: Namburu, Chandu-babu <[email protected]>; [email protected]
Subject: [PATCH v1 1/2] net/axgbe: add support for Yellow Carp ethernet device

From: Selwin Sebastian <[email protected]>

Yellow Carp ethernet devices (V3xxx) use the existing PCI ID but the window settings for the indirect PCS access have been altered. Add the check for Yellow Carp Ethernet devices to use the new register values.

---
 drivers/net/axgbe/axgbe_common.h |  2 ++  drivers/net/axgbe/axgbe_ethdev.c | 34 +++++++++++++++++++++-----------
 2 files changed, 25 insertions(+), 11 deletions(-)
drivers/net/axgbe/axgbe_common.h +2 -0
index 5310ac54f5..b9ebf64fb8 100644
@@ -901,6 +901,8 @@
 #define PCS_V2_WINDOW_SELECT		0x9064
 #define PCS_V2_RV_WINDOW_DEF		0x1060
 #define PCS_V2_RV_WINDOW_SELECT		0x1064
+#define PCS_V2_YC_WINDOW_DEF		0x18060
+#define PCS_V2_YC_WINDOW_SELECT		0x18064
 
 /* PCS register entry bit positions and sizes */
 #define PCS_V2_WINDOW_DEF_OFFSET_INDEX	6
drivers/net/axgbe/axgbe_ethdev.c +2 -11
index e9546469f3..2be9387f98 100644
@@ -173,6 +173,8 @@ 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 AMD_PCI_AXGBE_DEVICE_V2A 0x1458  #define AMD_PCI_AXGBE_DEVICE_V2B 0x1459
 
@@ -2178,17 +2180,6 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
 	pci_dev = RTE_DEV_TO_PCI(eth_dev->device);
 	pdata->pci_dev = pci_dev;
 
-	/*
-	 * Use root complex device ID to differentiate RV AXGBE vs SNOWY AXGBE
-	 */
-	if ((get_pci_rc_devid()) == 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;
-	} else {
-		pdata->xpcs_window_def_reg = PCS_V2_WINDOW_DEF;
-		pdata->xpcs_window_sel_reg = PCS_V2_WINDOW_SELECT;
-	}
-
 	pdata->xgmac_regs =
 		(void *)pci_dev->mem_resource[AXGBE_AXGMAC_BAR].addr;
 	pdata->xprop_regs = (void *)((uint8_t *)pdata->xgmac_regs @@ -2203,6 +2194,27 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)

else
pdata->vdata = &axgbe_v2b;

+ /*
+ * Use PCI root complex device 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;
+ 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;
+ break;
+ default:
+ PMD_DRV_LOG(ERR, "No supported devices found\n");
+ return -ENODEV;
+ }
+
/* Configure the PCS indirect addressing support */
reg = XPCS32_IOREAD(pdata, pdata->xpcs_window_def_reg); pdata->xpcs_window = XPCS_GET_BITS(reg, PCS_V2_WINDOW_DEF, OFFSET);
--
2.25.1

For series,

#3 lore raw

Re: [PATCH v1 1/2] net/axgbe: add support for Yellow Carp ethernet device

Quoted 16 lines · Chandu-babu

[Public]

-----Original Message-----
From: Sebastian, Selwin <[email protected]>
Sent: Monday, January 31, 2022 11:09 AM
To: [email protected]
Cc: Namburu, Chandu-babu <[email protected]>; [email protected]
Subject: [PATCH v1 1/2] net/axgbe: add support for Yellow Carp ethernet device

From: Selwin Sebastian <[email protected]>

Yellow Carp ethernet devices (V3xxx) use the existing PCI ID but the window settings for the indirect PCS access have been altered. Add the check for Yellow Carp Ethernet devices to use the new register values.

<...>

Quoted 3 lines

For series,

Series applied to dpdk-next-net/main, thanks.

#4 lore raw

Re: [PATCH v1 1/2] net/axgbe: add support for Yellow Carp ethernet device

In reply to [email protected]
Quoted 4 lines · On 1/31/2022 5:39 AM, [email protected] wrote:

From: Selwin Sebastian <[email protected]>

Yellow Carp ethernet devices (V3xxx) use the existing PCI ID but the window settings for the indirect PCS access have been

Can you please explain (again) what is happening here?

Was is same IP used in multiple CPUs with same PCI id but slightly different configuration, and you are trying to detect the device by checking root complex device PCI ID?
If so why the device name (Yellow Carp) is different, or is it the name of the CPU?

Quoted 81 lines

altered. Add the check for Yellow Carp Ethernet devices to use the new register values.

---
  drivers/net/axgbe/axgbe_common.h |  2 ++
  drivers/net/axgbe/axgbe_ethdev.c | 34 +++++++++++++++++++++-----------
  2 files changed, 25 insertions(+), 11 deletions(-)
drivers/net/axgbe/axgbe_common.h +2 -0
index 5310ac54f5..b9ebf64fb8 100644
@@ -901,6 +901,8 @@
  #define PCS_V2_WINDOW_SELECT		0x9064
  #define PCS_V2_RV_WINDOW_DEF		0x1060
  #define PCS_V2_RV_WINDOW_SELECT		0x1064
+#define PCS_V2_YC_WINDOW_DEF		0x18060
+#define PCS_V2_YC_WINDOW_SELECT		0x18064
 
  /* PCS register entry bit positions and sizes */
  #define PCS_V2_WINDOW_DEF_OFFSET_INDEX	6
drivers/net/axgbe/axgbe_ethdev.c +23 -11
index e9546469f3..2be9387f98 100644
@@ -173,6 +173,8 @@ 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 AMD_PCI_AXGBE_DEVICE_V2A 0x1458
  #define AMD_PCI_AXGBE_DEVICE_V2B 0x1459
 
@@ -2178,17 +2180,6 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
  	pci_dev = RTE_DEV_TO_PCI(eth_dev->device);
  	pdata->pci_dev = pci_dev;
 
-	/*
-	 * Use root complex device ID to differentiate RV AXGBE vs SNOWY AXGBE
-	 */
-	if ((get_pci_rc_devid()) == 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;
-	} else {
-		pdata->xpcs_window_def_reg = PCS_V2_WINDOW_DEF;
-		pdata->xpcs_window_sel_reg = PCS_V2_WINDOW_SELECT;
-	}
-
  	pdata->xgmac_regs =
  		(void *)pci_dev->mem_resource[AXGBE_AXGMAC_BAR].addr;
  	pdata->xprop_regs = (void *)((uint8_t *)pdata->xgmac_regs
@@ -2203,6 +2194,27 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
  	else
  		pdata->vdata = &axgbe_v2b;
 
+	/*
+	 * Use PCI root complex device 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;
+		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;
+		break;
+	default:
+		PMD_DRV_LOG(ERR, "No supported devices found\n");
+		return -ENODEV;
+	}
+
  	/* Configure the PCS indirect addressing support */
  	reg = XPCS32_IOREAD(pdata, pdata->xpcs_window_def_reg);
  	pdata->xpcs_window = XPCS_GET_BITS(reg, PCS_V2_WINDOW_DEF, OFFSET);
#5 lore raw

RE: [PATCH v1 1/2] net/axgbe: add support for Yellow Carp ethernet device

[AMD Official Use Only]

Hi Ferruh,
Yellow Carp is the name of the new V3xxx series CPU with same ethernet IP and same PCI id as older generation CPUs. We are using root complex device PCI ID to differentiate the CPUs so that right window settings can be applied.

Thanks and Regards
Selwin Sebastian

-----Original Message-----
From: Ferruh Yigit <[email protected]>
Sent: Tuesday, February 1, 2022 7:56 PM
To: Sebastian, Selwin <[email protected]>; [email protected]
Cc: Namburu, Chandu-babu <[email protected]>
Subject: Re: [PATCH v1 1/2] net/axgbe: add support for Yellow Carp ethernet device

[CAUTION: External Email]

Quoted 4 lines · On 1/31/2022 5:39 AM, [email protected] wrote:

From: Selwin Sebastian <[email protected]>

Yellow Carp ethernet devices (V3xxx) use the existing PCI ID but the window settings for the indirect PCS access have been

Can you please explain (again) what is happening here?

Was is same IP used in multiple CPUs with same PCI id but slightly different configuration, and you are trying to detect the device by checking root complex device PCI ID? If so why the device name (Yellow Carp) is different, or is it the name of the CPU?

Quoted 84 lines

altered. Add the check for Yellow Carp Ethernet devices to use the new register values.

---
  drivers/net/axgbe/axgbe_common.h |  2 ++
  drivers/net/axgbe/axgbe_ethdev.c | 34 +++++++++++++++++++++-----------
  2 files changed, 25 insertions(+), 11 deletions(-)
drivers/net/axgbe/axgbe_common.h +2 -0
index 5310ac54f5..b9ebf64fb8 100644
@@ -901,6 +901,8 @@
  #define PCS_V2_WINDOW_SELECT                0x9064
  #define PCS_V2_RV_WINDOW_DEF                0x1060
  #define PCS_V2_RV_WINDOW_SELECT             0x1064
+#define PCS_V2_YC_WINDOW_DEF         0x18060
+#define PCS_V2_YC_WINDOW_SELECT              0x18064
 
  /* PCS register entry bit positions and sizes */
  #define PCS_V2_WINDOW_DEF_OFFSET_INDEX      6
drivers/net/axgbe/axgbe_ethdev.c +23 -12
index e9546469f3..2be9387f98 100644
@@ -173,6 +173,8 @@ 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 AMD_PCI_AXGBE_DEVICE_V2A 0x1458
  #define AMD_PCI_AXGBE_DEVICE_V2B 0x1459
 
@@ -2178,17 +2180,6 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
      pci_dev = RTE_DEV_TO_PCI(eth_dev->device);
      pdata->pci_dev = pci_dev;
 
-     /*
-      * Use root complex device ID to differentiate RV AXGBE vs SNOWY AXGBE
-      */
-     if ((get_pci_rc_devid()) == 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;
-     } else {
-             pdata->xpcs_window_def_reg = PCS_V2_WINDOW_DEF;
-             pdata->xpcs_window_sel_reg = PCS_V2_WINDOW_SELECT;
-     }
-
      pdata->xgmac_regs =
              (void *)pci_dev->mem_resource[AXGBE_AXGMAC_BAR].addr;
      pdata->xprop_regs = (void *)((uint8_t *)pdata->xgmac_regs @@
-2203,6 +2194,27 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
      else
              pdata->vdata = &axgbe_v2b;
 
+     /*
+      * Use PCI root complex device 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;
+             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;
+             break;
+     default:
+             PMD_DRV_LOG(ERR, "No supported devices found\n");
+             return -ENODEV;
+     }
+
      /* Configure the PCS indirect addressing support */
      reg = XPCS32_IOREAD(pdata, pdata->xpcs_window_def_reg);
      pdata->xpcs_window = XPCS_GET_BITS(reg, PCS_V2_WINDOW_DEF,

OFFSET);

#6 lore raw

Re: [PATCH v1 1/2] net/axgbe: add support for Yellow Carp ethernet device

Quoted 5 lines · Selwin

[AMD Official Use Only]

Hi Ferruh,
Yellow Carp is the name of the new V3xxx series CPU with same ethernet IP and same PCI id as older generation CPUs. We are using root complex device PCI ID to differentiate the CPUs so that right window settings can be applied.

It must be difficult to manage, how is it handled in Linux Kernel, same way (root complex)?

And what do you think about proving link/documentation for new device? (The question asked on cover letter.)

Quoted 109 lines

Thanks and Regards
Selwin Sebastian

-----Original Message-----
From: Ferruh Yigit <[email protected]>
Sent: Tuesday, February 1, 2022 7:56 PM
To: Sebastian, Selwin <[email protected]>; [email protected]
Cc: Namburu, Chandu-babu <[email protected]>
Subject: Re: [PATCH v1 1/2] net/axgbe: add support for Yellow Carp ethernet device

[CAUTION: External Email]

Quoted 4 lines · On 1/31/2022 5:39 AM, [email protected] wrote:

From: Selwin Sebastian <[email protected]>

Yellow Carp ethernet devices (V3xxx) use the existing PCI ID but the window settings for the indirect PCS access have been

Can you please explain (again) what is happening here?

Was is same IP used in multiple CPUs with same PCI id but slightly different configuration, and you are trying to detect the device by checking root complex device PCI ID? If so why the device name (Yellow Carp) is different, or is it the name of the CPU?

Quoted 84 lines

altered. Add the check for Yellow Carp Ethernet devices to use the new register values.

---
   drivers/net/axgbe/axgbe_common.h |  2 ++
   drivers/net/axgbe/axgbe_ethdev.c | 34 +++++++++++++++++++++-----------
   2 files changed, 25 insertions(+), 11 deletions(-)
drivers/net/axgbe/axgbe_common.h +2 -0
index 5310ac54f5..b9ebf64fb8 100644
@@ -901,6 +901,8 @@
   #define PCS_V2_WINDOW_SELECT                0x9064
   #define PCS_V2_RV_WINDOW_DEF                0x1060
   #define PCS_V2_RV_WINDOW_SELECT             0x1064
+#define PCS_V2_YC_WINDOW_DEF         0x18060
+#define PCS_V2_YC_WINDOW_SELECT              0x18064
 
   /* PCS register entry bit positions and sizes */
   #define PCS_V2_WINDOW_DEF_OFFSET_INDEX      6
drivers/net/axgbe/axgbe_ethdev.c +23 -12
index e9546469f3..2be9387f98 100644
@@ -173,6 +173,8 @@ 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 AMD_PCI_AXGBE_DEVICE_V2A 0x1458
   #define AMD_PCI_AXGBE_DEVICE_V2B 0x1459
 
@@ -2178,17 +2180,6 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
       pci_dev = RTE_DEV_TO_PCI(eth_dev->device);
       pdata->pci_dev = pci_dev;
 
-     /*
-      * Use root complex device ID to differentiate RV AXGBE vs SNOWY AXGBE
-      */
-     if ((get_pci_rc_devid()) == 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;
-     } else {
-             pdata->xpcs_window_def_reg = PCS_V2_WINDOW_DEF;
-             pdata->xpcs_window_sel_reg = PCS_V2_WINDOW_SELECT;
-     }
-
       pdata->xgmac_regs =
               (void *)pci_dev->mem_resource[AXGBE_AXGMAC_BAR].addr;
       pdata->xprop_regs = (void *)((uint8_t *)pdata->xgmac_regs @@
-2203,6 +2194,27 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
       else
               pdata->vdata = &axgbe_v2b;
 
+     /*
+      * Use PCI root complex device 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;
+             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;
+             break;
+     default:
+             PMD_DRV_LOG(ERR, "No supported devices found\n");
+             return -ENODEV;
+     }
+
       /* Configure the PCS indirect addressing support */
       reg = XPCS32_IOREAD(pdata, pdata->xpcs_window_def_reg);
       pdata->xpcs_window = XPCS_GET_BITS(reg, PCS_V2_WINDOW_DEF,

OFFSET);

#7 lore raw

RE: [PATCH v1 1/2] net/axgbe: add support for Yellow Carp ethernet device

[AMD Official Use Only]

Hi Ferruh,
Linux kernel also handles it the same way using root complex ID (https://lore.kernel.org/netdev/[email protected]/T/)
Documentation on v3xxx CPU is not yet available in public domain.

Thanks and Regards
Selwin Sebastian

-----Original Message-----
From: Ferruh Yigit <[email protected]>
Sent: Wednesday, February 2, 2022 4:23 PM
To: Sebastian, Selwin <[email protected]>; [email protected]
Cc: Namburu, Chandu-babu <[email protected]>
Subject: Re: [PATCH v1 1/2] net/axgbe: add support for Yellow Carp ethernet device

[CAUTION: External Email]

Quoted 5 lines · Selwin

[AMD Official Use Only]

Hi Ferruh,
Yellow Carp is the name of the new V3xxx series CPU with same ethernet IP and same PCI id as older generation CPUs. We are using root complex device PCI ID to differentiate the CPUs so that right window settings can be applied.

It must be difficult to manage, how is it handled in Linux Kernel, same way (root complex)?

And what do you think about proving link/documentation for new device? (The question asked on cover letter.)

Quoted 110 lines

Thanks and Regards
Selwin Sebastian

-----Original Message-----
From: Ferruh Yigit <[email protected]>
Sent: Tuesday, February 1, 2022 7:56 PM
To: Sebastian, Selwin <[email protected]>; [email protected]
Cc: Namburu, Chandu-babu <[email protected]>
Subject: Re: [PATCH v1 1/2] net/axgbe: add support for Yellow Carp ethernet device

[CAUTION: External Email]

Quoted 4 lines · On 1/31/2022 5:39 AM, [email protected] wrote:

From: Selwin Sebastian <[email protected]>

Yellow Carp ethernet devices (V3xxx) use the existing PCI ID but the window settings for the indirect PCS access have been

Can you please explain (again) what is happening here?

Was is same IP used in multiple CPUs with same PCI id but slightly different configuration, and you are trying to detect the device by checking root complex device PCI ID? If so why the device name (Yellow Carp) is different, or is it the name of the CPU?

Quoted 84 lines

altered. Add the check for Yellow Carp Ethernet devices to use the new register values.

---
   drivers/net/axgbe/axgbe_common.h |  2 ++
   drivers/net/axgbe/axgbe_ethdev.c | 34 +++++++++++++++++++++-----------
   2 files changed, 25 insertions(+), 11 deletions(-)
drivers/net/axgbe/axgbe_common.h +2 -0
index 5310ac54f5..b9ebf64fb8 100644
@@ -901,6 +901,8 @@
   #define PCS_V2_WINDOW_SELECT                0x9064
   #define PCS_V2_RV_WINDOW_DEF                0x1060
   #define PCS_V2_RV_WINDOW_SELECT             0x1064
+#define PCS_V2_YC_WINDOW_DEF         0x18060
+#define PCS_V2_YC_WINDOW_SELECT              0x18064
 
   /* PCS register entry bit positions and sizes */
   #define PCS_V2_WINDOW_DEF_OFFSET_INDEX      6
drivers/net/axgbe/axgbe_ethdev.c +23 -12
index e9546469f3..2be9387f98 100644
@@ -173,6 +173,8 @@ 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 AMD_PCI_AXGBE_DEVICE_V2A 0x1458
   #define AMD_PCI_AXGBE_DEVICE_V2B 0x1459
 
@@ -2178,17 +2180,6 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
       pci_dev = RTE_DEV_TO_PCI(eth_dev->device);
       pdata->pci_dev = pci_dev;
 
-     /*
-      * Use root complex device ID to differentiate RV AXGBE vs SNOWY AXGBE
-      */
-     if ((get_pci_rc_devid()) == 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;
-     } else {
-             pdata->xpcs_window_def_reg = PCS_V2_WINDOW_DEF;
-             pdata->xpcs_window_sel_reg = PCS_V2_WINDOW_SELECT;
-     }
-
       pdata->xgmac_regs =
               (void *)pci_dev->mem_resource[AXGBE_AXGMAC_BAR].addr;
       pdata->xprop_regs = (void *)((uint8_t *)pdata->xgmac_regs @@
-2203,6 +2194,27 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
       else
               pdata->vdata = &axgbe_v2b;
 
+     /*
+      * Use PCI root complex device 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;
+             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;
+             break;
+     default:
+             PMD_DRV_LOG(ERR, "No supported devices found\n");
+             return -ENODEV;
+     }
+
       /* Configure the PCS indirect addressing support */
       reg = XPCS32_IOREAD(pdata, pdata->xpcs_window_def_reg);
       pdata->xpcs_window = XPCS_GET_BITS(reg, PCS_V2_WINDOW_DEF,

OFFSET);

#8 lore raw

PATCH 2/2 net/axgbe: disable the CDR wa for Yellow Carp devices

In reply to [email protected]

From: Selwin Sebastian <[email protected]>

Yellow Carp ethernet devices (V3xxx) do not require autonegotiation CDR workaround, hence disable the same.

---
 drivers/net/axgbe/axgbe_ethdev.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/net/axgbe/axgbe_ethdev.c +2 -0
index 2be9387f98..951da5cc26 100644
@@ -2205,6 +2205,8 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
 	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;
 		break;
 	case AMD_PCI_SNOWY_ROOT_COMPLEX_ID:
 		pdata->xpcs_window_def_reg = PCS_V2_WINDOW_DEF;
Signature · 1 line
2.25.1
#9 lore raw
In reply to [email protected]
Quoted 4 lines · On 1/31/2022 5:39 AM, [email protected] wrote:

From: Selwin Sebastian <[email protected]>

Adding support for Yellow Carp ethernet device

Hi Selwin,

Since you are referring to this new device (Yellow Carp), can you please point to some documentation for it, better in the documentation but at least in the commit log.

And if this device support is important enough, you can add this into the release notes.

Quoted 8 lines

Selwin Sebastian (2):
net/axgbe: add support for Yellow Carp ethernet device net/axgbe: disable the CDR wa for Yellow Carp devices

  drivers/net/axgbe/axgbe_common.h |  2 ++
  drivers/net/axgbe/axgbe_ethdev.c | 36 ++++++++++++++++++++++----------
  2 files changed, 27 insertions(+), 11 deletions(-)