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=-10.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 817EBC47425 for ; Tue, 29 Sep 2020 17:46:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 39081208B8 for ; Tue, 29 Sep 2020 17:46:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601401591; bh=Eygb0b3lGWlgqkHSLZz5ftXfR6UVNqbZY53CkkEuGME=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=aKWY3p9P8Q9Brh6S8hIZd+XIpPR/TeAYVZOyKnGSS5ay9Qi+cFpsiW6/yer8qpAH+ KI82wLWoegSlHDrqKQWp9eQ4ztM95JYH78Fck8qAmA8kO1CpXAQlpP+3ndcfOsTft5 xKZtjUuVK4JCaKQCAFZlPFqX+vFC32MmCtdqddBU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730248AbgI2Rq3 (ORCPT ); Tue, 29 Sep 2020 13:46:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:44780 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729113AbgI2Rq0 (ORCPT ); Tue, 29 Sep 2020 13:46:26 -0400 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (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 B1485207F7; Tue, 29 Sep 2020 17:46:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601401585; bh=Eygb0b3lGWlgqkHSLZz5ftXfR6UVNqbZY53CkkEuGME=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=ANSra6H4xGSHUFI7hYAnAt1P73+jiHWeE3tEvS93Fzj96VdhSDsD+vcopQcIBnEj2 njZKuVe2AWaCC63qSJT/rItjjfCKlWU+gpuBoHKnJHy3xWJ5zmaY2qyjFrIBOS/M9L slpvSN2E7Mo9Vf01eUrE3jhf05OCf8mXPaUkBjBw= Received: from disco-boy.misterjones.org ([51.254.78.96] helo=www.loen.fr) by disco-boy.misterjones.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1kNJhn-00FxNf-Tk; Tue, 29 Sep 2020 18:46:24 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Tue, 29 Sep 2020 18:46:23 +0100 From: Marc Zyngier To: Will Deacon Cc: David Brazdil , kvmarm@lists.cs.columbia.edu, Catalin Marinas , James Morse , Julien Thierry , Suzuki K Poulose , Dennis Zhou , Tejun Heo , Christoph Lameter , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com, Andrew Scull Subject: Re: [PATCH v4 05/10] kvm: arm64: Remove hyp_adr/ldr_this_cpu In-Reply-To: <20200929173407.GC14317@willie-the-truck> References: <20200922204910.7265-1-dbrazdil@google.com> <20200922204910.7265-6-dbrazdil@google.com> <20200929173407.GC14317@willie-the-truck> User-Agent: Roundcube Webmail/1.4.8 Message-ID: <2221d6a88c4077b7e0a4ce2ac5f50a45@kernel.org> X-Sender: maz@kernel.org X-SA-Exim-Connect-IP: 51.254.78.96 X-SA-Exim-Rcpt-To: will@kernel.org, dbrazdil@google.com, kvmarm@lists.cs.columbia.edu, catalin.marinas@arm.com, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com, dennis@kernel.org, tj@kernel.org, cl@linux.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com, ascull@google.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2020-09-29 18:34, Will Deacon wrote: > On Tue, Sep 22, 2020 at 09:49:05PM +0100, David Brazdil wrote: >> The hyp_adr/ldr_this_cpu helpers were introduced for use in hyp code >> because they always needed to use TPIDR_EL2 for base, while >> adr/ldr_this_cpu from kernel proper would select between TPIDR_EL2 and >> _EL1 based on VHE/nVHE. >> >> Simplify this now that the hyp mode case can be handled using the >> __KVM_VHE/NVHE_HYPERVISOR__ macros. >> >> Acked-by: Andrew Scull >> Acked-by: Will Deacon >> Signed-off-by: David Brazdil >> --- >> arch/arm64/include/asm/assembler.h | 29 +++++++++++++++++++---------- >> arch/arm64/include/asm/kvm_asm.h | 14 +------------- >> arch/arm64/kvm/hyp/hyp-entry.S | 2 +- >> 3 files changed, 21 insertions(+), 24 deletions(-) >> >> diff --git a/arch/arm64/include/asm/assembler.h >> b/arch/arm64/include/asm/assembler.h >> index 54d181177656..86e0ef79a799 100644 >> --- a/arch/arm64/include/asm/assembler.h >> +++ b/arch/arm64/include/asm/assembler.h >> @@ -218,6 +218,23 @@ lr .req x30 // link register >> str \src, [\tmp, :lo12:\sym] >> .endm >> >> + /* >> + * @dst: destination register (32 or 64 bit wide) > > nit: this comment is wrong as I don't think mrs can take a W register > as the destination argument. I'm assuming Marc can fix that up. Indeed. I'll fix it locally. Another thing is that this patch is going to clash with the Ghostbuster branch (the hyp-entry.S hunk goes), but we can deal with that. M. -- Jazz is not dead. It just smells funny...