From patchwork Thu Aug 20 10:34:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Scull X-Patchwork-Id: 11726057 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 67C31722 for ; Thu, 20 Aug 2020 10:40:20 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 40DF420639 for ; Thu, 20 Aug 2020 10:40:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="LHPRL35d"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="Lz+c7mxE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 40DF420639 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version:Message-Id: In-Reply-To:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=xUmR9PqUO7Re80d6mz9a6dN+cWaNhnImHZVGCqAtU04=; b=LHPRL35djXflwM7NskocBOZwa s9jBKpT6mvvVBZuid0cCeZ2lCbLGrP4IXOZ58lGmxP1ibh04flphWFy83g/Z/DY4QiUxbrTjjQWNi /uWE+dCcETTPAMEzG2/lPe0VIdS6GZpR5axzwwPY4Oo52CpqSAfaC5DjaemwqrbM51zqzBwVTVTed Gg8hRfr3YNgQdUC/U7IHTGsXjz9+3yWNnEf70ISmaZLJTfFGBJSYswGCPI94FJE4IvfC9ELUiO7Lm e/Wy9WbO9P1h2ZIjXXVfohQrlX6wpxPaL5mWsSxeX0kmbaKcZXACKfjBNLeUC4dmhFR3upecmLhRM fuT7qz9Gg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k8hxK-0003C1-1c; Thu, 20 Aug 2020 10:38:02 +0000 Received: from mail-wr1-x449.google.com ([2a00:1450:4864:20::449]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k8hvK-000295-Es for linux-arm-kernel@lists.infradead.org; Thu, 20 Aug 2020 10:36:00 +0000 Received: by mail-wr1-x449.google.com with SMTP id 89so504492wrr.15 for ; Thu, 20 Aug 2020 03:35:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=74yntT1kxv0J/pTwf0wLv411jMgw/p3nen54ZOSwT/I=; b=Lz+c7mxELafLwoUlrK+Akp/7rdHb7L51hH3TPaVfxdgBIhSUiza+hYlLvu5WLVJfpK bFwWak/4tKuFc4+IttRiCiohCMtWhCZvijxLhYMklXvAc6v11H44hXqCHJPlWErYng2o d25b2Bfoiw733maaNKnyaKObVYfZ2CJSHF9kvsbuCt5NGmS63kZOawr3zpjoBPtP8Icp 3aAtJqPDrztjcEpD/XuGZXuVebqQ8NfZxbBZxujaB/9hKqgt18DSqdozZpRBEACHXeSA ULtkR09bayFTGpDPVcNp5g0Kj4MwJ4P9N20oFjZ98wSPwmpEWJVd9gi7oDPizCZdLc0j IZxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=74yntT1kxv0J/pTwf0wLv411jMgw/p3nen54ZOSwT/I=; b=mYEBOy6IiWEOgA+JRRFZPZJsG77Je9vdWMCfv2/dtrrI1DECKpPaRUwlGq3f3KgX1z JRCLSrexe7wfIXrT3q3s0GwwUK5Iba2OqfECcWzSadq7W5vvnNf7t+LRtxepPGABXCZI zxMHi2rHBd11BTftc1RsWHqs8ADhFNK++xatgSe0DXoGNg7rh9rJtqDtNC2QG+kShFil FXLxNiIi4022LzwRBc7DwB6dWqqNcnUb773SEHpwfMMgPqWExeHgP5zfGEjrZ172tIEC H/qMnHKzHCaJmZ+afJNQyQCG6BrSVMtdZds04sVk65X3v0kRQIIoVYT/1wkuaZOdGx0R F6Ow== X-Gm-Message-State: AOAM533nZOBVPbMlek08ZOQq/tf/nZSNtyTpONq2fz9tbwBPdzy/eJUk M1UBqmcNPlEvUzuKQha/dLG+E0A5pfc= X-Google-Smtp-Source: ABdhPJyXooREtfUVBflBDIpWZ6Vxt5EN9/e5jMZ4iaiI6lNPkYgQor6CWClHFKJILCEcgG/9dfwM2UolGiA= X-Received: from ascull.lon.corp.google.com ([2a00:79e0:d:109:4a0f:cfff:fe4a:6363]) (user=ascull job=sendgmr) by 2002:a05:600c:c3:: with SMTP id u3mr1389280wmm.1.1597919755166; Thu, 20 Aug 2020 03:35:55 -0700 (PDT) Date: Thu, 20 Aug 2020 11:34:42 +0100 In-Reply-To: <20200820103446.959000-1-ascull@google.com> Message-Id: <20200820103446.959000-17-ascull@google.com> Mime-Version: 1.0 References: <20200820103446.959000-1-ascull@google.com> X-Mailer: git-send-email 2.28.0.220.ged08abb693-goog Subject: [PATCH v2 16/20] KVM: arm64: nVHE: Pass pointers consistently to hyp-init From: Andrew Scull To: kvmarm@lists.cs.columbia.edu X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200820_063558_577325_1ADF157B X-CRM114-Status: GOOD ( 12.71 ) X-Spam-Score: -7.7 (-------) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-7.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:449 listed in] [list.dnswl.org] -7.5 USER_IN_DEF_DKIM_WL From: address is in the default DKIM white-list -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.0 DKIMWL_WL_MED DKIMwl.org - Medium sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, kernel-team@android.com, suzuki.poulose@arm.com, maz@kernel.org, Sudeep Holla , james.morse@arm.com, Andrew Scull , catalin.marinas@arm.com, will@kernel.org, julien.thierry.kdev@gmail.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Rather than some being kernel pointer and others being hyp pointers, standardize on all pointers being hyp pointers. Signed-off-by: Andrew Scull --- arch/arm64/kvm/arm.c | 1 + arch/arm64/kvm/hyp/nvhe/hyp-init.S | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 0e3bdb7cb9d0..3f5d00167674 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -1278,6 +1278,7 @@ static void cpu_init_hyp_mode(void) pgd_ptr = kvm_mmu_get_httbr(); hyp_stack_ptr = __this_cpu_read(kvm_arm_hyp_stack_page) + PAGE_SIZE; + hyp_stack_ptr = kern_hyp_va(hyp_stack_ptr); vector_ptr = (unsigned long)kern_hyp_va(kvm_ksym_ref(__kvm_hyp_host_vector)); /* diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-init.S b/arch/arm64/kvm/hyp/nvhe/hyp-init.S index d9434e90c06d..abe885e26fe2 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-init.S +++ b/arch/arm64/kvm/hyp/nvhe/hyp-init.S @@ -114,7 +114,6 @@ alternative_else_nop_endif isb /* Set the stack and new vectors */ - kern_hyp_va x1 mov sp, x1 msr vbar_el2, x2