From nobody Tue Feb 10 22:17:24 2026 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; 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1528488864586843.7701549624394; Fri, 8 Jun 2018 13:14:24 -0700 (PDT) Received: from localhost ([::1]:38008 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRNm3-0005Bc-Bl for importer@patchew.org; Fri, 08 Jun 2018 16:14:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47940) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRNez-0007gZ-Or for qemu-devel@nongnu.org; Fri, 08 Jun 2018 16:07:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRNew-0006oO-3P for qemu-devel@nongnu.org; Fri, 08 Jun 2018 16:06:57 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:55933) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fRNev-0006mn-Kk; Fri, 08 Jun 2018 16:06:54 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LiKia-1fzLxe1DI4-00ci5K; Fri, 08 Jun 2018 22:06:27 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Fri, 8 Jun 2018 22:05:54 +0200 Message-Id: <20180608200558.386-10-laurent@vivier.eu> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180608200558.386-1-laurent@vivier.eu> References: <20180608200558.386-1-laurent@vivier.eu> X-Provags-ID: V03:K1:lQg5t1IHhsOyhv6iHV4Jw4WT5nELi2/c3QXuRhg1s3UNN7YRRiB snKrKNVWuHMjfapuBc+SEtE03wu7saUEU6+zxB6P12XKO8zvFcuMNuJbMuD2YCX2Rnc9Acp e4fitiXqX9hN4XAI4s4429gZN/lThZ6moOHQzusmTbqvqigFboeZrU6g19qVUbbknRTTDYw Z5zpcMF8sxnZepcJSqBow== X-UI-Out-Filterresults: notjunk:1;V01:K0:9a/LjXycE2Q=:4lWZAbCEyJVFiIDA+mz1+o W8wFC9Uc4lJR6v9cROqij4R5xumYpzq1Wcc28SA6oWt+FkQRvC+IgbRzv90IzLU/UVnAXhYIT BWEDU9AyKCGROWIlfcncA4/UoIK+oNOBfOr5z1zt9XcaHKCMRXh41d5lsb8y4vG1Q7AlYccd6 tmZanIe7wyQQYrqb0aiRTnncNFKBQKKZ3HL2qJm6cPFqmglqZJpvvpn17IH+z5lG1a5qJPI40 sx96r17q8ABgqcs2tov7xncHRVr2OceaEtguREYcSK6megpxZn8CbWjtHsmt3L8ygBir70NU8 cNlwBQd1Cwq/tFhbFPcwamk37EWQNFkDi3+t9wRHFbnOsSaZ5mzvVvLIMdpIcC0kRHyGTIpL3 xpNwLy8CtjvYAQaSi1Wrr5QNOOObV4HOTW6G+G27zCtfqoVu7GB+JIKeExeUHt4vlOvRi9t2w 6YmNmyAfXUP2OkIEaZVFH7GdOW/p2nApCANIpsw6UgeY/j9OVgiXAfz1PlQ2FSkv50yr5SAk2 VJZsbW0FNjxZl+RWv7CFK83xnW2jKT8wpJ9wh+EmrJkT2x8LKs6czcmAFiHgZUN6c8pHYhxg0 JDcWbmW1x9SGkgYcYrb52+COR1ycSEqDwD97UqcLsWShGADvenRLhmMKHx0buyKMgwKuC55jV XzdTYzML38HTKsb5ntOUJ4ujT8KBcERtjLE0NsT7c9nHAlWsn6BLdfwnOQnNUoIO2TJA= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.131 Subject: [Qemu-devel] [RFC 09/13] hw/m68k: define Macintosh Quadra 800 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 , Fam Zheng , qemu-block@nongnu.org, Jason Wang , "Dr. David Alan Gilbert" , Max Reitz , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Paolo Bonzini , Yongbok Kim , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Laurent Vivier Signed-off-by: Laurent Vivier --- default-configs/m68k-softmmu.mak | 12 ++ hw/display/macfb.c | 31 ++-- hw/m68k/Makefile.objs | 6 +- hw/m68k/bootinfo.h | 99 ++++++++++ hw/m68k/mac.c | 384 +++++++++++++++++++++++++++++++++++= ++++ hw/nubus/nubus-device.c | 13 -- tests/qom-test.c | 5 + tests/test-hmp.c | 3 +- 8 files changed, 519 insertions(+), 34 deletions(-) create mode 100644 hw/m68k/bootinfo.h create mode 100644 hw/m68k/mac.c diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmm= u.mak index 60f7cdfbf2..1b568be166 100644 --- a/default-configs/m68k-softmmu.mak +++ b/default-configs/m68k-softmmu.mak @@ -2,3 +2,15 @@ =20 CONFIG_COLDFIRE=3Dy CONFIG_PTIMER=3Dy +CONFIG_ESCC=3Dy +CONFIG_FRAMEBUFFER=3Dy +CONFIG_ADB=3Dy +CONFIG_MAC_VIA=3Dy +CONFIG_MAC=3Dy +CONFIG_SCSI=3Dy +CONFIG_ESP=3Dy +CONFIG_ASC=3Dy +CONFIG_MACFB=3Dy +CONFIG_NUBUS=3Dy +CONFIG_DP8393X=3Dy +CONFIG_SWIM=3Dy diff --git a/hw/display/macfb.c b/hw/display/macfb.c index 295fd0fc8a..a3204ab150 100644 --- a/hw/display/macfb.c +++ b/hw/display/macfb.c @@ -240,31 +240,28 @@ typedef struct { MacfbState macfb; } MacfbNubusState; =20 -static int macfb_sysbus_init(SysBusDevice *dev) +static void macfb_sysbus_realize(DeviceState *dev, Error **errp) { MacfbState *s =3D &MACFB(dev)->macfb; =20 - macfb_init(DEVICE(dev), s); - sysbus_init_mmio(dev, &s->mem_ctrl); - sysbus_init_mmio(dev, &s->mem_vram); - - return 0; + macfb_init(dev, s); + sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->mem_ctrl); + sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->mem_vram); } =20 const uint8_t macfb_rom[] =3D { 255, 0, 0, 0, }; =20 -static int macfb_nubus_init(NubusDevice *dev) +static void macfb_nubus_realize(DeviceState *dev, Error **errp) { - MacfbState *s =3D &DO_UPCAST(MacfbNubusState, busdev, dev)->macfb; + NubusDevice *nubus =3D NUBUS_DEVICE(dev); + MacfbState *s =3D &DO_UPCAST(MacfbNubusState, busdev, nubus)->macfb; =20 - macfb_init(DEVICE(dev), s); - nubus_add_slot_mmio(dev, DAFB_BASE, &s->mem_ctrl); - nubus_add_slot_mmio(dev, VIDEO_BASE, &s->mem_vram); - nubus_register_rom(dev, macfb_rom, sizeof(macfb_rom), 1, 9, 0xf); - - return 0; + macfb_init(dev, s); + nubus_add_slot_mmio(nubus, DAFB_BASE, &s->mem_ctrl); + nubus_add_slot_mmio(nubus, VIDEO_BASE, &s->mem_vram); + nubus_register_rom(nubus, macfb_rom, sizeof(macfb_rom), 1, 9, 0xf); } =20 static void macfb_sysbus_reset(DeviceState *d) @@ -296,9 +293,8 @@ static Property macfb_nubus_properties[] =3D { static void macfb_sysbus_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D macfb_sysbus_init; + dc->realize =3D macfb_sysbus_realize; dc->desc =3D "SysBus Macintosh framebuffer"; dc->reset =3D macfb_sysbus_reset; dc->vmsd =3D &vmstate_macfb; @@ -308,9 +304,8 @@ static void macfb_sysbus_class_init(ObjectClass *klass,= void *data) static void macfb_nubus_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - NubusDeviceClass *k =3D NUBUS_DEVICE_CLASS(klass); =20 - k->init =3D macfb_nubus_init; + dc->realize =3D macfb_nubus_realize; dc->desc =3D "Nubus Macintosh framebuffer"; dc->reset =3D macfb_nubus_reset; dc->vmsd =3D &vmstate_macfb; diff --git a/hw/m68k/Makefile.objs b/hw/m68k/Makefile.objs index d1f089c08a..ff739617b2 100644 --- a/hw/m68k/Makefile.objs +++ b/hw/m68k/Makefile.objs @@ -1,2 +1,4 @@ -obj-y +=3D an5206.o mcf5208.o -obj-y +=3D mcf5206.o mcf_intc.o +obj-$(CONFIG_COLDFIRE) +=3D an5206.o mcf5208.o +obj-$(CONFIG_MAC) +=3D mac.o + +obj-$(CONFIG_COLDFIRE) +=3D mcf5206.o mcf_intc.o diff --git a/hw/m68k/bootinfo.h b/hw/m68k/bootinfo.h new file mode 100644 index 0000000000..b04153ce1e --- /dev/null +++ b/hw/m68k/bootinfo.h @@ -0,0 +1,99 @@ +struct bi_record { + uint16_t tag; /* tag ID */ + uint16_t size; /* size of record */ + uint32_t data[0]; /* data */ +}; + +/* machine independent tags */ + +#define BI_LAST 0x0000 /* last record */ +#define BI_MACHTYPE 0x0001 /* machine type (u_long) */ +#define BI_CPUTYPE 0x0002 /* cpu type (u_long) */ +#define BI_FPUTYPE 0x0003 /* fpu type (u_long) */ +#define BI_MMUTYPE 0x0004 /* mmu type (u_long) */ +#define BI_MEMCHUNK 0x0005 /* memory chunk address and size */ + /* (struct mem_info) */ +#define BI_RAMDISK 0x0006 /* ramdisk address and size */ + /* (struct mem_info) */ +#define BI_COMMAND_LINE 0x0007 /* kernel command line parameters */ + /* (string) */ + +/* Macintosh-specific tags (all u_long) */ + +#define BI_MAC_MODEL 0x8000 /* Mac Gestalt ID (model type) */ +#define BI_MAC_VADDR 0x8001 /* Mac video base address */ +#define BI_MAC_VDEPTH 0x8002 /* Mac video depth */ +#define BI_MAC_VROW 0x8003 /* Mac video rowbytes */ +#define BI_MAC_VDIM 0x8004 /* Mac video dimensions */ +#define BI_MAC_VLOGICAL 0x8005 /* Mac video logical base */ +#define BI_MAC_SCCBASE 0x8006 /* Mac SCC base address */ +#define BI_MAC_BTIME 0x8007 /* Mac boot time */ +#define BI_MAC_GMTBIAS 0x8008 /* Mac GMT timezone offset */ +#define BI_MAC_MEMSIZE 0x8009 /* Mac RAM size (sanity check) */ +#define BI_MAC_CPUID 0x800a /* Mac CPU type (sanity check) */ +#define BI_MAC_ROMBASE 0x800b /* Mac system ROM base address */ + +/* Macintosh hardware profile data */ + +#define BI_MAC_VIA1BASE 0x8010 /* Mac VIA1 base address (always present) = */ +#define BI_MAC_VIA2BASE 0x8011 /* Mac VIA2 base address (type varies) */ +#define BI_MAC_VIA2TYPE 0x8012 /* Mac VIA2 type (VIA, RBV, OSS) */ +#define BI_MAC_ADBTYPE 0x8013 /* Mac ADB interface type */ +#define BI_MAC_ASCBASE 0x8014 /* Mac Apple Sound Chip base address */ +#define BI_MAC_SCSI5380 0x8015 /* Mac NCR 5380 SCSI (base address, multi)= */ +#define BI_MAC_SCSIDMA 0x8016 /* Mac SCSI DMA (base address) */ +#define BI_MAC_SCSI5396 0x8017 /* Mac NCR 53C96 SCSI (base address, multi= ) */ +#define BI_MAC_IDETYPE 0x8018 /* Mac IDE interface type */ +#define BI_MAC_IDEBASE 0x8019 /* Mac IDE interface base address */ +#define BI_MAC_NUBUS 0x801a /* Mac Nubus type (none, regular, pseudo) = */ +#define BI_MAC_SLOTMASK 0x801b /* Mac Nubus slots present */ +#define BI_MAC_SCCTYPE 0x801c /* Mac SCC serial type (normal, IOP) */ +#define BI_MAC_ETHTYPE 0x801d /* Mac builtin ethernet type (Sonic, MACE = */ +#define BI_MAC_ETHBASE 0x801e /* Mac builtin ethernet base address */ +#define BI_MAC_PMU 0x801f /* Mac power management / poweroff hardwar= e */ +#define BI_MAC_IOP_SWIM 0x8020 /* Mac SWIM floppy IOP */ +#define BI_MAC_IOP_ADB 0x8021 /* Mac ADB IOP */ + +#define BOOTINFO0(as, base, id) \ + do { \ + stw_phys(as, base, id); \ + base +=3D 2; \ + stw_phys(as, base, sizeof(struct bi_record)); \ + base +=3D 2; \ + } while (0) + +#define BOOTINFO1(as, base, id, value) \ + do { \ + stw_phys(as, base, id); \ + base +=3D 2; \ + stw_phys(as, base, sizeof(struct bi_record) + 4); \ + base +=3D 2; \ + stl_phys(as, base, value); \ + base +=3D 4; \ + } while (0) + +#define BOOTINFO2(as, base, id, value1, value2) \ + do { \ + stw_phys(as, base, id); \ + base +=3D 2; \ + stw_phys(as, base, sizeof(struct bi_record) + 8); \ + base +=3D 2; \ + stl_phys(as, base, value1); \ + base +=3D 4; \ + stl_phys(as, base, value2); \ + base +=3D 4; \ + } while (0) + +#define BOOTINFOSTR(as, base, id, string) \ + do { \ + int i; \ + stw_phys(as, base, id); \ + base +=3D 2; \ + stw_phys(as, base, (sizeof(struct bi_record) + strlen(string) + 2)= & ~1); \ + base +=3D 2; \ + for (i =3D 0; string[i]; i++) { \ + stb_phys(as, base++, string[i]); \ + } \ + stb_phys(as, base++, 0); \ + base =3D (parameters_base + 1) & ~1; \ + } while (0) diff --git a/hw/m68k/mac.c b/hw/m68k/mac.c new file mode 100644 index 0000000000..d573339e66 --- /dev/null +++ b/hw/m68k/mac.c @@ -0,0 +1,384 @@ +/* + * QEMU Motorla 680x0 Macintosh hardware System Emulator + * + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included= in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN + * THE SOFTWARE. + */ + +#include "qemu/osdep.h" +#include "sysemu/sysemu.h" +#include "cpu.h" +#include "hw/hw.h" +#include "hw/boards.h" +#include "elf.h" +#include "hw/loader.h" +#include "hw/display/framebuffer.h" +#include "ui/console.h" +#include "exec/address-spaces.h" +#include "hw/char/escc.h" +#include "hw/sysbus.h" +#include "hw/scsi/esp.h" +#include "bootinfo.h" +#include "hw/misc/mac_via.h" +#include "hw/input/adb.h" +#include "hw/audio/asc.h" +#include "hw/nubus/mac.h" +#include "net/net.h" +#include "qapi/error.h" + +#define MACROM_ADDR 0x40000000 +#define MACROM_SIZE 0x00100000 + +/* + * .ident =3D MAC_MODEL_Q800, + * .name =3D "Quadra 800", + * .adb_type =3D MAC_ADB_II, + * .via_type =3D MAC_VIA_QUADRA, + * .scsi_type =3D MAC_SCSI_QUADRA, + * .scc_type =3D MAC_SCC_QUADRA, + * .ether_type =3D MAC_ETHER_SONIC, + * .nubus_type =3D MAC_NUBUS + */ + +#define MACROM_FILENAME "MacROM.bin" + +#define Q800_MACHINE_ID 35 +#define Q800_CPU_ID (1 << 2) +#define Q800_FPU_ID (1 << 2) +#define Q800_MMU_ID (1 << 2) + +#define MACH_MAC 3 +#define Q800_MAC_CPU_ID 2 + +#define VIA_BASE 0x50f00000 +#define SONIC_PROM_BASE 0x50f08000 +#define SONIC_BASE 0x50f0a000 +#define SCC_BASE 0x50f0c020 +#define ESP_BASE 0x50f10000 +#define ESP_PDMA 0x50f10100 +#define ASC_BASE 0x50F14000 +#define SWIM_BASE 0x50F1E000 +#define NUBUS_SUPER_SLOT_BASE 0x60000000 +#define NUBUS_SLOT_BASE 0xf0000000 + +/* the video base, whereas it a Nubus address, + * is needed by the kernel to have early display and + * thus provided by the bootloader + */ +#define VIDEO_BASE 0xf9001000 + +#define MAC_CLOCK 3686418 + +typedef struct { + M68kCPU *cpu; + uint8_t ipr; +} q800_glue_state_t; + +static void q800_glue_set_irq(void *opaque, int irq, int level) +{ + int i; + + q800_glue_state_t *s =3D opaque; + + if (level) { + s->ipr |=3D 1 << irq; + } else { + s->ipr &=3D ~(1 << irq); + } + + for (i =3D 7; i >=3D 0; i--) { + if ((s->ipr >> i) & 1) { + m68k_set_irq_level(s->cpu, i + 1, i + 25); + return; + } + } + m68k_set_irq_level(s->cpu, 0, 0); +} + +static void main_cpu_reset(void *opaque) +{ + M68kCPU *cpu =3D opaque; + CPUState *cs =3D CPU(cpu); + + cpu_reset(cs); + cpu->env.aregs[7] =3D ldl_phys(cs->as, 0); + cpu->env.pc =3D ldl_phys(cs->as, 4); +} + +static void q800_init(MachineState *machine) +{ + M68kCPU *cpu =3D NULL; + int linux_boot; + int32_t kernel_size; + uint64_t elf_entry; + char *filename; + int bios_size; + ram_addr_t initrd_base; + int32_t initrd_size; + MemoryRegion *rom; + MemoryRegion *ram; + ram_addr_t ram_size =3D machine->ram_size; + const char *kernel_filename =3D machine->kernel_filename; + const char *initrd_filename =3D machine->initrd_filename; + const char *kernel_cmdline =3D machine->kernel_cmdline; + q800_glue_state_t *s; + qemu_irq *pic; + hwaddr parameters_base; + CPUState *cs; + DeviceState *dev; + DeviceState *via_dev; + SysBusDevice *sysbus; + BusState *adb_bus; + qemu_irq esp_reset_irq, esp_dma_enable; + NubusBus *nubus; + NubusDevice *nubus_dev; + DriveInfo *fds[2]; + + linux_boot =3D (kernel_filename !=3D NULL); + + /* init CPUs */ + cpu =3D M68K_CPU(cpu_create(machine->cpu_type)); + if (!cpu) { + hw_error("qemu: unable to find m68k CPU definition\n"); + exit(1); + } + qemu_register_reset(main_cpu_reset, cpu); + + ram =3D g_malloc(sizeof(*ram)); + memory_region_init_ram(ram, NULL, "m68k_mac.ram", ram_size, &error_abo= rt); + memory_region_add_subregion(get_system_memory(), 0, ram); + + /* Glue */ + + s =3D (q800_glue_state_t *)g_malloc0(sizeof(q800_glue_state_t)); + s->cpu =3D cpu; + pic =3D qemu_allocate_irqs(q800_glue_set_irq, s, 6); + + /* VIA */ + + via_dev =3D qdev_create(NULL, TYPE_MAC_VIA); + qdev_init_nofail(via_dev); + sysbus =3D SYS_BUS_DEVICE(via_dev); + sysbus_mmio_map(sysbus, 0, VIA_BASE); + sysbus_connect_irq(sysbus, 0, pic[0]); + sysbus_connect_irq(sysbus, 1, pic[1]); + + adb_bus =3D qdev_get_child_bus(via_dev, "adb.0"); + dev =3D qdev_create(adb_bus, TYPE_ADB_KEYBOARD); + qdev_init_nofail(dev); + dev =3D qdev_create(adb_bus, TYPE_ADB_MOUSE); + qdev_init_nofail(dev); + + /* MACSONIC */ + + if (nb_nics !=3D 1) { + hw_error("Q800 needs a dp83932 ethernet interfaces"); + } + if (!nd_table[0].model) { + nd_table[0].model =3D g_strdup("dp83932"); + } + if (strcmp(nd_table[0].model, "dp83932") !=3D 0) { + hw_error("Q800 needs a dp83932 ethernet interfaces"); + } else { + /* MacSonic driver needs an Apple MAC address + * Valid prefix are: + * 00:05:02 Apple + * 00:80:19 Dayna Communications, Inc. + * 00:A0:40 Apple + * 08:00:07 Apple + * (Q800 use the last one) + */ + nd_table[0].macaddr.a[0] =3D 0x08; + nd_table[0].macaddr.a[1] =3D 0x00; + nd_table[0].macaddr.a[2] =3D 0x07; + } + qemu_check_nic_model(&nd_table[0], "dp83932"); + dev =3D qdev_create(NULL, "dp8393x"); + qdev_set_nic_properties(dev, &nd_table[0]); + qdev_prop_set_uint8(dev, "it_shift", 2); + qdev_prop_set_bit(dev, "big_endian", true); + qdev_prop_set_ptr(dev, "dma_mr", get_system_memory()); + qdev_init_nofail(dev); + sysbus =3D SYS_BUS_DEVICE(dev); + sysbus_mmio_map(sysbus, 0, SONIC_BASE); + sysbus_mmio_map(sysbus, 1, SONIC_PROM_BASE); + sysbus_connect_irq(sysbus, 0, pic[2]); + + /* SCC */ + + dev =3D qdev_create(NULL, "escc"); + qdev_prop_set_uint32(dev, "disabled", 0); + qdev_prop_set_uint32(dev, "frequency", MAC_CLOCK); + qdev_prop_set_uint32(dev, "it_shift", 1); + qdev_prop_set_bit(dev, "bit_swap", true); + qdev_prop_set_chr(dev, "chrA", serial_hd(0)); + qdev_prop_set_chr(dev, "chrB", serial_hd(1)); + qdev_prop_set_uint32(dev, "chnBtype", 0); + qdev_prop_set_uint32(dev, "chnAtype", 0); + qdev_init_nofail(dev); + sysbus =3D SYS_BUS_DEVICE(dev); + sysbus_connect_irq(sysbus, 0, pic[3]); + sysbus_connect_irq(sysbus, 1, pic[3]); + sysbus_mmio_map(sysbus, 0, SCC_BASE); + + /* SCSI */ + + esp_init_pdma(ESP_BASE, 4, ESP_PDMA, + qdev_get_gpio_in(via_dev, VIA2_IRQ_SCSI_BIT), + qdev_get_gpio_in(via_dev, VIA2_IRQ_SCSI_DATA_BIT), + &esp_reset_irq, &esp_dma_enable); + + /* Apple Sound Chip */ + + dev =3D qdev_create(NULL, "apple-sound-chip"); + qdev_prop_set_uint8(dev, "asctype", ASC_TYPE_ASC); + qdev_init_nofail(dev); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, ASC_BASE); + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, + qdev_get_gpio_in(via_dev, VIA2_IRQ_ASC_BIT)); + + /* SWIM floppy controller */ + + if (drive_get_max_bus(IF_FLOPPY) >=3D 2) { + fprintf(stderr, "qemu: too many floppy drives\n"); + exit(1); + } + fds[0] =3D drive_get(IF_FLOPPY, 0, 0); + fds[1] =3D drive_get(IF_FLOPPY, 0, 1); + + dev =3D qdev_create(NULL, "sysbus-swim"); + if (fds[0]) { + qdev_prop_set_drive(dev, "driveA", blk_by_legacy_dinfo(fds[0]), + &error_fatal); + } + if (fds[1]) { + qdev_prop_set_drive(dev, "driveB", blk_by_legacy_dinfo(fds[1]), + &error_fatal); + } + qdev_init_nofail(dev); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, SWIM_BASE); + + /* NuBus */ + + nubus =3D nubus_mac_new(NUBUS_SUPER_SLOT_BASE, NUBUS_SLOT_BASE); + + /* framebuffer in nubus slot #9 */ + + nubus_dev =3D nubus_create(nubus, "nubus-macfb"); + qdev_prop_set_uint32(&nubus_dev->qdev, "width", graphic_width); + qdev_prop_set_uint32(&nubus_dev->qdev, "height", graphic_height); + qdev_prop_set_uint8(&nubus_dev->qdev, "depth", graphic_depth); + qdev_init_nofail(&nubus_dev->qdev); + + cs =3D CPU(cpu); + if (linux_boot) { + uint64_t high; + kernel_size =3D load_elf(kernel_filename, NULL, NULL, + &elf_entry, NULL, &high, 1, + EM_68K, 0, 0); + if (kernel_size < 0) { + hw_error("qemu: could not load kernel '%s'\n", + kernel_filename); + exit(1); + } + stl_phys(cs->as, 4, elf_entry); /* reset initial PC */ + parameters_base =3D (high + 1) & ~1; + + BOOTINFO1(cs->as, parameters_base, BI_MACHTYPE, MACH_MAC); + BOOTINFO1(cs->as, parameters_base, BI_FPUTYPE, Q800_FPU_ID); + BOOTINFO1(cs->as, parameters_base, BI_MMUTYPE, Q800_MMU_ID); + BOOTINFO1(cs->as, parameters_base, BI_CPUTYPE, Q800_CPU_ID); + BOOTINFO1(cs->as, parameters_base, BI_MAC_CPUID, Q800_MAC_CPU_ID); + BOOTINFO1(cs->as, parameters_base, BI_MAC_MODEL, Q800_MACHINE_ID); + BOOTINFO1(cs->as, parameters_base, + BI_MAC_MEMSIZE, ram_size >> 20); /* in MB */ + BOOTINFO2(cs->as, parameters_base, BI_MEMCHUNK, 0, ram_size); + BOOTINFO1(cs->as, parameters_base, BI_MAC_VADDR, VIDEO_BASE); + BOOTINFO1(cs->as, parameters_base, BI_MAC_VDEPTH, graphic_depth); + BOOTINFO1(cs->as, parameters_base, BI_MAC_VDIM, + (graphic_height << 16) | graphic_width); + BOOTINFO1(cs->as, parameters_base, BI_MAC_VROW, + (graphic_width * graphic_depth + 7) / 8); + BOOTINFO1(cs->as, parameters_base, BI_MAC_SCCBASE, SCC_BASE); + + if (kernel_cmdline) { + BOOTINFOSTR(cs->as, parameters_base, BI_COMMAND_LINE, + kernel_cmdline); + } + + /* load initrd */ + if (initrd_filename) { + initrd_size =3D get_image_size(initrd_filename); + if (initrd_size < 0) { + hw_error("qemu: could not load initial ram disk '%s'\n", + initrd_filename); + exit(1); + } + + initrd_base =3D (ram_size - initrd_size) & TARGET_PAGE_MASK; + load_image_targphys(initrd_filename, initrd_base, + ram_size - initrd_base); + BOOTINFO2(cs->as, parameters_base, BI_RAMDISK, initrd_base, + initrd_size); + } else { + initrd_base =3D 0; + initrd_size =3D 0; + } + BOOTINFO0(cs->as, parameters_base, BI_LAST); + } else { + uint8_t *ptr; + /* allocate and load BIOS */ + rom =3D g_malloc(sizeof(*rom)); + memory_region_init_ram(rom, NULL, "m68k_mac.rom", MACROM_SIZE, + &error_abort); + if (bios_name =3D=3D NULL) { + bios_name =3D MACROM_FILENAME; + } + filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); + memory_region_set_readonly(rom, true); + memory_region_add_subregion(get_system_memory(), MACROM_ADDR, rom); + + /* Load MacROM binary */ + if (filename) { + bios_size =3D load_image_targphys(filename, MACROM_ADDR, MACRO= M_SIZE); + g_free(filename); + } else { + bios_size =3D -1; + } + if (bios_size < 0 || bios_size > MACROM_SIZE) { + hw_error("qemu: could not load MacROM '%s'\n", bios_name); + exit(1); + } + ptr =3D rom_ptr(MACROM_ADDR); + stl_phys(cs->as, 0, ldl_p(ptr)); /* reset initial SP */ + stl_phys(cs->as, 4, + MACROM_ADDR + ldl_p(ptr + 4)); /* reset initial PC */ + } +} + +static void q800_machine_init(MachineClass *mc) +{ + mc->desc =3D "Macintosh Quadra 800"; + mc->init =3D q800_init; + mc->default_cpu_type =3D M68K_CPU_TYPE_NAME("m68040"); + mc->max_cpus =3D 1; + mc->is_default =3D 0; + mc->block_default_type =3D IF_SCSI; +} + +DEFINE_MACHINE("q800", q800_machine_init) diff --git a/hw/nubus/nubus-device.c b/hw/nubus/nubus-device.c index 0c8023d46a..7fd1e03909 100644 --- a/hw/nubus/nubus-device.c +++ b/hw/nubus/nubus-device.c @@ -238,22 +238,9 @@ static void nubus_device_init(Object *obj) { } =20 -static int nubus_qdev_init(DeviceState *qdev) -{ - NubusDevice *dev =3D NUBUS_DEVICE(qdev); - NubusDeviceClass *klass =3D NUBUS_DEVICE_GET_CLASS(dev); - - if (klass->init) { - return klass->init(dev); - } - - return 0; -} - static void nubus_device_class_init(ObjectClass *klass, void *data) { DeviceClass *k =3D DEVICE_CLASS(klass); - k->init =3D nubus_qdev_init; k->bus_type =3D TYPE_NUBUS_BUS; } =20 diff --git a/tests/qom-test.c b/tests/qom-test.c index e6f712cbd3..373699fda4 100644 --- a/tests/qom-test.c +++ b/tests/qom-test.c @@ -19,12 +19,17 @@ static const char *blacklist_x86[] =3D { "xenfv", "xenpv", NULL }; =20 +static const char *blacklist_m68k[] =3D { + "q800", NULL +}; + static const struct { const char *arch; const char **machine; } blacklists[] =3D { { "i386", blacklist_x86 }, { "x86_64", blacklist_x86 }, + { "m68k", blacklist_m68k }, }; =20 static bool is_blacklisted(const char *arch, const char *mach) diff --git a/tests/test-hmp.c b/tests/test-hmp.c index 5352c9c088..f3b79d5bdf 100644 --- a/tests/test-hmp.c +++ b/tests/test-hmp.c @@ -139,7 +139,8 @@ static void add_machine_test_case(const char *mname) char *path; =20 /* Ignore blacklisted machines that have known problems */ - if (!strcmp("xenfv", mname) || !strcmp("xenpv", mname)) { + if (!strcmp("xenfv", mname) || !strcmp("xenpv", mname) || + !strcmp("q800", mname)) { return; } =20 --=20 2.14.4