[v7,05/12] register: QOMify

Commit Message

Alistair Francis June 22, 2016, 8:23 p.m. UTC

From: Peter Crosthwaite <[e-mail]>

QOMify registers as a child of TYPE_DEVICE. This allows registers to
define GPIOs.

Define an init helper that will do QOM initialisation.

Signed-off-by: Peter Crosthwaite <[e-mail]>
Signed-off-by: Alistair Francis <[e-mail]>
Reviewed-by: KONRAD Frederic <[e-mail]>
---
V7:
 - Remove uneeded struct
 - Fixup documentation
V5:
 - Convert to using only one memory region

 hw/core/register.c    | 23 +++++++++++++++++++++++
 include/hw/register.h | 16 ++++++++++++++++
 2 files changed, 39 insertions(+)

Comments

Peter Maydell June 23, 2016, 12:40 p.m. UTC | #1

On 22 June 2016 at 21:23, Alistair Francis <[e-mail]> wrote:
> From: Peter Crosthwaite <[e-mail]>
>
> QOMify registers as a child of TYPE_DEVICE. This allows registers to
> define GPIOs.
>
> Define an init helper that will do QOM initialisation.
>
> Signed-off-by: Peter Crosthwaite <[e-mail]>
> Signed-off-by: Alistair Francis <[e-mail]>
> Reviewed-by: KONRAD Frederic <[e-mail]>
> ---
> V7:
>  - Remove uneeded struct
>  - Fixup documentation
> V5:
>  - Convert to using only one memory region
>
>  hw/core/register.c    | 23 +++++++++++++++++++++++
>  include/hw/register.h | 16 ++++++++++++++++
>  2 files changed, 39 insertions(+)
>
> diff --git a/hw/core/register.c b/hw/core/register.c
> index 149aebb..41c11c8 100644
> --- a/hw/core/register.c
> +++ b/hw/core/register.c
> @@ -155,6 +155,17 @@ void register_reset(RegisterInfo *reg)
>      register_write_val(reg, reg->access->reset);
>  }
>
> +void register_init(RegisterInfo *reg)
> +{
> +    assert(reg);
> +
> +    if (!reg->data || !reg->access) {
> +        return;
> +    }
> +
> +    object_initialize((void *)reg, sizeof(*reg), TYPE_REGISTER);
> +}
> +
>  void register_write_memory(void *opaque, hwaddr addr,
>                             uint64_t value, unsigned size)
>  {
> @@ -212,3 +223,15 @@ uint64_t register_read_memory(void *opaque, hwaddr addr,
>
>      return extract64(read_val, 0, size * 8);
>  }
> +
> +static const TypeInfo register_info = {
> +    .name  = TYPE_REGISTER,
> +    .parent = TYPE_DEVICE,
> +};
> +
> +static void register_register_types(void)
> +{
> +    type_register_static(&register_info);
> +}
> +
> +type_init(register_register_types)
> diff --git a/include/hw/register.h b/include/hw/register.h
> index 216b679..18a63df 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;
> @@ -72,6 +73,9 @@ struct RegisterAccessInfo {
>   */
>
>  struct RegisterInfo {
> +    /* <private> */
> +    DeviceState parent_obj;
> +
>      /* <public> */
>      void *data;
>      int data_size;
> @@ -81,6 +85,9 @@ struct RegisterInfo {
>      void *opaque;
>  };
>
> +#define TYPE_REGISTER "qemu,register"
> +#define REGISTER(obj) OBJECT_CHECK(RegisterInfo, (obj), TYPE_REGISTER)
> +
>  /**
>   * This structure is used to group all of the individual registers which are
>   * modeled using the RegisterInfo strucutre.
> @@ -130,6 +137,15 @@ uint64_t register_read(RegisterInfo *reg, const char* prefix, bool debug);
>  void register_reset(RegisterInfo *reg);
>
>  /**
> + * Initialize a register. This will also setup any GPIO links which are used
> + * to connect register updates in one device to other devices. Generally this
> + * is useful for interrupt propagation.
> + * @reg: Register to initialize
> + */

Leave the remark about GPIOs to the patch that adds GPIO support.

Otherwise
Reviewed-by: Peter Maydell <[e-mail]>

thanks
-- PMM

Patch

diff --git a/hw/core/register.c b/hw/core/register.c
index 149aebb..41c11c8 100644
--- a/hw/core/register.c
+++ b/hw/core/register.c
@@ -155,6 +155,17 @@  void register_reset(RegisterInfo *reg)
     register_write_val(reg, reg->access->reset);
 }
 
+void register_init(RegisterInfo *reg)
+{
+    assert(reg);
+
+    if (!reg->data || !reg->access) {
+        return;
+    }
+
+    object_initialize((void *)reg, sizeof(*reg), TYPE_REGISTER);
+}
+
 void register_write_memory(void *opaque, hwaddr addr,
                            uint64_t value, unsigned size)
 {
@@ -212,3 +223,15 @@  uint64_t register_read_memory(void *opaque, hwaddr addr,
 
     return extract64(read_val, 0, size * 8);
 }
+
+static const TypeInfo register_info = {
+    .name  = TYPE_REGISTER,
+    .parent = TYPE_DEVICE,
+};
+
+static void register_register_types(void)
+{
+    type_register_static(&register_info);
+}
+
+type_init(register_register_types)
diff --git a/include/hw/register.h b/include/hw/register.h
index 216b679..18a63df 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;
@@ -72,6 +73,9 @@  struct RegisterAccessInfo {
  */
 
 struct RegisterInfo {
+    /* <private> */
+    DeviceState parent_obj;
+
     /* <public> */
     void *data;
     int data_size;
@@ -81,6 +85,9 @@  struct RegisterInfo {
     void *opaque;
 };
 
+#define TYPE_REGISTER "qemu,register"
+#define REGISTER(obj) OBJECT_CHECK(RegisterInfo, (obj), TYPE_REGISTER)
+
 /**
  * This structure is used to group all of the individual registers which are
  * modeled using the RegisterInfo strucutre.
@@ -130,6 +137,15 @@  uint64_t register_read(RegisterInfo *reg, const char* prefix, bool debug);
 void register_reset(RegisterInfo *reg);
 
 /**
+ * Initialize a register. This will also setup any GPIO links which are used
+ * to connect register updates in one device to other devices. Generally this
+ * is useful for interrupt propagation.
+ * @reg: Register to initialize
+ */
+
+void register_init(RegisterInfo *reg);
+
+/**
  * Memory API MMIO write handler that will write to a Register API register.
  * @opaque: RegisterInfo to write to
  * @addr: Address to write