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

Commit 0e59e7e7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next-rebase' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci 

* 'next-rebase' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci:
  PCI: Clean-up MPS debug output
  pci: Clamp pcie_set_readrq() when using "performance" settings
  PCI: enable MPS "performance" setting to properly handle bridge MPS
  PCI: Workaround for Intel MPS errata
  PCI: Add support for PASID capability
  PCI: Add implementation for PRI capability
  PCI: Export ATS functions to modules
  PCI: Move ATS implementation into own file
  PCI / PM: Remove unnecessary error variable from acpi_dev_run_wake()
  PCI hotplug: acpiphp: Prevent deadlock on PCI-to-PCI bridge remove
  PCI / PM: Extend PME polling to all PCI devices
  PCI quirk: mmc: Always check for lower base frequency quirk for Ricoh 1180:e823
  PCI: Make pci_setup_bridge() non-static for use by arch code
  x86: constify PCI raw ops structures
  PCI: Add quirk for known incorrect MPSS
  PCI: Add Solarflare vendor ID and SFC4000 device IDs
parents 46b51ea2 a513a99a

arch/x86/include/asm/pci_x86.h

+3 −3
Original line number Diff line number Diff line
@@ -99,10 +99,10 @@ struct pci_raw_ops { 
						int reg, int len, u32 val);

};



extern struct pci_raw_ops *raw_pci_ops;

extern struct pci_raw_ops *raw_pci_ext_ops;

extern const struct pci_raw_ops *raw_pci_ops;

extern const struct pci_raw_ops *raw_pci_ext_ops;



extern struct pci_raw_ops pci_direct_conf1;

extern const struct pci_raw_ops pci_direct_conf1;

extern bool port_cf9_safe;



/* arch_initcall level */

arch/x86/pci/ce4100.c

+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ static int ce4100_conf_write(unsigned int seg, unsigned int bus, 
	return pci_direct_conf1.write(seg, bus, devfn, reg, len, value);

}



struct pci_raw_ops ce4100_pci_conf = {

static const struct pci_raw_ops ce4100_pci_conf = {

	.read =	ce4100_conf_read,

	.write = ce4100_conf_write,

};

arch/x86/pci/common.c

+2 −2
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ int noioapicreroute = 1; 
int pcibios_last_bus = -1;

unsigned long pirq_table_addr;

struct pci_bus *pci_root_bus;

struct pci_raw_ops *raw_pci_ops;

struct pci_raw_ops *raw_pci_ext_ops;

const struct pci_raw_ops *__read_mostly raw_pci_ops;

const struct pci_raw_ops *__read_mostly raw_pci_ext_ops;



int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn,

						int reg, int len, u32 *val)

arch/x86/pci/direct.c

+3 −3
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int seg, unsigned int bus, 


#undef PCI_CONF1_ADDRESS



struct pci_raw_ops pci_direct_conf1 = {

const struct pci_raw_ops pci_direct_conf1 = {

	.read =		pci_conf1_read,

	.write =	pci_conf1_write,

};
@@ -175,7 +175,7 @@ static int pci_conf2_write(unsigned int seg, unsigned int bus, 


#undef PCI_CONF2_ADDRESS



struct pci_raw_ops pci_direct_conf2 = {

static const struct pci_raw_ops pci_direct_conf2 = {

	.read =		pci_conf2_read,

	.write =	pci_conf2_write,

};
@@ -191,7 +191,7 @@ struct pci_raw_ops pci_direct_conf2 = { 
 * This should be close to trivial, but it isn't, because there are buggy

 * chipsets (yes, you guessed it, by Intel and Compaq) that have no class ID.

 */

static int __init pci_sanity_check(struct pci_raw_ops *o)

static int __init pci_sanity_check(const struct pci_raw_ops *o)

{

	u32 x = 0;

	int year, devfn;

arch/x86/pci/mmconfig_32.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static int pci_mmcfg_write(unsigned int seg, unsigned int bus, 
	return 0;

}



static struct pci_raw_ops pci_mmcfg = {

static const struct pci_raw_ops pci_mmcfg = {

	.read =		pci_mmcfg_read,

	.write =	pci_mmcfg_write,

};