korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-25 05:04:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

PCI: Remove reset_fn field from pci_dev

Browse Source 
"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>
This commit is contained in:
Amey Narkhede 2021-08-17 23:34:55 +05:30 committed by Bjorn Helgaas
parent e20afa0624
commit 4ec36dfeb1
7 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
View File

@ -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);

2
drivers/pci/pci-sysfs.c
View File

@ -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;

6
drivers/pci/pci.c
View File

@ -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))

1
drivers/pci/probe.c
View File

@ -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);
}
/*

2
drivers/pci/quirks.c
View File

@ -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))

1
drivers/pci/remove.c
View File

@ -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);

1
include/linux/pci.h
View File

@ -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 */