Commit a5bfc471 authored Jan 23, 2009 by Tejun Heo Committed by Jeff Garzik Mar 24, 2009

ahci: drop intx manipulation on msi enable



There's no need to turn off intx explicitly on msi enable.  This is
automatically handled by pci.  Drop it.

This might be needed on machines if the BIOS turns intx off during
boot.  However, there's no evidence of such behavior for ahci and
the only such case seems to be ICH5 PATA according to ata_piix.
Also, given the way ahci operates, it's highly unlikely BIOS ever
disables IRQ for the controller.  However, as this change has slight
possibility of introducing failure, please schedule it for #upstream.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

parent 6be976e7

drivers/ata/ahci.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2647,8 +2647,8 @@ static int ahci_init_one(struct pci_dev pdev, const struct pci_device_id ent)
		if (board_id == board_ahci_sb700 && pdev->revision >= 0x40)
		hpriv->flags &= ~AHCI_HFLAG_IGN_SERR_INTERNAL;

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

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

Admin message