niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

scsi: megaraid_sas: Use generic power management

Browse source 
Drivers should do only device-specific jobs. But in general, drivers using
legacy PCI PM framework for .suspend()/.resume() have to manage many PCI
PM-related tasks themselves which can be done by PCI Core itself. This
brings extra load on the driver and it directly calls PCI helper functions
to handle them.

Switch to the new generic framework by updating function signatures and
define a "struct dev_pm_ops" variable to bind PM callbacks. Also, remove
unnecessary calls to the PCI Helper functions along with the legacy
.suspend & .resume bindings.

Link: https://lore.kernel.org/r/20201102164730.324035-3-vaibhavgupta40@gmail.com
Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Vaibhav Gupta 2020-11-02 22:17:03 +05:30 • committed by Martin K. Petersen
parent 8ed9d987c6
commit 977001df03
1 changed files with 13 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
drivers/scsi/megaraid/megaraid_sas_base.c
View file

@ -7593,25 +7593,23 @@ static void megasas_shutdown_controller(struct megasas_instance *instance,
megasas_return_cmd(instance, cmd); megasas_return_cmd(instance, cmd);
} }
#ifdef CONFIG_PM
/** /**
* megasas_suspend - driver suspend entry point * megasas_suspend - driver suspend entry point
* @pdev: PCI device structure * @dev: Device structure
* @state: PCI power state to suspend routine
*/ */
static int static int __maybe_unused
megasas_suspend(struct pci_dev *pdev, pm_message_t state) megasas_suspend(struct device *dev)
{ {
struct megasas_instance *instance; struct megasas_instance *instance;
instance = pci_get_drvdata(pdev); instance = dev_get_drvdata(dev);
if (!instance) if (!instance)
return 0; return 0;
instance->unload = 1; instance->unload = 1;
dev_info(&pdev->dev, "%s is called\n", __func__); dev_info(dev, "%s is called\n", __func__);
/* Shutdown SR-IOV heartbeat timer */ /* Shutdown SR-IOV heartbeat timer */
if (instance->requestorId && !instance->skip_heartbeat_timer_del) if (instance->requestorId && !instance->skip_heartbeat_timer_del)
@ -7641,47 +7639,29 @@ megasas_suspend(struct pci_dev *pdev, pm_message_t state)
if (instance->msix_vectors) if (instance->msix_vectors)
pci_free_irq_vectors(instance->pdev); pci_free_irq_vectors(instance->pdev);
pci_save_state(pdev);
pci_disable_device(pdev);
pci_set_power_state(pdev, pci_choose_state(pdev, state));
return 0; return 0;
} }
/** /**
* megasas_resume- driver resume entry point * megasas_resume- driver resume entry point
* @pdev: PCI device structure * @dev: Device structure
*/ */
static int static int __maybe_unused
megasas_resume(struct pci_dev *pdev) megasas_resume(struct device *dev)
{ {
int rval; int rval;
struct Scsi_Host *host; struct Scsi_Host *host;
struct megasas_instance *instance; struct megasas_instance *instance;
u32 status_reg; u32 status_reg;
instance = pci_get_drvdata(pdev); instance = dev_get_drvdata(dev);
if (!instance) if (!instance)
return 0; return 0;
host = instance->host; host = instance->host;
pci_set_power_state(pdev, PCI_D0);
pci_restore_state(pdev);
dev_info(&pdev->dev, "%s is called\n", __func__); dev_info(dev, "%s is called\n", __func__);
/*
* PCI prepping: enable device set bus mastering and dma mask
*/
rval = pci_enable_device_mem(pdev);
if (rval) {
dev_err(&pdev->dev, "Enable device failed\n");
return rval;
}
pci_set_master(pdev);
/* /*
* We expect the FW state to be READY * We expect the FW state to be READY
@ -7807,14 +7787,8 @@ fail_reenable_msix:
fail_set_dma_mask: fail_set_dma_mask:
fail_ready_state: fail_ready_state:
pci_disable_device(pdev);
return -ENODEV; return -ENODEV;
} }
#else
#define megasas_suspend NULL
#define megasas_resume NULL
#endif
static inline int static inline int
megasas_wait_for_adapter_operational(struct megasas_instance *instance) megasas_wait_for_adapter_operational(struct megasas_instance *instance)
@ -8552,6 +8526,8 @@ static const struct file_operations megasas_mgmt_fops = {
.llseek = noop_llseek, .llseek = noop_llseek,
}; };
static SIMPLE_DEV_PM_OPS(megasas_pm_ops, megasas_suspend, megasas_resume);
/* /*
* PCI hotplug support registration structure * PCI hotplug support registration structure
*/ */
@ -8561,8 +8537,7 @@ static struct pci_driver megasas_pci_driver = {
.id_table = megasas_pci_table, .id_table = megasas_pci_table,
.probe = megasas_probe_one, .probe = megasas_probe_one,
.remove = megasas_detach_one, .remove = megasas_detach_one,
.suspend = megasas_suspend, .driver.pm = &megasas_pm_ops,
.resume = megasas_resume,
.shutdown = megasas_shutdown, .shutdown = megasas_shutdown,
}; };