Message ID | 1381391779-27718-6-git-send-email-pingfank@linux.vnet.ibm.com |
---|---|
State | New |
Headers | show |
On Thu, Oct 10, 2013 at 03:56:19PM +0800, Liu Ping Fan wrote: > For pc-piix-*, hpet's intcap is always hard coded as IRQ2. > For q35, if it is pc-q35-1.7 and earlier, we use IRQ2 for compat > reason, otherwise IRQ2, IRQ8, and IRQ16~23 are allowed. > > Signed-off-by: Liu Ping Fan <pingfank@linux.vnet.ibm.com> > --- > hw/i386/pc.c | 21 ++++++++++++++++----- > hw/i386/pc_piix.c | 3 ++- > hw/i386/pc_q35.c | 2 +- > include/hw/i386/pc.h | 3 ++- > 4 files changed, 21 insertions(+), 8 deletions(-) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index f2b7b6c..062019d 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -1219,7 +1219,8 @@ static const MemoryRegionOps ioportF0_io_ops = { > void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, > ISADevice **rtc_state, > ISADevice **floppy, > - bool no_vmport) > + bool no_vmport, > + bool hpet_irqs) > { > int i; > DriveInfo *fd[MAX_FD]; > @@ -1249,10 +1250,20 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, > /* In order to set property, here not using sysbus_try_create_simple */ > hpet = qdev_try_create(NULL, "hpet"); > if (hpet) { > - /* tmp fix. For compat, hard code to IRQ2 until we have correct > - * compat property and differentiate pc-iix with pc-q35 > - */ > - qdev_prop_set_uint32(hpet, "intcap", 0x4); > + /* For pc-piix-*, hpet's intcap is always IRQ2. */ > + if (!hpet_irqs) { > + qdev_prop_set_uint32(hpet, "intcap", 0x4); > + } else { > + /* For pc-q35-1.7 and earlier, use IRQ2 for compat. */ > + uint8_t compat = object_property_get_int(OBJECT(hpet), > + "compat", NULL); > + if (compat) { > + qdev_prop_set_uint32(hpet, "intcap", 0x4); > + } else { > + /* using IRQ16~23, IRQ8 and IRQ2 */ > + qdev_prop_set_uint32(hpet, "intcap", 0xff0104); > + } > + } So why do we need an extra property? uint8_t compat = object_property_get_int(OBJECT(hpet), "intcap", NULL); if (!intcap) { /* For pc-piix-*, hpet's intcap is IRQ2. */ /* For Q35, using IRQ16~23, IRQ8 and IRQ2 */ uint32_t intcap = hpet_irqs ? 0xff0104 : 0x4; qdev_prop_set_uint32(hpet, "intcap", intcap); } now all you need to do for compat is set intcap property. > qdev_init_nofail(hpet); > sysbus_mmio_map(SYS_BUS_DEVICE(hpet), 0, HPET_BASE); > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 90f1ea4..a45ce11 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -180,7 +180,8 @@ static void pc_init1(QEMUMachineInitArgs *args, > pc_vga_init(isa_bus, pci_enabled ? pci_bus : NULL); > > /* init basic PC hardware */ > - pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, xen_enabled()); > + pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, xen_enabled(), > + false); > > pc_nic_init(isa_bus, pci_bus); > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index ca84e1c..9e41f4a 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -181,7 +181,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args) > pc_register_ferr_irq(gsi[13]); > > /* init basic PC hardware */ > - pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, false); > + pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, false, true); > > /* connect pm stuff to lpc */ > ich9_lpc_pm_init(lpc); > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 80aa7bd..a49d9cd 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -134,7 +134,8 @@ DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus); > void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, > ISADevice **rtc_state, > ISADevice **floppy, > - bool no_vmport); > + bool no_vmport, > + bool hpet_irqs); > void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd); > void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, > const char *boot_device, > -- > 1.8.1.4
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index f2b7b6c..062019d 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1219,7 +1219,8 @@ static const MemoryRegionOps ioportF0_io_ops = { void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, ISADevice **rtc_state, ISADevice **floppy, - bool no_vmport) + bool no_vmport, + bool hpet_irqs) { int i; DriveInfo *fd[MAX_FD]; @@ -1249,10 +1250,20 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, /* In order to set property, here not using sysbus_try_create_simple */ hpet = qdev_try_create(NULL, "hpet"); if (hpet) { - /* tmp fix. For compat, hard code to IRQ2 until we have correct - * compat property and differentiate pc-iix with pc-q35 - */ - qdev_prop_set_uint32(hpet, "intcap", 0x4); + /* For pc-piix-*, hpet's intcap is always IRQ2. */ + if (!hpet_irqs) { + qdev_prop_set_uint32(hpet, "intcap", 0x4); + } else { + /* For pc-q35-1.7 and earlier, use IRQ2 for compat. */ + uint8_t compat = object_property_get_int(OBJECT(hpet), + "compat", NULL); + if (compat) { + qdev_prop_set_uint32(hpet, "intcap", 0x4); + } else { + /* using IRQ16~23, IRQ8 and IRQ2 */ + qdev_prop_set_uint32(hpet, "intcap", 0xff0104); + } + } qdev_init_nofail(hpet); sysbus_mmio_map(SYS_BUS_DEVICE(hpet), 0, HPET_BASE); diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 90f1ea4..a45ce11 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -180,7 +180,8 @@ static void pc_init1(QEMUMachineInitArgs *args, pc_vga_init(isa_bus, pci_enabled ? pci_bus : NULL); /* init basic PC hardware */ - pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, xen_enabled()); + pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, xen_enabled(), + false); pc_nic_init(isa_bus, pci_bus); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index ca84e1c..9e41f4a 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -181,7 +181,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args) pc_register_ferr_irq(gsi[13]); /* init basic PC hardware */ - pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, false); + pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, false, true); /* connect pm stuff to lpc */ ich9_lpc_pm_init(lpc); diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 80aa7bd..a49d9cd 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -134,7 +134,8 @@ DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus); void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, ISADevice **rtc_state, ISADevice **floppy, - bool no_vmport); + bool no_vmport, + bool hpet_irqs); void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd); void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, const char *boot_device,
For pc-piix-*, hpet's intcap is always hard coded as IRQ2. For q35, if it is pc-q35-1.7 and earlier, we use IRQ2 for compat reason, otherwise IRQ2, IRQ8, and IRQ16~23 are allowed. Signed-off-by: Liu Ping Fan <pingfank@linux.vnet.ibm.com> --- hw/i386/pc.c | 21 ++++++++++++++++----- hw/i386/pc_piix.c | 3 ++- hw/i386/pc_q35.c | 2 +- include/hw/i386/pc.h | 3 ++- 4 files changed, 21 insertions(+), 8 deletions(-)