From patchwork Wed Jun 27 23:23:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 935780 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=2001:4830:134:3::11; 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=vivier.eu Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41GJxV6gppz9s01 for ; Thu, 28 Jun 2018 09:28:14 +1000 (AEST) Received: from localhost ([::1]:33585 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYJrA-0005Uk-K9 for incoming@patchwork.ozlabs.org; Wed, 27 Jun 2018 19:28:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYJnQ-0002rd-O8 for qemu-devel@nongnu.org; Wed, 27 Jun 2018 19:24:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYJnP-0007JE-DZ for qemu-devel@nongnu.org; Wed, 27 Jun 2018 19:24:20 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:33683) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYJnK-0007Bz-Bc; Wed, 27 Jun 2018 19:24:14 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MMnOB-1fVogi1CWt-008YBw; Thu, 28 Jun 2018 01:23:51 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 28 Jun 2018 01:23:24 +0200 Message-Id: <20180627232334.14142-1-laurent@vivier.eu> X-Mailer: git-send-email 2.14.4 MIME-Version: 1.0 X-Provags-ID: V03:K1:YWLMckfmuAjeuSNh6Us2f4ZuXKKNA6cSwT4wswcJog3DJZFp0tW e37VdiPqO6KlSedEQfXoaddHT3Rchr/de5A3lccoE9ji1KugsVI5wOK6hpjFhsB+YKevsia y2zs9UILTCGpc3dj8gY9JD9GACelyc3QklhhRbqmz3nKmuP9egb+0IiwiaA7WopIexznMW2 rQ+LdEDz3SpYmn56kOUIw== X-UI-Out-Filterresults: notjunk:1; V01:K0:RkZoQ5PvVSU=:qv44ZWvwpcn4PScBvcxinF eWilVKA36HNtL4vd4WcHYNuYbHb4A8kwwQKl5Viin/hvswIFb136cfshtQa/ctkwmNw/huCh0 SoMX1SosaIr+ma2ezPm1uIF2MWhWxjHhpkvW9gxlaqGqx7xlCMvMvaB8ss+rZ8qhJv7JYiTzO BCjFtqELtZmgXdh62nUtMu6JAxNeguFwdNGVHUvPL18Fl2ZnVWhFJhModjJB7IggYfPkqx81O DMWBPH0+TtJkyAGESrXuwoDZyczkXqqBUuWvzOF0ST800qDpFusYXBLvE7C+eGOfEnDts6P3V f3YcQD28hB2RnXs9j2+KdUQSMLGhiyybj7qPE//uCLgOiIQyQo87fduDN75neVv03jrywJhuG 4vN2XUSnq+s56HyZjVLjcRHQ1xehbpItuf19VvckSkfbcyyQGly9DNNmOPuzq6VKsRufUjMqU BdRU1GEuKGo/qzMEBUE++7Z3fhZ2sGnQOuOY8f/1fORPl7+Id59CXWlXVbJFxMofCOxe7WpV+ N0rSN1uXCR4QNaJ4ReKrsPkef62VS3PFQwF/KP20qbE11+wAggTV7TuwPe7Mi9OPAGQuWYeNA mmT6H0tAC6uZC2pb49gvcc8GvbNpsltG1JzarhkgfxWTgzl8xuNunEdTZgqesmoAKkpDkTvnR p5oQt51zIRsRb/ad7wCz4tuaXb2XrtwH5DL4tkEviNxAduXk6fHM4aYNM8ixJurmDnx9zEQRe cunnFD34Z15ry5KN X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.73 Subject: [Qemu-devel] [C v2 00/10] hw/m68k: add Apple Machintosh Quadra 800 machine 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: Kevin Wolf , "Dr. David Alan Gilbert" , Fam Zheng , qemu-block@nongnu.org, Jason Wang , Mark Cave-Ayland , Laurent Vivier , Max Reitz , =?utf-8?q?Herv=C3=A9_Poussineau?= , Gerd Hoffmann , Paolo Bonzini , Yongbok Kim , =?utf-8?q?Andreas_F=C3=A4rber?= , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" I'm rebasing some of these patches for seven years now, too many years... if you want to test the machine, I'm sorry, it doesn't boot a MacROM, but you can boot a linux kernel from the command line. You can install your own disk using debian-installer, with: ... -M q800 \ -serial none -serial mon:stdio \ -m 1000M -drive file=m68k.qcow2,format=qcow2 \ -net nic,model=dp83932,addr=09:00:07:12:34:57 \ -append "console=ttyS0 vga=off" \ -kernel vmlinux-4.15.0-2-m68k \ -initrd initrd.gz \ -drive file=debian-9.0-m68k-NETINST-1.iso \ -drive file=m68k.qcow2,format=qcow2 \ -nographic If you use a graphic adapter instead of "-nographic", you can use "-g" to set the size of the display (I use "-g 1600x800x24"). You can get the ISO from: https://cdimage.debian.org/mirror/cdimage/ports/9.0/m68k/iso-cd/debian-9.0-m68k-NETINST-1.iso and extract the kernel and initrd.gz: guestfish --add debian-9.0-m68k-NETINST-1.iso --ro \ --mount /dev/sda:/ <<_EOF_ copy-out /install/cdrom/initrd.gz . copy-out /install/kernels/vmlinux-4.15.0-2-m68k . _EOF_ The mirror to use is: http://ftp.ports.debian.org/debian-ports/ when it fails, continue without boot loader. In the same way, you can extract the kernel and the initramfs from the qcow2 image to use it with "-kernel" and "-initrd": guestfish --add m68k.qcow2 --mount /dev/sda2:/ <<_EOF_ copy-out /boot/vmlinux-4.15.0-2-m68k . copy-out /boot/initrd.img-4.15.0-2-m68k . _EOF_ and boot with: ... -append "root=/dev/sda2 rw console=ttyS0 console=tty \ -kernel vmlinux-4.15.0-2-m68k \ -initrd initrd.img-4.15.0-2-m68k v2: remove the dp8393x fixes, because one of the patch breaks something Update "dp8393x: manage big endian bus" with idea from Thomas Mark has reworked most of the patches: - use mos6522 - some code move, renamings and cleanup Laurent Vivier (10): hw/m68k: add via support ADB: VIA probes ADB bus when it is idle escc: introduce a selector for the register bit hw/m68k: add video card hw/m68k: Apple Sound Chip (ASC) emulation ESP: add pseudo-DMA as used by Macintosh hw/m68k: add Nubus support hw/m68k: add a dummy SWIM floppy controller dp8393x: manage big endian bus hw/m68k: define Macintosh Quadra 800 MAINTAINERS | 19 + arch_init.c | 4 + default-configs/m68k-softmmu.mak | 14 + hw/Makefile.objs | 1 + hw/audio/Makefile.objs | 1 + hw/audio/asc.c | 463 +++++++++++++++++++++++ hw/block/Makefile.objs | 1 + hw/block/swim.c | 284 ++++++++++++++ hw/char/escc.c | 30 +- hw/display/Makefile.objs | 1 + hw/display/macfb-template.h | 158 ++++++++ hw/display/macfb.c | 308 +++++++++++++++ hw/input/adb-kbd.c | 4 + hw/input/adb-mouse.c | 4 + hw/input/adb.c | 115 ++++++ hw/intc/Makefile.objs | 1 + hw/intc/q800_irq.c | 73 ++++ hw/m68k/Makefile.objs | 6 +- hw/m68k/bootinfo.h | 100 +++++ hw/m68k/q800.c | 385 +++++++++++++++++++ hw/mips/mips_jazz.c | 2 +- hw/misc/Makefile.objs | 1 + hw/misc/mac_via.c | 731 ++++++++++++++++++++++++++++++++++++ hw/net/dp8393x.c | 88 +++-- hw/nubus/Makefile.objs | 4 + hw/nubus/mac-nubus-bridge.c | 45 +++ hw/nubus/nubus-bridge.c | 34 ++ hw/nubus/nubus-bus.c | 111 ++++++ hw/nubus/nubus-device.c | 210 +++++++++++ hw/scsi/esp.c | 297 +++++++++++++-- include/hw/audio/asc.h | 48 +++ include/hw/block/swim.h | 53 +++ include/hw/char/escc.h | 1 + include/hw/display/macfb.h | 63 ++++ include/hw/input/adb.h | 10 + include/hw/intc/q800_irq.h | 39 ++ include/hw/misc/mac_via.h | 107 ++++++ include/hw/nubus/mac-nubus-bridge.h | 24 ++ include/hw/nubus/nubus.h | 69 ++++ include/hw/scsi/esp.h | 11 +- qemu-options.hx | 2 +- tests/qom-test.c | 5 + tests/test-hmp.c | 3 +- vl.c | 3 +- 44 files changed, 3857 insertions(+), 76 deletions(-) create mode 100644 hw/audio/asc.c create mode 100644 hw/block/swim.c create mode 100644 hw/display/macfb-template.h create mode 100644 hw/display/macfb.c create mode 100644 hw/intc/q800_irq.c create mode 100644 hw/m68k/bootinfo.h create mode 100644 hw/m68k/q800.c create mode 100644 hw/misc/mac_via.c create mode 100644 hw/nubus/Makefile.objs create mode 100644 hw/nubus/mac-nubus-bridge.c create mode 100644 hw/nubus/nubus-bridge.c create mode 100644 hw/nubus/nubus-bus.c create mode 100644 hw/nubus/nubus-device.c create mode 100644 include/hw/audio/asc.h create mode 100644 include/hw/block/swim.h create mode 100644 include/hw/display/macfb.h create mode 100644 include/hw/intc/q800_irq.h create mode 100644 include/hw/misc/mac_via.h create mode 100644 include/hw/nubus/mac-nubus-bridge.h create mode 100644 include/hw/nubus/nubus.h