target/ppc: Fix wrong number of UAMR register

[Qemu-devel] [PATCH] target/ppc: Fix wrong number of UAMR register

Thomas Huth posted 1 patch 7 years, 1 month ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/1489003123-3641-1-git-send-email-thuth@redhat.com

Test checkpatch passed

Test docker passed

target/ppc/cpu.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[Qemu-devel] [PATCH] target/ppc: Fix wrong number of UAMR register

Posted by Thomas Huth 7 years, 1 month ago

The SPR UAMR has the number 13, and not 12. (Fortunately it seems like
Linux is not using this register yet - only the privileged version with
number 29 ... that's why nobody noticed this problem yet)

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 target/ppc/cpu.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index 7c4a1f5..5ee33b3 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -1408,7 +1408,7 @@ int ppc_compat_max_threads(PowerPCCPU *cpu);
 #define SPR_601_UDECR         (0x006)
 #define SPR_LR                (0x008)
 #define SPR_CTR               (0x009)
-#define SPR_UAMR              (0x00C)
+#define SPR_UAMR              (0x00D)
 #define SPR_DSCR              (0x011)
 #define SPR_DSISR             (0x012)
 #define SPR_DAR               (0x013) /* DAE for PowerPC 601 */
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH] target/ppc: Fix wrong number of UAMR register

Posted by David Gibson 7 years, 1 month ago

On Wed, Mar 08, 2017 at 08:58:43PM +0100, Thomas Huth wrote:
> The SPR UAMR has the number 13, and not 12. (Fortunately it seems like
> Linux is not using this register yet - only the privileged version with
> number 29 ... that's why nobody noticed this problem yet)
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  target/ppc/cpu.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to ppc-for-2.9, thanks.

> 
> diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
> index 7c4a1f5..5ee33b3 100644
> --- a/target/ppc/cpu.h
> +++ b/target/ppc/cpu.h
> @@ -1408,7 +1408,7 @@ int ppc_compat_max_threads(PowerPCCPU *cpu);
>  #define SPR_601_UDECR         (0x006)
>  #define SPR_LR                (0x008)
>  #define SPR_CTR               (0x009)
> -#define SPR_UAMR              (0x00C)
> +#define SPR_UAMR              (0x00D)
>  #define SPR_DSCR              (0x011)
>  #define SPR_DSISR             (0x012)
>  #define SPR_DAR               (0x013) /* DAE for PowerPC 601 */

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson