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

Commit 91bbec65 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' into next 

* pci/misc:
  x86/PCI: Simplify Dell DMI B1 quirk
  PCI: Add domain number check to find_smbios_instance_string()
  x86/PCI: Fix whitespace in set_bios_x() printk
  PCI: Correct PCI_STD_RESOURCE_END usage
  efi/fb: Correct PCI_STD_RESOURCE_END usage
  MIPS: PCI: Remove unused busn_offset
  MIPS: Loongson: Remove unused PCI_BAR_COUNT definition
parents f9bfeccd f5ab3b70

arch/mips/include/asm/mach-loongson64/cs5536/cs5536_pci.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -80,7 +80,6 @@ extern u32 cs5536_pci_conf_read4(int function, int reg); 
#define PCI_BAR3_REG			0x1c

#define PCI_BAR3_REG			0x1c

#define PCI_BAR4_REG			0x20

#define PCI_BAR4_REG			0x20

#define PCI_BAR5_REG			0x24

#define PCI_BAR5_REG			0x24

#define PCI_BAR_COUNT			6

#define PCI_BAR_RANGE_MASK		0xFFFFFFFF

#define PCI_BAR_RANGE_MASK		0xFFFFFFFF





/* CARDBUS CIS POINTER */

/* CARDBUS CIS POINTER */

arch/mips/include/asm/pci.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -39,7 +39,6 @@ struct pci_controller { 
	unsigned long io_offset;

	unsigned long io_offset;

	unsigned long io_map_base;

	unsigned long io_map_base;

	struct resource *busn_resource;

	struct resource *busn_resource;

	unsigned long busn_offset;





#ifndef CONFIG_PCI_DOMAINS_GENERIC

#ifndef CONFIG_PCI_DOMAINS_GENERIC

	unsigned int index;

	unsigned int index;

arch/mips/pci/pci-legacy.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -86,8 +86,7 @@ static void pcibios_scanbus(struct pci_controller *hose) 
				hose->mem_resource, hose->mem_offset);

				hose->mem_resource, hose->mem_offset);

	pci_add_resource_offset(&resources,

	pci_add_resource_offset(&resources,

				hose->io_resource, hose->io_offset);

				hose->io_resource, hose->io_offset);

	pci_add_resource_offset(&resources,

	pci_add_resource(&resources, hose->busn_resource);

				hose->busn_resource, hose->busn_offset);

	bus = pci_scan_root_bus(NULL, next_busno, hose->pci_ops, hose,

	bus = pci_scan_root_bus(NULL, next_busno, hose->pci_ops, hose,

				&resources);

				&resources);

	hose->bus = bus;

	hose->bus = bus;

arch/x86/pci/common.c

+5 −22
Original line number Original line Diff line number Diff line
@@ -24,7 +24,6 @@ unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2 | 




unsigned int pci_early_dump_regs;

unsigned int pci_early_dump_regs;

static int pci_bf_sort;

static int pci_bf_sort;

static int smbios_type_b1_flag;

int pci_routeirq;

int pci_routeirq;

int noioapicquirk;

int noioapicquirk;

#ifdef CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS

#ifdef CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS
@@ -197,35 +196,19 @@ static int __init set_bf_sort(const struct dmi_system_id *d) 
static void __init read_dmi_type_b1(const struct dmi_header *dm,

static void __init read_dmi_type_b1(const struct dmi_header *dm,

				    void *private_data)

				    void *private_data)

{

{

	u8 *d = (u8 *)dm + 4;

	u8 *data = (u8 *)dm + 4;





	if (dm->type != 0xB1)

	if (dm->type != 0xB1)

		return;

		return;

	switch (((*(u32 *)d) >> 9) & 0x03) {

	if ((((*(u32 *)data) >> 9) & 0x03) == 0x01)

	case 0x00:

		set_bf_sort((const struct dmi_system_id *)private_data);

		printk(KERN_INFO "dmi type 0xB1 record - unknown flag\n");

		break;

	case 0x01: /* set pci=bfsort */

		smbios_type_b1_flag = 1;

		break;

	case 0x02: /* do not set pci=bfsort */

		smbios_type_b1_flag = 2;

		break;

	default:

		break;

	}

}

}





static int __init find_sort_method(const struct dmi_system_id *d)

static int __init find_sort_method(const struct dmi_system_id *d)

{

{

	dmi_walk(read_dmi_type_b1, NULL);

	dmi_walk(read_dmi_type_b1, (void *)d);



	if (smbios_type_b1_flag == 1) {

		set_bf_sort(d);

	return 0;

	return 0;

}

}

	return -1;

}





/*

/*

 * Enable renumbering of PCI bus# ranges to reach all PCI busses (Cardbus)

 * Enable renumbering of PCI bus# ranges to reach all PCI busses (Cardbus)

drivers/pci/pci-label.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -43,9 +43,11 @@ static size_t find_smbios_instance_string(struct pci_dev *pdev, char *buf, 
{

{

	const struct dmi_device *dmi;

	const struct dmi_device *dmi;

	struct dmi_dev_onboard *donboard;

	struct dmi_dev_onboard *donboard;

	int domain_nr;

	int bus;

	int bus;

	int devfn;

	int devfn;





	domain_nr = pci_domain_nr(pdev->bus);

	bus = pdev->bus->number;

	bus = pdev->bus->number;

	devfn = pdev->devfn;

	devfn = pdev->devfn;
@@ -53,7 +55,8 @@ static size_t find_smbios_instance_string(struct pci_dev *pdev, char *buf, 
	while ((dmi = dmi_find_device(DMI_DEV_TYPE_DEV_ONBOARD,

	while ((dmi = dmi_find_device(DMI_DEV_TYPE_DEV_ONBOARD,

				      NULL, dmi)) != NULL) {

				      NULL, dmi)) != NULL) {

		donboard = dmi->device_data;

		donboard = dmi->device_data;

		if (donboard && donboard->bus == bus &&

		if (donboard && donboard->segment == domain_nr &&

				donboard->bus == bus &&

				donboard->devfn == devfn) {

				donboard->devfn == devfn) {

			if (buf) {

			if (buf) {

				if (attribute == SMBIOS_ATTR_INSTANCE_SHOW)

				if (attribute == SMBIOS_ATTR_INSTANCE_SHOW)