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

Commit 13a84687 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' into next 

* pci/misc:
  PCI/PM: Add comments for PME poll support for PCIe
  PCI: Add PLX PCI 9050 workaround for some Meilhaus DAQ cards
  PCI: Add workaround for PLX PCI 9050 BAR alignment erratum
  PCI: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
  x86/PCI: Ignore _SEG on HP xw9300
  PCI: Don't touch card regs after runtime suspend D3
parents 8f0d8163 6e965e0d

arch/x86/pci/acpi.c

+23 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ struct pci_root_info { 
};



static bool pci_use_crs = true;

static bool pci_ignore_seg = false;



static int __init set_use_crs(const struct dmi_system_id *id)

{
@@ -35,7 +36,14 @@ static int __init set_nouse_crs(const struct dmi_system_id *id) 
	return 0;

}



static const struct dmi_system_id pci_use_crs_table[] __initconst = {

static int __init set_ignore_seg(const struct dmi_system_id *id)

{

	printk(KERN_INFO "PCI: %s detected: ignoring ACPI _SEG\n", id->ident);

	pci_ignore_seg = true;

	return 0;

}



static const struct dmi_system_id pci_crs_quirks[] __initconst = {

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

	{

		.callback = set_use_crs,
@@ -98,6 +106,16 @@ static const struct dmi_system_id pci_use_crs_table[] __initconst = { 
			DMI_MATCH(DMI_BIOS_VERSION, "6JET85WW (1.43 )"),

		},

	},



	/* https://bugzilla.kernel.org/show_bug.cgi?id=15362 */

	{

		.callback = set_ignore_seg,

		.ident = "HP xw9300",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

			DMI_MATCH(DMI_PRODUCT_NAME, "HP xw9300 Workstation"),

		},

	},

	{}

};
@@ -108,7 +126,7 @@ void __init pci_acpi_crs_quirks(void) 
	if (dmi_get_date(DMI_BIOS_DATE, &year, NULL, NULL) && year < 2008)

		pci_use_crs = false;



	dmi_check_system(pci_use_crs_table);

	dmi_check_system(pci_crs_quirks);



	/*

	 * If the user specifies "pci=use_crs" or "pci=nocrs" explicitly, that
@@ -455,6 +473,9 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root) 
	int pxm;

#endif



	if (pci_ignore_seg)

		domain = 0;



	if (domain && !pci_domains_supported) {

		printk(KERN_WARNING "pci_bus %04x:%02x: "

		       "ignored (multiple domains not supported)\n",

drivers/pci/irq.c

+5 −5
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ static void pci_note_irq_problem(struct pci_dev *pdev, const char *reason) 
{

	struct pci_dev *parent = to_pci_dev(pdev->dev.parent);



	dev_printk(KERN_ERR, &pdev->dev,

	dev_err(&pdev->dev,

		"Potentially misrouted IRQ (Bridge %s %04x:%04x)\n",

		dev_name(&parent->dev), parent->vendor, parent->device);

	dev_printk(KERN_ERR, &pdev->dev, "%s\n", reason);

	dev_printk(KERN_ERR, &pdev->dev, "Please report to linux-kernel@vger.kernel.org\n");

	dev_err(&pdev->dev, "%s\n", reason);

	dev_err(&pdev->dev, "Please report to linux-kernel@vger.kernel.org\n");

	WARN_ON(1);

}

drivers/pci/pci-driver.c

+3 −3
Original line number Diff line number Diff line
@@ -1023,10 +1023,10 @@ static int pci_pm_runtime_suspend(struct device *dev) 
		return 0;

	}



	if (!pci_dev->state_saved)

	if (!pci_dev->state_saved) {

		pci_save_state(pci_dev);



		pci_finish_runtime_suspend(pci_dev);

	}



	return 0;

}

drivers/pci/pci-stub.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ MODULE_PARM_DESC(ids, "Initial PCI IDs to add to the stub driver, format is " 


static int pci_stub_probe(struct pci_dev *dev, const struct pci_device_id *id)

{

	dev_printk(KERN_INFO, &dev->dev, "claimed by stub\n");

	dev_info(&dev->dev, "claimed by stub\n");

	return 0;

}

drivers/pci/pci.c

+19 −9
Original line number Diff line number Diff line
@@ -1578,15 +1578,25 @@ void pci_pme_active(struct pci_dev *dev, bool enable) 


	pci_write_config_word(dev, dev->pm_cap + PCI_PM_CTRL, pmcsr);



	/* PCI (as opposed to PCIe) PME requires that the device have

	   its PME# line hooked up correctly. Not all hardware vendors

	   do this, so the PME never gets delivered and the device

	   remains asleep. The easiest way around this is to

	   periodically walk the list of suspended devices and check

	   whether any have their PME flag set. The assumption is that

	   we'll wake up often enough anyway that this won't be a huge

	   hit, and the power savings from the devices will still be a

	   win. */

	/*

	 * PCI (as opposed to PCIe) PME requires that the device have

	 * its PME# line hooked up correctly. Not all hardware vendors

	 * do this, so the PME never gets delivered and the device

	 * remains asleep. The easiest way around this is to

	 * periodically walk the list of suspended devices and check

	 * whether any have their PME flag set. The assumption is that

	 * we'll wake up often enough anyway that this won't be a huge

	 * hit, and the power savings from the devices will still be a

	 * win.

	 *

	 * Although PCIe uses in-band PME message instead of PME# line

	 * to report PME, PME does not work for some PCIe devices in

	 * reality.  For example, there are devices that set their PME

	 * status bits, but don't really bother to send a PME message;

	 * there are PCI Express Root Ports that don't bother to

	 * trigger interrupts when they receive PME messages from the

	 * devices below.  So PME poll is used for PCIe devices too.

	 */



	if (dev->pme_poll) {

		struct pci_pme_device *pme_dev;