linux-next: manual merge of the pci tree with Linus' tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Alan Stern <stern@rowland.harvard.edu>,
	Jan Kiszka <jan.kiszka@siemens.com>
Subject: linux-next: manual merge of the pci tree with Linus' tree
Date: Tue, 19 Jun 2012 11:15:35 +1000	[thread overview]
Message-ID: <20120619111535.da6def8f1171361ed31adf84@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 2372 bytes --]

Hi Bjorn,

Today's linux-next merge of the pci tree got a conflict in
drivers/pci/quirks.c between commit c2fb8a3fa255 ("USB: add
NO_D3_DURING_SLEEP flag and revert 151b61284776be2") from Linus' tree and
commit fbebb9fd2258 ("PCI: add infrastructure for devices with broken
INTx masking") from the pci tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/pci/quirks.c
index 9478f72,a2d9d33..0000000

--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@@ -2930,31 -2930,19 +2930,45 @@@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_I
  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
  
  /*
 + * The Intel 6 Series/C200 Series chipset's EHCI controllers on many
 + * ASUS motherboards will cause memory corruption or a system crash
 + * if they are in D3 while the system is put into S3 sleep.
 + */
 +static void __devinit asus_ehci_no_d3(struct pci_dev *dev)
 +{
 +	const char *sys_info;
 +	static const char good_Asus_board[] = "P8Z68-V";
 +
 +	if (dev->dev_flags & PCI_DEV_FLAGS_NO_D3_DURING_SLEEP)
 +		return;
 +	if (dev->subsystem_vendor != PCI_VENDOR_ID_ASUSTEK)
 +		return;
 +	sys_info = dmi_get_system_info(DMI_BOARD_NAME);
 +	if (sys_info && memcmp(sys_info, good_Asus_board,
 +			sizeof(good_Asus_board) - 1) == 0)
 +		return;
 +
 +	dev_info(&dev->dev, "broken D3 during system sleep on ASUS\n");
 +	dev->dev_flags |= PCI_DEV_FLAGS_NO_D3_DURING_SLEEP;
 +	device_set_wakeup_capable(&dev->dev, false);
 +}
 +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1c26, asus_ehci_no_d3);
 +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1c2d, asus_ehci_no_d3);
 +
++/*
+  * Some devices may pass our check in pci_intx_mask_supported if
+  * PCI_COMMAND_INTX_DISABLE works though they actually do not properly
+  * support this feature.
+  */
+ static void __devinit quirk_broken_intx_masking(struct pci_dev *dev)
+ {
+ 	dev->broken_intx_masking = 1;
+ }
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_CHELSIO, 0x0030,
+ 			 quirk_broken_intx_masking);
+ DECLARE_PCI_FIXUP_HEADER(0x1814, 0x0601, /* Ralink RT2800 802.11n PCI */
+ 			 quirk_broken_intx_masking);
+ 
  static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f,
  			  struct pci_fixup *end)
  {

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
