From: Daniil Egranov <daniil.egranov@arm.com>
To: edk2-devel@lists.01.org
Cc: leif.lindholm@linaro.org, ryan.harkin@linaro.org,
Daniil Egranov <daniil.egranov@arm.com>
Subject: [PATCH] ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe: Fixed crash on Juno R0
Date: Wed, 18 Jan 2017 17:27:12 -0600 [thread overview]
Message-ID: <1484782032-82342-1-git-send-email-daniil.egranov@arm.com> (raw)
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.egranov@arm.com>
---
ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c
index 47ff587..e9e6990 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,12 @@ 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 ();
+ ASSERT_EFI_ERROR (Status);
+ }
}
STATIC
--
2.7.4
next reply other threads:[~2017-01-18 23:27 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-18 23:27 Daniil Egranov [this message]
2017-01-19 13:49 ` [PATCH] ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe: Fixed crash on Juno R0 Ryan Harkin
2017-01-19 15:13 ` Leif Lindholm
2017-01-20 1:34 ` Daniil Egranov
2017-01-20 10:30 ` Ryan Harkin
2017-01-20 20:57 ` Daniil Egranov
2017-01-23 11:26 ` Ryan Harkin
2017-01-23 12:56 ` Ryan Harkin
2017-01-24 2:19 ` Daniil Egranov
2017-01-24 11:05 ` Ryan Harkin
2017-01-24 12:34 ` Ryan Harkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1484782032-82342-1-git-send-email-daniil.egranov@arm.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox