From patchwork Tue Mar 14 04:26:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 738546 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vj1t83RwQz9s76 for ; Tue, 14 Mar 2017 15:27:28 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b="TLZrKfu8"; dkim-atps=neutral Received: from localhost ([::1]:56297 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cne3Q-0007S6-1l for incoming@patchwork.ozlabs.org; Tue, 14 Mar 2017 00:27:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48904) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cne2d-0007Rm-09 for qemu-devel@nongnu.org; Tue, 14 Mar 2017 00:26:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cne2c-0007AF-7X for qemu-devel@nongnu.org; Tue, 14 Mar 2017 00:26:35 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:32855) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cne2b-00077f-R3; Tue, 14 Mar 2017 00:26:34 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3vj1s125Y0z9s2G; Tue, 14 Mar 2017 15:26:29 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1489465589; bh=jNoKdkAJlXX4OhaAA+Jl7Q3Gic5sEwXZttcbruDZF9g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TLZrKfu8mQpjWFhsRljJrjxi3VJSqEbNjM23oHvaYsXdYgdi4Ke1AwdRLio8JHONm duaFQAl2gVhuw6I/NSsg7eXMYfWk3A5a8bB2TY68an5gbXYp9EBY9u2oLJ92imO+wz f6QWQHUcAARg6HIKJr38uDd6WBb+p7Y9f+NnNdZ0= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 14 Mar 2017 15:26:23 +1100 Message-Id: <20170314042626.20020-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170314042626.20020-1-david@gibson.dropbear.id.au> References: <20170314042626.20020-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 1/4] target/ppc: Fix wrong number of UAMR register X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, thuth@redhat.com, qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com, agraf@suse.de, aik@ozlabs.ru, qemu-ppc@nongnu.org, pbonzini@redhat.com, David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth 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 Signed-off-by: David Gibson --- 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 */