Skip to contentSkip to conversation

net/axgbe: add a HW quirk for register definitions

PATCH Superseded Selwin Sebastian 2 participants 3 messages Jan 9, 2020 – Jan 14, 2020 Network drivers

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 net/axgbe: add a HW quirk for register definitions

V1000/R1000 processors are using the same PCI ids for the network device as SNOWYOWL processor but has altered register definitions for determining the window settings for the indirect PCS access. Add support to check for this hardware and if found use the new register values

---
 drivers/net/axgbe/axgbe_common.h |  2 ++
 drivers/net/axgbe/axgbe_ethdev.c | 22 +++++++++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)
drivers/net/axgbe/axgbe_common.h +2 -0
index 34f60f156..4a3fbac16 100644
@@ -841,6 +841,8 @@
 #define PCS_V1_WINDOW_SELECT		0x03fc
 #define PCS_V2_WINDOW_DEF		0x9060
 #define PCS_V2_WINDOW_SELECT		0x9064
+#define PCS_V2_RV_WINDOW_DEF		0x1060
+#define PCS_V2_RV_WINDOW_SELECT		0x1064
 
 /* PCS register entry bit positions and sizes */
 #define PCS_V2_WINDOW_DEF_OFFSET_INDEX	6
drivers/net/axgbe/axgbe_ethdev.c +19 -3
index d1f160e79..c551375a4 100644
@@ -29,8 +29,10 @@ static int  axgbe_dev_info_get(struct rte_eth_dev *dev,
 
 /* 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_AXGBE_DEVICE_V2A 0x1458
 #define AMD_PCI_AXGBE_DEVICE_V2B 0x1459
+extern struct rte_pci_bus rte_pci_bus;
 
 int axgbe_logtype_init;
 int axgbe_logtype_driver;
@@ -585,6 +587,7 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
 	struct rte_pci_device *pci_dev;
 	uint32_t reg, mac_lo, mac_hi;
 	int ret;
+	struct rte_pci_device *root_complex_dev;
 
 	eth_dev->dev_ops = &axgbe_eth_dev_ops;
 	eth_dev->rx_pkt_burst = &axgbe_recv_pkts;
@@ -605,6 +608,20 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
 	pci_dev = RTE_DEV_TO_PCI(eth_dev->device);
 	pdata->pci_dev = pci_dev;
 
+	/*
+	 * Get root complex device to differentiate RV AXGBE vs SNOWY AXGBE
+	 */
+	root_complex_dev = TAILQ_FIRST(&rte_pci_bus.device_list);
+
+	if (root_complex_dev->id.vendor_id == AMD_PCI_VENDOR_ID &&
+		root_complex_dev->id.device_id == 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
@@ -620,14 +637,13 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
 		pdata->vdata = &axgbe_v2b;
 
 	/* Configure the PCS indirect addressing support */
-	reg = XPCS32_IOREAD(pdata, PCS_V2_WINDOW_DEF);
+	reg = XPCS32_IOREAD(pdata, pdata->xpcs_window_def_reg);
 	pdata->xpcs_window = XPCS_GET_BITS(reg, PCS_V2_WINDOW_DEF, OFFSET);
 	pdata->xpcs_window <<= 6;
 	pdata->xpcs_window_size = XPCS_GET_BITS(reg, PCS_V2_WINDOW_DEF, SIZE);
 	pdata->xpcs_window_size = 1 << (pdata->xpcs_window_size + 7);
 	pdata->xpcs_window_mask = pdata->xpcs_window_size - 1;
-	pdata->xpcs_window_def_reg = PCS_V2_WINDOW_DEF;
-	pdata->xpcs_window_sel_reg = PCS_V2_WINDOW_SELECT;
+
 	PMD_INIT_LOG(DEBUG,
 		     "xpcs window :%x, size :%x, mask :%x ", pdata->xpcs_window,
 		     pdata->xpcs_window_size, pdata->xpcs_window_mask);
Signature · 1 line
2.17.1
#1 lore raw
Quoted 30 lines · Selwin Sebastian

V1000/R1000 processors are using the same PCI ids for the network device as SNOWYOWL processor but has altered register definitions for determining the window settings for the indirect PCS access. Add support to check for this hardware and if found use the new register values

---
 drivers/net/axgbe/axgbe_common.h |  2 ++
 drivers/net/axgbe/axgbe_ethdev.c | 22 +++++++++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)
drivers/net/axgbe/axgbe_common.h +2 -0
index 34f60f156..4a3fbac16 100644
@@ -841,6 +841,8 @@
 #define PCS_V1_WINDOW_SELECT		0x03fc
 #define PCS_V2_WINDOW_DEF		0x9060
 #define PCS_V2_WINDOW_SELECT		0x9064
+#define PCS_V2_RV_WINDOW_DEF		0x1060
+#define PCS_V2_RV_WINDOW_SELECT		0x1064
 
 /* PCS register entry bit positions and sizes */
 #define PCS_V2_WINDOW_DEF_OFFSET_INDEX	6
drivers/net/axgbe/axgbe_ethdev.c +0 -0
index d1f160e79..c551375a4 100644

drivers/net/axgbe/axgbe_ethdev.c static int axgbe_dev_info_get(struct rte_eth_dev *dev, · line 35

Quoted 7 lines
drivers/net/axgbe/axgbe_ethdev.c +2 -0
@@ -29,8 +29,10 @@ static int  axgbe_dev_info_get(struct rte_eth_dev *dev,
 
 /* 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_AXGBE_DEVICE_V2A 0x1458
 #define AMD_PCI_AXGBE_DEVICE_V2B 0x1459
+extern struct rte_pci_bus rte_pci_bus;

This is not working for the case DPDK is build as shared library, since the symbol is not exported in the .map file, because it should be driver internal.

What about adding an API to 'drivers/bus/pci' to check if given vendor_id & device_id exists in the bus? This also prevents accessing the bus internals.

Quoted 50 lines
drivers/net/axgbe/axgbe_ethdev.c +17 -3
 int axgbe_logtype_init;
 int axgbe_logtype_driver;
@@ -585,6 +587,7 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
 	struct rte_pci_device *pci_dev;
 	uint32_t reg, mac_lo, mac_hi;
 	int ret;
+	struct rte_pci_device *root_complex_dev;
 
 	eth_dev->dev_ops = &axgbe_eth_dev_ops;
 	eth_dev->rx_pkt_burst = &axgbe_recv_pkts;
@@ -605,6 +608,20 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
 	pci_dev = RTE_DEV_TO_PCI(eth_dev->device);
 	pdata->pci_dev = pci_dev;
 
+	/*
+	 * Get root complex device to differentiate RV AXGBE vs SNOWY AXGBE
+	 */
+	root_complex_dev = TAILQ_FIRST(&rte_pci_bus.device_list);
+
+	if (root_complex_dev->id.vendor_id == AMD_PCI_VENDOR_ID &&
+		root_complex_dev->id.device_id == 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
@@ -620,14 +637,13 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
 		pdata->vdata = &axgbe_v2b;
 
 	/* Configure the PCS indirect addressing support */
-	reg = XPCS32_IOREAD(pdata, PCS_V2_WINDOW_DEF);
+	reg = XPCS32_IOREAD(pdata, pdata->xpcs_window_def_reg);
 	pdata->xpcs_window = XPCS_GET_BITS(reg, PCS_V2_WINDOW_DEF, OFFSET);
 	pdata->xpcs_window <<= 6;
 	pdata->xpcs_window_size = XPCS_GET_BITS(reg, PCS_V2_WINDOW_DEF, SIZE);
 	pdata->xpcs_window_size = 1 << (pdata->xpcs_window_size + 7);
 	pdata->xpcs_window_mask = pdata->xpcs_window_size - 1;
-	pdata->xpcs_window_def_reg = PCS_V2_WINDOW_DEF;
-	pdata->xpcs_window_sel_reg = PCS_V2_WINDOW_SELECT;
+
 	PMD_INIT_LOG(DEBUG,
 		     "xpcs window :%x, size :%x, mask :%x ", pdata->xpcs_window,
 		     pdata->xpcs_window_size, pdata->xpcs_window_mask);
#2 lore raw

[AMD Official Use Only - Internal Distribution Only]

Hi Ferruh,
I submitted my v3 of the patch with changes. Added a new api to pci driver to search for device.

Thanks and Regards
Selwin Sebastian

-----Original Message-----
From: Ferruh Yigit <[email protected]>
Sent: Monday, January 13, 2020 10:48 PM
To: Sebastian, Selwin <[email protected]>; [email protected]
Cc: Thomas Monjalon <[email protected]>; David Marchand <[email protected]>
Subject: Re: [dpdk-dev] [PATCH v2] net/axgbe: add a HW quirk for register definitions

[CAUTION: External Email]

Quoted 38 lines · Selwin Sebastian

V1000/R1000 processors are using the same PCI ids for the network device as SNOWYOWL processor but has altered register definitions for determining the window settings for the indirect PCS access. Add support to check for this hardware and if found use the new register values

---
 drivers/net/axgbe/axgbe_common.h |  2 ++  
drivers/net/axgbe/axgbe_ethdev.c | 22 +++++++++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)
drivers/net/axgbe/axgbe_common.h +2 -0
index 34f60f156..4a3fbac16 100644
@@ -841,6 +841,8 @@
 #define PCS_V1_WINDOW_SELECT         0x03fc
 #define PCS_V2_WINDOW_DEF            0x9060
 #define PCS_V2_WINDOW_SELECT         0x9064
+#define PCS_V2_RV_WINDOW_DEF         0x1060
+#define PCS_V2_RV_WINDOW_SELECT              0x1064
 
 /* PCS register entry bit positions and sizes */
 #define PCS_V2_WINDOW_DEF_OFFSET_INDEX       6
drivers/net/axgbe/axgbe_ethdev.c +1 -0
index d1f160e79..c551375a4 100644
@@ -29,8 +29,10 @@ static int  axgbe_dev_info_get(struct rte_eth_dev 
 *dev,
 
 /* 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_AXGBE_DEVICE_V2A 0x1458  #define 
Quoted 2 lines

AMD_PCI_AXGBE_DEVICE_V2B 0x1459
+extern struct rte_pci_bus rte_pci_bus;

This is not working for the case DPDK is build as shared library, since the symbol is not exported in the .map file, because it should be driver internal.

What about adding an API to 'drivers/bus/pci' to check if given vendor_id & device_id exists in the bus? This also prevents accessing the bus internals.

Quoted 50 lines

int axgbe_logtype_init;
int axgbe_logtype_driver;

drivers/net/axgbe/axgbe_ethdev.c +1 -0
@@ -585,6 +587,7 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
      struct rte_pci_device *pci_dev;
      uint32_t reg, mac_lo, mac_hi;
      int ret;
+     struct rte_pci_device *root_complex_dev;
 
      eth_dev->dev_ops = &axgbe_eth_dev_ops;
      eth_dev->rx_pkt_burst = &axgbe_recv_pkts; @@ -605,6 +608,20 @@ 

eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)

      pci_dev = RTE_DEV_TO_PCI(eth_dev->device);
      pdata->pci_dev = pci_dev;
drivers/net/axgbe/axgbe_ethdev.c +16 -4
+     /*
+      * Get root complex device to differentiate RV AXGBE vs SNOWY AXGBE
+      */
+     root_complex_dev = TAILQ_FIRST(&rte_pci_bus.device_list);
+
+     if (root_complex_dev->id.vendor_id == AMD_PCI_VENDOR_ID &&
+             root_complex_dev->id.device_id == 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 @@ 
-620,14 +637,13 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
              pdata->vdata = &axgbe_v2b;
 
      /* Configure the PCS indirect addressing support */
-     reg = XPCS32_IOREAD(pdata, PCS_V2_WINDOW_DEF);
+     reg = XPCS32_IOREAD(pdata, pdata->xpcs_window_def_reg);
      pdata->xpcs_window = XPCS_GET_BITS(reg, PCS_V2_WINDOW_DEF, OFFSET);
      pdata->xpcs_window <<= 6;
      pdata->xpcs_window_size = XPCS_GET_BITS(reg, PCS_V2_WINDOW_DEF, SIZE);
      pdata->xpcs_window_size = 1 << (pdata->xpcs_window_size + 7);
      pdata->xpcs_window_mask = pdata->xpcs_window_size - 1;
-     pdata->xpcs_window_def_reg = PCS_V2_WINDOW_DEF;
-     pdata->xpcs_window_sel_reg = PCS_V2_WINDOW_SELECT;
+
      PMD_INIT_LOG(DEBUG,
                   "xpcs window :%x, size :%x, mask :%x ", pdata->xpcs_window,
                   pdata->xpcs_window_size, pdata->xpcs_window_mask);