Skip to contentSkip to conversation

Revert "ast-g5: deactivate vbar (for qemu)"

PATCH Applied Cédric Le Goater 2 participants 4 messages Oct 10, 2017 – Oct 20, 2017 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "ast-g5: deactivate vbar (for qemu)"

This reverts commit a0ca4ecbeae4ae9632ebc67bf5318dd2ea09c94f.

Support was added to QEMU in :

commit 91db4642f868 ("target-arm: Add VBAR support to ARM1176 CPUs")

The work around happens to crash the guest when the vector relocation is done, with ignore_memory_transaction_failures=false which is now the default in QEMU.

---
 arch/arm/lib/relocate.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/lib/relocate.S +1 -1
index 33bcff41ac30..475d503dd9df 100644
@@ -35,7 +35,7 @@ ENTRY(relocate_vectors)
 	ldr	r1, =V7M_SCB_BASE
 	str	r0, [r1, V7M_SCB_VTOR]
 #else
-#if defined(CONFIG_HAS_VBAR) && !defined(CONFIG_ARCH_AST2500)
+#ifdef CONFIG_HAS_VBAR
 	/*
 	 * If the ARM processor has the security extensions,
 	 * use VBAR to relocate the exception vectors.
Signature · 1 line
2.13.6
#1 lore raw
Quoted 9 lines · Cédric Le Goater

This reverts commit a0ca4ecbeae4ae9632ebc67bf5318dd2ea09c94f.
Support was added to QEMU in :

commit 91db4642f868 ("target-arm: Add VBAR support to ARM1176 CPUs")
The work around happens to crash the guest when the vector relocation is done, with ignore_memory_transaction_failures=false which is now the default in QEMU.

You need a Signed-off-by here. Can you reply with one? Hopefully patchwork will pick it up.

Cheers,

Andrew

Quoted 17 lines

---
 arch/arm/lib/relocate.S | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/lib/relocate.S +0 -0
index 33bcff41ac30..475d503dd9df 100644
@@ -35,7 +35,7 @@ ENTRY(relocate_vectors)

  ldr r1, =V7M_SCB_BASE
  str r0, [r1, V7M_SCB_VTOR]
 #else

arch/arm/lib/relocate.S +1 -1
-#if defined(CONFIG_HAS_VBAR) && !defined(CONFIG_ARCH_AST2500)
+#ifdef CONFIG_HAS_VBAR

  /*
   * If the ARM processor has the security extensions,
   * use VBAR to relocate the exception vectors.

#2 lore raw
Quoted 11 lines · Andrew Jeffery
Quoted 9 lines · Cédric Le Goater

This reverts commit a0ca4ecbeae4ae9632ebc67bf5318dd2ea09c94f.
Support was added to QEMU in :

commit 91db4642f868 ("target-arm: Add VBAR support to ARM1176 CPUs")
The work around happens to crash the guest when the vector relocation is done, with ignore_memory_transaction_failures=false which is now the default in QEMU.

Quoted 2 lines

You need a Signed-off-by here. Can you reply with one? Hopefully patchwork will pick it up.

Ah I missed that doing the revert.

C.

Quoted 21 lines

Cheers,

Andrew

Quoted 17 lines

---
 arch/arm/lib/relocate.S | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/lib/relocate.S +0 -0
index 33bcff41ac30..475d503dd9df 100644
@@ -35,7 +35,7 @@ ENTRY(relocate_vectors)

  ldr r1, =V7M_SCB_BASE
  str r0, [r1, V7M_SCB_VTOR]
 #else

arch/arm/lib/relocate.S +1 -1
-#if defined(CONFIG_HAS_VBAR) && !defined(CONFIG_ARCH_AST2500)
+#ifdef CONFIG_HAS_VBAR

  /*
   * If the ARM processor has the security extensions,
   * use VBAR to relocate the exception vectors.

#3 lore raw
In reply to Cédric Le Goater
Quoted 9 lines · Cédric Le Goater

This reverts commit a0ca4ecbeae4ae9632ebc67bf5318dd2ea09c94f.

Support was added to QEMU in :

commit 91db4642f868 ("target-arm: Add VBAR support to ARM1176 CPUs")

The work around happens to crash the guest when the vector relocation is done, with ignore_memory_transaction_failures=false which is now the default in QEMU.

Applied to v2016.07-aspeed-openbmc with the Signed-off-by.

Cheers,

Andrew

Quoted 17 lines

---
 arch/arm/lib/relocate.S | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/lib/relocate.S +0 -0
index 33bcff41ac30..475d503dd9df 100644
@@ -35,7 +35,7 @@ ENTRY(relocate_vectors)
Quoted 2 lines
Quoted 2 lines

  ldr r1, =V7M_SCB_BASE
  str r0, [r1, V7M_SCB_VTOR]

 #else

arch/arm/lib/relocate.S +1 -1
-#if defined(CONFIG_HAS_VBAR) && !defined(CONFIG_ARCH_AST2500)
+#ifdef CONFIG_HAS_VBAR
Quoted 3 lines

  /*
   * If the ARM processor has the security extensions,
   * use VBAR to relocate the exception vectors.