subject:"\[Qemu\-devel\] \[PATCH\]\[SPARC\] LEON3\: Add emulation of AMBA plugplay"

Re: [Qemu-devel] [PATCH][SPARC] LEON3: Add emulation of AMBA plugplay

2014-10-09 Thread Fabien Chouteau

On 10/08/2014 05:38 PM, Andreas Färber wrote:
 Hi,
 

Hi Andreas,

 Am 08.10.2014 um 16:19 schrieb Fabien Chouteau:
 From: Jiri Gaisler j...@gaisler.se

 +
 +#define TYPE_GRLIB_APB_PNP grlib,apbpnp
 
 If you move the two TYPE_* constants to grlib.h, you can reuse them.
 

Will do.

 +#define GRLIB_APB_PNP(obj) \
 +OBJECT_CHECK(APBPNP, (obj), TYPE_GRLIB_APB_PNP)
 +
 +typedef struct APBPNP {
 +SysBusDevice parent_obj;
 +MemoryRegion iomem;
 +} APBPNP;
 +
 +static uint64_t grlib_apbpnp_read(void *opaque, hwaddr addr,
 +   unsigned size)
 
 Indentation is off by one for all read/write functions.
 

Are you sure? The indentation is 4 spaces right? (checkpatch.pl didn't
raise any error).

 +static int grlib_apbpnp_init(SysBusDevice *dev)
 +{
 +APBPNP *pnp = GRLIB_APB_PNP(dev);
 +
 +memory_region_init_io(pnp-iomem, OBJECT(pnp), grlib_apbpnp_ops, pnp,
 +  apbpnp, APBPNP_REG_SIZE);
 +
 +sysbus_init_mmio(dev, pnp-iomem);

 APBPNP_REG_SIZE seems constant, so you could move both lines into an
 instance_init function.


Will do. I don't need a .class_init then.

 +
 +k-init = grlib_apbpnp_init;
 +}
 +
 +static const TypeInfo grlib_apbpnp_info = {
 +.name  = TYPE_GRLIB_APB_PNP,
 +.parent= TYPE_SYS_BUS_DEVICE,
 +.instance_size = sizeof(APBPNP),
 +.class_init= grlib_apbpnp_class_init,
 +};
 +
 +static void grlib_apbpnp_register_types(void)
 +{
 +type_register_static(grlib_apbpnp_info);
 +}
 +
 +type_init(grlib_apbpnp_register_types)
 
 Please either split into two .c files here, ...
 

 
 ... or if unavoidable use just one type_init and registration function.
 +

I will create one type init for both memory regions.

 +static inline
 +DeviceState *grlib_ahbpnp_create(hwaddr  base)
 +{
 +DeviceState *dev;
 +
 +dev = qdev_create(NULL, grlib,ahbpnp);
 +
 +if (qdev_init(dev)) {
 +return NULL;
 +}
 +
 +sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
 +
 +return dev;
 +}
 +
  #endif /* ! _GRLIB_H_ */
 
 Are these functions really needed? Can't you just inline them?
 Also note that the return value is never actually checked.


This is what we do for all GRLIB devices, I think it makes a cleaner
machine init.

Thanks for the review.

Re: [Qemu-devel] [PATCH][SPARC] LEON3: Add emulation of AMBA plugplay

2014-10-09 Thread Fabien Chouteau

On 10/08/2014 09:43 PM, Jiri Gaisler wrote:
 On 10/08/2014 05:38 PM, Andreas Färber wrote:
 Hi,

 Am 08.10.2014 um 16:19 schrieb Fabien Chouteau:
 From: Jiri Gaisler j...@gaisler.se

 AMBA plugplay is used by kernels to probe available devices (Timers,
 UART, etc...). This is a static declaration of devices implemented in
 QEMU. In the future, a more advanced version could compute those
 information directly from the device tree.

 Interesting. There's quite some magic numbers in the read functions; I
 wonder if you could read them via QOM if you actually give the devices a
 canonical path or search by type? You may want to peek at ACPI code.
 
 
 The plugplay area is similar in function to the PCI configuration
 space, indicating vendor/device ID's, address range, interrupt number
 etc. of on-chip IP cores. The 'magic' numbers could be generated by
 generic functions taking these parameters as inputs. This would
 certainly make the code more readable, and easily extended in the
 future. Would such a solution be acceptable?
 
 

That would be a great improvement, then we could try to plug it with the
QOM API to generate automatically the data.

[Qemu-devel] [PATCH][SPARC] LEON3: Add emulation of AMBA plugplay

2014-10-08 Thread Fabien Chouteau

From: Jiri Gaisler j...@gaisler.se

AMBA plugplay is used by kernels to probe available devices (Timers,
UART, etc...). This is a static declaration of devices implemented in
QEMU. In the future, a more advanced version could compute those
information directly from the device tree.

Signed-off-by: Fabien Chouteau chout...@adacore.com
---
 hw/sparc/Makefile.objs   |1 +
 hw/sparc/grlib_ambapnp.c |  206 ++
 hw/sparc/leon3.c |6 ++
 include/hw/sparc/grlib.h |   36 
 4 files changed, 249 insertions(+)
 create mode 100644 hw/sparc/grlib_ambapnp.c

diff --git a/hw/sparc/Makefile.objs b/hw/sparc/Makefile.objs
index c987b5b..e763701 100644
--- a/hw/sparc/Makefile.objs
+++ b/hw/sparc/Makefile.objs
@@ -1 +1,2 @@
 obj-y += sun4m.o leon3.o
+obj-$(CONFIG_GRLIB) += grlib_ambapnp.o
diff --git a/hw/sparc/grlib_ambapnp.c b/hw/sparc/grlib_ambapnp.c
new file mode 100644
index 000..dfadd5c
--- /dev/null
+++ b/hw/sparc/grlib_ambapnp.c
@@ -0,0 +1,206 @@
+/*
+ * QEMU GRLIB AMBA PlugPlay Emulator
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the Software), to 
deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include hw/sysbus.h
+
+#define APBPNP_REG_SIZE 4096 /* Size of memory mapped registers */
+
+#define TYPE_GRLIB_APB_PNP grlib,apbpnp
+#define GRLIB_APB_PNP(obj) \
+OBJECT_CHECK(APBPNP, (obj), TYPE_GRLIB_APB_PNP)
+
+typedef struct APBPNP {
+SysBusDevice parent_obj;
+MemoryRegion iomem;
+} APBPNP;
+
+static uint64_t grlib_apbpnp_read(void *opaque, hwaddr addr,
+   unsigned size)
+{
+uint64_t read_data;
+addr = 0xfff;
+
+/* Unit registers */
+switch (addr  0xffc) {
+case 0x00:
+read_data = 0x0400f000; /* Memory controller */
+break;
+case 0x04:
+read_data = 0xfff1;
+break;
+case 0x08:
+read_data = 0x0100c023; /* APBUART */
+break;
+case 0x0C:
+read_data = 0x0010fff1;
+break;
+case 0x10:
+read_data = 0x0100d040; /* IRQMP */
+break;
+case 0x14:
+read_data = 0x0020fff1;
+break;
+case 0x18:
+read_data = 0x01011006; /* GPTIMER */
+break;
+case 0x1C:
+read_data = 0x0030fff1;
+break;
+
+default:
+read_data = 0;
+}
+if (size == 1) {
+read_data = (24 - (addr  3) * 8);
+read_data = 0x0ff;
+}
+return read_data;
+}
+
+static void grlib_apbpnp_write(void *opaque, hwaddr addr,
+uint64_t value, unsigned size)
+{
+}
+
+static const MemoryRegionOps grlib_apbpnp_ops = {
+.write  = grlib_apbpnp_write,
+.read   = grlib_apbpnp_read,
+.endianness = DEVICE_NATIVE_ENDIAN,
+};
+
+static int grlib_apbpnp_init(SysBusDevice *dev)
+{
+APBPNP *pnp = GRLIB_APB_PNP(dev);
+
+memory_region_init_io(pnp-iomem, OBJECT(pnp), grlib_apbpnp_ops, pnp,
+  apbpnp, APBPNP_REG_SIZE);
+
+sysbus_init_mmio(dev, pnp-iomem);
+
+return 0;
+}
+
+static void grlib_apbpnp_class_init(ObjectClass *klass, void *data)
+{
+SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
+
+k-init = grlib_apbpnp_init;
+}
+
+static const TypeInfo grlib_apbpnp_info = {
+.name  = TYPE_GRLIB_APB_PNP,
+.parent= TYPE_SYS_BUS_DEVICE,
+.instance_size = sizeof(APBPNP),
+.class_init= grlib_apbpnp_class_init,
+};
+
+static void grlib_apbpnp_register_types(void)
+{
+type_register_static(grlib_apbpnp_info);
+}
+
+type_init(grlib_apbpnp_register_types)
+
+
+/* AHB PNP */
+
+#define AHBPNP_REG_SIZE (4096 - 8)  /* Size of memory mapped registers */
+
+#define TYPE_GRLIB_AHB_PNP grlib,ahbpnp
+#define GRLIB_AHB_PNP(obj) \
+OBJECT_CHECK(AHBPNP, (obj), TYPE_GRLIB_AHB_PNP)
+
+typedef struct AHBPNP {
+SysBusDevice parent_obj;
+MemoryRegion iomem;
+} AHBPNP;
+
+static uint64_t grlib_ahbpnp_read(void *opaque, hwaddr addr,
+   unsigned size)

Re: [Qemu-devel] [PATCH][SPARC] LEON3: Add emulation of AMBA plugplay

2014-10-08 Thread Andreas Färber

Hi,

Am 08.10.2014 um 16:19 schrieb Fabien Chouteau:
 From: Jiri Gaisler j...@gaisler.se
 
 AMBA plugplay is used by kernels to probe available devices (Timers,
 UART, etc...). This is a static declaration of devices implemented in
 QEMU. In the future, a more advanced version could compute those
 information directly from the device tree.

Interesting. There's quite some magic numbers in the read functions; I
wonder if you could read them via QOM if you actually give the devices a
canonical path or search by type? You may want to peek at ACPI code.

 
 Signed-off-by: Fabien Chouteau chout...@adacore.com
 ---
  hw/sparc/Makefile.objs   |1 +
  hw/sparc/grlib_ambapnp.c |  206 
 ++
  hw/sparc/leon3.c |6 ++
  include/hw/sparc/grlib.h |   36 
  4 files changed, 249 insertions(+)
  create mode 100644 hw/sparc/grlib_ambapnp.c
 
 diff --git a/hw/sparc/Makefile.objs b/hw/sparc/Makefile.objs
 index c987b5b..e763701 100644
 --- a/hw/sparc/Makefile.objs
 +++ b/hw/sparc/Makefile.objs
 @@ -1 +1,2 @@
  obj-y += sun4m.o leon3.o
 +obj-$(CONFIG_GRLIB) += grlib_ambapnp.o
 diff --git a/hw/sparc/grlib_ambapnp.c b/hw/sparc/grlib_ambapnp.c
 new file mode 100644
 index 000..dfadd5c
 --- /dev/null
 +++ b/hw/sparc/grlib_ambapnp.c
 @@ -0,0 +1,206 @@
 +/*
 + * QEMU GRLIB AMBA PlugPlay Emulator
 + *
 + * Permission is hereby granted, free of charge, to any person obtaining a 
 copy
 + * of this software and associated documentation files (the Software), to 
 deal
 + * in the Software without restriction, including without limitation the 
 rights
 + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 + * copies of the Software, and to permit persons to whom the Software is
 + * furnished to do so, subject to the following conditions:
 + *
 + * The above copyright notice and this permission notice shall be included in
 + * all copies or substantial portions of the Software.
 + *
 + * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
 FROM,
 + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 + * THE SOFTWARE.
 + */
 +
 +#include hw/sysbus.h
 +
 +#define APBPNP_REG_SIZE 4096 /* Size of memory mapped registers */
 +
 +#define TYPE_GRLIB_APB_PNP grlib,apbpnp

If you move the two TYPE_* constants to grlib.h, you can reuse them.

 +#define GRLIB_APB_PNP(obj) \
 +OBJECT_CHECK(APBPNP, (obj), TYPE_GRLIB_APB_PNP)
 +
 +typedef struct APBPNP {
 +SysBusDevice parent_obj;
 +MemoryRegion iomem;
 +} APBPNP;
 +
 +static uint64_t grlib_apbpnp_read(void *opaque, hwaddr addr,
 +   unsigned size)

Indentation is off by one for all read/write functions.

 +{
 +uint64_t read_data;
 +addr = 0xfff;
 +
 +/* Unit registers */
 +switch (addr  0xffc) {
 +case 0x00:
 +read_data = 0x0400f000; /* Memory controller */
 +break;
 +case 0x04:
 +read_data = 0xfff1;
 +break;
 +case 0x08:
 +read_data = 0x0100c023; /* APBUART */
 +break;
 +case 0x0C:
 +read_data = 0x0010fff1;
 +break;
 +case 0x10:
 +read_data = 0x0100d040; /* IRQMP */
 +break;
 +case 0x14:
 +read_data = 0x0020fff1;
 +break;
 +case 0x18:
 +read_data = 0x01011006; /* GPTIMER */
 +break;
 +case 0x1C:
 +read_data = 0x0030fff1;
 +break;
 +
 +default:
 +read_data = 0;
 +}
 +if (size == 1) {
 +read_data = (24 - (addr  3) * 8);
 +read_data = 0x0ff;
 +}
 +return read_data;
 +}
 +
 +static void grlib_apbpnp_write(void *opaque, hwaddr addr,
 +uint64_t value, unsigned size)
 +{
 +}
 +
 +static const MemoryRegionOps grlib_apbpnp_ops = {
 +.write  = grlib_apbpnp_write,
 +.read   = grlib_apbpnp_read,
 +.endianness = DEVICE_NATIVE_ENDIAN,
 +};
 +
 +static int grlib_apbpnp_init(SysBusDevice *dev)
 +{
 +APBPNP *pnp = GRLIB_APB_PNP(dev);
 +
 +memory_region_init_io(pnp-iomem, OBJECT(pnp), grlib_apbpnp_ops, pnp,
 +  apbpnp, APBPNP_REG_SIZE);
 +
 +sysbus_init_mmio(dev, pnp-iomem);

APBPNP_REG_SIZE seems constant, so you could move both lines into an
instance_init function.

 +
 +return 0;
 +}
 +
 +static void grlib_apbpnp_class_init(ObjectClass *klass, void *data)

s/klass/oc/g

 +{
 +SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);

sdc?

 +
 +k-init = grlib_apbpnp_init;
 +}
 +
 +static const TypeInfo grlib_apbpnp_info = {
 +.name  = TYPE_GRLIB_APB_PNP,
 +.parent= TYPE_SYS_BUS_DEVICE,

Re: [Qemu-devel] [PATCH][SPARC] LEON3: Add emulation of AMBA plugplay

2014-10-08 Thread Jiri Gaisler

On 10/08/2014 05:38 PM, Andreas Färber wrote:
 Hi,
 
 Am 08.10.2014 um 16:19 schrieb Fabien Chouteau:
 From: Jiri Gaisler j...@gaisler.se

 AMBA plugplay is used by kernels to probe available devices (Timers,
 UART, etc...). This is a static declaration of devices implemented in
 QEMU. In the future, a more advanced version could compute those
 information directly from the device tree.
 
 Interesting. There's quite some magic numbers in the read functions; I
 wonder if you could read them via QOM if you actually give the devices a
 canonical path or search by type? You may want to peek at ACPI code.


The plugplay area is similar in function to the PCI configuration
space, indicating vendor/device ID's, address range, interrupt number
etc. of on-chip IP cores. The 'magic' numbers could be generated by
generic functions taking these parameters as inputs. This would
certainly make the code more readable, and easily extended in the
future. Would such a solution be acceptable?


 

 Signed-off-by: Fabien Chouteau chout...@adacore.com
 ---
  hw/sparc/Makefile.objs   |1 +
  hw/sparc/grlib_ambapnp.c |  206 
 ++
  hw/sparc/leon3.c |6 ++
  include/hw/sparc/grlib.h |   36 
  4 files changed, 249 insertions(+)
  create mode 100644 hw/sparc/grlib_ambapnp.c

 diff --git a/hw/sparc/Makefile.objs b/hw/sparc/Makefile.objs
 index c987b5b..e763701 100644
 --- a/hw/sparc/Makefile.objs
 +++ b/hw/sparc/Makefile.objs
 @@ -1 +1,2 @@
  obj-y += sun4m.o leon3.o
 +obj-$(CONFIG_GRLIB) += grlib_ambapnp.o
 diff --git a/hw/sparc/grlib_ambapnp.c b/hw/sparc/grlib_ambapnp.c
 new file mode 100644
 index 000..dfadd5c
 --- /dev/null
 +++ b/hw/sparc/grlib_ambapnp.c
 @@ -0,0 +1,206 @@
 +/*
 + * QEMU GRLIB AMBA PlugPlay Emulator
 + *
 + * Permission is hereby granted, free of charge, to any person obtaining a 
 copy
 + * of this software and associated documentation files (the Software), to 
 deal
 + * in the Software without restriction, including without limitation the 
 rights
 + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 + * copies of the Software, and to permit persons to whom the Software is
 + * furnished to do so, subject to the following conditions:
 + *
 + * The above copyright notice and this permission notice shall be included 
 in
 + * all copies or substantial portions of the Software.
 + *
 + * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS 
 OR
 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR 
 OTHER
 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
 FROM,
 + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 + * THE SOFTWARE.
 + */
 +
 +#include hw/sysbus.h
 +
 +#define APBPNP_REG_SIZE 4096 /* Size of memory mapped registers */
 +
 +#define TYPE_GRLIB_APB_PNP grlib,apbpnp
 
 If you move the two TYPE_* constants to grlib.h, you can reuse them.
 
 +#define GRLIB_APB_PNP(obj) \
 +OBJECT_CHECK(APBPNP, (obj), TYPE_GRLIB_APB_PNP)
 +
 +typedef struct APBPNP {
 +SysBusDevice parent_obj;
 +MemoryRegion iomem;
 +} APBPNP;
 +
 +static uint64_t grlib_apbpnp_read(void *opaque, hwaddr addr,
 +   unsigned size)
 
 Indentation is off by one for all read/write functions.
 
 +{
 +uint64_t read_data;
 +addr = 0xfff;
 +
 +/* Unit registers */
 +switch (addr  0xffc) {
 +case 0x00:
 +read_data = 0x0400f000; /* Memory controller */
 +break;
 +case 0x04:
 +read_data = 0xfff1;
 +break;
 +case 0x08:
 +read_data = 0x0100c023; /* APBUART */
 +break;
 +case 0x0C:
 +read_data = 0x0010fff1;
 +break;
 +case 0x10:
 +read_data = 0x0100d040; /* IRQMP */
 +break;
 +case 0x14:
 +read_data = 0x0020fff1;
 +break;
 +case 0x18:
 +read_data = 0x01011006; /* GPTIMER */
 +break;
 +case 0x1C:
 +read_data = 0x0030fff1;
 +break;
 +
 +default:
 +read_data = 0;
 +}
 +if (size == 1) {
 +read_data = (24 - (addr  3) * 8);
 +read_data = 0x0ff;
 +}
 +return read_data;
 +}
 +
 +static void grlib_apbpnp_write(void *opaque, hwaddr addr,
 +uint64_t value, unsigned size)
 +{
 +}
 +
 +static const MemoryRegionOps grlib_apbpnp_ops = {
 +.write  = grlib_apbpnp_write,
 +.read   = grlib_apbpnp_read,
 +.endianness = DEVICE_NATIVE_ENDIAN,
 +};
 +
 +static int grlib_apbpnp_init(SysBusDevice *dev)
 +{
 +APBPNP *pnp = GRLIB_APB_PNP(dev);
 +
 +memory_region_init_io(pnp-iomem, OBJECT(pnp), grlib_apbpnp_ops, pnp,
 +  apbpnp, APBPNP_REG_SIZE);
 +
 +sysbus_init_mmio(dev, pnp-iomem);

Re: [Qemu-devel] [PATCH][SPARC] LEON3: Add emulation of AMBA plugplay

Re: [Qemu-devel] [PATCH][SPARC] LEON3: Add emulation of AMBA plugplay

[Qemu-devel] [PATCH][SPARC] LEON3: Add emulation of AMBA plugplay

Re: [Qemu-devel] [PATCH][SPARC] LEON3: Add emulation of AMBA plugplay

Re: [Qemu-devel] [PATCH][SPARC] LEON3: Add emulation of AMBA plugplay

5 matches

Site Navigation

Mail list logo

Footer information