Commit d661d76b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI/cardbus: Add a fixup hook and fix powerpc
  PCI: change PCI nomenclature in drivers/pci/ (non-comment changes)
  PCI: change PCI nomenclature in drivers/pci/ (comment changes)
  PCI: fix section mismatch on update_res()
  PCI: add Intel 82599 Virtual Function specific reset method
  PCI: add Intel USB specific reset method
  PCI: support device-specific reset methods
  PCI: Handle case when no pci device can provide cache line size hint
  PCI/PM: Propagate wake-up enable for PCIe devices too
  vgaarbiter: fix a typo in the vgaarbiter Documentation
parents b07d41b7 2d1c8618

Documentation/vgaarbiter.txt

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ I.2 libpciaccess 
----------------



To use the vga arbiter char device it was implemented an API inside the

libpciaccess library. One fieldd was added to struct pci_device (each device

libpciaccess library. One field was added to struct pci_device (each device

on the system):



    /* the type of resource decoded by the device */

arch/powerpc/kernel/pci-common.c

+13 −0
Original line number Diff line number Diff line
@@ -1107,6 +1107,12 @@ void __devinit pcibios_setup_bus_devices(struct pci_bus *bus) 
	list_for_each_entry(dev, &bus->devices, bus_list) {

		struct dev_archdata *sd = &dev->dev.archdata;



		/* Cardbus can call us to add new devices to a bus, so ignore

		 * those who are already fully discovered

		 */

		if (dev->is_added)

			continue;



		/* Setup OF node pointer in archdata */

		sd->of_node = pci_device_to_OF_node(dev);
@@ -1147,6 +1153,13 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus) 
}

EXPORT_SYMBOL(pcibios_fixup_bus);



void __devinit pci_fixup_cardbus(struct pci_bus *bus)

{

	/* Now fixup devices on that bus */

	pcibios_setup_bus_devices(bus);

}





static int skip_isa_ioresource_align(struct pci_dev *dev)

{

	if ((ppc_pci_flags & PPC_PCI_CAN_SKIP_ISA_ALIGN) &&

arch/x86/pci/bus_numa.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ void x86_pci_root_bus_res_quirks(struct pci_bus *b) 
	}

}



void __init update_res(struct pci_root_info *info, size_t start,

void __devinit update_res(struct pci_root_info *info, size_t start,

			      size_t end, unsigned long flags, int merge)

{

	int i;

drivers/pci/hotplug/shpchp.h

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ struct controller { 
#define PCI_DEVICE_ID_AMD_GOLAM_7450	0x7450

#define PCI_DEVICE_ID_AMD_POGO_7458	0x7458



/* AMD PCIX bridge registers */

/* AMD PCI-X bridge registers */

#define PCIX_MEM_BASE_LIMIT_OFFSET	0x1C

#define PCIX_MISCII_OFFSET		0x48

#define PCIX_MISC_BRIDGE_ERRORS_OFFSET	0x80

drivers/pci/intel-iommu.c

+3 −3
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ struct device_domain_info { 
	int segment;		/* PCI domain */

	u8 bus;			/* PCI bus number */

	u8 devfn;		/* PCI devfn number */

	struct pci_dev *dev; /* it's NULL for PCIE-to-PCI bridge */

	struct pci_dev *dev; /* it's NULL for PCIe-to-PCI bridge */

	struct intel_iommu *iommu; /* IOMMU used by this device */

	struct dmar_domain *domain; /* pointer to domain */

};
@@ -1604,7 +1604,7 @@ domain_context_mapping(struct dmar_domain *domain, struct pci_dev *pdev, 
			return ret;

		parent = parent->bus->self;

	}

	if (pci_is_pcie(tmp)) /* this is a PCIE-to-PCI bridge */

	if (pci_is_pcie(tmp)) /* this is a PCIe-to-PCI bridge */

		return domain_context_mapping_one(domain,

					pci_domain_nr(tmp->subordinate),

					tmp->subordinate->number, 0,
@@ -3325,7 +3325,7 @@ static void iommu_detach_dependent_devices(struct intel_iommu *iommu, 
					 parent->devfn);

			parent = parent->bus->self;

		}

		if (pci_is_pcie(tmp)) /* this is a PCIE-to-PCI bridge */

		if (pci_is_pcie(tmp)) /* this is a PCIe-to-PCI bridge */

			iommu_detach_dev(iommu,

				tmp->subordinate->number, 0);

		else /* this is a legacy PCI bridge */

CRA Git | Maintained and supported by SUSTech CRA and CCSE