mirror of
https://github.com/qemu/qemu.git
synced 2024-12-05 01:33:41 +08:00
b00c92e3ef
A bunch of fixes all over the place. Also, beginning to generalize acpi build code for reuse by ARM. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJUx465AAoJECgfDbjSjVRpzewIAI/tzV1oCR1D/YDYBYpiK68W 85JJbyR90DpS9unjrkeUHEnJgkegCk8dMXlWJOlshpwxDw2khC2ol0yS6siwC6Z/ 1peL9E5zHz2H8KWfH6JlhqLETovZxjd5Uv3q1mWULvK+zZcPzeQDCky5I8mbEw4b 0LGDGX8mcLlDnit9mnAbgHu7cbqGa0jtXoJTFveKdxQtHdyj4cAg0wCjOLhnEo6s fJP7K1TJ2Ptiwwlk2cnj8T4Z9AoJkWjpFfr94dST2KqR3z5j8OUZYYhifrZa3e8t qxO/UatY4IwSnsmWCn/hvzlHZFa03sc9nPIkAlj96j78sHqPafDJxCdnwlX8pF8= =Kfwr -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging pci, pc, virtio fixes and cleanups A bunch of fixes all over the place. Also, beginning to generalize acpi build code for reuse by ARM. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Tue 27 Jan 2015 13:12:25 GMT using RSA key ID D28D5469 # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" * remotes/mst/tags/for_upstream: pc-dimm: Add Error argument to pc_existing_dimms_capacity pc-dimm: Make pc_existing_dimms_capacity global pc: Fix DIMMs capacity calculation smbios: Don't report unknown CPU speed (fix SVVP regression) smbios: Fix dimm size calculation when RAM is multiple of 16GB bios-linker-loader: move source to common location bios-linker-loader: move header to common location virtio: fix feature bit checks bios-tables-test: split piix4 and q35 tests acpi: build_append_nameseg(): add padding if necessary acpi: update generated hex files acpi-test: update expected DSDT pc: acpi: fix WindowsXP BSOD when memory hotplug is enabled pci: Split pcie_host_mmcfg_map() Add some trace calls to pci.c. ich9: add disable_s3, disable_s4, s4_val properties Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
406 lines
13 KiB
C
406 lines
13 KiB
C
/*
|
|
* ACPI implementation
|
|
*
|
|
* Copyright (c) 2006 Fabrice Bellard
|
|
* Copyright (c) 2009 Isaku Yamahata <yamahata at valinux co jp>
|
|
* VA Linux Systems Japan K.K.
|
|
* Copyright (C) 2012 Jason Baron <jbaron@redhat.com>
|
|
*
|
|
* This is based on acpi.c.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License version 2 as published by the Free Software Foundation.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, see <http://www.gnu.org/licenses/>
|
|
*
|
|
* Contributions after 2012-01-13 are licensed under the terms of the
|
|
* GNU GPL, version 2 or (at your option) any later version.
|
|
*/
|
|
#include "hw/hw.h"
|
|
#include "qapi/visitor.h"
|
|
#include "hw/i386/pc.h"
|
|
#include "hw/pci/pci.h"
|
|
#include "qemu/timer.h"
|
|
#include "sysemu/sysemu.h"
|
|
#include "hw/acpi/acpi.h"
|
|
#include "sysemu/kvm.h"
|
|
#include "exec/address-spaces.h"
|
|
|
|
#include "hw/i386/ich9.h"
|
|
#include "hw/mem/pc-dimm.h"
|
|
|
|
//#define DEBUG
|
|
|
|
#ifdef DEBUG
|
|
#define ICH9_DEBUG(fmt, ...) \
|
|
do { printf("%s "fmt, __func__, ## __VA_ARGS__); } while (0)
|
|
#else
|
|
#define ICH9_DEBUG(fmt, ...) do { } while (0)
|
|
#endif
|
|
|
|
static void ich9_pm_update_sci_fn(ACPIREGS *regs)
|
|
{
|
|
ICH9LPCPMRegs *pm = container_of(regs, ICH9LPCPMRegs, acpi_regs);
|
|
acpi_update_sci(&pm->acpi_regs, pm->irq);
|
|
}
|
|
|
|
static uint64_t ich9_gpe_readb(void *opaque, hwaddr addr, unsigned width)
|
|
{
|
|
ICH9LPCPMRegs *pm = opaque;
|
|
return acpi_gpe_ioport_readb(&pm->acpi_regs, addr);
|
|
}
|
|
|
|
static void ich9_gpe_writeb(void *opaque, hwaddr addr, uint64_t val,
|
|
unsigned width)
|
|
{
|
|
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 = {
|
|
.read = ich9_gpe_readb,
|
|
.write = ich9_gpe_writeb,
|
|
.valid.min_access_size = 1,
|
|
.valid.max_access_size = 4,
|
|
.impl.min_access_size = 1,
|
|
.impl.max_access_size = 1,
|
|
.endianness = DEVICE_LITTLE_ENDIAN,
|
|
};
|
|
|
|
static uint64_t ich9_smi_readl(void *opaque, hwaddr addr, unsigned width)
|
|
{
|
|
ICH9LPCPMRegs *pm = opaque;
|
|
switch (addr) {
|
|
case 0:
|
|
return pm->smi_en;
|
|
case 4:
|
|
return pm->smi_sts;
|
|
default:
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
static void ich9_smi_writel(void *opaque, hwaddr addr, uint64_t val,
|
|
unsigned width)
|
|
{
|
|
ICH9LPCPMRegs *pm = opaque;
|
|
switch (addr) {
|
|
case 0:
|
|
pm->smi_en = val;
|
|
break;
|
|
}
|
|
}
|
|
|
|
static const MemoryRegionOps ich9_smi_ops = {
|
|
.read = ich9_smi_readl,
|
|
.write = ich9_smi_writel,
|
|
.valid.min_access_size = 4,
|
|
.valid.max_access_size = 4,
|
|
.endianness = DEVICE_LITTLE_ENDIAN,
|
|
};
|
|
|
|
void ich9_pm_iospace_update(ICH9LPCPMRegs *pm, uint32_t pm_io_base)
|
|
{
|
|
ICH9_DEBUG("to 0x%x\n", pm_io_base);
|
|
|
|
assert((pm_io_base & ICH9_PMIO_MASK) == 0);
|
|
|
|
pm->pm_io_base = pm_io_base;
|
|
memory_region_transaction_begin();
|
|
memory_region_set_enabled(&pm->io, pm->pm_io_base != 0);
|
|
memory_region_set_address(&pm->io, pm->pm_io_base);
|
|
memory_region_transaction_commit();
|
|
}
|
|
|
|
static int ich9_pm_post_load(void *opaque, int version_id)
|
|
{
|
|
ICH9LPCPMRegs *pm = opaque;
|
|
uint32_t pm_io_base = pm->pm_io_base;
|
|
pm->pm_io_base = 0;
|
|
ich9_pm_iospace_update(pm, pm_io_base);
|
|
return 0;
|
|
}
|
|
|
|
#define VMSTATE_GPE_ARRAY(_field, _state) \
|
|
{ \
|
|
.name = (stringify(_field)), \
|
|
.version_id = 0, \
|
|
.num = ICH9_PMIO_GPE0_LEN, \
|
|
.info = &vmstate_info_uint8, \
|
|
.size = sizeof(uint8_t), \
|
|
.flags = VMS_ARRAY | VMS_POINTER, \
|
|
.offset = vmstate_offset_pointer(_state, _field, uint8_t), \
|
|
}
|
|
|
|
static bool vmstate_test_use_memhp(void *opaque)
|
|
{
|
|
ICH9LPCPMRegs *s = opaque;
|
|
return s->acpi_memory_hotplug.is_enabled;
|
|
}
|
|
|
|
static const VMStateDescription vmstate_memhp_state = {
|
|
.name = "ich9_pm/memhp",
|
|
.version_id = 1,
|
|
.minimum_version_id = 1,
|
|
.minimum_version_id_old = 1,
|
|
.fields = (VMStateField[]) {
|
|
VMSTATE_MEMORY_HOTPLUG(acpi_memory_hotplug, ICH9LPCPMRegs),
|
|
VMSTATE_END_OF_LIST()
|
|
}
|
|
};
|
|
|
|
const VMStateDescription vmstate_ich9_pm = {
|
|
.name = "ich9_pm",
|
|
.version_id = 1,
|
|
.minimum_version_id = 1,
|
|
.post_load = ich9_pm_post_load,
|
|
.fields = (VMStateField[]) {
|
|
VMSTATE_UINT16(acpi_regs.pm1.evt.sts, ICH9LPCPMRegs),
|
|
VMSTATE_UINT16(acpi_regs.pm1.evt.en, ICH9LPCPMRegs),
|
|
VMSTATE_UINT16(acpi_regs.pm1.cnt.cnt, ICH9LPCPMRegs),
|
|
VMSTATE_TIMER_PTR(acpi_regs.tmr.timer, ICH9LPCPMRegs),
|
|
VMSTATE_INT64(acpi_regs.tmr.overflow_time, ICH9LPCPMRegs),
|
|
VMSTATE_GPE_ARRAY(acpi_regs.gpe.sts, ICH9LPCPMRegs),
|
|
VMSTATE_GPE_ARRAY(acpi_regs.gpe.en, ICH9LPCPMRegs),
|
|
VMSTATE_UINT32(smi_en, ICH9LPCPMRegs),
|
|
VMSTATE_UINT32(smi_sts, ICH9LPCPMRegs),
|
|
VMSTATE_END_OF_LIST()
|
|
},
|
|
.subsections = (VMStateSubsection[]) {
|
|
{
|
|
.vmsd = &vmstate_memhp_state,
|
|
.needed = vmstate_test_use_memhp,
|
|
},
|
|
VMSTATE_END_OF_LIST()
|
|
}
|
|
};
|
|
|
|
static void pm_reset(void *opaque)
|
|
{
|
|
ICH9LPCPMRegs *pm = opaque;
|
|
ich9_pm_iospace_update(pm, 0);
|
|
|
|
acpi_pm1_evt_reset(&pm->acpi_regs);
|
|
acpi_pm1_cnt_reset(&pm->acpi_regs);
|
|
acpi_pm_tmr_reset(&pm->acpi_regs);
|
|
acpi_gpe_reset(&pm->acpi_regs);
|
|
|
|
if (kvm_enabled()) {
|
|
/* Mark SMM as already inited to prevent SMM from running. KVM does not
|
|
* support SMM mode. */
|
|
pm->smi_en |= ICH9_PMIO_SMI_EN_APMC_EN;
|
|
}
|
|
|
|
acpi_update_sci(&pm->acpi_regs, pm->irq);
|
|
}
|
|
|
|
static void pm_powerdown_req(Notifier *n, void *opaque)
|
|
{
|
|
ICH9LPCPMRegs *pm = container_of(n, ICH9LPCPMRegs, powerdown_notifier);
|
|
|
|
acpi_pm1_evt_power_down(&pm->acpi_regs);
|
|
}
|
|
|
|
void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
|
|
qemu_irq sci_irq)
|
|
{
|
|
memory_region_init(&pm->io, OBJECT(lpc_pci), "ich9-pm", ICH9_PMIO_SIZE);
|
|
memory_region_set_enabled(&pm->io, false);
|
|
memory_region_add_subregion(pci_address_space_io(lpc_pci),
|
|
0, &pm->io);
|
|
|
|
acpi_pm_tmr_init(&pm->acpi_regs, ich9_pm_update_sci_fn, &pm->io);
|
|
acpi_pm1_evt_init(&pm->acpi_regs, ich9_pm_update_sci_fn, &pm->io);
|
|
acpi_pm1_cnt_init(&pm->acpi_regs, &pm->io, pm->s4_val);
|
|
|
|
acpi_gpe_init(&pm->acpi_regs, ICH9_PMIO_GPE0_LEN);
|
|
memory_region_init_io(&pm->io_gpe, OBJECT(lpc_pci), &ich9_gpe_ops, pm,
|
|
"acpi-gpe0", ICH9_PMIO_GPE0_LEN);
|
|
memory_region_add_subregion(&pm->io, ICH9_PMIO_GPE0_STS, &pm->io_gpe);
|
|
|
|
memory_region_init_io(&pm->io_smi, OBJECT(lpc_pci), &ich9_smi_ops, pm,
|
|
"acpi-smi", 8);
|
|
memory_region_add_subregion(&pm->io, ICH9_PMIO_SMI_EN, &pm->io_smi);
|
|
|
|
pm->irq = sci_irq;
|
|
qemu_register_reset(pm_reset, pm);
|
|
pm->powerdown_notifier.notify = pm_powerdown_req;
|
|
qemu_register_powerdown_notifier(&pm->powerdown_notifier);
|
|
|
|
acpi_cpu_hotplug_init(pci_address_space_io(lpc_pci), OBJECT(lpc_pci),
|
|
&pm->gpe_cpu, ICH9_CPU_HOTPLUG_IO_BASE);
|
|
|
|
if (pm->acpi_memory_hotplug.is_enabled) {
|
|
acpi_memory_hotplug_init(pci_address_space_io(lpc_pci), OBJECT(lpc_pci),
|
|
&pm->acpi_memory_hotplug);
|
|
}
|
|
}
|
|
|
|
static void ich9_pm_get_gpe0_blk(Object *obj, Visitor *v,
|
|
void *opaque, const char *name,
|
|
Error **errp)
|
|
{
|
|
ICH9LPCPMRegs *pm = opaque;
|
|
uint32_t value = pm->pm_io_base + ICH9_PMIO_GPE0_STS;
|
|
|
|
visit_type_uint32(v, &value, name, errp);
|
|
}
|
|
|
|
static bool ich9_pm_get_memory_hotplug_support(Object *obj, Error **errp)
|
|
{
|
|
ICH9LPCState *s = ICH9_LPC_DEVICE(obj);
|
|
|
|
return s->pm.acpi_memory_hotplug.is_enabled;
|
|
}
|
|
|
|
static void ich9_pm_set_memory_hotplug_support(Object *obj, bool value,
|
|
Error **errp)
|
|
{
|
|
ICH9LPCState *s = ICH9_LPC_DEVICE(obj);
|
|
|
|
s->pm.acpi_memory_hotplug.is_enabled = value;
|
|
}
|
|
|
|
static void ich9_pm_get_disable_s3(Object *obj, Visitor *v,
|
|
void *opaque, const char *name,
|
|
Error **errp)
|
|
{
|
|
ICH9LPCPMRegs *pm = opaque;
|
|
uint8_t value = pm->disable_s3;
|
|
|
|
visit_type_uint8(v, &value, name, errp);
|
|
}
|
|
|
|
static void ich9_pm_set_disable_s3(Object *obj, Visitor *v,
|
|
void *opaque, const char *name,
|
|
Error **errp)
|
|
{
|
|
ICH9LPCPMRegs *pm = opaque;
|
|
Error *local_err = NULL;
|
|
uint8_t value;
|
|
|
|
visit_type_uint8(v, &value, name, &local_err);
|
|
if (local_err) {
|
|
goto out;
|
|
}
|
|
pm->disable_s3 = value;
|
|
out:
|
|
error_propagate(errp, local_err);
|
|
}
|
|
|
|
static void ich9_pm_get_disable_s4(Object *obj, Visitor *v,
|
|
void *opaque, const char *name,
|
|
Error **errp)
|
|
{
|
|
ICH9LPCPMRegs *pm = opaque;
|
|
uint8_t value = pm->disable_s4;
|
|
|
|
visit_type_uint8(v, &value, name, errp);
|
|
}
|
|
|
|
static void ich9_pm_set_disable_s4(Object *obj, Visitor *v,
|
|
void *opaque, const char *name,
|
|
Error **errp)
|
|
{
|
|
ICH9LPCPMRegs *pm = opaque;
|
|
Error *local_err = NULL;
|
|
uint8_t value;
|
|
|
|
visit_type_uint8(v, &value, name, &local_err);
|
|
if (local_err) {
|
|
goto out;
|
|
}
|
|
pm->disable_s4 = value;
|
|
out:
|
|
error_propagate(errp, local_err);
|
|
}
|
|
|
|
static void ich9_pm_get_s4_val(Object *obj, Visitor *v,
|
|
void *opaque, const char *name,
|
|
Error **errp)
|
|
{
|
|
ICH9LPCPMRegs *pm = opaque;
|
|
uint8_t value = pm->s4_val;
|
|
|
|
visit_type_uint8(v, &value, name, errp);
|
|
}
|
|
|
|
static void ich9_pm_set_s4_val(Object *obj, Visitor *v,
|
|
void *opaque, const char *name,
|
|
Error **errp)
|
|
{
|
|
ICH9LPCPMRegs *pm = opaque;
|
|
Error *local_err = NULL;
|
|
uint8_t value;
|
|
|
|
visit_type_uint8(v, &value, name, &local_err);
|
|
if (local_err) {
|
|
goto out;
|
|
}
|
|
pm->s4_val = value;
|
|
out:
|
|
error_propagate(errp, local_err);
|
|
}
|
|
|
|
void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)
|
|
{
|
|
static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN;
|
|
pm->acpi_memory_hotplug.is_enabled = true;
|
|
pm->disable_s3 = 0;
|
|
pm->disable_s4 = 0;
|
|
pm->s4_val = 2;
|
|
|
|
object_property_add_uint32_ptr(obj, ACPI_PM_PROP_PM_IO_BASE,
|
|
&pm->pm_io_base, errp);
|
|
object_property_add(obj, ACPI_PM_PROP_GPE0_BLK, "uint32",
|
|
ich9_pm_get_gpe0_blk,
|
|
NULL, NULL, pm, NULL);
|
|
object_property_add_uint32_ptr(obj, ACPI_PM_PROP_GPE0_BLK_LEN,
|
|
&gpe0_len, errp);
|
|
object_property_add_bool(obj, "memory-hotplug-support",
|
|
ich9_pm_get_memory_hotplug_support,
|
|
ich9_pm_set_memory_hotplug_support,
|
|
NULL);
|
|
object_property_add(obj, ACPI_PM_PROP_S3_DISABLED, "uint8",
|
|
ich9_pm_get_disable_s3,
|
|
ich9_pm_set_disable_s3,
|
|
NULL, pm, NULL);
|
|
object_property_add(obj, ACPI_PM_PROP_S4_DISABLED, "uint8",
|
|
ich9_pm_get_disable_s4,
|
|
ich9_pm_set_disable_s4,
|
|
NULL, pm, NULL);
|
|
object_property_add(obj, ACPI_PM_PROP_S4_VAL, "uint8",
|
|
ich9_pm_get_s4_val,
|
|
ich9_pm_set_s4_val,
|
|
NULL, pm, NULL);
|
|
}
|
|
|
|
void ich9_pm_device_plug_cb(ICH9LPCPMRegs *pm, DeviceState *dev, Error **errp)
|
|
{
|
|
if (pm->acpi_memory_hotplug.is_enabled &&
|
|
object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
|
|
acpi_memory_plug_cb(&pm->acpi_regs, pm->irq, &pm->acpi_memory_hotplug,
|
|
dev, errp);
|
|
} else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
|
|
acpi_cpu_plug_cb(&pm->acpi_regs, pm->irq, &pm->gpe_cpu, dev, errp);
|
|
} else {
|
|
error_setg(errp, "acpi: device plug request for not supported device"
|
|
" type: %s", object_get_typename(OBJECT(dev)));
|
|
}
|
|
}
|
|
|
|
void ich9_pm_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list)
|
|
{
|
|
ICH9LPCState *s = ICH9_LPC_DEVICE(adev);
|
|
|
|
acpi_memory_ospm_status(&s->pm.acpi_memory_hotplug, list);
|
|
}
|