armv7a_mmu: Check earlier for PAR read

Check earlier that the read of the PAR register was successful instead of starting the decoding and then checking for an error reading that register. Change-Id: Id96c2b2f76d2d1c745fcfa55ad4c1e6db92106f9 Signed-off-by: Florian Fainelli <[email protected]> Reviewed-on: http:https://openocd.zylin.com/5215 Tested-by: jenkins Reviewed-by: Antonio Borneo <[email protected]> Reviewed-by: Matthias Welwarsky <[email protected]>
lobaro · Jun 12, 2019 · ba11adb · ba11adb
1 parent 6f87df8
commit ba11adb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/target/armv7a_mmu.c b/src/target/armv7a_mmu.c
@@ -143,14 +143,14 @@ int armv7a_mmu_translate_va_pa(struct target *target, uint32_t va,
  retval = dpm->instr_read_data_r0(dpm,
  ARMV4_5_MRC(15, 0, 0, 7, 4, 0),
  val);
+ if (retval != ERROR_OK)
+ goto done;
  /* decode memory attribute */
  NOS = (*val >> 10) & 1; /* Not Outer shareable */
  NS = (*val >> 9) & 1; /* Non secure */
  INNER = (*val >> 4) & 0x7;
  OUTER = (*val >> 2) & 0x3;
 
- if (retval != ERROR_OK)
- goto done;
  *val = (*val & ~0xfff) + (va & 0xfff);
  if (meminfo) {
  LOG_INFO("%" PRIx32 " : %" PRIx32 " %s outer shareable %s secured",