On Tue, Dec 17, 2019 at 07:31:31PM +0300, Yurii Monakov wrote:
> On Tue, 17 Dec 2019 08:31:13 -0600, Bjorn Helgaas <helgaas@xxxxxxxxxx> wrote:
>
> > [+cc Kishon]
> >
> > On Fri, Oct 04, 2019 at 06:48:11PM +0300, Yurii Monakov wrote:
> > > PCIe window memory start address should be incremented by OB_WIN_SIZE
> > > megabytes (8 MB) instead of plain OB_WIN_SIZE (8).
> > >
> > > Signed-off-by: Yurii Monakov <monakov.y@xxxxxxxxx>
> >
> > I added:
> >
> > Fixes: e75043ad9792 ("PCI: keystone: Cleanup outbound window configuration")
> > Acked-by: Andrew Murray <andrew.murray@xxxxxxx>
> > Cc: stable@xxxxxxxxxxxxxxx # v4.20+
> >
> > and cc'd Kishon (author of e75043ad9792) and put this on my
> > pci/host-keystone branch for v5.6. Lorenzo may pick this up when he
> > returns.
> >
> > I'd like the commit message to say what this fixes. Currently it just
> > restates the code change, which I can see from the diff.
> This was my first patch sent to LKML, I'm sorry for inconvenience.
> Should I take any actions to fix this?
Great, welcome! No need for you to do anything; just let me know if I
captured this correctly:
commit 93c53da177c9 ("PCI: keystone: Fix outbound region mapping")
Author: Yurii Monakov <monakov.y@xxxxxxxxx>
Date: Fri Oct 4 18:48:11 2019 +0300
PCI: keystone: Fix outbound region mapping
The Keystone outbound Address Translation Unit (ATU) maps PCI MMIO space in
8 MB windows. When programming the ATU windows, we previously incremented
the starting address by 8, not 8 MB, so all the windows were mapped to the
first 8 MB. Therefore, only 8 MB of MMIO space was accessible.
Update the loop so it increments the starting address by 8 MB, not 8, so
more MMIO space is accessible.
Fixes: e75043ad9792 ("PCI: keystone: Cleanup outbound window configuration")
Link: https://lore.kernel.org/r/20191004154811.GA31397@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
[bhelgaas: commit log]
Signed-off-by: Yurii Monakov <monakov.y@xxxxxxxxx>
Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
Acked-by: Andrew Murray <andrew.murray@xxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx # v4.20+
diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c
index af677254a072..f19de60ac991 100644
--- a/drivers/pci/controller/dwc/pci-keystone.c
+++ b/drivers/pci/controller/dwc/pci-keystone.c
@@ -422,7 +422,7 @@ static void ks_pcie_setup_rc_app_regs(struct keystone_pcie *ks_pcie)
lower_32_bits(start) | OB_ENABLEN);
ks_pcie_app_writel(ks_pcie, OB_OFFSET_HI(i),
upper_32_bits(start));
- start += OB_WIN_SIZE;
+ start += OB_WIN_SIZE * SZ_1M;
}
val = ks_pcie_app_readl(ks_pcie, CMD_STATUS);
