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: Derek Chickles <derek.chickles@caviumnetworks.com>
Signed-off-by: Satanand Burla <satananda.burla@caviumnetworks.com>
Signed-off-by: Felix Manlunas <felix.manlunas@caviumnetworks.com>
Signed-off-by: Raghu Vatsavayi <raghu.vatsavayi@caviumnetworks.com>
Signed-off-by: Raghu Vatsavayi <rvatsavayi@caviumnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c
index 4440086aaef184cb2b1ded18abd8eb275fe80c55..56b1d6710be130236bb2997330a2b9e7c846f1e6 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -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) */