qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Andrew Jones <drjones@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org
Subject: [Qemu-devel] [PATCH 2/5] target-arm: enable get_rw_prot to take simple AP
Date: Thu, 12 Feb 2015 16:05:04 +0100	[thread overview]
Message-ID: <1423753507-30542-3-git-send-email-drjones@redhat.com> (raw)
In-Reply-To: <1423753507-30542-1-git-send-email-drjones@redhat.com>

Teach get_rw_prot about the simple AP format AP[2:1]. An additional
switch was added, as opposed to converting ap := AP[2:1] to AP[2:0]
with a simple shift - and then modifying cases 0,2,4,6, because the
resulting code is easier to read with the switch.

Signed-off-by: Andrew Jones <drjones@redhat.com>
---
 target-arm/helper.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/target-arm/helper.c b/target-arm/helper.c
index 610f305c4d661..b63ec7b7979f9 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -4698,12 +4698,32 @@ static inline bool regime_is_user(CPUARMState *env, ARMMMUIdx mmu_idx)
 static inline int get_rw_prot(CPUARMState *env, ARMMMUIdx mmu_idx,
                               int ap, int domain_prot)
 {
+    bool simple_ap = regime_using_lpae_format(env, mmu_idx)
+                         || (regime_sctlr(env, mmu_idx) & SCTLR_AFE);
+    bool domain_prot_valid = !regime_using_lpae_format(env, mmu_idx);
     bool is_user = regime_is_user(env, mmu_idx);
 
-    if (domain_prot == 3) {
+    if (domain_prot_valid && domain_prot == 3) {
         return PAGE_READ | PAGE_WRITE;
     }
 
+    /* ap is AP[2:1] */
+    if (simple_ap) {
+        switch (ap) {
+        case 0:
+            return is_user ? 0 : PAGE_READ | PAGE_WRITE;
+        case 1:
+            return PAGE_READ | PAGE_WRITE;
+        case 2:
+            return is_user ? 0 : PAGE_READ;
+        case 3:
+            return PAGE_READ;
+        default:
+            g_assert_not_reached();
+        }
+    }
+
+    /* ap is AP[2:0] */
     switch (ap) {
     case 0:
         if (arm_feature(env, ARM_FEATURE_V7)) {
-- 
1.9.3

  parent reply	other threads:[~2015-02-12 15:05 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-12 15:05 [Qemu-devel] [PATCH 0/5] tcg-arm: LPAE: fix and extend xn control Andrew Jones
2015-02-12 15:05 ` [Qemu-devel] [PATCH 1/5] target-arm: convert check_ap to get_rw_prot Andrew Jones
2015-03-10 15:07   ` Peter Maydell
2015-03-10 15:17     ` Peter Maydell
2015-03-10 15:12   ` Peter Maydell
2015-03-10 15:52     ` Andrew Jones
2015-02-12 15:05 ` Andrew Jones [this message]
2015-03-10 15:22   ` [Qemu-devel] [PATCH 2/5] target-arm: enable get_rw_prot to take simple AP Peter Maydell
2015-03-10 16:32     ` Andrew Jones
2015-03-10 16:41       ` Peter Maydell
2015-03-10 16:57         ` Andrew Jones
2015-02-12 15:05 ` [Qemu-devel] [PATCH 3/5] target-arm: add an is_user param to get_rw_prot Andrew Jones
2015-02-12 15:05 ` [Qemu-devel] [PATCH 4/5] target-arm: get_phys_addr_lpae: more xn control Andrew Jones
2015-02-12 17:44   ` Andrew Jones
2015-03-10 15:56   ` Peter Maydell
2015-03-10 16:48     ` Andrew Jones
2015-03-10 16:55       ` Peter Maydell
2015-03-10 17:02         ` Andrew Jones
2015-03-10 17:14           ` Peter Maydell
2015-03-10 17:28             ` Andrew Jones
2015-03-10 17:38               ` Peter Maydell
2015-03-11 10:37   ` Andrew Jones
2015-02-12 15:05 ` [Qemu-devel] [PATCH 5/5] target-arm: apply get_S1prot to get_phys_addr_v6 Andrew Jones
2015-02-12 17:08   ` Andrew Jones
2015-03-10 15:57     ` Peter Maydell
2015-03-10 16:54       ` Andrew Jones
2015-03-10 17:03         ` Peter Maydell
2015-03-10 17:08           ` Andrew Jones
2015-02-24 15:06 ` [Qemu-devel] [PATCH 0/5] tcg-arm: LPAE: fix and extend xn control Andrew Jones
2015-02-24 15:08   ` Peter Maydell
2015-02-24 15:14     ` Andrew Jones

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=1423753507-30542-3-git-send-email-drjones@redhat.com \
    --to=drjones@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.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).