Commit d388e541 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/host-generic' 

  - Constify struct pci_ecam_ops (Rob Herring)

  - Support building as modules (Rob Herring)

  - Eliminate wrappers for pci_host_common_probe() by using DT match table
    data (Rob Herring)

* remotes/lorenzo/pci/host-generic:
  PCI: host-generic: Eliminate pci_host_common_probe wrappers
  PCI: host-generic: Support building as modules
  PCI: Constify struct pci_ecam_ops

# Conflicts:
#	drivers/pci/controller/dwc/pcie-hisi.c
parents d611b2b8 b2f75a41

arch/arm64/kernel/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ pci_acpi_setup_ecam_mapping(struct acpi_pci_root *root) 
	struct device *dev = &root->device->dev;

	struct resource *bus_res = &root->secondary;

	u16 seg = root->segment;

	struct pci_ecam_ops *ecam_ops;

	const struct pci_ecam_ops *ecam_ops;

	struct resource cfgres;

	struct acpi_device *adev;

	struct pci_config_window *cfg;
@@ -185,7 +185,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) 


	root_ops->release_info = pci_acpi_generic_release_info;

	root_ops->prepare_resources = pci_acpi_root_prepare_resources;

	root_ops->pci_ops = &ri->cfg->ops->pci_ops;

	root_ops->pci_ops = (struct pci_ops *)&ri->cfg->ops->pci_ops;

	bus = acpi_pci_root_create(root, root_ops, &ri->common, ri->cfg);

	if (!bus)

		return NULL;

drivers/acpi/pci_mcfg.c

+4 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ struct mcfg_fixup { 
	u32 oem_revision;

	u16 segment;

	struct resource bus_range;

	struct pci_ecam_ops *ops;

	const struct pci_ecam_ops *ops;

	struct resource cfgres;

};
@@ -165,7 +165,7 @@ static int pci_mcfg_quirk_matches(struct mcfg_fixup *f, u16 segment, 


static void pci_mcfg_apply_quirks(struct acpi_pci_root *root,

				  struct resource *cfgres,

				  struct pci_ecam_ops **ecam_ops)

				  const struct pci_ecam_ops **ecam_ops)

{

#ifdef CONFIG_PCI_QUIRKS

	u16 segment = root->segment;
@@ -191,9 +191,9 @@ static void pci_mcfg_apply_quirks(struct acpi_pci_root *root, 
static LIST_HEAD(pci_mcfg_list);



int pci_mcfg_lookup(struct acpi_pci_root *root, struct resource *cfgres,

		    struct pci_ecam_ops **ecam_ops)

		    const struct pci_ecam_ops **ecam_ops)

{

	struct pci_ecam_ops *ops = &pci_generic_ecam_ops;

	const struct pci_ecam_ops *ops = &pci_generic_ecam_ops;

	struct resource *bus_res = &root->secondary;

	u16 seg = root->segment;

	struct mcfg_entry *e;

drivers/pci/controller/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -62,11 +62,11 @@ config PCIE_RCAR 
	  Say Y here if you want PCIe controller support on R-Car SoCs.



config PCI_HOST_COMMON

	bool

	tristate

	select PCI_ECAM



config PCI_HOST_GENERIC

	bool "Generic PCI host controller"

	tristate "Generic PCI host controller"

	depends on OF

	select PCI_HOST_COMMON

	select IRQ_DOMAIN

drivers/pci/controller/dwc/pcie-al.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static int al_pcie_init(struct pci_config_window *cfg) 
	return 0;

}



struct pci_ecam_ops al_pcie_ops = {

const struct pci_ecam_ops al_pcie_ops = {

	.bus_shift    = 20,

	.init         =  al_pcie_init,

	.pci_ops      = {

drivers/pci/controller/dwc/pcie-hisi.c

+5 −14
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static int hisi_pcie_init(struct pci_config_window *cfg) 
	return 0;

}



struct pci_ecam_ops hisi_pcie_ops = {

const struct pci_ecam_ops hisi_pcie_ops = {

	.bus_shift    = 20,

	.init         =  hisi_pcie_init,

	.pci_ops      = {
@@ -332,15 +332,6 @@ static struct platform_driver hisi_pcie_driver = { 
};

builtin_platform_driver(hisi_pcie_driver);



static int hisi_pcie_almost_ecam_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct pci_ecam_ops *ops;



	ops = (struct pci_ecam_ops *)of_device_get_match_data(dev);

	return pci_host_common_probe(pdev, ops);

}



static int hisi_pcie_platform_init(struct pci_config_window *cfg)

{

	struct device *dev = cfg->parent;
@@ -362,7 +353,7 @@ static int hisi_pcie_platform_init(struct pci_config_window *cfg) 
	return 0;

}



static struct pci_ecam_ops hisi_pcie_platform_ops = {

static const struct pci_ecam_ops hisi_pcie_platform_ops = {

	.bus_shift    = 20,

	.init         =  hisi_pcie_platform_init,

	.pci_ops      = {
@@ -375,17 +366,17 @@ static struct pci_ecam_ops hisi_pcie_platform_ops = { 
static const struct of_device_id hisi_pcie_almost_ecam_of_match[] = {

	{

		.compatible =  "hisilicon,hip06-pcie-ecam",

		.data	    = (void *) &hisi_pcie_platform_ops,

		.data	    =  &hisi_pcie_platform_ops,

	},

	{

		.compatible =  "hisilicon,hip07-pcie-ecam",

		.data       = (void *) &hisi_pcie_platform_ops,

		.data       =  &hisi_pcie_platform_ops,

	},

	{},

};



static struct platform_driver hisi_pcie_almost_ecam_driver = {

	.probe  = hisi_pcie_almost_ecam_probe,

	.probe  = pci_host_common_probe,

	.driver = {

		   .name = "hisi-pcie-almost-ecam",

		   .of_match_table = hisi_pcie_almost_ecam_of_match,

CRA Git | Maintained and supported by SUSTech CRA and CCSE