Commit 648d93fc authored by Tomasz Nowicki's avatar Tomasz Nowicki Committed by Bjorn Helgaas
Browse files

PCI: Add MCFG quirks for Cavium ThunderX pass1.x host controller 



ThunderX pass1.x requires to emulate the EA headers for on-chip devices
hence it has to use custom pci_thunder_ecam_ops for accessing PCI config
space (pci-thunder-ecam.c). Add new entries to MCFG quirk array where it
can be applied while probing ACPI based PCI host controller.

ThunderX pass1.x is using the same way for accessing off-chip devices
(so-called PEM) as silicon pass-2.x so we need to add PEM quirk entries
too.

Quirk is considered for ThunderX silicon pass1.x only which is identified
via MCFG revision 2.

ThunderX pass 1.x requires the following accessors:

  NUMA node 0 PCI segments  0- 3: pci_thunder_ecam_ops (MCFG quirk)
  NUMA node 0 PCI segments  4- 9: thunder_pem_ecam_ops (MCFG quirk)
  NUMA node 1 PCI segments 10-13: pci_thunder_ecam_ops (MCFG quirk)
  NUMA node 1 PCI segments 14-19: thunder_pem_ecam_ops (MCFG quirk)

[bhelgaas: change Makefile/ifdefs so quirk doesn't depend on
CONFIG_PCI_HOST_THUNDER_ECAM]
Signed-off-by: default avatarTomasz Nowicki <tn@semihalf.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 44f22bd9

drivers/acpi/pci_mcfg.c

+15 −0
Original line number Diff line number Diff line
@@ -93,6 +93,21 @@ static struct mcfg_fixup mcfg_quirks[] = { 
	/* SoC pass2.x */

	THUNDER_PEM_QUIRK(1, 0),

	THUNDER_PEM_QUIRK(1, 1),



#define THUNDER_ECAM_QUIRK(rev, seg)					\

	{ "CAVIUM", "THUNDERX", rev, seg, MCFG_BUS_ANY,			\

	&pci_thunder_ecam_ops }

	/* SoC pass1.x */

	THUNDER_PEM_QUIRK(2, 0),	/* off-chip devices */

	THUNDER_PEM_QUIRK(2, 1),	/* off-chip devices */

	THUNDER_ECAM_QUIRK(2,  0),

	THUNDER_ECAM_QUIRK(2,  1),

	THUNDER_ECAM_QUIRK(2,  2),

	THUNDER_ECAM_QUIRK(2,  3),

	THUNDER_ECAM_QUIRK(2, 10),

	THUNDER_ECAM_QUIRK(2, 11),

	THUNDER_ECAM_QUIRK(2, 12),

	THUNDER_ECAM_QUIRK(2, 13),

};



static char mcfg_oem_id[ACPI_OEM_ID_SIZE];

drivers/pci/host/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -248,7 +248,8 @@ config PCI_HOST_THUNDER_PEM 


config PCI_HOST_THUNDER_ECAM

	bool "Cavium Thunder ECAM controller to on-chip devices on pass-1.x silicon"

	depends on OF && ARM64

	depends on ARM64

	depends on OF || (ACPI && PCI_QUIRKS)

	select PCI_HOST_COMMON

	help

	  Say Y here if you want ECAM support for CN88XX-Pass-1.x Cavium Thunder SoCs.

drivers/pci/host/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ obj-$(CONFIG_PCIE_ALTERA) += pcie-altera.o 
obj-$(CONFIG_PCIE_ALTERA_MSI) += pcie-altera-msi.o

obj-$(CONFIG_ARM64) += pcie-hisi.o

obj-$(CONFIG_PCIE_QCOM) += pcie-qcom.o

obj-$(CONFIG_PCI_HOST_THUNDER_ECAM) += pci-thunder-ecam.o

obj-$(CONFIG_ARM64) += pci-thunder-ecam.o

obj-$(CONFIG_ARM64) += pci-thunder-pem.o

obj-$(CONFIG_PCIE_ARMADA_8K) += pcie-armada8k.o

obj-$(CONFIG_PCIE_ARTPEC6) += pcie-artpec6.o

drivers/pci/host/pci-thunder-ecam.c

+8 −1
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
#include <linux/pci-ecam.h>

#include <linux/platform_device.h>



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



static void set_val(u32 v, int where, int size, u32 *val)

{

	int shift = (where & 3) * 8;
@@ -346,7 +348,7 @@ static int thunder_ecam_config_write(struct pci_bus *bus, unsigned int devfn, 
	return pci_generic_config_write(bus, devfn, where, size, val);

}



static struct pci_ecam_ops pci_thunder_ecam_ops = {

struct pci_ecam_ops pci_thunder_ecam_ops = {

	.bus_shift	= 20,

	.pci_ops	= {

		.map_bus        = pci_ecam_map_bus,
@@ -355,6 +357,8 @@ static struct pci_ecam_ops pci_thunder_ecam_ops = { 
	}

};



#ifdef CONFIG_PCI_HOST_THUNDER_ECAM



static const struct of_device_id thunder_ecam_of_match[] = {

	{ .compatible = "cavium,pci-host-thunder-ecam" },

	{ },
@@ -373,3 +377,6 @@ static struct platform_driver thunder_ecam_driver = { 
	.probe = thunder_ecam_probe,

};

builtin_platform_driver(thunder_ecam_driver);



#endif

#endif

include/linux/pci-ecam.h

+2 −1
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ extern struct pci_ecam_ops pci_generic_ecam_ops; 
#if defined(CONFIG_ACPI) && defined(CONFIG_PCI_QUIRKS)

extern struct pci_ecam_ops pci_32b_ops;		/* 32-bit accesses only */

extern struct pci_ecam_ops hisi_pcie_ops;	/* HiSilicon */

extern struct pci_ecam_ops thunder_pem_ecam_ops; /* Cavium ThunderX 2.x */

extern struct pci_ecam_ops thunder_pem_ecam_ops; /* Cavium ThunderX 1.x & 2.x */

extern struct pci_ecam_ops pci_thunder_ecam_ops; /* Cavium ThunderX 1.x */

#endif



#ifdef CONFIG_PCI_HOST_GENERIC

CRA Git | Maintained and supported by SUSTech CRA and CCSE