Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 (fe31eb67) · Commits · e / devices / android_kernel_fairphone_FP3

arch/i386/pci/fixup.c

+55 −0

Original line number	Diff line number	Diff line
		@@ -342,6 +342,61 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_MCH_PB1, pcie_r
		DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_MCH_PC, pcie_rootport_aspm_quirk );
		DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_MCH_PC1, pcie_rootport_aspm_quirk );

		/*
		* Fixup to mark boot BIOS video selected by BIOS before it changes
		*
		* From information provided by "Jon Smirl" <jonsmirl@gmail.com>
		*
		* The standard boot ROM sequence for an x86 machine uses the BIOS
		* to select an initial video card for boot display. This boot video
		* card will have it's BIOS copied to C0000 in system RAM.
		* IORESOURCE_ROM_SHADOW is used to associate the boot video
		* card with this copy. On laptops this copy has to be used since
		* the main ROM may be compressed or combined with another image.
		* See pci_map_rom() for use of this flag. IORESOURCE_ROM_SHADOW
		* is marked here since the boot video device will be the only enabled
		* video device at this point.
		*/

		static void __devinit pci_fixup_video(struct pci_dev *pdev)
		{
		struct pci_dev *bridge;
		struct pci_bus *bus;
		u16 config;

		if ((pdev->class >> 8) != PCI_CLASS_DISPLAY_VGA)
		return;

		/* Is VGA routed to us? */
		bus = pdev->bus;
		while (bus) {
		bridge = bus->self;

		/*
		* From information provided by
		* "David Miller" <davem@davemloft.net>
		* The bridge control register is valid for PCI header
		* type BRIDGE, or CARDBUS. Host to PCI controllers use
		* PCI header type NORMAL.
		*/
		if (bridge
		&&((bridge->hdr_type == PCI_HEADER_TYPE_BRIDGE)
		\|\|(bridge->hdr_type == PCI_HEADER_TYPE_CARDBUS))) {
		pci_read_config_word(bridge, PCI_BRIDGE_CONTROL,
		&config);
		if (!(config & PCI_BRIDGE_CTL_VGA))
		return;
		}
		bus = bus->parent;
		}
		pci_read_config_word(pdev, PCI_COMMAND, &config);
		if (config & (PCI_COMMAND_IO \| PCI_COMMAND_MEMORY)) {
		pdev->resource[PCI_ROM_RESOURCE].flags \|= IORESOURCE_ROM_SHADOW;
		printk(KERN_DEBUG "Boot video device is %s\n", pci_name(pdev));
		}
		}
		DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_video);

		/*
		* Some Toshiba laptops need extra code to enable their TI TSB43AB22/A.
		*

arch/ia64/pci/Makefile

+1 −1

Original line number	Diff line number	Diff line
		#
		# Makefile for the ia64-specific parts of the pci bus
		#
		obj-y := pci.o
		obj-y := pci.o fixup.o

arch/ia64/pci/fixup.c

0 → 100644

+69 −0

Original line number	Diff line number	Diff line
		/*
		* Exceptions for specific devices. Usually work-arounds for fatal design flaws.
		* Derived from fixup.c of i386 tree.
		*/

		#include <linux/pci.h>
		#include <linux/init.h>

		#include <asm/machvec.h>

		/*
		* Fixup to mark boot BIOS video selected by BIOS before it changes
		*
		* From information provided by "Jon Smirl" <jonsmirl@gmail.com>
		*
		* The standard boot ROM sequence for an x86 machine uses the BIOS
		* to select an initial video card for boot display. This boot video
		* card will have it's BIOS copied to C0000 in system RAM.
		* IORESOURCE_ROM_SHADOW is used to associate the boot video
		* card with this copy. On laptops this copy has to be used since
		* the main ROM may be compressed or combined with another image.
		* See pci_map_rom() for use of this flag. IORESOURCE_ROM_SHADOW
		* is marked here since the boot video device will be the only enabled
		* video device at this point.
		*/

		static void __devinit pci_fixup_video(struct pci_dev *pdev)
		{
		struct pci_dev *bridge;
		struct pci_bus *bus;
		u16 config;

		if ((strcmp(platform_name, "dig") != 0)
		&& (strcmp(platform_name, "hpzx1") != 0))
		return;
		/* Maybe, this machine supports legacy memory map. */

		if ((pdev->class >> 8) != PCI_CLASS_DISPLAY_VGA)
		return;

		/* Is VGA routed to us? */
		bus = pdev->bus;
		while (bus) {
		bridge = bus->self;

		/*
		* From information provided by
		* "David Miller" <davem@davemloft.net>
		* The bridge control register is valid for PCI header
		* type BRIDGE, or CARDBUS. Host to PCI controllers use
		* PCI header type NORMAL.
		*/
		if (bridge
		&&((bridge->hdr_type == PCI_HEADER_TYPE_BRIDGE)
		\|\|(bridge->hdr_type == PCI_HEADER_TYPE_CARDBUS))) {
		pci_read_config_word(bridge, PCI_BRIDGE_CONTROL,
		&config);
		if (!(config & PCI_BRIDGE_CTL_VGA))
		return;
		}
		bus = bus->parent;
		}
		pci_read_config_word(pdev, PCI_COMMAND, &config);
		if (config & (PCI_COMMAND_IO \| PCI_COMMAND_MEMORY)) {
		pdev->resource[PCI_ROM_RESOURCE].flags \|= IORESOURCE_ROM_SHADOW;
		printk(KERN_DEBUG "Boot video device is %s\n", pci_name(pdev));
		}
		}
		DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_video);

arch/x86_64/pci/mmconfig.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -220,7 +220,7 @@ void __init pci_mmcfg_init(int type)

		pci_mmcfg_virt = kmalloc(sizeof(pci_mmcfg_virt) pci_mmcfg_config_num, GFP_KERNEL);
		if (pci_mmcfg_virt == NULL) {
		printk("PCI: Can not allocate memory for mmconfig structures\n");
		printk(KERN_ERR "PCI: Can not allocate memory for mmconfig structures\n");
		return;
		}
		for (i = 0; i < pci_mmcfg_config_num; ++i) {
		@@ -228,7 +228,8 @@ void __init pci_mmcfg_init(int type)
		pci_mmcfg_virt[i].virt = ioremap_nocache(pci_mmcfg_config[i].base_address,
		MMCONFIG_APER_MAX);
		if (!pci_mmcfg_virt[i].virt) {
		printk("PCI: Cannot map mmconfig aperture for segment %d\n",
		printk(KERN_ERR "PCI: Cannot map mmconfig aperture for "
		"segment %d\n",
		pci_mmcfg_config[i].pci_segment_group_number);
		return;
		}

drivers/pci/hotplug/acpiphp_glue.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1807,8 +1807,8 @@ u8 acpiphp_get_power_status(struct acpiphp_slot *slot)


		/*
		* latch closed: 1
		* latch open: 0
		* latch open: 1
		* latch closed: 0
		*/
		u8 acpiphp_get_latch_status(struct acpiphp_slot *slot)
		{
		@@ -1816,7 +1816,7 @@ u8 acpiphp_get_latch_status(struct acpiphp_slot *slot)

		sta = get_slot_status(slot);

		return (sta & ACPI_STA_SHOW_IN_UI) ? 1 : 0;
		return (sta & ACPI_STA_SHOW_IN_UI) ? 0 : 1;
		}