| From 08cab6310dd6a99c59b21c6a136af4b893dda4d0 Mon Sep 17 00:00:00 2001 |
| From: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com> |
| Date: Thu, 2 Apr 2020 20:54:28 +0300 |
| Subject: [PATCH] ARC: Fix ICCM & DCCM runtime size checks |
| |
| commit 43900edf67d7ef3ac8909854d75b8a1fba2d570c upstream. |
| |
| 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 <pmgreco@us.ibm.com> |
| Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com> |
| Signed-off-by: Vineet Gupta <vgupta@synopsys.com> |
| |
| diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c |
| index 7ee89dc61f6e..23dc002aa574 100644 |
| --- a/arch/arc/kernel/setup.c |
| +++ b/arch/arc/kernel/setup.c |
| @@ -12,6 +12,7 @@ |
| #include <linux/clocksource.h> |
| #include <linux/console.h> |
| #include <linux/module.h> |
| +#include <linux/sizes.h> |
| #include <linux/cpu.h> |
| #include <linux/of_fdt.h> |
| #include <linux/of.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.7.4 |
| |
