@@ -130,16 +130,16 @@ enum {
PCI_DEVICE_ID_MELLANOX_CONNECTX5VF = 0x1018,
PCI_DEVICE_ID_MELLANOX_CONNECTX5EX = 0x1019,
PCI_DEVICE_ID_MELLANOX_CONNECTX5EXVF = 0x101a,
- PCI_DEVICE_ID_MELLANOX_CONNECTX5BF = 0xa2d2,
- PCI_DEVICE_ID_MELLANOX_CONNECTX5BFVF = 0xa2d3,
+ PCI_DEVICE_ID_MELLANOX_BLUEFIELD = 0xa2d2,
+ PCI_DEVICE_ID_MELLANOX_BLUEFIELDVF = 0xa2d3,
PCI_DEVICE_ID_MELLANOX_CONNECTX6 = 0x101b,
PCI_DEVICE_ID_MELLANOX_CONNECTX6VF = 0x101c,
PCI_DEVICE_ID_MELLANOX_CONNECTX6DX = 0x101d,
PCI_DEVICE_ID_MELLANOX_CONNECTXVF = 0x101e,
- PCI_DEVICE_ID_MELLANOX_CONNECTX6DXBF = 0xa2d6,
+ PCI_DEVICE_ID_MELLANOX_BLUEFIELD2 = 0xa2d6,
PCI_DEVICE_ID_MELLANOX_CONNECTX6LX = 0x101f,
PCI_DEVICE_ID_MELLANOX_CONNECTX7 = 0x1021,
- PCI_DEVICE_ID_MELLANOX_CONNECTX7BF = 0Xa2dc,
+ PCI_DEVICE_ID_MELLANOX_BLUEFIELD3 = 0Xa2dc,
};
/* Maximum number of simultaneous unicast MAC addresses. */
@@ -116,7 +116,7 @@ mlx5_dev_is_vf_pci(struct rte_pci_device *pci_dev)
case PCI_DEVICE_ID_MELLANOX_CONNECTX4LXVF:
case PCI_DEVICE_ID_MELLANOX_CONNECTX5VF:
case PCI_DEVICE_ID_MELLANOX_CONNECTX5EXVF:
- case PCI_DEVICE_ID_MELLANOX_CONNECTX5BFVF:
+ case PCI_DEVICE_ID_MELLANOX_BLUEFIELDVF:
case PCI_DEVICE_ID_MELLANOX_CONNECTX6VF:
case PCI_DEVICE_ID_MELLANOX_CONNECTXVF:
return true;
@@ -786,11 +786,11 @@ mlx5_compress_dev_remove(struct mlx5_common_device *cdev)
static const struct rte_pci_id mlx5_compress_pci_id_map[] = {
{
RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
- PCI_DEVICE_ID_MELLANOX_CONNECTX6DXBF)
+ PCI_DEVICE_ID_MELLANOX_BLUEFIELD2)
},
{
RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
- PCI_DEVICE_ID_MELLANOX_CONNECTX7BF)
+ PCI_DEVICE_ID_MELLANOX_BLUEFIELD3)
},
{
.vendor_id = 0
@@ -992,7 +992,7 @@ static const struct rte_pci_id mlx5_crypto_pci_id_map[] = {
},
{
RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
- PCI_DEVICE_ID_MELLANOX_CONNECTX6DXBF)
+ PCI_DEVICE_ID_MELLANOX_BLUEFIELD2)
},
{
RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
@@ -1000,7 +1000,7 @@ static const struct rte_pci_id mlx5_crypto_pci_id_map[] = {
},
{
RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
- PCI_DEVICE_ID_MELLANOX_CONNECTX7BF)
+ PCI_DEVICE_ID_MELLANOX_BLUEFIELD3)
},
{
.vendor_id = 0
@@ -3202,11 +3202,11 @@ static const struct rte_pci_id mlx5_pci_id_map[] = {
},
{
RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
- PCI_DEVICE_ID_MELLANOX_CONNECTX5BF)
+ PCI_DEVICE_ID_MELLANOX_BLUEFIELD)
},
{
RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
- PCI_DEVICE_ID_MELLANOX_CONNECTX5BFVF)
+ PCI_DEVICE_ID_MELLANOX_BLUEFIELDVF)
},
{
RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
@@ -3226,7 +3226,7 @@ static const struct rte_pci_id mlx5_pci_id_map[] = {
},
{
RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
- PCI_DEVICE_ID_MELLANOX_CONNECTX6DXBF)
+ PCI_DEVICE_ID_MELLANOX_BLUEFIELD2)
},
{
RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
@@ -3238,7 +3238,7 @@ static const struct rte_pci_id mlx5_pci_id_map[] = {
},
{
RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
- PCI_DEVICE_ID_MELLANOX_CONNECTX7BF)
+ PCI_DEVICE_ID_MELLANOX_BLUEFIELD3)
},
{
.vendor_id = 0
@@ -11221,8 +11221,8 @@ mlx5_flow_flex_item_create(struct rte_eth_dev *dev,
return NULL;
}
switch (priv->pci_dev->id.device_id) {
- case PCI_DEVICE_ID_MELLANOX_CONNECTX6DXBF:
- case PCI_DEVICE_ID_MELLANOX_CONNECTX7BF:
+ case PCI_DEVICE_ID_MELLANOX_BLUEFIELD2:
+ case PCI_DEVICE_ID_MELLANOX_BLUEFIELD3:
break;
default:
rte_flow_error_set(error, ENOTSUP,
@@ -11470,9 +11470,9 @@ int16_t mlx5_flow_get_esw_manager_vport_id(struct rte_eth_dev *dev)
if (priv->pci_dev == NULL)
return 0;
switch (priv->pci_dev->id.device_id) {
- case PCI_DEVICE_ID_MELLANOX_CONNECTX5BF:
- case PCI_DEVICE_ID_MELLANOX_CONNECTX6DXBF:
- case PCI_DEVICE_ID_MELLANOX_CONNECTX7BF:
+ case PCI_DEVICE_ID_MELLANOX_BLUEFIELD:
+ case PCI_DEVICE_ID_MELLANOX_BLUEFIELD2:
+ case PCI_DEVICE_ID_MELLANOX_BLUEFIELD3:
/*
* In old FW which doesn't expose the E-Switch Manager vport ID in the capability,
* only the BF embedded CPUs control the E-Switch Manager port. Hence,
@@ -767,7 +767,7 @@ txq_set_params(struct mlx5_txq_ctrl *txq_ctrl)
txqs_inline =
#if defined(RTE_ARCH_ARM64)
(priv->pci_dev && priv->pci_dev->id.device_id ==
- PCI_DEVICE_ID_MELLANOX_CONNECTX5BF) ?
+ PCI_DEVICE_ID_MELLANOX_BLUEFIELD) ?
MLX5_INLINE_MAX_TXQS_BLUEFIELD :
#endif
MLX5_INLINE_MAX_TXQS;
@@ -156,11 +156,11 @@ mlx5_regex_dev_remove(struct mlx5_common_device *cdev)
static const struct rte_pci_id mlx5_regex_pci_id_map[] = {
{
RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
- PCI_DEVICE_ID_MELLANOX_CONNECTX6DXBF)
+ PCI_DEVICE_ID_MELLANOX_BLUEFIELD2)
},
{
RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
- PCI_DEVICE_ID_MELLANOX_CONNECTX7BF)
+ PCI_DEVICE_ID_MELLANOX_BLUEFIELD3)
},
{
.vendor_id = 0
@@ -961,7 +961,7 @@ static const struct rte_pci_id mlx5_vdpa_pci_id_map[] = {
},
{
RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
- PCI_DEVICE_ID_MELLANOX_CONNECTX6DXBF)
+ PCI_DEVICE_ID_MELLANOX_BLUEFIELD2)
},
{
RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
@@ -973,7 +973,7 @@ static const struct rte_pci_id mlx5_vdpa_pci_id_map[] = {
},
{
RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
- PCI_DEVICE_ID_MELLANOX_CONNECTX7BF)
+ PCI_DEVICE_ID_MELLANOX_BLUEFIELD3)
},
{
.vendor_id = 0