Expose and manage PCI device reset
Subsystems (6)
v6 cover Expose and manage PCI device reset
PCI and PCIe devices may support a number of possible reset mechanisms for example Function Level Reset (FLR) provided via Advanced Feature or PCIe capabilities, Power Management reset, bus reset, or device specific reset. Currently the PCI subsystem creates a policy prioritizing these reset methods which provides neither visibility nor control to userspace.
Expose the reset methods available per device to userspace, via sysfs and allow an administrative user or device owner to have ability to manage per device reset method priorities or exclusions. This feature aims to allow greater control of a device for use cases as device assignment, where specific device or platform issues may interact poorly with a given reset method, and for which device specific quirks have not been developed.
Changes in v6:
- Address Bjorn's and Krzysztof's review comments
- Add Shanker's updated patches along with new "PCI: Setup ACPI_COMPANION early" patch
Changes in v5:
- Rebase the series over pci/reset branch of Bjorn's pci tree to avoid merge conflicts caused by recent changes in existing reset sysfs attribute
Changes in v4:
- Change the order or strlen and strim in reset_method_store function to avoid extra strlen call.
- Use consistent terminology in new pci_reset_mode enum and rename the probe argument of reset functions.
Changes in v3:
- Dropped "PCI: merge slot and bus reset implementations" which was already accepted separately
- Grammar fixes
- Added Shanker's patches which were rebased on v2 of this series
- Added "PCI: Change the type of probe argument in reset functions" and additional user input sanitization code in reset_method_store function per review feedback from Krzysztof
Changes in v2:
- Use byte array instead of bitmap to keep track of ordering of reset methods
- Fix incorrect use of reset_fn field in octeon driver
- Allow writing comma separated list of names of supported reset methods to reset_method sysfs attribute
- Writing empty string instead of "none" to reset_method attribute disables ability of reset the device
Amey Narkhede (5):
PCI: Add pcie_reset_flr to follow calling convention of other reset
methods
PCI: Add new array for keeping track of ordering of reset methods
PCI: Remove reset_fn field from pci_dev
PCI/sysfs: Allow userspace to query and set device reset mechanism
PCI: Change the type of probe argument in reset functions
Shanker Donthineni (3):
PCI: Setup ACPI_COMPANION early
PCI: Add support for ACPI _RST reset method
PCI: Enable NO_BUS_RESET quirk for Nvidia GPUs
Documentation/ABI/testing/sysfs-bus-pci | 16 ++ drivers/crypto/cavium/nitrox/nitrox_main.c | 4 +- .../ethernet/cavium/liquidio/lio_vf_main.c | 2 +- drivers/pci/hotplug/pciehp.h | 2 +- drivers/pci/hotplug/pciehp_hpc.c | 4 +- drivers/pci/pci-acpi.c | 39 ++- drivers/pci/pci-sysfs.c | 120 ++++++++- drivers/pci/pci.c | 238 +++++++++++------- drivers/pci/pci.h | 22 +- drivers/pci/pcie/aer.c | 12 +- drivers/pci/probe.c | 6 +- drivers/pci/quirks.c | 54 ++-- drivers/pci/remove.c | 1 - include/linux/pci.h | 16 +- include/linux/pci_hotplug.h | 2 +- 15 files changed, 393 insertions(+), 145 deletions(-)
--
2.31.1
PATCH v6 1/8 PCI: Add pcie_reset_flr to follow calling convention of other reset methods
Currently there is separate function pcie_has_flr() to probe if pcie flr is supported by the device which does not match the calling convention followed by reset methods which use second function argument to decide whether to probe or not. Add new function pcie_reset_flr() that follows the calling convention of reset methods.
--- drivers/crypto/cavium/nitrox/nitrox_main.c | 4 +- drivers/pci/pci.c | 62 ++++++++++++---------- drivers/pci/pcie/aer.c | 12 ++--- drivers/pci/quirks.c | 9 ++-- include/linux/pci.h | 2 +- 5 files changed, 43 insertions(+), 46 deletions(-)
drivers/crypto/cavium/nitrox/nitrox_main.c +1 -3
@@ -306,9 +306,7 @@ static int nitrox_device_flr(struct pci_dev *pdev)return -ENOMEM ; } -/* check flr support */ -if (pcie_has_flr (pdev)) -pcie_flr (pdev); +pcie_reset_flr (pdev,0 );pci_restore_state (pdev);
drivers/pci/pci.c +33 -29
90 lines not on this page · raw message
drivers/pci/pcie/aer.c +5 -7
@@ -1405,13 +1405,11 @@ static pci_ers_result_t aer_root_reset(struct pci_dev *dev) }if (type ==PCI_EXP_TYPE_RC_EC || type ==PCI_EXP_TYPE_RC_END ) { -if (pcie_has_flr (dev)) { - rc =pcie_flr (dev); -pci_info (dev,"has been reset (%d)\n" , rc); - }else { -pci_info (dev,"not reset (no FLR support)\n" ); - rc = -ENOTTY ; - } + rc =pcie_reset_flr (dev,0 ); +if (!rc) +pci_info (dev,"has been reset\n" ); +else +pci_info (dev,"not reset (no FLR support: %d)\n" , rc); }else { rc =pci_bus_error_reset (dev); pci_info(dev, "%s Port link has been reset (%d)\n",
drivers/pci/quirks.c +3 -6
@@ -3819,7 +3819,7 @@ static int nvme_disable_and_flr(struct pci_dev *dev, int probe)u32 cfg;if (dev->class !=PCI_CLASS_STORAGE_EXPRESS || - !pcie_has_flr (dev) || !pci_resource_start (dev,0 )) +pcie_reset_flr (dev,1 ) || !pci_resource_start (dev,0 ))return -ENOTTY ;if (probe)
@@ -3888,13 +3888,10 @@ static int nvme_disable_and_flr(struct pci_dev *dev, int probe)*/ static int delay_250ms_after_flr (struct pci_dev *dev,int probe) { -if (!pcie_has_flr (dev)) -return -ENOTTY ; +int ret =pcie_reset_flr (dev, probe);if (probe) -return 0 ; - -pcie_flr (dev); +return ret;msleep (250 );
include/linux/pci.h +1 -1
@@ -1225,7 +1225,7 @@ u32 pcie_bandwidth_available(struct pci_dev *dev, struct pci_dev **limiting_dev,enum pci_bus_speed *speed, enum pcie_link_width *width);void pcie_print_link_status (struct pci_dev *dev); -bool pcie_has_flr (struct pci_dev *dev); +int pcie_reset_flr (struct pci_dev *dev,int probe);int pcie_flr (struct pci_dev *dev);int __pci_reset_function_locked (struct pci_dev *dev);int pci_reset_function (struct pci_dev *dev);
Signature · 1 line
2.31.1
PATCH v6 2/8 PCI: Add new array for keeping track of ordering of reset methods
In reply to Amey NarkhedeIntroduce a new array reset_methods in struct pci_dev to keep track of reset mechanisms supported by the device and their ordering. Also refactor probing and reset functions to take advantage of calling convention of reset functions.
--- drivers/pci/pci.c | 108 ++++++++++++++++++++++++++------------------ drivers/pci/pci.h | 8 +++- drivers/pci/probe.c | 5 +- include/linux/pci.h | 7 +++ 4 files changed, 81 insertions(+), 47 deletions(-)
drivers/pci/pci.c +65 -43
@@ -72,6 +72,14 @@ static void pci_dev_d3_sleep(struct pci_dev *dev)msleep (delay); } +bool pci_reset_supported (struct pci_dev *dev) +{ +u8 null_reset_methods[PCI_RESET_METHODS_NUM ] = {0 }; + +return memcmp (null_reset_methods, + dev->reset_methods,PCI_RESET_METHODS_NUM ); +} +#ifdef CONFIG_PCI_DOMAINS int pci_domains_supported =1 ;#endif
@@ -5107,6 +5115,18 @@ static void pci_dev_restore(struct pci_dev *dev) err_handler->reset_done (dev); } +/* +* The ordering for functions in pci_reset_fn_methods is required for +* reset_methods byte array defined in struct pci_dev. +*/ +const struct pci_reset_fn_method pci_reset_fn_methods[] = { + { &pci_dev_specific_reset, .name ="device_specific" }, + { &pcie_reset_flr, .name ="flr" }, + { &pci_af_flr, .name ="af_flr" }, + { &pci_pm_reset, .name ="pm" }, + { &pci_reset_bus_function, .name ="bus" }, +}; +/** * __pci_reset_function_locked - reset a PCI device function while holding * the @dev mutex lock.
@@ -5129,65 +5149,67 @@ static void pci_dev_restore(struct pci_dev *dev)*/ int __pci_reset_function_locked (struct pci_dev *dev) { -int rc; +int i, rc = -ENOTTY ; +u8 prio;might_sleep (); -/* -* A reset method returns -ENOTTY if it doesn't support this device -* and we should try the next method. -* -* If it returns 0 (success), we're finished. If it returns any -* other error, we're also finished: this indicates that further -* reset mechanisms might be broken on the device. -*/ - rc =pci_dev_specific_reset (dev,0 ); -if (rc != -ENOTTY ) -return rc; - rc =pcie_reset_flr (dev,0 ); -if (rc != -ENOTTY ) -return rc; - rc =pci_af_flr (dev,0 ); -if (rc != -ENOTTY ) -return rc; - rc =pci_pm_reset (dev,0 ); -if (rc != -ENOTTY ) -return rc; -return pci_reset_bus_function (dev,0 ); +for (prio =PCI_RESET_METHODS_NUM ; prio; prio--) { +for (i =0 ; i <PCI_RESET_METHODS_NUM ; i++) { +if (dev->reset_methods[i] == prio) { +/* +* A reset method returns -ENOTTY if it doesn't +* support this device and we should try the +* next method. +* +* If it returns 0 (success), we're finished. +* If it returns any other error, we're also +* finished: this indicates that further reset +* mechanisms might be broken on the device. +*/ + rc = pci_reset_fn_methods[i].reset_fn (dev,0 ); +if (rc != -ENOTTY ) +return rc; +break ; + } + } +if (i ==PCI_RESET_METHODS_NUM ) +break ; + } +return rc; }EXPORT_SYMBOL_GPL (__pci_reset_function_locked);/** -* pci_probe_reset_function - check whether the device can be safely reset -* @dev: PCI device to reset +* pci_init_reset_methods - check whether device can be safely reset +* and store supported reset mechanisms. +* @dev: PCI device to check for reset mechanisms * * Some devices allow an individual function to be reset without affecting * other functions in the same device. The PCI device must be responsive -* to PCI config space in order to use this function. +* to reads and writes to its PCI config space in order to use this function. * -* Returns 0 if the device function can be reset or negative if the -* device doesn't support resetting a single function. +* Stores reset mechanisms supported by device in reset_methods byte array +* which is a member of struct pci_dev. */ -int pci_probe_reset_function (struct pci_dev *dev) +void pci_init_reset_methods (struct pci_dev *dev) { -int rc; +int i, rc; +u8 prio =PCI_RESET_METHODS_NUM ; +u8 reset_methods[PCI_RESET_METHODS_NUM ] = {0 }; -might_sleep (); +BUILD_BUG_ON (ARRAY_SIZE (pci_reset_fn_methods) !=PCI_RESET_METHODS_NUM ); - rc =pci_dev_specific_reset (dev,1 ); -if (rc != -ENOTTY ) -return rc; - rc =pcie_reset_flr (dev,1 ); -if (rc != -ENOTTY ) -return rc; - rc =pci_af_flr (dev,1 ); -if (rc != -ENOTTY ) -return rc; - rc =pci_pm_reset (dev,1 ); -if (rc != -ENOTTY ) -return rc; +might_sleep (); -return pci_reset_bus_function (dev,1 ); +for (i =0 ; i <PCI_RESET_METHODS_NUM ; i++) { + rc = pci_reset_fn_methods[i].reset_fn (dev,1 ); +if (!rc) + reset_methods[i] = prio--; +else if (rc != -ENOTTY ) +break ; + } +memcpy (dev->reset_methods, reset_methods,sizeof (reset_methods)); }/**
drivers/pci/pci.h +7 -1
@@ -33,7 +33,7 @@ enum pci_mmap_api {int pci_mmap_fits (struct pci_dev *pdev,int resno,struct vm_area_struct *vmai,enum pci_mmap_api mmap_api); -int pci_probe_reset_function (struct pci_dev *dev); +void pci_init_reset_methods (struct pci_dev *dev);int pci_bridge_secondary_bus_reset (struct pci_dev *dev);int pci_bus_error_reset (struct pci_dev *dev);
@@ -606,6 +606,12 @@ struct pci_dev_reset_methods {int (*reset)(struct pci_dev *dev,int probe); }; +struct pci_reset_fn_method { +int (*reset_fn)(struct pci_dev *pdev,int probe); +char *name; +}; + +extern const struct pci_reset_fn_method pci_reset_fn_methods[];#ifdef CONFIG_PCI_QUIRKS int pci_dev_specific_reset (struct pci_dev *dev,int probe);#else
drivers/pci/probe.c +2 -3
@@ -2404,9 +2404,8 @@ static void pci_init_capabilities(struct pci_dev *dev)pci_rcec_init (dev);/* Root Complex Event Collector */ pcie_report_downtraining (dev); - -if (pci_probe_reset_function (dev) ==0 ) - dev->reset_fn =1 ; +pci_init_reset_methods (dev); + dev->reset_fn =pci_reset_supported (dev); }/*
include/linux/pci.h +7 -0
@@ -49,6 +49,8 @@ PCI_STATUS_SIG_TARGET_ABORT | \ PCI_STATUS_PARITY) +#define PCI_RESET_METHODS_NUM 5 +/* * The PCI interface treats multi-function devices as independent * devices. The slot/function address of each device is encoded
@@ -505,6 +507,10 @@ struct pci_dev {char *driver_override;/* Driver name to force a match */ unsigned long priv_flags;/* Private flags for the PCI driver */ +/* +* See pci_reset_fn_methods array in pci.c for ordering. +*/ +u8 reset_methods[PCI_RESET_METHODS_NUM ];/* Reset methods ordered by priority */ };static inline struct pci_dev *pci_physfn (struct pci_dev *dev)
@@ -1227,6 +1233,7 @@ u32 pcie_bandwidth_available(struct pci_dev *dev, struct pci_dev **limiting_dev,void pcie_print_link_status (struct pci_dev *dev);int pcie_reset_flr (struct pci_dev *dev,int probe);int pcie_flr (struct pci_dev *dev); +bool pci_reset_supported (struct pci_dev *dev);int __pci_reset_function_locked (struct pci_dev *dev);int pci_reset_function (struct pci_dev *dev);int pci_reset_function_locked (struct pci_dev *dev);
Signature · 1 line
2.31.1
PATCH v6 3/8 PCI: Remove reset_fn field from pci_dev
In reply to Amey Narkhedereset_fn field is used to indicate whether the device supports any reset mechanism or not. Remove the use of reset_fn in favor of new reset_methods array which can be used to keep track of all supported reset mechanisms of a device and their ordering.
The octeon driver is incorrectly usingreset_fn field to detect if the device supports FLR or not. Use pcie_reset_flr() to probe whether it supports FLR or not.
--- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 2 +- drivers/pci/pci-sysfs.c | 2 +- drivers/pci/pci.c | 6 +++--- drivers/pci/probe.c | 1 - drivers/pci/quirks.c | 2 +- drivers/pci/remove.c | 1 - include/linux/pci.h | 1 - 7 files changed, 6 insertions(+), 9 deletions(-)
drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +1 -1
@@ -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);
drivers/pci/pci-sysfs.c +1 -1
@@ -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;
drivers/pci/pci.c +3 -3
@@ -5232,7 +5232,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);
@@ -5268,7 +5268,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);
@@ -5291,7 +5291,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))
drivers/pci/probe.c +0 -1
@@ -2405,7 +2405,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); }/*
drivers/pci/quirks.c +1 -1
@@ -5589,7 +5589,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))
drivers/pci/remove.c +0 -1
@@ -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);
include/linux/pci.h +0 -1
@@ -429,7 +429,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 */
Signature · 1 line
2.31.1
PATCH v6 4/8 PCI/sysfs: Allow userspace to query and set device reset mechanism
In reply to Amey NarkhedeAdd reset_method sysfs attribute to enable user to query and set user preferred device reset methods and their ordering.
--- Documentation/ABI/testing/sysfs-bus-pci | 16 ++++ drivers/pci/pci-sysfs.c | 118 ++++++++++++++++++++++++ 2 files changed, 134 insertions(+)
Documentation/ABI/testing/sysfs-bus-pci +16 -0
@@ -121,6 +121,22 @@ Description: child buses, and re-discover devices removed earlier from this part of the device tree. +What: /sys/bus/pci/devices/.../reset_method +Date: March 2021 +Contact: Amey Narkhede <[email protected]> +Description: + Some devices allow an individual function to be reset + without affecting other functions in the same slot. + For devices that have this support, a file named reset_method + will be present in sysfs. Reading this file will give names + of the device supported reset methods and their ordering. + Writing the name or comma separated list of names of any of + the device supported reset methods to this file will set the + reset methods and their ordering to be used when resetting + the device. Writing empty string to this file will disable + ability to reset the device and writing "default" will return + to the original value. + What: /sys/bus/pci/devices/.../reset Date: July 2009 Contact: Michael S. Tsirkin <[email protected]>
drivers/pci/pci-sysfs.c +118 -0
130 lines not on this page · raw message
Signature · 1 line
2.31.1
PATCH v6 5/8 PCI: Setup ACPI_COMPANION early
In reply to Amey NarkhedeFrom: Shanker Donthineni <[email protected]>
Currently, the ACPI_COMPANION is not available until device_add(). The software features which have dependency on ACPI fwnode properties and needs to be handled before device_add() will not work. One use case, software has to check the existence of _RST method to support ACPI based reset mechanism.
This patch adds a new function pci_set_acpi_fwnode() for setting the ACPI_COMPANION, same code which is available in acpi_pci_bridge_d3().
Call pci_set_acpi_fwnode() from pci_scan_device() to fix the issue.
--- drivers/pci/pci-acpi.c | 12 ++++++++---- drivers/pci/pci.h | 2 ++ drivers/pci/probe.c | 2 ++ 3 files changed, 12 insertions(+), 4 deletions(-)
drivers/pci/pci-acpi.c +8 -4
@@ -934,6 +934,13 @@ static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev)static struct acpi_device *acpi_pci_find_companion (struct device *dev); +void pci_set_acpi_fwnode (struct pci_dev *dev) +{ +if (!ACPI_COMPANION (&dev->dev) && !pci_dev_is_added (dev)) +ACPI_COMPANION_SET (&dev->dev, +acpi_pci_find_companion (&dev->dev)); +} +static bool acpi_pci_bridge_d3 (struct pci_dev *dev) {const struct fwnode_handle *fwnode;
@@ -945,11 +952,8 @@ static bool acpi_pci_bridge_d3(struct pci_dev *dev)return false;/* Assume D3 support if the bridge is power-manageable by ACPI. */ +pci_set_acpi_fwnode (dev); adev =ACPI_COMPANION (&dev->dev); -if (!adev && !pci_dev_is_added (dev)) { - adev =acpi_pci_find_companion (&dev->dev); -ACPI_COMPANION_SET (&dev->dev, adev); - }if (adev &&acpi_device_power_manageable (adev))return true;
drivers/pci/pci.h +2 -0
@@ -703,7 +703,9 @@ static inline int pci_aer_raw_clear_status(struct pci_dev *dev) { return -EINVAL#ifdef CONFIG_ACPI int pci_acpi_program_hp_params (struct pci_dev *dev);extern const struct attribute_group pci_dev_acpi_attr_group; +void pci_set_acpi_fwnode (struct pci_dev *dev);#else +static inline void pci_set_acpi_fwnode (struct pci_dev *dev) {}static inline int pci_acpi_program_hp_params (struct pci_dev *dev) {return -ENODEV ;
drivers/pci/probe.c +2 -0
@@ -2359,6 +2359,8 @@ static struct pci_dev *pci_scan_device(struct pci_bus *bus, int devfn)return NULL ; } +pci_set_acpi_fwnode (dev); +return dev; }
Signature · 1 line
2.31.1
PATCH v6 6/8 PCI: Add support for ACPI _RST reset method
In reply to Amey NarkhedeFrom: Shanker Donthineni <[email protected]>
The _RST is a standard method specified in the ACPI specification. It provides a function level reset when it is described in the acpi_device context associated with PCI-device. Implement a new reset function pci_dev_acpi_reset() for probing RST method and execute if it is defined in the firmware.
The default priority of the ACPI reset is set to below device-specific and above hardware resets.
--- drivers/pci/pci-acpi.c | 23 +++++++++++++++++++++++ drivers/pci/pci.c | 1 + drivers/pci/pci.h | 6 ++++++ include/linux/pci.h | 2 +- 4 files changed, 31 insertions(+), 1 deletion(-)
drivers/pci/pci-acpi.c +23 -0
@@ -941,6 +941,29 @@ void pci_set_acpi_fwnode(struct pci_dev *dev) acpi_pci_find_companion(&dev->dev)); } +/** +* pci_dev_acpi_reset - do a function level reset using _RST method +* @dev: device to reset +* @probe: check if _RST method is included in the acpi_device context. +*/ +int pci_dev_acpi_reset (struct pci_dev *dev,int probe) +{ +acpi_handle handle =ACPI_HANDLE (&dev->dev); + +if (!handle || !acpi_has_method (handle,"_RST" )) +return -ENOTTY ; + +if (probe) +return 0 ; + +if (ACPI_FAILURE (acpi_evaluate_object (handle,"_RST" ,NULL ,NULL ))) { +pci_warn (dev,"ACPI _RST failed\n" ); +return -EINVAL ; + } + +return 0 ; +} +static bool acpi_pci_bridge_d3 (struct pci_dev *dev) {const struct fwnode_handle *fwnode;
drivers/pci/pci.c +1 -0
@@ -5121,6 +5121,7 @@ static void pci_dev_restore(struct pci_dev *dev)*/ const struct pci_reset_fn_method pci_reset_fn_methods[] = { { &pci_dev_specific_reset, .name ="device_specific" }, + { &pci_dev_acpi_reset, .name ="acpi" }, { &pcie_reset_flr, .name ="flr" }, { &pci_af_flr, .name ="af_flr" }, { &pci_pm_reset, .name ="pm" },
drivers/pci/pci.h +6 -0
@@ -704,7 +704,13 @@ static inline int pci_aer_raw_clear_status(struct pci_dev *dev) { return -EINVALint pci_acpi_program_hp_params (struct pci_dev *dev);extern const struct attribute_group pci_dev_acpi_attr_group;void pci_set_acpi_fwnode (struct pci_dev *dev); +int pci_dev_acpi_reset (struct pci_dev *dev,int probe);#else +static inline int pci_dev_acpi_reset (struct pci_dev *dev,int probe) +{ +return -ENOTTY ; +} +static inline void pci_set_acpi_fwnode (struct pci_dev *dev) {}static inline int pci_acpi_program_hp_params (struct pci_dev *dev) {
include/linux/pci.h +1 -1
@@ -49,7 +49,7 @@ PCI_STATUS_SIG_TARGET_ABORT | \ PCI_STATUS_PARITY) -#define PCI_RESET_METHODS_NUM 5 +#define PCI_RESET_METHODS_NUM 6/* * The PCI interface treats multi-function devices as independent
Signature · 1 line
2.31.1
PATCH v6 7/8 PCI: Enable NO_BUS_RESET quirk for Nvidia GPUs
In reply to Amey NarkhedeFrom: Shanker Donthineni <[email protected]>
On select platforms, some Nvidia GPU devices do not work with SBR. Triggering SBR would leave the device inoperable for the current system boot. It requires a system hard-reboot to get the GPU device back to normal operating condition post-SBR. For the affected devices, enable NO_BUS_RESET quirk to fix the issue.
This issue will be fixed in the next generation of hardware.
--- drivers/pci/quirks.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/pci/quirks.c +12 -0
@@ -3546,6 +3546,18 @@ static void quirk_no_bus_reset(struct pci_dev *dev) dev->dev_flags |=PCI_DEV_FLAGS_NO_BUS_RESET ; } +/* +* Some Nvidia GPU devices do not work with bus reset, SBR needs to be +* prevented for those affected devices. +*/ +static void quirk_nvidia_no_bus_reset (struct pci_dev *dev) +{ +if ((dev->device &0xffc0 ) ==0x2340 ) +quirk_no_bus_reset (dev); +} +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_NVIDIA ,PCI_ANY_ID , + quirk_nvidia_no_bus_reset); +/* * Some Atheros AR9xxx and QCA988x chips do not behave after a bus reset. * The device will throw a Link Down error on AER-capable systems and
Signature · 1 line
2.31.1
PATCH v6 8/8 PCI: Change the type of probe argument in reset functions
In reply to Amey NarkhedeIntroduce a new enum pci_reset_mode_t to make the context of probe argument in reset functions clear and the code easier to read.
Change the type of probe argument in functions which implement reset methods from int to pci_reset_mode_t to make the intent clear.
Add a new line in return statement of pci_reset_bus_function().
--- drivers/crypto/cavium/nitrox/nitrox_main.c | 2 +- .../ethernet/cavium/liquidio/lio_vf_main.c | 2 +- drivers/pci/hotplug/pciehp.h | 2 +- drivers/pci/hotplug/pciehp_hpc.c | 4 +- drivers/pci/pci-acpi.c | 10 ++- drivers/pci/pci.c | 85 ++++++++++++------- drivers/pci/pci.h | 10 +-- drivers/pci/pcie/aer.c | 2 +- drivers/pci/quirks.c | 37 ++++---- include/linux/pci.h | 8 +- include/linux/pci_hotplug.h | 2 +- 11 files changed, 100 insertions(+), 64 deletions(-)
drivers/crypto/cavium/nitrox/nitrox_main.c +1 -1
@@ -306,7 +306,7 @@ static int nitrox_device_flr(struct pci_dev *pdev)return -ENOMEM ; } -pcie_reset_flr (pdev,0 ); +pcie_reset_flr (pdev,PCI_RESET_DO_RESET );pci_restore_state (pdev);
drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +1 -1
@@ -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 (!pcie_reset_flr (oct->pci_dev,1 )) +if (!pcie_reset_flr (oct->pci_dev,PCI_RESET_PROBE ))octeon_pci_flr (oct);else cn23xx_vf_ask_pf_to_do_flr (oct);
drivers/pci/hotplug/pciehp.h +1 -1
@@ -181,7 +181,7 @@ void pciehp_release_ctrl(struct controller *ctrl);int pciehp_sysfs_enable_slot (struct hotplug_slot *hotplug_slot);int pciehp_sysfs_disable_slot (struct hotplug_slot *hotplug_slot); -int pciehp_reset_slot (struct hotplug_slot *hotplug_slot,int probe); +int pciehp_reset_slot (struct hotplug_slot *hotplug_slot,pci_reset_mode_t mode);int pciehp_get_attention_status (struct hotplug_slot *hotplug_slot,u8 *status);int pciehp_set_raw_indicator_status (struct hotplug_slot *h_slot,u8 status);int pciehp_get_raw_indicator_status (struct hotplug_slot *h_slot,u8 *status);
drivers/pci/hotplug/pciehp_hpc.c +2 -2
@@ -834,14 +834,14 @@ void pcie_disable_interrupt(struct controller *ctrl)* momentarily, if we see that they could interfere. Also, clear any spurious * events after. */ -int pciehp_reset_slot (struct hotplug_slot *hotplug_slot,int probe) +int pciehp_reset_slot (struct hotplug_slot *hotplug_slot,pci_reset_mode_t mode) {struct controller *ctrl =to_ctrl (hotplug_slot);struct pci_dev *pdev =ctrl_dev (ctrl);u16 stat_mask =0 , ctrl_mask =0 ;int rc; -if (probe) +if (mode ==PCI_RESET_PROBE )return 0 ;down_write (&ctrl->reset_lock);
drivers/pci/pci-acpi.c +7 -3
@@ -944,16 +944,20 @@ void pci_set_acpi_fwnode(struct pci_dev *dev)/** * pci_dev_acpi_reset - do a function level reset using _RST method * @dev: device to reset -* @probe: check if _RST method is included in the acpi_device context. +* @probe: If PCI_RESET_PROBE, check whether _RST method is included +* in the acpi_device context. */ -int pci_dev_acpi_reset (struct pci_dev *dev,int probe) +int pci_dev_acpi_reset (struct pci_dev *dev,pci_reset_mode_t mode) {acpi_handle handle =ACPI_HANDLE (&dev->dev); +if (mode >=PCI_RESET_MODE_MAX ) +return -EINVAL ; +if (!handle || !acpi_has_method (handle,"_RST" ))return -ENOTTY ; -if (probe) +if (mode ==PCI_RESET_PROBE )return 0 ;if (ACPI_FAILURE (acpi_evaluate_object (handle,"_RST" ,NULL ,NULL ))) {
drivers/pci/pci.c +53 -32
268 lines not on this page · raw message
drivers/pci/pci.h +5 -5
@@ -603,19 +603,19 @@ static inline int pci_enable_ptm(struct pci_dev *dev, u8 *granularity)struct pci_dev_reset_methods {u16 vendor;u16 device; -int (*reset)(struct pci_dev *dev,int probe); +int (*reset)(struct pci_dev *dev,pci_reset_mode_t mode); };struct pci_reset_fn_method { -int (*reset_fn)(struct pci_dev *pdev,int probe); +int (*reset_fn)(struct pci_dev *pdev,pci_reset_mode_t mode);char *name; };extern const struct pci_reset_fn_method pci_reset_fn_methods[];#ifdef CONFIG_PCI_QUIRKS -int pci_dev_specific_reset (struct pci_dev *dev,int probe); +int pci_dev_specific_reset (struct pci_dev *dev,pci_reset_mode_t mode);#else -static inline int pci_dev_specific_reset (struct pci_dev *dev,int probe) +static inline int pci_dev_specific_reset (struct pci_dev *dev,pci_reset_mode_t mode) {return -ENOTTY ; }
@@ -704,7 +704,7 @@ static inline int pci_aer_raw_clear_status(struct pci_dev *dev) { return -EINVALint pci_acpi_program_hp_params (struct pci_dev *dev);extern const struct attribute_group pci_dev_acpi_attr_group;void pci_set_acpi_fwnode (struct pci_dev *dev); -int pci_dev_acpi_reset (struct pci_dev *dev,int probe); +int pci_dev_acpi_reset (struct pci_dev *dev,pci_reset_mode_t mode);#else static inline int pci_dev_acpi_reset (struct pci_dev *dev,int probe) {
drivers/pci/pcie/aer.c +1 -1
@@ -1405,7 +1405,7 @@ static pci_ers_result_t aer_root_reset(struct pci_dev *dev) }if (type ==PCI_EXP_TYPE_RC_EC || type ==PCI_EXP_TYPE_RC_END ) { - rc =pcie_reset_flr (dev,0 ); + rc =pcie_reset_flr (dev,PCI_RESET_DO_RESET );if (!rc)pci_info (dev,"has been reset\n" );else
drivers/pci/quirks.c +21 -16
@@ -3681,7 +3681,7 @@ DECLARE_PCI_FIXUP_SUSPEND_LATE(PCI_VENDOR_ID_INTEL,* reset a single function if other methods (e.g. FLR, PM D0->D3) are * not available. */ -static int reset_intel_82599_sfp_virtfn (struct pci_dev *dev,int probe) +static int reset_intel_82599_sfp_virtfn (struct pci_dev *dev,pci_reset_mode_t mode) {/* * http://www.intel.com/content/dam/doc/datasheet/82599-10-gbe-controller-datasheet.pdf
@@ -3691,7 +3691,7 @@ static int reset_intel_82599_sfp_virtfn(struct pci_dev *dev, int probe)* Thus we must call pcie_flr() directly without first checking if it is * supported. */ -if (!probe) +if (mode ==PCI_RESET_DO_RESET )pcie_flr (dev);return 0 ; }
@@ -3703,13 +3703,13 @@ static int reset_intel_82599_sfp_virtfn(struct pci_dev *dev, int probe)#define NSDE_PWR_STATE 0xd0100#define IGD_OPERATION_TIMEOUT 10000/* set timeout 10 seconds */ -static int reset_ivb_igd (struct pci_dev *dev,int probe) +static int reset_ivb_igd (struct pci_dev *dev,pci_reset_mode_t mode) {void __iomem *mmio_base;unsigned long timeout;u32 val; -if (probe) +if (mode ==PCI_RESET_PROBE )return 0 ; mmio_base =pci_iomap (dev,0 ,0 );
@@ -3746,7 +3746,7 @@ static int reset_ivb_igd(struct pci_dev *dev, int probe) }/* Device-specific reset method for Chelsio T4-based adapters */ -static int reset_chelsio_generic_dev (struct pci_dev *dev,int probe) +static int reset_chelsio_generic_dev (struct pci_dev *dev,pci_reset_mode_t mode) {u16 old_command;u16 msix_flags;
@@ -3762,7 +3762,7 @@ static int reset_chelsio_generic_dev(struct pci_dev *dev, int probe)* If this is the "probe" phase, return 0 indicating that we can * reset this device. */ -if (probe) +if (mode ==PCI_RESET_PROBE )return 0 ;/*
@@ -3824,17 +3824,17 @@ static int reset_chelsio_generic_dev(struct pci_dev *dev, int probe)* Chapter 3: NVMe control registers * Chapter 7.3: Reset behavior */ -static int nvme_disable_and_flr (struct pci_dev *dev,int probe) +static int nvme_disable_and_flr (struct pci_dev *dev,pci_reset_mode_t mode) {void __iomem *bar;u16 cmd;u32 cfg;if (dev->class !=PCI_CLASS_STORAGE_EXPRESS || -pcie_reset_flr (dev,1 ) || !pci_resource_start (dev,0 )) +pcie_reset_flr (dev,PCI_RESET_PROBE ) || !pci_resource_start (dev,0 ))return -ENOTTY ; -if (probe) +if (mode ==PCI_RESET_PROBE )return 0 ; bar =pci_iomap (dev,0 ,NVME_REG_CC +sizeof (cfg));
@@ -3898,11 +3898,13 @@ static int nvme_disable_and_flr(struct pci_dev *dev, int probe)* device too soon after FLR. A 250ms delay after FLR has heuristically * proven to produce reliably working results for device assignment cases. */ -static int delay_250ms_after_flr (struct pci_dev *dev,int probe) +static int delay_250ms_after_flr (struct pci_dev *dev,pci_reset_mode_t mode) { -int ret =pcie_reset_flr (dev, probe); +int ret; + + ret =pcie_reset_flr (dev, mode); -if (probe) +if (ret || mode ==PCI_RESET_PROBE )return ret;msleep (250 );
@@ -3918,13 +3920,13 @@ static int delay_250ms_after_flr(struct pci_dev *dev, int probe)#define HINIC_OPERATION_TIMEOUT 15000/* 15 seconds */ /* Device-specific reset method for Huawei Intelligent NIC virtual functions */ -static int reset_hinic_vf_dev (struct pci_dev *pdev,int probe) +static int reset_hinic_vf_dev (struct pci_dev *pdev,pci_reset_mode_t mode) {unsigned long timeout;void __iomem *bar;u32 val; -if (probe) +if (mode ==PCI_RESET_PROBE )return 0 ; bar =pci_iomap (pdev,0 ,0 );
@@ -3995,16 +3997,19 @@ static const struct pci_dev_reset_methods pci_dev_reset_methods[] = {* because when a host assigns a device to a guest VM, the host may need * to reset the device but probably doesn't have a driver for it. */ -int pci_dev_specific_reset (struct pci_dev *dev,int probe) +int pci_dev_specific_reset (struct pci_dev *dev,pci_reset_mode_t mode) {const struct pci_dev_reset_methods *i; +if (mode >=PCI_RESET_MODE_MAX ) +return -EINVAL ; +for (i = pci_dev_reset_methods; i->reset; i++) {if ((i->vendor == dev->vendor || i->vendor == (u16 )PCI_ANY_ID ) && (i->device == dev->device || i->device == (u16 )PCI_ANY_ID )) -return i->reset (dev, probe); +return i->reset (dev, mode); }return -ENOTTY ;
include/linux/pci.h +7 -1
@@ -51,6 +51,12 @@#define PCI_RESET_METHODS_NUM 6 +typedef enum pci_reset_mode { +PCI_RESET_DO_RESET , +PCI_RESET_PROBE , +PCI_RESET_MODE_MAX , +}pci_reset_mode_t ; +/* * The PCI interface treats multi-function devices as independent * devices. The slot/function address of each device is encoded
@@ -1230,7 +1236,7 @@ u32 pcie_bandwidth_available(struct pci_dev *dev, struct pci_dev **limiting_dev,enum pci_bus_speed *speed, enum pcie_link_width *width);void pcie_print_link_status (struct pci_dev *dev); -int pcie_reset_flr (struct pci_dev *dev,int probe); +int pcie_reset_flr (struct pci_dev *dev,pci_reset_mode_t mode);int pcie_flr (struct pci_dev *dev);bool pci_reset_supported (struct pci_dev *dev);int __pci_reset_function_locked (struct pci_dev *dev);
include/linux/pci_hotplug.h +1 -1
@@ -44,7 +44,7 @@ struct hotplug_slot_ops {int (*get_attention_status) (struct hotplug_slot *slot,u8 *value);int (*get_latch_status) (struct hotplug_slot *slot,u8 *value);int (*get_adapter_status) (struct hotplug_slot *slot,u8 *value); -int (*reset_slot) (struct hotplug_slot *slot,int probe); +int (*reset_slot) (struct hotplug_slot *slot,pci_reset_mode_t mode); };/**
--
2.31.1
kernel test robot
build botRe: [PATCH v6 8/8] PCI: Change the type of probe argument in reset functions
Thank you for the patch! Yet something to improve:
Hi Amey,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on pci/next]
[also build test ERROR on next-20210607]
[cannot apply to pm/linux-next cryptodev/master crypto/master linus/master v5.13-rc5] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Amey-Narkhede/Expose-and-manage-PCI-device-reset/20210608-022554 base: https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git next config: arm64-randconfig-r031-20210607 (attached as .config) compiler: clang version 13.0.0 (https://github.com/llvm/llvm-project ae973380c5f6be77ce395022be40350942260be9)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm64 cross compiling tool for clang build
# apt-get install binutils-aarch64-linux-gnu
# https://github.com/0day-ci/linux/commit/827552fbc3a1722cd8f6d5e81c4806670fd5545f
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Amey-Narkhede/Expose-and-manage-PCI-device-reset/20210608-022554 git checkout 827552fbc3a1722cd8f6d5e81c4806670fd5545f
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=arm64
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> drivers/pci/pci.c:5139:4: error: incompatible function pointer types initializing 'int (*)(struct pci_dev *, pci_reset_mode_t)' (aka 'int (*)(struct pci_dev *, enum pci_reset_mode)') with an expression of type 'int (*)(struct pci_dev *, int)' [-Werror,-Wincompatible-function-pointer-types]
{ &pci_dev_acpi_reset, .name = "acpi" },
^~~~~~~~~~~~~~~~~~~1 error generated.
vim +5139 drivers/pci/pci.c
3ebe7f9f7e4a4f Keith Busch 2014-05-02 5132
c09bbd373f3e96 Amey Narkhede 2021-06-07 5133 /*
c09bbd373f3e96 Amey Narkhede 2021-06-07 5134 * The ordering for functions in pci_reset_fn_methods is required for
c09bbd373f3e96 Amey Narkhede 2021-06-07 5135 * reset_methods byte array defined in struct pci_dev.
c09bbd373f3e96 Amey Narkhede 2021-06-07 5136 */
c09bbd373f3e96 Amey Narkhede 2021-06-07 5137 const struct pci_reset_fn_method pci_reset_fn_methods[] = {
c09bbd373f3e96 Amey Narkhede 2021-06-07 5138 { &pci_dev_specific_reset, .name = "device_specific" },
ccbe2295e8be73 Shanker Donthineni 2021-06-07 @5139 { &pci_dev_acpi_reset, .name = "acpi" },
c09bbd373f3e96 Amey Narkhede 2021-06-07 5140 { &pcie_reset_flr, .name = "flr" },
c09bbd373f3e96 Amey Narkhede 2021-06-07 5141 { &pci_af_flr, .name = "af_flr" },
c09bbd373f3e96 Amey Narkhede 2021-06-07 5142 { &pci_pm_reset, .name = "pm" },
c09bbd373f3e96 Amey Narkhede 2021-06-07 5143 { &pci_reset_bus_function, .name = "bus" },
c09bbd373f3e96 Amey Narkhede 2021-06-07 5144 };c09bbd373f3e96 Amey Narkhede 2021-06-07 5145
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Re: [PATCH v6 8/8] PCI: Change the type of probe argument in reset functions
In reply to Amey NarkhedeHi Amey,
drivers/pci/pci.h static inline int pci_aer_raw_clear_status(struct pci_dev *dev) { return -EINVAL · line 710
Quoted 8 lines · Amey Narkhede
int
pci_acpi_program_hp_params(struct pci_dev *dev); extern const structattribute_grouppci_dev_acpi_attr_group; voidpci_set_acpi_fwnode(struct pci_dev *dev);drivers/pci/pci.h +1
-1-int pci_dev_acpi_reset (struct pci_dev *dev,int probe); +int pci_dev_acpi_reset (struct pci_dev *dev,pci_reset_mode_t mode);#else static inline int pci_dev_acpi_reset (struct pci_dev *dev,int probe) {
Prototype mismatch, build kernel with CONFIG_ACPI=n to catch this issue.