Commit d1819762 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'mst/tags/for_anthony' into staging 



acpi,pci,pc,fedora,virtio fixes and enhancements

This includes some Preparatory patches for cpu hotplug for q25 and memory
hotplug by Igor, tests and memory mapping change
by Laszlo and pci reset cleanup by Paolo.
There are also some fixes for fedora and virtio:
included here since they are test blockers for me.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Mon 23 Dec 2013 08:07:18 AM PST using RSA key ID D28D5469
# gpg: Can't check signature: public key not found

* mst/tags/for_anthony:
  target-arm: fix build with gcc 4.8.2
  virtio: add back call to virtio_bus_device_unplugged
  piix: fix 32bit pci hole
  qdev: switch reset to post-order
  qdev: allow both pre- and post-order vists in qdev walking functions
  pci: clean up resetting of IRQs
  pci: do not export pci_bus_reset
  ACPI/DSDT-CPU: cleanup bogus comment
  ACPI: Q35 DSDT: fix CPU hotplug GPE0.2 handler
  acpi: ich9: allow guest to clear SCI rised by GPE
  acpi: factor out common pm_update_sci() into acpi core
  acpi: piix4: remove not needed GPE0 mask
  i440fx-test: verify firmware under 4G and 1M, both -bios and -pflash
  i440fx-test: generate temporary firmware blob
  i440fx-test: give each GTest case its own qtest
  i440fx-test: qtest_start() should be paired with qtest_end()
  hw/i386/pc_sysfw: support two flash drives
  pc_piix: document gigabyte_align
  piix: gigabyte alignment for ram

Message-id: 1387815007-1272-1-git-send-email-mst@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@amazon.com>
parents 4cddc7f4 5bf58abf

hw/acpi/core.c

+18 −0
Original line number Diff line number Diff line
@@ -662,3 +662,21 @@ uint32_t acpi_gpe_ioport_readb(ACPIREGS *ar, uint32_t addr) 


    return val;

}



void acpi_update_sci(ACPIREGS *regs, qemu_irq irq)

{

    int sci_level, pm1a_sts;



    pm1a_sts = acpi_pm1_evt_get_sts(regs);



    sci_level = ((pm1a_sts &

                  regs->pm1.evt.en & ACPI_BITMASK_PM1_COMMON_ENABLED) != 0) ||

                ((regs->gpe.sts[0] & regs->gpe.en[0]) != 0);



    qemu_set_irq(irq, sci_level);



    /* schedule a timer interruption if needed */

    acpi_pm_tmr_update(regs,

                       (regs->pm1.evt.en & ACPI_BITMASK_TIMER_ENABLE) &&

                       !(pm1a_sts & ACPI_BITMASK_TIMER_STATUS));

}

hw/acpi/ich9.c

+3 −21
Original line number Diff line number Diff line
@@ -44,29 +44,10 @@ do { printf("%s "fmt, __func__, ## __VA_ARGS__); } while (0) 
#define ICH9_DEBUG(fmt, ...)    do { } while (0)

#endif



static void pm_update_sci(ICH9LPCPMRegs *pm)

{

    int sci_level, pm1a_sts;



    pm1a_sts = acpi_pm1_evt_get_sts(&pm->acpi_regs);



    sci_level = (((pm1a_sts & pm->acpi_regs.pm1.evt.en) &

                  (ACPI_BITMASK_RT_CLOCK_ENABLE |

                   ACPI_BITMASK_POWER_BUTTON_ENABLE |

                   ACPI_BITMASK_GLOBAL_LOCK_ENABLE |

                   ACPI_BITMASK_TIMER_ENABLE)) != 0);

    qemu_set_irq(pm->irq, sci_level);



    /* schedule a timer interruption if needed */

    acpi_pm_tmr_update(&pm->acpi_regs,

                       (pm->acpi_regs.pm1.evt.en & ACPI_BITMASK_TIMER_ENABLE) &&

                       !(pm1a_sts & ACPI_BITMASK_TIMER_STATUS));

}



static void ich9_pm_update_sci_fn(ACPIREGS *regs)

{

    ICH9LPCPMRegs *pm = container_of(regs, ICH9LPCPMRegs, acpi_regs);

    pm_update_sci(pm);

    acpi_update_sci(&pm->acpi_regs, pm->irq);

}



static uint64_t ich9_gpe_readb(void *opaque, hwaddr addr, unsigned width)
@@ -80,6 +61,7 @@ static void ich9_gpe_writeb(void *opaque, hwaddr addr, uint64_t val, 
{

    ICH9LPCPMRegs *pm = opaque;

    acpi_gpe_ioport_writeb(&pm->acpi_regs, addr, val);

    acpi_update_sci(&pm->acpi_regs, pm->irq);

}



static const MemoryRegionOps ich9_gpe_ops = {
@@ -193,7 +175,7 @@ static void pm_reset(void *opaque) 
        pm->smi_en |= ICH9_PMIO_SMI_EN_APMC_EN;

    }



    pm_update_sci(pm);

    acpi_update_sci(&pm->acpi_regs, pm->irq);

}



static void pm_powerdown_req(Notifier *n, void *opaque)

hw/acpi/piix4.c

+4 −23
Original line number Diff line number Diff line
@@ -112,29 +112,10 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, 
#define ACPI_ENABLE 0xf1

#define ACPI_DISABLE 0xf0



static void pm_update_sci(PIIX4PMState *s)

{

    int sci_level, pmsts;



    pmsts = acpi_pm1_evt_get_sts(&s->ar);

    sci_level = (((pmsts & s->ar.pm1.evt.en) &

                  (ACPI_BITMASK_RT_CLOCK_ENABLE |

                   ACPI_BITMASK_POWER_BUTTON_ENABLE |

                   ACPI_BITMASK_GLOBAL_LOCK_ENABLE |

                   ACPI_BITMASK_TIMER_ENABLE)) != 0) ||

        (((s->ar.gpe.sts[0] & s->ar.gpe.en[0]) &

          (PIIX4_PCI_HOTPLUG_STATUS | PIIX4_CPU_HOTPLUG_STATUS)) != 0);



    qemu_set_irq(s->irq, sci_level);

    /* schedule a timer interruption if needed */

    acpi_pm_tmr_update(&s->ar, (s->ar.pm1.evt.en & ACPI_BITMASK_TIMER_ENABLE) &&

                       !(pmsts & ACPI_BITMASK_TIMER_STATUS));

}



static void pm_tmr_timer(ACPIREGS *ar)

{

    PIIX4PMState *s = container_of(ar, PIIX4PMState, ar);

    pm_update_sci(s);

    acpi_update_sci(&s->ar, s->irq);

}



static void apm_ctrl_changed(uint32_t val, void *arg)
@@ -582,7 +563,7 @@ static void gpe_writeb(void *opaque, hwaddr addr, uint64_t val, 
    PIIX4PMState *s = opaque;



    acpi_gpe_ioport_writeb(&s->ar, addr, val);

    pm_update_sci(s);

    acpi_update_sci(&s->ar, s->irq);



    PIIX4_DPRINTF("gpe write %" HWADDR_PRIx " <== %" PRIu64 "\n", addr, val);

}
@@ -698,7 +679,7 @@ static void piix4_cpu_hotplug_req(PIIX4PMState *s, CPUState *cpu, 
    } else {

        g->sts[cpu_id / 8] &= ~(1 << (cpu_id % 8));

    }

    pm_update_sci(s);

    acpi_update_sci(&s->ar, s->irq);

}



static void piix4_cpu_added_req(Notifier *n, void *opaque)
@@ -772,7 +753,7 @@ static int piix4_device_hotplug(DeviceState *qdev, PCIDevice *dev, 
        disable_device(s, slot);

    }



    pm_update_sci(s);

    acpi_update_sci(&s->ar, s->irq);



    return 0;

}

hw/core/qdev.c

+34 −13
Original line number Diff line number Diff line
@@ -233,19 +233,19 @@ static int qbus_reset_one(BusState *bus, void *opaque) 
{

    BusClass *bc = BUS_GET_CLASS(bus);

    if (bc->reset) {

        return bc->reset(bus);

        bc->reset(bus);

    }

    return 0;

}



void qdev_reset_all(DeviceState *dev)

{

    qdev_walk_children(dev, qdev_reset_one, qbus_reset_one, NULL);

    qdev_walk_children(dev, NULL, NULL, qdev_reset_one, qbus_reset_one, NULL);

}



void qbus_reset_all(BusState *bus)

{

    qbus_walk_children(bus, qdev_reset_one, qbus_reset_one, NULL);

    qbus_walk_children(bus, NULL, NULL, qdev_reset_one, qbus_reset_one, NULL);

}



void qbus_reset_all_fn(void *opaque)
@@ -337,49 +337,70 @@ BusState *qdev_get_child_bus(DeviceState *dev, const char *name) 
    return NULL;

}



int qbus_walk_children(BusState *bus, qdev_walkerfn *devfn,

                       qbus_walkerfn *busfn, void *opaque)

int qbus_walk_children(BusState *bus,

                       qdev_walkerfn *pre_devfn, qbus_walkerfn *pre_busfn,

                       qdev_walkerfn *post_devfn, qbus_walkerfn *post_busfn,

                       void *opaque)

{

    BusChild *kid;

    int err;



    if (busfn) {

        err = busfn(bus, opaque);

    if (pre_busfn) {

        err = pre_busfn(bus, opaque);

        if (err) {

            return err;

        }

    }



    QTAILQ_FOREACH(kid, &bus->children, sibling) {

        err = qdev_walk_children(kid->child, devfn, busfn, opaque);

        err = qdev_walk_children(kid->child,

                                 pre_devfn, pre_busfn,

                                 post_devfn, post_busfn, opaque);

        if (err < 0) {

            return err;

        }

    }



    if (post_busfn) {

        err = post_busfn(bus, opaque);

        if (err) {

            return err;

        }

    }



    return 0;

}



int qdev_walk_children(DeviceState *dev, qdev_walkerfn *devfn,

                       qbus_walkerfn *busfn, void *opaque)

int qdev_walk_children(DeviceState *dev,

                       qdev_walkerfn *pre_devfn, qbus_walkerfn *pre_busfn,

                       qdev_walkerfn *post_devfn, qbus_walkerfn *post_busfn,

                       void *opaque)

{

    BusState *bus;

    int err;



    if (devfn) {

        err = devfn(dev, opaque);

    if (pre_devfn) {

        err = pre_devfn(dev, opaque);

        if (err) {

            return err;

        }

    }



    QLIST_FOREACH(bus, &dev->child_bus, sibling) {

        err = qbus_walk_children(bus, devfn, busfn, opaque);

        err = qbus_walk_children(bus, pre_devfn, pre_busfn,

                                 post_devfn, post_busfn, opaque);

        if (err < 0) {

            return err;

        }

    }



    if (post_devfn) {

        err = post_devfn(dev, opaque);

        if (err) {

            return err;

        }

    }



    return 0;

}

hw/i386/acpi-dsdt-cpu-hotplug.dsl

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ Scope(\_SB) { 
        Sleep(200)

    }



    /* CPU hotplug notify method */

    OperationRegion(PRST, SystemIO, 0xaf00, 32)

    Field(PRST, ByteAcc, NoLock, Preserve) {

        PRS, 256