net: hns3: refine the definition for struct hclge_pf_to_vf_msg

The struct hclge_pf_to_vf_msg is used for mailbox message from
PF to VF, including both response and request. But its definition
can only indicate respone, which makes the message data copy in
function hclge_send_mbx_msg() unreadable. So refine it by edding
a general message definition into it.

Signed-off-by: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h b/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h
index b668df6..8c7fadf 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h
@@ -135,10 +135,19 @@ struct hclge_vf_to_pf_msg {
 
 struct hclge_pf_to_vf_msg {
        u16 code;
-       u16 vf_mbx_msg_code;
-       u16 vf_mbx_msg_subcode;
-       u16 resp_status;
-       u8 resp_data[HCLGE_MBX_MAX_RESP_DATA_SIZE];
+       union {
+               /* used for mbx response */
+               struct {
+                       u16 vf_mbx_msg_code;
+                       u16 vf_mbx_msg_subcode;
+                       u16 resp_status;
+                       u8 resp_data[HCLGE_MBX_MAX_RESP_DATA_SIZE];
+               };
+               /* used for general mbx */
+               struct {
+                       u8 msg_data[HCLGE_MBX_MAX_MSG_SIZE];
+               };
+       };
 };
 
 struct hclge_mbx_vf_to_pf_cmd {

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c
index 6799d16..76d0f17 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c
@@ -102,7 +102,7 @@ static int hclge_send_mbx_msg(struct hclge_vport *vport, u8 *msg, u16 msg_len,
        resp_pf_to_vf->msg_len = msg_len;
        resp_pf_to_vf->msg.code = mbx_opcode;
 
-       memcpy(&resp_pf_to_vf->msg.vf_mbx_msg_code, msg, msg_len);
+       memcpy(resp_pf_to_vf->msg.msg_data, msg, msg_len);
 
        trace_hclge_pf_mbx_send(hdev, resp_pf_to_vf);