From nobody Tue Oct 28 12:16:28 2025 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; dkim=fail; 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 151538107496325.233056578002902; Sun, 7 Jan 2018 19:11:14 -0800 (PST) Received: from localhost ([::1]:60345 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYNqB-0002qN-6C for importer@patchew.org; Sun, 07 Jan 2018 22:11:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51619) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYNT1-0007L4-HL for qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:47:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eYNT0-0002w1-L7 for qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:47:15 -0500 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:42455) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eYNT0-0002vK-GN for qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:47:14 -0500 Received: by mail-qk0-x241.google.com with SMTP id d202so12534550qkc.9 for ; Sun, 07 Jan 2018 18:47:14 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d10sm7156245qkg.16.2018.01.07.18.47.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Jan 2018 18:47:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hBi79hDIgEKjjopvztu2QDJ3BpIh5Nt3kAqhiadNHys=; b=Bgs+ZTfud/aOfO1xQiT+m4CK9fYEgdRUXU0C1wwEv537uboMZcgt+poolm0a/FI+oO ap3ujdpmDeSbuFOvW2cUb1V38ulL9OGhMn7T5wIjYwxQ4rq36VUXD0yk+A9faWO3vLrI Jjx1hNIGbesvNownA4/fC2zuKEGXJyfd1jGHJj9gXozMxgNhni+J9CIJ29msgXmHjX/4 Aqc22CTfr4aCmcsnrKlCQDxPW0PY0Mw7D/gXm/gktv4CLcNfZUBQTksQ6dg55od8hN7Q FhyfcPGDpDqeIzUApHD12aXZTqH47rv8hvQb0rqSLOYSeAuY2+gV+ex08jiqAWKY5Jmz 1LtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=hBi79hDIgEKjjopvztu2QDJ3BpIh5Nt3kAqhiadNHys=; b=Wvq9rSS+kzGR9p0O0lTaaL7v/6VNvc01qi8H//pmZ0k2aJt6Ia4q0BwYk3W6TJnrF5 uvoWKNLd8BYQQwdEPHLmEGQWadqMCfB6obQK7DoF8zPj0W65ybyvFFY9oxnd0hkFefpP k3DjfZuQag4vGXyNGr/mdki1V0h7ggG3Y4nEyVPWr6BWya4dR80TQduzGUeSyT1QixkV ztlFp2NyoqYYIvW0MxeHbPzHdXbTo0vYqSQlWyvSLt1ZETz05pyIdDPWR1YcbgKes8YM CKiGJD9aSobfiq13V31GnizMq1N52sLQDvpUa6r16wjgKzubaJ5fxPU4haEliY790aQx YB9g== X-Gm-Message-State: AKwxytd/KwaWCife0CwEapJFegW3K/NWhqStn9f3bZoWdMSUiO06Mpl1 Hnp0ANa8iID6kXAMbZ+1EvY= X-Google-Smtp-Source: ACJfBovCXey5NbFUZkbjv6kqU0J8pHnMNExnw7SOLBjaZG+Z7ZlOuUYtafUq3lU5kE/JnMj42DXMmg== X-Received: by 10.55.152.69 with SMTP id a66mr13204291qke.120.1515379633930; Sun, 07 Jan 2018 18:47:13 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , "Michael S. Tsirkin" , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , Eduardo Habkost , Marcel Apfelbaum Date: Sun, 7 Jan 2018 23:45:48 -0300 Message-Id: <20180108024558.17983-20-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180108024558.17983-1-f4bug@amsat.org> References: <20180108024558.17983-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH 19/29] piix4: add a i8254 pit controller as specified in datasheet 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: Igor Mammedov , Yongbok Kim , qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Herv=C3=A9 Poussineau Remove i8254 instanciated in malta board, to not have it twice. Signed-off-by: Herv=C3=A9 Poussineau [PMD: rebased] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/piix4.c | 4 ++++ hw/mips/mips_malta.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index 56a1c7d429..04b13f97c6 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -31,6 +31,7 @@ #include "hw/southbridge/i82371_piix.h" #include "hw/dma/i8257.h" #include "hw/sysbus.h" +#include "hw/timer/i8254.h" =20 PCIDevice *piix4_dev; =20 @@ -164,6 +165,9 @@ static void piix4_realize(PCIDevice *pci_dev, Error **e= rrp) /* initialize ISA irqs */ isa_bus_irqs(isa_bus, s->isa); =20 + /* initialize pit */ + i8254_pit_init(isa_bus, 0x40, 0, NULL); + /* DMA */ i8257_dma_init(isa_bus, 0); =20 diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index db5a8b1811..84b4d5c423 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -44,7 +44,6 @@ #include "hw/loader.h" #include "elf.h" #include "hw/timer/mc146818rtc.h" -#include "hw/timer/i8254.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" #include "hw/sysbus.h" /* SysBusDevice */ @@ -98,8 +97,6 @@ typedef struct { qemu_irq i8259[16]; } MaltaState; =20 -static ISADevice *pit; - static struct _loaderparams { int ram_size, ram_low_size; const char *kernel_filename; @@ -1206,7 +1203,6 @@ void mips_malta_init(MachineState *machine) pci_create_simple(pci_bus, piix4_devfn + 2, "piix4-usb-uhci"); smbus =3D piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100, isa_get_irq(NULL, 9), NULL, 0, NULL); - pit =3D i8254_pit_init(isa_bus, 0x40, 0, NULL); mc146818_rtc_init(isa_bus, 2000, NULL); =20 /* generate SPD EEPROM data */ --=20 2.15.1