Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 979b1791 authored by Alan Cox's avatar Alan Cox Committed by Jesse Barnes
Browse files

PCI: add D3 power state avoidance quirk 



Libata has some hacks to deal with certain controllers going silly in D3
state. The right way to handle this is to keep a PCI device flag for
such devices. That can then be generalised for no ATA devices with power
problems.

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 362b7077

drivers/pci/pci.c

+4 −0
Original line number Diff line number Diff line
@@ -572,6 +572,10 @@ int pci_set_power_state(struct pci_dev *dev, pci_power_t state) 
		if (!ret)

			pci_update_current_state(dev);

	}

	/* This device is quirked not to be put into D3, so

	   don't put it in D3 */

	if (state == PCI_D3hot && (dev->dev_flags & PCI_DEV_FLAGS_NO_D3))

		return 0;



	error = pci_raw_set_power_state(dev, state);

drivers/pci/quirks.c

+13 −0
Original line number Diff line number Diff line
@@ -923,6 +923,19 @@ static void __init quirk_ide_samemode(struct pci_dev *pdev) 
}

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_10, quirk_ide_samemode);



/*

 * Some ATA devices break if put into D3

 */



static void __devinit quirk_no_ata_d3(struct pci_dev *pdev)

{

	/* Quirk the legacy ATA devices only. The AHCI ones are ok */

	if ((pdev->class >> 8) == PCI_CLASS_STORAGE_IDE)

		pdev->dev_flags |= PCI_DEV_FLAGS_NO_D3;

}

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, PCI_ANY_ID, quirk_no_ata_d3);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_ATI, PCI_ANY_ID, quirk_no_ata_d3);



/* This was originally an Alpha specific thing, but it really fits here.

 * The i82375 PCI/EISA bridge appears as non-classified. Fix that.

 */

include/linux/pci.h

+2 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ enum pci_dev_flags { 
	 * generation too.

	 */

	PCI_DEV_FLAGS_MSI_INTX_DISABLE_BUG = (__force pci_dev_flags_t) 1,

	/* Device configuration is irrevocably lost if disabled into D3 */

	PCI_DEV_FLAGS_NO_D3 = (__force pci_dev_flags_t) 2,

};



typedef unsigned short __bitwise pci_bus_flags_t;