[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/12] s390x: update R and C bits in storage key
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH 03/12] s390x: update R and C bits in storage key |
Date: |
Mon, 14 Nov 2011 18:06:31 +0100 |
When the s390x maps a page or writes happen to a page, the R and C
bits get updated. The easiest way to implement this in qemu is to
simply update them whenever we map a TLB translation and act according
to the permissions.
Signed-off-by: Alexander Graf <address@hidden>
---
target-s390x/cpu.h | 4 ++++
target-s390x/helper.c | 12 ++++++++++++
target-s390x/op_helper.c | 1 -
3 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h
index e192b50..95abe59 100644
--- a/target-s390x/cpu.h
+++ b/target-s390x/cpu.h
@@ -819,6 +819,10 @@ struct sysib_322 {
#define _PAGE_RO 0x200 /* HW read-only bit */
#define _PAGE_INVALID 0x400 /* HW invalid bit */
+#define SK_C (0x1 << 1)
+#define SK_R (0x1 << 2)
+#define SK_F (0x1 << 3)
+#define SK_ACC_MASK (0xf << 4)
/* EBCDIC handling */
diff --git a/target-s390x/helper.c b/target-s390x/helper.c
index 96dd867..4145104 100644
--- a/target-s390x/helper.c
+++ b/target-s390x/helper.c
@@ -348,6 +348,7 @@ int mmu_translate(CPUState *env, target_ulong vaddr, int
rw, uint64_t asc,
target_ulong *raddr, int *flags)
{
int r = -1;
+ uint8_t *sk;
*flags = PAGE_READ | PAGE_WRITE | PAGE_EXEC;
vaddr &= TARGET_PAGE_MASK;
@@ -390,6 +391,17 @@ out:
*raddr = *raddr + env->psa;
}
+ if (*raddr <= ram_size) {
+ sk = &env->storage_keys[*raddr / TARGET_PAGE_SIZE];
+ if (*flags & PAGE_READ) {
+ *sk |= SK_R;
+ }
+
+ if (*flags & PAGE_WRITE) {
+ *sk |= SK_C;
+ }
+ }
+
return r;
}
diff --git a/target-s390x/op_helper.c b/target-s390x/op_helper.c
index 2f46bdd..440e871 100644
--- a/target-s390x/op_helper.c
+++ b/target-s390x/op_helper.c
@@ -2761,7 +2761,6 @@ uint64_t HELPER(iske)(uint64_t r2)
return 0;
}
- /* XXX maybe use qemu's internal keys? */
return env->storage_keys[addr / TARGET_PAGE_SIZE];
}
--
1.6.0.2
- [Qemu-devel] [PULL 00/12] s390 patch queue 2011-11- 14 1.0, Alexander Graf, 2011/11/14
- [Qemu-devel] [PATCH 07/12] s390: fix short kernel command lines, Alexander Graf, 2011/11/14
- [Qemu-devel] [PATCH 03/12] s390x: update R and C bits in storage key,
Alexander Graf <=
- [Qemu-devel] [PATCH 05/12] s390x: implement SIGP restart and shutdown, Alexander Graf, 2011/11/14
- [Qemu-devel] [PATCH 09/12] s390x: Add shutdown for TCG s390-virtio machine, Alexander Graf, 2011/11/14
- [Qemu-devel] [PATCH 06/12] s390: fix reset hypercall to reset the status, Alexander Graf, 2011/11/14
- [Qemu-devel] [PATCH 08/12] s390: Fix cpu shutdown for KVM, Alexander Graf, 2011/11/14
- [Qemu-devel] [PATCH 12/12] s390x: initialize virtio dev region, Alexander Graf, 2011/11/14
- [Qemu-devel] [PATCH 02/12] s390x: make ipte 31-bit aware, Alexander Graf, 2011/11/14
- [Qemu-devel] [PATCH 01/12] s390x: add ldeb instruction, Alexander Graf, 2011/11/14
- [Qemu-devel] [PATCH 04/12] s390x: implement rrbe instruction properly, Alexander Graf, 2011/11/14
- [Qemu-devel] [PATCH 11/12] tcg: Use TCGReg for standard tcg-target entry points., Alexander Graf, 2011/11/14
- [Qemu-devel] [PATCH 10/12] tcg: Standardize on TCGReg as the enum for hard registers, Alexander Graf, 2011/11/14