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=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable 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 75BB4C433E0 for ; Tue, 9 Mar 2021 14:08:08 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 EC2FE651C7 for ; Tue, 9 Mar 2021 14:08:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EC2FE651C7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+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=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:Cc: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=rSVfDuWSVpWfFyTnzVhVO32nzDUackEBvmQzjT5wlYQ=; b=VUvv4J+fpVs2fpf2I2pNJH5Nn r2hcfGotc98IpRc5eRoKNZDnyNK3tPAk7WRL6NLlGcb2bOWFiFkuWZULYVjmRjp2XZ0WYOaY09K0m JR11IYmxeEh7GAD89wSHzF93Dq94BMPRaLRkDmhrBkMbX6rWbP+IR5rHJYEJu/zBljqEIht1ccExZ AbnRjaNXHVfQoWh0mQvr8HdKy8QmjRn4TJ68P9leD5LpnTTXNaMf42mKiVoNfgEohcP5OKWlDDFU8 2ZunVecRc5cDvXJtJdcuDtsuGYijYAv4ZJk1ACw3OoOVOUq4/fO5gvPvjAgI8JHMnvMKQSebfWdNS zJHFnxPkA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lJczW-004nyC-7K; Tue, 09 Mar 2021 14:05:42 +0000 Received: from mail.kernel.org ([198.145.29.99]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lJczO-004nxb-NT for linux-arm-kernel@lists.infradead.org; Tue, 09 Mar 2021 14:05:40 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5F345651BC; Tue, 9 Mar 2021 14:05:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1615298733; bh=TXFyWZPHheQTfjIK2kd6LjPJ24kLhlnsvHPduOP6/pU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ljqk/HLJGPqAhnbVLxuJBVYmpA3a/gpakTeq2jSnDfJ4ODGdfxPGQoZkLaRF8sLkX Z9LdSoLOdtnXDqR/YOsaNmyVl/a9Gm2EpeYcDjd2aKANAEDAz64S491ZBim6sE9dBf 0wNnv/yVQBXxniz3XssTBHpJvwPZlZbu6cz4ELcWDx2sBT7MnVLvr1JJGfBNr0hb4S xEz6zMdOtFIVEZul/a/vuR7ctRHq5TVbcAo/Ds5L9eReHIYgYFIRRgfxXHbQbWflkQ CtG6CXy7+VFTozFwYVmqvfuLSm97ATpF+MEqLyZDRHG+75XuXt3BEnBAV1RfIhtNR2 58HMKLQGgb50w== Date: Tue, 9 Mar 2021 14:05:28 +0000 From: Will Deacon To: Marc Zyngier Cc: Anshuman Khandual , linux-arm-kernel@lists.infradead.org, James Morse , Catalin Marinas , Suzuki K Poulose , Ard Biesheuvel , Mark Rutland , kvmarm@lists.cs.columbia.edu, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] arm64/mm: Fix __enable_mmu() for new TGRAN range values Message-ID: <20210309140527.GB28395@willie-the-truck> References: <1614954969-14338-1-git-send-email-anshuman.khandual@arm.com> <8735x5zozr.wl-maz@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <8735x5zozr.wl-maz@kernel.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210309_140534_993225_7FF945F9 X-CRM114-Status: GOOD ( 16.56 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Mar 08, 2021 at 02:42:00PM +0000, Marc Zyngier wrote: > On Fri, 05 Mar 2021 14:36:09 +0000, > Anshuman Khandual wrote: > > - switch (cpuid_feature_extract_unsigned_field(mmfr0, tgran_2)) { > > - default: > > - case 1: > > + tgran_2 = cpuid_feature_extract_unsigned_field(mmfr0, tgran_2_shift); > > + if (tgran_2 == ID_AA64MMFR0_TGRAN_2_SUPPORTED_NONE) { > > kvm_err("PAGE_SIZE not supported at Stage-2, giving up\n"); > > return -EINVAL; > > - case 0: > > + } else if (tgran_2 == ID_AA64MMFR0_TGRAN_2_SUPPORTED_DEFAULT) { > > kvm_debug("PAGE_SIZE supported at Stage-2 (default)\n"); > > - break; > > - case 2: > > + } else if (tgran_2 >= ID_AA64MMFR0_TGRAN_2_SUPPORTED_MIN && > > + tgran_2 <= ID_AA64MMFR0_TGRAN_2_SUPPORTED_MAX) { > > kvm_debug("PAGE_SIZE supported at Stage-2 (advertised)\n"); > > - break; > > + } else { > > + kvm_err("Unsupported value, giving up\n"); > > + return -EINVAL; > > nit: this doesn't say *what* value is unsupported, and I really > preferred the switch-case version, such as this: > > diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c > index 1f22b36a0eff..d267e4b1aec6 100644 > --- a/arch/arm64/kvm/reset.c > +++ b/arch/arm64/kvm/reset.c > @@ -312,15 +312,18 @@ int kvm_set_ipa_limit(void) > > switch (cpuid_feature_extract_unsigned_field(mmfr0, tgran_2)) { > default: > - case 1: > + case ID_AA64MMFR0_TGRAN_2_SUPPORTED_NONE: > kvm_err("PAGE_SIZE not supported at Stage-2, giving up\n"); > return -EINVAL; > - case 0: > + case ID_AA64MMFR0_TGRAN_2_SUPPORTED_DEFAULT: > kvm_debug("PAGE_SIZE supported at Stage-2 (default)\n"); > break; > - case 2: > + case ID_AA64MMFR0_TGRAN_2_SUPPORTED_MIN ... ID_AA64MMFR0_TGRAN_2_SUPPORTED_MAX: > kvm_debug("PAGE_SIZE supported at Stage-2 (advertised)\n"); > break; > + default: > + kvm_err("Unsupported value for TGRAN_2, giving up\n"); > + return -EINVAL; > } > > kvm_ipa_limit = id_aa64mmfr0_parange_to_phys_shift(parange); > > > Otherwise: > > Acked-by: Marc Zyngier Anshuman -- please can you spin a v2 with the switch syntax as suggested above by Marc? Will _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel