From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E662DC04E53 for ; Wed, 15 May 2019 11:40:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AE3032053B for ; Wed, 15 May 2019 11:40:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557920432; bh=jkLFPE0Btsk4k/1uPATuEs2Vl549eC/EjkT7x9ITssY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cHRkpvUQHGkmQJdfWffWjcwgFYoV3zXbDYrr2N3VowQEXzCulYzX6Glg8rg/vdT0H q0NsdtJDXWM45AtfI1Wj85rsNvEeQ/ii/b/wdzV41/zCojbxluNLn34XqRpBfYI8mg rhzZ5bTNoO8CMF2apdlOyFbyWEunlBvZL1WclP4E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726551AbfEOL3V (ORCPT ); Wed, 15 May 2019 07:29:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:40560 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732540AbfEOL3U (ORCPT ); Wed, 15 May 2019 07:29:20 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 94662206BF; Wed, 15 May 2019 11:29:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557919760; bh=jkLFPE0Btsk4k/1uPATuEs2Vl549eC/EjkT7x9ITssY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=isjvbvxMoYKB7k8iRGMI729XDRnT3ckbboLI3dk8iTikfxh5+UN1S+wUJik+iDjKw Jm991KcOAhCKwGfvrE6W3AjgKru4w2T0I0Bi9h86TNRCNXdhI4A/KZYqQ1oesMzWdL 8qP5xwPZmrVo0nPnhCqcpSTeZHNp7kPZgaMQQUKM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tigran Tadevosyan , Vladimir Murzin , Russell King , Sasha Levin Subject: [PATCH 5.0 084/137] ARM: 8856/1: NOMMU: Fix CCR register faulty initialization when MPU is disabled Date: Wed, 15 May 2019 12:56:05 +0200 Message-Id: <20190515090659.632659265@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090651.633556783@linuxfoundation.org> References: <20190515090651.633556783@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit c3143967807adb1357c36b68a7563fc0c4e1f615 ] When CONFIG_ARM_MPU is not defined, the base address of v7M SCB register is not initialized with correct value. This prevents enabling I/D caches when the L1 cache poilcy is applied in kernel. Fixes: 3c24121039c9da14692eb48f6e39565b28c0f3cf ("ARM: 8756/1: NOMMU: Postpone MPU activation till __after_proc_init") Signed-off-by: Tigran Tadevosyan Signed-off-by: Vladimir Murzin Signed-off-by: Russell King Signed-off-by: Sasha Levin --- arch/arm/kernel/head-nommu.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S index ec29de2500764..cab89479d15ef 100644 --- a/arch/arm/kernel/head-nommu.S +++ b/arch/arm/kernel/head-nommu.S @@ -133,9 +133,9 @@ __secondary_data: */ .text __after_proc_init: -#ifdef CONFIG_ARM_MPU M_CLASS(movw r12, #:lower16:BASEADDR_V7M_SCB) M_CLASS(movt r12, #:upper16:BASEADDR_V7M_SCB) +#ifdef CONFIG_ARM_MPU M_CLASS(ldr r3, [r12, 0x50]) AR_CLASS(mrc p15, 0, r3, c0, c1, 4) @ Read ID_MMFR0 and r3, r3, #(MMFR0_PMSA) @ PMSA field -- 2.20.1