patches/edk2-platforms: add d05 MAC address fixrpf-19.03-rc3

Add patch provided by Ming to address
https://bugs.linaro.org/show_bug.cgi?id=4345

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

1 files changed, 85 insertions, 0 deletions

diff --git a/patches/edk2-platforms/0004-Hisilicon-Silicon-Add-dependence-for-AcpiPlatformDxe.patch b/patches/edk2-platforms/0004-Hisilicon-Silicon-Add-dependence-for-AcpiPlatformDxe.patch
new file mode 100644
index 0000000..a75bad4
--- /dev/null
+++ b/patches/edk2-platforms/0004-Hisilicon-Silicon-Add-dependence-for-AcpiPlatformDxe.patch
@@ -0,0 +1,85 @@
+From 5fc77339c99f53fb0bcb1ed3f5d7f9e0e7c2dd2d Mon Sep 17 00:00:00 2001
+From: Ming Huang <ming.huang@linaro.org>
+Date: Tue, 16 Apr 2019 22:35:07 +0800
+Subject: [PATCH edk2-platforms 4/4] Hisilicon/Silicon: Add dependence for
+ AcpiPlatformDxe
+
+As AcpiPlatformDxe/AcpiPlatformDxe intend to update some fields of
+DSDT of ACPI, it should be ran after HisiAcpiPlatformDxe which will
+install ACPI tables, so add dependenc to insure the order.
+
+This order break by commit 253809c906f7:
+"Hisilicon/D06: Add Hi1620OemConfigUiLib".
+
+This patch also fix issue:
+https://bugs.linaro.org/show_bug.cgi?id=435
+
+Contributed-under: TianoCore Contribution Agreement 1.1
+Signed-off-by: Ming Huang <ming.huang@linaro.org>
+---
+ Silicon/Hisilicon/HisiPkg.dec                                |  1 +
+ .../Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf    |  2 +-
+ .../Drivers/HisiAcpiPlatformDxe/AcpiPlatformDxe.inf          |  1 +
+ Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatform.c | 12 +++++++++++-
+ 4 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/Silicon/Hisilicon/HisiPkg.dec b/Silicon/Hisilicon/HisiPkg.dec
+index 404a3ae4af..30b2226b04 100644
+--- a/Silicon/Hisilicon/HisiPkg.dec
++++ b/Silicon/Hisilicon/HisiPkg.dec
+@@ -39,6 +39,7 @@ [Protocols]
+   gPlatformSasProtocolGuid = {0x40e9829f, 0x3a2c, 0x479a, {0x9a, 0x93, 0x45, 0x7d, 0x13, 0x50, 0x96, 0x5d}}

+   gHisiPlatformSasProtocolGuid = {0x20e9829f, 0x3a2c, 0x479a, {0x9a, 0x93, 0x45, 0x7d, 0x13, 0x50, 0x96, 0x6d}}

+   gHisiSnpPlatformProtocolGuid = {0x81321f27, 0xff58, 0x4a1d, {0x99, 0x97, 0xd, 0xcc, 0xfa, 0x82, 0xf4, 0x6f}}

++  gHisiInstalledAcpiProtocolGuid = {0x31505f6a, 0xe496, 0x4c7e, {0xba, 0xbb, 0x71, 0x7b, 0xe2, 0xc4, 0xb4, 0x59}}

+ 

+ [Guids]

+   gHisiTokenSpaceGuid = {0xc8bc553e, 0x12bf, 0x11e6, {0x97, 0x4f, 0x87, 0xf7, 0x7c, 0xfd, 0x52, 0x1d}}

+diff --git a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf b/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf
+index 5209f31801..171583bee0 100644
+--- a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf
++++ b/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf
+@@ -68,5 +68,5 @@ [FixedPcd]
+   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision

+ 

+ [Depex]

+-  gEfiAcpiTableProtocolGuid AND gEfiAcpiSdtProtocolGuid AND gHisiBoardNicProtocolGuid

++  gEfiAcpiTableProtocolGuid AND gEfiAcpiSdtProtocolGuid AND gHisiBoardNicProtocolGuid AND gHisiInstalledAcpiProtocolGuid

+ 

+diff --git a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatformDxe.inf b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatformDxe.inf
+index 3d133aff85..f166d7672b 100644
+--- a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatformDxe.inf
++++ b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatformDxe.inf
+@@ -48,6 +48,7 @@ [LibraryClasses]
+ 

+ [Protocols]

+   gEfiAcpiTableProtocolGuid                     ## CONSUMES

++  gHisiInstalledAcpiProtocolGuid                ## CONSUMES

+ 

+ [Guids]

+   gHisiEfiMemoryMapGuid

+diff --git a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatform.c b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatform.c
+index c8b56e1bd1..a26060ef4c 100644
+--- a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatform.c
++++ b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatform.c
+@@ -264,6 +264,16 @@ AcpiPlatformEntryPoint (
+     }

+   }

+ 

+-  return EFI_SUCCESS;

++  Status = gBS->InstallProtocolInterface (

++                  &ImageHandle,

++                  &gHisiInstalledAcpiProtocolGuid,

++                  EFI_NATIVE_INTERFACE,

++                  NULL

++                  );

++  if (EFI_ERROR (Status)) {

++    DEBUG ((DEBUG_ERROR, "Install protocol %r\n", Status));

++  }

++

++  return Status;

+ }

+ 

+-- 
+2.11.0
+