From nobody Tue Feb 10 20:30:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1525616711651721.2470489926255; Sun, 6 May 2018 07:25:11 -0700 (PDT) Received: from localhost ([::1]:42302 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFKb8-0007sT-Uq for importer@patchew.org; Sun, 06 May 2018 10:25:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41930) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFKWd-0004q5-Hp for qemu-devel@nongnu.org; Sun, 06 May 2018 10:20:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fFKWb-0008OU-0O for qemu-devel@nongnu.org; Sun, 06 May 2018 10:20:31 -0400 Received: from chuckie.co.uk ([82.165.15.123]:46748 helo=s16892447.onlinehome-server.info) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fFKWa-0008J4-MS; Sun, 06 May 2018 10:20:28 -0400 Received: from host109-152-7-9.range109-152.btcentralplus.com ([109.152.7.9] helo=kentang.home) by s16892447.onlinehome-server.info with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1fFKWf-0005Mh-Up; Sun, 06 May 2018 15:20:35 +0100 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org, david@gibson.dropbear.id.au Date: Sun, 6 May 2018 15:20:05 +0100 Message-Id: <20180506142005.19580-5-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180506142005.19580-1-mark.cave-ayland@ilande.co.uk> References: <20180506142005.19580-1-mark.cave-ayland@ilande.co.uk> X-SA-Exim-Connect-IP: 109.152.7.9 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk X-SA-Exim-Version: 4.2.1 (built Sun, 08 Jan 2012 02:45:44 +0000) X-SA-Exim-Scanned: Yes (on s16892447.onlinehome-server.info) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 82.165.15.123 Subject: [Qemu-devel] [PATCH 4/4] uninorth: remove token register from uninorth device 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From observation of various OS sources it can be seen that the token regist= er introduced in 4e46dcdbd3 "PPC: Newworld: Add uninorth token register" is not required, since the only register currently implemented is the uninorth har= dware version which is read-only. Remove the token register implementation and instead return the uninorth version corresponding to the hardware. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/uninorth.c | 11 +++++------ include/hw/pci-host/uninorth.h | 4 +++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c index a658f9230a..abebfaf755 100644 --- a/hw/pci-host/uninorth.c +++ b/hw/pci-host/uninorth.c @@ -524,19 +524,18 @@ static void unin_write(void *opaque, hwaddr addr, uin= t64_t value, unsigned size) { trace_unin_write(addr, value); - if (addr =3D=3D 0x0) { - *(int *)opaque =3D value; - } } =20 static uint64_t unin_read(void *opaque, hwaddr addr, unsigned size) { uint32_t value; =20 - value =3D 0; switch (addr) { case 0: - value =3D *(int *)opaque; + value =3D UNINORTH_VERSION_10A; + break; + default: + value =3D 0; } =20 trace_unin_read(addr, value); @@ -559,7 +558,7 @@ static void unin_init(Object *obj) UNINState *s =3D UNI_NORTH(obj); SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); =20 - memory_region_init_io(&s->mem, obj, &unin_ops, &s->token, "unin", 0x10= 00); + memory_region_init_io(&s->mem, obj, &unin_ops, s, "unin", 0x1000); =20 sysbus_init_mmio(sbd, &s->mem); } diff --git a/include/hw/pci-host/uninorth.h b/include/hw/pci-host/uninorth.h index f6654bad9b..2a1cf9f284 100644 --- a/include/hw/pci-host/uninorth.h +++ b/include/hw/pci-host/uninorth.h @@ -29,6 +29,9 @@ =20 #include "hw/ppc/openpic.h" =20 +/* UniNorth version */ +#define UNINORTH_VERSION_10A 0x7 + #define TYPE_UNI_NORTH_PCI_HOST_BRIDGE "uni-north-pci-pcihost" #define TYPE_UNI_NORTH_AGP_HOST_BRIDGE "uni-north-agp-pcihost" #define TYPE_UNI_NORTH_INTERNAL_PCI_HOST_BRIDGE "uni-north-internal-pci-pc= ihost" @@ -57,7 +60,6 @@ typedef struct UNINState { SysBusDevice parent_obj; =20 MemoryRegion mem; - int token[1]; } UNINState; =20 #define TYPE_UNI_NORTH "uni-north" --=20 2.11.0