On Tue, Feb 9, 2016 at 3:49 AM, Alex Bennée <alex.ben...@linaro.org> wrote: > > Alistair Francis <alistair.fran...@xilinx.com> writes: > >> From: Peter Crosthwaite <peter.crosthwa...@xilinx.com> >> >> QOMify registers as a child of TYPE_DEVICE. This allows registers to >> define GPIOs. >> >> Define an init helper that will do QOM initialisation as well as setup >> the r/w fast paths. > > I don't know if there has been bit-rot since posting but this currently > doesn't build: > > CC hw/core/register.o > hw/core/register.c:394:1: error: return type defaults to ‘int’ > [-Werror=return-type] > type_init(register_register_types) > ^ > hw/core/register.c:394:1: error: function declaration isn’t a prototype > [-Werror=strict-prototypes] > hw/core/register.c: In function ‘type_init’: > hw/core/register.c:394:1: error: old-style function definition > [-Werror=old-style-definition] > hw/core/register.c:394:1: error: expected ‘{’ at end of input > hw/core/register.c: At top level: > hw/core/register.c:389:13: error: ‘register_register_types’ defined but not > used [-Werror=unused-function] > static void register_register_types(void) > ^ > hw/core/register.c: In function ‘type_init’: > hw/core/register.c:394:1: error: control reaches end of non-void function > [-Werror=return-type] > type_init(register_register_types) > ^ > cc1: all warnings being treated as errors > make: *** [hw/core/register.o] Error 1 > make: Target `all' not remade because of errors.
Yeah there appears to have been some changes with include files. Thanks for pointing it out, fixed in V4. Thanks, Alistair > > >> >> Signed-off-by: Peter Crosthwaite <peter.crosthwa...@xilinx.com> >> Signed-off-by: Alistair Francis <alistair.fran...@xilinx.com> >> Reviewed-by: KONRAD Frederic <fred.kon...@greensocs.com> >> --- >> >> hw/core/register.c | 34 ++++++++++++++++++++++++++++++++++ >> include/hw/register.h | 14 ++++++++++++++ >> 2 files changed, 48 insertions(+) >> >> diff --git a/hw/core/register.c b/hw/core/register.c >> index e696c43..939f398 100644 >> --- a/hw/core/register.c >> +++ b/hw/core/register.c >> @@ -188,6 +188,28 @@ void register_reset(RegisterInfo *reg) >> register_write_val(reg, reg->access->reset); >> } >> >> +void register_init(RegisterInfo *reg) >> +{ >> + assert(reg); >> + const RegisterAccessInfo *ac; >> + >> + if (!reg->data || !reg->access) { >> + return; >> + } >> + >> + object_initialize((void *)reg, sizeof(*reg), TYPE_REGISTER); >> + >> + ac = reg->access; >> + >> + /* if there are no debug msgs and no RMW requirement, mark for fast >> write */ >> + reg->write_lite = reg->debug || ac->ro || ac->w1c || ac->pre_write || >> + ((ac->ge0 || ac->ge1) && qemu_loglevel_mask(LOG_GUEST_ERROR)) || >> + ((ac->ui0 || ac->ui1) && qemu_loglevel_mask(LOG_UNIMP)) >> + ? false : true; >> + /* no debug and no clear-on-read is a fast read */ >> + reg->read_lite = reg->debug || ac->cor ? false : true; >> +} >> + >> static inline void register_write_memory(void *opaque, hwaddr addr, >> uint64_t value, unsigned size, >> bool be) >> { >> @@ -235,3 +257,15 @@ uint64_t register_read_memory_le(void *opaque, hwaddr >> addr, unsigned size) >> { >> return register_read_memory(opaque, addr, size, false); >> } >> + >> +static const TypeInfo register_info = { >> + .name = TYPE_REGISTER, >> + .parent = TYPE_DEVICE, >> +}; >> + >> +static void register_register_types(void) >> +{ >> + type_register_static(®ister_info); >> +} >> + >> +type_init(register_register_types) >> diff --git a/include/hw/register.h b/include/hw/register.h >> index 38ee6f5..3316458 100644 >> --- a/include/hw/register.h >> +++ b/include/hw/register.h >> @@ -11,6 +11,7 @@ >> #ifndef REGISTER_H >> #define REGISTER_H >> >> +#include "hw/qdev-core.h" >> #include "exec/memory.h" >> >> typedef struct RegisterInfo RegisterInfo; >> @@ -101,6 +102,8 @@ struct RegisterAccessInfo { >> >> struct RegisterInfo { >> /* <private> */ >> + DeviceState parent_obj; >> + >> bool read_lite; >> bool write_lite; >> >> @@ -118,6 +121,9 @@ struct RegisterInfo { >> void *opaque; >> }; >> >> +#define TYPE_REGISTER "qemu,register" >> +#define REGISTER(obj) OBJECT_CHECK(RegisterInfo, (obj), TYPE_REGISTER) >> + >> /** >> * write a value to a register, subject to its restrictions >> * @reg: register to write to >> @@ -143,6 +149,14 @@ uint64_t register_read(RegisterInfo *reg); >> void register_reset(RegisterInfo *reg); >> >> /** >> + * Initialize a register. GPIO's are setup as IOs to the specified device. >> + * Fast paths for eligible registers are enabled. >> + * @reg: Register to initialize >> + */ >> + >> +void register_init(RegisterInfo *reg); >> + >> +/** >> * Memory API MMIO write handler that will write to a Register API register. >> * _be for big endian variant and _le for little endian. >> * @opaque: RegisterInfo to write to > > > -- > Alex Bennée >