Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 935ba01e authored by Eugeniy Paltsev's avatar Eugeniy Paltsev Committed by Greg Kroah-Hartman
Browse files

ARC: Fix ICCM & DCCM runtime size checks 



[ Upstream commit 43900edf67d7ef3ac8909854d75b8a1fba2d570c ]

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: default avatarPaul Greco <pmgreco@us.ibm.com>
Signed-off-by: default avatarEugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
Signed-off-by: default avatarVineet Gupta <vgupta@synopsys.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8a69220b

arch/arc/kernel/setup.c

+3 −2
Original line number Diff line number Diff line
@@ -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