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/cxgbe: support flow API for matching QinQ VLAN
[dpdk.git]
/
drivers
/
net
/
iavf
/
iavf_vchnl.c
diff --git
a/drivers/net/iavf/iavf_vchnl.c
b/drivers/net/iavf/iavf_vchnl.c
index
6381fb6
..
fa4da3a
100644
(file)
--- a/
drivers/net/iavf/iavf_vchnl.c
+++ b/
drivers/net/iavf/iavf_vchnl.c
@@
-19,11
+19,6
@@
#include <rte_ethdev_driver.h>
#include <rte_dev.h>
#include <rte_ethdev_driver.h>
#include <rte_dev.h>
-#include "iavf_log.h"
-#include "base/iavf_prototype.h"
-#include "base/iavf_adminq_cmd.h"
-#include "base/iavf_type.h"
-
#include "iavf.h"
#include "iavf_rxtx.h"
#include "iavf.h"
#include "iavf_rxtx.h"
@@
-31,7
+26,7
@@
#define ASQ_DELAY_MS 10
/* Read data in admin queue to get msg from pf driver */
#define ASQ_DELAY_MS 10
/* Read data in admin queue to get msg from pf driver */
-static enum iavf_status
_code
+static enum iavf_status
iavf_read_msg_from_pf(struct iavf_adapter *adapter, uint16_t buf_len,
uint8_t *buf)
{
iavf_read_msg_from_pf(struct iavf_adapter *adapter, uint16_t buf_len,
uint8_t *buf)
{
@@
-69,7
+64,7
@@
iavf_execute_vf_cmd(struct iavf_adapter *adapter, struct iavf_cmd_info *args)
{
struct iavf_hw *hw = IAVF_DEV_PRIVATE_TO_HW(adapter);
struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);
{
struct iavf_hw *hw = IAVF_DEV_PRIVATE_TO_HW(adapter);
struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);
- enum iavf_status
_code
ret;
+ enum iavf_status ret;
int err = 0;
int i = 0;
int err = 0;
int i = 0;
@@
-153,7
+148,7
@@
iavf_handle_pf_event_msg(struct rte_eth_dev *dev, uint8_t *msg,
case VIRTCHNL_EVENT_LINK_CHANGE:
PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_LINK_CHANGE event");
vf->link_up = pf_msg->event_data.link_event.link_status;
case VIRTCHNL_EVENT_LINK_CHANGE:
PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_LINK_CHANGE event");
vf->link_up = pf_msg->event_data.link_event.link_status;
- vf->link_speed = pf_msg->event_data.link_event.link_speed;
+ vf->link_speed = pf_msg->event_data.link_event
_adv
.link_speed;
iavf_dev_link_update(dev, 0);
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC,
NULL);
iavf_dev_link_update(dev, 0);
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC,
NULL);
@@
-175,7
+170,7
@@
iavf_handle_virtchnl_msg(struct rte_eth_dev *dev)
struct iavf_arq_event_info info;
uint16_t pending, aq_opc;
enum virtchnl_ops msg_opc;
struct iavf_arq_event_info info;
uint16_t pending, aq_opc;
enum virtchnl_ops msg_opc;
- enum iavf_status
_code
msg_ret;
+ enum iavf_status msg_ret;
int ret;
info.buf_len = IAVF_AQ_BUF_SZ;
int ret;
info.buf_len = IAVF_AQ_BUF_SZ;
@@
-201,7
+196,7
@@
iavf_handle_virtchnl_msg(struct rte_eth_dev *dev)
*/
msg_opc = (enum virtchnl_ops)rte_le_to_cpu_32(
info.desc.cookie_high);
*/
msg_opc = (enum virtchnl_ops)rte_le_to_cpu_32(
info.desc.cookie_high);
- msg_ret = (enum iavf_status
_code
)rte_le_to_cpu_32(
+ msg_ret = (enum iavf_status)rte_le_to_cpu_32(
info.desc.cookie_low);
switch (aq_opc) {
case iavf_aqc_opc_send_msg_to_vf:
info.desc.cookie_low);
switch (aq_opc) {
case iavf_aqc_opc_send_msg_to_vf:
@@
-210,12
+205,9
@@
iavf_handle_virtchnl_msg(struct rte_eth_dev *dev)
info.msg_len);
} else {
/* read message and it's expected one */
info.msg_len);
} else {
/* read message and it's expected one */
- if (msg_opc == vf->pend_cmd) {
- vf->cmd_retval = msg_ret;
- /* prevent compiler reordering */
- rte_compiler_barrier();
- _clear_cmd(vf);
- } else
+ if (msg_opc == vf->pend_cmd)
+ _notify_cmd(vf, msg_ret);
+ else
PMD_DRV_LOG(ERR, "command mismatch,"
"expect %u, get %u",
vf->pend_cmd, msg_opc);
PMD_DRV_LOG(ERR, "command mismatch,"
"expect %u, get %u",
vf->pend_cmd, msg_opc);
@@
-344,7
+336,7
@@
iavf_get_vf_resource(struct iavf_adapter *adapter)
* add advanced/optional offload capabilities
*/
* add advanced/optional offload capabilities
*/
- caps = IAVF_BASIC_OFFLOAD_CAPS;
+ caps = IAVF_BASIC_OFFLOAD_CAPS
| VIRTCHNL_VF_CAP_ADV_LINK_SPEED
;
args.in_args = (uint8_t *)∩︀
args.in_args_size = sizeof(caps);
args.in_args = (uint8_t *)∩︀
args.in_args_size = sizeof(caps);
@@
-363,7
+355,7
@@
iavf_get_vf_resource(struct iavf_adapter *adapter)
rte_memcpy(vf->vf_res, args.out_buffer,
RTE_MIN(args.out_size, len));
/* parse VF config message back from PF*/
rte_memcpy(vf->vf_res, args.out_buffer,
RTE_MIN(args.out_size, len));
/* parse VF config message back from PF*/
- iavf_parse_hw_config(hw, vf->vf_res);
+ iavf_
vf_
parse_hw_config(hw, vf->vf_res);
for (i = 0; i < vf->vf_res->num_vsis; i++) {
if (vf->vf_res->vsi_res[i].vsi_type == VIRTCHNL_VSI_SRIOV)
vf->vsi_res = &vf->vf_res->vsi_res[i];
for (i = 0; i < vf->vf_res->num_vsis; i++) {
if (vf->vf_res->vsi_res[i].vsi_type == VIRTCHNL_VSI_SRIOV)
vf->vsi_res = &vf->vf_res->vsi_res[i];
@@
-636,7
+628,7
@@
iavf_add_del_all_mac_addr(struct iavf_adapter *adapter, bool add)
{
struct virtchnl_ether_addr_list *list;
struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);
{
struct virtchnl_ether_addr_list *list;
struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);
- struct ether_addr *addr;
+ struct
rte_
ether_addr *addr;
struct iavf_cmd_info args;
int len, err, i, j;
int next_begin = 0;
struct iavf_cmd_info args;
int len, err, i, j;
int next_begin = 0;
@@
-647,7
+639,7
@@
iavf_add_del_all_mac_addr(struct iavf_adapter *adapter, bool add)
len = sizeof(struct virtchnl_ether_addr_list);
for (i = begin; i < IAVF_NUM_MACADDR_MAX; i++, next_begin++) {
addr = &adapter->eth_dev->data->mac_addrs[i];
len = sizeof(struct virtchnl_ether_addr_list);
for (i = begin; i < IAVF_NUM_MACADDR_MAX; i++, next_begin++) {
addr = &adapter->eth_dev->data->mac_addrs[i];
- if (is_zero_ether_addr(addr))
+ if (
rte_
is_zero_ether_addr(addr))
continue;
len += sizeof(struct virtchnl_ether_addr);
if (len >= IAVF_AQ_BUF_SZ) {
continue;
len += sizeof(struct virtchnl_ether_addr);
if (len >= IAVF_AQ_BUF_SZ) {
@@
-664,7
+656,7
@@
iavf_add_del_all_mac_addr(struct iavf_adapter *adapter, bool add)
for (i = begin; i < next_begin; i++) {
addr = &adapter->eth_dev->data->mac_addrs[i];
for (i = begin; i < next_begin; i++) {
addr = &adapter->eth_dev->data->mac_addrs[i];
- if (is_zero_ether_addr(addr))
+ if (
rte_
is_zero_ether_addr(addr))
continue;
rte_memcpy(list->list[j].addr, addr->addr_bytes,
sizeof(addr->addr_bytes));
continue;
rte_memcpy(list->list[j].addr, addr->addr_bytes,
sizeof(addr->addr_bytes));
@@
-753,7
+745,7
@@
iavf_config_promisc(struct iavf_adapter *adapter,
}
int
}
int
-iavf_add_del_eth_addr(struct iavf_adapter *adapter, struct ether_addr *addr,
+iavf_add_del_eth_addr(struct iavf_adapter *adapter, struct
rte_
ether_addr *addr,
bool add)
{
struct virtchnl_ether_addr_list *list;
bool add)
{
struct virtchnl_ether_addr_list *list;