Re: [Qemu-devel] [PATCH] call ide_reset when resetting the piix

[Ryan Harper]

* Naphtali Sprei <address@hidden> [2009-07-27 12:13]:
> In some cases reboot sequence fails to detect the ide device in the rombios
> sequence for ata_detect, since ioport writes are ignored when the
> ide device status indicates busy or data request in progres.
> The ide if must be reset when system reset.

Does this fix any particular bugs?  Is this a candidate for stable
branch?

> 
> Signed-off-by: Naphtali Sprei <address@hidden>
> ---
>  hw/ide.c |   14 ++++++++------
>  1 files changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/hw/ide.c b/hw/ide.c
> index f3787f2..4bf0987 100644
> --- a/hw/ide.c
> +++ b/hw/ide.c
> @@ -3352,6 +3352,8 @@ static void piix3_reset(void *opaque)
> 
>      for (i = 0; i < 2; i++)
>          ide_dma_cancel(&d->bmdma[i]);
> +    for (i = 0; i < 4; i++)
> +        ide_reset(&d->ide_if[i]);
> 
>      pci_conf[0x04] = 0x00;
>      pci_conf[0x05] = 0x00;
> @@ -3383,9 +3385,6 @@ void pci_piix3_ide_init(PCIBus *bus, BlockDriverState 
> **hd_table, int devfn,
>      pci_config_set_class(pci_conf, PCI_CLASS_STORAGE_IDE);
>      pci_conf[PCI_HEADER_TYPE] = PCI_HEADER_TYPE_NORMAL; // header_type
> 
> -    qemu_register_reset(piix3_reset, 0, d);
> -    piix3_reset(d);
> -
>      pci_register_bar((PCIDevice *)d, 4, 0x10,
>                             PCI_ADDRESS_SPACE_IO, bmdma_map);
> 
> @@ -3398,6 +3397,9 @@ void pci_piix3_ide_init(PCIBus *bus, BlockDriverState 
> **hd_table, int devfn,
>          if (hd_table[i])
>              hd_table[i]->private = &d->dev;
> 
> +    qemu_register_reset(piix3_reset, 0, d);
> +    piix3_reset(d);
> +
>      register_savevm("ide", 0, 2, pci_ide_save, pci_ide_load, d);
>  }
> 
> @@ -3423,9 +3425,6 @@ void pci_piix4_ide_init(PCIBus *bus, BlockDriverState 
> **hd_table, int devfn,
>      pci_config_set_class(pci_conf, PCI_CLASS_STORAGE_IDE);
>      pci_conf[PCI_HEADER_TYPE] = PCI_HEADER_TYPE_NORMAL; // header_type
> 
> -    qemu_register_reset(piix3_reset, 0, d);
> -    piix3_reset(d);
> -
>      pci_register_bar((PCIDevice *)d, 4, 0x10,
>                             PCI_ADDRESS_SPACE_IO, bmdma_map);
> 
> @@ -3434,6 +3433,9 @@ void pci_piix4_ide_init(PCIBus *bus, BlockDriverState 
> **hd_table, int devfn,
>      ide_init_ioport(&d->ide_if[0], 0x1f0, 0x3f6);
>      ide_init_ioport(&d->ide_if[2], 0x170, 0x376);
> 
> +    qemu_register_reset(piix3_reset, 0, d);
> +    piix3_reset(d);
> +
>      register_savevm("ide", 0, 2, pci_ide_save, pci_ide_load, d);
>  }
> 
> -- 
> 1.5.5.6
> 
> 

-- 
Ryan Harper
Software Engineer; Linux Technology Center
IBM Corp., Austin, Tx
address@hidden