Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d944c3d6 authored by John Allen's avatar John Allen Committed by David S. Miller
Browse files

ibmvnic: Track state of adapter napis 



Track the state of ibmvnic napis. The driver can get into states where it
can be reset when napis are already disabled and attempting to disable them
again will cause the driver to hang.

Signed-off-by: default avatarJohn Allen <jallen@linux.vnet.ibm.com>
Signed-off-by: default avatarNathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0ca37375

drivers/net/ethernet/ibm/ibmvnic.c

+28 −9
Original line number Diff line number Diff line
@@ -518,6 +518,32 @@ static void release_error_buffers(struct ibmvnic_adapter *adapter) 
	spin_unlock_irqrestore(&adapter->error_list_lock, flags);

}



static void ibmvnic_napi_enable(struct ibmvnic_adapter *adapter)

{

	int i;



	if (adapter->napi_enabled)

		return;



	for (i = 0; i < adapter->req_rx_queues; i++)

		napi_enable(&adapter->napi[i]);



	adapter->napi_enabled = true;

}



static void ibmvnic_napi_disable(struct ibmvnic_adapter *adapter)

{

	int i;



	if (!adapter->napi_enabled)

		return;



	for (i = 0; i < adapter->req_rx_queues; i++)

		napi_disable(&adapter->napi[i]);



	adapter->napi_enabled = false;

}



static int ibmvnic_login(struct net_device *netdev)

{

	struct ibmvnic_adapter *adapter = netdev_priv(netdev);
@@ -674,9 +700,7 @@ static int __ibmvnic_open(struct net_device *netdev) 


	adapter->state = VNIC_OPENING;

	replenish_pools(adapter);



	for (i = 0; i < adapter->req_rx_queues; i++)

		napi_enable(&adapter->napi[i]);

	ibmvnic_napi_enable(adapter);



	/* We're ready to receive frames, enable the sub-crq interrupts and

	 * set the logical link state to up
@@ -779,12 +803,7 @@ static int __ibmvnic_close(struct net_device *netdev) 


	adapter->state = VNIC_CLOSING;

	netif_tx_stop_all_queues(netdev);



	if (adapter->napi) {

		for (i = 0; i < adapter->req_rx_queues; i++)

			napi_disable(&adapter->napi[i]);

	}



	ibmvnic_napi_disable(adapter);

	clean_tx_pools(adapter);



	if (adapter->tx_scrq) {

drivers/net/ethernet/ibm/ibmvnic.h

+1 −0
Original line number Diff line number Diff line
@@ -1031,4 +1031,5 @@ struct ibmvnic_adapter { 
	struct list_head rwi_list;

	struct work_struct ibmvnic_reset;

	bool resetting;

	bool napi_enabled;

};