From patchwork Thu Jan 24 12:49:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1030445 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43lhvX65Rjz9s3l for ; Thu, 24 Jan 2019 23:55:04 +1100 (AEDT) Received: from localhost ([127.0.0.1]:53055 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmeX8-0004vK-Qk for incoming@patchwork.ozlabs.org; Thu, 24 Jan 2019 07:55:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44343) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmeSK-00019M-0W for qemu-devel@nongnu.org; Thu, 24 Jan 2019 07:50:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmeSI-00015f-MP for qemu-devel@nongnu.org; Thu, 24 Jan 2019 07:50:03 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:51431) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmeS5-0000rk-GR; Thu, 24 Jan 2019 07:49:51 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M3lHZ-1gmvhA0O2d-000wFW; Thu, 24 Jan 2019 13:49:31 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 24 Jan 2019 13:49:04 +0100 Message-Id: <20190124124906.16653-4-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190124124906.16653-1-laurent@vivier.eu> References: <20190124124906.16653-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:6QICfGEk2DwAbqWYsK+ZlND/rR9YBFjeGen3fCdzF7uCkWxwPAr Q4bceXqJItdHqqMbokHDTICRG8HgfgY9+n6YDbpOPlVz53BW62SFXzYwoLF6RYNUGfXJFQx WuI8Z7g0AWMuo4cyg0RAVI0e96ItdNA+cedIgC+WT/VuSiXPGd0Rpil45Gxn481xXF/u0J9 /8JLpinQl1wTQJVS7E0Dg== X-UI-Out-Filterresults: notjunk:1; V03:K0:56wQ0EH/nwQ=:mvH9nKamZvJrTJtCS+4UqX egqUO9K4CT33VnChpjtFcy5rCBJpH7S2jPb3d03u+EbX9nzWb5D7WHXZRJICzieKrrBqafWOJ d77vE0VN4vwc27KgnRsxrqcJRG+9bm7jws4p4v9WOThnEBDnd/iv4B4dg7D69yOIZ7I5YvaQF r41noxEHABuNJgLKgLu0/hRmylyTq0AxNTYxcXAN8KfTaw/n0E5/lyY4GKQdGEtf+Y6tOExGT DF9yL5wqIRU6wPG2SeAMbXy6XkxmkgM3TFymiNPqXipq6oIzhoGKxWNOe+amOyZmNFvwi0efB waFlTqvqBdfABguhB3qEeE7p8YNBsNFhKNrDEuo5qADtG18l6sWzaxR1PpYcvQUvqZ1QbP4ha iFeCIGcnQEBEAkC8ZPvS2ehUzp2MBamaBlgAXbSjFjl+0rOgu1TPh3hF+4PYITVSLYAXeyBBg DluMpdgluXWYnGOD0TmPJvqj8bQdYNOVa7ulisKsbqQhRhwdWQ4sj/9nKqZ5hqu7ohYbZD5Uu o0THaNArZIXc8RR72lZe01oEWll7JRtPpBTKFSqgJMqF7g3swkufz/9G4LOFPM/TdR670RQPc Ah6llD1BJWfybjgMvr0hn1zB9RLPwS4VbTuYXLQCiWqmCDYkJ+NL8u97HSE2wKNXBrj5CksOj NsEPHW2Xy0FY5TJUrykzZ9gkWJ433eM9F/D61usyYTGCJ8qR0IShHblayDU4LRPk6yQIfg1Xf 0QafHq/HTHEPqOcfV+4pw91RJ4PwX+0EzFwu/g== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.13 Subject: [Qemu-devel] [PULL 3/5] ppc: e6500 registers SPR 604 twice 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: Eduardo Habkost , "Michael S. Tsirkin" , qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , qemu-ppc@nongnu.org, Paolo Bonzini , Jon Diekema , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9e?= , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Jon Diekema When using the e6500 CPU, QEMU generates a fatal error after complaining about registering SPR 604 twice. Building and testing with commit 9b2e891ec5ccdb4a7d583b77988848282606fdea shows the issue: qemu-system-ppc64 --version QEMU emulator version 3.1.50 (v3.1.0-456-g9b2e891ec5-dirty) Copyright (c) 2003-2018 Fabrice Bellard and the QEMU Project developers qemu-system-ppc64 -M none -cpu e6500 Error: Trying to register SPR 604 (25c) twice ! Signed-off-by: Jon Diekema Message-Id: [removed duplicated mail header in the commit message] Signed-off-by: Laurent Vivier --- target/ppc/translate_init.inc.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c index ade06cc773..59e0b86762 100644 --- a/target/ppc/translate_init.inc.c +++ b/target/ppc/translate_init.inc.c @@ -4947,14 +4947,6 @@ static void init_proc_e500(CPUPPCState *env, int version) } if (version == fsl_e6500) { - spr_register(env, SPR_BOOKE_SPRG8, "SPRG8", - SPR_NOACCESS, SPR_NOACCESS, - &spr_read_generic, &spr_write_generic, - 0x00000000); - spr_register(env, SPR_BOOKE_SPRG9, "SPRG9", - SPR_NOACCESS, SPR_NOACCESS, - &spr_read_generic, &spr_write_generic, - 0x00000000); /* Thread identification */ spr_register(env, SPR_TIR, "TIR", SPR_NOACCESS, SPR_NOACCESS,