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

Commit 60b48c5a authored by Raghu Vatsavayi's avatar Raghu Vatsavayi Committed by David S. Miller
Browse files

liquidio: chip reset changes 



This patch resolves the order of chip reset while destroying
the resources by postoponing soft reset in destroy resources
function until all queues are removed properly.

Signed-off-by: default avatarDerek Chickles <derek.chickles@caviumnetworks.com>
Signed-off-by: default avatarSatanand Burla <satananda.burla@caviumnetworks.com>
Signed-off-by: default avatarFelix Manlunas <felix.manlunas@caviumnetworks.com>
Signed-off-by: default avatarRaghu Vatsavayi <raghu.vatsavayi@caviumnetworks.com>
Signed-off-by: default avatarRaghu Vatsavayi <rvatsavayi@caviumnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 60441888

drivers/net/ethernet/cavium/liquidio/lio_main.c

+7 −6
Original line number Diff line number Diff line
@@ -1180,12 +1180,6 @@ static void octeon_destroy_resources(struct octeon_device *oct) 
		if (oct->flags & LIO_FLAG_MSI_ENABLED)

			pci_disable_msi(oct->pci_dev);



		/* Soft reset the octeon device before exiting */

		oct->fn_list.soft_reset(oct);



		/* Disable the device, releasing the PCI INT */

		pci_disable_device(oct->pci_dev);



		/* fallthrough */

	case OCT_DEV_IN_RESET:

	case OCT_DEV_DROQ_INIT_DONE:
@@ -1232,11 +1226,18 @@ static void octeon_destroy_resources(struct octeon_device *oct) 


		/* fallthrough */

	case OCT_DEV_PCI_MAP_DONE:



		/* Soft reset the octeon device before exiting */

		oct->fn_list.soft_reset(oct);



		octeon_unmap_pci_barx(oct, 0);

		octeon_unmap_pci_barx(oct, 1);



		/* fallthrough */

	case OCT_DEV_BEGIN_STATE:

		/* Disable the device, releasing the PCI INT */

		pci_disable_device(oct->pci_dev);



		/* Nothing to be done here either */

		break;

	}                       /* end switch(oct->status) */