diff options
author | Alex Williamson <alex.williamson@hp.com> | 2007-07-30 18:14:29 -0600 |
---|---|---|
committer | Alex Williamson <alex.williamson@hp.com> | 2007-07-30 18:14:29 -0600 |
commit | a423930e0d6de08e14864579c58fbe81a735f600 (patch) | |
tree | b2b594fb6147d8c6e936594eeccbb87a0ff157d7 /extras/mini-os/arch | |
parent | 3f0fc7793559318862e25f317223be940fea6f78 (diff) | |
download | xen-a423930e0d6de08e14864579c58fbe81a735f600.tar.gz xen-a423930e0d6de08e14864579c58fbe81a735f600.tar.bz2 xen-a423930e0d6de08e14864579c58fbe81a735f600.zip |
[IA64][MINIOS] PKR support
- adds optimization feature for region 7 identity mapping
- adds protection keys to region 5 and region 7 addresses,
may be used for testing the hypervisor protection key support
Signed-off-by: Dietmar Hahn <dietmar.hahn@fujitsu-siemens.com>
Diffstat (limited to 'extras/mini-os/arch')
-rw-r--r-- | extras/mini-os/arch/ia64/common.c | 21 | ||||
-rw-r--r-- | extras/mini-os/arch/ia64/ia64.S | 14 | ||||
-rw-r--r-- | extras/mini-os/arch/ia64/ivt.S | 4 |
3 files changed, 34 insertions, 5 deletions
diff --git a/extras/mini-os/arch/ia64/common.c b/extras/mini-os/arch/ia64/common.c index 13416d9542..cd4cec1e20 100644 --- a/extras/mini-os/arch/ia64/common.c +++ b/extras/mini-os/arch/ia64/common.c @@ -103,7 +103,8 @@ map_pal_code(void) */ ia64_ptc_l(machineFwG.ia64_pal_base, PTE_PS_16K); ia64_write_itr_i(&pte, IA64_TR_PAL, - (uint64_t) machineFwG.ia64_pal_base, PTE_PS_16K, 0); + (uint64_t)machineFwG.ia64_pal_base, + PTE_PS_16K, IA64_KEY_REG7); xen_set_virtual_psr_ic(1); } @@ -180,6 +181,21 @@ init_boot_params(void) bootverbose = 1; } +static void +set_opt_feature(void) +{ + struct xen_ia64_opt_feature optf; + + optf.cmd = XEN_IA64_OPTF_IDENT_MAP_REG7; + optf.on = XEN_IA64_OPTF_ON; + optf.pgprot = ((1 << PTE_OFF_P) | (1 << PTE_OFF_A) | (1 << PTE_OFF_D) | + (PTE_MA_WB << PTE_OFF_MA) | + (PTE_PL_KERN << PTE_OFF_PL) | + (PTE_AR_RW << PTE_OFF_AR)); + optf.key = IA64_KEY_REG7; + HYPERVISOR_opt_feature(&optf); +} + void arch_init(start_info_t *si) { @@ -213,6 +229,9 @@ arch_init(start_info_t *si) printk("efi_get_time() failed\n"); registerCallback(); + + set_opt_feature(); + initialized = 1; } diff --git a/extras/mini-os/arch/ia64/ia64.S b/extras/mini-os/arch/ia64/ia64.S index 4374c750e7..7ea9433199 100644 --- a/extras/mini-os/arch/ia64/ia64.S +++ b/extras/mini-os/arch/ia64/ia64.S @@ -101,11 +101,21 @@ ENTRY(_start) ;; mov rr[r3]=r2 ;; - + /* + * Setup protection keys for region 5 and 7. + */ + mov r2=(IA64_KEY_REG5 << IA64_PKR_KEY) | IA64_PKR_VALID + mov r3=(IA64_KEY_REG7 << IA64_PKR_KEY) | IA64_PKR_VALID + mov r14=0x1 + ;; + mov pkr[r0]=r2 /* Region 5 */ + mov pkr[r14]=r3 /* Region 7 */ + ;; /* * Now pin mappings into the TLB for kernel text and data */ - mov r18=KERNEL_TR_PAGE_SIZE<<IA64_ITIR_PS + mov r18=(KERNEL_TR_PAGE_SIZE<<IA64_ITIR_PS)| \ + (IA64_KEY_REG5<<IA64_ITIR_KEY) movl r17=KERNEL_START ;; mov cr.itir=r18 diff --git a/extras/mini-os/arch/ia64/ivt.S b/extras/mini-os/arch/ia64/ivt.S index 58ff32559f..79971fef34 100644 --- a/extras/mini-os/arch/ia64/ivt.S +++ b/extras/mini-os/arch/ia64/ivt.S @@ -249,7 +249,7 @@ ENTRY(save_tf_rse_switch) /* xen special handling for possibly lazy cover */ movl r8=XSI_PRECOVER_IFS; ;; - ld8 r21=[r8]; + ld8 r21=[r8] ;; #if defined(BIG_ENDIAN) // swap because mini-os is in BE mux1 r21=r21,@rev @@ -771,7 +771,7 @@ adt_reg7_addr: * addresses. Currently I don't do a check. */ movl r20=~((7 << IA64_RR_IDX_POS) | 0xfff) - movl r18=((PTE_PS_16K<<IA64_ITIR_PS)|(0<<IA64_ITIR_KEY)) + movl r18=((PTE_PS_16K<<IA64_ITIR_PS)|(IA64_KEY_REG7<<IA64_ITIR_KEY)) ;; movl r19= ((1<<PTE_OFF_P) | (PTE_MA_WB<<PTE_OFF_MA) | \ (1<<PTE_OFF_A) | (1<<PTE_OFF_D) | \ |