From patchwork Tue Aug 21 04:33:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 144680 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4797871ljj; Mon, 20 Aug 2018 21:55:23 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYE4eDk2eiS3PjnVdG+UlZ464RhS56XL7wbt8wsa63u78lL7l1Ey3EDwl8zwqShtuygmY0r X-Received: by 2002:ac8:74cf:: with SMTP id j15-v6mr392018qtr.386.1534827323115; Mon, 20 Aug 2018 21:55:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534827323; cv=none; d=google.com; s=arc-20160816; b=rpw/GdpMJDxZKP6Dk1q2UXx7O+c/fSu9HN9dwPe2PdZYhY4dB8O1kI5alogKV8LEFc dqBLHbQRfXF8F8N1xfBtHMbtwhNsI+02KdzwnBLE44wBcHODF0Pq6xD2R9rE8KQW7zPX 8nGr9778NugrG7ubAJf+CNXMcro3LRQrnLm19FX1VklgOhZXmuYiVBWTcymh3bwFF5G8 HkZc+XaxDT7EAv9RrP+eDM2QqsqEE0Cn/JEe7Ca9Iuv0I3uI0/tuWZAzdT2jNNrggh/v 89Ffcn+X7iaDl2cX0eyrhBGVxBGHk8BraWoRnLx2h1UsmMx+NwAGjz1Eicmtt93suFdf aCsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=GCuiNbhg2Z7it7vh9UxVSeyoTyGzlbsUv7ztrvBGAHw=; b=Qy+XVbO8YI3men7RTlxLzyt16JMs5Gq/x7284n5QUyU5Qx/OiPmZCEj1LdOmEJ8c0Y M01x7sFiTWTUZy/6SUBbie6MEy+svAlU29mQY4bJE02/Melcq1vS5noBr2xn+BFgtd0W Vq9HNtWvEnvOcZQwUo8qBubf9M1rSPx8+o8VnN0sTBaHZbSR+TqBW9DiQJBjNHfp19jA a6yPPzMYJJbsG+atBuYft0Iiz8eWkNBHeXwJQbZG9rhWHwdCVoxU3KVOpQMAqXd1mN4f PGYUFFmk8dFr+rClkmYiBxbSuudVqIMFq8F682nY2F3NY/npTOgde+8kJMl5n/ZCLYmm cayA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gibson.dropbear.id.au header.s=201602 header.b=MGgJe88h; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id v35-v6si6343759qtv.322.2018.08.20.21.55.22 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 20 Aug 2018 21:55:23 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gibson.dropbear.id.au header.s=201602 header.b=MGgJe88h; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:50764 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fryhO-0007eM-Jp for patch@linaro.org; Tue, 21 Aug 2018 00:55:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56803) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fryN0-0004Jy-OJ for qemu-devel@nongnu.org; Tue, 21 Aug 2018 00:34:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fryMx-0000VF-5u for qemu-devel@nongnu.org; Tue, 21 Aug 2018 00:34:18 -0400 Received: from ozlabs.org ([203.11.71.1]:55333) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fryMv-0000Rz-Vq; Tue, 21 Aug 2018 00:34:14 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 41vd9H33tRz9sDJ; Tue, 21 Aug 2018 14:33:52 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1534826035; bh=AEgPcPl2PEoVlsrISFrfbB7P0pVFwLHR3cDKUtGZvt8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MGgJe88hDlzbB1q8E8sdEhaY8hvvdxh1HF3mcly8YRUcNhGJlAoG8oR+dmWDbuQEf lg9xKmVNtenkoISVLuRXgl6vwHuqr06JyQXTkOhkZIkogtg0V5mAaGeHwSxsh6mv3V yc/I9E+3xObu1RGvFoDVE2V8Akg6ost3UjbGQXvY= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 21 Aug 2018 14:33:33 +1000 Message-Id: <20180821043343.7514-17-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180821043343.7514-1-david@gibson.dropbear.id.au> References: <20180821043343.7514-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 203.11.71.1 Subject: [Qemu-devel] [PULL 16/26] hw/ppc/prep: Remove ifdeffed-out stub of XCSR code 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, aik@ozlabs.ru, groug@kaod.org, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, clg@kaod.org, David Gibson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell The prep machine has some code which is stubs of accessors for XCSR registers. This has been disabled via #if 0 since commit b6b8bd1819ff in 2004, and doesn't have any actual interesting content. It also uses the deprecated old_mmio accessor functions. Remove it entirely. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Hervé Poussineau Signed-off-by: David Gibson --- hw/ppc/prep.c | 97 +++------------------------------------------------ 1 file changed, 4 insertions(+), 93 deletions(-) -- 2.17.1 diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 3401570d98..b26138e5c4 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -78,94 +78,6 @@ static int ne2000_irq[NE2000_NB_MAX] = { 9, 10, 11, 3, 4, 5 }; /* ISA IO ports bridge */ #define PPC_IO_BASE 0x80000000 -/* PowerPC control and status registers */ -#if 0 // Not used -static struct { - /* IDs */ - uint32_t veni_devi; - uint32_t revi; - /* Control and status */ - uint32_t gcsr; - uint32_t xcfr; - uint32_t ct32; - uint32_t mcsr; - /* General purpose registers */ - uint32_t gprg[6]; - /* Exceptions */ - uint32_t feen; - uint32_t fest; - uint32_t fema; - uint32_t fecl; - uint32_t eeen; - uint32_t eest; - uint32_t eecl; - uint32_t eeint; - uint32_t eemck0; - uint32_t eemck1; - /* Error diagnostic */ -} XCSR; - -static void PPC_XCSR_writeb (void *opaque, - hwaddr addr, uint32_t value) -{ - printf("%s: 0x" TARGET_FMT_plx " => 0x%08" PRIx32 "\n", __func__, addr, - value); -} - -static void PPC_XCSR_writew (void *opaque, - hwaddr addr, uint32_t value) -{ - printf("%s: 0x" TARGET_FMT_plx " => 0x%08" PRIx32 "\n", __func__, addr, - value); -} - -static void PPC_XCSR_writel (void *opaque, - hwaddr addr, uint32_t value) -{ - printf("%s: 0x" TARGET_FMT_plx " => 0x%08" PRIx32 "\n", __func__, addr, - value); -} - -static uint32_t PPC_XCSR_readb (void *opaque, hwaddr addr) -{ - uint32_t retval = 0; - - printf("%s: 0x" TARGET_FMT_plx " <= %08" PRIx32 "\n", __func__, addr, - retval); - - return retval; -} - -static uint32_t PPC_XCSR_readw (void *opaque, hwaddr addr) -{ - uint32_t retval = 0; - - printf("%s: 0x" TARGET_FMT_plx " <= %08" PRIx32 "\n", __func__, addr, - retval); - - return retval; -} - -static uint32_t PPC_XCSR_readl (void *opaque, hwaddr addr) -{ - uint32_t retval = 0; - - printf("%s: 0x" TARGET_FMT_plx " <= %08" PRIx32 "\n", __func__, addr, - retval); - - return retval; -} - -static const MemoryRegionOps PPC_XCSR_ops = { - .old_mmio = { - .read = { PPC_XCSR_readb, PPC_XCSR_readw, PPC_XCSR_readl, }, - .write = { PPC_XCSR_writeb, PPC_XCSR_writew, PPC_XCSR_writel, }, - }, - .endianness = DEVICE_LITTLE_ENDIAN, -}; - -#endif - /* Fake super-io ports for PREP platform (Intel 82378ZB) */ typedef struct sysctrl_t { qemu_irq reset_irq; @@ -648,11 +560,10 @@ static void ppc_prep_init(MachineState *machine) portio_list_init(&prep_port_list, NULL, prep_portio_list, sysctrl, "prep"); portio_list_add(&prep_port_list, isa_address_space_io(isa), 0x0); - /* PowerPC control and status register group */ -#if 0 - memory_region_init_io(xcsr, NULL, &PPC_XCSR_ops, NULL, "ppc-xcsr", 0x1000); - memory_region_add_subregion(sysmem, 0xFEFF0000, xcsr); -#endif + /* + * PowerPC control and status register group: unimplemented, + * would be at address 0xFEFF0000. + */ if (machine_usb(machine)) { pci_create_simple(pci_bus, -1, "pci-ohci");