* [PATCH 1/2] bus: mbus: fix window size calculation for 4GB windows
2017-08-28 15:25 [PATCH 0/2] fix 4GB DRAM window support on mvebu Jan Luebbe
@ 2017-08-28 15:25 ` Jan Luebbe
2017-09-19 14:43 ` Gregory CLEMENT
2017-08-28 15:25 ` [PATCH 2/2] PCI: mvebu: Check DRAM window size Jan Luebbe
` (2 subsequent siblings)
3 siblings, 1 reply; 12+ messages in thread
From: Jan Luebbe @ 2017-08-28 15:25 UTC (permalink / raw)
To: Gregory Clement, Andrew Lunn, Thomas Petazzoni, Jason Cooper
Cc: kernel, linux-pci, linux-kernel, linux-arm-kernel, Jan Luebbe
At least the Armada XP SoC supports 4GB on a single DRAM window. Because
the size register values contain the actual size - 1, the MSB is set in
that case. For example, the SDRAM window's control register's value is
0xffffffe1 for 4GB (bits 31 to 24 contain the size).
The MBUS driver reads back each window's size from registers and
calculates the actual size as (control_reg | ~DDR_SIZE_MASK) + 1, which
overflows for 32 bit values, resulting in other miscalculations further
on (a bad RAM window for the CESA crypto engine calculated by
mvebu_mbus_setup_cpu_target_nooverlap() in my case).
This patch changes the type in 'struct mbus_dram_window' from u32 to
u64, which allows us to keep using the same register calculation code in
most MBUS-using drivers (which calculate ->size - 1 again).
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
drivers/bus/mvebu-mbus.c | 2 +-
include/linux/mbus.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
index c7f396903184..70db4d5638a6 100644
--- a/drivers/bus/mvebu-mbus.c
+++ b/drivers/bus/mvebu-mbus.c
@@ -720,7 +720,7 @@ mvebu_mbus_default_setup_cpu_target(struct mvebu_mbus_state *mbus)
if (mbus->hw_io_coherency)
w->mbus_attr |= ATTR_HW_COHERENCY;
w->base = base & DDR_BASE_CS_LOW_MASK;
- w->size = (size | ~DDR_SIZE_MASK) + 1;
+ w->size = (u64)(size | ~DDR_SIZE_MASK) + 1;
}
}
mvebu_mbus_dram_info.num_cs = cs;
diff --git a/include/linux/mbus.h b/include/linux/mbus.h
index 0d3f14fd2621..4773145246ed 100644
--- a/include/linux/mbus.h
+++ b/include/linux/mbus.h
@@ -31,8 +31,8 @@ struct mbus_dram_target_info
struct mbus_dram_window {
u8 cs_index;
u8 mbus_attr;
- u32 base;
- u32 size;
+ u64 base;
+ u64 size;
} cs[4];
};
--
2.11.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 1/2] bus: mbus: fix window size calculation for 4GB windows
2017-08-28 15:25 ` [PATCH 1/2] bus: mbus: fix window size calculation for 4GB windows Jan Luebbe
@ 2017-09-19 14:43 ` Gregory CLEMENT
2017-09-20 16:37 ` Uwe Kleine-König
0 siblings, 1 reply; 12+ messages in thread
From: Gregory CLEMENT @ 2017-09-19 14:43 UTC (permalink / raw)
To: Jan Luebbe
Cc: Thomas Petazzoni, Andrew Lunn, Jason Cooper, linux-pci,
linux-kernel, kernel, linux-arm-kernel
SGkgSmFuLAogCiBPbiBsdW4uLCBhb8O7dCAyOCAyMDE3LCBKYW4gTHVlYmJlIDxqbHVAcGVuZ3V0
cm9uaXguZGU+IHdyb3RlOgoKPiBBdCBsZWFzdCB0aGUgQXJtYWRhIFhQIFNvQyBzdXBwb3J0cyA0
R0Igb24gYSBzaW5nbGUgRFJBTSB3aW5kb3cuIEJlY2F1c2UKPiB0aGUgc2l6ZSByZWdpc3RlciB2
YWx1ZXMgY29udGFpbiB0aGUgYWN0dWFsIHNpemUgLSAxLCB0aGUgTVNCIGlzIHNldCBpbgo+IHRo
YXQgY2FzZS4gRm9yIGV4YW1wbGUsIHRoZSBTRFJBTSB3aW5kb3cncyBjb250cm9sIHJlZ2lzdGVy
J3MgdmFsdWUgaXMKPiAweGZmZmZmZmUxIGZvciA0R0IgKGJpdHMgMzEgdG8gMjQgY29udGFpbiB0
aGUgc2l6ZSkuCj4KPiBUaGUgTUJVUyBkcml2ZXIgcmVhZHMgYmFjayBlYWNoIHdpbmRvdydzIHNp
emUgZnJvbSByZWdpc3RlcnMgYW5kCj4gY2FsY3VsYXRlcyB0aGUgYWN0dWFsIHNpemUgYXMgKGNv
bnRyb2xfcmVnIHwgfkREUl9TSVpFX01BU0spICsgMSwgd2hpY2gKPiBvdmVyZmxvd3MgZm9yIDMy
IGJpdCB2YWx1ZXMsIHJlc3VsdGluZyBpbiBvdGhlciBtaXNjYWxjdWxhdGlvbnMgZnVydGhlcgo+
IG9uIChhIGJhZCBSQU0gd2luZG93IGZvciB0aGUgQ0VTQSBjcnlwdG8gZW5naW5lIGNhbGN1bGF0
ZWQgYnkKPiBtdmVidV9tYnVzX3NldHVwX2NwdV90YXJnZXRfbm9vdmVybGFwKCkgaW4gbXkgY2Fz
ZSkuCj4KPiBUaGlzIHBhdGNoIGNoYW5nZXMgdGhlIHR5cGUgaW4gJ3N0cnVjdCBtYnVzX2RyYW1f
d2luZG93JyBmcm9tIHUzMiB0bwo+IHU2NCwgd2hpY2ggYWxsb3dzIHVzIHRvIGtlZXAgdXNpbmcg
dGhlIHNhbWUgcmVnaXN0ZXIgY2FsY3VsYXRpb24gY29kZSBpbgo+IG1vc3QgTUJVUy11c2luZyBk
cml2ZXJzICh3aGljaCBjYWxjdWxhdGUgLT5zaXplIC0gMSBhZ2FpbikuCj4KCllvdXIgcGF0Y2gg
bG9va3MgZ29vZCwgYnV0IGFzIGl0IGlzIGEgZml4IHdlIHNob3VsZCBhbHNvIGFwcGx5IGl0IG9u
CnN0YWJsZSwgY291bGQgeW91IHByb3ZpZGUgdGhlIGNvbW1pdCB0byBmaXg/CgpUaGFua3MsCgpH
cmVnb3J5Cgo+IFNpZ25lZC1vZmYtYnk6IEphbiBMdWViYmUgPGpsdUBwZW5ndXRyb25peC5kZT4K
PiAtLS0KPiAgZHJpdmVycy9idXMvbXZlYnUtbWJ1cy5jIHwgMiArLQo+ICBpbmNsdWRlL2xpbnV4
L21idXMuaCAgICAgfCA0ICsrLS0KPiAgMiBmaWxlcyBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyks
IDMgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9idXMvbXZlYnUtbWJ1cy5j
IGIvZHJpdmVycy9idXMvbXZlYnUtbWJ1cy5jCj4gaW5kZXggYzdmMzk2OTAzMTg0Li43MGRiNGQ1
NjM4YTYgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9idXMvbXZlYnUtbWJ1cy5jCj4gKysrIGIvZHJp
dmVycy9idXMvbXZlYnUtbWJ1cy5jCj4gQEAgLTcyMCw3ICs3MjAsNyBAQCBtdmVidV9tYnVzX2Rl
ZmF1bHRfc2V0dXBfY3B1X3RhcmdldChzdHJ1Y3QgbXZlYnVfbWJ1c19zdGF0ZSAqbWJ1cykKPiAg
CQkJaWYgKG1idXMtPmh3X2lvX2NvaGVyZW5jeSkKPiAgCQkJCXctPm1idXNfYXR0ciB8PSBBVFRS
X0hXX0NPSEVSRU5DWTsKPiAgCQkJdy0+YmFzZSA9IGJhc2UgJiBERFJfQkFTRV9DU19MT1dfTUFT
SzsKPiAtCQkJdy0+c2l6ZSA9IChzaXplIHwgfkREUl9TSVpFX01BU0spICsgMTsKPiArCQkJdy0+
c2l6ZSA9ICh1NjQpKHNpemUgfCB+RERSX1NJWkVfTUFTSykgKyAxOwo+ICAJCX0KPiAgCX0KPiAg
CW12ZWJ1X21idXNfZHJhbV9pbmZvLm51bV9jcyA9IGNzOwo+IGRpZmYgLS1naXQgYS9pbmNsdWRl
L2xpbnV4L21idXMuaCBiL2luY2x1ZGUvbGludXgvbWJ1cy5oCj4gaW5kZXggMGQzZjE0ZmQyNjIx
Li40NzczMTQ1MjQ2ZWQgMTAwNjQ0Cj4gLS0tIGEvaW5jbHVkZS9saW51eC9tYnVzLmgKPiArKysg
Yi9pbmNsdWRlL2xpbnV4L21idXMuaAo+IEBAIC0zMSw4ICszMSw4IEBAIHN0cnVjdCBtYnVzX2Ry
YW1fdGFyZ2V0X2luZm8KPiAgCXN0cnVjdCBtYnVzX2RyYW1fd2luZG93IHsKPiAgCQl1OAljc19p
bmRleDsKPiAgCQl1OAltYnVzX2F0dHI7Cj4gLQkJdTMyCWJhc2U7Cj4gLQkJdTMyCXNpemU7Cj4g
KwkJdTY0CWJhc2U7Cj4gKwkJdTY0CXNpemU7Cj4gIAl9IGNzWzRdOwo+ICB9Owo+ICAKPiAtLSAK
PiAyLjExLjAKPgoKLS0gCkdyZWdvcnkgQ2xlbWVudCwgRnJlZSBFbGVjdHJvbnMKS2VybmVsLCBk
cml2ZXJzLCByZWFsLXRpbWUgYW5kIGVtYmVkZGVkIExpbnV4CmRldmVsb3BtZW50LCBjb25zdWx0
aW5nLCB0cmFpbmluZyBhbmQgc3VwcG9ydC4KaHR0cDovL2ZyZWUtZWxlY3Ryb25zLmNvbQoKX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtl
cm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0
dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5l
bAo=
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/2] bus: mbus: fix window size calculation for 4GB windows
2017-09-19 14:43 ` Gregory CLEMENT
@ 2017-09-20 16:37 ` Uwe Kleine-König
0 siblings, 0 replies; 12+ messages in thread
From: Uwe Kleine-König @ 2017-09-20 16:37 UTC (permalink / raw)
To: Gregory CLEMENT
Cc: Thomas Petazzoni, Andrew Lunn, Jan Luebbe, linux-pci,
linux-kernel, kernel, linux-arm-kernel, Jason Cooper
On Tue, Sep 19, 2017 at 04:43:18PM +0200, Gregory CLEMENT wrote:
> Hi Jan,
> =
> On lun., ao=FBt 28 2017, Jan Luebbe <jlu@pengutronix.de> wrote:
> =
> > At least the Armada XP SoC supports 4GB on a single DRAM window. Because
> > the size register values contain the actual size - 1, the MSB is set in
> > that case. For example, the SDRAM window's control register's value is
> > 0xffffffe1 for 4GB (bits 31 to 24 contain the size).
> >
> > The MBUS driver reads back each window's size from registers and
> > calculates the actual size as (control_reg | ~DDR_SIZE_MASK) + 1, which
> > overflows for 32 bit values, resulting in other miscalculations further
> > on (a bad RAM window for the CESA crypto engine calculated by
> > mvebu_mbus_setup_cpu_target_nooverlap() in my case).
> >
> > This patch changes the type in 'struct mbus_dram_window' from u32 to
> > u64, which allows us to keep using the same register calculation code in
> > most MBUS-using drivers (which calculate ->size - 1 again).
> >
> =
> Your patch looks good, but as it is a fix we should also apply it on
> stable, could you provide the commit to fix?
It was there just from the start: the .c file was introduced in
v3.10-rc1~64^2~1^2~8^2~2 and already did that 32 bit calculus.
Best regards
Uwe
-- =
Pengutronix e.K. | Uwe Kleine-K=F6nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/2] PCI: mvebu: Check DRAM window size
2017-08-28 15:25 [PATCH 0/2] fix 4GB DRAM window support on mvebu Jan Luebbe
2017-08-28 15:25 ` [PATCH 1/2] bus: mbus: fix window size calculation for 4GB windows Jan Luebbe
@ 2017-08-28 15:25 ` Jan Luebbe
2017-09-25 23:56 ` Bjorn Helgaas
2017-08-28 15:30 ` [RFC] ARM: Orion: " Jan Luebbe
2017-08-30 20:07 ` [PATCH 0/2] fix 4GB DRAM window support on mvebu Bjorn Helgaas
3 siblings, 1 reply; 12+ messages in thread
From: Jan Luebbe @ 2017-08-28 15:25 UTC (permalink / raw)
To: Gregory Clement, Andrew Lunn, Thomas Petazzoni, Jason Cooper
Cc: linux-pci, linux-arm-kernel, linux-kernel, kernel, Jan Luebbe
The sum of the DRAM windows may exceed 4GB (at least on Armada XP).
Return an error in that case.
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
drivers/pci/host/pci-mvebu.c | 27 ++++++++++++++++++++++-----
1 file changed, 22 insertions(+), 5 deletions(-)
diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
index f353a6eb2f01..5d74af81d104 100644
--- a/drivers/pci/host/pci-mvebu.c
+++ b/drivers/pci/host/pci-mvebu.c
@@ -206,10 +206,10 @@ static void mvebu_pcie_set_local_dev_nr(struct mvebu_pcie_port *port, int nr)
* BAR[0,2] -> disabled, BAR[1] -> covers all DRAM banks
* WIN[0-3] -> DRAM bank[0-3]
*/
-static void mvebu_pcie_setup_wins(struct mvebu_pcie_port *port)
+static int mvebu_pcie_setup_wins(struct mvebu_pcie_port *port)
{
const struct mbus_dram_target_info *dram;
- u32 size;
+ u64 size;
int i;
dram = mv_mbus_dram_info();
@@ -252,19 +252,32 @@ static void mvebu_pcie_setup_wins(struct mvebu_pcie_port *port)
if ((size & (size - 1)) != 0)
size = 1 << fls(size);
+ if (size > 0x100000000) {
+ dev_err(&port->pcie->pdev->dev,
+ "Could not configure DRAM window (too large): 0x%llx\n",
+ size);
+
+ return -EINVAL;
+ }
+
/* Setup BAR[1] to all DRAM banks. */
mvebu_writel(port, dram->cs[0].base, PCIE_BAR_LO_OFF(1));
mvebu_writel(port, 0, PCIE_BAR_HI_OFF(1));
mvebu_writel(port, ((size - 1) & 0xffff0000) | 1,
PCIE_BAR_CTRL_OFF(1));
+
+ return 0;
}
-static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port)
+static int mvebu_pcie_setup_hw(struct mvebu_pcie_port *port)
{
u32 cmd, mask;
+ int ret;
/* Point PCIe unit MBUS decode windows to DRAM space. */
- mvebu_pcie_setup_wins(port);
+ ret = mvebu_pcie_setup_wins(port);
+ if (ret)
+ return ret;
/* Master + slave enable. */
cmd = mvebu_readl(port, PCIE_CMD_OFF);
@@ -277,6 +290,8 @@ static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port)
mask = mvebu_readl(port, PCIE_MASK_OFF);
mask |= PCIE_MASK_ENABLE_INTS;
mvebu_writel(port, mask, PCIE_MASK_OFF);
+
+ return 0;
}
static int mvebu_pcie_hw_rd_conf(struct mvebu_pcie_port *port,
@@ -882,7 +897,9 @@ static int mvebu_pcie_setup(int nr, struct pci_sys_data *sys)
if (!port->base)
continue;
- mvebu_pcie_setup_hw(port);
+ err = mvebu_pcie_setup_hw(port);
+ if (err)
+ return 0;
}
return 1;
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 2/2] PCI: mvebu: Check DRAM window size
2017-08-28 15:25 ` [PATCH 2/2] PCI: mvebu: Check DRAM window size Jan Luebbe
@ 2017-09-25 23:56 ` Bjorn Helgaas
2017-10-05 21:16 ` Bjorn Helgaas
0 siblings, 1 reply; 12+ messages in thread
From: Bjorn Helgaas @ 2017-09-25 23:56 UTC (permalink / raw)
To: Jan Luebbe
Cc: Thomas Petazzoni, Andrew Lunn, Jason Cooper, linux-pci,
linux-kernel, kernel, Gregory Clement, linux-arm-kernel
On Mon, Aug 28, 2017 at 05:25:17PM +0200, Jan Luebbe wrote:
> The sum of the DRAM windows may exceed 4GB (at least on Armada XP).
> Return an error in that case.
>
> Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Looking for an ack from Thomas or Jason before applying this...
> ---
> drivers/pci/host/pci-mvebu.c | 27 ++++++++++++++++++++++-----
> 1 file changed, 22 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
> index f353a6eb2f01..5d74af81d104 100644
> --- a/drivers/pci/host/pci-mvebu.c
> +++ b/drivers/pci/host/pci-mvebu.c
> @@ -206,10 +206,10 @@ static void mvebu_pcie_set_local_dev_nr(struct mvebu_pcie_port *port, int nr)
> * BAR[0,2] -> disabled, BAR[1] -> covers all DRAM banks
> * WIN[0-3] -> DRAM bank[0-3]
> */
> -static void mvebu_pcie_setup_wins(struct mvebu_pcie_port *port)
> +static int mvebu_pcie_setup_wins(struct mvebu_pcie_port *port)
> {
> const struct mbus_dram_target_info *dram;
> - u32 size;
> + u64 size;
> int i;
>
> dram = mv_mbus_dram_info();
> @@ -252,19 +252,32 @@ static void mvebu_pcie_setup_wins(struct mvebu_pcie_port *port)
> if ((size & (size - 1)) != 0)
> size = 1 << fls(size);
>
> + if (size > 0x100000000) {
> + dev_err(&port->pcie->pdev->dev,
> + "Could not configure DRAM window (too large): 0x%llx\n",
> + size);
> +
> + return -EINVAL;
> + }
> +
> /* Setup BAR[1] to all DRAM banks. */
> mvebu_writel(port, dram->cs[0].base, PCIE_BAR_LO_OFF(1));
> mvebu_writel(port, 0, PCIE_BAR_HI_OFF(1));
> mvebu_writel(port, ((size - 1) & 0xffff0000) | 1,
> PCIE_BAR_CTRL_OFF(1));
> +
> + return 0;
> }
>
> -static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port)
> +static int mvebu_pcie_setup_hw(struct mvebu_pcie_port *port)
> {
> u32 cmd, mask;
> + int ret;
>
> /* Point PCIe unit MBUS decode windows to DRAM space. */
> - mvebu_pcie_setup_wins(port);
> + ret = mvebu_pcie_setup_wins(port);
> + if (ret)
> + return ret;
>
> /* Master + slave enable. */
> cmd = mvebu_readl(port, PCIE_CMD_OFF);
> @@ -277,6 +290,8 @@ static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port)
> mask = mvebu_readl(port, PCIE_MASK_OFF);
> mask |= PCIE_MASK_ENABLE_INTS;
> mvebu_writel(port, mask, PCIE_MASK_OFF);
> +
> + return 0;
> }
>
> static int mvebu_pcie_hw_rd_conf(struct mvebu_pcie_port *port,
> @@ -882,7 +897,9 @@ static int mvebu_pcie_setup(int nr, struct pci_sys_data *sys)
>
> if (!port->base)
> continue;
> - mvebu_pcie_setup_hw(port);
> + err = mvebu_pcie_setup_hw(port);
> + if (err)
> + return 0;
> }
>
> return 1;
> --
> 2.11.0
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 2/2] PCI: mvebu: Check DRAM window size
2017-09-25 23:56 ` Bjorn Helgaas
@ 2017-10-05 21:16 ` Bjorn Helgaas
2017-11-06 19:17 ` Bjorn Helgaas
0 siblings, 1 reply; 12+ messages in thread
From: Bjorn Helgaas @ 2017-10-05 21:16 UTC (permalink / raw)
To: Jan Luebbe
Cc: Thomas Petazzoni, Andrew Lunn, Jason Cooper, linux-pci,
linux-kernel, kernel, Gregory Clement, linux-arm-kernel
On Mon, Sep 25, 2017 at 06:56:58PM -0500, Bjorn Helgaas wrote:
> On Mon, Aug 28, 2017 at 05:25:17PM +0200, Jan Luebbe wrote:
> > The sum of the DRAM windows may exceed 4GB (at least on Armada XP).
> > Return an error in that case.
> >
> > Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
>
> Looking for an ack from Thomas or Jason before applying this...
Ping, I think I'm stil waiting for an ack for this. Or did I miss it?
> > ---
> > drivers/pci/host/pci-mvebu.c | 27 ++++++++++++++++++++++-----
> > 1 file changed, 22 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
> > index f353a6eb2f01..5d74af81d104 100644
> > --- a/drivers/pci/host/pci-mvebu.c
> > +++ b/drivers/pci/host/pci-mvebu.c
> > @@ -206,10 +206,10 @@ static void mvebu_pcie_set_local_dev_nr(struct mvebu_pcie_port *port, int nr)
> > * BAR[0,2] -> disabled, BAR[1] -> covers all DRAM banks
> > * WIN[0-3] -> DRAM bank[0-3]
> > */
> > -static void mvebu_pcie_setup_wins(struct mvebu_pcie_port *port)
> > +static int mvebu_pcie_setup_wins(struct mvebu_pcie_port *port)
> > {
> > const struct mbus_dram_target_info *dram;
> > - u32 size;
> > + u64 size;
> > int i;
> >
> > dram = mv_mbus_dram_info();
> > @@ -252,19 +252,32 @@ static void mvebu_pcie_setup_wins(struct mvebu_pcie_port *port)
> > if ((size & (size - 1)) != 0)
> > size = 1 << fls(size);
> >
> > + if (size > 0x100000000) {
> > + dev_err(&port->pcie->pdev->dev,
> > + "Could not configure DRAM window (too large): 0x%llx\n",
> > + size);
> > +
> > + return -EINVAL;
> > + }
> > +
> > /* Setup BAR[1] to all DRAM banks. */
> > mvebu_writel(port, dram->cs[0].base, PCIE_BAR_LO_OFF(1));
> > mvebu_writel(port, 0, PCIE_BAR_HI_OFF(1));
> > mvebu_writel(port, ((size - 1) & 0xffff0000) | 1,
> > PCIE_BAR_CTRL_OFF(1));
> > +
> > + return 0;
> > }
> >
> > -static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port)
> > +static int mvebu_pcie_setup_hw(struct mvebu_pcie_port *port)
> > {
> > u32 cmd, mask;
> > + int ret;
> >
> > /* Point PCIe unit MBUS decode windows to DRAM space. */
> > - mvebu_pcie_setup_wins(port);
> > + ret = mvebu_pcie_setup_wins(port);
> > + if (ret)
> > + return ret;
> >
> > /* Master + slave enable. */
> > cmd = mvebu_readl(port, PCIE_CMD_OFF);
> > @@ -277,6 +290,8 @@ static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port)
> > mask = mvebu_readl(port, PCIE_MASK_OFF);
> > mask |= PCIE_MASK_ENABLE_INTS;
> > mvebu_writel(port, mask, PCIE_MASK_OFF);
> > +
> > + return 0;
> > }
> >
> > static int mvebu_pcie_hw_rd_conf(struct mvebu_pcie_port *port,
> > @@ -882,7 +897,9 @@ static int mvebu_pcie_setup(int nr, struct pci_sys_data *sys)
> >
> > if (!port->base)
> > continue;
> > - mvebu_pcie_setup_hw(port);
> > + err = mvebu_pcie_setup_hw(port);
> > + if (err)
> > + return 0;
> > }
> >
> > return 1;
> > --
> > 2.11.0
> >
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 2/2] PCI: mvebu: Check DRAM window size
2017-10-05 21:16 ` Bjorn Helgaas
@ 2017-11-06 19:17 ` Bjorn Helgaas
0 siblings, 0 replies; 12+ messages in thread
From: Bjorn Helgaas @ 2017-11-06 19:17 UTC (permalink / raw)
To: Jan Luebbe
Cc: Thomas Petazzoni, Andrew Lunn, Jason Cooper, linux-pci,
linux-kernel, kernel, Gregory Clement, linux-arm-kernel
On Thu, Oct 05, 2017 at 04:16:50PM -0500, Bjorn Helgaas wrote:
> On Mon, Sep 25, 2017 at 06:56:58PM -0500, Bjorn Helgaas wrote:
> > On Mon, Aug 28, 2017 at 05:25:17PM +0200, Jan Luebbe wrote:
> > > The sum of the DRAM windows may exceed 4GB (at least on Armada XP).
> > > Return an error in that case.
> > >
> > > Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
> >
> > Looking for an ack from Thomas or Jason before applying this...
>
> Ping, I think I'm stil waiting for an ack for this. Or did I miss it?
I'm dropping this. Please repost it with the appropriate acks if it's
still needed.
> > > ---
> > > drivers/pci/host/pci-mvebu.c | 27 ++++++++++++++++++++++-----
> > > 1 file changed, 22 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
> > > index f353a6eb2f01..5d74af81d104 100644
> > > --- a/drivers/pci/host/pci-mvebu.c
> > > +++ b/drivers/pci/host/pci-mvebu.c
> > > @@ -206,10 +206,10 @@ static void mvebu_pcie_set_local_dev_nr(struct mvebu_pcie_port *port, int nr)
> > > * BAR[0,2] -> disabled, BAR[1] -> covers all DRAM banks
> > > * WIN[0-3] -> DRAM bank[0-3]
> > > */
> > > -static void mvebu_pcie_setup_wins(struct mvebu_pcie_port *port)
> > > +static int mvebu_pcie_setup_wins(struct mvebu_pcie_port *port)
> > > {
> > > const struct mbus_dram_target_info *dram;
> > > - u32 size;
> > > + u64 size;
> > > int i;
> > >
> > > dram = mv_mbus_dram_info();
> > > @@ -252,19 +252,32 @@ static void mvebu_pcie_setup_wins(struct mvebu_pcie_port *port)
> > > if ((size & (size - 1)) != 0)
> > > size = 1 << fls(size);
> > >
> > > + if (size > 0x100000000) {
> > > + dev_err(&port->pcie->pdev->dev,
> > > + "Could not configure DRAM window (too large): 0x%llx\n",
> > > + size);
> > > +
> > > + return -EINVAL;
> > > + }
> > > +
> > > /* Setup BAR[1] to all DRAM banks. */
> > > mvebu_writel(port, dram->cs[0].base, PCIE_BAR_LO_OFF(1));
> > > mvebu_writel(port, 0, PCIE_BAR_HI_OFF(1));
> > > mvebu_writel(port, ((size - 1) & 0xffff0000) | 1,
> > > PCIE_BAR_CTRL_OFF(1));
> > > +
> > > + return 0;
> > > }
> > >
> > > -static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port)
> > > +static int mvebu_pcie_setup_hw(struct mvebu_pcie_port *port)
> > > {
> > > u32 cmd, mask;
> > > + int ret;
> > >
> > > /* Point PCIe unit MBUS decode windows to DRAM space. */
> > > - mvebu_pcie_setup_wins(port);
> > > + ret = mvebu_pcie_setup_wins(port);
> > > + if (ret)
> > > + return ret;
> > >
> > > /* Master + slave enable. */
> > > cmd = mvebu_readl(port, PCIE_CMD_OFF);
> > > @@ -277,6 +290,8 @@ static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port)
> > > mask = mvebu_readl(port, PCIE_MASK_OFF);
> > > mask |= PCIE_MASK_ENABLE_INTS;
> > > mvebu_writel(port, mask, PCIE_MASK_OFF);
> > > +
> > > + return 0;
> > > }
> > >
> > > static int mvebu_pcie_hw_rd_conf(struct mvebu_pcie_port *port,
> > > @@ -882,7 +897,9 @@ static int mvebu_pcie_setup(int nr, struct pci_sys_data *sys)
> > >
> > > if (!port->base)
> > > continue;
> > > - mvebu_pcie_setup_hw(port);
> > > + err = mvebu_pcie_setup_hw(port);
> > > + if (err)
> > > + return 0;
> > > }
> > >
> > > return 1;
> > > --
> > > 2.11.0
> > >
> >
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel@lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread
* [RFC] ARM: Orion: Check DRAM window size
2017-08-28 15:25 [PATCH 0/2] fix 4GB DRAM window support on mvebu Jan Luebbe
2017-08-28 15:25 ` [PATCH 1/2] bus: mbus: fix window size calculation for 4GB windows Jan Luebbe
2017-08-28 15:25 ` [PATCH 2/2] PCI: mvebu: Check DRAM window size Jan Luebbe
@ 2017-08-28 15:30 ` Jan Luebbe
2017-08-28 15:51 ` Andrew Lunn
2017-08-30 20:07 ` [PATCH 0/2] fix 4GB DRAM window support on mvebu Bjorn Helgaas
3 siblings, 1 reply; 12+ messages in thread
From: Jan Luebbe @ 2017-08-28 15:30 UTC (permalink / raw)
To: Gregory Clement, Andrew Lunn, Thomas Petazzoni, Jason Cooper
Cc: linux-pci, linux-arm-kernel, linux-kernel, kernel, Jan Luebbe
This is a corresponding change as "PCI: mvebu: Check DRAM window size" applied
to the Orion PCIe driver. I don't have the relevant hardware myself, but the
patch may still be useful for someone who has. This is completely untested.
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
arch/arm/mach-dove/pcie.c | 3 ++-
arch/arm/mach-mv78xx0/pcie.c | 3 ++-
arch/arm/mach-orion5x/pci.c | 3 ++-
arch/arm/plat-orion/pcie.c | 19 +++++++++++++++----
4 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-dove/pcie.c b/arch/arm/mach-dove/pcie.c
index 91fe97144570..27e4689ee58d 100644
--- a/arch/arm/mach-dove/pcie.c
+++ b/arch/arm/mach-dove/pcie.c
@@ -51,7 +51,8 @@ static int __init dove_pcie_setup(int nr, struct pci_sys_data *sys)
*/
orion_pcie_set_local_bus_nr(pp->base, sys->busnr);
- orion_pcie_setup(pp->base);
+ if (!orion_pcie_setup(pp->base))
+ return 0;
if (pp->index == 0)
pci_ioremap_io(sys->busnr * SZ_64K, DOVE_PCIE0_IO_PHYS_BASE);
diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c
index 81ff4327a962..3d17eeff44bf 100644
--- a/arch/arm/mach-mv78xx0/pcie.c
+++ b/arch/arm/mach-mv78xx0/pcie.c
@@ -113,7 +113,8 @@ static int __init mv78xx0_pcie_setup(int nr, struct pci_sys_data *sys)
* Generic PCIe unit setup.
*/
orion_pcie_set_local_bus_nr(pp->base, sys->busnr);
- orion_pcie_setup(pp->base);
+ if (!orion_pcie_setup(pp->base))
+ return 0;
pci_ioremap_io(nr * SZ_64K, MV78XX0_PCIE_IO_PHYS_BASE(nr));
diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c
index ecb998e7f8dc..f7f830872cc9 100644
--- a/arch/arm/mach-orion5x/pci.c
+++ b/arch/arm/mach-orion5x/pci.c
@@ -147,7 +147,8 @@ static int __init pcie_setup(struct pci_sys_data *sys)
/*
* Generic PCIe unit setup.
*/
- orion_pcie_setup(PCIE_BASE);
+ if (!orion_pcie_setup(PCIE_BASE))
+ return 0;
/*
* Check whether to apply Orion-1/Orion-NAS PCIe config
diff --git a/arch/arm/plat-orion/pcie.c b/arch/arm/plat-orion/pcie.c
index 8b8c06d2e9c4..07ae382cf48a 100644
--- a/arch/arm/plat-orion/pcie.c
+++ b/arch/arm/plat-orion/pcie.c
@@ -120,10 +120,10 @@ void __init orion_pcie_reset(void __iomem *base)
* BAR[0,2] -> disabled, BAR[1] -> covers all DRAM banks
* WIN[0-3] -> DRAM bank[0-3]
*/
-static void __init orion_pcie_setup_wins(void __iomem *base)
+static int __init orion_pcie_setup_wins(void __iomem *base)
{
const struct mbus_dram_target_info *dram;
- u32 size;
+ u64 size;
int i;
dram = mv_mbus_dram_info();
@@ -170,15 +170,23 @@ static void __init orion_pcie_setup_wins(void __iomem *base)
if ((size & (size - 1)) != 0)
size = 1 << fls(size);
+ if (size > 0x100000000) {
+ pr_err("Could not configure DRAM window (too large): 0x%llx\n",
+ size);
+ return 0;
+ }
+
/*
* Setup BAR[1] to all DRAM banks.
*/
writel(dram->cs[0].base, base + PCIE_BAR_LO_OFF(1));
writel(0, base + PCIE_BAR_HI_OFF(1));
writel(((size - 1) & 0xffff0000) | 1, base + PCIE_BAR_CTRL_OFF(1));
+
+ return 1;
}
-void __init orion_pcie_setup(void __iomem *base)
+int __init orion_pcie_setup(void __iomem *base)
{
u16 cmd;
u32 mask;
@@ -186,7 +194,8 @@ void __init orion_pcie_setup(void __iomem *base)
/*
* Point PCIe unit MBUS decode windows to DRAM space.
*/
- orion_pcie_setup_wins(base);
+ if (!orion_pcie_setup_wins(base))
+ return 0;
/*
* Master + slave enable.
@@ -203,6 +212,8 @@ void __init orion_pcie_setup(void __iomem *base)
mask = readl(base + PCIE_MASK_OFF);
mask |= 0x0f000000;
writel(mask, base + PCIE_MASK_OFF);
+
+ return 1;
}
int orion_pcie_rd_conf(void __iomem *base, struct pci_bus *bus,
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [RFC] ARM: Orion: Check DRAM window size
2017-08-28 15:30 ` [RFC] ARM: Orion: " Jan Luebbe
@ 2017-08-28 15:51 ` Andrew Lunn
0 siblings, 0 replies; 12+ messages in thread
From: Andrew Lunn @ 2017-08-28 15:51 UTC (permalink / raw)
To: Jan Luebbe
Cc: Thomas Petazzoni, Jason Cooper, linux-pci, linux-kernel, kernel,
Gregory Clement, linux-arm-kernel
On Mon, Aug 28, 2017 at 05:30:39PM +0200, Jan Luebbe wrote:
> This is a corresponding change as "PCI: mvebu: Check DRAM window size" applied
> to the Orion PCIe driver. I don't have the relevant hardware myself, but the
> patch may still be useful for someone who has. This is completely untested.
Hi Jan
I've never seen one of these boards have more than 512M bytes of RAM.
So it is probably a non-issue.
Andrew
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/2] fix 4GB DRAM window support on mvebu
2017-08-28 15:25 [PATCH 0/2] fix 4GB DRAM window support on mvebu Jan Luebbe
` (2 preceding siblings ...)
2017-08-28 15:30 ` [RFC] ARM: Orion: " Jan Luebbe
@ 2017-08-30 20:07 ` Bjorn Helgaas
2017-08-31 8:11 ` Gregory CLEMENT
3 siblings, 1 reply; 12+ messages in thread
From: Bjorn Helgaas @ 2017-08-30 20:07 UTC (permalink / raw)
To: Jan Luebbe
Cc: Thomas Petazzoni, Andrew Lunn, Jason Cooper, linux-pci,
linux-kernel, kernel, Gregory Clement, linux-arm-kernel
On Mon, Aug 28, 2017 at 05:25:15PM +0200, Jan Luebbe wrote:
> The current MBUS DRAM window calculation fails for 4GB windows because it
> overflows. This is fixed in the first patch by using u64 instead of u32 to
> store the size. The second excplicitly checks that we don't try to configure a
> too large memory window in the pci driver.
>
> As they don't depend on each other, they could also go in separatly.
>
> Jan Luebbe (2):
> bus: mbus: fix window size calculation for 4GB windows
> PCI: mvebu: Check DRAM window size
>
> drivers/bus/mvebu-mbus.c | 2 +-
> drivers/pci/host/pci-mvebu.c | 27 ++++++++++++++++++++++-----
> include/linux/mbus.h | 4 ++--
> 3 files changed, 25 insertions(+), 8 deletions(-)
Since these can be applied separately, I'll let somebody else take care of
the drivers/bus/mvebu-mbus.c part.
I'll look for an ack from Thomas or Jason before applying the second patch,
which touches drivers/pci/host/pci-mvebu.c.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 0/2] fix 4GB DRAM window support on mvebu
2017-08-30 20:07 ` [PATCH 0/2] fix 4GB DRAM window support on mvebu Bjorn Helgaas
@ 2017-08-31 8:11 ` Gregory CLEMENT
0 siblings, 0 replies; 12+ messages in thread
From: Gregory CLEMENT @ 2017-08-31 8:11 UTC (permalink / raw)
To: Jan Luebbe, Bjorn Helgaas
Cc: Andrew Lunn, Thomas Petazzoni, Jason Cooper, linux-pci,
linux-arm-kernel, linux-kernel, kernel
Hi Bjorn and Jan,
=20
On mer., ao=C3=BBt 30 2017, Bjorn Helgaas <helgaas@kernel.org> wrote:
> On Mon, Aug 28, 2017 at 05:25:15PM +0200, Jan Luebbe wrote:
>> The current MBUS DRAM window calculation fails for 4GB windows because it
>> overflows. This is fixed in the first patch by using u64 instead of u32 =
to
>> store the size. The second excplicitly checks that we don't try to confi=
gure a
>> too large memory window in the pci driver.
>>=20
>> As they don't depend on each other, they could also go in separatly.
>>=20
>> Jan Luebbe (2):
>> bus: mbus: fix window size calculation for 4GB windows
>> PCI: mvebu: Check DRAM window size
>>=20
>> drivers/bus/mvebu-mbus.c | 2 +-
>> drivers/pci/host/pci-mvebu.c | 27 ++++++++++++++++++++++-----
>> include/linux/mbus.h | 4 ++--
>> 3 files changed, 25 insertions(+), 8 deletions(-)
>
> Since these can be applied separately, I'll let somebody else take care of
> the drivers/bus/mvebu-mbus.c part.
I think I am the one who should take it. I will apply it when v4.14-rc1
will be released as it is too late for me for 4.14 now.
However I am not against the fact that it is applied through an other
tree because we don't touch this file for the next release so there is
no risk for a conflict, I can give my Acked-by if needed.
Thanks,
Gregory
>
> I'll look for an ack from Thomas or Jason before applying the second patc=
h,
> which touches drivers/pci/host/pci-mvebu.c.
--=20
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 12+ messages in thread