Re: [PATCH v5 06/13] hw/isa/vt82c686: Instantiate IDE function in host device

[Daniel Henrique Barboza]

On 9/1/22 08:41, Bernhard Beschow wrote:
> The IDE function is closely tied to the ISA function (e.g. the IDE
> interrupt routing happens there), so it makes sense that the IDE
> function is instantiated within the south bridge itself.
>
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
> ---

Acked-by: Daniel Henrique Barboza <danielhb413@gmail.com>

>   configs/devices/mips64el-softmmu/default.mak |  1 -
>   hw/isa/Kconfig                               |  1 +
>   hw/isa/vt82c686.c                            | 17 +++++++++++++++++
>   hw/mips/fuloong2e.c                          |  8 ++++----
>   hw/ppc/Kconfig                               |  1 -
>   hw/ppc/pegasos2.c                            |  9 ++++-----
>   6 files changed, 26 insertions(+), 11 deletions(-)
>
> diff --git a/configs/devices/mips64el-softmmu/default.mak 
> b/configs/devices/mips64el-softmmu/default.mak
> index c610749ac1..d5188f7ea5 100644
> --- a/configs/devices/mips64el-softmmu/default.mak
> +++ b/configs/devices/mips64el-softmmu/default.mak
> @@ -1,7 +1,6 @@
>   # Default configuration for mips64el-softmmu
>   
>   include ../mips-softmmu/common.mak
> -CONFIG_IDE_VIA=y
>   CONFIG_FULOONG=y
>   CONFIG_LOONGSON3V=y
>   CONFIG_ATI_VGA=y
> diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
> index d42143a991..20de7e9294 100644
> --- a/hw/isa/Kconfig
> +++ b/hw/isa/Kconfig
> @@ -53,6 +53,7 @@ config VT82C686
>       select I8254
>       select I8257
>       select I8259
> +    select IDE_VIA
>       select MC146818RTC
>       select PARALLEL
>   
> diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
> index 37e37b3855..63c1e3b8ce 100644
> --- a/hw/isa/vt82c686.c
> +++ b/hw/isa/vt82c686.c
> @@ -17,6 +17,7 @@
>   #include "hw/isa/vt82c686.h"
>   #include "hw/pci/pci.h"
>   #include "hw/qdev-properties.h"
> +#include "hw/ide/pci.h"
>   #include "hw/isa/isa.h"
>   #include "hw/isa/superio.h"
>   #include "hw/intc/i8259.h"
> @@ -544,6 +545,7 @@ struct ViaISAState {
>       qemu_irq cpu_intr;
>       qemu_irq *isa_irqs;
>       ViaSuperIOState via_sio;
> +    PCIIDEState ide;
>   };
>   
>   static const VMStateDescription vmstate_via = {
> @@ -556,10 +558,18 @@ static const VMStateDescription vmstate_via = {
>       }
>   };
>   
> +static void via_isa_init(Object *obj)
> +{
> +    ViaISAState *s = VIA_ISA(obj);
> +
> +    object_initialize_child(obj, "ide", &s->ide, TYPE_VIA_IDE);
> +}
> +
>   static const TypeInfo via_isa_info = {
>       .name          = TYPE_VIA_ISA,
>       .parent        = TYPE_PCI_DEVICE,
>       .instance_size = sizeof(ViaISAState),
> +    .instance_init = via_isa_init,
>       .abstract      = true,
>       .interfaces    = (InterfaceInfo[]) {
>           { INTERFACE_CONVENTIONAL_PCI_DEVICE },
> @@ -583,6 +593,7 @@ static void via_isa_realize(PCIDevice *d, Error **errp)
>   {
>       ViaISAState *s = VIA_ISA(d);
>       DeviceState *dev = DEVICE(d);
> +    PCIBus *pci_bus = pci_get_bus(d);
>       qemu_irq *isa_irq;
>       ISABus *isa_bus;
>       int i;
> @@ -612,6 +623,12 @@ static void via_isa_realize(PCIDevice *d, Error **errp)
>       if (!qdev_realize(DEVICE(&s->via_sio), BUS(isa_bus), errp)) {
>           return;
>       }
> +
> +    /* Function 1: IDE */
> +    qdev_prop_set_int32(DEVICE(&s->ide), "addr", d->devfn + 1);
> +    if (!qdev_realize(DEVICE(&s->ide), BUS(pci_bus), errp)) {
> +        return;
> +    }
>   }
>   
>   /* TYPE_VT82C686B_ISA */
> diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c
> index 44225fbe33..32605901e7 100644
> --- a/hw/mips/fuloong2e.c
> +++ b/hw/mips/fuloong2e.c
> @@ -199,13 +199,13 @@ static void main_cpu_reset(void *opaque)
>   static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq 
> intc,
>                                          I2CBus **i2c_bus)
>   {
> -    PCIDevice *dev;
> +    PCIDevice *dev, *via;
>   
> -    dev = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(slot, 0), true,
> +    via = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(slot, 0), true,
>                                             TYPE_VT82C686B_ISA);
> -    qdev_connect_gpio_out(DEVICE(dev), 0, intc);
> +    qdev_connect_gpio_out(DEVICE(via), 0, intc);
>   
> -    dev = pci_create_simple(pci_bus, PCI_DEVFN(slot, 1), TYPE_VIA_IDE);
> +    dev = PCI_DEVICE(object_resolve_path_component(OBJECT(via), "ide"));
>       pci_ide_create_devs(dev);
>   
>       pci_create_simple(pci_bus, PCI_DEVFN(slot, 2), "vt82c686b-usb-uhci");
> diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
> index 400511c6b7..18565e966b 100644
> --- a/hw/ppc/Kconfig
> +++ b/hw/ppc/Kconfig
> @@ -74,7 +74,6 @@ config PEGASOS2
>       bool
>       select MV64361
>       select VT82C686
> -    select IDE_VIA
>       select SMBUS_EEPROM
>       select VOF
>   # This should come with VT82C686
> diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c
> index 8039775f80..8bc528a560 100644
> --- a/hw/ppc/pegasos2.c
> +++ b/hw/ppc/pegasos2.c
> @@ -102,7 +102,7 @@ static void pegasos2_init(MachineState *machine)
>       CPUPPCState *env;
>       MemoryRegion *rom = g_new(MemoryRegion, 1);
>       PCIBus *pci_bus;
> -    PCIDevice *dev;
> +    PCIDevice *dev, *via;
>       I2CBus *i2c_bus;
>       const char *fwname = machine->firmware ?: PROM_FILENAME;
>       char *filename;
> @@ -160,13 +160,12 @@ static void pegasos2_init(MachineState *machine)
>   
>       /* VIA VT8231 South Bridge (multifunction PCI device) */
>       /* VT8231 function 0: PCI-to-ISA Bridge */
> -    dev = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(12, 0), true,
> +    via = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(12, 0), true,
>                                             TYPE_VT8231_ISA);
> -    qdev_connect_gpio_out(DEVICE(dev), 0,
> +    qdev_connect_gpio_out(DEVICE(via), 0,
>                             qdev_get_gpio_in_named(pm->mv, "gpp", 31));
>   
> -    /* VT8231 function 1: IDE Controller */
> -    dev = pci_create_simple(pci_bus, PCI_DEVFN(12, 1), TYPE_VIA_IDE);
> +    dev = PCI_DEVICE(object_resolve_path_component(OBJECT(via), "ide"));
>       pci_ide_create_devs(dev);
>   
>       /* VT8231 function 2-3: USB Ports */