[Qemu-devel] [PATCH v1 0/6] Microblaze Patches

[Qemu-devel] [PATCH v1 0/6] Microblaze Patches

[Peter A. G. Crosthwaite]

Misc microblaze patches.

Chris Wulff (1):
  xilinx_timer: Fix a compile error if debug enabled

Peter A. G. Crosthwaite (5):
  xilinx_timer: Removed comma in device name
  xilinx_timer: Send dbg msgs to stderr not stdout
  xilinx_timer: Fixed "frequency" prop name
  xilinx.h: Error check when setting links
  xilinx: fix names of ethernet and dma links.

 hw/xilinx.h       |   16 ++++++++++++----
 hw/xilinx_timer.c |   16 +++++++++-------
 2 files changed, 21 insertions(+), 11 deletions(-)

[Qemu-devel] [PATCH v1 1/6] xilinx_timer: Removed comma in device name

[Peter A. G. Crosthwaite]

Fixes an error in a61e4b07a30c062260d2d01771773f14820d1eb7

Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
---
 hw/xilinx.h       |    2 +-
 hw/xilinx_timer.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/xilinx.h b/hw/xilinx.h
index 556c5aa..df06a00 100644
--- a/hw/xilinx.h
+++ b/hw/xilinx.h
@@ -21,7 +21,7 @@ xilinx_timer_create(target_phys_addr_t base, qemu_irq irq, int oto, int freq)
 {
     DeviceState *dev;
 
-    dev = qdev_create(NULL, "xlnx,xps-timer");
+    dev = qdev_create(NULL, "xlnx.xps-timer");
     qdev_prop_set_uint32(dev, "one-timer-only", oto);
     qdev_prop_set_uint32(dev, "frequency", freq);
     qdev_init_nofail(dev);
diff --git a/hw/xilinx_timer.c b/hw/xilinx_timer.c
index b562bd0..053ba02 100644
--- a/hw/xilinx_timer.c
+++ b/hw/xilinx_timer.c
@@ -217,7 +217,7 @@ static int xilinx_timer_init(SysBusDevice *dev)
         ptimer_set_freq(xt->ptimer, t->freq_hz);
     }
 
-    memory_region_init_io(&t->mmio, &timer_ops, t, "xlnx,xps-timer",
+    memory_region_init_io(&t->mmio, &timer_ops, t, "xlnx.xps-timer",
                           R_MAX * 4 * num_timers(t));
     sysbus_init_mmio(dev, &t->mmio);
     return 0;
@@ -239,7 +239,7 @@ static void xilinx_timer_class_init(ObjectClass *klass, void *data)
 }
 
 static TypeInfo xilinx_timer_info = {
-    .name          = "xlnx,xps-timer",
+    .name          = "xlnx.xps-timer",
     .parent        = TYPE_SYS_BUS_DEVICE,
     .instance_size = sizeof(struct timerblock),
     .class_init    = xilinx_timer_class_init,
-- 
1.7.0.4

[Qemu-devel] [PATCH v1 2/6] xilinx_timer: Send dbg msgs to stderr not stdout

[Peter A. G. Crosthwaite]

Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
---
 hw/xilinx_timer.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/xilinx_timer.c b/hw/xilinx_timer.c
index 053ba02..c02e6ca 100644
--- a/hw/xilinx_timer.c
+++ b/hw/xilinx_timer.c
@@ -119,7 +119,7 @@ timer_read(void *opaque, target_phys_addr_t addr, unsigned int size)
             break;
 
     }
-    D(printf("%s timer=%d %x=%x\n", __func__, timer, addr * 4, r));
+    D(fprintf(stderr, "%s timer=%d %x=%x\n", __func__, timer, addr * 4, r));
     return r;
 }
 
@@ -127,7 +127,7 @@ static void timer_enable(struct xlx_timer *xt)
 {
     uint64_t count;
 
-    D(printf("%s timer=%d down=%d\n", __func__,
+    D(fprintf(stderr, "%s timer=%d down=%d\n", __func__,
               xt->nr, xt->regs[R_TCSR] & TCSR_UDT));
 
     ptimer_stop(xt->ptimer);
@@ -152,7 +152,7 @@ timer_write(void *opaque, target_phys_addr_t addr,
     addr >>= 2;
     timer = timer_from_addr(addr);
     xt = &t->timers[timer];
-    D(printf("%s addr=%x val=%x (timer=%d off=%d)\n",
+    D(fprintf(stderr, "%s addr=%x val=%x (timer=%d off=%d)\n",
              __func__, addr * 4, value, timer, addr & 3));
     /* Further decoding to address a specific timers reg.  */
     addr &= 3;
@@ -189,7 +189,7 @@ static void timer_hit(void *opaque)
 {
     struct xlx_timer *xt = opaque;
     struct timerblock *t = xt->parent;
-    D(printf("%s %d\n", __func__, timer));
+    D(fprintf(stderr, "%s %d\n", __func__, timer));
     xt->regs[R_TCSR] |= TCSR_TINT;
 
     if (xt->regs[R_TCSR] & TCSR_ARHT)
-- 
1.7.0.4

[Qemu-devel] [PATCH v1 3/6] xilinx_timer: Fixed "frequency" prop name

[Peter A. G. Crosthwaite]

The "frequency" qdev prop matches the "clock-frequency" property in Xilinx EDK.
Renamed "frequency" -> "clock-frequency" accordingly.

Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
---
 hw/xilinx.h       |    2 +-
 hw/xilinx_timer.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/hw/xilinx.h b/hw/xilinx.h
index df06a00..45a6bdc 100644
--- a/hw/xilinx.h
+++ b/hw/xilinx.h
@@ -23,7 +23,7 @@ xilinx_timer_create(target_phys_addr_t base, qemu_irq irq, int oto, int freq)
 
     dev = qdev_create(NULL, "xlnx.xps-timer");
     qdev_prop_set_uint32(dev, "one-timer-only", oto);
-    qdev_prop_set_uint32(dev, "frequency", freq);
+    qdev_prop_set_uint32(dev, "clock-frequency", freq);
     qdev_init_nofail(dev);
     sysbus_mmio_map(sysbus_from_qdev(dev), 0, base);
     sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq);
diff --git a/hw/xilinx_timer.c b/hw/xilinx_timer.c
index c02e6ca..9eb5ef7 100644
--- a/hw/xilinx_timer.c
+++ b/hw/xilinx_timer.c
@@ -224,7 +224,8 @@ static int xilinx_timer_init(SysBusDevice *dev)
 }
 
 static Property xilinx_timer_properties[] = {
-    DEFINE_PROP_UINT32("frequency", struct timerblock, freq_hz,   62 * 1000000),
+    DEFINE_PROP_UINT32("clock-frequency", struct timerblock, freq_hz,
+                                                                62 * 1000000),
     DEFINE_PROP_UINT8("one-timer-only", struct timerblock, one_timer_only, 0),
     DEFINE_PROP_END_OF_LIST(),
 };
-- 
1.7.0.4

[Qemu-devel] [PATCH v1 4/6] xilinx.h: Error check when setting links

[Peter A. G. Crosthwaite]

Assert that the ethernet and dma controller are sucessfully linked to their
peers.

Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
---
 hw/xilinx.h |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/hw/xilinx.h b/hw/xilinx.h
index 45a6bdc..4d29265 100644
--- a/hw/xilinx.h
+++ b/hw/xilinx.h
@@ -55,13 +55,16 @@ xilinx_axiethernet_create(NICInfo *nd, StreamSlave *peer,
                           int txmem, int rxmem)
 {
     DeviceState *dev;
+    Error *errp = NULL;
+
     qemu_check_nic_model(nd, "xlnx.axi-ethernet");
 
     dev = qdev_create(NULL, "xlnx.axi-ethernet");
     qdev_set_nic_properties(dev, nd);
     qdev_prop_set_uint32(dev, "rxmem", rxmem);
     qdev_prop_set_uint32(dev, "txmem", txmem);
-    object_property_set_link(OBJECT(dev), OBJECT(peer), "tx_dev", NULL);
+    object_property_set_link(OBJECT(dev), OBJECT(peer), "tx_dev", &errp);
+    assert_no_error(errp);
     qdev_init_nofail(dev);
     sysbus_mmio_map(sysbus_from_qdev(dev), 0, base);
     sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq);
@@ -74,8 +77,11 @@ xilinx_axiethernetdma_init(DeviceState *dev, StreamSlave *peer,
                            target_phys_addr_t base, qemu_irq irq,
                            qemu_irq irq2, int freqhz)
 {
+    Error *errp = NULL;
+
     qdev_prop_set_uint32(dev, "freqhz", freqhz);
-    object_property_set_link(OBJECT(dev), OBJECT(peer), "tx_dev", NULL);
+    object_property_set_link(OBJECT(dev), OBJECT(peer), "tx_dev", &errp);
+    assert_no_error(errp);
     qdev_init_nofail(dev);
 
     sysbus_mmio_map(sysbus_from_qdev(dev), 0, base);
-- 
1.7.0.4

[Qemu-devel] [PATCH v1 5/6] xilinx: fix names of ethernet and dma links.

[Peter A. G. Crosthwaite]

These names were incorrect. Fixed to match to actual link names

Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
---
 hw/xilinx.h |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hw/xilinx.h b/hw/xilinx.h
index 4d29265..6449bd4 100644
--- a/hw/xilinx.h
+++ b/hw/xilinx.h
@@ -63,7 +63,8 @@ xilinx_axiethernet_create(NICInfo *nd, StreamSlave *peer,
     qdev_set_nic_properties(dev, nd);
     qdev_prop_set_uint32(dev, "rxmem", rxmem);
     qdev_prop_set_uint32(dev, "txmem", txmem);
-    object_property_set_link(OBJECT(dev), OBJECT(peer), "tx_dev", &errp);
+    object_property_set_link(OBJECT(dev), OBJECT(peer), "axistream-connected",
+                                &errp);
     assert_no_error(errp);
     qdev_init_nofail(dev);
     sysbus_mmio_map(sysbus_from_qdev(dev), 0, base);
@@ -80,7 +81,8 @@ xilinx_axiethernetdma_init(DeviceState *dev, StreamSlave *peer,
     Error *errp = NULL;
 
     qdev_prop_set_uint32(dev, "freqhz", freqhz);
-    object_property_set_link(OBJECT(dev), OBJECT(peer), "tx_dev", &errp);
+    object_property_set_link(OBJECT(dev), OBJECT(peer), "axistream-connected",
+                                &errp);
     assert_no_error(errp);
     qdev_init_nofail(dev);
 
-- 
1.7.0.4

Re: [Qemu-devel] [PATCH v1 5/6] xilinx: fix names of ethernet and dma links.

[Andreas Färber]

Hi,

Am 17.09.2012 10:47, schrieb Peter A. G. Crosthwaite:
> These names were incorrect. Fixed to match to actual link names
> 
> Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
> ---
>  hw/xilinx.h |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/xilinx.h b/hw/xilinx.h
> index 4d29265..6449bd4 100644
> --- a/hw/xilinx.h
> +++ b/hw/xilinx.h
> @@ -63,7 +63,8 @@ xilinx_axiethernet_create(NICInfo *nd, StreamSlave *peer,
>      qdev_set_nic_properties(dev, nd);
>      qdev_prop_set_uint32(dev, "rxmem", rxmem);
>      qdev_prop_set_uint32(dev, "txmem", txmem);
> -    object_property_set_link(OBJECT(dev), OBJECT(peer), "tx_dev", &errp);
> +    object_property_set_link(OBJECT(dev), OBJECT(peer), "axistream-connected",
> +                                &errp);
>      assert_no_error(errp);
>      qdev_init_nofail(dev);
>      sysbus_mmio_map(sysbus_from_qdev(dev), 0, base);
> @@ -80,7 +81,8 @@ xilinx_axiethernetdma_init(DeviceState *dev, StreamSlave *peer,
>      Error *errp = NULL;
>  
>      qdev_prop_set_uint32(dev, "freqhz", freqhz);
> -    object_property_set_link(OBJECT(dev), OBJECT(peer), "tx_dev", &errp);
> +    object_property_set_link(OBJECT(dev), OBJECT(peer), "axistream-connected",
> +                                &errp);
>      assert_no_error(errp);
>      qdev_init_nofail(dev);
>  

Indentation of &errp looks odd despite no tabs - intentional?

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PATCH v1 5/6] xilinx: fix names of ethernet and dma links.

[Peter Crosthwaite]

On Tue, Sep 18, 2012 at 1:13 AM, Andreas Färber <afaerber@suse.de> wrote:
> Hi,
>
> Am 17.09.2012 10:47, schrieb Peter A. G. Crosthwaite:
>> These names were incorrect. Fixed to match to actual link names
>>
>> Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
>> ---
>>  hw/xilinx.h |    6 ++++--
>>  1 files changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/hw/xilinx.h b/hw/xilinx.h
>> index 4d29265..6449bd4 100644
>> --- a/hw/xilinx.h
>> +++ b/hw/xilinx.h
>> @@ -63,7 +63,8 @@ xilinx_axiethernet_create(NICInfo *nd, StreamSlave *peer,
>>      qdev_set_nic_properties(dev, nd);
>>      qdev_prop_set_uint32(dev, "rxmem", rxmem);
>>      qdev_prop_set_uint32(dev, "txmem", txmem);
>> -    object_property_set_link(OBJECT(dev), OBJECT(peer), "tx_dev", &errp);
>> +    object_property_set_link(OBJECT(dev), OBJECT(peer), "axistream-connected",
>> +                                &errp);
>>      assert_no_error(errp);
>>      qdev_init_nofail(dev);
>>      sysbus_mmio_map(sysbus_from_qdev(dev), 0, base);
>> @@ -80,7 +81,8 @@ xilinx_axiethernetdma_init(DeviceState *dev, StreamSlave *peer,
>>      Error *errp = NULL;
>>
>>      qdev_prop_set_uint32(dev, "freqhz", freqhz);
>> -    object_property_set_link(OBJECT(dev), OBJECT(peer), "tx_dev", &errp);
>> +    object_property_set_link(OBJECT(dev), OBJECT(peer), "axistream-connected",
>> +                                &errp);
>>      assert_no_error(errp);
>>      qdev_init_nofail(dev);
>>
>
> Indentation of &errp looks odd despite no tabs - intentional?
>

I have indented to the first multiple of 4 spaces after the function
opening brace. Is there a prescribed way? Can it be added to
CODING_STYLE and checkpatch if there is a particular recommended way?

Regards,
Peter


> Andreas
>
> --
> SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
> GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PATCH v1 5/6] xilinx: fix names of ethernet and dma links.

[Andreas Färber]

Am 18.09.2012 01:36, schrieb Peter Crosthwaite:
> On Tue, Sep 18, 2012 at 1:13 AM, Andreas Färber <afaerber@suse.de> wrote:
>> Am 17.09.2012 10:47, schrieb Peter A. G. Crosthwaite:
>>> @@ -80,7 +81,8 @@ xilinx_axiethernetdma_init(DeviceState *dev, StreamSlave *peer,
>>>      Error *errp = NULL;
>>>
>>>      qdev_prop_set_uint32(dev, "freqhz", freqhz);
>>> -    object_property_set_link(OBJECT(dev), OBJECT(peer), "tx_dev", &errp);
>>> +    object_property_set_link(OBJECT(dev), OBJECT(peer), "axistream-connected",
>>> +                                &errp);
>>>      assert_no_error(errp);
>>>      qdev_init_nofail(dev);
>>>
>>
>> Indentation of &errp looks odd despite no tabs - intentional?
>>
> 
> I have indented to the first multiple of 4 spaces after the function
> opening brace. Is there a prescribed way? Can it be added to
> CODING_STYLE and checkpatch if there is a particular recommended way?

The usual convention is to align with the opening brace (i.e., 3 spaces
less), or if the function name or string argument is too long I believe
one 4-spaces indent from the block.

Cheers,
Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

[Qemu-devel] [PATCH v1 6/6] xilinx_timer: Fix a compile error if debug enabled

[Peter A. G. Crosthwaite]

From: Chris Wulff <crwulff@gmail.com>

There was a missing include of qemu-log and a variable name in a printf was out
of date.

Signed-off-by: Chris Wulff <crwulff@gmail.com>
Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
---
 hw/xilinx_timer.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/hw/xilinx_timer.c b/hw/xilinx_timer.c
index 9eb5ef7..2e48ca2 100644
--- a/hw/xilinx_timer.c
+++ b/hw/xilinx_timer.c
@@ -24,6 +24,7 @@
 
 #include "sysbus.h"
 #include "ptimer.h"
+#include "qemu-log.h"
 
 #define D(x)
 
@@ -189,7 +190,7 @@ static void timer_hit(void *opaque)
 {
     struct xlx_timer *xt = opaque;
     struct timerblock *t = xt->parent;
-    D(fprintf(stderr, "%s %d\n", __func__, timer));
+    D(fprintf(stderr, "%s %d\n", __func__, xt->nr));
     xt->regs[R_TCSR] |= TCSR_TINT;
 
     if (xt->regs[R_TCSR] & TCSR_ARHT)
-- 
1.7.0.4

Re: [Qemu-devel] [PATCH v1 0/6] Microblaze Patches

[Edgar E. Iglesias]

On Mon, Sep 17, 2012 at 06:47:30PM +1000, Peter A. G. Crosthwaite wrote:
> Misc microblaze patches.

I've applied this (including your indentation fix to patch 5)

Thanks,
Edgar