Commit 0dd563b9 authored by Vadim Lomovtsev's avatar Vadim Lomovtsev Committed by David S. Miller
Browse files

net: thunderx: make CFG_DONE message to run through generic send-ack sequence 



At the end of NIC VF initialization VF sends CFG_DONE message to PF without
using nicvf_msg_send_to_pf routine. This potentially could re-write data in
mailbox. This commit is to implement common way of sending CFG_DONE message
by the same way with other configuration messages by using
nicvf_send_msg_to_pf() routine.

Signed-off-by: default avatarVadim Lomovtsev <vlomovtsev@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2ecbe4f4

drivers/net/ethernet/cavium/thunder/nic_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1039,7 +1039,7 @@ static void nic_handle_mbx_intr(struct nicpf *nic, int vf) 
	case NIC_MBOX_MSG_CFG_DONE:

		/* Last message of VF config msg sequence */

		nic_enable_vf(nic, vf, true);

		goto unlock;

		break;

	case NIC_MBOX_MSG_SHUTDOWN:

		/* First msg in VF teardown sequence */

		if (vf >= nic->num_vf_en)

drivers/net/ethernet/cavium/thunder/nicvf_main.c

+12 −3
Original line number Diff line number Diff line
@@ -169,6 +169,17 @@ static int nicvf_check_pf_ready(struct nicvf *nic) 
	return 1;

}



static void nicvf_send_cfg_done(struct nicvf *nic)

{

	union nic_mbx mbx = {};



	mbx.msg.msg = NIC_MBOX_MSG_CFG_DONE;

	if (nicvf_send_msg_to_pf(nic, &mbx)) {

		netdev_err(nic->netdev,

			   "PF didn't respond to CFG DONE msg\n");

	}

}



static void nicvf_read_bgx_stats(struct nicvf *nic, struct bgx_stats_msg *bgx)

{

	if (bgx->rx)
@@ -1416,7 +1427,6 @@ int nicvf_open(struct net_device *netdev) 
	struct nicvf *nic = netdev_priv(netdev);

	struct queue_set *qs = nic->qs;

	struct nicvf_cq_poll *cq_poll = NULL;

	union nic_mbx mbx = {};



	/* wait till all queued set_rx_mode tasks completes if any */

	drain_workqueue(nic->nicvf_rx_mode_wq);
@@ -1515,8 +1525,7 @@ int nicvf_open(struct net_device *netdev) 
		nicvf_enable_intr(nic, NICVF_INTR_RBDR, qidx);



	/* Send VF config done msg to PF */

	mbx.msg.msg = NIC_MBOX_MSG_CFG_DONE;

	nicvf_write_to_mbx(nic, &mbx);

	nicvf_send_cfg_done(nic);



	return 0;

cleanup:

CRA Git | Maintained and supported by SUSTech CRA and CCSE