From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf0-x22a.google.com (mail-lf0-x22a.google.com [IPv6:2a00:1450:4010:c07::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 AEAE481EFB for ; Tue, 24 Jan 2017 03:07:14 -0800 (PST) Received: by mail-lf0-x22a.google.com with SMTP id x1so22072894lff.0 for ; Tue, 24 Jan 2017 03:07:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=9DT8j4KIgJb8eAgj9pNc8PhZ/S90mYj0nhMbbJuVmtQ=; b=RVHggbbSBF2/CgqSFszwyZgp+4nz8RpHMIhtLQkEy0DwNVDbJVioRw15jZLc6pkrnZ HFrCeL+BZsqLDEIL95lA52IduPseWKKT9/NQ9dtiovISkP+QNrkdlfLacKEAoLDXHg5i piOnuOStq489QIoQD+xuXxK/mkenUWL7b2YqU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=9DT8j4KIgJb8eAgj9pNc8PhZ/S90mYj0nhMbbJuVmtQ=; b=AEM0od2Dxx9cMpJOqhMD5PwaL1eF9c16aN4F4Ko++F0xzLONEe/U/Y6jXya+PuIPTO 2Zqf4GUnIZNwlnK57j226LJe2qozfx62f5js0TshfCusBNw4skVcxm41qsglnjyvM3EV SNtbRJdvrdLqup9pXbpIXwovVC0sAf0GK+enfZH735UJkfsVFah6knQcIsmosL4bEckw LgEl0F+dobX/cYsstZ33czpqhGr4kAkNU2MWLeT3ULbnId9KV1yGosOnFAZwxnimUnVY 9XRaG5Ov/geVKaXWLNvfuCG+hUpnlUT+ZP2RnHVa2QRxu+m/tip0tfRzkFK4eYBE2j84 VmvA== X-Gm-Message-State: AIkVDXKm5fw65/fcy8aHPqPatg5i/gUszv9TclWzaIAJ4U3yfKZ3CtKTOJgpfCkYkKRuEviNpuvkwXJX6+ymRi5L X-Received: by 10.46.72.10 with SMTP id v10mr13918360lja.46.1485256032931; Tue, 24 Jan 2017 03:07:12 -0800 (PST) MIME-Version: 1.0 Received: by 10.25.207.72 with HTTP; Tue, 24 Jan 2017 03:07:12 -0800 (PST) In-Reply-To: <1485223266-61334-1-git-send-email-daniil.egranov@arm.com> References: <1485223266-61334-1-git-send-email-daniil.egranov@arm.com> From: Ryan Harkin Date: Tue, 24 Jan 2017 11:07:12 +0000 Message-ID: To: Daniil Egranov Cc: "edk2-devel@lists.01.org" , Leif Lindholm 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: Tue, 24 Jan 2017 11:07:15 -0000 Content-Type: text/plain; charset=UTF-8 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 > --- > 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