On 24 January 2017 at 02:01, Daniil Egranov <daniil.egra...@arm.com> 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 <daniil.egra...@arm.com>
Tested-by: Ryan Harkin <ryan.har...@linaro.org>
> ---
> 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
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
