From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941298AbcLVOKY (ORCPT ); Thu, 22 Dec 2016 09:10:24 -0500 Received: from smtprelay4.synopsys.com ([198.182.47.9]:60338 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760370AbcLVOJz (ORCPT ); Thu, 22 Dec 2016 09:09:55 -0500 From: Alexey Brodkin To: linux-snps-arc@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Vineet Gupta , Alexey Brodkin , Igor Guryanov , stable@vger.kernel.org Subject: [PATCH 2/2] arc: Fix xCCM size check Date: Thu, 22 Dec 2016 17:09:10 +0300 Message-Id: <1482415750-5471-3-git-send-email-abrodkin@synopsys.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482415750-5471-1-git-send-email-abrodkin@synopsys.com> References: <1482415750-5471-1-git-send-email-abrodkin@synopsys.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org CONFIG_ARC_ICCM_SZ in menuconfig is specified in kB while "cpu->Xccm.sz" contains value in bytes thus direct comparison fails leading to boot-time panic like that: ----------------------->8--------------------- IDENTITY : ARCVER [0x52] ARCNUM [0x1] CHIPID [ 0x0] processor [1] : ARC HS38 R2.1 (ARCv2 ISA) Timers : Timer0 Timer1 Local-64-bit-Ctr (not used) ISA Extn : atomic ll64 unalign (not used) : mpy[opt 9] div_rem norm barrel-shift swap minmax swape BPU : full match, cache:2048, Predict Table:16384 MMU [v0] : 0k PAGE, JTLB 0 (0x0), uDTLB 0, uITLB 0 I-Cache : N/A D-Cache : N/A Peripherals : 0xf0000000, IO-Coherency (disabled) Vector Table : 0x80000000 FPU : SP DP DEBUG : ActionPoint smaRT RTT Extn [CCM] : DCCM @ e0000000, 256 KB / ICCM: @ 60000000, 256 KB OS ABI [v4] : 64-bit data any register aligned Extn [SMP] : ARConnect (v2): 2 cores with IPI IDU DEBUG GFRC Kernel panic - not syncing: Linux built with incorrect DCCM Size ---[ end Kernel panic - not syncing: Linux built with incorrect DCCM Size ----------------------->8--------------------- Signed-off-by: Alexey Brodkin Cc: Igor Guryanov Cc: stable@vger.kernel.org --- arch/arc/kernel/setup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c index ee574f37f365..601dab6fe5e0 100644 --- a/arch/arc/kernel/setup.c +++ b/arch/arc/kernel/setup.c @@ -333,12 +333,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 != TO_KB(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 != TO_KB(cpu->iccm.sz)) panic("Linux built with incorrect ICCM Size\n"); #endif -- 2.7.4