PCI: Remove reset_fn field from pci_dev

"reset_fn" indicates whether the device supports any reset mechanism.
Remove the use of reset_fn in favor of the reset_methods array that tracks
supported reset mechanisms of a device and their ordering.

The octeon driver incorrectly used reset_fn to detect whether the device
supports FLR or not. Use pcie_reset_flr() to probe whether it supports FLR.

Co-developed-by: Alex Williamson <alex.williamson@redhat.com>
Link: https://lore.kernel.org/r/20210817180500.1253-5-ameynarkhede03@gmail.com
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Amey Narkhede <ameynarkhede03@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
Reviewed-by: Raphael Norwitz <raphael.norwitz@nutanix.com>

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
index ffddb3126a3236d5bd99d6755400335adc167dbf..d185df5acea694ad22802b3e9efde48c26011dce 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
@@ -526,7 +526,7 @@ static void octeon_destroy_resources(struct octeon_device *oct)
                        oct->irq_name_storage = NULL;
                }
                /* Soft reset the octeon device before exiting */
-               if (oct->pci_dev->reset_fn)
+               if (!pcie_reset_flr(oct->pci_dev, 1))
                        octeon_pci_flr(oct);
                else
                        cn23xx_vf_ask_pf_to_do_flr(oct);

diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 5d63df7c18206ae416f800fa5f35ea37cb0aab9b..a1d9b0e83615a644a3530e6c7ffbaf2cb44ec241 100644 (file)
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -1367,7 +1367,7 @@ static umode_t pci_dev_reset_attr_is_visible(struct kobject *kobj,
 {
        struct pci_dev *pdev = to_pci_dev(kobj_to_dev(kobj));
 
-       if (!pdev->reset_fn)
+       if (!pci_reset_supported(pdev))
                return 0;
 
        return a->mode;

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 43a823f8dd69328a16074e64e913c788bc0caa5d..5ead8826c702c675f19ce66f8e1441d7208ce636 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -5234,7 +5234,7 @@ int pci_reset_function(struct pci_dev *dev)
 {
        int rc;
 
-       if (!dev->reset_fn)
+       if (!pci_reset_supported(dev))
                return -ENOTTY;
 
        pci_dev_lock(dev);
@@ -5270,7 +5270,7 @@ int pci_reset_function_locked(struct pci_dev *dev)
 {
        int rc;
 
-       if (!dev->reset_fn)
+       if (!pci_reset_supported(dev))
                return -ENOTTY;
 
        pci_dev_save_and_disable(dev);
@@ -5293,7 +5293,7 @@ int pci_try_reset_function(struct pci_dev *dev)
 {
        int rc;
 
-       if (!dev->reset_fn)
+       if (!pci_reset_supported(dev))
                return -ENOTTY;
 
        if (!pci_dev_trylock(dev))

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 817ad149ebd119ef4da05816e03fae30b52c1ff6..3325d4682cd67cd748387cdd788e6bc2b4b6576e 100644 (file)
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -2430,7 +2430,6 @@ static void pci_init_capabilities(struct pci_dev *dev)
 
        pcie_report_downtraining(dev);
        pci_init_reset_methods(dev);
-       dev->reset_fn = pci_reset_supported(dev);
 }
 
 /*

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index a8a167bbc1d704a477633a68ee3b383e667c34a7..a1b57b63c6242bc0039c0479f9f3849c6eacab82 100644 (file)
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -5626,7 +5626,7 @@ static void quirk_reset_lenovo_thinkpad_p50_nvgpu(struct pci_dev *pdev)
 
        if (pdev->subsystem_vendor != PCI_VENDOR_ID_LENOVO ||
            pdev->subsystem_device != 0x222e ||
-           !pdev->reset_fn)
+           !pci_reset_supported(pdev))
                return;
 
        if (pci_enable_device_mem(pdev))

diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index dd12c2fcc7dc106da8e9a25fb3db0566ab668b63..4c54c75050dc12179b53d82425699715d7ad3597 100644 (file)
--- a/drivers/pci/remove.c
+++ b/drivers/pci/remove.c
@@ -19,7 +19,6 @@ static void pci_stop_dev(struct pci_dev *dev)
        pci_pme_active(dev, false);
 
        if (pci_dev_is_added(dev)) {
-               dev->reset_fn = 0;
 
                device_release_driver(&dev->dev);
                pci_proc_detach_device(dev);

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 2faf517d20c13271b350b4d88b5035805805304e..d1f4d248617b57ebea4a73d05091697aa6fc2f8a 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -431,7 +431,6 @@ struct pci_dev {
        unsigned int    state_saved:1;
        unsigned int    is_physfn:1;
        unsigned int    is_virtfn:1;
-       unsigned int    reset_fn:1;
        unsigned int    is_hotplug_bridge:1;
        unsigned int    shpc_managed:1;         /* SHPC owned by shpchp */
        unsigned int    is_thunderbolt:1;       /* Thunderbolt controller */