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=-8.5 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,USER_AGENT_MUTT 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 CB68FC4360F for ; Wed, 3 Apr 2019 11:44:02 +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 958652084B for ; Wed, 3 Apr 2019 11:44:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="lMKF+TMC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 958652084B 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:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=HOireEDmLLW411gHH6f3Vf4QVsUeSdOA8o+FwzYFmBE=; b=lMKF+TMC7cESP/ FVgeJ0kXjT1qn/BUpuqU7NwYKdmlBfESRd7rfDVsca4eAVczQYNG0FezzHB7/D0HKgU1Rukjd94SK 97QkijNSsJsjHVg0C7h8pSAlRUi7xz64wd/tgKABTw8XDjhCFi42Sdzb20r+qNiKJt0jjCWgH6xSI caD8T8hwDEXAg/9ey35e+Dy/dLlfm6KnHVvb7HtmQMtHVpVw4uRtzXui9151P7rAXx3PK7M8+AjUY F+Z/IeHMxY6B+6aPFv/nFIQIV+g0KvWZ4lNLKgH3OGvlqxWJrDsgfHeIq5K+Uefg1u9kEzkVqmV1o qB/UHbDsNYA3Hidp7mXQ==; 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 1hBeJC-0007YB-9K; Wed, 03 Apr 2019 11:43:58 +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 1hBeJ9-0007Xm-Eu for linux-arm-kernel@lists.infradead.org; Wed, 03 Apr 2019 11:43:56 +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 A7BF180D; Wed, 3 Apr 2019 04:43:52 -0700 (PDT) Received: from localhost (e113682-lin.copenhagen.arm.com [10.32.144.41]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 180123F59C; Wed, 3 Apr 2019 04:43:51 -0700 (PDT) Date: Wed, 3 Apr 2019 13:43:50 +0200 From: Christoffer Dall To: Mark Rutland Subject: Re: [PATCH] arm64: clean up has_vhe() Message-ID: <20190403114350.GA7810@e113682-lin.lund.arm.com> References: <20190403084125.4009-1-mark.rutland@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190403084125.4009-1-mark.rutland@arm.com> User-Agent: Mutt/1.5.24 (2015-08-30) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190403_044355_504748_2B831B90 X-CRM114-Status: GOOD ( 17.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: Marc Zyngier , Catalin Marinas , Will Deacon , 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, Apr 03, 2019 at 09:41:25AM +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: Christoffer Dall _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel