Commit 0c59c06a authored by Rob Herring's avatar Rob Herring Committed by Lorenzo Pieralisi
Browse files

PCI: host-generic: Support building as modules 

Enable building host-generic and its host-common dependency as a
module.

Link: https://lore.kernel.org/r/20200409234923.21598-3-robh@kernel.org


Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: default avatarWill Deacon <will@kernel.org>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Andrew Murray <amurray@thegoodpenguin.co.uk>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Will Deacon <will@kernel.org>
Cc: linux-pci@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
parent 0b104773

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/pci-host-common.c

+5 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 */



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/of_address.h>

#include <linux/of_pci.h>

#include <linux/pci-ecam.h>
@@ -95,6 +96,7 @@ int pci_host_common_probe(struct platform_device *pdev, 
	platform_set_drvdata(pdev, bridge->bus);

	return 0;

}

EXPORT_SYMBOL_GPL(pci_host_common_probe);



int pci_host_common_remove(struct platform_device *pdev)

{
@@ -107,3 +109,6 @@ int pci_host_common_remove(struct platform_device *pdev) 


	return 0;

}

EXPORT_SYMBOL_GPL(pci_host_common_remove);



MODULE_LICENSE("GPL v2");

drivers/pci/controller/pci-host-generic.c

+5 −2
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 


#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/of_address.h>

#include <linux/of_pci.h>

#include <linux/pci-ecam.h>
@@ -76,6 +77,7 @@ static const struct of_device_id gen_pci_of_match[] = { 


	{ },

};

MODULE_DEVICE_TABLE(of, gen_pci_of_match);



static int gen_pci_probe(struct platform_device *pdev)

{
@@ -92,9 +94,10 @@ static struct platform_driver gen_pci_driver = { 
	.driver = {

		.name = "pci-host-generic",

		.of_match_table = gen_pci_of_match,

		.suppress_bind_attrs = true,

	},

	.probe = gen_pci_probe,

	.remove = pci_host_common_remove,

};

builtin_platform_driver(gen_pci_driver);
 
module_platform_driver(gen_pci_driver);



MODULE_LICENSE("GPL v2");

drivers/pci/ecam.c

+4 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ err_exit: 
	pci_ecam_free(cfg);

	return ERR_PTR(err);

}

EXPORT_SYMBOL_GPL(pci_ecam_create);



void pci_ecam_free(struct pci_config_window *cfg)

{
@@ -121,6 +122,7 @@ void pci_ecam_free(struct pci_config_window *cfg) 
		release_resource(&cfg->res);

	kfree(cfg);

}

EXPORT_SYMBOL_GPL(pci_ecam_free);



/*

 * Function to implement the pci_ops ->map_bus method
@@ -143,6 +145,7 @@ void __iomem *pci_ecam_map_bus(struct pci_bus *bus, unsigned int devfn, 
		base = cfg->win + (busn << cfg->ops->bus_shift);

	return base + (devfn << devfn_shift) + where;

}

EXPORT_SYMBOL_GPL(pci_ecam_map_bus);



/* ECAM ops */

const struct pci_ecam_ops pci_generic_ecam_ops = {
@@ -153,6 +156,7 @@ const struct pci_ecam_ops pci_generic_ecam_ops = { 
		.write		= pci_generic_config_write,

	}

};

EXPORT_SYMBOL_GPL(pci_generic_ecam_ops);



#if defined(CONFIG_ACPI) && defined(CONFIG_PCI_QUIRKS)

/* ECAM ops for 32-bit access only (non-compliant) */

drivers/pci/setup-bus.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "pci.h"



unsigned int pci_flags;

EXPORT_SYMBOL_GPL(pci_flags);



struct pci_dev_resource {

	struct list_head list;

CRA Git | Maintained and supported by SUSTech CRA and CCSE