i40e: update device ids
Add new Device ID's for backplane and QSFP+ adapters, and delete deprecated one for backplane. Signed-off-by: Helin Zhang <helin.zhang@intel.com> Acked-by: Jingjing Wu <jingjing.wu@intel.com> Acked-by: Remy Horton <remy.horton@intel.com>
This commit is contained in:
parent
1939d724f2
commit
a0454b5d2e
@ -58,7 +58,6 @@ STATIC enum i40e_status_code i40e_set_mac_type(struct i40e_hw *hw)
|
||||
switch (hw->device_id) {
|
||||
case I40E_DEV_ID_SFP_XL710:
|
||||
case I40E_DEV_ID_QEMU:
|
||||
case I40E_DEV_ID_KX_A:
|
||||
case I40E_DEV_ID_KX_B:
|
||||
case I40E_DEV_ID_KX_C:
|
||||
case I40E_DEV_ID_QSFP_A:
|
||||
@ -74,6 +73,8 @@ STATIC enum i40e_status_code i40e_set_mac_type(struct i40e_hw *hw)
|
||||
#ifdef X722_A0_SUPPORT
|
||||
case I40E_DEV_ID_X722_A0:
|
||||
#endif
|
||||
case I40E_DEV_ID_KX_X722:
|
||||
case I40E_DEV_ID_QSFP_X722:
|
||||
case I40E_DEV_ID_SFP_X722:
|
||||
case I40E_DEV_ID_1G_BASE_T_X722:
|
||||
case I40E_DEV_ID_10G_BASE_T_X722:
|
||||
@ -81,15 +82,22 @@ STATIC enum i40e_status_code i40e_set_mac_type(struct i40e_hw *hw)
|
||||
break;
|
||||
#endif
|
||||
#ifdef X722_SUPPORT
|
||||
#if defined(INTEGRATED_VF) || defined(VF_DRIVER)
|
||||
case I40E_DEV_ID_X722_VF:
|
||||
case I40E_DEV_ID_X722_VF_HV:
|
||||
#ifdef X722_A0_SUPPORT
|
||||
case I40E_DEV_ID_X722_A0_VF:
|
||||
#endif
|
||||
hw->mac.type = I40E_MAC_X722_VF;
|
||||
break;
|
||||
#endif
|
||||
#endif /* INTEGRATED_VF || VF_DRIVER */
|
||||
#endif /* X722_SUPPORT */
|
||||
#if defined(INTEGRATED_VF) || defined(VF_DRIVER)
|
||||
case I40E_DEV_ID_VF:
|
||||
case I40E_DEV_ID_VF_HV:
|
||||
hw->mac.type = I40E_MAC_VF;
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
hw->mac.type = I40E_MAC_GENERIC;
|
||||
break;
|
||||
|
@ -40,7 +40,6 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||
/* Device IDs */
|
||||
#define I40E_DEV_ID_SFP_XL710 0x1572
|
||||
#define I40E_DEV_ID_QEMU 0x1574
|
||||
#define I40E_DEV_ID_KX_A 0x157F
|
||||
#define I40E_DEV_ID_KX_B 0x1580
|
||||
#define I40E_DEV_ID_KX_C 0x1581
|
||||
#define I40E_DEV_ID_QSFP_A 0x1583
|
||||
@ -50,17 +49,26 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||
#define I40E_DEV_ID_20G_KR2 0x1587
|
||||
#define I40E_DEV_ID_20G_KR2_A 0x1588
|
||||
#define I40E_DEV_ID_10G_BASE_T4 0x1589
|
||||
#if defined(INTEGRATED_VF) || defined(VF_DRIVER) || defined(I40E_NDIS_SUPPORT)
|
||||
#define I40E_DEV_ID_VF 0x154C
|
||||
#define I40E_DEV_ID_VF_HV 0x1571
|
||||
#endif /* VF_DRIVER */
|
||||
#ifdef X722_SUPPORT
|
||||
#ifdef X722_A0_SUPPORT
|
||||
#define I40E_DEV_ID_X722_A0 0x374C
|
||||
#if defined(INTEGRATED_VF) || defined(VF_DRIVER)
|
||||
#define I40E_DEV_ID_X722_A0_VF 0x374D
|
||||
#endif
|
||||
#endif
|
||||
#define I40E_DEV_ID_KX_X722 0x37CE
|
||||
#define I40E_DEV_ID_QSFP_X722 0x37CF
|
||||
#define I40E_DEV_ID_SFP_X722 0x37D0
|
||||
#define I40E_DEV_ID_1G_BASE_T_X722 0x37D1
|
||||
#define I40E_DEV_ID_10G_BASE_T_X722 0x37D2
|
||||
#if defined(INTEGRATED_VF) || defined(VF_DRIVER) || defined(I40E_NDIS_SUPPORT)
|
||||
#define I40E_DEV_ID_X722_VF 0x37CD
|
||||
#define I40E_DEV_ID_X722_VF_HV 0x37D9
|
||||
#endif /* VF_DRIVER */
|
||||
#endif /* X722_SUPPORT */
|
||||
|
||||
#define i40e_is_40G_device(d) ((d) == I40E_DEV_ID_QSFP_A || \
|
||||
|
@ -601,7 +601,7 @@ i40e_get_vsi_from_adapter(struct i40e_adapter *adapter)
|
||||
return NULL;
|
||||
|
||||
hw = I40E_DEV_PRIVATE_TO_HW(adapter);
|
||||
if (hw->mac.type == I40E_MAC_VF) {
|
||||
if (hw->mac.type == I40E_MAC_VF || hw->mac.type == I40E_MAC_X722_VF) {
|
||||
struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(adapter);
|
||||
return &vf->vsi;
|
||||
} else {
|
||||
|
@ -2107,7 +2107,7 @@ i40e_dev_rx_queue_setup(struct rte_eth_dev *dev,
|
||||
uint16_t base, bsf, tc_mapping;
|
||||
int use_def_burst_func = 1;
|
||||
|
||||
if (hw->mac.type == I40E_MAC_VF) {
|
||||
if (hw->mac.type == I40E_MAC_VF || hw->mac.type == I40E_MAC_X722_VF) {
|
||||
struct i40e_vf *vf =
|
||||
I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
|
||||
vsi = &vf->vsi;
|
||||
@ -2147,7 +2147,7 @@ i40e_dev_rx_queue_setup(struct rte_eth_dev *dev,
|
||||
rxq->nb_rx_desc = nb_desc;
|
||||
rxq->rx_free_thresh = rx_conf->rx_free_thresh;
|
||||
rxq->queue_id = queue_idx;
|
||||
if (hw->mac.type == I40E_MAC_VF)
|
||||
if (hw->mac.type == I40E_MAC_VF || hw->mac.type == I40E_MAC_X722_VF)
|
||||
rxq->reg_idx = queue_idx;
|
||||
else /* PF device */
|
||||
rxq->reg_idx = vsi->base_queue +
|
||||
@ -2324,7 +2324,7 @@ i40e_dev_tx_queue_setup(struct rte_eth_dev *dev,
|
||||
uint16_t tx_rs_thresh, tx_free_thresh;
|
||||
uint16_t i, base, bsf, tc_mapping;
|
||||
|
||||
if (hw->mac.type == I40E_MAC_VF) {
|
||||
if (hw->mac.type == I40E_MAC_VF || hw->mac.type == I40E_MAC_X722_VF) {
|
||||
struct i40e_vf *vf =
|
||||
I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
|
||||
vsi = &vf->vsi;
|
||||
@ -2452,7 +2452,7 @@ i40e_dev_tx_queue_setup(struct rte_eth_dev *dev,
|
||||
txq->hthresh = tx_conf->tx_thresh.hthresh;
|
||||
txq->wthresh = tx_conf->tx_thresh.wthresh;
|
||||
txq->queue_id = queue_idx;
|
||||
if (hw->mac.type == I40E_MAC_VF)
|
||||
if (hw->mac.type == I40E_MAC_VF || hw->mac.type == I40E_MAC_X722_VF)
|
||||
txq->reg_idx = queue_idx;
|
||||
else /* PF device */
|
||||
txq->reg_idx = vsi->base_queue +
|
||||
|
@ -523,7 +523,6 @@ RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_BYPASS)
|
||||
|
||||
#define I40E_DEV_ID_SFP_XL710 0x1572
|
||||
#define I40E_DEV_ID_QEMU 0x1574
|
||||
#define I40E_DEV_ID_KX_A 0x157F
|
||||
#define I40E_DEV_ID_KX_B 0x1580
|
||||
#define I40E_DEV_ID_KX_C 0x1581
|
||||
#define I40E_DEV_ID_QSFP_A 0x1583
|
||||
@ -534,13 +533,14 @@ RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_BYPASS)
|
||||
#define I40E_DEV_ID_20G_KR2_A 0x1588
|
||||
#define I40E_DEV_ID_10G_BASE_T4 0x1589
|
||||
#define I40E_DEV_ID_X722_A0 0x374C
|
||||
#define I40E_DEV_ID_KX_X722 0x37CE
|
||||
#define I40E_DEV_ID_QSFP_X722 0x37CF
|
||||
#define I40E_DEV_ID_SFP_X722 0x37D0
|
||||
#define I40E_DEV_ID_1G_BASE_T_X722 0x37D1
|
||||
#define I40E_DEV_ID_10G_BASE_T_X722 0x37D2
|
||||
|
||||
RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_SFP_XL710)
|
||||
RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_QEMU)
|
||||
RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_KX_A)
|
||||
RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_KX_B)
|
||||
RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_KX_C)
|
||||
RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_QSFP_A)
|
||||
@ -551,6 +551,8 @@ RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_20G_KR2)
|
||||
RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_20G_KR2_A)
|
||||
RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_10G_BASE_T4)
|
||||
RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_X722_A0)
|
||||
RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_KX_X722)
|
||||
RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_QSFP_X722)
|
||||
RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_SFP_X722)
|
||||
RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_1G_BASE_T_X722)
|
||||
RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_10G_BASE_T_X722)
|
||||
@ -603,11 +605,13 @@ RTE_PCI_DEV_ID_DECL_IXGBEVF(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X550EM_X_VF_HV)
|
||||
|
||||
#define I40E_DEV_ID_VF 0x154C
|
||||
#define I40E_DEV_ID_VF_HV 0x1571
|
||||
#define I40E_DEV_ID_X722_A0_VF 0x374D
|
||||
#define I40E_DEV_ID_X722_VF 0x37CD
|
||||
#define I40E_DEV_ID_X722_VF_HV 0x37D9
|
||||
|
||||
RTE_PCI_DEV_ID_DECL_I40EVF(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_VF)
|
||||
RTE_PCI_DEV_ID_DECL_I40EVF(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_VF_HV)
|
||||
RTE_PCI_DEV_ID_DECL_I40EVF(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_X722_A0_VF)
|
||||
RTE_PCI_DEV_ID_DECL_I40EVF(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_X722_VF)
|
||||
RTE_PCI_DEV_ID_DECL_I40EVF(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_X722_VF_HV)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user