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

Commit 5fc054a5 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/resource' 

  - Clean up devm_of_pci_get_host_bridge_resources() resource allocation
    (Jan Kiszka)

  - Fixup resizable BARs after suspend/resume (Christian König)

  - Make "pci=earlydump" generic (Sinan Kaya)

  - Fix ROM BAR access routines to stay in bounds and check for signature
    correctly (Rex Zhu)

* pci/resource:
  PCI: Make pci_get_rom_size() static
  PCI: Add check code for last image indicator not set
  PCI: Avoid accessing memory outside the ROM BAR
  PCI: Make early dump functionality generic
  PCI: Cleanup PCI_REBAR_CTRL_BAR_SHIFT handling
  PCI: Restore resized BAR state on resume
  PCI: Clean up resource allocation in devm_of_pci_get_host_bridge_resources()

# Conflicts:
#	Documentation/admin-guide/kernel-parameters.txt
parents c689209b 783e8496

Documentation/admin-guide/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -3018,7 +3018,7 @@ 
				configuration space which may match multiple

				devices in the system.



		earlydump	[X86] dump PCI config space before the kernel

		earlydump	dump PCI config space before the kernel

				changes anything

		off		[X86] don't probe for the PCI bus

		bios		[X86-32] force use of PCI BIOS, don't access

arch/x86/include/asm/pci-direct.h

+0 −4
Original line number Diff line number Diff line
@@ -15,8 +15,4 @@ extern void write_pci_config_byte(u8 bus, u8 slot, u8 func, u8 offset, u8 val); 
extern void write_pci_config_16(u8 bus, u8 slot, u8 func, u8 offset, u16 val);



extern int early_pci_allowed(void);



extern unsigned int pci_early_dump_regs;

extern void early_dump_pci_device(u8 bus, u8 slot, u8 func);

extern void early_dump_pci_devices(void);

#endif /* _ASM_X86_PCI_DIRECT_H */

arch/x86/kernel/setup.c

+0 −5
Original line number Diff line number Diff line
@@ -991,11 +991,6 @@ void __init setup_arch(char **cmdline_p) 
		setup_clear_cpu_cap(X86_FEATURE_APIC);

	}



#ifdef CONFIG_PCI

	if (pci_early_dump_regs)

		early_dump_pci_devices();

#endif



	e820__reserve_setup_data();

	e820__finish_early_params();

arch/x86/pci/common.c

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

				PCI_PROBE_MMCONF;



unsigned int pci_early_dump_regs;

static int pci_bf_sort;

int pci_routeirq;

int noioapicquirk;
@@ -599,9 +598,6 @@ char *__init pcibios_setup(char *str) 
		pci_probe |= PCI_BIG_ROOT_WINDOW;

		return NULL;

#endif

	} else if (!strcmp(str, "earlydump")) {

		pci_early_dump_regs = 1;

		return NULL;

	} else if (!strcmp(str, "routeirq")) {

		pci_routeirq = 1;

		return NULL;

arch/x86/pci/early.c

+0 −44
Original line number Diff line number Diff line
@@ -57,47 +57,3 @@ int early_pci_allowed(void) 
			PCI_PROBE_CONF1;

}

void early_dump_pci_device(u8 bus, u8 slot, u8 func)

{

	u32 value[256 / 4];

	int i;



	pr_info("pci 0000:%02x:%02x.%d config space:\n", bus, slot, func);



	for (i = 0; i < 256; i += 4)

		value[i / 4] = read_pci_config(bus, slot, func, i);



	print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 16, 1, value, 256, false);

}



void early_dump_pci_devices(void)

{

	unsigned bus, slot, func;



	if (!early_pci_allowed())

		return;



	for (bus = 0; bus < 256; bus++) {

		for (slot = 0; slot < 32; slot++) {

			for (func = 0; func < 8; func++) {

				u32 class;

				u8 type;



				class = read_pci_config(bus, slot, func,

							PCI_CLASS_REVISION);

				if (class == 0xffffffff)

					continue;



				early_dump_pci_device(bus, slot, func);



				if (func == 0) {

					type = read_pci_config_byte(bus, slot,

								    func,

							       PCI_HEADER_TYPE);

					if (!(type & 0x80))

						break;

				}

			}

		}

	}

}