mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-28 12:25:31 +00:00
scsi: cxlflash: Remove the device cleanly in the system shutdown path
Commit704c4b0ddc
("cxlflash: Shutdown notify support for CXL Flash cards") was recently introduced to notify the AFU when a system is going down. Due to the position of the cxlflash driver in the device stack, cxlflash devices are _always_ removed during a reboot/shutdown. This can lead to a crash if the cxlflash shutdown hook is invoked _after_ the shutdown hook for the owning virtual PHB. Furthermore, the current implementation of shutdown/remove hooks for cxlflash are not tolerant to being invoked when the device is not enabled. This can also lead to a crash in situations where the remove hook is invoked after the device has been removed via the vPHBs shutdown hook. An example of this scenario would be an EEH reset failure while a reboot/shutdown is in progress. To solve both problems, the shutdown hook for cxlflash is updated to simply remove the device. This path already includes the AFU notification and thus this solution will continue to perform the original intent. At the same time, the remove hook is updated to protect against being called when the device is not enabled. Fixes:704c4b0ddc
("cxlflash: Shutdown notify support for CXL Flash cards") Signed-off-by: Uma Krishnan <ukrishn@linux.vnet.ibm.com> Acked-by: Matthew R. Ochs <mrochs@linux.vnet.ibm.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
parent
bbbfae962b
commit
babf985d1e
@ -822,17 +822,6 @@ static void notify_shutdown(struct cxlflash_cfg *cfg, bool wait)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* cxlflash_shutdown() - shutdown handler
|
||||
* @pdev: PCI device associated with the host.
|
||||
*/
|
||||
static void cxlflash_shutdown(struct pci_dev *pdev)
|
||||
{
|
||||
struct cxlflash_cfg *cfg = pci_get_drvdata(pdev);
|
||||
|
||||
notify_shutdown(cfg, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* cxlflash_remove() - PCI entry point to tear down host
|
||||
* @pdev: PCI device associated with the host.
|
||||
@ -844,6 +833,11 @@ static void cxlflash_remove(struct pci_dev *pdev)
|
||||
struct cxlflash_cfg *cfg = pci_get_drvdata(pdev);
|
||||
ulong lock_flags;
|
||||
|
||||
if (!pci_is_enabled(pdev)) {
|
||||
pr_debug("%s: Device is disabled\n", __func__);
|
||||
return;
|
||||
}
|
||||
|
||||
/* If a Task Management Function is active, wait for it to complete
|
||||
* before continuing with remove.
|
||||
*/
|
||||
@ -2685,7 +2679,7 @@ static struct pci_driver cxlflash_driver = {
|
||||
.id_table = cxlflash_pci_table,
|
||||
.probe = cxlflash_probe,
|
||||
.remove = cxlflash_remove,
|
||||
.shutdown = cxlflash_shutdown,
|
||||
.shutdown = cxlflash_remove,
|
||||
.err_handler = &cxlflash_err_handler,
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user