mirror of https://github.com/proxmox/mirror_qemu
hw/misc/pvpanic: split-out generic and bus dependent code
To ease the PCI device addition in next patches, split the code as follows: - generic code (read/write/setup) is being kept in pvpanic.c - ISA dependent code moved to pvpanic-isa.c Also, rename: - ISA_PVPANIC_DEVICE -> PVPANIC_ISA_DEVICE. - TYPE_PVPANIC -> TYPE_PVPANIC_ISA. - MemoryRegion io -> mr. - pvpanic_ioport_* in pvpanic_*. Update the build system with the new files and config structure. Signed-off-by: Mihai Carabas <mihai.carabas@oracle.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>master
parent
8a74ce618b
commit
677726ef1e
|
@ -14,7 +14,7 @@ config PC
|
||||||
imply ISA_DEBUG
|
imply ISA_DEBUG
|
||||||
imply PARALLEL
|
imply PARALLEL
|
||||||
imply PCI_DEVICES
|
imply PCI_DEVICES
|
||||||
imply PVPANIC
|
imply PVPANIC_ISA
|
||||||
imply QXL
|
imply QXL
|
||||||
imply SEV
|
imply SEV
|
||||||
imply SGA
|
imply SGA
|
||||||
|
|
|
@ -121,9 +121,13 @@ config IOTKIT_SYSCTL
|
||||||
config IOTKIT_SYSINFO
|
config IOTKIT_SYSINFO
|
||||||
bool
|
bool
|
||||||
|
|
||||||
config PVPANIC
|
config PVPANIC_COMMON
|
||||||
|
bool
|
||||||
|
|
||||||
|
config PVPANIC_ISA
|
||||||
bool
|
bool
|
||||||
depends on ISA_BUS
|
depends on ISA_BUS
|
||||||
|
select PVPANIC_COMMON
|
||||||
|
|
||||||
config AUX
|
config AUX
|
||||||
bool
|
bool
|
||||||
|
|
|
@ -13,6 +13,7 @@ softmmu_ss.add(when: 'CONFIG_EMC141X', if_true: files('emc141x.c'))
|
||||||
softmmu_ss.add(when: 'CONFIG_UNIMP', if_true: files('unimp.c'))
|
softmmu_ss.add(when: 'CONFIG_UNIMP', if_true: files('unimp.c'))
|
||||||
softmmu_ss.add(when: 'CONFIG_EMPTY_SLOT', if_true: files('empty_slot.c'))
|
softmmu_ss.add(when: 'CONFIG_EMPTY_SLOT', if_true: files('empty_slot.c'))
|
||||||
softmmu_ss.add(when: 'CONFIG_LED', if_true: files('led.c'))
|
softmmu_ss.add(when: 'CONFIG_LED', if_true: files('led.c'))
|
||||||
|
softmmu_ss.add(when: 'CONFIG_PVPANIC_COMMON', if_true: files('pvpanic.c'))
|
||||||
|
|
||||||
# ARM devices
|
# ARM devices
|
||||||
softmmu_ss.add(when: 'CONFIG_PL310', if_true: files('arm_l2x0.c'))
|
softmmu_ss.add(when: 'CONFIG_PL310', if_true: files('arm_l2x0.c'))
|
||||||
|
@ -98,7 +99,7 @@ softmmu_ss.add(when: 'CONFIG_IOTKIT_SYSINFO', if_true: files('iotkit-sysinfo.c')
|
||||||
softmmu_ss.add(when: 'CONFIG_ARMSSE_CPUID', if_true: files('armsse-cpuid.c'))
|
softmmu_ss.add(when: 'CONFIG_ARMSSE_CPUID', if_true: files('armsse-cpuid.c'))
|
||||||
softmmu_ss.add(when: 'CONFIG_ARMSSE_MHU', if_true: files('armsse-mhu.c'))
|
softmmu_ss.add(when: 'CONFIG_ARMSSE_MHU', if_true: files('armsse-mhu.c'))
|
||||||
|
|
||||||
softmmu_ss.add(when: 'CONFIG_PVPANIC', if_true: files('pvpanic.c'))
|
softmmu_ss.add(when: 'CONFIG_PVPANIC_ISA', if_true: files('pvpanic-isa.c'))
|
||||||
softmmu_ss.add(when: 'CONFIG_AUX', if_true: files('auxbus.c'))
|
softmmu_ss.add(when: 'CONFIG_AUX', if_true: files('auxbus.c'))
|
||||||
softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_scu.c', 'aspeed_sdmc.c', 'aspeed_xdma.c'))
|
softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_scu.c', 'aspeed_sdmc.c', 'aspeed_xdma.c'))
|
||||||
softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-sysreg.c'))
|
softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-sysreg.c'))
|
||||||
|
|
|
@ -0,0 +1,94 @@
|
||||||
|
/*
|
||||||
|
* QEMU simulated pvpanic device.
|
||||||
|
*
|
||||||
|
* Copyright Fujitsu, Corp. 2013
|
||||||
|
*
|
||||||
|
* Authors:
|
||||||
|
* Wen Congyang <wency@cn.fujitsu.com>
|
||||||
|
* Hu Tao <hutao@cn.fujitsu.com>
|
||||||
|
*
|
||||||
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
||||||
|
* See the COPYING file in the top-level directory.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "qemu/osdep.h"
|
||||||
|
#include "qemu/log.h"
|
||||||
|
#include "qemu/module.h"
|
||||||
|
#include "sysemu/runstate.h"
|
||||||
|
|
||||||
|
#include "hw/nvram/fw_cfg.h"
|
||||||
|
#include "hw/qdev-properties.h"
|
||||||
|
#include "hw/misc/pvpanic.h"
|
||||||
|
#include "qom/object.h"
|
||||||
|
#include "hw/isa/isa.h"
|
||||||
|
|
||||||
|
OBJECT_DECLARE_SIMPLE_TYPE(PVPanicISAState, PVPANIC_ISA_DEVICE)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* PVPanicISAState for ISA device and
|
||||||
|
* use ioport.
|
||||||
|
*/
|
||||||
|
struct PVPanicISAState {
|
||||||
|
ISADevice parent_obj;
|
||||||
|
|
||||||
|
uint16_t ioport;
|
||||||
|
PVPanicState pvpanic;
|
||||||
|
};
|
||||||
|
|
||||||
|
static void pvpanic_isa_initfn(Object *obj)
|
||||||
|
{
|
||||||
|
PVPanicISAState *s = PVPANIC_ISA_DEVICE(obj);
|
||||||
|
|
||||||
|
pvpanic_setup_io(&s->pvpanic, DEVICE(s), 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp)
|
||||||
|
{
|
||||||
|
ISADevice *d = ISA_DEVICE(dev);
|
||||||
|
PVPanicISAState *s = PVPANIC_ISA_DEVICE(dev);
|
||||||
|
PVPanicState *ps = &s->pvpanic;
|
||||||
|
FWCfgState *fw_cfg = fw_cfg_find();
|
||||||
|
uint16_t *pvpanic_port;
|
||||||
|
|
||||||
|
if (!fw_cfg) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
pvpanic_port = g_malloc(sizeof(*pvpanic_port));
|
||||||
|
*pvpanic_port = cpu_to_le16(s->ioport);
|
||||||
|
fw_cfg_add_file(fw_cfg, "etc/pvpanic-port", pvpanic_port,
|
||||||
|
sizeof(*pvpanic_port));
|
||||||
|
|
||||||
|
isa_register_ioport(d, &ps->mr, s->ioport);
|
||||||
|
}
|
||||||
|
|
||||||
|
static Property pvpanic_isa_properties[] = {
|
||||||
|
DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicISAState, ioport, 0x505),
|
||||||
|
DEFINE_PROP_UINT8("events", PVPanicISAState, pvpanic.events, PVPANIC_PANICKED | PVPANIC_CRASHLOADED),
|
||||||
|
DEFINE_PROP_END_OF_LIST(),
|
||||||
|
};
|
||||||
|
|
||||||
|
static void pvpanic_isa_class_init(ObjectClass *klass, void *data)
|
||||||
|
{
|
||||||
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||||
|
|
||||||
|
dc->realize = pvpanic_isa_realizefn;
|
||||||
|
device_class_set_props(dc, pvpanic_isa_properties);
|
||||||
|
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
|
||||||
|
}
|
||||||
|
|
||||||
|
static TypeInfo pvpanic_isa_info = {
|
||||||
|
.name = TYPE_PVPANIC_ISA_DEVICE,
|
||||||
|
.parent = TYPE_ISA_DEVICE,
|
||||||
|
.instance_size = sizeof(PVPanicISAState),
|
||||||
|
.instance_init = pvpanic_isa_initfn,
|
||||||
|
.class_init = pvpanic_isa_class_init,
|
||||||
|
};
|
||||||
|
|
||||||
|
static void pvpanic_register_types(void)
|
||||||
|
{
|
||||||
|
type_register_static(&pvpanic_isa_info);
|
||||||
|
}
|
||||||
|
|
||||||
|
type_init(pvpanic_register_types)
|
|
@ -22,18 +22,6 @@
|
||||||
#include "hw/misc/pvpanic.h"
|
#include "hw/misc/pvpanic.h"
|
||||||
#include "qom/object.h"
|
#include "qom/object.h"
|
||||||
|
|
||||||
/* The bit of supported pv event, TODO: include uapi header and remove this */
|
|
||||||
#define PVPANIC_F_PANICKED 0
|
|
||||||
#define PVPANIC_F_CRASHLOADED 1
|
|
||||||
|
|
||||||
/* The pv event value */
|
|
||||||
#define PVPANIC_PANICKED (1 << PVPANIC_F_PANICKED)
|
|
||||||
#define PVPANIC_CRASHLOADED (1 << PVPANIC_F_CRASHLOADED)
|
|
||||||
|
|
||||||
typedef struct PVPanicState PVPanicState;
|
|
||||||
DECLARE_INSTANCE_CHECKER(PVPanicState, ISA_PVPANIC_DEVICE,
|
|
||||||
TYPE_PVPANIC)
|
|
||||||
|
|
||||||
static void handle_event(int event)
|
static void handle_event(int event)
|
||||||
{
|
{
|
||||||
static bool logged;
|
static bool logged;
|
||||||
|
@ -54,90 +42,29 @@ static void handle_event(int event)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "hw/isa/isa.h"
|
|
||||||
|
|
||||||
struct PVPanicState {
|
|
||||||
ISADevice parent_obj;
|
|
||||||
|
|
||||||
MemoryRegion io;
|
|
||||||
uint16_t ioport;
|
|
||||||
uint8_t events;
|
|
||||||
};
|
|
||||||
|
|
||||||
/* return supported events on read */
|
/* return supported events on read */
|
||||||
static uint64_t pvpanic_ioport_read(void *opaque, hwaddr addr, unsigned size)
|
static uint64_t pvpanic_read(void *opaque, hwaddr addr, unsigned size)
|
||||||
{
|
{
|
||||||
PVPanicState *pvp = opaque;
|
PVPanicState *pvp = opaque;
|
||||||
return pvp->events;
|
return pvp->events;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void pvpanic_ioport_write(void *opaque, hwaddr addr, uint64_t val,
|
static void pvpanic_write(void *opaque, hwaddr addr, uint64_t val,
|
||||||
unsigned size)
|
unsigned size)
|
||||||
{
|
{
|
||||||
handle_event(val);
|
handle_event(val);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const MemoryRegionOps pvpanic_ops = {
|
static const MemoryRegionOps pvpanic_ops = {
|
||||||
.read = pvpanic_ioport_read,
|
.read = pvpanic_read,
|
||||||
.write = pvpanic_ioport_write,
|
.write = pvpanic_write,
|
||||||
.impl = {
|
.impl = {
|
||||||
.min_access_size = 1,
|
.min_access_size = 1,
|
||||||
.max_access_size = 1,
|
.max_access_size = 1,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
static void pvpanic_isa_initfn(Object *obj)
|
void pvpanic_setup_io(PVPanicState *s, DeviceState *dev, unsigned size)
|
||||||
{
|
{
|
||||||
PVPanicState *s = ISA_PVPANIC_DEVICE(obj);
|
memory_region_init_io(&s->mr, OBJECT(dev), &pvpanic_ops, s, "pvpanic", size);
|
||||||
|
|
||||||
memory_region_init_io(&s->io, OBJECT(s), &pvpanic_ops, s, "pvpanic", 1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp)
|
|
||||||
{
|
|
||||||
ISADevice *d = ISA_DEVICE(dev);
|
|
||||||
PVPanicState *s = ISA_PVPANIC_DEVICE(dev);
|
|
||||||
FWCfgState *fw_cfg = fw_cfg_find();
|
|
||||||
uint16_t *pvpanic_port;
|
|
||||||
|
|
||||||
if (!fw_cfg) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
pvpanic_port = g_malloc(sizeof(*pvpanic_port));
|
|
||||||
*pvpanic_port = cpu_to_le16(s->ioport);
|
|
||||||
fw_cfg_add_file(fw_cfg, "etc/pvpanic-port", pvpanic_port,
|
|
||||||
sizeof(*pvpanic_port));
|
|
||||||
|
|
||||||
isa_register_ioport(d, &s->io, s->ioport);
|
|
||||||
}
|
|
||||||
|
|
||||||
static Property pvpanic_isa_properties[] = {
|
|
||||||
DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicState, ioport, 0x505),
|
|
||||||
DEFINE_PROP_UINT8("events", PVPanicState, events, PVPANIC_PANICKED | PVPANIC_CRASHLOADED),
|
|
||||||
DEFINE_PROP_END_OF_LIST(),
|
|
||||||
};
|
|
||||||
|
|
||||||
static void pvpanic_isa_class_init(ObjectClass *klass, void *data)
|
|
||||||
{
|
|
||||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
||||||
|
|
||||||
dc->realize = pvpanic_isa_realizefn;
|
|
||||||
device_class_set_props(dc, pvpanic_isa_properties);
|
|
||||||
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
|
|
||||||
}
|
|
||||||
|
|
||||||
static TypeInfo pvpanic_isa_info = {
|
|
||||||
.name = TYPE_PVPANIC,
|
|
||||||
.parent = TYPE_ISA_DEVICE,
|
|
||||||
.instance_size = sizeof(PVPanicState),
|
|
||||||
.instance_init = pvpanic_isa_initfn,
|
|
||||||
.class_init = pvpanic_isa_class_init,
|
|
||||||
};
|
|
||||||
|
|
||||||
static void pvpanic_register_types(void)
|
|
||||||
{
|
|
||||||
type_register_static(&pvpanic_isa_info);
|
|
||||||
}
|
|
||||||
|
|
||||||
type_init(pvpanic_register_types)
|
|
||||||
|
|
|
@ -17,13 +17,32 @@
|
||||||
|
|
||||||
#include "qom/object.h"
|
#include "qom/object.h"
|
||||||
|
|
||||||
#define TYPE_PVPANIC "pvpanic"
|
#define TYPE_PVPANIC_ISA_DEVICE "pvpanic"
|
||||||
|
|
||||||
#define PVPANIC_IOPORT_PROP "ioport"
|
#define PVPANIC_IOPORT_PROP "ioport"
|
||||||
|
|
||||||
|
/* The bit of supported pv event, TODO: include uapi header and remove this */
|
||||||
|
#define PVPANIC_F_PANICKED 0
|
||||||
|
#define PVPANIC_F_CRASHLOADED 1
|
||||||
|
|
||||||
|
/* The pv event value */
|
||||||
|
#define PVPANIC_PANICKED (1 << PVPANIC_F_PANICKED)
|
||||||
|
#define PVPANIC_CRASHLOADED (1 << PVPANIC_F_CRASHLOADED)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* PVPanicState for any device type
|
||||||
|
*/
|
||||||
|
typedef struct PVPanicState PVPanicState;
|
||||||
|
struct PVPanicState {
|
||||||
|
MemoryRegion mr;
|
||||||
|
uint8_t events;
|
||||||
|
};
|
||||||
|
|
||||||
|
void pvpanic_setup_io(PVPanicState *s, DeviceState *dev, unsigned size);
|
||||||
|
|
||||||
static inline uint16_t pvpanic_port(void)
|
static inline uint16_t pvpanic_port(void)
|
||||||
{
|
{
|
||||||
Object *o = object_resolve_path_type("", TYPE_PVPANIC, NULL);
|
Object *o = object_resolve_path_type("", TYPE_PVPANIC_ISA_DEVICE, NULL);
|
||||||
if (!o) {
|
if (!o) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,7 @@ qtests_i386 = \
|
||||||
(config_host.has_key('CONFIG_LINUX') and \
|
(config_host.has_key('CONFIG_LINUX') and \
|
||||||
config_all_devices.has_key('CONFIG_ISA_IPMI_BT') ? ['ipmi-bt-test'] : []) + \
|
config_all_devices.has_key('CONFIG_ISA_IPMI_BT') ? ['ipmi-bt-test'] : []) + \
|
||||||
(config_all_devices.has_key('CONFIG_WDT_IB700') ? ['wdt_ib700-test'] : []) + \
|
(config_all_devices.has_key('CONFIG_WDT_IB700') ? ['wdt_ib700-test'] : []) + \
|
||||||
(config_all_devices.has_key('CONFIG_PVPANIC') ? ['pvpanic-test'] : []) + \
|
(config_all_devices.has_key('CONFIG_PVPANIC_ISA') ? ['pvpanic-test'] : []) + \
|
||||||
(config_all_devices.has_key('CONFIG_HDA') ? ['intel-hda-test'] : []) + \
|
(config_all_devices.has_key('CONFIG_HDA') ? ['intel-hda-test'] : []) + \
|
||||||
(config_all_devices.has_key('CONFIG_I82801B11') ? ['i82801b11-test'] : []) + \
|
(config_all_devices.has_key('CONFIG_I82801B11') ? ['i82801b11-test'] : []) + \
|
||||||
(config_all_devices.has_key('CONFIG_IOH3420') ? ['ioh3420-test'] : []) + \
|
(config_all_devices.has_key('CONFIG_IOH3420') ? ['ioh3420-test'] : []) + \
|
||||||
|
|
Loading…
Reference in New Issue