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=-7.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 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 8707AC4360F for ; Wed, 3 Apr 2019 10:51:41 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 4FFA920700 for ; Wed, 3 Apr 2019 10:51:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="NNeZ5wlm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4FFA920700 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Subject:To:From:Message-ID:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7Nr/m8zJW2p58Np/yOPEDW5ooh9IxvYA8PDDM/PMNXQ=; b=NNeZ5wlmn6SKsx Rdf1rKGfqVk/3+sMT7Pt6+BQxHgpttcyRukKH2uj08NUKIkurd56nzp6k7QY6y4mpSPwCK4EKTKdP C6nvx/YG7ss48jIn5fF+u4LEBJ8BlmalIiJnL1py2oBuHc5W698ishWzy2FivQQuqcUmDz3gQYZSs ManWgUxOcG60Uxd3PmMUaj7uRvIcuQfKYDeTVFEt91ZtzzlJnqr8YCOsCeBJ7+KtawwwsrGpqQqan tP9Xz/bxgNKwnGOpe7px2den9BXBQ7Q7K0Ra4Bwa5hGRhrPPsP9xczskDAWFPP+p/XloER42Gi26w MwZUUu81A8f5tzirZRJg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hBdUX-0001ck-Cu; Wed, 03 Apr 2019 10:51:37 +0000 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70] helo=foss.arm.com) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hBdUU-0001cQ-4h for linux-arm-kernel@lists.infradead.org; Wed, 03 Apr 2019 10:51:35 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2495E80D; Wed, 3 Apr 2019 03:51:31 -0700 (PDT) Received: from big-swifty.misterjones.org (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E4F503F59C; Wed, 3 Apr 2019 03:51:28 -0700 (PDT) Date: Wed, 03 Apr 2019 11:51:25 +0100 Message-ID: <86sguz4b0y.wl-marc.zyngier@arm.com> From: Marc Zyngier To: Mark Rutland Subject: Re: [PATCH] arm64: clean up has_vhe() In-Reply-To: <20190403084125.4009-1-mark.rutland@arm.com> References: <20190403084125.4009-1-mark.rutland@arm.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 EasyPG/1.0.0 Emacs/26 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) Organization: ARM Ltd MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190403_035134_187798_4156F9AF X-CRM114-Status: GOOD ( 18.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Catalin Marinas , Will Deacon , Christoffer Dall , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, 03 Apr 2019 09:41:25 +0100, Mark Rutland wrote: > > Currently, has_vhe() has a redundant if statement, and unlike other cpucap > helpers, it doesn't check whether the relevant config option (CONFIG_ARM64_VHE) > is enabled, leading to redundant code in some minimal kernel configurations. > > This patches fixes both of these issues. > > Signed-off-by: Mark Rutland > Cc: Catalin Marinas > Cc: Christoffer Dall > Cc: Marc Zyngier > Cc: Will Deacon > --- > arch/arm64/include/asm/virt.h | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/include/asm/virt.h b/arch/arm64/include/asm/virt.h > index 9d1e24e030b3..57d500abdf4f 100644 > --- a/arch/arm64/include/asm/virt.h > +++ b/arch/arm64/include/asm/virt.h > @@ -96,10 +96,8 @@ static inline bool is_kernel_in_hyp_mode(void) > > static inline bool has_vhe(void) > { > - if (cpus_have_const_cap(ARM64_HAS_VIRT_HOST_EXTN)) > - return true; > - > - return false; > + return IS_ENABLED(CONFIG_ARM64_VHE) && > + cpus_have_const_cap(ARM64_HAS_VIRT_HOST_EXTN); > } > > #endif /* __ASSEMBLY__ */ Acked-by: Marc Zyngier M. -- Jazz is not dead, it just smell funny. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel