[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Xen-devel] [PATCH 6/6] xen: arm: Ensure HCR_EL2.RW is set correctly when building dom0
On 10/10/2013 03:43 PM, Ian Campbell wrote:
copy_to_user and friends rely on this, since the address transalation
functions (guest VA -> MFN) will truncate VA to the appropriate size.
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Julien Grall <julien.grall@xxxxxxxxxx>
---
xen/arch/arm/domain_build.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index fb1fa56..e3ea3f0 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -875,6 +875,13 @@ int construct_dom0(struct domain *d)
/* The following loads use the domain's p2m */
p2m_load_VTTBR(d);
+#ifdef CONFIG_ARM_64
+ d->arch.type = kinfo.type;
+ if ( is_pv32_domain(d) )
+ WRITE_SYSREG(READ_SYSREG(HCR_EL2) & ~HCR_RW, HCR_EL2);
+ else
+ WRITE_SYSREG(READ_SYSREG(HCR_EL2) | HCR_RW, HCR_EL2);
+#endif
kernel_load(&kinfo);
dtb_load(&kinfo);
@@ -888,9 +895,6 @@ int construct_dom0(struct domain *d)
regs->pc = (register_t)kinfo.entry;
-#ifdef CONFIG_ARM_64
- d->arch.type = kinfo.type;
-#endif
if ( is_pv32_domain(d) )
{
--
Julien Grall
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
