[Qemu-devel] [BUG] Regression for machine using fdc

[Qemu-devel] [BUG] Regression for machine using fdc

[Stefan Weil]

Hello

8baf73adf664e79eae201c3f618078a220a661d9 (qdev/isa: convert fdc)
breaks MIPS Malta:

Tried to create isa device isa-fdc with no isa bus present

Maybe other machines (mips_jazz, ppc_prec, sun4u) are also affected.

Regards
Stefan

[Qemu-devel] [PATCH] mips malta: Fix fdc regression

[Stefan Weil]

8baf73adf664e79eae201c3f618078a220a661d9 (qdev/isa: convert fdc)
breaks MIPS Malta:

Tried to create isa device isa-fdc with no isa bus present

Fix this by creating an isa bus for piix4
and convert initialization code for i8042
in mips_malta.c to new style (copy from pc.c)

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 hw/mips_malta.c |    6 +++++-
 hw/piix_pci.c   |    1 +
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index d8fa264..e4421a6 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -764,6 +764,7 @@ void mips_malta_init (ram_addr_t ram_size,
     target_long bios_size;
     int64_t kernel_entry;
     PCIBus *pci_bus;
+    ISADevice *isa_dev;
     CPUState *env;
     RTCState *rtc_state;
     fdctrl_t *floppy_controller;
@@ -919,7 +920,10 @@ void mips_malta_init (ram_addr_t ram_size,
     DMA_init(0);
 
     /* Super I/O */
-    i8042_init(i8259[1], i8259[12], 0x60);
+    isa_dev = isa_create_simple("i8042", 0x60, 0x64);
+    isa_connect_irq(isa_dev, 0, i8259[1]);
+    isa_connect_irq(isa_dev, 1, i8259[12]);
+ 
     rtc_state = rtc_init(0x70, i8259[8], 2000);
     serial_init(0x3f8, i8259[4], 115200, serial_hds[0]);
     serial_init(0x2f8, i8259[3], 115200, serial_hds[1]);
diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index e2ddf4b..736fca4 100644
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -362,6 +362,7 @@ static void piix4_initfn(PCIDevice *d)
 {
     uint8_t *pci_conf;
 
+    isa_bus_new(&d->qdev);
     register_savevm("PIIX4", 0, 2, piix_save, piix_load, d);
 
     pci_conf = d->config;
-- 
1.5.6.5

[Qemu-devel] Re: [PATCH] mips malta: Fix fdc regression

[Stefan Weil]

Stefan Weil schrieb:
> 8baf73adf664e79eae201c3f618078a220a661d9 (qdev/isa: convert fdc)
> breaks MIPS Malta:
>
> Tried to create isa device isa-fdc with no isa bus present
>
> Fix this by creating an isa bus for piix4
> and convert initialization code for i8042
> in mips_malta.c to new style (copy from pc.c)
>
> Signed-off-by: Stefan Weil <weil@mail.berlios.de>
> ---
>  hw/mips_malta.c |    6 +++++-
>  hw/piix_pci.c   |    1 +
>  2 files changed, 6 insertions(+), 1 deletions(-)
>
> diff --git a/hw/mips_malta.c b/hw/mips_malta.c
> index d8fa264..e4421a6 100644
> --- a/hw/mips_malta.c
> +++ b/hw/mips_malta.c
> @@ -764,6 +764,7 @@ void mips_malta_init (ram_addr_t ram_size,
>      target_long bios_size;
>      int64_t kernel_entry;
>      PCIBus *pci_bus;
> +    ISADevice *isa_dev;
>      CPUState *env;
>      RTCState *rtc_state;
>      fdctrl_t *floppy_controller;
> @@ -919,7 +920,10 @@ void mips_malta_init (ram_addr_t ram_size,
>      DMA_init(0);
>  
>      /* Super I/O */
> -    i8042_init(i8259[1], i8259[12], 0x60);
> +    isa_dev = isa_create_simple("i8042", 0x60, 0x64);
> +    isa_connect_irq(isa_dev, 0, i8259[1]);
> +    isa_connect_irq(isa_dev, 1, i8259[12]);
> + 
>      rtc_state = rtc_init(0x70, i8259[8], 2000);
>      serial_init(0x3f8, i8259[4], 115200, serial_hds[0]);
>      serial_init(0x2f8, i8259[3], 115200, serial_hds[1]);
> diff --git a/hw/piix_pci.c b/hw/piix_pci.c
> index e2ddf4b..736fca4 100644
> --- a/hw/piix_pci.c
> +++ b/hw/piix_pci.c
> @@ -362,6 +362,7 @@ static void piix4_initfn(PCIDevice *d)
>  {
>      uint8_t *pci_conf;
>  
> +    isa_bus_new(&d->qdev);
>      register_savevm("PIIX4", 0, 2, piix_save, piix_load, d);
>  
>      pci_conf = d->config;
>   

The patch no longer applies because i8042_init changed in latest QEMU.
I'll split it in two independent new patches.

Regards
Stefan

[Qemu-devel] [PATCH] mips malta: Fix fdc regression

[Stefan Weil]

8baf73adf664e79eae201c3f618078a220a661d9 (qdev/isa: convert fdc)
breaks MIPS Malta:

Tried to create isa device isa-fdc with no isa bus present

Fix this by creating an isa bus for piix4.

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 hw/piix_pci.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index c9fef92..91fd038 100644
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -365,6 +365,7 @@ static int piix4_initfn(PCIDevice *d)
 {
     uint8_t *pci_conf;
 
+    isa_bus_new(&d->qdev);
     register_savevm("PIIX4", 0, 2, piix_save, piix_load, d);
 
     pci_conf = d->config;
-- 
1.5.6.5

[Qemu-devel] [PATCH] mips malta: Fix fdc regression and use qdev for i8042 setup

[Stefan Weil]

8baf73adf664e79eae201c3f618078a220a661d9 (qdev/isa: convert fdc)
breaks MIPS Malta:

Tried to create isa device isa-fdc with no isa bus present

Fix this by creating an isa bus for piix4.
This change also requires some more qdev related changes
(similar changes were applied to pc.c) and allows
cleaning of piix3/piix4 code.

Thanks to Gerd Hoffmann for his hints.

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 hw/ide.h        |    6 ++----
 hw/ide/pci.c    |   13 ++++---------
 hw/mips_malta.c |   19 +++++++++++--------
 hw/piix_pci.c   |    1 +
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/hw/ide.h b/hw/ide.h
index 56cf4ec..9fcbce6 100644
--- a/hw/ide.h
+++ b/hw/ide.h
@@ -10,10 +10,8 @@ void isa_ide_init(int iobase, int iobase2, qemu_irq irq,
 /* ide-pci.c */
 void pci_cmd646_ide_init(PCIBus *bus, BlockDriverState **hd_table,
                          int secondary_ide_enabled);
-void pci_piix3_ide_init(PCIBus *bus, BlockDriverState **hd_table, int devfn,
-                        qemu_irq *pic);
-void pci_piix4_ide_init(PCIBus *bus, BlockDriverState **hd_table, int devfn,
-                        qemu_irq *pic);
+void pci_piix3_ide_init(PCIBus *bus, BlockDriverState **hd_table, int devfn);
+void pci_piix4_ide_init(PCIBus *bus, BlockDriverState **hd_table, int devfn);
 
 /* ide-macio.c */
 int pmac_ide_init (BlockDriverState **hd_table, qemu_irq irq,
diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index a3d6bd0..bf5f278 100644
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -443,8 +443,7 @@ static void piix3_reset(void *opaque)
 
 /* hd_table must contain 4 block drivers */
 /* NOTE: for the PIIX3, the IRQs and IOports are hardcoded */
-void pci_piix3_ide_init(PCIBus *bus, BlockDriverState **hd_table, int devfn,
-                        qemu_irq *pic)
+void pci_piix3_ide_init(PCIBus *bus, BlockDriverState **hd_table, int devfn)
 {
     PCIIDEState *d;
     uint8_t *pci_conf;
@@ -484,8 +483,7 @@ void pci_piix3_ide_init(PCIBus *bus, BlockDriverState **hd_table, int devfn,
 
 /* hd_table must contain 4 block drivers */
 /* NOTE: for the PIIX4, the IRQs and IOports are hardcoded */
-void pci_piix4_ide_init(PCIBus *bus, BlockDriverState **hd_table, int devfn,
-                        qemu_irq *pic)
+void pci_piix4_ide_init(PCIBus *bus, BlockDriverState **hd_table, int devfn)
 {
     PCIIDEState *d;
     uint8_t *pci_conf;
@@ -510,11 +508,8 @@ void pci_piix4_ide_init(PCIBus *bus, BlockDriverState **hd_table, int devfn,
     pci_register_bar((PCIDevice *)d, 4, 0x10,
                            PCI_ADDRESS_SPACE_IO, bmdma_map);
 
-    /*
-     * These should call isa_reserve_irq() instead when MIPS supports it
-     */
-    ide_init2(&d->bus[0], hd_table[0], hd_table[1], pic[14]);
-    ide_init2(&d->bus[1], hd_table[2], hd_table[3], pic[15]);
+    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);
 
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index a70d79e..d047424 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -765,6 +765,7 @@ void mips_malta_init (ram_addr_t ram_size,
     target_long bios_size;
     int64_t kernel_entry;
     PCIBus *pci_bus;
+    ISADevice *isa_dev;
     CPUState *env;
     RTCState *rtc_state;
     fdctrl_t *floppy_controller;
@@ -904,9 +905,10 @@ void mips_malta_init (ram_addr_t ram_size,
     }
 
     piix4_devfn = piix4_init(pci_bus, 80);
-    pci_piix4_ide_init(pci_bus, hd, piix4_devfn + 1, i8259);
+    isa_bus_irqs(i8259);
+    pci_piix4_ide_init(pci_bus, hd, piix4_devfn + 1);
     usb_uhci_piix4_init(pci_bus, piix4_devfn + 2);
-    smbus = piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100, i8259[9]);
+    smbus = piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100, isa_reserve_irq(9));
     eeprom_buf = qemu_mallocz(8 * 256); /* XXX: make this persistent */
     for (i = 0; i < 8; i++) {
         /* TODO: Populate SPD eeprom data.  */
@@ -916,16 +918,17 @@ void mips_malta_init (ram_addr_t ram_size,
         qdev_prop_set_ptr(eeprom, "data", eeprom_buf + (i * 256));
         qdev_init(eeprom);
     }
-    pit = pit_init(0x40, i8259[0]);
+    pit = pit_init(0x40, isa_reserve_irq(0));
     DMA_init(0);
 
     /* Super I/O */
-    i8042_init(i8259[1], i8259[12], 0x60);
-    rtc_state = rtc_init(0x70, i8259[8], 2000);
-    serial_init(0x3f8, i8259[4], 115200, serial_hds[0]);
-    serial_init(0x2f8, i8259[3], 115200, serial_hds[1]);
+    isa_dev = isa_create_simple("i8042", 0x60, 0x64, 1, 12);
+ 
+    rtc_state = rtc_init(0x70, isa_reserve_irq(8), 2000);
+    serial_init(0x3f8, isa_reserve_irq(4), 115200, serial_hds[0]);
+    serial_init(0x2f8, isa_reserve_irq(3), 115200, serial_hds[1]);
     if (parallel_hds[0])
-        parallel_init(0x378, i8259[7], parallel_hds[0]);
+        parallel_init(0x378, isa_reserve_irq(7), parallel_hds[0]);
     for(i = 0; i < MAX_FD; i++) {
         dinfo = drive_get(IF_FLOPPY, 0, i);
         fd[i] = dinfo ? dinfo->bdrv : NULL;
diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index c9fef92..91fd038 100644
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -365,6 +365,7 @@ static int piix4_initfn(PCIDevice *d)
 {
     uint8_t *pci_conf;
 
+    isa_bus_new(&d->qdev);
     register_savevm("PIIX4", 0, 2, piix_save, piix_load, d);
 
     pci_conf = d->config;
-- 
1.5.6.5

[Qemu-devel] Re: [PATCH] mips malta: Fix fdc regression and use qdev for i8042 setup

[Gerd Hoffmann]

On 08/28/09 19:37, Stefan Weil wrote:
> Fix this by creating an isa bus for piix4.
> This change also requires some more qdev related changes
> (similar changes were applied to pc.c) and allows
> cleaning of piix3/piix4 code.

Patch looks good.

Acked-by: Gerd Hoffmann <kraxel@redhat.com>

cheers,
   Gerd

[Qemu-devel] Re: [PATCH] mips malta: Fix fdc regression

[Stefan Weil]

Stefan Weil schrieb:
> 8baf73adf664e79eae201c3f618078a220a661d9 (qdev/isa: convert fdc)
> breaks MIPS Malta:
>
> Tried to create isa device isa-fdc with no isa bus present
>
> Fix this by creating an isa bus for piix4.
>
> Signed-off-by: Stefan Weil <weil@mail.berlios.de>
> ---
>  hw/piix_pci.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/hw/piix_pci.c b/hw/piix_pci.c
> index c9fef92..91fd038 100644
> --- a/hw/piix_pci.c
> +++ b/hw/piix_pci.c
> @@ -365,6 +365,7 @@ static int piix4_initfn(PCIDevice *d)
>  {
>      uint8_t *pci_conf;
>  
> +    isa_bus_new(&d->qdev);
>      register_savevm("PIIX4", 0, 2, piix_save, piix_load, d);
>  
>      pci_conf = d->config;
>   

This patch no longer is sufficient with latest QEMU
because ISA irqs also have to be defined (otherwise
the MIPS Malta emulation gets a runtime crash).

Please don't use it.

Use the new patch (mips malta: Fix fdc regression and use qdev for i8042
setup).

Regards
Stefan

[Qemu-devel] [PATCH] mips malta: Use qdev for i8042 setup

[Stefan Weil]

This is just a copy of similar changes which were applied to pc.c.

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 hw/mips_malta.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index a70d79e..23c257a 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -765,6 +765,7 @@ void mips_malta_init (ram_addr_t ram_size,
     target_long bios_size;
     int64_t kernel_entry;
     PCIBus *pci_bus;
+    ISADevice *isa_dev;
     CPUState *env;
     RTCState *rtc_state;
     fdctrl_t *floppy_controller;
@@ -920,7 +921,8 @@ void mips_malta_init (ram_addr_t ram_size,
     DMA_init(0);
 
     /* Super I/O */
-    i8042_init(i8259[1], i8259[12], 0x60);
+    isa_dev = isa_create_simple("i8042", 0x60, 0x64, 1, 12);
+ 
     rtc_state = rtc_init(0x70, i8259[8], 2000);
     serial_init(0x3f8, i8259[4], 115200, serial_hds[0]);
     serial_init(0x2f8, i8259[3], 115200, serial_hds[1]);
-- 
1.5.6.5

[Qemu-devel] Re: [PATCH] mips malta: Use qdev for i8042 setup

[Stefan Weil]

Stefan Weil schrieb:
> This is just a copy of similar changes which were applied to pc.c.
>
> Signed-off-by: Stefan Weil <weil@mail.berlios.de>
> ---
>  hw/mips_malta.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/hw/mips_malta.c b/hw/mips_malta.c
> index a70d79e..23c257a 100644
> --- a/hw/mips_malta.c
> +++ b/hw/mips_malta.c
> @@ -765,6 +765,7 @@ void mips_malta_init (ram_addr_t ram_size,
>      target_long bios_size;
>      int64_t kernel_entry;
>      PCIBus *pci_bus;
> +    ISADevice *isa_dev;
>      CPUState *env;
>      RTCState *rtc_state;
>      fdctrl_t *floppy_controller;
> @@ -920,7 +921,8 @@ void mips_malta_init (ram_addr_t ram_size,
>      DMA_init(0);
>  
>      /* Super I/O */
> -    i8042_init(i8259[1], i8259[12], 0x60);
> +    isa_dev = isa_create_simple("i8042", 0x60, 0x64, 1, 12);
> + 
>      rtc_state = rtc_init(0x70, i8259[8], 2000);
>      serial_init(0x3f8, i8259[4], 115200, serial_hds[0]);
>      serial_init(0x2f8, i8259[3], 115200, serial_hds[1]);
>   

Please don't use this patch. It results in a runtime error because
isa interrupts are uninitialized.

Stefan

Re: [Qemu-devel] [BUG] Regression for machine using fdc

[Stefan Weil]

Stefan Weil schrieb:
> Hello
>
> 8baf73adf664e79eae201c3f618078a220a661d9 (qdev/isa: convert fdc)
> breaks MIPS Malta:
>
> Tried to create isa device isa-fdc with no isa bus present
>
> Maybe other machines (mips_jazz, ppc_prec, sun4u) are also affected.
>
> Regards
> Stefan

mips_malta works now again (with patch in separate mail),
sun4u should work, at least it calls isa_bus_new,
but I still expect a regression for mips_jazz and ppc_prep.

Stefan

Re: [Qemu-devel] [BUG] Regression for machine using fdc

[Gerd Hoffmann]

On 08/27/09 08:26, Stefan Weil wrote:
> Stefan Weil schrieb:
>> Hello
>>
>> 8baf73adf664e79eae201c3f618078a220a661d9 (qdev/isa: convert fdc)
>> breaks MIPS Malta:
>>
>> Tried to create isa device isa-fdc with no isa bus present
>>
>> Maybe other machines (mips_jazz, ppc_prec, sun4u) are also affected.
>>
>> Regards
>> Stefan
>
> mips_malta works now again (with patch in separate mail),
> sun4u should work, at least it calls isa_bus_new,
> but I still expect a regression for mips_jazz and ppc_prep.

-M isapc is broken too btw.  The ISA patches sent to the list yesterday 
are providing a sysbus->isa bridge and fix the -M isapc breakage.  With 
them applied fixing the other machines is simple one-liner as 
isa_bus_new(NULL) can be used then for machines without a PCI->ISA bridge.

cheers,
   Gerd

Re: [Qemu-devel] [BUG] Regression for machine using fdc

[Hervé Poussineau]

Stefan Weil a écrit :
> Stefan Weil schrieb:
>   
>> Hello
>>
>> 8baf73adf664e79eae201c3f618078a220a661d9 (qdev/isa: convert fdc)
>> breaks MIPS Malta:
>>
>> Tried to create isa device isa-fdc with no isa bus present
>>
>> Maybe other machines (mips_jazz, ppc_prec, sun4u) are also affected.
>>
>> Regards
>> Stefan
>>     
>
> mips_malta works now again (with patch in separate mail),
> sun4u should work, at least it calls isa_bus_new,
> but I still expect a regression for mips_jazz and ppc_prep.
>   

Mips Magnum has a floppy disk controller which is memory-mapped. It is 
connected to jazz IRQ controller (works in Qemu) and to jazz DMA 
controller (not done in Qemu). The problem I'm still facing is that it 
is intimately linked with i8257 DMA engine, and I wasn't able to easily 
decouple them.

Hervé