Merge branch 'pci/host-thunder' into next (1154768a) · Commits · 戴 / test

drivers/acpi/pci_mcfg.c

+11 −3

Original line number	Diff line number	Diff line
		@@ -54,6 +54,7 @@ static struct mcfg_fixup mcfg_quirks[] = {

		#define QCOM_ECAM32(seg) \
		{ "QCOM ", "QDF2432 ", 1, seg, MCFG_BUS_ANY, &pci_32b_ops }

		QCOM_ECAM32(0),
		QCOM_ECAM32(1),
		QCOM_ECAM32(2),
		@@ -68,6 +69,7 @@ static struct mcfg_fixup mcfg_quirks[] = {
		{ "HISI ", table_id, 0, (seg) + 1, MCFG_BUS_ANY, ops }, \
		{ "HISI ", table_id, 0, (seg) + 2, MCFG_BUS_ANY, ops }, \
		{ "HISI ", table_id, 0, (seg) + 3, MCFG_BUS_ANY, ops }

		HISI_QUAD_DOM("HIP05 ", 0, &hisi_pcie_ops),
		HISI_QUAD_DOM("HIP06 ", 0, &hisi_pcie_ops),
		HISI_QUAD_DOM("HIP07 ", 0, &hisi_pcie_ops),
		@@ -77,6 +79,7 @@ static struct mcfg_fixup mcfg_quirks[] = {

		#define THUNDER_PEM_RES(addr, node) \
		DEFINE_RES_MEM((addr) + ((u64) (node) << 44), 0x39 * SZ_16M)

		#define THUNDER_PEM_QUIRK(rev, node) \
		{ "CAVIUM", "THUNDERX", rev, 4 + (10 * (node)), MCFG_BUS_ANY, \
		&thunder_pem_ecam_ops, THUNDER_PEM_RES(0x88001f000000UL, node) }, \
		@@ -90,13 +93,16 @@ static struct mcfg_fixup mcfg_quirks[] = {
		&thunder_pem_ecam_ops, THUNDER_PEM_RES(0x894057000000UL, node) }, \
		{ "CAVIUM", "THUNDERX", rev, 9 + (10 * (node)), MCFG_BUS_ANY, \
		&thunder_pem_ecam_ops, THUNDER_PEM_RES(0x89808f000000UL, node) }
		/* 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 pass2.x */
		THUNDER_PEM_QUIRK(1, 0),
		THUNDER_PEM_QUIRK(1, 1),
		THUNDER_ECAM_QUIRK(1, 10),

		/* SoC pass1.x */
		THUNDER_PEM_QUIRK(2, 0), /* off-chip devices */
		THUNDER_PEM_QUIRK(2, 1), /* off-chip devices */
		@@ -112,9 +118,11 @@ static struct mcfg_fixup mcfg_quirks[] = {
		#define XGENE_V1_ECAM_MCFG(rev, seg) \
		{"APM ", "XGENE ", rev, seg, MCFG_BUS_ANY, \
		&xgene_v1_pcie_ecam_ops }

		#define XGENE_V2_ECAM_MCFG(rev, seg) \
		{"APM ", "XGENE ", rev, seg, MCFG_BUS_ANY, \
		&xgene_v2_pcie_ecam_ops }

		/* X-Gene SoC with v1 PCIe controller */
		XGENE_V1_ECAM_MCFG(1, 0),
		XGENE_V1_ECAM_MCFG(1, 1),

drivers/pci/quirks.c

+17 −0

Original line number	Diff line number	Diff line
		@@ -3957,6 +3957,20 @@ static void quirk_mic_x200_dma_alias(struct pci_dev *pdev)
		DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2260, quirk_mic_x200_dma_alias);
		DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2264, quirk_mic_x200_dma_alias);

		/*
		* The IOMMU and interrupt controller on Broadcom Vulcan/Cavium ThunderX2 are
		* associated not at the root bus, but at a bridge below. This quirk avoids
		* generating invalid DMA aliases.
		*/
		static void quirk_bridge_cavm_thrx2_pcie_root(struct pci_dev *pdev)
		{
		pdev->dev_flags \|= PCI_DEV_FLAGS_BRIDGE_XLATE_ROOT;
		}
		DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
		quirk_bridge_cavm_thrx2_pcie_root);
		DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9084,
		quirk_bridge_cavm_thrx2_pcie_root);

		/*
		* Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero)
		* class code. Fix it.
		@@ -4095,6 +4109,9 @@ static int pci_quirk_cavium_acs(struct pci_dev *dev, u16 acs_flags)
		acs_flags &= ~(PCI_ACS_SV \| PCI_ACS_TB \| PCI_ACS_RR \|
		PCI_ACS_CR \| PCI_ACS_UF \| PCI_ACS_DT);

		if (!((dev->device >= 0xa000) && (dev->device <= 0xa0ff)))
		return -ENOTTY;

		return acs_flags ? 0 : 1;
		}

drivers/pci/search.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,10 @@ int pci_for_each_dma_alias(struct pci_dev *pdev,

		tmp = bus->self;

		/* stop at bridge where translation unit is associated */
		if (tmp->dev_flags & PCI_DEV_FLAGS_BRIDGE_XLATE_ROOT)
		return ret;

		/*
		* PCIe-to-PCI/X bridges alias transactions from downstream
		* devices using the subordinate bus number (PCI Express to

include/linux/pci.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -178,6 +178,8 @@ enum pci_dev_flags {
		PCI_DEV_FLAGS_NO_PM_RESET = (__force pci_dev_flags_t) (1 << 7),
		/* Get VPD from function 0 VPD */
		PCI_DEV_FLAGS_VPD_REF_F0 = (__force pci_dev_flags_t) (1 << 8),
		/* a non-root bridge where translation occurs, stop alias search here */
		PCI_DEV_FLAGS_BRIDGE_XLATE_ROOT = (__force pci_dev_flags_t) (1 << 9),
		};

		enum pci_irq_reroute_variant {

Admin message