git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: add rte prefix to ether structures
[dpdk.git]
/
drivers
/
net
/
i40e
/
i40e_ethdev.c
diff --git
a/drivers/net/i40e/i40e_ethdev.c
b/drivers/net/i40e/i40e_ethdev.c
index
62865c5
..
85fdf35
100644
(file)
--- a/
drivers/net/i40e/i40e_ethdev.c
+++ b/
drivers/net/i40e/i40e_ethdev.c
@@
-265,7
+265,7
@@
static int i40e_flow_ctrl_set(struct rte_eth_dev *dev,
static int i40e_priority_flow_ctrl_set(struct rte_eth_dev *dev,
struct rte_eth_pfc_conf *pfc_conf);
static int i40e_macaddr_add(struct rte_eth_dev *dev,
static int i40e_priority_flow_ctrl_set(struct rte_eth_dev *dev,
struct rte_eth_pfc_conf *pfc_conf);
static int i40e_macaddr_add(struct rte_eth_dev *dev,
- struct ether_addr *mac_addr,
+ struct
rte_
ether_addr *mac_addr,
uint32_t index,
uint32_t pool);
static void i40e_macaddr_remove(struct rte_eth_dev *dev, uint32_t index);
uint32_t index,
uint32_t pool);
static void i40e_macaddr_remove(struct rte_eth_dev *dev, uint32_t index);
@@
-379,7
+379,7
@@
static int i40e_get_module_eeprom(struct rte_eth_dev *dev,
struct rte_dev_eeprom_info *info);
static int i40e_set_default_mac_addr(struct rte_eth_dev *dev,
struct rte_dev_eeprom_info *info);
static int i40e_set_default_mac_addr(struct rte_eth_dev *dev,
- struct ether_addr *mac_addr);
+ struct
rte_
ether_addr *mac_addr);
static int i40e_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu);
static int i40e_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu);
@@
-433,6
+433,9
@@
static const struct rte_pci_id pci_id_i40e_map[] = {
{ RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_1G_BASE_T_X722) },
{ RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_10G_BASE_T_X722) },
{ RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_SFP_I_X722) },
{ RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_1G_BASE_T_X722) },
{ RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_10G_BASE_T_X722) },
{ RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_SFP_I_X722) },
+ { RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_X710_N3000) },
+ { RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_XXV710_N3000) },
+ { RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_10G_BASE_T_BC) },
{ .vendor_id = 0, /* sentinel */ },
};
{ .vendor_id = 0, /* sentinel */ },
};
@@
-1466,8
+1469,8
@@
eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused)
goto err_get_mac_addr;
}
/* Copy the permanent MAC address */
goto err_get_mac_addr;
}
/* Copy the permanent MAC address */
- ether_addr_copy((struct
ether_addr *)
hw->mac.addr,
- (struct
ether_addr *)
hw->mac.perm_addr);
+ ether_addr_copy((struct
rte_ether_addr *)
hw->mac.addr,
+ (struct
rte_ether_addr *)
hw->mac.perm_addr);
/* Disable flow control */
hw->fc.requested_mode = I40E_FC_NONE;
/* Disable flow control */
hw->fc.requested_mode = I40E_FC_NONE;
@@
-1518,7
+1521,7
@@
eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused)
"Failed to allocated memory for storing mac address");
goto err_mac_alloc;
}
"Failed to allocated memory for storing mac address");
goto err_mac_alloc;
}
- ether_addr_copy((struct ether_addr *)hw->mac.perm_addr,
+ ether_addr_copy((struct
rte_
ether_addr *)hw->mac.perm_addr,
&dev->data->mac_addrs[0]);
/* Init dcb to sw mode by default */
&dev->data->mac_addrs[0]);
/* Init dcb to sw mode by default */
@@
-2670,11
+2673,11
@@
update_link_reg(struct i40e_hw *hw, struct rte_eth_link *link)
#define I40E_PRTMAC_MACC 0x001E24E0
#define I40E_REG_MACC_25GB 0x00020000
#define I40E_REG_SPEED_MASK 0x38000000
#define I40E_PRTMAC_MACC 0x001E24E0
#define I40E_REG_MACC_25GB 0x00020000
#define I40E_REG_SPEED_MASK 0x38000000
-#define I40E_REG_SPEED_
100MB
0x00000000
-#define I40E_REG_SPEED_1
GB
0x08000000
-#define I40E_REG_SPEED_
10GB
0x10000000
-#define I40E_REG_SPEED_
20GB 0x20
000000
-#define I40E_REG_SPEED_
25_40GB 0x18
000000
+#define I40E_REG_SPEED_
0
0x00000000
+#define I40E_REG_SPEED_1
0x08000000
+#define I40E_REG_SPEED_
2
0x10000000
+#define I40E_REG_SPEED_
3 0x18
000000
+#define I40E_REG_SPEED_
4 0x20
000000
uint32_t link_speed;
uint32_t reg_val;
uint32_t link_speed;
uint32_t reg_val;
@@
-2688,26
+2691,35
@@
update_link_reg(struct i40e_hw *hw, struct rte_eth_link *link)
/* Parse the link status */
switch (link_speed) {
/* Parse the link status */
switch (link_speed) {
- case I40E_REG_SPEED_
100MB
:
+ case I40E_REG_SPEED_
0
:
link->link_speed = ETH_SPEED_NUM_100M;
break;
link->link_speed = ETH_SPEED_NUM_100M;
break;
- case I40E_REG_SPEED_1
GB
:
+ case I40E_REG_SPEED_1:
link->link_speed = ETH_SPEED_NUM_1G;
break;
link->link_speed = ETH_SPEED_NUM_1G;
break;
- case I40E_REG_SPEED_
10GB
:
- link->link_speed = ETH_SPEED_NUM_10G;
-
break
;
- case I40E_REG_SPEED_20GB:
-
link->link_speed = ETH_SPEED_NUM_2
0G;
+ case I40E_REG_SPEED_
2
:
+ if (hw->mac.type == I40E_MAC_X722)
+
link->link_speed = ETH_SPEED_NUM_2_5G
;
+ else
+
link->link_speed = ETH_SPEED_NUM_1
0G;
break;
break;
- case I40E_REG_SPEED_25_40GB:
- reg_val = I40E_READ_REG(hw, I40E_PRTMAC_MACC);
+ case I40E_REG_SPEED_3:
+ if (hw->mac.type == I40E_MAC_X722) {
+ link->link_speed = ETH_SPEED_NUM_5G;
+ } else {
+ reg_val = I40E_READ_REG(hw, I40E_PRTMAC_MACC);
- if (reg_val & I40E_REG_MACC_25GB)
- link->link_speed = ETH_SPEED_NUM_25G;
+ if (reg_val & I40E_REG_MACC_25GB)
+ link->link_speed = ETH_SPEED_NUM_25G;
+ else
+ link->link_speed = ETH_SPEED_NUM_40G;
+ }
+ break;
+ case I40E_REG_SPEED_4:
+ if (hw->mac.type == I40E_MAC_X722)
+ link->link_speed = ETH_SPEED_NUM_10G;
else
else
- link->link_speed = ETH_SPEED_NUM_40G;
-
+ link->link_speed = ETH_SPEED_NUM_20G;
break;
default:
PMD_DRV_LOG(ERR, "Unknown link speed info %u", link_speed);
break;
default:
PMD_DRV_LOG(ERR, "Unknown link speed info %u", link_speed);
@@
-4000,7
+4012,7
@@
i40e_priority_flow_ctrl_set(__rte_unused struct rte_eth_dev *dev,
/* Add a MAC address, and update filters */
static int
i40e_macaddr_add(struct rte_eth_dev *dev,
/* Add a MAC address, and update filters */
static int
i40e_macaddr_add(struct rte_eth_dev *dev,
- struct ether_addr *mac_addr,
+ struct
rte_
ether_addr *mac_addr,
__rte_unused uint32_t index,
uint32_t pool)
{
__rte_unused uint32_t index,
uint32_t pool)
{
@@
-4051,7
+4063,7
@@
i40e_macaddr_remove(struct rte_eth_dev *dev, uint32_t index)
struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
struct i40e_vsi *vsi;
struct rte_eth_dev_data *data = dev->data;
struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
struct i40e_vsi *vsi;
struct rte_eth_dev_data *data = dev->data;
- struct ether_addr *macaddr;
+ struct
rte_
ether_addr *macaddr;
int ret;
uint32_t i;
uint64_t pool_sel;
int ret;
uint32_t i;
uint64_t pool_sel;
@@
-4092,8
+4104,8
@@
i40e_vf_mac_filter_set(struct i40e_pf *pf,
{
struct i40e_hw *hw;
struct i40e_mac_filter_info mac_filter;
{
struct i40e_hw *hw;
struct i40e_mac_filter_info mac_filter;
- struct ether_addr old_mac;
- struct ether_addr *new_mac;
+ struct
rte_
ether_addr old_mac;
+ struct
rte_
ether_addr *new_mac;
struct i40e_pf_vf *vf = NULL;
uint16_t vf_id;
int ret;
struct i40e_pf_vf *vf = NULL;
uint16_t vf_id;
int ret;
@@
-4154,7
+4166,7
@@
i40e_vf_mac_filter_set(struct i40e_pf *pf,
/* Clear device address as it has been removed */
if (is_same_ether_addr(&(pf->dev_addr), new_mac))
/* Clear device address as it has been removed */
if (is_same_ether_addr(&(pf->dev_addr), new_mac))
- memset(&pf->dev_addr, 0, sizeof(struct ether_addr));
+ memset(&pf->dev_addr, 0, sizeof(struct
rte_
ether_addr));
}
return 0;
}
return 0;
@@
-5331,7
+5343,7
@@
i40e_update_default_filter_setting(struct i40e_vsi *vsi)
ret = i40e_aq_remove_macvlan(hw, vsi->seid, &def_filter, 1, NULL);
if (ret != I40E_SUCCESS) {
struct i40e_mac_filter *f;
ret = i40e_aq_remove_macvlan(hw, vsi->seid, &def_filter, 1, NULL);
if (ret != I40E_SUCCESS) {
struct i40e_mac_filter *f;
- struct ether_addr *mac;
+ struct
rte_
ether_addr *mac;
PMD_DRV_LOG(DEBUG,
"Cannot remove the default macvlan filter");
PMD_DRV_LOG(DEBUG,
"Cannot remove the default macvlan filter");
@@
-5351,7
+5363,7
@@
i40e_update_default_filter_setting(struct i40e_vsi *vsi)
return ret;
}
rte_memcpy(&filter.mac_addr,
return ret;
}
rte_memcpy(&filter.mac_addr,
- (struct ether_addr *)(hw->mac.perm_addr), ETH_ADDR_LEN);
+ (struct
rte_
ether_addr *)(hw->mac.perm_addr), ETH_ADDR_LEN);
filter.filter_type = RTE_MACVLAN_PERFECT_MATCH;
return i40e_vsi_add_mac(vsi, &filter);
}
filter.filter_type = RTE_MACVLAN_PERFECT_MATCH;
return i40e_vsi_add_mac(vsi, &filter);
}
@@
-5469,7
+5481,7
@@
i40e_vsi_setup(struct i40e_pf *pf,
struct i40e_mac_filter_info filter;
int ret;
struct i40e_vsi_context ctxt;
struct i40e_mac_filter_info filter;
int ret;
struct i40e_vsi_context ctxt;
- struct ether_addr broadcast =
+ struct
rte_
ether_addr broadcast =
{.addr_bytes = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}};
if (type != I40E_VSI_MAIN && type != I40E_VSI_SRIOV &&
{.addr_bytes = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}};
if (type != I40E_VSI_MAIN && type != I40E_VSI_SRIOV &&
@@
-6896,7
+6908,7
@@
DONE:
/* Find out specific MAC filter */
static struct i40e_mac_filter *
i40e_find_mac_filter(struct i40e_vsi *vsi,
/* Find out specific MAC filter */
static struct i40e_mac_filter *
i40e_find_mac_filter(struct i40e_vsi *vsi,
- struct ether_addr *macaddr)
+ struct
rte_
ether_addr *macaddr)
{
struct i40e_mac_filter *f;
{
struct i40e_mac_filter *f;
@@
-6980,7
+6992,7
@@
i40e_set_vlan_filter(struct i40e_vsi *vsi,
int
i40e_find_all_vlan_for_mac(struct i40e_vsi *vsi,
struct i40e_macvlan_filter *mv_f,
int
i40e_find_all_vlan_for_mac(struct i40e_vsi *vsi,
struct i40e_macvlan_filter *mv_f,
- int num, struct ether_addr *addr)
+ int num, struct
rte_
ether_addr *addr)
{
int i;
uint32_t j, k;
{
int i;
uint32_t j, k;
@@
-7274,7
+7286,7
@@
DONE:
}
int
}
int
-i40e_vsi_delete_mac(struct i40e_vsi *vsi, struct ether_addr *addr)
+i40e_vsi_delete_mac(struct i40e_vsi *vsi, struct
rte_
ether_addr *addr)
{
struct i40e_mac_filter *f;
struct i40e_macvlan_filter *mv_f;
{
struct i40e_mac_filter *f;
struct i40e_macvlan_filter *mv_f;
@@
-7574,10
+7586,10
@@
i40e_tunnel_filter_convert(
struct i40e_aqc_cloud_filters_element_bb *cld_filter,
struct i40e_tunnel_filter *tunnel_filter)
{
struct i40e_aqc_cloud_filters_element_bb *cld_filter,
struct i40e_tunnel_filter *tunnel_filter)
{
- ether_addr_copy((struct ether_addr *)&cld_filter->element.outer_mac,
-
(struct
ether_addr *)&tunnel_filter->input.outer_mac);
- ether_addr_copy((struct ether_addr *)&cld_filter->element.inner_mac,
-
(struct
ether_addr *)&tunnel_filter->input.inner_mac);
+ ether_addr_copy((struct
rte_
ether_addr *)&cld_filter->element.outer_mac,
+
(struct rte_
ether_addr *)&tunnel_filter->input.outer_mac);
+ ether_addr_copy((struct
rte_
ether_addr *)&cld_filter->element.inner_mac,
+
(struct rte_
ether_addr *)&tunnel_filter->input.inner_mac);
tunnel_filter->input.inner_vlan = cld_filter->element.inner_vlan;
if ((rte_le_to_cpu_16(cld_filter->element.flags) &
I40E_AQC_ADD_CLOUD_FLAGS_IPV6) ==
tunnel_filter->input.inner_vlan = cld_filter->element.inner_vlan;
if ((rte_le_to_cpu_16(cld_filter->element.flags) &
I40E_AQC_ADD_CLOUD_FLAGS_IPV6) ==
@@
-7686,9
+7698,9
@@
i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
pfilter = cld_filter;
ether_addr_copy(&tunnel_filter->outer_mac,
pfilter = cld_filter;
ether_addr_copy(&tunnel_filter->outer_mac,
- (struct ether_addr *)&pfilter->element.outer_mac);
+ (struct
rte_
ether_addr *)&pfilter->element.outer_mac);
ether_addr_copy(&tunnel_filter->inner_mac,
ether_addr_copy(&tunnel_filter->inner_mac,
- (struct ether_addr *)&pfilter->element.inner_mac);
+ (struct
rte_
ether_addr *)&pfilter->element.inner_mac);
pfilter->element.inner_vlan =
rte_cpu_to_le_16(tunnel_filter->inner_vlan);
pfilter->element.inner_vlan =
rte_cpu_to_le_16(tunnel_filter->inner_vlan);
@@
-8133,9
+8145,9
@@
i40e_dev_consistent_tunnel_filter_set(struct i40e_pf *pf,
pfilter = cld_filter;
ether_addr_copy(&tunnel_filter->outer_mac,
pfilter = cld_filter;
ether_addr_copy(&tunnel_filter->outer_mac,
- (struct ether_addr *)&pfilter->element.outer_mac);
+ (struct
rte_
ether_addr *)&pfilter->element.outer_mac);
ether_addr_copy(&tunnel_filter->inner_mac,
ether_addr_copy(&tunnel_filter->inner_mac,
- (struct ether_addr *)&pfilter->element.inner_mac);
+ (struct
rte_
ether_addr *)&pfilter->element.inner_mac);
pfilter->element.inner_vlan =
rte_cpu_to_le_16(tunnel_filter->inner_vlan);
pfilter->element.inner_vlan =
rte_cpu_to_le_16(tunnel_filter->inner_vlan);
@@
-11939,7
+11951,7
@@
static int i40e_get_module_eeprom(struct rte_eth_dev *dev,
}
static int i40e_set_default_mac_addr(struct rte_eth_dev *dev,
}
static int i40e_set_default_mac_addr(struct rte_eth_dev *dev,
- struct ether_addr *mac_addr)
+ struct
rte_
ether_addr *mac_addr)
{
struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
{
struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
@@
-12072,10
+12084,10
@@
i40e_tunnel_filter_restore(struct i40e_pf *pf)
vsi = vf->vsi;
}
memset(&cld_filter, 0, sizeof(cld_filter));
vsi = vf->vsi;
}
memset(&cld_filter, 0, sizeof(cld_filter));
- ether_addr_copy((struct ether_addr *)&f->input.outer_mac,
- (struct ether_addr *)&cld_filter.element.outer_mac);
- ether_addr_copy((struct ether_addr *)&f->input.inner_mac,
- (struct ether_addr *)&cld_filter.element.inner_mac);
+ ether_addr_copy((struct
rte_
ether_addr *)&f->input.outer_mac,
+ (struct
rte_
ether_addr *)&cld_filter.element.outer_mac);
+ ether_addr_copy((struct
rte_
ether_addr *)&f->input.inner_mac,
+ (struct
rte_
ether_addr *)&cld_filter.element.inner_mac);
cld_filter.element.inner_vlan = f->input.inner_vlan;
cld_filter.element.flags = f->input.flags;
cld_filter.element.tenant_id = f->input.tenant_id;
cld_filter.element.inner_vlan = f->input.inner_vlan;
cld_filter.element.flags = f->input.flags;
cld_filter.element.tenant_id = f->input.tenant_id;