From nobody Tue Oct 28 12:16:29 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 1515379908852800.9471465912718; Sun, 7 Jan 2018 18:51:48 -0800 (PST) Received: from localhost ([::1]:59355 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYNXP-0002KT-RF for importer@patchew.org; Sun, 07 Jan 2018 21:51:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51585) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYNSx-0007JD-Un for qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:47:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eYNSx-0002qc-4W for qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:47:11 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:45642) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eYNSx-0002q4-0B for qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:47:11 -0500 Received: by mail-qk0-x244.google.com with SMTP id o126so12537278qke.12 for ; Sun, 07 Jan 2018 18:47:10 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d10sm7156245qkg.16.2018.01.07.18.47.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Jan 2018 18:47:09 -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=chbMtJzKXNsi6pGw2kwMddPyBzpG3dOnZoSmZJuwMPs=; b=Js5iNTioV5TaurcipQa3LkGXVnqWG7qAgIfJu2Xw7Tk+Qedx9mCCLirx22Y2JE293P iZPagohM8vZTo6iko/3rqB32KEbg75bJzIlV597IgR86nKrj8ghYMC3XNgAfjv05LWJe owzOjIe93o1QOVcgRPtTJCY72iLt7Qsml+uyfAUhcTZqN4AlMDvznRSN0ia0UnGhNM+M K9qLwQbr59g5U9LrnXfCsZBpWwChgoWw5+8zxYUJA+gzx/ZJw8chCy6x258+NBJMlt7L DaDS8mV6/ooq6ufBHufkooiNkPYCj1CmXJTbQAJ2TJ/FzgufvcWmIPQZLhHbYpIIUhp4 1WZw== 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=chbMtJzKXNsi6pGw2kwMddPyBzpG3dOnZoSmZJuwMPs=; b=iDqCmGdItjlgjnRblZJ4u+4Rke4cTHJoPf9KtVnW5TWwodlhf0pN+RPW76i+N6BoUc DmunnLySmxv1HMhVCvqBRVqSwSbt34L9xTmX6Jl3Y0piuS/d5JShOf/rTGCjuNqmddQ5 Z1hTDlh2dGHZP2Z89rGvwmGtShXlFc6M7tLQ4csiO2gzkM+hrRO8Z/3mjqMuJbjm1tLK GtUisU9Qx2Fyliq9/qJvshVxLsB/xs8bgRBA6uExu4HlsrpAtJoESI4qTsa+veAAaeSz TjBE+lwIBVqcR1m7LIVyFEjS1ZnFVZ2Gb9v6suEzTcFglfP+vXdsl9v90ab5UUf2M0N9 Ay+w== X-Gm-Message-State: AKwxytfGxm3+PI7D4AKsFEiE/s1Yd3mjr/2YMLM8qN6kM8lWp7z93YBF p76DbipW550/tz4EVlLY7AU= X-Google-Smtp-Source: ACJfBovjMK9DxqBDqOBYf8DvAPXezOBvw9/umGDbAJ7uYyQPhvIU+gYsqnTBwi5CnoiULiwjIDf1sg== X-Received: by 10.55.167.130 with SMTP id q124mr14660617qke.167.1515379630494; Sun, 07 Jan 2018 18:47:10 -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:47 -0300 Message-Id: <20180108024558.17983-19-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::244 Subject: [Qemu-devel] [PATCH 18/29] piix4: add a i8257 dma 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 i8257 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 | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index b0f6a0a342..56a1c7d429 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -29,6 +29,7 @@ #include "hw/pci/pci.h" #include "hw/isa/isa.h" #include "hw/southbridge/i82371_piix.h" +#include "hw/dma/i8257.h" #include "hw/sysbus.h" =20 PCIDevice *piix4_dev; @@ -163,6 +164,9 @@ static void piix4_realize(PCIDevice *pci_dev, Error **e= rrp) /* initialize ISA irqs */ isa_bus_irqs(isa_bus, s->isa); =20 + /* DMA */ + i8257_dma_init(isa_bus, 0); + piix4_dev =3D pci_dev; } =20 diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index d31e144b70..db5a8b1811 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -28,7 +28,6 @@ #include "hw/hw.h" #include "hw/i386/pc.h" #include "hw/isa/superio.h" -#include "hw/dma/i8257.h" #include "hw/char/serial.h" #include "net/net.h" #include "hw/boards.h" @@ -1208,7 +1207,6 @@ void mips_malta_init(MachineState *machine) 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); - i8257_dma_init(isa_bus, 0); mc146818_rtc_init(isa_bus, 2000, NULL); =20 /* generate SPD EEPROM data */ --=20 2.15.1