Commit 574f2903 authored by Wei Liu's avatar Wei Liu Committed by Bjorn Helgaas
Browse files

PCI: iproc: Apply quirk_paxc_bridge() for module as well as built-in 

Previously quirk_paxc_bridge() was applied when the iproc driver was
built-in, but not when it was compiled as a module.

This happened because it was under #ifdef CONFIG_PCIE_IPROC_PLATFORM:
PCIE_IPROC_PLATFORM=y causes CONFIG_PCIE_IPROC_PLATFORM to be defined, but
PCIE_IPROC_PLATFORM=m causes CONFIG_PCIE_IPROC_PLATFORM_MODULE to be
defined.

Move quirk_paxc_bridge() to pcie-iproc.c and drop the #ifdef so the quirk
is always applied, whether iproc is built-in or a module.

[bhelgaas: commit log, move to pcie-iproc.c, not pcie-iproc-platform.c]
Link: https://lore.kernel.org/r/20191211174511.89713-1-wei.liu@kernel.org


Signed-off-by: default avatarWei Liu <wei.liu@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent e42617b8

drivers/pci/controller/pcie-iproc.c

+24 −0
Original line number Diff line number Diff line
@@ -1588,6 +1588,30 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_BROADCOM, 0xd802, 
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_BROADCOM, 0xd804,

			quirk_paxc_disable_msi_parsing);



static void quirk_paxc_bridge(struct pci_dev *pdev)

{

	/*

	 * The PCI config space is shared with the PAXC root port and the first

	 * Ethernet device.  So, we need to workaround this by telling the PCI

	 * code that the bridge is not an Ethernet device.

	 */

	if (pdev->hdr_type == PCI_HEADER_TYPE_BRIDGE)

		pdev->class = PCI_CLASS_BRIDGE_PCI << 8;



	/*

	 * MPSS is not being set properly (as it is currently 0).  This is

	 * because that area of the PCI config space is hard coded to zero, and

	 * is not modifiable by firmware.  Set this to 2 (e.g., 512 byte MPS)

	 * so that the MPS can be set to the real max value.

	 */

	pdev->pcie_mpss = 2;

}

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_BROADCOM, 0x16cd, quirk_paxc_bridge);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_BROADCOM, 0x16f0, quirk_paxc_bridge);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_BROADCOM, 0xd750, quirk_paxc_bridge);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_BROADCOM, 0xd802, quirk_paxc_bridge);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_BROADCOM, 0xd804, quirk_paxc_bridge);



MODULE_AUTHOR("Ray Jui <rjui@broadcom.com>");

MODULE_DESCRIPTION("Broadcom iPROC PCIe common driver");

MODULE_LICENSE("GPL v2");

drivers/pci/quirks.c

+0 −26
Original line number Diff line number Diff line
@@ -2381,32 +2381,6 @@ DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_BROADCOM, 
			 PCI_DEVICE_ID_TIGON3_5719,

			 quirk_brcm_5719_limit_mrrs);



#ifdef CONFIG_PCIE_IPROC_PLATFORM

static void quirk_paxc_bridge(struct pci_dev *pdev)

{

	/*

	 * The PCI config space is shared with the PAXC root port and the first

	 * Ethernet device.  So, we need to workaround this by telling the PCI

	 * code that the bridge is not an Ethernet device.

	 */

	if (pdev->hdr_type == PCI_HEADER_TYPE_BRIDGE)

		pdev->class = PCI_CLASS_BRIDGE_PCI << 8;



	/*

	 * MPSS is not being set properly (as it is currently 0).  This is

	 * because that area of the PCI config space is hard coded to zero, and

	 * is not modifiable by firmware.  Set this to 2 (e.g., 512 byte MPS)

	 * so that the MPS can be set to the real max value.

	 */

	pdev->pcie_mpss = 2;

}

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_BROADCOM, 0x16cd, quirk_paxc_bridge);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_BROADCOM, 0x16f0, quirk_paxc_bridge);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_BROADCOM, 0xd750, quirk_paxc_bridge);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_BROADCOM, 0xd802, quirk_paxc_bridge);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_BROADCOM, 0xd804, quirk_paxc_bridge);

#endif



/*

 * Originally in EDAC sources for i82875P: Intel tells BIOS developers to

 * hide device 6 which configures the overflow device access containing the