From aa1a048729808c4c1797649b3863b00c661e5ee4 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Fri, 26 Sep 2014 14:36:05 +0200 Subject: [PATCH] ixgbe: allow unsupported SFP No need to restrict usage of non Intel SFP. If (hw->phy.type == ixgbe_phy_sfp_intel) is false, a warning will be logged. It was disabled for ixgbe and enabled but unused for i40e. Signed-off-by: Thomas Monjalon --- config/common_bsdapp | 2 -- config/common_linuxapp | 2 -- lib/librte_pmd_ixgbe/ixgbe_ethdev.c | 2 -- 3 files changed, 6 deletions(-) diff --git a/config/common_bsdapp b/config/common_bsdapp index 645949f089..eebd05bd01 100644 --- a/config/common_bsdapp +++ b/config/common_bsdapp @@ -167,7 +167,6 @@ CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX_FREE=n CONFIG_RTE_LIBRTE_IXGBE_DEBUG_DRIVER=n CONFIG_RTE_LIBRTE_IXGBE_PF_DISABLE_STRIP_CRC=n CONFIG_RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC=y -CONFIG_RTE_LIBRTE_IXGBE_ALLOW_UNSUPPORTED_SFP=n CONFIG_RTE_IXGBE_INC_VECTOR=n CONFIG_RTE_IXGBE_RX_OLFLAGS_DISABLE=n @@ -182,7 +181,6 @@ CONFIG_RTE_LIBRTE_I40E_DEBUG_TX_FREE=n CONFIG_RTE_LIBRTE_I40E_DEBUG_DRIVER=n CONFIG_RTE_LIBRTE_I40E_PF_DISABLE_STRIP_CRC=y CONFIG_RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC=n -CONFIG_RTE_LIBRTE_I40E_ALLOW_UNSUPPORTED_SFP=y CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF=4 # interval up to 8160 us, aligned to 2 (or default value) diff --git a/config/common_linuxapp b/config/common_linuxapp index 5bee910e4e..4713eb49fe 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -190,7 +190,6 @@ CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX_FREE=n CONFIG_RTE_LIBRTE_IXGBE_DEBUG_DRIVER=n CONFIG_RTE_LIBRTE_IXGBE_PF_DISABLE_STRIP_CRC=n CONFIG_RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC=y -CONFIG_RTE_LIBRTE_IXGBE_ALLOW_UNSUPPORTED_SFP=n CONFIG_RTE_IXGBE_INC_VECTOR=y CONFIG_RTE_IXGBE_RX_OLFLAGS_ENABLE=y @@ -205,7 +204,6 @@ CONFIG_RTE_LIBRTE_I40E_DEBUG_TX_FREE=n CONFIG_RTE_LIBRTE_I40E_DEBUG_DRIVER=n CONFIG_RTE_LIBRTE_I40E_PF_DISABLE_STRIP_CRC=n CONFIG_RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC=y -CONFIG_RTE_LIBRTE_I40E_ALLOW_UNSUPPORTED_SFP=n CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF=4 # interval up to 8160 us, aligned to 2 (or default value) diff --git a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c index f4b590b011..a147d46245 100644 --- a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c +++ b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c @@ -727,9 +727,7 @@ eth_ixgbe_dev_init(__attribute__((unused)) struct eth_driver *eth_drv, hw->device_id = pci_dev->id.device_id; hw->vendor_id = pci_dev->id.vendor_id; hw->hw_addr = (void *)pci_dev->mem_resource[0].addr; -#ifdef RTE_LIBRTE_IXGBE_ALLOW_UNSUPPORTED_SFP hw->allow_unsupported_sfp = 1; -#endif /* Initialize the shared code (base driver) */ #ifdef RTE_NIC_BYPASS -- 2.20.1