From: christoffer.dall@linaro.org (Christoffer Dall)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 3/5] arm64: KVM: Fix outdated comment about VTCR_EL2.PS
Date: Mon, 16 Mar 2015 13:55:01 +0100 [thread overview]
Message-ID: <1426510503-27995-4-git-send-email-christoffer.dall@linaro.org> (raw)
In-Reply-To: <1426510503-27995-1-git-send-email-christoffer.dall@linaro.org>
From: Marc Zyngier <marc.zyngier@arm.com>
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 <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
---
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)
--
2.1.2.330.g565301e.dirty
next prev parent reply other threads:[~2015-03-16 12:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-16 12:54 [GIT PULL 0/5] arm/arm64: KVM: Fixes for KVM for 4.0-rc5 Christoffer Dall
2015-03-16 12:54 ` [GIT PULL 1/5] arm64: KVM: Fix stage-2 PGD allocation to have per-page refcounting Christoffer Dall
2015-03-16 12:55 ` [GIT PULL 2/5] arm64: KVM: Do not use pgd_index to index stage-2 pgd Christoffer Dall
2015-03-16 12:55 ` Christoffer Dall [this message]
2015-03-16 12:55 ` [GIT PULL 4/5] arm/arm64: KVM: fix missing unlock on error in kvm_vgic_create() Christoffer Dall
2015-03-16 12:55 ` [GIT PULL 5/5] arm/arm64: KVM: Keep elrsr/aisr in sync with software model Christoffer Dall
2015-04-07 16:14 ` [GIT PULL 0/5] arm/arm64: KVM: Fixes for KVM for 4.0-rc5 Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1426510503-27995-4-git-send-email-christoffer.dall@linaro.org \
--to=christoffer.dall@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).