Commit 89bbcaac authored by Roman Bacik's avatar Roman Bacik Committed by Lorenzo Pieralisi
Browse files

PCI: iproc: Invalidate correct PAXB inbound windows 

Second stage bootloaders prior to Linux boot may use all inbound windows
including IARR1/IMAP1. We need to ensure that all previous configuration
of inbound windows are invalidated during the initialization stage of
the Linux iProc PCIe driver so let's add a fix to define and invalidate
IARR1/IMAP1 because it is currently missing, fixing the issue.

Link: https://lore.kernel.org/r/20201001060054.6616-3-srinath.mannam@broadcom.com


Fixes: 9415743e ("PCI: iproc: Invalidate PAXB address mapping")
Signed-off-by: default avatarRoman Bacik <roman.bacik@broadcom.com>
Signed-off-by: default avatarSrinath Mannam <srinath.mannam@broadcom.com>
[lorenzo.pieralisi@arm.com: commit log]
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
parent a3ff529f

drivers/pci/controller/pcie-iproc.c

+11 −2
Original line number Diff line number Diff line
@@ -192,8 +192,15 @@ static const struct iproc_pcie_ib_map paxb_v2_ib_map[] = { 
		.imap_window_offset = 0x4,

	},

	{

		/* IARR1/IMAP1 (currently unused) */

		.type = IPROC_PCIE_IB_MAP_INVALID,

		/* IARR1/IMAP1 */

		.type = IPROC_PCIE_IB_MAP_MEM,

		.size_unit = SZ_1M,

		.region_sizes = { 8 },

		.nr_sizes = 1,

		.nr_windows = 8,

		.imap_addr_offset = 0x4,

		.imap_window_offset = 0x8,



	},

	{

		/* IARR2/IMAP2 */
@@ -351,6 +358,8 @@ static const u16 iproc_pcie_reg_paxb_v2[IPROC_PCIE_MAX_NUM_REG] = { 
	[IPROC_PCIE_OMAP3]		= 0xdf8,

	[IPROC_PCIE_IARR0]		= 0xd00,

	[IPROC_PCIE_IMAP0]		= 0xc00,

	[IPROC_PCIE_IARR1]		= 0xd08,

	[IPROC_PCIE_IMAP1]		= 0xd70,

	[IPROC_PCIE_IARR2]		= 0xd10,

	[IPROC_PCIE_IMAP2]		= 0xcc0,

	[IPROC_PCIE_IARR3]		= 0xe00,