Patchwork ahci: restore pci_intx() handling

login
register
mail settings
Submitter Tejun Heo
Date Sept. 16, 2009, 3:34 p.m.
Message ID <4AB1058F.3070108@kernel.org>
Download mbox | patch
Permalink /patch/33722/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Tejun Heo - Sept. 16, 2009, 3:34 p.m.
Commit a5bfc4714b3f01365aef89a92673f2ceb1ccf246 dropped explicit
pci_intx() manipulation from ahci because it seemed unnecessary and
ahci doesn't seem to be the right place to be tweaking it if it were.
This was largely okay but there are exceptions.  There was one on an
embedded platform which was fixed via firmware and now bko#14124
reports it on a HP DL320.

  http://bugzilla.kernel.org/show_bug.cgi?id=14124

I still think this isn't something libata drivers should be caring
about (the only ones which are calling pci_intx() explicitly are
libata ones and one other driver) but for now reverting the change
seems to be the right thing to do.

Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
---
 drivers/ata/ahci.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Greg KH - Sept. 16, 2009, 3:48 p.m.
On Thu, Sep 17, 2009 at 12:34:39AM +0900, Tejun Heo wrote:
> Commit a5bfc4714b3f01365aef89a92673f2ceb1ccf246 dropped explicit
> pci_intx() manipulation from ahci because it seemed unnecessary and
> ahci doesn't seem to be the right place to be tweaking it if it were.
> This was largely okay but there are exceptions.  There was one on an
> embedded platform which was fixed via firmware and now bko#14124
> reports it on a HP DL320.
> 
>   http://bugzilla.kernel.org/show_bug.cgi?id=14124
> 
> I still think this isn't something libata drivers should be caring
> about (the only ones which are calling pci_intx() explicitly are
> libata ones and one other driver) but for now reverting the change
> seems to be the right thing to do.
> 
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Reported-by: Thomas Jarosch <thomas.jarosch@intra2net.com>

In the future, for stuff that you want sent to stable, can you also add:
	Cc: stable <stable@kernel.org>
in this signed-off-by area?  That way, when the patch hits Linus's tree,
we get automatically notified of it and I don't have to dig back through
log files to try to find out if your commit has made it in or not.

thanks,

greg "drowning in -stable patches" k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tejun Heo - Sept. 16, 2009, 3:52 p.m.
Greg KH wrote:
> In the future, for stuff that you want sent to stable, can you also add:
> 	Cc: stable <stable@kernel.org>
> in this signed-off-by area?  That way, when the patch hits Linus's tree,
> we get automatically notified of it and I don't have to dig back through
> log files to try to find out if your commit has made it in or not.

Ah... new protocol.  Will do.

Thanks.
Jeff Garzik - Sept. 17, 2009, 8:49 p.m.
On 09/16/2009 11:34 AM, Tejun Heo wrote:
> Commit a5bfc4714b3f01365aef89a92673f2ceb1ccf246 dropped explicit
> pci_intx() manipulation from ahci because it seemed unnecessary and
> ahci doesn't seem to be the right place to be tweaking it if it were.
> This was largely okay but there are exceptions.  There was one on an
> embedded platform which was fixed via firmware and now bko#14124
> reports it on a HP DL320.
>
>    http://bugzilla.kernel.org/show_bug.cgi?id=14124
>
> I still think this isn't something libata drivers should be caring
> about (the only ones which are calling pci_intx() explicitly are
> libata ones and one other driver) but for now reverting the change
> seems to be the right thing to do.
>
> Signed-off-by: Tejun Heo<tj@kernel.org>
> Reported-by: Thomas Jarosch<thomas.jarosch@intra2net.com>
> ---
>   drivers/ata/ahci.c |    4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)

applied


--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index d4cd9c2..acd1162 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -2930,8 +2930,8 @@  static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	if (ahci_sb600_32bit_only(pdev))
 		hpriv->flags |= AHCI_HFLAG_32BIT_ONLY;

-	if (!(hpriv->flags & AHCI_HFLAG_NO_MSI))
-		pci_enable_msi(pdev);
+	if ((hpriv->flags & AHCI_HFLAG_NO_MSI) || pci_enable_msi(pdev))
+		pci_intx(pdev, 1);

 	/* save initial config */
 	ahci_save_initial_config(pdev, hpriv);