From patchwork Fri Sep 11 12:32:28 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 33464 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 EE63FB6F20 for ; Fri, 11 Sep 2009 23:28:02 +1000 (EST) Received: from localhost ([127.0.0.1]:59605 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mm6AQ-0002Hc-5s for incoming@patchwork.ozlabs.org; Fri, 11 Sep 2009 09:27:58 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mm5JU-0004VV-Ou for qemu-devel@nongnu.org; Fri, 11 Sep 2009 08:33:16 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mm5JN-0004MI-Vf for qemu-devel@nongnu.org; Fri, 11 Sep 2009 08:33:14 -0400 Received: from [199.232.76.173] (port=49299 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mm5JN-0004LE-9g for qemu-devel@nongnu.org; Fri, 11 Sep 2009 08:33:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46330) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mm5JM-00047o-He for qemu-devel@nongnu.org; Fri, 11 Sep 2009 08:33:09 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8BCX7W6020000 for ; Fri, 11 Sep 2009 08:33:07 -0400 Received: from zweiblum.home.kraxel.org (vpn1-5-42.ams2.redhat.com [10.36.5.42]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id n8BCWvYx010002; Fri, 11 Sep 2009 08:33:01 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 688A9700E2; Fri, 11 Sep 2009 14:32:32 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 11 Sep 2009 14:32:28 +0200 Message-Id: <1252672351-12937-6-git-send-email-kraxel@redhat.com> In-Reply-To: <1252672351-12937-1-git-send-email-kraxel@redhat.com> References: <1252672351-12937-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 5/8] ide/pci: convert to qdev. 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 With this patch applied ide drives (when attached to a pci adapter) can be created via -device, like this: -drive if=none,id=mydisk,file=/path/to/disk.img -device ide-drive,drive=mydisk,bus=ide.0,unit=0 Note that creating a master on ide1 doesn't work that way. That is a side effect of qemu creating a cdrom automagically even if you don't ask for it. Signed-off-by: Gerd Hoffmann --- Makefile.target | 10 ++- hw/ide/pci.c | 205 ++++++++++++++++++++++++++++++++++--------------------- 2 files changed, 133 insertions(+), 82 deletions(-) diff --git a/Makefile.target b/Makefile.target index 0fe8b6a..3c71736 100644 --- a/Makefile.target +++ b/Makefile.target @@ -183,7 +183,8 @@ obj-y += e1000.o obj-y += wdt_i6300esb.o # Hardware support -obj-i386-y = ide/core.o ide/isa.o ide/pci.o pckbd.o $(sound-obj-y) dma.o isa-bus.o +obj-i386-y = ide/core.o ide/qdev.o ide/isa.o ide/pci.o +obj-i386-y += pckbd.o $(sound-obj-y) dma.o isa-bus.o obj-i386-y += vga.o vga-pci.o vga-isa.o 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 @@ -192,7 +193,7 @@ 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 = ppc.o ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/macio.o obj-ppc-y += vga.o vga-pci.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 @@ -215,7 +216,7 @@ obj-mips-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o obj-mips-y += mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o rc4030.o obj-mips-y += vga-pci.o vga-isa.o vga-isa-mm.o 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 += ide/core.o ide/qdev.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 ne2000-isa.o @@ -247,7 +248,8 @@ obj-cris-y += etraxfs_ser.o obj-cris-y += pflash_cfi02.o ifeq ($(TARGET_ARCH), sparc64) -obj-sparc-y = sun4u.o ide/core.o ide/pci.o isa-bus.o pckbd.o apb_pci.o +obj-sparc-y = sun4u.o isa-bus.o pckbd.o apb_pci.o +obj-sparc-y += ide/core.o ide/qdev.o ide/pci.o obj-sparc-y += vga.o vga-pci.o obj-sparc-y += fdc.o mc146818rtc.o serial.o obj-sparc-y += cirrus_vga.o parallel.o diff --git a/hw/ide/pci.c b/hw/ide/pci.c index 607472b..aa6daf2 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "block.h" #include "block_int.h" #include "sysemu.h" @@ -50,9 +51,10 @@ typedef struct PCIIDEState { PCIDevice dev; - IDEBus bus[2]; + IDEBus *bus[2]; BMDMAState bmdma[2]; int type; /* see IDE_TYPE_xxx */ + uint32_t secondary; } PCIIDEState; static void cmd646_update_irq(PCIIDEState *d); @@ -64,7 +66,7 @@ static void ide_map(PCIDevice *pci_dev, int region_num, IDEBus *bus; if (region_num <= 3) { - bus = &d->bus[(region_num >> 1)]; + bus = d->bus[(region_num >> 1)]; if (region_num & 1) { register_ioport_read(addr + 2, 1, 1, ide_status_read, bus); register_ioport_write(addr + 2, 1, 1, ide_cmd_write, bus); @@ -250,9 +252,9 @@ static void bmdma_map(PCIDevice *pci_dev, int region_num, for(i = 0;i < 2; i++) { BMDMAState *bm = &d->bmdma[i]; - d->bus[i].bmdma = bm; + d->bus[i]->bmdma = bm; bm->pci_dev = DO_UPCAST(PCIIDEState, dev, pci_dev); - bm->bus = d->bus+i; + bm->bus = d->bus[i]; qemu_add_vm_change_state_handler(ide_dma_restart_cb, bm); register_ioport_write(addr, 1, 1, bmdma_cmd_writeb, bm); @@ -292,13 +294,13 @@ static void pci_ide_save(QEMUFile* f, void *opaque) /* per IDE interface data */ for(i = 0; i < 2; i++) { - idebus_save(f, &d->bus[i]); + idebus_save(f, d->bus[i]); } /* per IDE drive data */ for(i = 0; i < 2; i++) { - ide_save(f, &d->bus[i].ifs[0]); - ide_save(f, &d->bus[i].ifs[1]); + ide_save(f, &d->bus[i]->ifs[0]); + ide_save(f, &d->bus[i]->ifs[1]); } } @@ -328,17 +330,31 @@ static int pci_ide_load(QEMUFile* f, void *opaque, int version_id) /* per IDE interface data */ for(i = 0; i < 2; i++) { - idebus_load(f, &d->bus[i], version_id); + idebus_load(f, d->bus[i], version_id); } /* per IDE drive data */ for(i = 0; i < 2; i++) { - ide_load(f, &d->bus[i].ifs[0], version_id); - ide_load(f, &d->bus[i].ifs[1], version_id); + ide_load(f, &d->bus[i]->ifs[0], version_id); + ide_load(f, &d->bus[i]->ifs[1], version_id); } return 0; } +static void pci_ide_create_devs(PCIDevice *dev, DriveInfo **hd_table) +{ + PCIIDEState *d = DO_UPCAST(PCIIDEState, dev, dev); + static const int bus[4] = { 0, 0, 1, 1 }; + static const int unit[4] = { 0, 1, 0, 1 }; + int i; + + for (i = 0; i < 4; i++) { + if (hd_table[i] == NULL) + continue; + ide_create_drive(d->bus[bus[i]], unit[i], hd_table[i]); + } +} + /* XXX: call it also when the MRDMODE is changed from the PCI config registers */ static void cmd646_update_irq(PCIIDEState *d) @@ -375,19 +391,13 @@ static void cmd646_reset(void *opaque) } /* CMD646 PCI IDE controller */ -void pci_cmd646_ide_init(PCIBus *bus, DriveInfo **hd_table, - int secondary_ide_enabled) +static int pci_cmd646_ide_initfn(PCIDevice *dev) { - PCIIDEState *d; - uint8_t *pci_conf; + PCIIDEState *d = DO_UPCAST(PCIIDEState, dev, dev); + uint8_t *pci_conf = d->dev.config; qemu_irq *irq; - d = (PCIIDEState *)pci_register_device(bus, "CMD646 IDE", - sizeof(PCIIDEState), - -1, - NULL, NULL); d->type = IDE_TYPE_CMD646; - pci_conf = d->dev.config; pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_CMD); pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_CMD_646); @@ -398,31 +408,47 @@ void pci_cmd646_ide_init(PCIBus *bus, DriveInfo **hd_table, pci_conf[PCI_HEADER_TYPE] = PCI_HEADER_TYPE_NORMAL; // header_type pci_conf[0x51] = 0x04; // enable IDE0 - if (secondary_ide_enabled) { + if (d->secondary) { /* XXX: if not enabled, really disable the seconday IDE controller */ pci_conf[0x51] |= 0x08; /* enable IDE1 */ } + pci_conf[0x3d] = 0x01; // interrupt on pin 1 pci_register_bar((PCIDevice *)d, 0, 0x8, - PCI_ADDRESS_SPACE_IO, ide_map); + PCI_ADDRESS_SPACE_IO, ide_map); pci_register_bar((PCIDevice *)d, 1, 0x4, - PCI_ADDRESS_SPACE_IO, ide_map); + PCI_ADDRESS_SPACE_IO, ide_map); pci_register_bar((PCIDevice *)d, 2, 0x8, - PCI_ADDRESS_SPACE_IO, ide_map); + PCI_ADDRESS_SPACE_IO, ide_map); pci_register_bar((PCIDevice *)d, 3, 0x4, - PCI_ADDRESS_SPACE_IO, ide_map); + PCI_ADDRESS_SPACE_IO, ide_map); pci_register_bar((PCIDevice *)d, 4, 0x10, - PCI_ADDRESS_SPACE_IO, bmdma_map); + PCI_ADDRESS_SPACE_IO, bmdma_map); - pci_conf[0x3d] = 0x01; // interrupt on pin 1 + register_savevm("ide", 0, 3, pci_ide_save, pci_ide_load, d); - irq = qemu_allocate_irqs(cmd646_set_irq, d, 2); - ide_init2(&d->bus[0], hd_table[0], hd_table[1], irq[0]); - ide_init2(&d->bus[1], hd_table[2], hd_table[3], irq[1]); + d->bus[0] = ide_bus_new(&d->dev.qdev); + d->bus[1] = ide_bus_new(&d->dev.qdev); - register_savevm("ide", 0, 3, pci_ide_save, pci_ide_load, d); qemu_register_reset(cmd646_reset, d); cmd646_reset(d); + + irq = qemu_allocate_irqs(cmd646_set_irq, d, 2); + ide_init2(d->bus[0], NULL, NULL, irq[0]); + ide_init2(d->bus[1], NULL, NULL, irq[1]); + return 0; +} + +void pci_cmd646_ide_init(PCIBus *bus, DriveInfo **hd_table, + int secondary_ide_enabled) +{ + PCIDevice *dev; + + dev = pci_create_noinit(bus, -1, "CMD646 IDE"); + qdev_prop_set_uint32(&dev->qdev, "secondary", secondary_ide_enabled); + qdev_init(&dev->qdev); + + pci_ide_create_devs(dev, hd_table); } static void piix3_reset(void *opaque) @@ -441,23 +467,10 @@ static void piix3_reset(void *opaque) pci_conf[0x20] = 0x01; /* BMIBA: 20-23h */ } -/* hd_table must contain 4 block drivers */ -/* NOTE: for the PIIX3, the IRQs and IOports are hardcoded */ -void pci_piix3_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn) +static int pci_piix_ide_initfn(PCIIDEState *d) { - PCIIDEState *d; - uint8_t *pci_conf; - - /* register a function 1 of PIIX3 */ - d = (PCIIDEState *)pci_register_device(bus, "PIIX3 IDE", - sizeof(PCIIDEState), - devfn, - NULL, NULL); - d->type = IDE_TYPE_PIIX3; + uint8_t *pci_conf = d->dev.config; - pci_conf = d->dev.config; - pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_INTEL); - pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_INTEL_82371SB_1); pci_conf[0x09] = 0x80; // legacy ATA mode pci_config_set_class(pci_conf, PCI_CLASS_STORAGE_IDE); pci_conf[PCI_HEADER_TYPE] = PCI_HEADER_TYPE_NORMAL; // header_type @@ -466,48 +479,84 @@ void pci_piix3_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn) piix3_reset(d); pci_register_bar((PCIDevice *)d, 4, 0x10, - PCI_ADDRESS_SPACE_IO, bmdma_map); - - ide_init2(&d->bus[0], hd_table[0], hd_table[1], isa_reserve_irq(14)); - ide_init2(&d->bus[1], hd_table[2], hd_table[3], isa_reserve_irq(15)); - ide_init_ioport(&d->bus[0], 0x1f0, 0x3f6); - ide_init_ioport(&d->bus[1], 0x170, 0x376); + PCI_ADDRESS_SPACE_IO, bmdma_map); register_savevm("ide", 0, 3, pci_ide_save, pci_ide_load, d); + + d->bus[0] = ide_bus_new(&d->dev.qdev); + d->bus[1] = ide_bus_new(&d->dev.qdev); + ide_init_ioport(d->bus[0], 0x1f0, 0x3f6); + ide_init_ioport(d->bus[1], 0x170, 0x376); + + ide_init2(d->bus[0], NULL, NULL, isa_reserve_irq(14)); + ide_init2(d->bus[1], NULL, NULL, isa_reserve_irq(15)); + return 0; } -/* hd_table must contain 4 block drivers */ -/* NOTE: for the PIIX4, the IRQs and IOports are hardcoded */ -void pci_piix4_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn) +static int pci_piix3_ide_initfn(PCIDevice *dev) { - PCIIDEState *d; - uint8_t *pci_conf; - - /* register a function 1 of PIIX4 */ - d = (PCIIDEState *)pci_register_device(bus, "PIIX4 IDE", - sizeof(PCIIDEState), - devfn, - NULL, NULL); - d->type = IDE_TYPE_PIIX4; + PCIIDEState *d = DO_UPCAST(PCIIDEState, dev, dev); - pci_conf = d->dev.config; - pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_INTEL); - pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_INTEL_82371AB); - pci_conf[0x09] = 0x80; // legacy ATA mode - pci_config_set_class(pci_conf, PCI_CLASS_STORAGE_IDE); - pci_conf[PCI_HEADER_TYPE] = PCI_HEADER_TYPE_NORMAL; // header_type + d->type = IDE_TYPE_PIIX3; + pci_config_set_vendor_id(d->dev.config, PCI_VENDOR_ID_INTEL); + pci_config_set_device_id(d->dev.config, PCI_DEVICE_ID_INTEL_82371SB_1); + return pci_piix_ide_initfn(d); +} - qemu_register_reset(piix3_reset, d); - piix3_reset(d); +static int pci_piix4_ide_initfn(PCIDevice *dev) +{ + PCIIDEState *d = DO_UPCAST(PCIIDEState, dev, dev); - pci_register_bar((PCIDevice *)d, 4, 0x10, - PCI_ADDRESS_SPACE_IO, bmdma_map); + d->type = IDE_TYPE_PIIX4; + pci_config_set_vendor_id(d->dev.config, PCI_VENDOR_ID_INTEL); + pci_config_set_device_id(d->dev.config, PCI_DEVICE_ID_INTEL_82371AB); + return pci_piix_ide_initfn(d); +} - ide_init2(&d->bus[0], hd_table[0], hd_table[1], isa_reserve_irq(14)); - ide_init2(&d->bus[1], hd_table[2], hd_table[3], isa_reserve_irq(15)); - ide_init_ioport(&d->bus[0], 0x1f0, 0x3f6); - ide_init_ioport(&d->bus[1], 0x170, 0x376); +/* hd_table must contain 4 block drivers */ +/* NOTE: for the PIIX3, the IRQs and IOports are hardcoded */ +void pci_piix3_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn) +{ + PCIDevice *dev; - register_savevm("ide", 0, 3, pci_ide_save, pci_ide_load, d); + dev = pci_create_simple(bus, devfn, "PIIX3 IDE"); + pci_ide_create_devs(dev, hd_table); +} + +/* hd_table must contain 4 block drivers */ +/* NOTE: for the PIIX4, the IRQs and IOports are hardcoded */ +void pci_piix4_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn) +{ + PCIDevice *dev; + + dev = pci_create_simple(bus, devfn, "PIIX4 IDE"); + pci_ide_create_devs(dev, hd_table); } +static PCIDeviceInfo piix_ide_info[] = { + { + .qdev.name = "PIIX3 IDE", + .qdev.size = sizeof(PCIIDEState), + .init = pci_piix3_ide_initfn, + },{ + .qdev.name = "PIIX4 IDE", + .qdev.size = sizeof(PCIIDEState), + .init = pci_piix4_ide_initfn, + },{ + .qdev.name = "CMD646 IDE", + .qdev.size = sizeof(PCIIDEState), + .init = pci_cmd646_ide_initfn, + .qdev.props = (Property[]) { + DEFINE_PROP_UINT32("secondary", PCIIDEState, secondary, 0), + DEFINE_PROP_END_OF_LIST(), + }, + },{ + /* end of list */ + } +}; + +static void piix_ide_register(void) +{ + pci_qdev_register_many(piix_ide_info); +} +device_init(piix_ide_register);