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

Commit 33de1b8b authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' into next 

* pci/misc:
  PCI: Report pci_pme_active() kmalloc failure
  mn10300/PCI: Remove useless pcibios_last_bus
  frv/PCI: Remove pcibios_last_bus
  PCI: Fail MSI/MSI-X initialization if device is not in PCI_D0
  x86/PCI: Coalesce multiple overlapping host bridge windows
  MAINTAINERS: Add arch/x86/pci to PCI file patterns
  PCI/PM: Remove pci_pm_complete()
  PCI: Add pci_dev_show_local_cpu() to simplify code
  mn10300/PCI: Remove unused pci_mem_start
  cris/PCI: Remove unused pci_mem_start
  PCI: Make pci_dev_pm_ops static

Conflicts:
	drivers/pci/pci-sysfs.c
parents cc17a67c 0394cb19

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -6338,6 +6338,7 @@ S: Supported 
F:	Documentation/PCI/

F:	drivers/pci/

F:	include/linux/pci*

F:	arch/x86/pci/



PCI DRIVER FOR NVIDIA TEGRA

M:	Thierry Reding <thierry.reding@gmail.com>

arch/cris/include/asm/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 


#define pcibios_assign_all_busses(void) 1



extern unsigned long pci_mem_start;

#define PCIBIOS_MIN_IO		0x1000

#define PCIBIOS_MIN_MEM		0x10000000

arch/frv/mb93090-mb00/pci-frv.h

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ void pcibios_resource_survey(void); 


/* pci-vdk.c */



extern int __nongpreldata pcibios_last_bus;

extern struct pci_ops *__nongpreldata pci_root_ops;



/* pci-irq.c */

arch/frv/mb93090-mb00/pci-vdk.c

+0 −36
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 


unsigned int __nongpreldata pci_probe = 1;



int  __nongpreldata pcibios_last_bus = -1;

struct pci_ops *__nongpreldata pci_root_ops;



/*
@@ -219,37 +218,6 @@ static struct pci_ops * __init pci_check_direct(void) 
	return NULL;

}



/*

 * Discover remaining PCI buses in case there are peer host bridges.

 * We use the number of last PCI bus provided by the PCI BIOS.

 */

static void __init pcibios_fixup_peer_bridges(void)

{

	struct pci_bus bus;

	struct pci_dev dev;

	int n;

	u16 l;



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

		return;

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

	for (n=0; n <= pcibios_last_bus; n++) {

		if (pci_find_bus(0, n))

			continue;

		bus.number = n;

		bus.ops = pci_root_ops;

		dev.bus = &bus;

		for(dev.devfn=0; dev.devfn<256; dev.devfn += 8)

			if (!pci_read_config_word(&dev, PCI_VENDOR_ID, &l) &&

			    l != 0x0000 && l != 0xffff) {

				printk("Found device at %02x:%02x [%04x]\n", n, dev.devfn, l);

				printk("PCI: Discovered peer bus %02x\n", n);

				pci_scan_bus(n, pci_root_ops, NULL);

				break;

			}

	}

}



/*

 * Exceptions for specific devices. Usually work-arounds for fatal design flaws.

 */
@@ -418,7 +386,6 @@ int __init pcibios_init(void) 
	pci_scan_root_bus(NULL, 0, pci_root_ops, NULL, &resources);



	pcibios_irq_init();

	pcibios_fixup_peer_bridges();

	pcibios_fixup_irqs();

	pcibios_resource_survey();
@@ -432,9 +399,6 @@ char * __init pcibios_setup(char *str) 
	if (!strcmp(str, "off")) {

		pci_probe = 0;

		return NULL;

	} else if (!strncmp(str, "lastbus=", 8)) {

		pcibios_last_bus = simple_strtol(str+8, NULL, 0);

		return NULL;

	}

	return str;

}

arch/mn10300/include/asm/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ extern void unit_pci_init(void); 
#define pcibios_assign_all_busses()	0

#endif



extern unsigned long pci_mem_start;

#define PCIBIOS_MIN_IO		0xBE000004

#define PCIBIOS_MIN_MEM		0xB8000000