lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 243/717] PCI: iproc: Invalidate correct PAXB inbound windows
    Date
    From: Roman Bacik <roman.bacik@broadcom.com>

    [ Upstream commit 89bbcaac3dff21f3567956b3416f5ec8b45f5555 ]

    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: 9415743e4c8a ("PCI: iproc: Invalidate PAXB address mapping")
    Signed-off-by: Roman Bacik <roman.bacik@broadcom.com>
    Signed-off-by: Srinath Mannam <srinath.mannam@broadcom.com>
    [lorenzo.pieralisi@arm.com: commit log]
    Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/pci/controller/pcie-iproc.c | 13 +++++++++++--
    1 file changed, 11 insertions(+), 2 deletions(-)

    diff --git a/drivers/pci/controller/pcie-iproc.c b/drivers/pci/controller/pcie-iproc.c
    index d901b9d392b8c..cc5b7823edeb7 100644
    --- a/drivers/pci/controller/pcie-iproc.c
    +++ b/drivers/pci/controller/pcie-iproc.c
    @@ -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,
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 16:05    [W:4.057 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site