Commit 7a10ef51 authored by Liu Ping Fan's avatar Liu Ping Fan Committed by Michael S. Tsirkin
Browse files

hpet: enable to entitle more irq pins for hpet 



Owning to some different hardware design, piix and q35 need
different compat. So making them diverge.

On q35, IRQ2/8 can be reserved for hpet timer 0/1. And pin 16~23
can be assigned to hpet as guest chooses. So we introduce intcap
property to do that.

Consider the compat and piix/q35, we finally have the following
value for intcap: For piix, hpet's intcap is hard coded as IRQ2.
For pc-q35-1.7 and earlier, we use IRQ2 for compat reason. Otherwise
IRQ2, IRQ8, and IRQ16~23 are allowed.

Signed-off-by: default avatarLiu Ping Fan <pingfank@linux.vnet.ibm.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 0d63b2dd

hw/i386/pc.c

+16 −3
Original line number Diff line number Diff line
@@ -1253,7 +1253,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,

                          uint32 hpet_irqs)

{

    int i;

    DriveInfo *fd[MAX_FD];
@@ -1280,9 +1281,21 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, 
     * when the HPET wants to take over. Thus we have to disable the latter.

     */

    if (!no_hpet && (!kvm_irqchip_in_kernel() || kvm_has_pit_state2())) {

        hpet = sysbus_try_create_simple("hpet", HPET_BASE, NULL);



        /* In order to set property, here not using sysbus_try_create_simple */

        hpet = qdev_try_create(NULL, "hpet");

        if (hpet) {

            /* For pc-piix-*, hpet's intcap is always IRQ2. For pc-q35-1.7

             * and earlier, use IRQ2 for compat. Otherwise, use IRQ16~23,

             * IRQ8 and IRQ2.

             */

            uint8_t compat = object_property_get_int(OBJECT(hpet),

                    HPET_INTCAP, NULL);

            if (!compat) {

                qdev_prop_set_uint32(hpet, HPET_INTCAP, hpet_irqs);

            }

            qdev_init_nofail(hpet);

            sysbus_mmio_map(SYS_BUS_DEVICE(hpet), 0, HPET_BASE);



            for (i = 0; i < GSI_NUM_PINS; i++) {

                sysbus_connect_irq(SYS_BUS_DEVICE(hpet), i, gsi[i]);

            }

hw/i386/pc_piix.c

+2 −1
Original line number Diff line number Diff line
@@ -189,7 +189,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(),

        0x4);



    pc_nic_init(isa_bus, pci_bus);

hw/i386/pc_q35.c

+8 −4
Original line number Diff line number Diff line
@@ -190,7 +190,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, 0xff0104);



    /* connect pm stuff to lpc */

    ich9_lpc_pm_init(lpc);
@@ -295,7 +295,11 @@ static QEMUMachine pc_q35_machine_v2_0 = { 
static QEMUMachine pc_q35_machine_v1_7 = {

    PC_Q35_1_7_MACHINE_OPTIONS,

    .name = "pc-q35-1.7",

    .init = pc_q35_init,

    .init = pc_q35_init_1_7,

    .compat_props = (GlobalProperty[]) {

        PC_Q35_COMPAT_1_7,

        { /* end of list */ }

    },

};



#define PC_Q35_1_6_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
@@ -305,7 +309,7 @@ static QEMUMachine pc_q35_machine_v1_6 = { 
    .name = "pc-q35-1.6",

    .init = pc_q35_init_1_6,

    .compat_props = (GlobalProperty[]) {

        PC_COMPAT_1_6,

        PC_Q35_COMPAT_1_6,

        { /* end of list */ }

    },

};
@@ -315,7 +319,7 @@ static QEMUMachine pc_q35_machine_v1_5 = { 
    .name = "pc-q35-1.5",

    .init = pc_q35_init_1_5,

    .compat_props = (GlobalProperty[]) {

        PC_COMPAT_1_5,

        PC_Q35_COMPAT_1_5,

        { /* end of list */ }

    },

};

hw/timer/hpet.c

+7 −2
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ typedef struct HPETState { 
    uint8_t rtc_irq_level;

    qemu_irq pit_enabled;

    uint8_t num_timers;

    uint32_t intcap;

    HPETTimer timer[HPET_MAX_TIMERS];



    /* Memory-mapped, software visible registers */
@@ -663,8 +664,8 @@ static void hpet_reset(DeviceState *d) 
        if (s->flags & (1 << HPET_MSI_SUPPORT)) {

            timer->config |= HPET_TN_FSB_CAP;

        }

        /* advertise availability of ioapic inti2 */

        timer->config |=  0x00000004ULL << 32;

        /* advertise availability of ioapic int */

        timer->config |=  (uint64_t)s->intcap << 32;

        timer->period = 0ULL;

        timer->wrap_flag = 0;

    }
@@ -713,6 +714,9 @@ static void hpet_realize(DeviceState *dev, Error **errp) 
    int i;

    HPETTimer *timer;



    if (!s->intcap) {

        error_printf("Hpet's intcap not initialized.\n");

    }

    if (hpet_cfg.count == UINT8_MAX) {

        /* first instance */

        hpet_cfg.count = 0;
@@ -753,6 +757,7 @@ static void hpet_realize(DeviceState *dev, Error **errp) 
static Property hpet_device_properties[] = {

    DEFINE_PROP_UINT8("timers", HPETState, num_timers, HPET_MIN_TIMERS),

    DEFINE_PROP_BIT("msi", HPETState, flags, HPET_MSI_SUPPORT, false),

    DEFINE_PROP_UINT32(HPET_INTCAP, HPETState, intcap, 0),

    DEFINE_PROP_END_OF_LIST(),

};

include/hw/i386/pc.h

+23 −1
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
#include "sysemu/sysemu.h"

#include "hw/pci/pci.h"



#define HPET_INTCAP "hpet-intcap"



/* PC-style peripherals (also used by other machines).  */



typedef struct PcPciInfo {
@@ -146,7 +148,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,

                          uint32 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,
@@ -236,6 +239,25 @@ uint16_t pvpanic_port(void); 


int e820_add_entry(uint64_t, uint64_t, uint32_t);



#define PC_Q35_COMPAT_1_7 \

        {\

            .driver   = "hpet",\

            .property = HPET_INTCAP,\

            .value    = stringify(4),\

        }



#define PC_Q35_COMPAT_1_6 \

        PC_COMPAT_1_6, \

        PC_Q35_COMPAT_1_7



#define PC_Q35_COMPAT_1_5 \

        PC_COMPAT_1_5, \

        PC_Q35_COMPAT_1_6



#define PC_Q35_COMPAT_1_4 \

        PC_COMPAT_1_4, \

        PC_Q35_COMPAT_1_5



#define PC_COMPAT_1_6 \

        {\

            .driver   = "e1000",\