* [Qemu-devel] [PATCH] net: cadence_gem: Set initial MAC address
@ 2015-10-12 8:25 Sebastian Huber
2015-10-14 2:18 ` Jason Wang
0 siblings, 1 reply; 4+ messages in thread
From: Sebastian Huber @ 2015-10-12 8:25 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Sebastian Huber, jasowang, peter.crosthwaite
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 1127223..3639fc1 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] net: cadence_gem: Set initial MAC address
2015-10-12 8:25 [Qemu-devel] [PATCH] net: cadence_gem: Set initial MAC address Sebastian Huber
@ 2015-10-14 2:18 ` Jason Wang
0 siblings, 0 replies; 4+ messages in thread
From: Jason Wang @ 2015-10-14 2:18 UTC (permalink / raw)
To: Sebastian Huber, qemu-devel; +Cc: qemu-trivial, peter.crosthwaite
On 10/12/2015 04:25 PM, Sebastian Huber 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>
> 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 1127223..3639fc1 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;
> }
Applied in https://github.com/jasowang/qemu/commits/net
Thanks
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] net: cadence_gem: Set initial MAC address
2015-01-29 12:59 Sebastian Huber
@ 2015-01-30 5:42 ` Jason Wang
0 siblings, 0 replies; 4+ messages in thread
From: Jason Wang @ 2015-01-30 5:42 UTC (permalink / raw)
To: Sebastian Huber, qemu-devel; +Cc: peter.crosthwaite
On 01/29/2015 08:59 PM, Sebastian Huber wrote:
> Set initial MAC address to the one specified by the command line.
>
> Signed-off-by: Sebastian Huber <sebastian.huber@embedded-brains.de>
> ---
> hw/net/cadence_gem.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c
> index de26609..a1aa91b 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;
> }
> @@ -1245,7 +1251,6 @@ static int gem_init(SysBusDevice *sbd)
> sysbus_init_mmio(sbd, &s->iomem);
> sysbus_init_irq(sbd, &s->irq);
> qemu_macaddr_default_if_unset(&s->conf.macaddr);
> -
This seems unnecessary.
> s->nic = qemu_new_nic(&net_gem_info, &s->conf,
> object_get_typename(OBJECT(dev)), dev->id, s);
>
Reviewed-by: Jason Wang <jasowang@redhat.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Qemu-devel] [PATCH] net: cadence_gem: Set initial MAC address
@ 2015-01-29 12:59 Sebastian Huber
2015-01-30 5:42 ` Jason Wang
0 siblings, 1 reply; 4+ messages in thread
From: Sebastian Huber @ 2015-01-29 12:59 UTC (permalink / raw)
To: qemu-devel; +Cc: Sebastian Huber, peter.crosthwaite
Set initial MAC address to the one specified by the command line.
Signed-off-by: Sebastian Huber <sebastian.huber@embedded-brains.de>
---
hw/net/cadence_gem.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c
index de26609..a1aa91b 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;
}
@@ -1245,7 +1251,6 @@ static int gem_init(SysBusDevice *sbd)
sysbus_init_mmio(sbd, &s->iomem);
sysbus_init_irq(sbd, &s->irq);
qemu_macaddr_default_if_unset(&s->conf.macaddr);
-
s->nic = qemu_new_nic(&net_gem_info, &s->conf,
object_get_typename(OBJECT(dev)), dev->id, s);
--
1.8.4.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-10-14 2:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-12 8:25 [Qemu-devel] [PATCH] net: cadence_gem: Set initial MAC address Sebastian Huber
2015-10-14 2:18 ` Jason Wang
-- strict thread matches above, loose matches on Subject: below --
2015-01-29 12:59 Sebastian Huber
2015-01-30 5:42 ` Jason Wang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.