From: "Suzuki K. Poulose" <Suzuki.Poulose@arm.com>
To: Marc Zyngier <marc.zyngier@arm.com>,
linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, Catalin.Marinas@arm.com,
Will.Deacon@arm.com, Mark.Rutland@arm.com,
kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org,
ard.biesheuvel@linaro.org,
Christoffer Dall <christoffer.dall@linaro.org>
Subject: Re: [PATCH 11/15] arm64: Cleanup VTCR_EL2 computation
Date: Wed, 7 Oct 2015 11:23:04 +0100 [thread overview]
Message-ID: <5614F288.6000901@arm.com> (raw)
In-Reply-To: <5614EFD0.20709@arm.com>
On 07/10/15 11:11, Marc Zyngier wrote:
> On 15/09/15 16:41, Suzuki K. Poulose wrote:
>> From: "Suzuki K. Poulose" <suzuki.poulose@arm.com>
>>
>> diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h
>> index bdf139e..699554d 100644
>> --- a/arch/arm64/include/asm/kvm_arm.h
>> +++ b/arch/arm64/include/asm/kvm_arm.h
>> @@ -138,6 +138,9 @@
>> * The magic numbers used for VTTBR_X in this patch can be found in Tables
>> * D4-23 and D4-25 in ARM DDI 0487A.b.
>> */
>> +#define VTCR_EL2_COMMON_BITS (VTCR_EL2_SH0_INNER | VTCR_EL2_ORGN0_WBWA | \
>> + VTCR_EL2_IRGN0_WBWA | VTCR_EL2_T0SZ_40B)
>> +
>> #ifdef CONFIG_ARM64_64K_PAGES
>> /*
>> * Stage2 translation configuration:
>> @@ -145,9 +148,8 @@
>> * 64kB pages (TG0 = 1)
>> * 2 level page tables (SL = 1)
>> */
>> -#define VTCR_EL2_FLAGS (VTCR_EL2_TG0_64K | VTCR_EL2_SH0_INNER | \
>> - VTCR_EL2_ORGN0_WBWA | VTCR_EL2_IRGN0_WBWA | \
>> - VTCR_EL2_SL0_LVL1 | VTCR_EL2_T0SZ_40B)
>> +#define VTCR_EL2_FLAGS (VTCR_EL2_TG0_64K | VTCR_EL2_SL0_LVL1 | \
>> + VTCR_EL2_COMMON_BITS)
>> #define VTTBR_X (38 - VTCR_EL2_T0SZ_40B)
>> #else
>> /*
>> @@ -156,9 +158,8 @@
>> * 4kB pages (TG0 = 0)
>> * 3 level page tables (SL = 1)
>> */
>> -#define VTCR_EL2_FLAGS (VTCR_EL2_TG0_4K | VTCR_EL2_SH0_INNER | \
>> - VTCR_EL2_ORGN0_WBWA | VTCR_EL2_IRGN0_WBWA | \
>> - VTCR_EL2_SL0_LVL1 | VTCR_EL2_T0SZ_40B)
>> +#define VTCR_EL2_FLAGS (VTCR_EL2_TG0_4K | VTCR_EL2_SL0_LVL1 | \
>> + VTCR_EL2_COMMON_BITS)
>> #define VTTBR_X (37 - VTCR_EL2_T0SZ_40B)
>> #endif
>>
>>
>
> This looks OK, but is going to clash badly with 857d1a9 ("arm64: KVM:
> set {v,}TCR_EL2 RES1 bits"). Nothing we can't fix though.
>
As discussed, I will rebase my series on top of 4.3-rc4 to avoid this.
Thanks
Suzuki
next prev parent reply other threads:[~2015-10-07 10:23 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-15 15:41 [PATCHv2 00/15] arm64: 16K translation granule support Suzuki K. Poulose
2015-09-15 15:41 ` [PATCH 01/15] arm64: Move swapper pagetable definitions Suzuki K. Poulose
2015-09-15 15:41 ` [PATCH 02/15] arm64: Handle section maps for swapper/idmap Suzuki K. Poulose
2015-09-15 15:41 ` [PATCH 03/15] arm64: Introduce helpers for page table levels Suzuki K. Poulose
2015-10-07 8:26 ` Christoffer Dall
2015-10-07 9:26 ` Marc Zyngier
2015-10-07 9:48 ` Suzuki K. Poulose
2015-10-08 14:45 ` Christoffer Dall
2015-10-08 17:22 ` Suzuki K. Poulose
2015-10-08 17:28 ` Catalin Marinas
2015-10-09 9:22 ` Suzuki K. Poulose
2015-10-07 9:51 ` Suzuki K. Poulose
2015-09-15 15:41 ` [PATCH 04/15] arm64: Calculate size for idmap_pg_dir at compile time Suzuki K. Poulose
2015-09-15 15:41 ` [PATCH 05/15] arm64: Handle 4 level page table for swapper Suzuki K. Poulose
2015-09-15 15:41 ` [PATCH 06/15] arm64: Clean config usages for page size Suzuki K. Poulose
2015-09-15 15:41 ` [PATCH 07/15] arm64: Kconfig: Fix help text about AArch32 support with 64K pages Suzuki K. Poulose
2015-09-15 15:41 ` [PATCH 08/15] arm64: Check for selected granule support Suzuki K. Poulose
2015-09-15 15:41 ` [PATCH 09/15] arm64: Add page size to the kernel image header Suzuki K. Poulose
2015-10-02 15:49 ` Catalin Marinas
2015-10-02 16:31 ` Catalin Marinas
2015-10-02 16:50 ` Marc Zyngier
2015-10-05 15:43 ` Christoffer Dall
2015-10-05 13:02 ` Suzuki K. Poulose
2015-10-05 13:22 ` Ard Biesheuvel
2015-10-10 17:22 ` Christoffer Dall
2015-09-15 15:41 ` [PATCH 10/15] arm64: kvm: Fix {V}TCR_EL2_TG0 mask Suzuki K. Poulose
2015-10-08 15:17 ` Christoffer Dall
2015-09-15 15:41 ` [PATCH 11/15] arm64: Cleanup VTCR_EL2 computation Suzuki K. Poulose
2015-10-07 10:11 ` Marc Zyngier
2015-10-07 10:23 ` Suzuki K. Poulose [this message]
2015-10-10 17:22 ` Christoffer Dall
2015-09-15 15:41 ` [PATCH 12/15] arm: kvm: Move fake PGD handling to arch specific files Suzuki K. Poulose
2015-10-07 10:23 ` Marc Zyngier
2015-10-10 17:22 ` Christoffer Dall
2015-09-15 15:41 ` [PATCH 13/15] arm64: kvm: Rewrite fake pgd handling Suzuki K. Poulose
2015-10-07 11:13 ` Marc Zyngier
2015-10-07 12:21 ` Suzuki K. Poulose
2015-10-10 14:52 ` Christoffer Dall
2015-10-12 9:55 ` Suzuki K. Poulose
2015-10-13 15:39 ` Christoffer Dall
2015-10-13 16:04 ` Suzuki K. Poulose
2015-09-15 15:41 ` [PATCH 14/15] arm64: Add 16K page size support Suzuki K. Poulose
2015-09-15 15:41 ` [PATCH 15/15] arm64: 36 bit VA Suzuki K. Poulose
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=5614F288.6000901@arm.com \
--to=suzuki.poulose@arm.com \
--cc=Catalin.Marinas@arm.com \
--cc=Mark.Rutland@arm.com \
--cc=Will.Deacon@arm.com \
--cc=ard.biesheuvel@linaro.org \
--cc=christoffer.dall@linaro.org \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.zyngier@arm.com \
/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).