From patchwork Wed Jun 3 08:56:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Huber X-Patchwork-Id: 479849 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 11E1A140280 for ; Wed, 3 Jun 2015 19:37:33 +1000 (AEST) Received: from localhost ([::1]:34267 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0575-00065I-17 for incoming@patchwork.ozlabs.org; Wed, 03 Jun 2015 05:37:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56030) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z056J-0004iw-G6 for qemu-devel@nongnu.org; Wed, 03 Jun 2015 05:36:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z056G-00023a-97 for qemu-devel@nongnu.org; Wed, 03 Jun 2015 05:36:43 -0400 Received: from host-82-135-62-35.customer.m-online.net ([82.135.62.35]:29306 helo=mail.embedded-brains.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z056F-000220-Mk for qemu-devel@nongnu.org; Wed, 03 Jun 2015 05:36:40 -0400 Received: from localhost (localhost.localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id AF4A72A0AA1; Wed, 3 Jun 2015 10:56:45 +0200 (CEST) Received: from mail.embedded-brains.de ([127.0.0.1]) by localhost (zimbra.eb.localhost [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id Uu94fpI5_8FC; Wed, 3 Jun 2015 10:56:43 +0200 (CEST) Received: from localhost (localhost.localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id 478BC2A1611; Wed, 3 Jun 2015 10:56:43 +0200 (CEST) X-Virus-Scanned: amavisd-new at zimbra.eb.localhost Received: from mail.embedded-brains.de ([127.0.0.1]) by localhost (zimbra.eb.localhost [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id CQQReAMjWCqR; Wed, 3 Jun 2015 10:56:43 +0200 (CEST) Received: from [192.168.96.129] (unknown [192.168.96.129]) by mail.embedded-brains.de (Postfix) with ESMTPSA id 292B12A0AA1; Wed, 3 Jun 2015 10:56:43 +0200 (CEST) Message-ID: <556EC148.7010503@embedded-brains.de> Date: Wed, 03 Jun 2015 10:56:40 +0200 From: Sebastian Huber User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Peter Crosthwaite References: <1422596933-11282-1-git-send-email-sebastian.huber@embedded-brains.de> In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 82.135.62.35 Cc: Jason Wang , "qemu-devel@nongnu.org Developers" Subject: Re: [Qemu-devel] [PATCH v2] net: cadence_gem: Set initial MAC address X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 > wrote: >> Set initial MAC address to the one specified by the command line. >> >> Signed-off-by: Sebastian Huber >> Reviewed-by: Jason Wang >> >> 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 > >> --- > 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 >> >> From bcc808023daa8192ab782bb8cda8940c26858704 Mon Sep 17 00:00:00 2001 From: Sebastian Huber 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 Reviewed-by: Jason Wang Reviewed-by: Peter Crosthwaite --- 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