fixing errors handling during pci_driver resume stage [ata]
Subsystems (4)
PATCH 2/5 fixing errors handling during pci_driver resume stage [ata]
ata pci drivers have to return correct error code during resume stage in case of errors.
Signed-off-by Dmitriy Monakhov <[email protected]>
-----
drivers/ata/ahci.c +3 -1
@@ -1372,7 +1372,9 @@ static int ahci_pci_device_resume(structvoid __iomem *mmio = host->mmio_base;int rc; -ata_pci_device_do_resume (pdev); + rc =ata_pci_device_do_resume (pdev); +if (rc) +return rc;if (pdev->dev.power.power_state.event ==PM_EVENT_SUSPEND ) { rc =ahci_reset_controller (mmio, pdev);
drivers/ata/libata-core.c +12 -3
@@ -6221,12 +6221,19 @@ void ata_pci_device_do_suspend(struct pc } } -void ata_pci_device_do_resume (struct pci_dev *pdev) +int ata_pci_device_do_resume (struct pci_dev *pdev) { +int ret =0 ;pci_set_power_state (pdev,PCI_D0 );pci_restore_state (pdev); -pci_enable_device (pdev); + ret =pci_enable_device (pdev); +if (ret) { +dev_err (&pdev->dev,"Cannot enable PCI device, aborting.\n" ); +return ret; + } +pci_set_master (pdev); +return ret; }int ata_pci_device_suspend (struct pci_dev *pdev,pm_message_t mesg)
@@ -6246,8 +6253,10 @@ int ata_pci_device_suspend(struct pci_deint ata_pci_device_resume (struct pci_dev *pdev) {struct ata_host *host =dev_get_drvdata (&pdev->dev); +int err; -ata_pci_device_do_resume (pdev); +if ((err =ata_pci_device_do_resume (pdev))) +return err;ata_host_resume (host);return 0 ; }
drivers/ata/sata_sil.c +5 -1
@@ -710,8 +710,12 @@ err_out:static int sil_pci_device_resume (struct pci_dev *pdev) {struct ata_host *host =dev_get_drvdata (&pdev->dev); +int err; + + err =ata_pci_device_do_resume (pdev); +if (err) +return err; -ata_pci_device_do_resume (pdev);sil_init_controller (pdev, host->n_ports, host->ports[0 ]->flags, host->mmio_base);ata_host_resume (host);
drivers/ata/sata_sil24.c +4 -1
@@ -1200,8 +1200,11 @@ static int sil24_pci_device_resume(struc {struct ata_host *host =dev_get_drvdata (&pdev->dev);struct sil24_host_priv *hpriv = host->private_data; +int err; -ata_pci_device_do_resume (pdev); + err =ata_pci_device_do_resume (pdev); +if (err) +return err;if (pdev->dev.power.power_state.event ==PM_EVENT_SUSPEND )writel (HOST_CTRL_GLOBAL_RST , hpriv->host_base +HOST_CTRL );
include/linux/libata.h +1 -1
@@ -719,7 +719,7 @@ extern int ata_pci_init_one (struct pci_ unsigned int n_ports);extern void ata_pci_remove_one (struct pci_dev *pdev);extern void ata_pci_device_do_suspend (struct pci_dev *pdev,pm_message_t mesg); -extern void ata_pci_device_do_resume (struct pci_dev *pdev); +extern int ata_pci_device_do_resume (struct pci_dev *pdev);extern int ata_pci_device_suspend (struct pci_dev *pdev,pm_message_t mesg);extern int ata_pci_device_resume (struct pci_dev *pdev);extern int ata_pci_clear_simplex (struct pci_dev *pdev);
Quoted 2 lines · Dmitriy Monakhov
ata pci drivers have to return correct error code during resume stage in case of errors.
...
drivers/ata/libata-core.c int ata_pci_device_suspend(struct pci_de · line 6259
Quoted 9 lines
drivers/ata/libata-core.c +3
-1@@ -6246,8 +6253,10 @@ int ata_pci_device_suspend(struct pci_deint ata_pci_device_resume (struct pci_dev *pdev) {struct ata_host *host =dev_get_drvdata (&pdev->dev); +int err; -ata_pci_device_do_resume (pdev); +if ((err =ata_pci_device_do_resume (pdev))) +return err;
nit: in every other case I looked at you did:
err = foo()
if (err) ...
Can you make that consistent here too?
thanks,
grant