Skip to content

Commit

Permalink
net/hns3: refactor send mailbox function
Browse files Browse the repository at this point in the history 
[ upstream commit c9bd98d ]

The 'hns3_send_mbx_msg' function has following problem:
1. the name is vague, missing caller indication
2. too many input parameters because the filling messages
   are placed in commands the send command.

Therefore, a common interface is encapsulated to fill in
the mailbox message before sending it.

Fixes: 463e748 ("net/hns3: support mailbox")

Signed-off-by: Dengdui Huang <[email protected]>
Signed-off-by: Jie Hai <[email protected]>
  • Loading branch information
@huangdengdui1 @kevintraynor
huangdengdui1 authored and kevintraynor committed Apr 11, 2024
1 parent 864254c commit 1f26b7e
Show file tree
Hide file tree
Showing 4 changed files with 120 additions and 103 deletions.
147 changes: 88 additions & 59 deletions drivers/net/hns3/hns3_ethdev_vf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,13 @@ hns3vf_add_uc_mac_addr(struct hns3_hw *hw, struct rte_ether_addr *mac_addr)
{
/* mac address was checked by upper level interface */
char mac_str[RTE_ETHER_ADDR_FMT_SIZE];
struct hns3_vf_to_pf_msg req;
int ret;

ret = hns3_send_mbx_msg(hw, HNS3_MBX_SET_UNICAST,
HNS3_MBX_MAC_VLAN_UC_ADD, mac_addr->addr_bytes,
RTE_ETHER_ADDR_LEN, false, NULL, 0);
hns3vf_mbx_setup(&req, HNS3_MBX_SET_UNICAST,
HNS3_MBX_MAC_VLAN_UC_ADD);
memcpy(req.data, mac_addr->addr_bytes, RTE_ETHER_ADDR_LEN);
ret = hns3vf_mbx_send(hw, &req, false, NULL, 0);
if (ret) {
hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
mac_addr);
Expand All @@ -190,12 +192,13 @@ hns3vf_remove_uc_mac_addr(struct hns3_hw *hw, struct rte_ether_addr *mac_addr)
{
/* mac address was checked by upper level interface */
char mac_str[RTE_ETHER_ADDR_FMT_SIZE];
struct hns3_vf_to_pf_msg req;
int ret;

ret = hns3_send_mbx_msg(hw, HNS3_MBX_SET_UNICAST,
HNS3_MBX_MAC_VLAN_UC_REMOVE,
mac_addr->addr_bytes, RTE_ETHER_ADDR_LEN,
false, NULL, 0);
hns3vf_mbx_setup(&req, HNS3_MBX_SET_UNICAST,
HNS3_MBX_MAC_VLAN_UC_REMOVE);
memcpy(req.data, mac_addr->addr_bytes, RTE_ETHER_ADDR_LEN);
ret = hns3vf_mbx_send(hw, &req, false, NULL, 0);
if (ret) {
hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
mac_addr);
Expand All @@ -214,6 +217,7 @@ hns3vf_set_default_mac_addr(struct rte_eth_dev *dev,
struct rte_ether_addr *old_addr;
uint8_t addr_bytes[HNS3_TWO_ETHER_ADDR_LEN]; /* for 2 MAC addresses */
char mac_str[RTE_ETHER_ADDR_FMT_SIZE];
struct hns3_vf_to_pf_msg req;
int ret;

/*
Expand All @@ -226,9 +230,10 @@ hns3vf_set_default_mac_addr(struct rte_eth_dev *dev,
memcpy(&addr_bytes[RTE_ETHER_ADDR_LEN], old_addr->addr_bytes,
RTE_ETHER_ADDR_LEN);

ret = hns3_send_mbx_msg(hw, HNS3_MBX_SET_UNICAST,
HNS3_MBX_MAC_VLAN_UC_MODIFY, addr_bytes,
HNS3_TWO_ETHER_ADDR_LEN, true, NULL, 0);
hns3vf_mbx_setup(&req, HNS3_MBX_SET_UNICAST,
HNS3_MBX_MAC_VLAN_UC_MODIFY);
memcpy(req.data, addr_bytes, HNS3_TWO_ETHER_ADDR_LEN);
ret = hns3vf_mbx_send(hw, &req, true, NULL, 0);
if (ret) {
/*
* The hns3 VF PMD depends on the hns3 PF kernel ethdev
Expand Down Expand Up @@ -265,12 +270,13 @@ hns3vf_add_mc_mac_addr(struct hns3_hw *hw,
struct rte_ether_addr *mac_addr)
{
char mac_str[RTE_ETHER_ADDR_FMT_SIZE];
struct hns3_vf_to_pf_msg req;
int ret;

ret = hns3_send_mbx_msg(hw, HNS3_MBX_SET_MULTICAST,
HNS3_MBX_MAC_VLAN_MC_ADD,
mac_addr->addr_bytes, RTE_ETHER_ADDR_LEN, false,
NULL, 0);
hns3vf_mbx_setup(&req, HNS3_MBX_SET_MULTICAST,
HNS3_MBX_MAC_VLAN_MC_ADD);
memcpy(req.data, mac_addr->addr_bytes, RTE_ETHER_ADDR_LEN);
ret = hns3vf_mbx_send(hw, &req, false, NULL, 0);
if (ret) {
hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
mac_addr);
Expand All @@ -286,12 +292,13 @@ hns3vf_remove_mc_mac_addr(struct hns3_hw *hw,
struct rte_ether_addr *mac_addr)
{
char mac_str[RTE_ETHER_ADDR_FMT_SIZE];
struct hns3_vf_to_pf_msg req;
int ret;

ret = hns3_send_mbx_msg(hw, HNS3_MBX_SET_MULTICAST,
HNS3_MBX_MAC_VLAN_MC_REMOVE,
mac_addr->addr_bytes, RTE_ETHER_ADDR_LEN, false,
NULL, 0);
hns3vf_mbx_setup(&req, HNS3_MBX_SET_MULTICAST,
HNS3_MBX_MAC_VLAN_MC_REMOVE);
memcpy(req.data, mac_addr->addr_bytes, RTE_ETHER_ADDR_LEN);
ret = hns3vf_mbx_send(hw, &req, false, NULL, 0);
if (ret) {
hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
mac_addr);
Expand Down Expand Up @@ -428,7 +435,6 @@ hns3vf_bind_ring_with_vector(struct hns3_hw *hw, uint16_t vector_id,
bool mmap, enum hns3_ring_type queue_type,
uint16_t queue_id)
{
#define HNS3_RING_VERCTOR_DATA_SIZE 14
struct hns3_vf_to_pf_msg req = {0};
const char *op_str;
int ret;
Expand All @@ -445,8 +451,7 @@ hns3vf_bind_ring_with_vector(struct hns3_hw *hw, uint16_t vector_id,
req.ring_param[0].ring_type = queue_type;
req.ring_param[0].tqp_index = queue_id;
op_str = mmap ? "Map" : "Unmap";
ret = hns3_send_mbx_msg(hw, req.code, 0, (uint8_t *)&req.vector_id,
HNS3_RING_VERCTOR_DATA_SIZE, false, NULL, 0);
ret = hns3vf_mbx_send(hw, &req, false, NULL, 0);
if (ret)
hns3_err(hw, "%s TQP %u fail, vector_id is %u, ret = %d.",
op_str, queue_id, req.vector_id, ret);
Expand Down Expand Up @@ -532,10 +537,12 @@ hns3vf_dev_configure(struct rte_eth_dev *dev)
static int
hns3vf_config_mtu(struct hns3_hw *hw, uint16_t mtu)
{
struct hns3_vf_to_pf_msg req;
int ret;

ret = hns3_send_mbx_msg(hw, HNS3_MBX_SET_MTU, 0, (const uint8_t *)&mtu,
sizeof(mtu), true, NULL, 0);
hns3vf_mbx_setup(&req, HNS3_MBX_SET_MTU, 0);
memcpy(req.data, &mtu, sizeof(mtu));
ret = hns3vf_mbx_send(hw, &req, true, NULL, 0);
if (ret)
hns3_err(hw, "Failed to set mtu (%u) for vf: %d", mtu, ret);

Expand Down Expand Up @@ -721,12 +728,13 @@ hns3vf_get_push_lsc_cap(struct hns3_hw *hw)
uint16_t val = HNS3_PF_PUSH_LSC_CAP_NOT_SUPPORTED;
uint16_t exp = HNS3_PF_PUSH_LSC_CAP_UNKNOWN;
struct hns3_vf *vf = HNS3_DEV_HW_TO_VF(hw);
struct hns3_vf_to_pf_msg req;

__atomic_store_n(&vf->pf_push_lsc_cap, HNS3_PF_PUSH_LSC_CAP_UNKNOWN,
__ATOMIC_RELEASE);

(void)hns3_send_mbx_msg(hw, HNS3_MBX_GET_LINK_STATUS, 0, NULL, 0, false,
NULL, 0);
hns3vf_mbx_setup(&req, HNS3_MBX_GET_LINK_STATUS, 0);
(void)hns3vf_mbx_send(hw, &req, false, NULL, 0);

while (remain_ms > 0) {
rte_delay_ms(HNS3_POLL_RESPONE_MS);
Expand Down Expand Up @@ -821,12 +829,13 @@ hns3vf_check_tqp_info(struct hns3_hw *hw)
static int
hns3vf_get_port_base_vlan_filter_state(struct hns3_hw *hw)
{
struct hns3_vf_to_pf_msg req;
uint8_t resp_msg;
int ret;

ret = hns3_send_mbx_msg(hw, HNS3_MBX_SET_VLAN,
HNS3_MBX_GET_PORT_BASE_VLAN_STATE, NULL, 0,
true, &resp_msg, sizeof(resp_msg));
hns3vf_mbx_setup(&req, HNS3_MBX_SET_VLAN,
HNS3_MBX_GET_PORT_BASE_VLAN_STATE);
ret = hns3vf_mbx_send(hw, &req, true, &resp_msg, sizeof(resp_msg));
if (ret) {
if (ret == -ETIME) {
/*
Expand Down Expand Up @@ -867,10 +876,12 @@ hns3vf_get_queue_info(struct hns3_hw *hw)
{
#define HNS3VF_TQPS_RSS_INFO_LEN 6
uint8_t resp_msg[HNS3VF_TQPS_RSS_INFO_LEN];
struct hns3_vf_to_pf_msg req;
int ret;

ret = hns3_send_mbx_msg(hw, HNS3_MBX_GET_QINFO, 0, NULL, 0, true,
resp_msg, HNS3VF_TQPS_RSS_INFO_LEN);
hns3vf_mbx_setup(&req, HNS3_MBX_GET_QINFO, 0);
ret = hns3vf_mbx_send(hw, &req, true,
resp_msg, HNS3VF_TQPS_RSS_INFO_LEN);
if (ret) {
PMD_INIT_LOG(ERR, "Failed to get tqp info from PF: %d", ret);
return ret;
Expand All @@ -887,10 +898,12 @@ hns3vf_get_queue_depth(struct hns3_hw *hw)
{
#define HNS3VF_TQPS_DEPTH_INFO_LEN 4
uint8_t resp_msg[HNS3VF_TQPS_DEPTH_INFO_LEN];
struct hns3_vf_to_pf_msg req;
int ret;

ret = hns3_send_mbx_msg(hw, HNS3_MBX_GET_QDEPTH, 0, NULL, 0, true,
resp_msg, HNS3VF_TQPS_DEPTH_INFO_LEN);
hns3vf_mbx_setup(&req, HNS3_MBX_GET_QDEPTH, 0);
ret = hns3vf_mbx_send(hw, &req, true,
resp_msg, HNS3VF_TQPS_DEPTH_INFO_LEN);
if (ret) {
PMD_INIT_LOG(ERR, "Failed to get tqp depth info from PF: %d",
ret);
Expand Down Expand Up @@ -929,10 +942,11 @@ hns3vf_get_basic_info(struct hns3_hw *hw)
{
uint8_t resp_msg[HNS3_MBX_MAX_RESP_DATA_SIZE];
struct hns3_basic_info *basic_info;
struct hns3_vf_to_pf_msg req;
int ret;

ret = hns3_send_mbx_msg(hw, HNS3_MBX_GET_BASIC_INFO, 0, NULL, 0,
true, resp_msg, sizeof(resp_msg));
hns3vf_mbx_setup(&req, HNS3_MBX_GET_BASIC_INFO, 0);
ret = hns3vf_mbx_send(hw, &req, true, resp_msg, sizeof(resp_msg));
if (ret) {
hns3_err(hw, "failed to get basic info from PF, ret = %d.",
ret);
Expand All @@ -952,10 +966,11 @@ static int
hns3vf_get_host_mac_addr(struct hns3_hw *hw)
{
uint8_t host_mac[RTE_ETHER_ADDR_LEN];
struct hns3_vf_to_pf_msg req;
int ret;

ret = hns3_send_mbx_msg(hw, HNS3_MBX_GET_MAC_ADDR, 0, NULL, 0,
true, host_mac, RTE_ETHER_ADDR_LEN);
hns3vf_mbx_setup(&req, HNS3_MBX_GET_MAC_ADDR, 0);
ret = hns3vf_mbx_send(hw, &req, true, host_mac, RTE_ETHER_ADDR_LEN);
if (ret) {
hns3_err(hw, "Failed to get mac addr from PF: %d", ret);
return ret;
Expand Down Expand Up @@ -1018,6 +1033,7 @@ static void
hns3vf_request_link_info(struct hns3_hw *hw)
{
struct hns3_vf *vf = HNS3_DEV_HW_TO_VF(hw);
struct hns3_vf_to_pf_msg req;
bool send_req;
int ret;

Expand All @@ -1029,8 +1045,8 @@ hns3vf_request_link_info(struct hns3_hw *hw)
if (!send_req)
return;

ret = hns3_send_mbx_msg(hw, HNS3_MBX_GET_LINK_STATUS, 0, NULL, 0, false,
NULL, 0);
hns3vf_mbx_setup(&req, HNS3_MBX_GET_LINK_STATUS, 0);
ret = hns3vf_mbx_send(hw, &req, false, NULL, 0);
if (ret) {
hns3_err(hw, "failed to fetch link status, ret = %d", ret);
return;
Expand Down Expand Up @@ -1074,16 +1090,18 @@ hns3vf_update_link_status(struct hns3_hw *hw, uint8_t link_status,
static int
hns3vf_vlan_filter_configure(struct hns3_adapter *hns, uint16_t vlan_id, int on)
{
struct hns3_mbx_vlan_filter vlan_filter = {0};
struct hns3_mbx_vlan_filter *vlan_filter;
struct hns3_vf_to_pf_msg req = {0};
struct hns3_hw *hw = &hns->hw;

vlan_filter.is_kill = on ? 0 : 1;
vlan_filter.proto = rte_cpu_to_le_16(RTE_ETHER_TYPE_VLAN);
vlan_filter.vlan_id = rte_cpu_to_le_16(vlan_id);
req.code = HNS3_MBX_SET_VLAN;
req.subcode = HNS3_MBX_VLAN_FILTER;
vlan_filter = (struct hns3_mbx_vlan_filter *)req.data;
vlan_filter->is_kill = on ? 0 : 1;
vlan_filter->proto = rte_cpu_to_le_16(RTE_ETHER_TYPE_VLAN);
vlan_filter->vlan_id = rte_cpu_to_le_16(vlan_id);

return hns3_send_mbx_msg(hw, HNS3_MBX_SET_VLAN, HNS3_MBX_VLAN_FILTER,
(uint8_t *)&vlan_filter, sizeof(vlan_filter),
true, NULL, 0);
return hns3vf_mbx_send(hw, &req, true, NULL, 0);
}

static int
Expand Down Expand Up @@ -1112,16 +1130,18 @@ hns3vf_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
static int
hns3vf_en_vlan_filter(struct hns3_hw *hw, bool enable)
{
struct hns3_vf_to_pf_msg req;
uint8_t msg_data;
int ret;

if (!hns3_dev_get_support(hw, VF_VLAN_FLT_MOD))
return 0;

msg_data = enable ? 1 : 0;
ret = hns3_send_mbx_msg(hw, HNS3_MBX_SET_VLAN,
HNS3_MBX_ENABLE_VLAN_FILTER, &msg_data,
sizeof(msg_data), true, NULL, 0);
hns3vf_mbx_setup(&req, HNS3_MBX_SET_VLAN,
HNS3_MBX_ENABLE_VLAN_FILTER);
memcpy(req.data, &msg_data, sizeof(msg_data));
ret = hns3vf_mbx_send(hw, &req, true, NULL, 0);
if (ret)
hns3_err(hw, "%s vlan filter failed, ret = %d.",
enable ? "enable" : "disable", ret);
Expand All @@ -1132,12 +1152,15 @@ hns3vf_en_vlan_filter(struct hns3_hw *hw, bool enable)
static int
hns3vf_en_hw_strip_rxvtag(struct hns3_hw *hw, bool enable)
{
struct hns3_vf_to_pf_msg req;
uint8_t msg_data;
int ret;

msg_data = enable ? 1 : 0;
ret = hns3_send_mbx_msg(hw, HNS3_MBX_SET_VLAN, HNS3_MBX_VLAN_RX_OFF_CFG,
&msg_data, sizeof(msg_data), false, NULL, 0);
hns3vf_mbx_setup(&req, HNS3_MBX_SET_VLAN,
HNS3_MBX_VLAN_RX_OFF_CFG);
memcpy(req.data, &msg_data, sizeof(msg_data));
ret = hns3vf_mbx_send(hw, &req, false, NULL, 0);
if (ret)
hns3_err(hw, "vf %s strip failed, ret = %d.",
enable ? "enable" : "disable", ret);
Expand Down Expand Up @@ -1281,23 +1304,26 @@ hns3vf_dev_configure_vlan(struct rte_eth_dev *dev)
static int
hns3vf_set_alive(struct hns3_hw *hw, bool alive)
{
struct hns3_vf_to_pf_msg req;
uint8_t msg_data;

msg_data = alive ? 1 : 0;
return hns3_send_mbx_msg(hw, HNS3_MBX_SET_ALIVE, 0, &msg_data,
sizeof(msg_data), false, NULL, 0);
hns3vf_mbx_setup(&req, HNS3_MBX_SET_ALIVE, 0);
memcpy(req.data, &msg_data, sizeof(msg_data));
return hns3vf_mbx_send(hw, &req, false, NULL, 0);
}

static void
hns3vf_keep_alive_handler(void *param)
{
struct rte_eth_dev *eth_dev = (struct rte_eth_dev *)param;
struct hns3_adapter *hns = eth_dev->data->dev_private;
struct hns3_vf_to_pf_msg req;
struct hns3_hw *hw = &hns->hw;
int ret;

ret = hns3_send_mbx_msg(hw, HNS3_MBX_KEEP_ALIVE, 0, NULL, 0,
false, NULL, 0);
hns3vf_mbx_setup(&req, HNS3_MBX_KEEP_ALIVE, 0);
ret = hns3vf_mbx_send(hw, &req, false, NULL, 0);
if (ret)
hns3_err(hw, "VF sends keeping alive cmd failed(=%d)",
ret);
Expand Down Expand Up @@ -1436,9 +1462,11 @@ hns3vf_init_hardware(struct hns3_adapter *hns)
static int
hns3vf_clear_vport_list(struct hns3_hw *hw)
{
return hns3_send_mbx_msg(hw, HNS3_MBX_HANDLE_VF_TBL,
HNS3_MBX_VPORT_LIST_CLEAR, NULL, 0, false,
NULL, 0);
struct hns3_vf_to_pf_msg req;

hns3vf_mbx_setup(&req, HNS3_MBX_HANDLE_VF_TBL,
HNS3_MBX_VPORT_LIST_CLEAR);
return hns3vf_mbx_send(hw, &req, false, NULL, 0);
}

static int
Expand Down Expand Up @@ -1926,12 +1954,13 @@ hns3vf_wait_hardware_ready(struct hns3_adapter *hns)
static int
hns3vf_prepare_reset(struct hns3_adapter *hns)
{
struct hns3_vf_to_pf_msg req;
struct hns3_hw *hw = &hns->hw;
int ret;

if (hw->reset.level == HNS3_VF_FUNC_RESET) {
ret = hns3_send_mbx_msg(hw, HNS3_MBX_RESET, 0, NULL,
0, true, NULL, 0);
hns3vf_mbx_setup(&req, HNS3_MBX_RESET, 0);
ret = hns3vf_mbx_send(hw, &req, true, NULL, 0);
if (ret)
return ret;
}
Expand Down
Loading

0 comments on commit 1f26b7e

Please sign in to comment.