Re: [Qemu-devel] [PATCH v2] net: cadence_gem: Set initial MAC address

[Sebastian Huber <sebastian.huber@embedded-brains.de>]

[-- Attachment #1: Type: text/plain, Size: 1938 bytes --]

Ping.

Attached is a rebased version.

On 30/01/15 18:56, Peter Crosthwaite wrote:
> On Thu, Jan 29, 2015 at 9:48 PM, Sebastian Huber
> <sebastian.huber@embedded-brains.de> wrote:
>> Set initial MAC address to the one specified by the command line.
>>
>> Signed-off-by: Sebastian Huber <sebastian.huber@embedded-brains.de>
>> Reviewed-by: Jason Wang <jasowang@redhat.com>
>>
>> v2: Remove superfluous whitespace change.
> The inter-spin change-logs should not go into commit messages. This
> should be below the ---. With this removed (placed below the ---):
>
> Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
>
>> ---
> Change-logs go here.
>
> Regards,
> Peter
>
>>   hw/net/cadence_gem.c | 6 ++++++
>>   1 file changed, 6 insertions(+)
>>
>> diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c
>> index de26609..f9a7af1 100644
>> --- a/hw/net/cadence_gem.c
>> +++ b/hw/net/cadence_gem.c
>> @@ -1005,6 +1005,7 @@ static void gem_reset(DeviceState *d)
>>   {
>>       int i;
>>       GemState *s = GEM(d);
>> +    const uint8_t *a;
>>
>>       DB_PRINT("\n");
>>
>> @@ -1023,6 +1024,11 @@ static void gem_reset(DeviceState *d)
>>       s->regs[GEM_DESCONF5] = 0x002f2145;
>>       s->regs[GEM_DESCONF6] = 0x00000200;
>>
>> +    /* Set MAC address */
>> +    a = &s->conf.macaddr.a[0];
>> +    s->regs[GEM_SPADDR1LO] = a[0] | (a[1] << 8) | (a[2] << 16) | (a[3] << 24);
>> +    s->regs[GEM_SPADDR1HI] = a[4] | (a[5] << 8);
>> +
>>       for (i = 0; i < 4; i++) {
>>           s->sar_active[i] = false;
>>       }
>> --
>> 1.8.4.5
>>
>>

-- 
Sebastian Huber, embedded brains GmbH

Address : Dornierstr. 4, D-82178 Puchheim, Germany
Phone   : +49 89 189 47 41-16
Fax     : +49 89 189 47 41-09
E-Mail  : sebastian.huber@embedded-brains.de
PGP     : Public key available on request.

Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG.


[-- Attachment #2: 0001-net-cadence_gem-Set-initial-MAC-address.patch --]
[-- Type: text/x-patch, Size: 1267 bytes --]

>From bcc808023daa8192ab782bb8cda8940c26858704 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Thu, 29 Jan 2015 13:55:33 +0100
Subject: [PATCH] net: cadence_gem: Set initial MAC address

Set initial MAC address to the one specified by the command line.

Signed-off-by: Sebastian Huber <sebastian.huber@embedded-brains.de>
Reviewed-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
---
 hw/net/cadence_gem.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c
index dafe914..c6ff89f 100644
--- a/hw/net/cadence_gem.c
+++ b/hw/net/cadence_gem.c
@@ -964,6 +964,7 @@ static void gem_reset(DeviceState *d)
 {
     int i;
     CadenceGEMState *s = CADENCE_GEM(d);
+    const uint8_t *a;
 
     DB_PRINT("\n");
 
@@ -982,6 +983,11 @@ static void gem_reset(DeviceState *d)
     s->regs[GEM_DESCONF5] = 0x002f2145;
     s->regs[GEM_DESCONF6] = 0x00000200;
 
+    /* Set MAC address */
+    a = &s->conf.macaddr.a[0];
+    s->regs[GEM_SPADDR1LO] = a[0] | (a[1] << 8) | (a[2] << 16) | (a[3] << 24);
+    s->regs[GEM_SPADDR1HI] = a[4] | (a[5] << 8);
+
     for (i = 0; i < 4; i++) {
         s->sar_active[i] = false;
     }
-- 
1.8.4.5