2012-11-23 07:05:06 +04:00
|
|
|
/*
|
|
|
|
* ACPI implementation
|
|
|
|
*
|
|
|
|
* Copyright (c) 2006 Fabrice Bellard
|
2012-10-30 06:11:31 +04:00
|
|
|
* 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.
|
2012-11-23 07:05:06 +04:00
|
|
|
*
|
|
|
|
* 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/>
|
|
|
|
*
|
2012-10-30 06:11:31 +04:00
|
|
|
* Contributions after 2012-01-13 are licensed under the terms of the
|
|
|
|
* GNU GPL, version 2 or (at your option) any later version.
|
2012-11-23 07:05:06 +04:00
|
|
|
*/
|
2019-08-12 08:23:38 +03:00
|
|
|
|
2016-01-26 21:17:03 +03:00
|
|
|
#include "qemu/osdep.h"
|
include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-03-14 11:01:28 +03:00
|
|
|
#include "qapi/error.h"
|
2013-07-24 19:56:10 +04:00
|
|
|
#include "qapi/visitor.h"
|
2013-02-04 18:40:22 +04:00
|
|
|
#include "hw/pci/pci.h"
|
2019-08-12 08:23:45 +03:00
|
|
|
#include "migration/vmstate.h"
|
2012-12-17 21:20:00 +04:00
|
|
|
#include "qemu/timer.h"
|
2019-07-09 18:20:52 +03:00
|
|
|
#include "hw/core/cpu.h"
|
2019-08-12 08:23:38 +03:00
|
|
|
#include "sysemu/reset.h"
|
2019-08-12 08:23:59 +03:00
|
|
|
#include "sysemu/runstate.h"
|
2013-02-05 20:06:20 +04:00
|
|
|
#include "hw/acpi/acpi.h"
|
2015-06-28 20:58:56 +03:00
|
|
|
#include "hw/acpi/tco.h"
|
2012-12-17 21:19:49 +04:00
|
|
|
#include "exec/address-spaces.h"
|
2012-11-23 07:05:06 +04:00
|
|
|
|
2013-02-05 20:06:20 +04:00
|
|
|
#include "hw/i386/ich9.h"
|
2014-06-02 17:25:22 +04:00
|
|
|
#include "hw/mem/pc-dimm.h"
|
2020-02-28 14:46:46 +03:00
|
|
|
#include "hw/mem/nvdimm.h"
|
2012-11-23 07:05:06 +04:00
|
|
|
|
|
|
|
//#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);
|
2013-12-13 20:22:07 +04:00
|
|
|
acpi_update_sci(&pm->acpi_regs, pm->irq);
|
2012-11-23 07:05:06 +04:00
|
|
|
}
|
|
|
|
|
2012-11-22 16:43:17 +04:00
|
|
|
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);
|
2013-12-13 20:22:10 +04:00
|
|
|
acpi_update_sci(&pm->acpi_regs, pm->irq);
|
2012-11-22 16:43:17 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
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,
|
|
|
|
};
|
|
|
|
|
2012-11-22 16:51:35 +04:00
|
|
|
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;
|
2015-06-28 20:58:56 +03:00
|
|
|
TCOIORegs *tr = &pm->tco_regs;
|
|
|
|
uint64_t tco_en;
|
|
|
|
|
2012-11-22 16:51:35 +04:00
|
|
|
switch (addr) {
|
|
|
|
case 0:
|
2015-06-28 20:58:56 +03:00
|
|
|
tco_en = pm->smi_en & ICH9_PMIO_SMI_EN_TCO_EN;
|
|
|
|
/* once TCO_LOCK bit is set, TCO_EN bit cannot be overwritten */
|
|
|
|
if (tr->tco.cnt1 & TCO_LOCK) {
|
|
|
|
val = (val & ~ICH9_PMIO_SMI_EN_TCO_EN) | tco_en;
|
|
|
|
}
|
2015-05-06 11:58:30 +03:00
|
|
|
pm->smi_en &= ~pm->smi_en_wmask;
|
|
|
|
pm->smi_en |= (val & pm->smi_en_wmask);
|
2012-11-22 16:51:35 +04:00
|
|
|
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,
|
|
|
|
};
|
|
|
|
|
2012-11-23 07:05:06 +04:00
|
|
|
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;
|
2012-11-22 15:08:22 +04:00
|
|
|
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();
|
2012-11-23 07:05:06 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
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), \
|
|
|
|
}
|
|
|
|
|
2014-06-02 17:25:23 +04:00
|
|
|
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,
|
2014-09-23 16:09:54 +04:00
|
|
|
.needed = vmstate_test_use_memhp,
|
2014-06-02 17:25:23 +04:00
|
|
|
.fields = (VMStateField[]) {
|
|
|
|
VMSTATE_MEMORY_HOTPLUG(acpi_memory_hotplug, ICH9LPCPMRegs),
|
|
|
|
VMSTATE_END_OF_LIST()
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2015-06-28 20:58:56 +03:00
|
|
|
static bool vmstate_test_use_tco(void *opaque)
|
|
|
|
{
|
|
|
|
ICH9LPCPMRegs *s = opaque;
|
|
|
|
return s->enable_tco;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const VMStateDescription vmstate_tco_io_state = {
|
|
|
|
.name = "ich9_pm/tco",
|
|
|
|
.version_id = 1,
|
|
|
|
.minimum_version_id = 1,
|
|
|
|
.minimum_version_id_old = 1,
|
|
|
|
.needed = vmstate_test_use_tco,
|
|
|
|
.fields = (VMStateField[]) {
|
|
|
|
VMSTATE_STRUCT(tco_regs, ICH9LPCPMRegs, 1, vmstate_tco_io_sts,
|
|
|
|
TCOIORegs),
|
|
|
|
VMSTATE_END_OF_LIST()
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2016-06-15 12:25:23 +03:00
|
|
|
static bool vmstate_test_use_cpuhp(void *opaque)
|
|
|
|
{
|
|
|
|
ICH9LPCPMRegs *s = opaque;
|
|
|
|
return !s->cpu_hotplug_legacy;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int vmstate_cpuhp_pre_load(void *opaque)
|
|
|
|
{
|
|
|
|
ICH9LPCPMRegs *s = opaque;
|
|
|
|
Object *obj = OBJECT(s->gpe_cpu.device);
|
qom: Put name parameter before value / visitor parameter
The object_property_set_FOO() setters take property name and value in
an unusual order:
void object_property_set_FOO(Object *obj, FOO_TYPE value,
const char *name, Error **errp)
Having to pass value before name feels grating. Swap them.
Same for object_property_set(), object_property_get(), and
object_property_parse().
Convert callers with this Coccinelle script:
@@
identifier fun = {
object_property_get, object_property_parse, object_property_set_str,
object_property_set_link, object_property_set_bool,
object_property_set_int, object_property_set_uint, object_property_set,
object_property_set_qobject
};
expression obj, v, name, errp;
@@
- fun(obj, v, name, errp)
+ fun(obj, name, v, errp)
Chokes on hw/arm/musicpal.c's lcd_refresh() with the unhelpful error
message "no position information". Convert that one manually.
Fails to convert hw/arm/armsse.c, because Coccinelle gets confused by
ARMSSE being used both as typedef and function-like macro there.
Convert manually.
Fails to convert hw/rx/rx-gdbsim.c, because Coccinelle gets confused
by RXCPU being used both as typedef and function-like macro there.
Convert manually. The other files using RXCPU that way don't need
conversion.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-27-armbru@redhat.com>
[Straightforwad conflict with commit 2336172d9b "audio: set default
value for pcspk.iobase property" resolved]
2020-07-07 19:05:54 +03:00
|
|
|
object_property_set_bool(obj, "cpu-hotplug-legacy", false, &error_abort);
|
2016-06-15 12:25:23 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const VMStateDescription vmstate_cpuhp_state = {
|
|
|
|
.name = "ich9_pm/cpuhp",
|
|
|
|
.version_id = 1,
|
|
|
|
.minimum_version_id = 1,
|
|
|
|
.minimum_version_id_old = 1,
|
|
|
|
.needed = vmstate_test_use_cpuhp,
|
|
|
|
.pre_load = vmstate_cpuhp_pre_load,
|
|
|
|
.fields = (VMStateField[]) {
|
|
|
|
VMSTATE_CPU_HOTPLUG(cpuhp_state, ICH9LPCPMRegs),
|
|
|
|
VMSTATE_END_OF_LIST()
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2012-11-23 07:05:06 +04:00
|
|
|
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),
|
2015-01-08 12:18:59 +03:00
|
|
|
VMSTATE_TIMER_PTR(acpi_regs.tmr.timer, ICH9LPCPMRegs),
|
2012-11-23 07:05:06 +04:00
|
|
|
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()
|
2014-06-02 17:25:23 +04:00
|
|
|
},
|
2014-09-23 16:09:54 +04:00
|
|
|
.subsections = (const VMStateDescription*[]) {
|
|
|
|
&vmstate_memhp_state,
|
2015-06-28 20:58:56 +03:00
|
|
|
&vmstate_tco_io_state,
|
2016-06-15 12:25:23 +03:00
|
|
|
&vmstate_cpuhp_state,
|
2015-06-28 20:58:56 +03:00
|
|
|
NULL
|
2012-11-23 07:05:06 +04:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
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);
|
|
|
|
|
2015-07-24 21:16:00 +03:00
|
|
|
pm->smi_en = 0;
|
2015-06-18 19:30:51 +03:00
|
|
|
if (!pm->smm_enabled) {
|
2015-07-24 21:16:01 +03:00
|
|
|
/* Mark SMM as already inited to prevent SMM from running. */
|
2012-11-15 00:54:07 +04:00
|
|
|
pm->smi_en |= ICH9_PMIO_SMI_EN_APMC_EN;
|
|
|
|
}
|
2015-05-06 11:58:30 +03:00
|
|
|
pm->smi_en_wmask = ~0;
|
2012-11-15 00:54:07 +04:00
|
|
|
|
2013-12-13 20:22:07 +04:00
|
|
|
acpi_update_sci(&pm->acpi_regs, pm->irq);
|
2012-11-23 07:05:06 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2015-06-28 20:58:56 +03:00
|
|
|
void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
|
2016-01-23 19:02:11 +03:00
|
|
|
bool smm_enabled,
|
2013-04-24 14:37:22 +04:00
|
|
|
qemu_irq sci_irq)
|
2012-11-23 07:05:06 +04:00
|
|
|
{
|
2013-06-07 05:25:08 +04:00
|
|
|
memory_region_init(&pm->io, OBJECT(lpc_pci), "ich9-pm", ICH9_PMIO_SIZE);
|
2012-11-22 15:08:22 +04:00
|
|
|
memory_region_set_enabled(&pm->io, false);
|
2012-12-11 12:42:18 +04:00
|
|
|
memory_region_add_subregion(pci_address_space_io(lpc_pci),
|
|
|
|
0, &pm->io);
|
2012-11-22 15:08:22 +04:00
|
|
|
|
2012-11-22 15:12:30 +04:00
|
|
|
acpi_pm_tmr_init(&pm->acpi_regs, ich9_pm_update_sci_fn, &pm->io);
|
2012-11-22 16:25:10 +04:00
|
|
|
acpi_pm1_evt_init(&pm->acpi_regs, ich9_pm_update_sci_fn, &pm->io);
|
2015-04-29 16:20:14 +03:00
|
|
|
acpi_pm1_cnt_init(&pm->acpi_regs, &pm->io, pm->disable_s3, pm->disable_s4,
|
|
|
|
pm->s4_val);
|
2012-11-22 16:43:17 +04:00
|
|
|
|
2012-11-23 07:05:06 +04:00
|
|
|
acpi_gpe_init(&pm->acpi_regs, ICH9_PMIO_GPE0_LEN);
|
2013-06-07 05:25:08 +04:00
|
|
|
memory_region_init_io(&pm->io_gpe, OBJECT(lpc_pci), &ich9_gpe_ops, pm,
|
2013-06-13 14:51:48 +04:00
|
|
|
"acpi-gpe0", ICH9_PMIO_GPE0_LEN);
|
2012-11-22 16:43:17 +04:00
|
|
|
memory_region_add_subregion(&pm->io, ICH9_PMIO_GPE0_STS, &pm->io_gpe);
|
2012-11-23 07:05:06 +04:00
|
|
|
|
2013-06-07 05:25:08 +04:00
|
|
|
memory_region_init_io(&pm->io_smi, OBJECT(lpc_pci), &ich9_smi_ops, pm,
|
2013-06-13 14:51:48 +04:00
|
|
|
"acpi-smi", 8);
|
2012-11-22 16:51:35 +04:00
|
|
|
memory_region_add_subregion(&pm->io, ICH9_PMIO_SMI_EN, &pm->io_smi);
|
|
|
|
|
2015-06-18 19:30:51 +03:00
|
|
|
pm->smm_enabled = smm_enabled;
|
2015-06-28 20:58:56 +03:00
|
|
|
|
2016-01-23 19:02:11 +03:00
|
|
|
pm->enable_tco = true;
|
|
|
|
acpi_pm_tco_init(&pm->tco_regs, &pm->io);
|
2015-06-28 20:58:56 +03:00
|
|
|
|
2012-11-23 07:05:06 +04:00
|
|
|
pm->irq = sci_irq;
|
|
|
|
qemu_register_reset(pm_reset, pm);
|
|
|
|
pm->powerdown_notifier.notify = pm_powerdown_req;
|
|
|
|
qemu_register_powerdown_notifier(&pm->powerdown_notifier);
|
2014-01-09 20:36:32 +04:00
|
|
|
|
2016-05-17 17:43:00 +03:00
|
|
|
legacy_acpi_cpu_hotplug_init(pci_address_space_io(lpc_pci),
|
|
|
|
OBJECT(lpc_pci), &pm->gpe_cpu, ICH9_CPU_HOTPLUG_IO_BASE);
|
2014-06-02 17:25:22 +04:00
|
|
|
|
|
|
|
if (pm->acpi_memory_hotplug.is_enabled) {
|
|
|
|
acpi_memory_hotplug_init(pci_address_space_io(lpc_pci), OBJECT(lpc_pci),
|
2016-12-06 02:32:28 +03:00
|
|
|
&pm->acpi_memory_hotplug,
|
|
|
|
ACPI_MEMORY_HOTPLUG_BASE);
|
2014-06-02 17:25:22 +04:00
|
|
|
}
|
2012-11-23 07:05:06 +04:00
|
|
|
}
|
2013-07-24 19:56:10 +04:00
|
|
|
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-20-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 16:48:55 +03:00
|
|
|
static void ich9_pm_get_gpe0_blk(Object *obj, Visitor *v, const char *name,
|
|
|
|
void *opaque, Error **errp)
|
2013-07-24 19:56:10 +04:00
|
|
|
{
|
|
|
|
ICH9LPCPMRegs *pm = opaque;
|
|
|
|
uint32_t value = pm->pm_io_base + ICH9_PMIO_GPE0_STS;
|
|
|
|
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-19-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 16:48:54 +03:00
|
|
|
visit_type_uint32(v, name, &value, errp);
|
2013-07-24 19:56:10 +04:00
|
|
|
}
|
|
|
|
|
2014-06-02 17:25:22 +04:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2016-04-11 18:25:54 +03:00
|
|
|
static bool ich9_pm_get_cpu_hotplug_legacy(Object *obj, Error **errp)
|
|
|
|
{
|
|
|
|
ICH9LPCState *s = ICH9_LPC_DEVICE(obj);
|
|
|
|
|
|
|
|
return s->pm.cpu_hotplug_legacy;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ich9_pm_set_cpu_hotplug_legacy(Object *obj, bool value,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
ICH9LPCState *s = ICH9_LPC_DEVICE(obj);
|
|
|
|
|
2016-06-15 12:25:23 +03:00
|
|
|
assert(!value);
|
|
|
|
if (s->pm.cpu_hotplug_legacy && value == false) {
|
|
|
|
acpi_switch_to_modern_cphp(&s->pm.gpe_cpu, &s->pm.cpuhp_state,
|
|
|
|
ICH9_CPU_HOTPLUG_IO_BASE);
|
|
|
|
}
|
2016-04-11 18:25:54 +03:00
|
|
|
s->pm.cpu_hotplug_legacy = value;
|
|
|
|
}
|
|
|
|
|
2015-06-28 20:58:56 +03:00
|
|
|
static bool ich9_pm_get_enable_tco(Object *obj, Error **errp)
|
|
|
|
{
|
|
|
|
ICH9LPCState *s = ICH9_LPC_DEVICE(obj);
|
|
|
|
return s->pm.enable_tco;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ich9_pm_set_enable_tco(Object *obj, bool value, Error **errp)
|
|
|
|
{
|
|
|
|
ICH9LPCState *s = ICH9_LPC_DEVICE(obj);
|
|
|
|
s->pm.enable_tco = value;
|
|
|
|
}
|
|
|
|
|
2020-05-05 18:29:23 +03:00
|
|
|
void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm)
|
2013-07-24 19:56:10 +04:00
|
|
|
{
|
|
|
|
static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN;
|
2014-06-02 17:25:22 +04:00
|
|
|
pm->acpi_memory_hotplug.is_enabled = true;
|
2016-04-11 18:25:54 +03:00
|
|
|
pm->cpu_hotplug_legacy = true;
|
2015-01-12 15:00:14 +03:00
|
|
|
pm->disable_s3 = 0;
|
|
|
|
pm->disable_s4 = 0;
|
|
|
|
pm->s4_val = 2;
|
2013-07-24 19:56:10 +04:00
|
|
|
|
|
|
|
object_property_add_uint32_ptr(obj, ACPI_PM_PROP_PM_IO_BASE,
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 18:29:22 +03:00
|
|
|
&pm->pm_io_base, OBJ_PROP_FLAG_READ);
|
2013-07-24 19:56:10 +04:00
|
|
|
object_property_add(obj, ACPI_PM_PROP_GPE0_BLK, "uint32",
|
|
|
|
ich9_pm_get_gpe0_blk,
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 18:29:22 +03:00
|
|
|
NULL, NULL, pm);
|
2013-07-24 19:56:10 +04:00
|
|
|
object_property_add_uint32_ptr(obj, ACPI_PM_PROP_GPE0_BLK_LEN,
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 18:29:22 +03:00
|
|
|
&gpe0_len, OBJ_PROP_FLAG_READ);
|
2014-06-02 17:25:22 +04:00
|
|
|
object_property_add_bool(obj, "memory-hotplug-support",
|
|
|
|
ich9_pm_get_memory_hotplug_support,
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 18:29:22 +03:00
|
|
|
ich9_pm_set_memory_hotplug_support);
|
2016-04-11 18:25:54 +03:00
|
|
|
object_property_add_bool(obj, "cpu-hotplug-legacy",
|
|
|
|
ich9_pm_get_cpu_hotplug_legacy,
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 18:29:22 +03:00
|
|
|
ich9_pm_set_cpu_hotplug_legacy);
|
2020-02-04 16:16:01 +03:00
|
|
|
object_property_add_uint8_ptr(obj, ACPI_PM_PROP_S3_DISABLED,
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 18:29:22 +03:00
|
|
|
&pm->disable_s3, OBJ_PROP_FLAG_READWRITE);
|
2020-02-04 16:16:01 +03:00
|
|
|
object_property_add_uint8_ptr(obj, ACPI_PM_PROP_S4_DISABLED,
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 18:29:22 +03:00
|
|
|
&pm->disable_s4, OBJ_PROP_FLAG_READWRITE);
|
2020-02-04 16:16:01 +03:00
|
|
|
object_property_add_uint8_ptr(obj, ACPI_PM_PROP_S4_VAL,
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 18:29:22 +03:00
|
|
|
&pm->s4_val, OBJ_PROP_FLAG_READWRITE);
|
2015-06-28 20:58:56 +03:00
|
|
|
object_property_add_bool(obj, ACPI_PM_PROP_TCO_ENABLED,
|
|
|
|
ich9_pm_get_enable_tco,
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 18:29:22 +03:00
|
|
|
ich9_pm_set_enable_tco);
|
2014-06-02 17:25:22 +04:00
|
|
|
}
|
|
|
|
|
2019-03-01 06:35:48 +03:00
|
|
|
void ich9_pm_device_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
ICH9LPCState *lpc = ICH9_LPC_DEVICE(hotplug_dev);
|
|
|
|
|
|
|
|
if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM) &&
|
|
|
|
!lpc->pm.acpi_memory_hotplug.is_enabled)
|
|
|
|
error_setg(errp,
|
|
|
|
"memory hotplug is not enabled: %s.memory-hotplug-support "
|
|
|
|
"is not set", object_get_typename(OBJECT(lpc)));
|
|
|
|
}
|
|
|
|
|
2016-05-31 13:01:17 +03:00
|
|
|
void ich9_pm_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|
|
|
Error **errp)
|
2014-06-02 17:25:22 +04:00
|
|
|
{
|
2016-05-31 13:01:17 +03:00
|
|
|
ICH9LPCState *lpc = ICH9_LPC_DEVICE(hotplug_dev);
|
|
|
|
|
2019-03-01 06:35:48 +03:00
|
|
|
if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
|
2016-11-07 14:13:38 +03:00
|
|
|
if (object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM)) {
|
|
|
|
nvdimm_acpi_plug_cb(hotplug_dev, dev);
|
|
|
|
} else {
|
|
|
|
acpi_memory_plug_cb(hotplug_dev, &lpc->pm.acpi_memory_hotplug,
|
|
|
|
dev, errp);
|
|
|
|
}
|
2016-06-14 17:02:06 +03:00
|
|
|
} else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
|
|
|
|
if (lpc->pm.cpu_hotplug_legacy) {
|
|
|
|
legacy_acpi_cpu_plug_cb(hotplug_dev, &lpc->pm.gpe_cpu, dev, errp);
|
|
|
|
} else {
|
|
|
|
acpi_cpu_plug_cb(hotplug_dev, &lpc->pm.cpuhp_state, dev, errp);
|
|
|
|
}
|
2014-06-02 17:25:22 +04:00
|
|
|
} else {
|
|
|
|
error_setg(errp, "acpi: device plug request for not supported device"
|
|
|
|
" type: %s", object_get_typename(OBJECT(dev)));
|
|
|
|
}
|
2013-07-24 19:56:10 +04:00
|
|
|
}
|
2014-06-16 21:12:27 +04:00
|
|
|
|
2016-05-31 13:01:17 +03:00
|
|
|
void ich9_pm_device_unplug_request_cb(HotplugHandler *hotplug_dev,
|
|
|
|
DeviceState *dev, Error **errp)
|
2015-01-28 10:45:38 +03:00
|
|
|
{
|
2016-05-31 13:01:17 +03:00
|
|
|
ICH9LPCState *lpc = ICH9_LPC_DEVICE(hotplug_dev);
|
|
|
|
|
|
|
|
if (lpc->pm.acpi_memory_hotplug.is_enabled &&
|
2015-04-27 11:47:17 +03:00
|
|
|
object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
|
2016-05-31 13:01:17 +03:00
|
|
|
acpi_memory_unplug_request_cb(hotplug_dev,
|
|
|
|
&lpc->pm.acpi_memory_hotplug, dev,
|
|
|
|
errp);
|
2016-06-14 17:14:02 +03:00
|
|
|
} else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU) &&
|
|
|
|
!lpc->pm.cpu_hotplug_legacy) {
|
|
|
|
acpi_cpu_unplug_request_cb(hotplug_dev, &lpc->pm.cpuhp_state,
|
|
|
|
dev, errp);
|
2015-04-27 11:47:17 +03:00
|
|
|
} else {
|
|
|
|
error_setg(errp, "acpi: device unplug request for not supported device"
|
|
|
|
" type: %s", object_get_typename(OBJECT(dev)));
|
|
|
|
}
|
2015-01-28 10:45:38 +03:00
|
|
|
}
|
|
|
|
|
2016-05-31 13:01:17 +03:00
|
|
|
void ich9_pm_device_unplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
|
2015-01-28 10:45:40 +03:00
|
|
|
Error **errp)
|
|
|
|
{
|
2016-05-31 13:01:17 +03:00
|
|
|
ICH9LPCState *lpc = ICH9_LPC_DEVICE(hotplug_dev);
|
|
|
|
|
|
|
|
if (lpc->pm.acpi_memory_hotplug.is_enabled &&
|
2015-04-27 11:47:18 +03:00
|
|
|
object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
|
2016-05-31 13:01:17 +03:00
|
|
|
acpi_memory_unplug_cb(&lpc->pm.acpi_memory_hotplug, dev, errp);
|
2016-06-14 17:14:02 +03:00
|
|
|
} else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU) &&
|
|
|
|
!lpc->pm.cpu_hotplug_legacy) {
|
|
|
|
acpi_cpu_unplug_cb(&lpc->pm.cpuhp_state, dev, errp);
|
2015-04-27 11:47:18 +03:00
|
|
|
} else {
|
|
|
|
error_setg(errp, "acpi: device unplug for not supported device"
|
|
|
|
" type: %s", object_get_typename(OBJECT(dev)));
|
|
|
|
}
|
2015-01-28 10:45:40 +03:00
|
|
|
}
|
|
|
|
|
2014-06-16 21:12:27 +04:00
|
|
|
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);
|
2016-04-22 20:06:36 +03:00
|
|
|
if (!s->pm.cpu_hotplug_legacy) {
|
|
|
|
acpi_cpu_ospm_status(&s->pm.cpuhp_state, list);
|
|
|
|
}
|
2014-06-16 21:12:27 +04:00
|
|
|
}
|