From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-x22a.google.com (mail-wm0-x22a.google.com [IPv6:2a00:1450:400c:c09::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A15C681F50 for ; Wed, 25 Jan 2017 05:42:59 -0800 (PST) Received: by mail-wm0-x22a.google.com with SMTP id r144so31569018wme.1 for ; Wed, 25 Jan 2017 05:42:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=vkZsqV5r0BTQLH/VYxdVkUPKl9yxqnjw5GesfOYz444=; b=D8spS4HPY2DSKFL57hxO3tppgxmX2pJ6R1aUJe51OXJGSL7t9BNzQMYVV9ejD0GTdK RL3qdN7rb/5GeZXtEc6brLt4SLCxPofKAq4lpBSQOrSg9YdgBZPd2Mi7F8+6QxDyqvjA lAPmouu7yUCrmBfom8U2/jvFW+H7/COpJGjnc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=vkZsqV5r0BTQLH/VYxdVkUPKl9yxqnjw5GesfOYz444=; b=Db25OMHgpb66B7O6q33nPtIm9ulukgJXQD6wn2zQ3qTPlr//abLtdwx6i2XLzsi5v8 fmGIBlhtc5gOVJV9q47HMFEIvZHNzWD5eV43gb6ieMnNN4JfwjVASI3qfU6PBCXjC/qu srcOAMp56FS11KAMqkADoYj2jd5qd5Anm7lEMeB78i+VzBd1l6YGS8hPfFNsPpbbXM6Z qp5iqduIuu7qmz30BgxMhDMRqJ8oWA5rDQDngjq+jUG5zrJ2+NAVll7MDpC/2orAd06V sw2Qm04pfJRaq0cEpl8joB9k02j0ea0U6Ip0IVpbMoJpjAo3Q3JLHR2hb/FuJzsFs/2T 18gQ== X-Gm-Message-State: AIkVDXJ0a/a0YFilz2nmG15td9AP3CnVvmju0H0hC007Ya6uglALqRVA8rgrZ0JiH0PpIhOG X-Received: by 10.28.217.136 with SMTP id q130mr21697070wmg.13.1485351776815; Wed, 25 Jan 2017 05:42:56 -0800 (PST) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id w16sm12677356wmd.4.2017.01.25.05.42.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Jan 2017 05:42:56 -0800 (PST) Date: Wed, 25 Jan 2017 13:42:54 +0000 From: Leif Lindholm To: Ryan Harkin Cc: Daniil Egranov , "edk2-devel@lists.01.org" Message-ID: <20170125134254.GQ25883@bivouac.eciton.net> References: <1485223266-61334-1-git-send-email-daniil.egranov@arm.com> MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: [PATCH v2] ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe: Fixed crash on Juno R0 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jan 2017 13:43:00 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Jan 24, 2017 at 11:07:12AM +0000, Ryan Harkin wrote: > On 24 January 2017 at 02:01, Daniil Egranov wrote: > > The Marvell Yukon MAC address load supported only on Juno R1 and R2. > > It disabled for Juno R0 due to PCI issues on this board. > > > > Contributed-under: TianoCore Contribution Agreement 1.0 > > Signed-off-by: Daniil Egranov > > Tested-by: Ryan Harkin Thanks, Ryan. Pushed as 2bdfb11df9. / Leif > > > --- > > Changelog: > > > > v2 > > Replaced ASSERT with the error message in case Marvell MAC address > > set has failed > > > > ^ Thanks for doing that, it's much more usable in my setup now. > > > > ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c | 11 +++++++++-- > > 1 file changed, 9 insertions(+), 2 deletions(-) > > > > diff --git a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c > > index 47ff587..0193b98 100644 > > --- a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c > > +++ b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c > > @@ -378,6 +378,7 @@ OnEndOfDxe ( > > EFI_DEVICE_PATH_PROTOCOL* PciRootComplexDevicePath; > > EFI_HANDLE Handle; > > EFI_STATUS Status; > > + UINT32 JunoRevision; > > > > // > > // PCI Root Complex initialization > > @@ -393,8 +394,14 @@ OnEndOfDxe ( > > Status = gBS->ConnectController (Handle, NULL, PciRootComplexDevicePath, FALSE); > > ASSERT_EFI_ERROR (Status); > > > > - Status = ArmJunoSetNicMacAddress (); > > - ASSERT_EFI_ERROR (Status); > > + GetJunoRevision (JunoRevision); > > + > > + if (JunoRevision != JUNO_REVISION_R0) { > > + Status = ArmJunoSetNicMacAddress (); > > + if (EFI_ERROR (Status)) { > > + DEBUG ((DEBUG_ERROR, "ArmJunoDxe: Failed to set Marvell Yukon NIC MAC address\n")); > > + } > > + } > > } > > > > STATIC > > -- > > 2.7.4 > > > > _______________________________________________ > > edk2-devel mailing list > > edk2-devel@lists.01.org > > https://lists.01.org/mailman/listinfo/edk2-devel