2020-04-02 18:25:52

by Eugeniy Paltsev

Subject: [PATCH] ARC: Fix ICCM & DCCM runtime size checks

As of today the ICCM and DCCM size checks are incorrectly using
mismatched units (KiB checked against bytes). The CONFIG_ARC_DCCM_SZ
and CONFIG_ARC_ICCM_SZ are in KiB, but the size calculated in
runtime and stored in cpu->dccm.sz and cpu->iccm.sz is in bytes.

Fix that.

Reported-by: Paul Greco <[email protected]>
Signed-off-by: Eugeniy Paltsev <[email protected]>
---
arch/arc/kernel/setup.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c
index aa41af6ef4ac..efdedf83b954 100644
--- a/arch/arc/kernel/setup.c
+++ b/arch/arc/kernel/setup.c
@@ -11,6 +11,7 @@
#include <linux/clocksource.h>
#include <linux/console.h>
#include <linux/module.h>
+#include <linux/sizes.h>
#include <linux/cpu.h>
#include <linux/of_clk.h>
#include <linux/of_fdt.h>
@@ -409,12 +410,12 @@ static void arc_chk_core_config(void)
if ((unsigned int)__arc_dccm_base != cpu->dccm.base_addr)
panic("Linux built with incorrect DCCM Base address\n");

- if (CONFIG_ARC_DCCM_SZ != cpu->dccm.sz)
+ if (CONFIG_ARC_DCCM_SZ * SZ_1K != cpu->dccm.sz)
panic("Linux built with incorrect DCCM Size\n");
#endif

#ifdef CONFIG_ARC_HAS_ICCM
- if (CONFIG_ARC_ICCM_SZ != cpu->iccm.sz)
+ if (CONFIG_ARC_ICCM_SZ * SZ_1K != cpu->iccm.sz)
panic("Linux built with incorrect ICCM Size\n");
#endif

--
2.21.1

2020-04-03 22:01:12

by Vineet Gupta

Subject: Re: [PATCH] ARC: Fix ICCM & DCCM runtime size checks

On 4/2/20 10:54 AM, Eugeniy Paltsev wrote:
> As of today the ICCM and DCCM size checks are incorrectly using
> mismatched units (KiB checked against bytes). The CONFIG_ARC_DCCM_SZ
> and CONFIG_ARC_ICCM_SZ are in KiB, but the size calculated in
> runtime and stored in cpu->dccm.sz and cpu->iccm.sz is in bytes.
>
> Fix that.
>
> Reported-by: Paul Greco <[email protected]>
> Signed-off-by: Eugeniy Paltsev <[email protected]>

LGTM. Will be added after merge window !

Thx,
-Vineet

> ---
> arch/arc/kernel/setup.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c
> index aa41af6ef4ac..efdedf83b954 100644
> --- a/arch/arc/kernel/setup.c
> +++ b/arch/arc/kernel/setup.c
> @@ -11,6 +11,7 @@
> #include <linux/clocksource.h>
> #include <linux/console.h>
> #include <linux/module.h>
> +#include <linux/sizes.h>
> #include <linux/cpu.h>
> #include <linux/of_clk.h>
> #include <linux/of_fdt.h>
> @@ -409,12 +410,12 @@ static void arc_chk_core_config(void)
> if ((unsigned int)__arc_dccm_base != cpu->dccm.base_addr)
> panic("Linux built with incorrect DCCM Base address\n");
>
> - if (CONFIG_ARC_DCCM_SZ != cpu->dccm.sz)
> + if (CONFIG_ARC_DCCM_SZ * SZ_1K != cpu->dccm.sz)
> panic("Linux built with incorrect DCCM Size\n");
> #endif
>
> #ifdef CONFIG_ARC_HAS_ICCM
> - if (CONFIG_ARC_ICCM_SZ != cpu->iccm.sz)
> + if (CONFIG_ARC_ICCM_SZ * SZ_1K != cpu->iccm.sz)
> panic("Linux built with incorrect ICCM Size\n");
> #endif
>