From patchwork Wed May 22 04:45:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 1103129 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=gibson.dropbear.id.au 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="kDEYQ+i/"; dkim-atps=neutral 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 4580W06rgkz9sBV for ; Wed, 22 May 2019 14:47:56 +1000 (AEST) Received: from localhost ([127.0.0.1]:35702 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTJAQ-0003tK-QB for incoming@patchwork.ozlabs.org; Wed, 22 May 2019 00:47:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47112) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTJ8p-0003Ls-L7 for qemu-devel@nongnu.org; Wed, 22 May 2019 00:46:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTJ8o-0006a7-Ki for qemu-devel@nongnu.org; Wed, 22 May 2019 00:46:15 -0400 Received: from ozlabs.org ([203.11.71.1]:33513) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hTJ8l-0006Wg-6c; Wed, 22 May 2019 00:46:13 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4580Ss5xgKz9sNK; Wed, 22 May 2019 14:46:05 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1558500365; bh=wYkYWuH7ycMxiKGkoDj9ZRZOWZRg8x2Va/UMRnZg9lM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kDEYQ+i/kQz9ocszrRtmGeEs32S4bipHDkSb1Yrb++5yUJYSraK+9OxDwPowLuVa3 DdPhkvDHblijISKgYQFZdNKWkSThTUKvqAFke6FvJtN1HizSixv2TUEvI0GyS9n77F Kd1RvXhc1DM072mAwoWGyl0kGp0NIEXI15FOu4AU= From: David Gibson To: peter.maydell@linaro.org Date: Wed, 22 May 2019 14:45:27 +1000 Message-Id: <20190522044600.16534-6-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190522044600.16534-1-david@gibson.dropbear.id.au> References: <20190522044600.16534-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 05/38] hw/ppc/40p: Move the MC146818 RTC to the board where it belongs 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, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.org, =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé The MC146818 RTC was incorrectly added to the i82378 chipset in commit a04ff940974a. In the next commit (506b7ddf8893) the PReP machine use the i82378. Since the MC146818 is specific to the PReP machine, move its use there. Fixes: a04ff940974a Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190505152839.18650-3-philmd@redhat.com> Signed-off-by: David Gibson --- hw/isa/i82378.c | 4 ---- hw/ppc/prep.c | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index a5d67bc6d7..c08970b24a 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -21,7 +21,6 @@ #include "hw/pci/pci.h" #include "hw/i386/pc.h" #include "hw/timer/i8254.h" -#include "hw/timer/mc146818rtc.h" #include "hw/audio/pcspk.h" #define TYPE_I82378 "i82378" @@ -105,9 +104,6 @@ static void i82378_realize(PCIDevice *pci, Error **errp) /* 2 82C37 (dma) */ isa = isa_create_simple(isabus, "i82374"); - - /* timer */ - isa_create_simple(isabus, TYPE_MC146818_RTC); } static void i82378_init(Object *obj) diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index ebee321148..7a0d311d43 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -675,6 +675,9 @@ static void ibm_40p_init(MachineState *machine) qdev_prop_set_uint32(dev, "ram-size", machine->ram_size); qdev_init_nofail(dev); + /* RTC */ + isa_create_simple(isa_bus, TYPE_MC146818_RTC); + /* initialize CMOS checksums */ cmos_checksum = 0x6aa9; qbus_walk_children(BUS(isa_bus), prep_set_cmos_checksum, NULL, NULL, NULL,