[PATCH] libata: disable pdev on all suspend events

[PATCH] libata: disable pdev on all suspend events

[Tejun Heo]

libata used disable pdev only on PM_EVENT_SUSPEND while re-enable pdev
unconditionally.  This was okay before ref-counted pdev enable update
but it now makes the pdev pinned after swsusp cycle (enabled twice but
disabled only once) and devres sanity check whines about it.

Fix it by unconditionally disabling pdev on all suspend events.

Signed-off-by: Tejun Heo <htejun@gmail.com>
---
Pavel, I took your advice and chose to disable unconditionally rather
than recording the status separately, but I still think it would be
nice if we can tell the status we're waking from from either the mesg
itself (say, PM_EVENT_THAW) or recorded prev state.

Both STM and STD are tested.  Please apply.  Thanks.

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 2cf8251..12bde4b 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -6001,11 +6001,10 @@ int pci_test_config_bits(struct pci_dev *pdev, const struct pci_bits *bits)
 void ata_pci_device_do_suspend(struct pci_dev *pdev, pm_message_t mesg)
 {
 	pci_save_state(pdev);
+	pci_disable_device(pdev);
 
-	if (mesg.event == PM_EVENT_SUSPEND) {
-		pci_disable_device(pdev);
+	if (mesg.event == PM_EVENT_SUSPEND)
 		pci_set_power_state(pdev, PCI_D3hot);
-	}
 }
 
 int ata_pci_device_do_resume(struct pci_dev *pdev)

Re: [PATCH] libata: disable pdev on all suspend events

[Jeff Garzik]

Tejun Heo wrote:
> libata used disable pdev only on PM_EVENT_SUSPEND while re-enable pdev
> unconditionally.  This was okay before ref-counted pdev enable update
> but it now makes the pdev pinned after swsusp cycle (enabled twice but
> disabled only once) and devres sanity check whines about it.
> 
> Fix it by unconditionally disabling pdev on all suspend events.
> 
> Signed-off-by: Tejun Heo <htejun@gmail.com>
> ---
> Pavel, I took your advice and chose to disable unconditionally rather
> than recording the status separately, but I still think it would be
> nice if we can tell the status we're waking from from either the mesg
> itself (say, PM_EVENT_THAW) or recorded prev state.
> 
> Both STM and STD are tested.  Please apply.  Thanks.

applied