From patchwork Mon Mar 16 12:55:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 45847 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CEF2D21547 for ; Mon, 16 Mar 2015 12:57:23 +0000 (UTC) Received: by lbdu14 with SMTP id u14sf26513317lbd.3 for ; Mon, 16 Mar 2015 05:57:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list; bh=X5RmBZDxYvtlzXebNcFdGTUP7ENxOF6qFSjmoCzAbgw=; b=kViP7D1abNkE2Kc9SOuyL8eoePCMm3fznta6H1r4+Rn/do4ppz7XbrZEgy0TI86lp1 Yp3+AV9crGjqY1448O24ie/W7uYxwABdYXH5htwPOCFRhwBIO5B0eylEe50eS3MMJsxI ixS53CC22vf/O49Zzja0Hydn7jxR63JmZGUhaokU+XUyJR0yIe7EkEPswrA1jpoji2pT dyajhPO0VZDRhg04tEKIICJe4rTigscpnkHE8vRj3qR8krLYgtrkcct1hJlCqhp+kiTf NmoNplEBfbCCBdnFLZd4eZHCwVJAvCfp45C7sm+S/11zuEimDBzTx0Zyr1u7kim8OTmf pdXQ== X-Gm-Message-State: ALoCoQn/GgvVdXBR8tDs4S5uPnkmkj72ZomH3ZZuYjhu9s3DZXzs8UGWeqIj1F7V6CeEXQHiS1m0 X-Received: by 10.112.44.167 with SMTP id f7mr6766233lbm.9.1426510642556; Mon, 16 Mar 2015 05:57:22 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.36 with SMTP id n4ls576300laj.27.gmail; Mon, 16 Mar 2015 05:57:22 -0700 (PDT) X-Received: by 10.152.37.69 with SMTP id w5mr55301657laj.15.1426510642213; Mon, 16 Mar 2015 05:57:22 -0700 (PDT) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id lz7si4822523lbb.73.2015.03.16.05.57.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Mar 2015 05:57:22 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by lamx15 with SMTP id x15so38968750lam.3 for ; Mon, 16 Mar 2015 05:57:22 -0700 (PDT) X-Received: by 10.112.212.106 with SMTP id nj10mr36349203lbc.36.1426510642060; Mon, 16 Mar 2015 05:57:22 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp2564294lbj; Mon, 16 Mar 2015 05:57:21 -0700 (PDT) X-Received: by 10.202.209.130 with SMTP id i124mr10338502oig.108.1426510640474; Mon, 16 Mar 2015 05:57:20 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id f4si22446326pas.112.2015.03.16.05.57.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Mar 2015 05:57:20 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YXUYq-0004CT-Ur; Mon, 16 Mar 2015 12:56:00 +0000 Received: from mail-la0-f47.google.com ([209.85.215.47]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YXUYG-0002vV-BJ for linux-arm-kernel@lists.infradead.org; Mon, 16 Mar 2015 12:55:25 +0000 Received: by lagg8 with SMTP id g8so38890447lag.1 for ; Mon, 16 Mar 2015 05:55:01 -0700 (PDT) X-Received: by 10.112.154.163 with SMTP id vp3mr30565133lbb.93.1426510501756; Mon, 16 Mar 2015 05:55:01 -0700 (PDT) Received: from localhost.localdomain (188-178-240-98-static.dk.customer.tdc.net. [188.178.240.98]) by mx.google.com with ESMTPSA id a10sm2183013lbk.12.2015.03.16.05.54.58 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Mar 2015 05:55:00 -0700 (PDT) From: Christoffer Dall To: Paolo Bonzini , Marcelo Tosatti Subject: [GIT PULL 3/5] arm64: KVM: Fix outdated comment about VTCR_EL2.PS Date: Mon, 16 Mar 2015 13:55:01 +0100 Message-Id: <1426510503-27995-4-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.1.2.330.g565301e.dirty In-Reply-To: <1426510503-27995-1-git-send-email-christoffer.dall@linaro.org> References: <1426510503-27995-1-git-send-email-christoffer.dall@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150316_055524_613698_E2A30075 X-CRM114-Status: UNSURE ( 8.75 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.215.47 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.215.47 listed in wl.mailspike.net] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: linux-arm-kernel@lists.infradead.org, Marc Zyngier , Christoffer Dall , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: christoffer.dall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Marc Zyngier Commit 87366d8cf7b3 ("arm64: Add boot time configuration of Intermediate Physical Address size") removed the hardcoded setting of VTCR_EL2.PS to use ID_AA64MMFR0_EL1.PARange instead, but didn't remove the (now rather misleading) comment. Fix the comments to match reality (at least for the next few minutes). Acked-by: Christoffer Dall Signed-off-by: Marc Zyngier Signed-off-by: Christoffer Dall --- arch/arm64/include/asm/kvm_arm.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h index 94674eb..54bb4ba 100644 --- a/arch/arm64/include/asm/kvm_arm.h +++ b/arch/arm64/include/asm/kvm_arm.h @@ -129,6 +129,9 @@ * 40 bits wide (T0SZ = 24). Systems with a PARange smaller than 40 bits are * not known to exist and will break with this configuration. * + * VTCR_EL2.PS is extracted from ID_AA64MMFR0_EL1.PARange at boot time + * (see hyp-init.S). + * * Note that when using 4K pages, we concatenate two first level page tables * together. * @@ -138,7 +141,6 @@ #ifdef CONFIG_ARM64_64K_PAGES /* * Stage2 translation configuration: - * 40bits output (PS = 2) * 40bits input (T0SZ = 24) * 64kB pages (TG0 = 1) * 2 level page tables (SL = 1) @@ -150,7 +152,6 @@ #else /* * Stage2 translation configuration: - * 40bits output (PS = 2) * 40bits input (T0SZ = 24) * 4kB pages (TG0 = 0) * 3 level page tables (SL = 1)