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=-2.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 EAA26ECDFB8 for ; Wed, 18 Jul 2018 10:18:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A217920850 for ; Wed, 18 Jul 2018 10:18:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DXYyUfYV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A217920850 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731023AbeGRKzN (ORCPT ); Wed, 18 Jul 2018 06:55:13 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:38508 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726142AbeGRKzM (ORCPT ); Wed, 18 Jul 2018 06:55:12 -0400 Received: by mail-pg1-f194.google.com with SMTP id k3-v6so1801668pgq.5 for ; Wed, 18 Jul 2018 03:18:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=C3VVPsCbTKnmEUV87ccS35kChskysrdX0+gD/3x+tZs=; b=DXYyUfYVhvSbX+0tDFqP5Qk2Z3IFN/x+e7L3x/326A8AhVJgryima1lW80yNTePYcZ TAdOk/qNGI4iQNajdcoTazwdPi3QPBcFsz0uPi84zvYTYgdPceDzwV2mTcK1logQYqr1 lxqZGBbz4NGLWOyZq1AG+fkw9qPt7pqXK+k1tsqW6pHQekzN6lhdsnYAtxep+zd6OVdD yhy0g1YVJhsFlg1ljFVwean2iLSbslVjZIopF43nBuFB+NyXJOgd8/qQkdTVPf8YuyPD eD9t56t5c9Hp/SOVlOtFHBxk+PyYqBxhSy3FHB9r48KSy3PeMf5n/Hw5MabrnPqCwEEx PcYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=C3VVPsCbTKnmEUV87ccS35kChskysrdX0+gD/3x+tZs=; b=VWJUOv1JoNoj5+MLR6xi6yDgIoqKlwuDKM1sud/KBmIsiVbD4cFzhgE0r19M4MvseY JmZuPv24NH0Rq6qxjF52LJkOzADE9wBZxI5QIy5ZDl/lFL7N84ORcdXmIq+d2WspGZN9 eDQY0bKzPLpntvj90pKMdTpgHYgNtpOVDshOkNbsFdbB2k8kNPitHkS1cAUuUMA6yXpz cffCFgvBpOGL0QpwBtnMIZNyKioTD0O5Z7rcMygZI8JMqN3dooMqtMBMXyzqgrgE1nXa MFE1KwRjCdVPiykH4wKv5sg/IySKk+ME+cP7pFNv86B1smlTzz7kT+oFpa0Mi2qArho3 ou5A== X-Gm-Message-State: AOUpUlHEHk0D7YS3KvCps4yJhDuU/eNm2VPtg7dB1o2Athsv+o3Ww79T hP19CQY71G/OwVFI173f4f0BLw== X-Google-Smtp-Source: AAOMgpfMtEqNH2OZhtMeT7RXbmGX02AJfNB500GFJ45jHj3qF92bBGnpVu5aztN1eIe6xLJ7X0G4tw== X-Received: by 2002:a63:3686:: with SMTP id d128-v6mr5067173pga.18.1531909081012; Wed, 18 Jul 2018 03:18:01 -0700 (PDT) Received: from toy.corp.qihoo.net ([104.192.108.10]) by smtp.gmail.com with ESMTPSA id x2-v6sm6899518pgq.33.2018.07.18.03.17.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Jul 2018 03:18:00 -0700 (PDT) From: Jun Yao To: linux-arm-kernel@lists.infradead.org Cc: catalin.marinas@arm.com, will.deacon@arm.com, james.morse@arm.com, linux-kernel@vger.kernel.org Subject: [RESEND PATCH v4 2/6] arm64/mm: Make __enable_mmu() take the Date: Wed, 18 Jul 2018 18:17:23 +0800 Message-Id: <20180718101727.10787-3-yaojun8558363@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180718101727.10787-1-yaojun8558363@gmail.com> References: <20180718101727.10787-1-yaojun8558363@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make __enable_mmu() take the physical address of the ttbr1 page as an argument. Signed-off-by: Jun Yao --- arch/arm64/kernel/head.S | 21 ++++++++++++--------- arch/arm64/kernel/sleep.S | 1 + 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 2c83a8c47e3f..c3e4b1886cde 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -714,6 +714,7 @@ secondary_startup: * Common entry point for secondary CPUs. */ bl __cpu_setup // initialise processor + adrp x1, swapper_pg_dir bl __enable_mmu ldr x8, =__secondary_switched br x8 @@ -756,6 +757,7 @@ ENDPROC(__secondary_switched) * Enable the MMU. * * x0 = SCTLR_EL1 value for turning on the MMU. + * x1 = TTBR1_EL1 value for turning on the MMU. * * Returns to the caller via x30/lr. This requires the caller to be covered * by the .idmap.text section. @@ -764,15 +766,15 @@ ENDPROC(__secondary_switched) * If it isn't, park the CPU */ ENTRY(__enable_mmu) - mrs x1, ID_AA64MMFR0_EL1 - ubfx x2, x1, #ID_AA64MMFR0_TGRAN_SHIFT, 4 - cmp x2, #ID_AA64MMFR0_TGRAN_SUPPORTED + mrs x5, ID_AA64MMFR0_EL1 + ubfx x6, x5, #ID_AA64MMFR0_TGRAN_SHIFT, 4 + cmp x6, #ID_AA64MMFR0_TGRAN_SUPPORTED b.ne __no_granule_support - update_early_cpu_boot_status 0, x1, x2 - adrp x1, idmap_pg_dir - adrp x2, swapper_pg_dir - phys_to_ttbr x3, x1 - phys_to_ttbr x4, x2 + update_early_cpu_boot_status 0, x5, x6 + adrp x5, idmap_pg_dir + mov x6, x1 + phys_to_ttbr x3, x5 + phys_to_ttbr x4, x6 msr ttbr0_el1, x3 // load TTBR0 msr ttbr1_el1, x4 // load TTBR1 isb @@ -791,7 +793,7 @@ ENDPROC(__enable_mmu) __no_granule_support: /* Indicate that this CPU can't boot and is stuck in the kernel */ - update_early_cpu_boot_status CPU_STUCK_IN_KERNEL, x1, x2 + update_early_cpu_boot_status CPU_STUCK_IN_KERNEL, x5, x6 1: wfe wfi @@ -831,6 +833,7 @@ __primary_switch: mrs x20, sctlr_el1 // preserve old SCTLR_EL1 value #endif + adrp x1, swapper_pg_dir bl __enable_mmu #ifdef CONFIG_RELOCATABLE bl __relocate_kernel diff --git a/arch/arm64/kernel/sleep.S b/arch/arm64/kernel/sleep.S index bebec8ef9372..3e53ffa07994 100644 --- a/arch/arm64/kernel/sleep.S +++ b/arch/arm64/kernel/sleep.S @@ -101,6 +101,7 @@ ENTRY(cpu_resume) bl el2_setup // if in EL2 drop to EL1 cleanly bl __cpu_setup /* enable the MMU early - so we can access sleep_save_stash by va */ + adrp x1, swapper_pg_dir bl __enable_mmu ldr x8, =_cpu_resume br x8 -- 2.17.1