ARC: Fix ICCM & DCCM runtime size checks (43900edf) · Commits · 戴 / test

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>

arch/arc/kernel/setup.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -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>
		@@ -424,12 +425,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

Admin message