add link state control driver flag

PATCH New Stephen Hemminger 1 participant 1 message Jun 10, 2014

Share & tools

Stephen Hemminger

author

2014-06-10 21:05 UTC #0 lore raw

PATCH 1/1 add link state control driver flag

Only some devices support the link state interrupt configuration option. Link state control does not work in virtual drivers
(virtio, vmxnet3, igbvf, and ixgbevf). Instead of having the application try and guess whether it will work or not provide a driver flag that can be checked instead.

Note: if device driver doesn't support link state control, what would happen previously is that the code would never detect link transitions. This prevents that.

Signed-off-by Stephen Hemminger <[email protected]>

---
 lib/librte_eal/common/include/rte_pci.h |    2 ++
 lib/librte_ether/rte_ethdev.c           |   14 ++++++++++++++
 lib/librte_pmd_e1000/em_ethdev.c        |    2 +-
 lib/librte_pmd_e1000/igb_ethdev.c       |    2 +-
 lib/librte_pmd_ixgbe/ixgbe_ethdev.c     |    2 +-
 5 files changed, 19 insertions(+), 3 deletions(-)

lib/librte_eal/common/include/rte_pci.h +2 -0

@@ -196,6 +196,8 @@ struct rte_pci_driver {
 #define RTE_PCI_DRV_MULTIPLE 0x0002
 /** Device needs to be unbound even if no module is provided */
 #define RTE_PCI_DRV_FORCE_UNBIND 0x0004
+/** Device driver supports link state interrupt */
+#define RTE_PCI_DRV_LSC	0x0008
 
 /**< Internal use only - Macro used by pci addr parsing functions **/
 #define GET_PCIADDR_FIELD(in, fd, lim, dlm)                   \

lib/librte_pmd_e1000/em_ethdev.c +1 -1

@@ -280,7 +280,7 @@ static struct eth_driver rte_em_pmd = {
 	{
 		.name = "rte_em_pmd",
 		.id_table = pci_id_em_map,
-		.drv_flags = RTE_PCI_DRV_NEED_IGB_UIO,
+		.drv_flags = RTE_PCI_DRV_NEED_IGB_UIO | RTE_PCI_DRV_LSC,
 	},
 	.eth_dev_init = eth_em_dev_init,
 	.dev_private_size = sizeof(struct e1000_adapter),

lib/librte_pmd_e1000/igb_ethdev.c +1 -1

@@ -603,7 +603,7 @@ static struct eth_driver rte_igb_pmd = {
 	{
 		.name = "rte_igb_pmd",
 		.id_table = pci_id_igb_map,
-		.drv_flags = RTE_PCI_DRV_NEED_IGB_UIO,
+		.drv_flags = RTE_PCI_DRV_NEED_IGB_UIO | RTE_PCI_DRV_LSC,
 	},
 	.eth_dev_init = eth_igb_dev_init,
 	.dev_private_size = sizeof(struct e1000_adapter),

lib/librte_pmd_ixgbe/ixgbe_ethdev.c +1 -1

@@ -999,7 +999,7 @@ static struct eth_driver rte_ixgbe_pmd =
 	{
 		.name = "rte_ixgbe_pmd",
 		.id_table = pci_id_ixgbe_map,
-		.drv_flags = RTE_PCI_DRV_NEED_IGB_UIO,
+		.drv_flags = RTE_PCI_DRV_NEED_IGB_UIO | RTE_PCI_DRV_LSC,
 	},
 	.eth_dev_init = eth_ixgbe_dev_init,
 	.dev_private_size = sizeof(struct ixgbe_adapter),

lib/librte_ether/rte_ethdev.c +14 -0

@@ -636,6 +636,20 @@ rte_eth_dev_configure(uint8_t port_id, u
 	memcpy(&dev->data->dev_conf, dev_conf, sizeof(dev->data->dev_conf));
 
 	/*
+	 * If link state interrupt is enabled, check that the
+	 * device supports it.
+	 */
+	if (dev_conf->intr_conf.lsc == 1) {
+		const struct rte_pci_driver *pci_drv = &dev->driver->pci_drv;
+
+		if (!(pci_drv->drv_flags & RTE_PCI_DRV_LSC)) {
+			PMD_DEBUG_TRACE("driver %s does not support lsc\n",
+					pci_drv->name);
+			return (-EINVAL);
+		}
+	}
+
+	/*
 	 * If jumbo frames are enabled, check that the maximum RX packet
 	 * length is supported by the configured device.
 	 */