From patchwork Tue Mar 13 22:46:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 10281197 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 183F6601A0 for ; Tue, 13 Mar 2018 23:25:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 08E78205F6 for ; Tue, 13 Mar 2018 23:25:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F18E1285C9; Tue, 13 Mar 2018 23:25:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 73003205F6 for ; Tue, 13 Mar 2018 23:25:00 +0000 (UTC) Received: from localhost ([::1]:43487 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evtHv-0004sZ-IT for patchwork-qemu-devel@patchwork.kernel.org; Tue, 13 Mar 2018 19:24:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evsiW-0006Br-Fo for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evsiV-00040F-JJ for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:24 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:36937) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evsiV-0003zY-C0 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:23 -0400 Received: by mail-wr0-x243.google.com with SMTP id z12so2563527wrg.4 for ; Tue, 13 Mar 2018 15:48:23 -0700 (PDT) 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=E2kNX/klygRs2q8tBXHtfuOhrrcDHdBSUrDH2R15Sj8=; b=rVNYficBlt9cz67rs+U3pZgln2n5+mVPBLHgVY52wnL+ou2y0C7HA2uV1T06Uo/Wzr gkYPJlBWbmfHgLkzp9jCpcGmhc3YIHOHkJ0e1qP1G1kD0rtUQOX+7839SDuKLLGGPMUL 7gcSmhAh6v1OFt0m04iW4GXZfIPG4NsCgY9aPrif0yotsBtY2sZL0cGmHaGlUhC3DYVB nu9fONurPhJ+sZ9d7jesS7FpM390qY2nQmj+kCMAR1Zm96YUV2S8cF9kuoeraODqO4A7 Qn9lujiCltmujFTspCvRCeeIE5a4U6Ci90eSwHSWRm3DHiDKLP2Sb35eutgS/TXu7yQh 2Nxg== 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=E2kNX/klygRs2q8tBXHtfuOhrrcDHdBSUrDH2R15Sj8=; b=IUvfcoEQPQ/mJHr+qsOOjMKK4BxoRc8cOq8ofTU120b0P+Gjc0xmzX5X7XijWqPCnr 3eesbaub0vtFrhajZMlmcI3oavvUplOBMVLKnElkcaJ35tpNWpwVQ71Y+BWAcgAOjKsS bkH5SVbmqUlezqJIzeatlXLCltwNuf6YucE2Wj50S19g+VmKQms9Dd1JtYebjsFb8KWc ry1rTiWQouKqI6uMdxuim5jEd/6T8lPT1fXzoJ8gdjVic5VHzTkkp/nsZR6YTbVvFV4+ NA26K5uDLJtphumtRfqHz3aRcrEx+2Mod/mO/oW9FLzqa1WPqD1AMVZRXRdfnkfZhK4+ hLqA== X-Gm-Message-State: AElRT7HcXwAOFJYh4x6uRgqHWiQTPgyI+1E3P1K9bdM0qrIvb3QO6mF6 THO/+IQAkub4xu6mN00LmvR3Mm2k X-Google-Smtp-Source: AG47ELuwvGTguiGQcP1x1+5FTCTCu3JJdRJja8DeN0pIr8+Qqd8WYia2T39Q33PEklaPkyq0ncP30A== X-Received: by 10.223.132.103 with SMTP id 94mr1855641wrf.275.1520981301999; Tue, 13 Mar 2018 15:48:21 -0700 (PDT) Received: from donizetti.lan (94-36-191-219.adsl-ull.clienti.tiscali.it. [94.36.191.219]) by smtp.gmail.com with ESMTPSA id x107sm1557951wrb.97.2018.03.13.15.48.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Mar 2018 15:48:21 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 23:46:59 +0100 Message-Id: <20180313224719.4954-50-pbonzini@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313224719.4954-1-pbonzini@redhat.com> References: <20180313224719.4954-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::243 Subject: [Qemu-devel] [PULL 49/69] hw/alpha/dp264: Add the ISA DMA controller 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20180308223946.26784-24-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- default-configs/alpha-softmmu.mak | 2 ++ hw/alpha/dp264.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-softmmu.mak index e0d75e3058..3740adc5e9 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -4,7 +4,9 @@ include pci.mak include usb.mak CONFIG_SERIAL=y CONFIG_SERIAL_ISA=y +CONFIG_I82374=y CONFIG_I8254=y +CONFIG_I8257=y CONFIG_PCKBD=y CONFIG_VGA_CIRRUS=y CONFIG_IDE_CORE=y diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index e13cb576fd..ffad678ea7 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -21,6 +21,7 @@ #include "hw/timer/i8254.h" #include "hw/input/i8042.h" #include "hw/char/serial.h" +#include "hw/dma/i8257.h" #include "qemu/cutils.h" #define MAX_IDE_BUS 2 @@ -95,6 +96,9 @@ static void clipper_init(MachineState *machine) pci_nic_init_nofail(&nd_table[i], pci_bus, "e1000", NULL); } + /* 2 82C37 (dma) */ + isa_create_simple(isa_bus, "i82374"); + /* IDE disk setup. */ { DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];