ionic: rearrange reset and bus-master control

We can prevent potential incorrect DMA access attempts from the
NIC by enabling bus-master after the reset, and by disabling
bus-master earlier in cleanup.

Signed-off-by: Shannon Nelson <snelson@pensando.io>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
index 2924cde..85c686c 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
@@ -247,12 +247,11 @@ static int ionic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto err_out_pci_disable_device;
        }
 
-       pci_set_master(pdev);
        pcie_print_link_status(pdev);
 
        err = ionic_map_bars(ionic);
        if (err)
-               goto err_out_pci_clear_master;
+               goto err_out_pci_disable_device;
 
        /* Configure the device */
        err = ionic_setup(ionic);
@@ -260,6 +259,7 @@ static int ionic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                dev_err(dev, "Cannot setup device: %d, aborting\n", err);
                goto err_out_unmap_bars;
        }
+       pci_set_master(pdev);
 
        err = ionic_identify(ionic);
        if (err) {
@@ -350,6 +350,7 @@ err_out_reset:
        ionic_reset(ionic);
 err_out_teardown:
        ionic_dev_teardown(ionic);
+       pci_clear_master(pdev);
        /* Don't fail the probe for these errors, keep
         * the hw interface around for inspection
         */
@@ -358,8 +359,6 @@ err_out_teardown:
 err_out_unmap_bars:
        ionic_unmap_bars(ionic);
        pci_release_regions(pdev);
-err_out_pci_clear_master:
-       pci_clear_master(pdev);
 err_out_pci_disable_device:
        pci_disable_device(pdev);
 err_out_debugfs_del_dev:
@@ -389,9 +388,9 @@ static void ionic_remove(struct pci_dev *pdev)
        ionic_port_reset(ionic);
        ionic_reset(ionic);
        ionic_dev_teardown(ionic);
+       pci_clear_master(pdev);
        ionic_unmap_bars(ionic);
        pci_release_regions(pdev);
-       pci_clear_master(pdev);
        pci_disable_device(pdev);
        ionic_debugfs_del_dev(ionic);
        mutex_destroy(&ionic->dev_cmd_lock);