From nobody Sat Nov 23 21:29:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1729674030741255.69516249607068; Wed, 23 Oct 2024 02:00:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t3XDu-0001XH-Hj; Wed, 23 Oct 2024 05:00:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t3XDp-0001N0-PX for qemu-devel@nongnu.org; Wed, 23 Oct 2024 05:00:07 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t3XDn-0000Mu-OV for qemu-devel@nongnu.org; Wed, 23 Oct 2024 05:00:05 -0400 Received: from [2a02:8012:c93d:0:260e:bf57:a4e9:8142] (helo=cheesecake.fritz.box) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1t3XDN-0008EL-FK; Wed, 23 Oct 2024 09:59:37 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=jHCPHwYNdJVTOr6wFMmpu+w67QlujWQpzGyzvLt7Qgc=; b=aQsPnB2xFLAh+Z5IB5qqY1jPfs +9KlkIpNo6ABXPiGbRRdQjH/HBNpAtqEc3YZrJBDtjs5Rk5+G9qcrnnY2/OG7z5ABHVCWUOEgy2pm RNsrY6XkhJst9WtHH80vQM0x/yzrpXM15+9/kzC9J83Bn+UyP3o7eXCAGyUzkmaVNC1zn+LpqRGeP dgc1fEtJfjq1ZMeiemAyyTsWj6BKcMzbNRGzmEucfC+eUSNH5HzdomIYEyP6bBjbknO8ucdXm3xEs UTeJFZufG8D0R7NfCjGp9Cnv7FcssOWQ4CK43PdixWnZ0VZ7AFxp8xdfurrgrZhxBW9AfnqXem+xK otD218BzInbM9nrp77i/8638kwzlYh3VTalY4qR5i5ImfujjrML+6UCPKmp1JUZ8XCgNzhIzjhVmh ofpCSOVHk92rEFwHeG5UDqQ6qZLPh3qHwrPoPKf/wkSXUFJXHYpMrJn2LgaBPdL8qGI2twLBORfvl 5g4fVmnY6OJRyxd6sr0OMVXmbh8MlhIt0QbrdclWo1gXKcZs0d90fbVoO9n/thJIkiG/tKCON0hLF OqjJBmORKyRk62xRagAsOVzrSd5LBLJNXTR7vNfDlDHCOr3FlFxnULtoUHGgeMhdHf7cn6QeuL6+L xBUS8fFsSNRPwDQBC0umqFlOPsBaF0iDCb243A1nQ=; From: Mark Cave-Ayland To: huth@tuxfamily.org, qemu-devel@nongnu.org Date: Wed, 23 Oct 2024 09:58:31 +0100 Message-Id: <20241023085852.1061031-16-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241023085852.1061031-1-mark.cave-ayland@ilande.co.uk> References: <20241023085852.1061031-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a02:8012:c93d:0:260e:bf57:a4e9:8142 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 15/36] next-cube: move en ethernet MMIO to separate memory region on next-pc device X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1729674032239116600 Content-Type: text/plain; charset="utf-8" Move the en ethernet MMIO accesses to a separate memory region on the next-= pc device instead of being part of the next.scr MMIO memory region. Signed-off-by: Mark Cave-Ayland Reviewed-by: Thomas Huth --- hw/m68k/next-cube.c | 48 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index 402aa7ea8e..3278970890 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -110,6 +110,7 @@ struct NeXTPC { =20 MemoryRegion floppy_mem; MemoryRegion timer_mem; + MemoryRegion dummyen_mem; MemoryRegion mmiomem; MemoryRegion scrmem; =20 @@ -372,11 +373,6 @@ static uint64_t next_scr_readfn(void *opaque, hwaddr a= ddr, unsigned size) uint64_t val; =20 switch (addr) { - /* For now return dummy byte to allow the Ethernet test to timeout */ - case 0x6000: - val =3D 0xff; - break; - default: DPRINTF("BMAP Read @ 0x%x size %u\n", (unsigned int)addr, size); val =3D 0; @@ -1012,6 +1008,38 @@ static const MemoryRegionOps next_timer_ops =3D { .endianness =3D DEVICE_BIG_ENDIAN, }; =20 +static void next_dummy_en_write(void *opaque, hwaddr addr, uint64_t val, + unsigned size) +{ + /* Do nothing */ + return; +} + +static uint64_t next_dummy_en_read(void *opaque, hwaddr addr, unsigned siz= e) +{ + uint64_t val; + + switch (addr) { + case 0: + /* For now return dummy byte to allow the Ethernet test to timeout= */ + val =3D 0xff; + break; + + default: + val =3D 0; + } + + return val; +} + +static const MemoryRegionOps next_dummy_en_ops =3D { + .read =3D next_dummy_en_read, + .write =3D next_dummy_en_write, + .valid.min_access_size =3D 1, + .valid.max_access_size =3D 4, + .endianness =3D DEVICE_BIG_ENDIAN, +}; + static void next_pc_reset(DeviceState *dev) { NeXTPC *s =3D NEXT_PC(dev); @@ -1034,6 +1062,10 @@ static void next_pc_realize(DeviceState *dev, Error = **errp) SysBusDevice *sbd; DeviceState *d; =20 + /* en network (dummy) */ + memory_region_add_subregion(&s->scrmem, 0x6000, + &s->dummyen_mem); + /* SCSI */ sbd =3D SYS_BUS_DEVICE(&s->next_scsi); if (!sysbus_realize(sbd, errp)) { @@ -1093,6 +1125,9 @@ static void next_pc_init(Object *obj) sysbus_init_mmio(sbd, &s->mmiomem); sysbus_init_mmio(sbd, &s->scrmem); =20 + memory_region_init_io(&s->dummyen_mem, OBJECT(s), &next_dummy_en_ops, = s, + "next.en", 0x20); + object_initialize_child(obj, "next-scsi", &s->next_scsi, TYPE_NEXT_SCS= I); =20 memory_region_init_io(&s->floppy_mem, OBJECT(s), &next_floppy_ops, s, @@ -1239,9 +1274,6 @@ static void next_cube_init(MachineState *machine) } } =20 - /* TODO: */ - /* Network */ - /* DMA */ memory_region_init_io(&m->dmamem, NULL, &next_dma_ops, machine, "next.dma", 0x5000); --=20 2.39.5