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

Commit 2ca5b8dd authored by Christopher Covington's avatar Christopher Covington Committed by Bjorn Helgaas
Browse files

PCI: Add MCFG quirks for Qualcomm QDF2432 host controller 



The Qualcomm Technologies QDF2432 SoC does not support accesses smaller
than 32 bits to the PCI configuration space.  Register the appropriate
quirk.

[bhelgaas: add QCOM_ECAM32 macro, ifdef for ACPI and PCI_QUIRKS]
Signed-off-by: default avatarChristopher Covington <cov@codeaurora.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 169de969

drivers/acpi/pci_mcfg.c

+11 −0
Original line number Diff line number Diff line
@@ -51,6 +51,17 @@ struct mcfg_fixup { 


static struct mcfg_fixup mcfg_quirks[] = {

/*	{ OEM_ID, OEM_TABLE_ID, REV, SEGMENT, BUS_RANGE, ops, cfgres }, */



#define QCOM_ECAM32(seg) \

	{ "QCOM  ", "QDF2432 ", 1, seg, MCFG_BUS_ANY, &pci_32b_ops }

	QCOM_ECAM32(0),

	QCOM_ECAM32(1),

	QCOM_ECAM32(2),

	QCOM_ECAM32(3),

	QCOM_ECAM32(4),

	QCOM_ECAM32(5),

	QCOM_ECAM32(6),

	QCOM_ECAM32(7),

};



static char mcfg_oem_id[ACPI_OEM_ID_SIZE];

drivers/pci/ecam.c

+12 −0
Original line number Diff line number Diff line
@@ -162,3 +162,15 @@ struct pci_ecam_ops pci_generic_ecam_ops = { 
		.write		= pci_generic_config_write,

	}

};



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

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

struct pci_ecam_ops pci_32b_ops = {

	.bus_shift	= 20,

	.pci_ops	= {

		.map_bus	= pci_ecam_map_bus,

		.read		= pci_generic_config_read32,

		.write		= pci_generic_config_write32,

	}

};

#endif

include/linux/pci-ecam.h

+4 −0
Original line number Diff line number Diff line
@@ -59,6 +59,10 @@ void __iomem *pci_ecam_map_bus(struct pci_bus *bus, unsigned int devfn, 
/* default ECAM ops */

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 */

#endif



#ifdef CONFIG_PCI_HOST_GENERIC

/* for DT-based PCI controllers that support ECAM */

int pci_host_common_probe(struct platform_device *pdev,