Commit 518a6a34 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branches 'pci/hotplug', 'pci/msi', 'pci/virtualization' and 'pci/misc' into next 

* pci/hotplug:
  PCI: rphahp: Fix endianess issues
  PCI: Allow hotplug service drivers to operate in polling mode
  PCI: pciehp: Acknowledge spurious "cmd completed" event
  PCI: pciehp: Use PCI_EXP_SLTCAP_PSN define
  PCI: hotplug: Remove unnecessary "dev->bus" test

* pci/msi:
  GenWQE: Use pci_enable_msi_exact() instead of pci_enable_msi_block()
  PCI/MSI: Simplify populate_msi_sysfs()
  PCI/portdrv: Use pci_enable_msix_exact() instead of pci_enable_msix()

* pci/virtualization:
  PCI: Add Patsburg (X79) to Intel PCH root port ACS quirk

* pci/misc:
  PCI: Fix use of uninitialized MPS value
  PCI: Remove dead code
  MAINTAINERS: Add arch/x86/kernel/quirks.c to PCI file patterns
  PCI: Remove unnecessary __ref annotations
  PCI: Fail new_id for vendor/device values already built into driver
  PCI: Add new ID for Intel GPU "spurious interrupt" quirk
  PCI: Update my email address
  PCI: Fix incorrect vgaarb conditional in WARN_ON()
  PCI: Use designated initialization in PCI_VDEVICE
  PCI: Remove old serial device IDs
  PCI: Remove unnecessary includes of <linux/init.h>
  powerpc/PCI: Fix NULL dereference in sys_pciconfig_iobase() list traversal
parents c9eaa447 761ce533 a30d0108 1a30fd0d 1e358f94

Documentation/ABI/testing/sysfs-bus-pci

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ Description: 


What:		/sys/bus/pci/devices/.../vpd

Date:		February 2008

Contact:	Ben Hutchings <bhutchings@solarflare.com>

Contact:	Ben Hutchings <bwh@kernel.org>

Description:

		A file named vpd in a device directory will be a

		binary file containing the Vital Product Data for the

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -6693,6 +6693,7 @@ F: Documentation/PCI/ 
F:	drivers/pci/

F:	include/linux/pci*

F:	arch/x86/pci/

F:	arch/x86/kernel/quirks.c



PCI DRIVER FOR IMX6

M:	Richard Zhu <r65037@freescale.com>

arch/powerpc/kernel/pci_64.c

+6 −4
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ long sys_pciconfig_iobase(long which, unsigned long in_bus, 
			  unsigned long in_devfn)

{

	struct pci_controller* hose;

	struct pci_bus *bus = NULL;

	struct pci_bus *tmp_bus, *bus = NULL;

	struct device_node *hose_node;



	/* Argh ! Please forgive me for that hack, but that's the
@@ -229,10 +229,12 @@ long sys_pciconfig_iobase(long which, unsigned long in_bus, 
	 * used on pre-domains setup. We return the first match

	 */



	list_for_each_entry(bus, &pci_root_buses, node) {

		if (in_bus >= bus->number && in_bus <= bus->busn_res.end)

	list_for_each_entry(tmp_bus, &pci_root_buses, node) {

		if (in_bus >= tmp_bus->number &&

		    in_bus <= tmp_bus->busn_res.end) {

			bus = tmp_bus;

			break;

		bus = NULL;

		}

	}

	if (bus == NULL || bus->dev.of_node == NULL)

		return -ENODEV;

drivers/misc/genwqe/card_utils.c

+1 −1
Original line number Diff line number Diff line
@@ -628,7 +628,7 @@ int genwqe_set_interrupt_capability(struct genwqe_dev *cd, int count) 
	int rc;

	struct pci_dev *pci_dev = cd->pci_dev;



	rc = pci_enable_msi_block(pci_dev, count);

	rc = pci_enable_msi_exact(pci_dev, count);

	if (rc == 0)

		cd->flags |= GENWQE_FLAG_MSI_ENABLED;

	return rc;

drivers/pci/bus.c

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/errno.h>

#include <linux/ioport.h>

#include <linux/proc_fs.h>

#include <linux/init.h>

#include <linux/slab.h>



#include "pci.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE