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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, T_DKIMWL_WL_HIGH,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 EE6D8C004C9 for ; Tue, 7 May 2019 05:57:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BF42D2054F for ; Tue, 7 May 2019 05:57:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557208634; bh=CqM25Liyll1vUZ+oKuFskUUke6oAbdea2XABoh0OlYE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Hz9q/J7EFrvRKKUkkUMPZe3Kf+5OGdfD2QDzvkNFfjqf1G1ncbcE1DPjGPyvfjkta Veskf0m78zg1eVrPMoGXOCZwjAmbs/kV+EGm+owBGEUxNCOs4yuYDoIbe3sntVRuCj nt7OvO7I+EWVtGIjiZhvgfIubKh7o/yx/I+4mRgM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728425AbfEGFhl (ORCPT ); Tue, 7 May 2019 01:37:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:57458 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726510AbfEGFhl (ORCPT ); Tue, 7 May 2019 01:37:41 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1CA0420578; Tue, 7 May 2019 05:37:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557207460; bh=CqM25Liyll1vUZ+oKuFskUUke6oAbdea2XABoh0OlYE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1pjhi46v9GkAsY12cvWwK0a7+0w1K9hEVSH3EScR6z01V6JJbOuooze2uL6Tfr6gW ao0LBtV23Kl55pYGvIu+KpTs3Xt2Ws3s5x6/pf/CpgqWaQkXR2TvnGzsUszWtJ3ymx 2+qcFupNDXqRjo7X4HJ7NYUXtxauT18iKFGQZeU0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tigran Tadevosyan , Vladimir Murzin , Russell King , Sasha Levin Subject: [PATCH AUTOSEL 4.19 55/81] ARM: 8856/1: NOMMU: Fix CCR register faulty initialization when MPU is disabled Date: Tue, 7 May 2019 01:35:26 -0400 Message-Id: <20190507053554.30848-55-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190507053554.30848-1-sashal@kernel.org> References: <20190507053554.30848-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tigran Tadevosyan [ 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 ec29de250076..cab89479d15e 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