Commit ddd13dc6 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: add acpi_find_root_bridge_handle
  PCI: acpi_pcihp: run _OSC on a root bridge
  x86/PCI: irq and pci_ids patch for Intel Ibex Peak PCHs
  x86/PCI: allow scanning of 255 PCI busses
  x86, pci: detect end_bus_number according to acpi/e820 reserved, v2
  pci: debug extra pci bus resources
  pci: debug extra pci resources range
parents f607e3a0 a59f2bba

arch/x86/pci/irq.c

+2 −0
Original line number Diff line number Diff line
@@ -590,6 +590,8 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route 
	case PCI_DEVICE_ID_INTEL_ICH10_1:

	case PCI_DEVICE_ID_INTEL_ICH10_2:

	case PCI_DEVICE_ID_INTEL_ICH10_3:

	case PCI_DEVICE_ID_INTEL_PCH_0:

	case PCI_DEVICE_ID_INTEL_PCH_1:

		r->name = "PIIX/ICH";

		r->get = pirq_piix_get;

		r->set = pirq_piix_set;

arch/x86/pci/legacy.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ static void __devinit pcibios_fixup_peer_bridges(void) 
	int n, devfn;

	long node;



	if (pcibios_last_bus <= 0 || pcibios_last_bus >= 0xff)

	if (pcibios_last_bus <= 0 || pcibios_last_bus > 0xff)

		return;

	DBG("PCI: Peer bridge fixup\n");

arch/x86/pci/mmconfig-shared.c

+48 −17
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ static acpi_status __init find_mboard_resource(acpi_handle handle, u32 lvl, 
	return AE_OK;

}



static int __init is_acpi_reserved(unsigned long start, unsigned long end)

static int __init is_acpi_reserved(u64 start, u64 end, unsigned not_used)

{

	struct resource mcfg_res;
@@ -310,6 +310,41 @@ static int __init is_acpi_reserved(unsigned long start, unsigned long end) 
	return mcfg_res.flags;

}



typedef int (*check_reserved_t)(u64 start, u64 end, unsigned type);



static int __init is_mmconf_reserved(check_reserved_t is_reserved,

		u64 addr, u64 size, int i,

		typeof(pci_mmcfg_config[0]) *cfg, int with_e820)

{

	u64 old_size = size;

	int valid = 0;



	while (!is_reserved(addr, addr + size - 1, E820_RESERVED)) {

		size >>= 1;

		if (size < (16UL<<20))

			break;

	}



	if (size >= (16UL<<20) || size == old_size) {

		printk(KERN_NOTICE

		       "PCI: MCFG area at %Lx reserved in %s\n",

			addr, with_e820?"E820":"ACPI motherboard resources");

		valid = 1;



		if (old_size != size) {

			/* update end_bus_number */

			cfg->end_bus_number = cfg->start_bus_number + ((size>>20) - 1);

			printk(KERN_NOTICE "PCI: updated MCFG configuration %d: base %lx "

			       "segment %hu buses %u - %u\n",

			       i, (unsigned long)cfg->address, cfg->pci_segment,

			       (unsigned int)cfg->start_bus_number,

			       (unsigned int)cfg->end_bus_number);

		}

	}



	return valid;

}



static void __init pci_mmcfg_reject_broken(int early)

{

	typeof(pci_mmcfg_config[0]) *cfg;
@@ -324,21 +359,22 @@ static void __init pci_mmcfg_reject_broken(int early) 


	for (i = 0; i < pci_mmcfg_config_num; i++) {

		int valid = 0;

		u32 size = (cfg->end_bus_number + 1) << 20;

		u64 addr, size;



		cfg = &pci_mmcfg_config[i];

		addr = cfg->start_bus_number;

		addr <<= 20;

		addr += cfg->address;

		size = cfg->end_bus_number + 1 - cfg->start_bus_number;

		size <<= 20;

		printk(KERN_NOTICE "PCI: MCFG configuration %d: base %lx "

		       "segment %hu buses %u - %u\n",

		       i, (unsigned long)cfg->address, cfg->pci_segment,

		       (unsigned int)cfg->start_bus_number,

		       (unsigned int)cfg->end_bus_number);



		if (!early &&

		    is_acpi_reserved(cfg->address, cfg->address + size - 1)) {

			printk(KERN_NOTICE "PCI: MCFG area at %Lx reserved "

			       "in ACPI motherboard resources\n",

			       cfg->address);

			valid = 1;

		}

		if (!early)

			valid = is_mmconf_reserved(is_acpi_reserved, addr, size, i, cfg, 0);



		if (valid)

			continue;
@@ -347,16 +383,11 @@ static void __init pci_mmcfg_reject_broken(int early) 
			printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %Lx is not"

			       " reserved in ACPI motherboard resources\n",

			       cfg->address);



		/* Don't try to do this check unless configuration

		   type 1 is available. how about type 2 ?*/

		if (raw_pci_ops && e820_all_mapped(cfg->address,

						  cfg->address + size - 1,

						  E820_RESERVED)) {

			printk(KERN_NOTICE

			       "PCI: MCFG area at %Lx reserved in E820\n",

			       cfg->address);

			valid = 1;

		}

		if (raw_pci_ops)

			valid = is_mmconf_reserved(e820_all_mapped, addr, size, i, cfg, 1);



		if (!valid)

			goto reject;

drivers/pci/hotplug/acpi_pcihp.c

+26 −12
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ EXPORT_SYMBOL_GPL(acpi_get_hp_params_from_firmware); 
int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags)

{

	acpi_status status;

	acpi_handle chandle, handle = DEVICE_ACPI_HANDLE(&(dev->dev));

	acpi_handle chandle, handle;

	struct pci_dev *pdev = dev;

	struct pci_bus *parent;

	struct acpi_buffer string = { ACPI_ALLOCATE_BUFFER, NULL };
@@ -399,10 +399,25 @@ int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags) 
	 * Per PCI firmware specification, we should run the ACPI _OSC

	 * method to get control of hotplug hardware before using it. If

	 * an _OSC is missing, we look for an OSHP to do the same thing.

	 * To handle different BIOS behavior, we look for _OSC and OSHP

	 * within the scope of the hotplug controller and its parents,

	 * To handle different BIOS behavior, we look for _OSC on a root

	 * bridge preferentially (according to PCI fw spec). Later for

	 * OSHP within the scope of the hotplug controller and its parents,

	 * upto the host bridge under which this controller exists.

	 */

	handle = acpi_find_root_bridge_handle(pdev);

	if (handle) {

		acpi_get_name(handle, ACPI_FULL_PATHNAME, &string);

		dbg("Trying to get hotplug control for %s\n",

				(char *)string.pointer);

		status = pci_osc_control_set(handle, flags);

		if (ACPI_SUCCESS(status))

			goto got_one;

		kfree(string.pointer);

		string = (struct acpi_buffer){ ACPI_ALLOCATE_BUFFER, NULL };

	}



	pdev = dev;

	handle = DEVICE_ACPI_HANDLE(&dev->dev);

	while (!handle) {

		/*

		 * This hotplug controller was not listed in the ACPI name
@@ -427,15 +442,9 @@ int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags) 
		acpi_get_name(handle, ACPI_FULL_PATHNAME, &string);

		dbg("Trying to get hotplug control for %s \n",

		    (char *)string.pointer);

		status = pci_osc_control_set(handle, flags);

		if (status == AE_NOT_FOUND)

		status = acpi_run_oshp(handle);

		if (ACPI_SUCCESS(status)) {

			dbg("Gained control for hotplug HW for pci %s (%s)\n",

			    pci_name(dev), (char *)string.pointer);

			kfree(string.pointer);

			return 0;

		}

		if (ACPI_SUCCESS(status))

			goto got_one;

		if (acpi_root_bridge(handle))

			break;

		chandle = handle;
@@ -449,6 +458,11 @@ int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags) 


	kfree(string.pointer);

	return -ENODEV;

got_one:

	dbg("Gained control for hotplug HW for pci %s (%s)\n", pci_name(dev),

			(char *)string.pointer);

	kfree(string.pointer);

	return 0;

}

EXPORT_SYMBOL(acpi_get_hp_hw_control_from_firmware);

drivers/pci/pcie/aer/aerdrv_acpi.c

+1 −6
Original line number Diff line number Diff line
@@ -36,12 +36,7 @@ int aer_osc_setup(struct pcie_device *pciedev) 
	if (acpi_pci_disabled)

		return -1;



	/* Find root host bridge */

	while (pdev->bus->self)

		pdev = pdev->bus->self;

	handle = acpi_get_pci_rootbridge_handle(

		pci_domain_nr(pdev->bus), pdev->bus->number);



	handle = acpi_find_root_bridge_handle(pdev);

	if (handle) {

		pcie_osc_support_set(OSC_EXT_PCI_CONFIG_SUPPORT);

		status = pci_osc_control_set(handle,

CRA Git | Maintained and supported by SUSTech CRA and CCSE