[PATCH] sata_via: add missing PM hooks

[PATCH] sata_via: add missing PM hooks

[Tejun Heo]

For some reason, sata_via is missing PM hooks.  Add them.

Signed-off-by: Tejun Heo <htejun@gmail.com>
---
This patch is against 2.6.21 but you can use it over 2.6.20 too.  Does
this fix your problem?

Index: tree0/drivers/ata/sata_via.c
===================================================================
--- tree0.orig/drivers/ata/sata_via.c
+++ tree0/drivers/ata/sata_via.c
@@ -97,6 +97,10 @@ static struct pci_driver svia_pci_driver
 	.name			= DRV_NAME,
 	.id_table		= svia_pci_tbl,
 	.probe			= svia_init_one,
+#ifdef CONFIG_PM
+	.suspend		= ata_pci_device_suspend,
+	.resume			= ata_pci_device_resume,
+#endif
 	.remove			= ata_pci_remove_one,
 };
 
@@ -116,6 +120,10 @@ static struct scsi_host_template svia_sh
 	.slave_configure	= ata_scsi_slave_config,
 	.slave_destroy		= ata_scsi_slave_destroy,
 	.bios_param		= ata_std_bios_param,
+#ifdef CONFIG_PM
+	.suspend		= ata_scsi_device_suspend,
+	.resume			= ata_scsi_device_resume,
+#endif
 };
 
 static const struct ata_port_operations vt6420_sata_ops = {

Re: [PATCH] sata_via: add missing PM hooks

[Jeroen Janssen]

Hi,

Thanks very much! This indeed solved the problem.
Anything I can to help get it included in the next kernel release?

Best regards,

Jeroen Janssen

On 5/4/07, Tejun Heo <htejun@gmail.com> wrote:
> For some reason, sata_via is missing PM hooks.  Add them.
>
> Signed-off-by: Tejun Heo <htejun@gmail.com>
> ---
> This patch is against 2.6.21 but you can use it over 2.6.20 too.  Does
> this fix your problem?
>
> Index: tree0/drivers/ata/sata_via.c
> ===================================================================
> --- tree0.orig/drivers/ata/sata_via.c
> +++ tree0/drivers/ata/sata_via.c
> @@ -97,6 +97,10 @@ static struct pci_driver svia_pci_driver
>         .name                   = DRV_NAME,
>         .id_table               = svia_pci_tbl,
>         .probe                  = svia_init_one,
> +#ifdef CONFIG_PM
> +       .suspend                = ata_pci_device_suspend,
> +       .resume                 = ata_pci_device_resume,
> +#endif
>         .remove                 = ata_pci_remove_one,
>  };
>
> @@ -116,6 +120,10 @@ static struct scsi_host_template svia_sh
>         .slave_configure        = ata_scsi_slave_config,
>         .slave_destroy          = ata_scsi_slave_destroy,
>         .bios_param             = ata_std_bios_param,
> +#ifdef CONFIG_PM
> +       .suspend                = ata_scsi_device_suspend,
> +       .resume                 = ata_scsi_device_resume,
> +#endif
>  };
>
>  static const struct ata_port_operations vt6420_sata_ops = {
>

Re: [PATCH] sata_via: add missing PM hooks

[Tejun Heo]

Jeroen Janssen wrote:
> Hi,
> 
> Thanks very much! This indeed solved the problem.
> Anything I can to help get it included in the next kernel release?

Well, the mystery here is how this bit was missing so there should be no
problem including it in the next release.  I'll forward it to -stable
team too.  It's also a bit amusing to see libata EH actually recovers
from suspend without explicit resuming.  :-)

Thanks.

-- 
tejun

[PATCH] sata_via: add missing PM hooks

[Tejun Heo]

For some reason, sata_via is missing PM hooks.  Add them.  Spotted by
Jeroen Janssen <jeroen.janssen@gmail.com>.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Cc: Jeroen Janssen <jeroen.janssen@gmail.com>
---
I have no idea how we missed this.  This is for both libata-dev &&
-stable.  Thanks.

Index: tree0/drivers/ata/sata_via.c
===================================================================
--- tree0.orig/drivers/ata/sata_via.c
+++ tree0/drivers/ata/sata_via.c
@@ -97,6 +97,10 @@ static struct pci_driver svia_pci_driver
 	.name			= DRV_NAME,
 	.id_table		= svia_pci_tbl,
 	.probe			= svia_init_one,
+#ifdef CONFIG_PM
+	.suspend		= ata_pci_device_suspend,
+	.resume			= ata_pci_device_resume,
+#endif
 	.remove			= ata_pci_remove_one,
 };
 
@@ -116,6 +120,10 @@ static struct scsi_host_template svia_sh
 	.slave_configure	= ata_scsi_slave_config,
 	.slave_destroy		= ata_scsi_slave_destroy,
 	.bios_param		= ata_std_bios_param,
+#ifdef CONFIG_PM
+	.suspend		= ata_scsi_device_suspend,
+	.resume			= ata_scsi_device_resume,
+#endif
 };
 
 static const struct ata_port_operations vt6420_sata_ops = {

Re: [PATCH] sata_via: add missing PM hooks

[Jeroen Janssen]

Hi,

Any idea how I can track that this has been picked up/applied (I
looked at some of the git repositories on kernel.org, but as far as I
can tell, this patch is not in yet).

Best regards,

Jeroen Janssen

On 5/4/07, Tejun Heo <htejun@gmail.com> wrote:
> For some reason, sata_via is missing PM hooks.  Add them.  Spotted by
> Jeroen Janssen <jeroen.janssen@gmail.com>.
>
> Signed-off-by: Tejun Heo <htejun@gmail.com>
> Cc: Jeroen Janssen <jeroen.janssen@gmail.com>
> ---
> I have no idea how we missed this.  This is for both libata-dev &&
> -stable.  Thanks.
>
> Index: tree0/drivers/ata/sata_via.c
> ===================================================================
> --- tree0.orig/drivers/ata/sata_via.c
> +++ tree0/drivers/ata/sata_via.c
> @@ -97,6 +97,10 @@ static struct pci_driver svia_pci_driver
>         .name                   = DRV_NAME,
>         .id_table               = svia_pci_tbl,
>         .probe                  = svia_init_one,
> +#ifdef CONFIG_PM
> +       .suspend                = ata_pci_device_suspend,
> +       .resume                 = ata_pci_device_resume,
> +#endif
>         .remove                 = ata_pci_remove_one,
>  };
>
> @@ -116,6 +120,10 @@ static struct scsi_host_template svia_sh
>         .slave_configure        = ata_scsi_slave_config,
>         .slave_destroy          = ata_scsi_slave_destroy,
>         .bios_param             = ata_std_bios_param,
> +#ifdef CONFIG_PM
> +       .suspend                = ata_scsi_device_suspend,
> +       .resume                 = ata_scsi_device_resume,
> +#endif
>  };
>
>  static const struct ata_port_operations vt6420_sata_ops = {
>

Re: [PATCH] sata_via: add missing PM hooks

[Tejun Heo]

Jeroen Janssen wrote:
> Hi,
> 
> Any idea how I can track that this has been picked up/applied (I
> looked at some of the git repositories on kernel.org, but as far as I
> can tell, this patch is not in yet).

It's still pending.  What usually happens is Jeff replying with the body
saying 'applied' and the patch gets into libata-dev#upstream or
#upstream-fixes and then merged into Linus's tree.  For stable release,
after Jeff acks it, Greg or any other stable team member picks it up and
writes a formatted mail about it to everyone on the S-O-B: or Cc: list
and stable mailing list.  So, nope, it hasn't happend yet but you'll get
a notice when it happens.

-- 
tejun

Re: [PATCH] sata_via: add missing PM hooks

[Jeff Garzik]

Tejun Heo wrote:
> For some reason, sata_via is missing PM hooks.  Add them.  Spotted by
> Jeroen Janssen <jeroen.janssen@gmail.com>.
> 
> Signed-off-by: Tejun Heo <htejun@gmail.com>
> Cc: Jeroen Janssen <jeroen.janssen@gmail.com>
> ---
> I have no idea how we missed this.  This is for both libata-dev &&
> -stable.  Thanks.

applied

patch sata_via-add-missing-pm-hooks.patch queued to 2.6.21-stable tree

[chrisw]

This is a note to let you know that we have just queued up the patch titled

     Subject: sata_via: add missing PM hooks

to the 2.6.21-stable tree.  Its filename is

     sata_via-add-missing-pm-hooks.patch

A git repo of this tree can be found at 
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary


>From stable-bounces@linux.kernel.org  Fri May  4 06:32:42 2007
Message-ID: <463B357A.4090703@gmail.com>
Date: Fri, 04 May 2007 15:30:34 +0200
From: Tejun Heo <htejun@gmail.com>
To: Jeff Garzik <jeff@garzik.org>, IDE/ATA development list <linux-ide@vger.kernel.org>, stable@kernel.org
Cc: Jeroen Janssen <jeroen.janssen@gmail.com>
Subject: sata_via: add missing PM hooks

For some reason, sata_via is missing PM hooks.  Add them.  Spotted by
Jeroen Janssen <jeroen.janssen@gmail.com>.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Cc: Jeroen Janssen <jeroen.janssen@gmail.com>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
---
 drivers/ata/sata_via.c |    8 ++++++++
 1 file changed, 8 insertions(+)

--- linux-2.6.21.1.orig/drivers/ata/sata_via.c
+++ linux-2.6.21.1/drivers/ata/sata_via.c
@@ -97,6 +97,10 @@ static struct pci_driver svia_pci_driver
 	.name			= DRV_NAME,
 	.id_table		= svia_pci_tbl,
 	.probe			= svia_init_one,
+#ifdef CONFIG_PM
+	.suspend		= ata_pci_device_suspend,
+	.resume			= ata_pci_device_resume,
+#endif
 	.remove			= ata_pci_remove_one,
 };
 
@@ -116,6 +120,10 @@ static struct scsi_host_template svia_sh
 	.slave_configure	= ata_scsi_slave_config,
 	.slave_destroy		= ata_scsi_slave_destroy,
 	.bios_param		= ata_std_bios_param,
+#ifdef CONFIG_PM
+	.suspend		= ata_scsi_device_suspend,
+	.resume			= ata_scsi_device_resume,
+#endif
 };
 
 static const struct ata_port_operations vt6420_sata_ops = {


Patches currently in stable-queue which might be from htejun@gmail.com are

queue-2.6.21/driver-core-don-t-free-devt_attr-till-the-device-is-released.patch
queue-2.6.21/libata-sff-undo-bug-introduced-with-pci_iomap-changes.patch
queue-2.6.21/pci-quirks-disable-msi-on-rs400-200-and-rs480.patch
queue-2.6.21/sata_via-add-missing-pm-hooks.patch