Commit 31b239ad authored Sep 17, 2009 by Tejun Heo Committed by Jeff Garzik Sep 17, 2009

ahci: restore pci_intx() handling

Commit a5bfc471 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>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

parent de55a895

drivers/ata/ahci.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);

Admin message