[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-arm] [PATCH V7 3/6] hw/misc/pvpanic: Add the MMIO interface
From: |
Peter Maydell |
Subject: |
Re: [Qemu-arm] [PATCH V7 3/6] hw/misc/pvpanic: Add the MMIO interface |
Date: |
Tue, 20 Nov 2018 14:29:23 +0000 |
On 16 November 2018 at 10:50, Peng Hao <address@hidden> wrote:
> Add pvpanic new type "TYPE_PVPANIC_MMIO"
>
> Signed-off-by: Peng Hao <address@hidden>
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
I'm not entirely sure I understand why we have two
signed-off-by lines here -- who is the author of this patch?
> ---
> hw/misc/pvpanic.c | 81
> +++++++++++++++++++++++++++++++++++++----------
> include/hw/misc/pvpanic.h | 1 +
> 2 files changed, 65 insertions(+), 17 deletions(-)
>
> diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c
> index dd3aef2..5d0fbc6 100644
> --- a/hw/misc/pvpanic.c
> +++ b/hw/misc/pvpanic.c
> @@ -2,10 +2,12 @@
> * QEMU simulated pvpanic device.
> *
> * Copyright Fujitsu, Corp. 2013
> + * Copyright (c) 2018 ZTE Ltd.
> *
> * Authors:
> * Wen Congyang <address@hidden>
> * Hu Tao <address@hidden>
> + * Peng Hao <address@hidden>
> *
> * This work is licensed under the terms of the GNU GPL, version 2 or later.
> * See the COPYING file in the top-level directory.
> @@ -25,9 +27,6 @@
> /* The pv event value */
> #define PVPANIC_PANICKED (1 << PVPANIC_F_PANICKED)
>
> -#define PVPANIC(obj) \
> - OBJECT_CHECK(PVPanicState, (obj), TYPE_PVPANIC)
> -
We just added (renamed) this macro in the previous patch:
has something gone wrong in a rebase ?
> static void handle_event(int event)
> {
> static bool logged;
> @@ -45,30 +44,50 @@ static void handle_event(int event)
>
> #include "hw/isa/isa.h"
>
> -typedef struct PVPanicState {
> - /* private */
> - ISADevice isadev;
> +/* PVPanicISAState for ISA device and
> + * use ioport.
> + */
> +typedef struct PVPanicISAState {
> + /* private */
> + ISADevice isadev;
This should be "ISADevice parent_obj;" and go above the /* private */
comment, because a PVPanicISAState is-a ISADevice (this is not
a has-a relation).
Again, this seems to be undoing changes from the previous patch
somewhat ?
> + uint16_t ioport;
>
> /* public */
> MemoryRegion mr;
> - uint16_t ioport;
> -} PVPanicState;
> +} PVPanicISAState;
> +
> +/* PVPanicMMIOState for sysbus device and
> + * use mmio.
> + */
> +typedef struct PVPanicMMIOState {
> + /* private */
> + SysBusDevice busdev;
> +
> + /* public */
> + MemoryRegion mr;
> +} PVPanicMMIOState;
> +
> +#define PVPANIC_ISA(obj) \
> + OBJECT_CHECK(PVPanicISAState, (obj), TYPE_PVPANIC)
> +
> +#define PVPANIC_MMIO(obj) \
> + OBJECT_CHECK(PVPanicMMIOState, (obj), TYPE_PVPANIC_MMIO)
>
> /* 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)
> {
> return PVPANIC_PANICKED;
> }
>
> -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)
> {
> handle_event(val);
> }
>
> static const MemoryRegionOps pvpanic_ops = {
> - .read = pvpanic_ioport_read,
> - .write = pvpanic_ioport_write,
> + .read = pvpanic_read,
> + .write = pvpanic_write,
> .impl = {
> .min_access_size = 1,
> .max_access_size = 1,
> @@ -77,15 +96,16 @@ static const MemoryRegionOps pvpanic_ops = {
>
> static void pvpanic_isa_initfn(Object *obj)
> {
> - PVPanicState *s = PVPANIC(obj);
> + PVPanicISAState *s = PVPANIC_ISA(obj);
>
> - memory_region_init_io(&s->mr, OBJECT(s), &pvpanic_ops, s, "pvpanic", 1);
> + memory_region_init_io(&s->mr, OBJECT(s), &pvpanic_ops, s,
> + TYPE_PVPANIC, 1);
> }
>
> static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp)
> {
> ISADevice *d = ISA_DEVICE(dev);
> - PVPanicState *s = PVPANIC(dev);
> + PVPanicISAState *s = PVPANIC_ISA(dev);
> FWCfgState *fw_cfg = fw_cfg_find();
> uint16_t *pvpanic_port;
>
> @@ -102,7 +122,7 @@ static void pvpanic_isa_realizefn(DeviceState *dev, Error
> **errp)
> }
>
> static Property pvpanic_isa_properties[] = {
> - DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicState, ioport, 0x505),
> + DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicISAState, ioport, 0x505),
> DEFINE_PROP_END_OF_LIST(),
> };
>
> @@ -118,14 +138,41 @@ static void pvpanic_isa_class_init(ObjectClass *klass,
> void *data)
> static TypeInfo pvpanic_isa_info = {
> .name = TYPE_PVPANIC,
> .parent = TYPE_ISA_DEVICE,
> - .instance_size = sizeof(PVPanicState),
> + .instance_size = sizeof(PVPanicISAState),
> .instance_init = pvpanic_isa_initfn,
> .class_init = pvpanic_isa_class_init,
> };
>
> +
> +static void pvpanic_mmio_initfn(Object *obj)
> +{
> + PVPanicMMIOState *s = PVPANIC_MMIO(obj);
> + SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
> +
> + memory_region_init_io(&s->mr, OBJECT(s), &pvpanic_ops, s,
> + TYPE_PVPANIC_MMIO, 2);
> + sysbus_init_mmio(sbd, &s->mr);
> +}
> +
> +static void pvpanic_mmio_class_init(ObjectClass *klass, void *data)
> +{
> + DeviceClass *dc = DEVICE_CLASS(klass);
> +
> + set_bit(DEVICE_CATEGORY_MISC, dc->categories);
> +}
> +
> +static TypeInfo pvpanic_mmio_info = {
> + .name = TYPE_PVPANIC_MMIO,
> + .parent = TYPE_SYS_BUS_DEVICE,
> + .instance_size = sizeof(PVPanicMMIOState),
> + .instance_init = pvpanic_mmio_initfn,
> + .class_init = pvpanic_mmio_class_init,
> +};
> +
> static void pvpanic_register_types(void)
> {
> type_register_static(&pvpanic_isa_info);
> + type_register_static(&pvpanic_mmio_info);
> }
I would suggest refactoring the ISA device in one patch,
and then adding the MMIO device in a second patch. Currently
this patch is mixing the two.
thanks
-- PMM
- [Qemu-arm] [PATCH V7 0/5] add pvpanic mmio support, Peng Hao, 2018/11/15
- [Qemu-arm] [PATCH V7 1/6] hw/misc/pvpanic: Build the pvpanic device in $(common-obj), Peng Hao, 2018/11/15
- [Qemu-arm] [PATCH V7 2/6] hw/misc/pvpanic: Cosmetic renaming, Peng Hao, 2018/11/15
- [Qemu-arm] [PATCH V7 3/6] hw/misc/pvpanic: Add the MMIO interface, Peng Hao, 2018/11/15
- Re: [Qemu-arm] [PATCH V7 3/6] hw/misc/pvpanic: Add the MMIO interface,
Peter Maydell <=
- [Qemu-arm] [PATCH V7 4/6] hw/arm/virt: Use the pvpanic device, Peng Hao, 2018/11/15
- [Qemu-arm] [PATCH V7 6/6] pvpanic : update pvpanic document, Peng Hao, 2018/11/15
- [Qemu-arm] [PATCH V7 5/6] hw/arm/virt: add pvpanic device in virt acpi table, Peng Hao, 2018/11/15