From patchwork Wed Sep 9 14:45:45 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 33191 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 271F8B7BCD for ; Thu, 10 Sep 2009 01:10:15 +1000 (EST) Received: from localhost ([127.0.0.1]:51538 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlOoC-0002Gh-W9 for incoming@patchwork.ozlabs.org; Wed, 09 Sep 2009 11:10:09 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MlOR0-00034R-CA for qemu-devel@nongnu.org; Wed, 09 Sep 2009 10:46:10 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MlOQv-00032A-6N for qemu-devel@nongnu.org; Wed, 09 Sep 2009 10:46:09 -0400 Received: from [199.232.76.173] (port=59679 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlOQu-00031z-P8 for qemu-devel@nongnu.org; Wed, 09 Sep 2009 10:46:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39763) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MlOQu-0004hF-32 for qemu-devel@nongnu.org; Wed, 09 Sep 2009 10:46:04 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n89Ek3rb010358 for ; Wed, 9 Sep 2009 10:46:03 -0400 Received: from zweiblum.home.kraxel.org (vpn2-9-67.ams2.redhat.com [10.36.9.67]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id n89Ejrwt029734; Wed, 9 Sep 2009 10:45:54 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id A40F8700E9; Wed, 9 Sep 2009 16:45:48 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 9 Sep 2009 16:45:45 +0200 Message-Id: <1252507547-11398-11-git-send-email-kraxel@redhat.com> In-Reply-To: <1252507547-11398-1-git-send-email-kraxel@redhat.com> References: <1252507547-11398-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 10/12] qdev/isa: convert ne2000 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Also split the isa bits into a separate source file, so we don't drag in a dependency for isa-bus.o for machines which want ne2k_pci only. Signed-off-by: Gerd Hoffmann --- Makefile.target | 5 +- hw/mips_r4k.c | 2 +- hw/ne2000-isa.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ hw/ne2000.c | 106 +++++++++------------------------------------------- hw/ne2000.h | 40 ++++++++++++++++++++ hw/pc.c | 2 +- hw/pc.h | 2 +- hw/ppc_prep.c | 2 +- 8 files changed, 177 insertions(+), 93 deletions(-) create mode 100644 hw/ne2000-isa.c create mode 100644 hw/ne2000.h diff --git a/Makefile.target b/Makefile.target index 67bd4d7..2c03877 100644 --- a/Makefile.target +++ b/Makefile.target @@ -188,13 +188,14 @@ obj-i386-y += fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o obj-i386-y += cirrus_vga.o apic.o ioapic.o parallel.o acpi.o piix_pci.o obj-i386-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o +obj-i386-y += ne2000-isa.o # shared objects obj-ppc-y = ppc.o ide/core.o ide/isa.o ide/pci.o ide/macio.o obj-ppc-y += vga.o $(sound-obj-y) dma.o isa-bus.o openpic.o # PREP target obj-ppc-y += pckbd.o serial.o i8259.o i8254.o fdc.o mc146818rtc.o -obj-ppc-y += prep_pci.o ppc_prep.o +obj-ppc-y += prep_pci.o ppc_prep.o ne2000-isa.o # Mac shared devices obj-ppc-y += macio.o cuda.o adb.o mac_nvram.o mac_dbdma.o # OldWorld PowerMac @@ -215,7 +216,7 @@ obj-mips-y += g364fb.o jazz_led.o dp8393x.o obj-mips-y += ide/core.o ide/isa.o ide/pci.o obj-mips-y += gt64xxx.o pckbd.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o obj-mips-y += piix4.o parallel.o cirrus_vga.o isa-bus.o pcspk.o $(sound-obj-y) -obj-mips-y += mipsnet.o +obj-mips-y += mipsnet.o ne2000-isa.o obj-mips-y += pflash_cfi01.o obj-mips-y += vmware_vga.o diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c index da5ca31..aacb256 100644 --- a/hw/mips_r4k.c +++ b/hw/mips_r4k.c @@ -260,7 +260,7 @@ void mips_r4k_init (ram_addr_t ram_size, isa_vga_init(); if (nd_table[0].vlan) - isa_ne2000_init(0x300, i8259[9], &nd_table[0]); + isa_ne2000_init(0x300, 9, &nd_table[0]); if (drive_get_max_bus(IF_IDE) >= MAX_IDE_BUS) { fprintf(stderr, "qemu: too many IDE bus\n"); diff --git a/hw/ne2000-isa.c b/hw/ne2000-isa.c new file mode 100644 index 0000000..3120035 --- /dev/null +++ b/hw/ne2000-isa.c @@ -0,0 +1,111 @@ +/* + * QEMU NE2000 emulation -- isa bus windup + * + * Copyright (c) 2003-2004 Fabrice Bellard + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * 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 OTHER + * 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 "hw.h" +#include "pc.h" +#include "isa.h" +#include "qdev.h" +#include "net.h" +#include "ne2000.h" + +typedef struct ISANE2000State { + ISADevice dev; + uint32_t iobase; + uint32_t isairq; + NE2000State ne2000; +} ISANE2000State; + +static void isa_ne2000_cleanup(VLANClientState *vc) +{ + NE2000State *s = vc->opaque; + ISANE2000State *isa = container_of(s, ISANE2000State, ne2000); + + unregister_savevm("ne2000", s); + + isa_unassign_ioport(isa->iobase, 16); + isa_unassign_ioport(isa->iobase + 0x10, 2); + isa_unassign_ioport(isa->iobase + 0x1f, 1); + + qemu_free(s); +} + +static int isa_ne2000_initfn(ISADevice *dev) +{ + ISANE2000State *isa = DO_UPCAST(ISANE2000State, dev, dev); + NE2000State *s = &isa->ne2000; + + register_ioport_write(isa->iobase, 16, 1, ne2000_ioport_write, s); + register_ioport_read(isa->iobase, 16, 1, ne2000_ioport_read, s); + + register_ioport_write(isa->iobase + 0x10, 1, 1, ne2000_asic_ioport_write, s); + register_ioport_read(isa->iobase + 0x10, 1, 1, ne2000_asic_ioport_read, s); + register_ioport_write(isa->iobase + 0x10, 2, 2, ne2000_asic_ioport_write, s); + register_ioport_read(isa->iobase + 0x10, 2, 2, ne2000_asic_ioport_read, s); + + register_ioport_write(isa->iobase + 0x1f, 1, 1, ne2000_reset_ioport_write, s); + register_ioport_read(isa->iobase + 0x1f, 1, 1, ne2000_reset_ioport_read, s); + + isa_init_irq(dev, &s->irq, isa->isairq); + + register_savevm("ne2000", -1, 2, ne2000_save, ne2000_load, s); + return 0; +} + +void isa_ne2000_init(int base, int irq, NICInfo *nd) +{ + ISADevice *dev; + NE2000State *s; + + qemu_check_nic_model(nd, "ne2k_isa"); + + dev = isa_create("ne2k_isa"); + qdev_prop_set_uint32(&dev->qdev, "iobase", base); + qdev_prop_set_uint32(&dev->qdev, "irq", irq); + qdev_init(&dev->qdev); + + s = &DO_UPCAST(ISANE2000State, dev, dev)->ne2000; + memcpy(s->macaddr, nd->macaddr, 6); + ne2000_reset(s); /* needs macaddr */ + s->vc = nd->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name, + ne2000_can_receive, ne2000_receive, + NULL, isa_ne2000_cleanup, s); + qemu_format_nic_info_str(s->vc, s->macaddr); +} + +static ISADeviceInfo ne2000_isa_info = { + .qdev.name = "ne2k_isa", + .qdev.size = sizeof(ISANE2000State), + .init = isa_ne2000_initfn, + .qdev.props = (Property[]) { + DEFINE_PROP_HEX32("iobase", ISANE2000State, iobase, 0x300), + DEFINE_PROP_UINT32("irq", ISANE2000State, isairq, 9), + DEFINE_PROP_END_OF_LIST(), + }, +}; + +static void ne2000_isa_register_devices(void) +{ + isa_qdev_register(&ne2000_isa_info); +} + +device_init(ne2000_isa_register_devices) diff --git a/hw/ne2000.c b/hw/ne2000.c index bdfc9ed..cde64be 100644 --- a/hw/ne2000.c +++ b/hw/ne2000.c @@ -25,6 +25,7 @@ #include "pci.h" #include "pc.h" #include "net.h" +#include "ne2000.h" /* debug NE2000 card */ //#define DEBUG_NE2000 @@ -116,42 +117,19 @@ #define ENTSR_CDH 0x40 /* The collision detect "heartbeat" signal was lost. */ #define ENTSR_OWC 0x80 /* There was an out-of-window collision. */ -#define NE2000_PMEM_SIZE (32*1024) -#define NE2000_PMEM_START (16*1024) -#define NE2000_PMEM_END (NE2000_PMEM_SIZE+NE2000_PMEM_START) -#define NE2000_MEM_SIZE NE2000_PMEM_END - -typedef struct NE2000State { - uint8_t cmd; - uint32_t start; - uint32_t stop; - uint8_t boundary; - uint8_t tsr; - uint8_t tpsr; - uint16_t tcnt; - uint16_t rcnt; - uint32_t rsar; - uint8_t rsr; - uint8_t rxcr; - uint8_t isr; - uint8_t dcfg; - uint8_t imr; - uint8_t phys[6]; /* mac address */ - uint8_t curpag; - uint8_t mult[8]; /* multicast mask array */ - qemu_irq irq; - int isa_io_base; - VLANClientState *vc; - uint8_t macaddr[6]; - uint8_t mem[NE2000_MEM_SIZE]; -} NE2000State; - typedef struct PCINE2000State { PCIDevice dev; NE2000State ne2000; } PCINE2000State; -static void ne2000_reset(NE2000State *s) +typedef struct ISANE2000State { + ISADevice dev; + uint32_t iobase; + uint32_t isairq; + NE2000State ne2000; +} ISANE2000State; + +void ne2000_reset(NE2000State *s) { int i; @@ -217,7 +195,7 @@ static int ne2000_buffer_full(NE2000State *s) return 0; } -static int ne2000_can_receive(VLANClientState *vc) +int ne2000_can_receive(VLANClientState *vc) { NE2000State *s = vc->opaque; @@ -228,7 +206,7 @@ static int ne2000_can_receive(VLANClientState *vc) #define MIN_BUF_SIZE 60 -static ssize_t ne2000_receive(VLANClientState *vc, const uint8_t *buf, size_t size_) +ssize_t ne2000_receive(VLANClientState *vc, const uint8_t *buf, size_t size_) { NE2000State *s = vc->opaque; int size = size_; @@ -325,7 +303,7 @@ static ssize_t ne2000_receive(VLANClientState *vc, const uint8_t *buf, size_t si return size_; } -static void ne2000_ioport_write(void *opaque, uint32_t addr, uint32_t val) +void ne2000_ioport_write(void *opaque, uint32_t addr, uint32_t val) { NE2000State *s = opaque; int offset, page, index; @@ -422,7 +400,7 @@ static void ne2000_ioport_write(void *opaque, uint32_t addr, uint32_t val) } } -static uint32_t ne2000_ioport_read(void *opaque, uint32_t addr) +uint32_t ne2000_ioport_read(void *opaque, uint32_t addr) { NE2000State *s = opaque; int offset, page, ret; @@ -572,7 +550,7 @@ static inline void ne2000_dma_update(NE2000State *s, int len) } } -static void ne2000_asic_ioport_write(void *opaque, uint32_t addr, uint32_t val) +void ne2000_asic_ioport_write(void *opaque, uint32_t addr, uint32_t val) { NE2000State *s = opaque; @@ -592,7 +570,7 @@ static void ne2000_asic_ioport_write(void *opaque, uint32_t addr, uint32_t val) } } -static uint32_t ne2000_asic_ioport_read(void *opaque, uint32_t addr) +uint32_t ne2000_asic_ioport_read(void *opaque, uint32_t addr) { NE2000State *s = opaque; int ret; @@ -640,19 +618,19 @@ static uint32_t ne2000_asic_ioport_readl(void *opaque, uint32_t addr) return ret; } -static void ne2000_reset_ioport_write(void *opaque, uint32_t addr, uint32_t val) +void ne2000_reset_ioport_write(void *opaque, uint32_t addr, uint32_t val) { /* nothing to do (end of reset pulse) */ } -static uint32_t ne2000_reset_ioport_read(void *opaque, uint32_t addr) +uint32_t ne2000_reset_ioport_read(void *opaque, uint32_t addr) { NE2000State *s = opaque; ne2000_reset(s); return 0; } -static void ne2000_save(QEMUFile* f, void* opaque) +void ne2000_save(QEMUFile* f, void* opaque) { NE2000State* s = opaque; uint32_t tmp; @@ -680,7 +658,7 @@ static void ne2000_save(QEMUFile* f, void* opaque) qemu_put_buffer(f, s->mem, NE2000_MEM_SIZE); } -static int ne2000_load(QEMUFile* f, void* opaque, int version_id) +int ne2000_load(QEMUFile* f, void* opaque, int version_id) { NE2000State* s = opaque; uint32_t tmp; @@ -741,52 +719,6 @@ static int pci_ne2000_load(QEMUFile* f, void* opaque, int version_id) return ne2000_load(f, &s->ne2000, version_id); } -static void isa_ne2000_cleanup(VLANClientState *vc) -{ - NE2000State *s = vc->opaque; - - unregister_savevm("ne2000", s); - - isa_unassign_ioport(s->isa_io_base, 16); - isa_unassign_ioport(s->isa_io_base + 0x10, 2); - isa_unassign_ioport(s->isa_io_base + 0x1f, 1); - - qemu_free(s); -} - -void isa_ne2000_init(int base, qemu_irq irq, NICInfo *nd) -{ - NE2000State *s; - - qemu_check_nic_model(nd, "ne2k_isa"); - - s = qemu_mallocz(sizeof(NE2000State)); - - register_ioport_write(base, 16, 1, ne2000_ioport_write, s); - register_ioport_read(base, 16, 1, ne2000_ioport_read, s); - - register_ioport_write(base + 0x10, 1, 1, ne2000_asic_ioport_write, s); - register_ioport_read(base + 0x10, 1, 1, ne2000_asic_ioport_read, s); - register_ioport_write(base + 0x10, 2, 2, ne2000_asic_ioport_write, s); - register_ioport_read(base + 0x10, 2, 2, ne2000_asic_ioport_read, s); - - register_ioport_write(base + 0x1f, 1, 1, ne2000_reset_ioport_write, s); - register_ioport_read(base + 0x1f, 1, 1, ne2000_reset_ioport_read, s); - s->isa_io_base = base; - s->irq = irq; - memcpy(s->macaddr, nd->macaddr, 6); - - ne2000_reset(s); - - s->vc = nd->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name, - ne2000_can_receive, ne2000_receive, - NULL, isa_ne2000_cleanup, s); - - qemu_format_nic_info_str(s->vc, s->macaddr); - - register_savevm("ne2000", -1, 2, ne2000_save, ne2000_load, s); -} - /***********************************************************/ /* PCI NE2000 definitions */ diff --git a/hw/ne2000.h b/hw/ne2000.h new file mode 100644 index 0000000..92a2ddb --- /dev/null +++ b/hw/ne2000.h @@ -0,0 +1,40 @@ +#define NE2000_PMEM_SIZE (32*1024) +#define NE2000_PMEM_START (16*1024) +#define NE2000_PMEM_END (NE2000_PMEM_SIZE+NE2000_PMEM_START) +#define NE2000_MEM_SIZE NE2000_PMEM_END + +typedef struct NE2000State { + uint8_t cmd; + uint32_t start; + uint32_t stop; + uint8_t boundary; + uint8_t tsr; + uint8_t tpsr; + uint16_t tcnt; + uint16_t rcnt; + uint32_t rsar; + uint8_t rsr; + uint8_t rxcr; + uint8_t isr; + uint8_t dcfg; + uint8_t imr; + uint8_t phys[6]; /* mac address */ + uint8_t curpag; + uint8_t mult[8]; /* multicast mask array */ + qemu_irq irq; + VLANClientState *vc; + uint8_t macaddr[6]; + uint8_t mem[NE2000_MEM_SIZE]; +} NE2000State; + +void ne2000_ioport_write(void *opaque, uint32_t addr, uint32_t val); +uint32_t ne2000_ioport_read(void *opaque, uint32_t addr); +void ne2000_asic_ioport_write(void *opaque, uint32_t addr, uint32_t val); +uint32_t ne2000_asic_ioport_read(void *opaque, uint32_t addr); +void ne2000_reset_ioport_write(void *opaque, uint32_t addr, uint32_t val); +uint32_t ne2000_reset_ioport_read(void *opaque, uint32_t addr); +void ne2000_save(QEMUFile* f, void* opaque); +int ne2000_load(QEMUFile* f, void* opaque, int version_id); +void ne2000_reset(NE2000State *s); +int ne2000_can_receive(VLANClientState *vc); +ssize_t ne2000_receive(VLANClientState *vc, const uint8_t *buf, size_t size_); diff --git a/hw/pc.c b/hw/pc.c index e1ffaa4..9497f71 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1052,7 +1052,7 @@ static void pc_init_ne2k_isa(NICInfo *nd) if (nb_ne2k == NE2000_NB_MAX) return; isa_ne2000_init(ne2000_io[nb_ne2k], - isa_reserve_irq(ne2000_irq[nb_ne2k]), nd); + ne2000_irq[nb_ne2k], nd); nb_ne2k++; } diff --git a/hw/pc.h b/hw/pc.h index ec5735b..d80d3a5 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -148,7 +148,7 @@ void isa_cirrus_vga_init(void); /* ne2000.c */ -void isa_ne2000_init(int base, qemu_irq irq, NICInfo *nd); +void isa_ne2000_init(int base, int irq, NICInfo *nd); int cpu_is_bsp(CPUState *env); #endif diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index 3fbfc8b..994c965 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -691,7 +691,7 @@ static void ppc_prep_init (ram_addr_t ram_size, nd_table[i].model = "ne2k_isa"; } if (strcmp(nd_table[i].model, "ne2k_isa") == 0) { - isa_ne2000_init(ne2000_io[i], i8259[ne2000_irq[i]], &nd_table[i]); + isa_ne2000_init(ne2000_io[i], ne2000_irq[i], &nd_table[i]); } else { pci_nic_init(&nd_table[i], "ne2k_pci", NULL); }