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

Commit 74c88af5 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ena-fixes' 



Netanel Belgazal says:

====================
bug fixes for ENA Ethernet driver

Changes from V1:
Revome incorrect "ena: invoke netif_carrier_off() only after netdev
  registered" patch

This patchset contains 2 bug fixes:
* handle rare race condition during MSI-X initialization
* fix error processing in ena_down()
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 15962a18 ee4552aa

drivers/net/ethernet/amazon/ena/ena_netdev.c

+30 −15
Original line number Original line Diff line number Diff line
@@ -75,6 +75,9 @@ static struct workqueue_struct *ena_wq; 
MODULE_DEVICE_TABLE(pci, ena_pci_tbl);

MODULE_DEVICE_TABLE(pci, ena_pci_tbl);





static int ena_rss_init_default(struct ena_adapter *adapter);

static int ena_rss_init_default(struct ena_adapter *adapter);

static void check_for_admin_com_state(struct ena_adapter *adapter);

static void ena_destroy_device(struct ena_adapter *adapter);

static int ena_restore_device(struct ena_adapter *adapter);





static void ena_tx_timeout(struct net_device *dev)

static void ena_tx_timeout(struct net_device *dev)

{

{
@@ -1565,7 +1568,7 @@ static int ena_rss_configure(struct ena_adapter *adapter) 




static int ena_up_complete(struct ena_adapter *adapter)

static int ena_up_complete(struct ena_adapter *adapter)

{

{

	int rc, i;

	int rc;





	rc = ena_rss_configure(adapter);

	rc = ena_rss_configure(adapter);

	if (rc)

	if (rc)
@@ -1584,17 +1587,6 @@ static int ena_up_complete(struct ena_adapter *adapter) 




	ena_napi_enable_all(adapter);

	ena_napi_enable_all(adapter);





	/* Enable completion queues interrupt */

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

		ena_unmask_interrupt(&adapter->tx_ring[i],

				     &adapter->rx_ring[i]);



	/* schedule napi in case we had pending packets

	 * from the last time we disable napi

	 */

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

		napi_schedule(&adapter->ena_napi[i].napi);



	return 0;

	return 0;

}

}
@@ -1731,7 +1723,7 @@ static int ena_create_all_io_rx_queues(struct ena_adapter *adapter) 




static int ena_up(struct ena_adapter *adapter)

static int ena_up(struct ena_adapter *adapter)

{

{

	int rc;

	int rc, i;





	netdev_dbg(adapter->netdev, "%s\n", __func__);

	netdev_dbg(adapter->netdev, "%s\n", __func__);
@@ -1774,6 +1766,17 @@ static int ena_up(struct ena_adapter *adapter) 




	set_bit(ENA_FLAG_DEV_UP, &adapter->flags);

	set_bit(ENA_FLAG_DEV_UP, &adapter->flags);





	/* Enable completion queues interrupt */

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

		ena_unmask_interrupt(&adapter->tx_ring[i],

				     &adapter->rx_ring[i]);



	/* schedule napi in case we had pending packets

	 * from the last time we disable napi

	 */

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

		napi_schedule(&adapter->ena_napi[i].napi);



	return rc;

	return rc;





err_up:

err_up:
@@ -1884,6 +1887,17 @@ static int ena_close(struct net_device *netdev) 
	if (test_bit(ENA_FLAG_DEV_UP, &adapter->flags))

	if (test_bit(ENA_FLAG_DEV_UP, &adapter->flags))

		ena_down(adapter);

		ena_down(adapter);





	/* Check for device status and issue reset if needed*/

	check_for_admin_com_state(adapter);

	if (unlikely(test_bit(ENA_FLAG_TRIGGER_RESET, &adapter->flags))) {

		netif_err(adapter, ifdown, adapter->netdev,

			  "Destroy failure, restarting device\n");

		ena_dump_stats_to_dmesg(adapter);

		/* rtnl lock already obtained in dev_ioctl() layer */

		ena_destroy_device(adapter);

		ena_restore_device(adapter);

	}



	return 0;

	return 0;

}

}
@@ -2544,11 +2558,12 @@ static void ena_destroy_device(struct ena_adapter *adapter) 




	ena_com_set_admin_running_state(ena_dev, false);

	ena_com_set_admin_running_state(ena_dev, false);





	ena_close(netdev);

	if (test_bit(ENA_FLAG_DEV_UP, &adapter->flags))

		ena_down(adapter);





	/* Before releasing the ENA resources, a device reset is required.

	/* Before releasing the ENA resources, a device reset is required.

	 * (to prevent the device from accessing them).

	 * (to prevent the device from accessing them).

	 * In case the reset flag is set and the device is up, ena_close

	 * In case the reset flag is set and the device is up, ena_down()

	 * already perform the reset, so it can be skipped.

	 * already perform the reset, so it can be skipped.

	 */

	 */

	if (!(test_bit(ENA_FLAG_TRIGGER_RESET, &adapter->flags) && dev_up))

	if (!(test_bit(ENA_FLAG_TRIGGER_RESET, &adapter->flags) && dev_up))