Browse Source

cputlb: Byte swap memory transaction attribute

Notice new attribute, byte swap, and force the transaction through the
memory slow path.

Required by architectures that can invert endianness of memory
transaction, e.g. SPARC64 has the Invert Endian TTE bit.

Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Tony Nguyen <tony.nguyen@bt.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <2a10a1f1c00a894af1212c8f68ef09c2966023c1.1566466906.git.tony.nguyen@bt.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Tony Nguyen 6 years ago
parent
commit
a26fc6f515
2 changed files with 14 additions and 0 deletions
  1. 12 0
      accel/tcg/cputlb.c
  2. 2 0
      include/exec/memattrs.h

+ 12 - 0
accel/tcg/cputlb.c

@@ -738,6 +738,10 @@ void tlb_set_page_with_attrs(CPUState *cpu, target_ulong vaddr,
          */
          */
         address |= TLB_RECHECK;
         address |= TLB_RECHECK;
     }
     }
+    if (attrs.byte_swap) {
+        /* Force the access through the I/O slow path.  */
+        address |= TLB_MMIO;
+    }
     if (!memory_region_is_ram(section->mr) &&
     if (!memory_region_is_ram(section->mr) &&
         !memory_region_is_romd(section->mr)) {
         !memory_region_is_romd(section->mr)) {
         /* IO memory case */
         /* IO memory case */
@@ -891,6 +895,10 @@ static uint64_t io_readx(CPUArchState *env, CPUIOTLBEntry *iotlbentry,
     bool locked = false;
     bool locked = false;
     MemTxResult r;
     MemTxResult r;
 
 
+    if (iotlbentry->attrs.byte_swap) {
+        op ^= MO_BSWAP;
+    }
+
     section = iotlb_to_section(cpu, iotlbentry->addr, iotlbentry->attrs);
     section = iotlb_to_section(cpu, iotlbentry->addr, iotlbentry->attrs);
     mr = section->mr;
     mr = section->mr;
     mr_offset = (iotlbentry->addr & TARGET_PAGE_MASK) + addr;
     mr_offset = (iotlbentry->addr & TARGET_PAGE_MASK) + addr;
@@ -933,6 +941,10 @@ static void io_writex(CPUArchState *env, CPUIOTLBEntry *iotlbentry,
     bool locked = false;
     bool locked = false;
     MemTxResult r;
     MemTxResult r;
 
 
+    if (iotlbentry->attrs.byte_swap) {
+        op ^= MO_BSWAP;
+    }
+
     section = iotlb_to_section(cpu, iotlbentry->addr, iotlbentry->attrs);
     section = iotlb_to_section(cpu, iotlbentry->addr, iotlbentry->attrs);
     mr = section->mr;
     mr = section->mr;
     mr_offset = (iotlbentry->addr & TARGET_PAGE_MASK) + addr;
     mr_offset = (iotlbentry->addr & TARGET_PAGE_MASK) + addr;

+ 2 - 0
include/exec/memattrs.h

@@ -37,6 +37,8 @@ typedef struct MemTxAttrs {
     unsigned int user:1;
     unsigned int user:1;
     /* Requester ID (for MSI for example) */
     /* Requester ID (for MSI for example) */
     unsigned int requester_id:16;
     unsigned int requester_id:16;
+    /* Invert endianness for this page */
+    unsigned int byte_swap:1;
     /*
     /*
      * The following are target-specific page-table bits.  These are not
      * The following are target-specific page-table bits.  These are not
      * related to actual memory transactions at all.  However, this structure
      * related to actual memory transactions at all.  However, this structure