[PATCH edk2-non-osi v3 0/7] Improve D0x platforms and bug fix

[PATCH edk2-non-osi v3 0/7] Improve D0x platforms and bug fix

[Heyi Guo]

The major features of this patchset:
1 Upgrade trusted firmware to 1.4
2 Workarounds for CVE-2017-5715 on Cortex A57/A72/A73 and A75 #1214
3 Delete some binary for open-source version
4 Update binary follow changing DmaLib to CoherentDmaLib

Code can also be found in github: https://github.com/hisilicon/OpenPlatformPkg.git
branch: rp-1802-osi-v3


Heyi Guo (6):
  Hisilicon D0x: Fix network interface order issue
  Hisilicon D0x: Delete SnpPlatform
  Hisilicon D03/D05: Update SasDriverDxe binary
  Hisilicon D03/D05: Update NativeOhci binary
  Hisilicon/D03: Update binary of trusted-firmware
  Hisilicon/D05: Update binary of trusted-firmware

Jason Zhang (1):
  Hisilicon D03/D05: Delete SasPlatform

 Platform/Hisilicon/D03/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.efi | Bin 26688 -> 27392 bytes
 Platform/Hisilicon/D03/Drivers/Net/SnpPlatform/SnpPlatform.efi | Bin 3040 -> 0 bytes
 Platform/Hisilicon/D03/Drivers/Net/SnpPlatform/SnpPlatform.inf |  24 --------------------
 Platform/Hisilicon/D03/Drivers/OhciDxe/NativeOhci.efi          | Bin 21664 -> 22336 bytes
 Platform/Hisilicon/D03/Drivers/Sas/SasDriverDxe.efi            | Bin 98112 -> 100224 bytes
 Platform/Hisilicon/D03/Drivers/SasPlatform/SasPlatform.efi     | Bin 3040 -> 0 bytes
 Platform/Hisilicon/D03/Drivers/SasPlatform/SasPlatform.inf     |  24 --------------------
 Platform/Hisilicon/D03/bl1.bin                                 | Bin 14336 -> 12416 bytes
 Platform/Hisilicon/D03/fip.bin                                 | Bin 62513 -> 66758 bytes
 Platform/Hisilicon/D05/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.efi | Bin 28544 -> 27680 bytes
 Platform/Hisilicon/D05/Drivers/Net/SnpPlatform/SnpPlatform.efi | Bin 3392 -> 0 bytes
 Platform/Hisilicon/D05/Drivers/Net/SnpPlatform/SnpPlatform.inf |  24 --------------------
 Platform/Hisilicon/D05/Drivers/OhciDxe/NativeOhci.efi          | Bin 23328 -> 22624 bytes
 Platform/Hisilicon/D05/Drivers/Sas/SasDriverDxe.efi            | Bin 112832 -> 115008 bytes
 Platform/Hisilicon/D05/Drivers/SasPlatform/SasPlatform.efi     | Bin 3424 -> 0 bytes
 Platform/Hisilicon/D05/Drivers/SasPlatform/SasPlatform.inf     |  24 --------------------
 Platform/Hisilicon/D05/bl1.bin                                 | Bin 14344 -> 12424 bytes
 Platform/Hisilicon/D05/fip.bin                                 | Bin 41493 -> 37546 bytes
 18 files changed, 96 deletions(-)
 delete mode 100644 Platform/Hisilicon/D03/Drivers/Net/SnpPlatform/SnpPlatform.efi
 delete mode 100644 Platform/Hisilicon/D03/Drivers/Net/SnpPlatform/SnpPlatform.inf
 delete mode 100644 Platform/Hisilicon/D03/Drivers/SasPlatform/SasPlatform.efi
 delete mode 100644 Platform/Hisilicon/D03/Drivers/SasPlatform/SasPlatform.inf
 delete mode 100644 Platform/Hisilicon/D05/Drivers/Net/SnpPlatform/SnpPlatform.efi
 delete mode 100644 Platform/Hisilicon/D05/Drivers/Net/SnpPlatform/SnpPlatform.inf
 delete mode 100644 Platform/Hisilicon/D05/Drivers/SasPlatform/SasPlatform.efi
 delete mode 100644 Platform/Hisilicon/D05/Drivers/SasPlatform/SasPlatform.inf

-- 
1.9.1

[PATCH edk2-non-osi v3 1/7] Hisilicon D03/D05: Delete SasPlatform

[Heyi Guo]

From: Jason Zhang <zhangjinsong2@huawei.com>

An open-source version coming to edk2-platfroms replaces this version.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jason Zhang <zhangjinsong2@huawei.com>
Signed-off-by: Ming Huang <huangming23@huawei.com>
Signed-off-by: Heyi Guo <heyi.guo@linaro.org>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
---
 Platform/Hisilicon/D03/Drivers/SasPlatform/SasPlatform.efi | Bin 3040 -> 0 bytes
 Platform/Hisilicon/D03/Drivers/SasPlatform/SasPlatform.inf |  24 --------------------
 Platform/Hisilicon/D05/Drivers/SasPlatform/SasPlatform.efi | Bin 3424 -> 0 bytes
 Platform/Hisilicon/D05/Drivers/SasPlatform/SasPlatform.inf |  24 --------------------
 4 files changed, 48 deletions(-)

diff --git a/Platform/Hisilicon/D03/Drivers/SasPlatform/SasPlatform.efi b/Platform/Hisilicon/D03/Drivers/SasPlatform/SasPlatform.efi
deleted file mode 100644
index 4255641..0000000
Binary files a/Platform/Hisilicon/D03/Drivers/SasPlatform/SasPlatform.efi and /dev/null differ
diff --git a/Platform/Hisilicon/D03/Drivers/SasPlatform/SasPlatform.inf b/Platform/Hisilicon/D03/Drivers/SasPlatform/SasPlatform.inf
deleted file mode 100644
index 0d747a1..0000000
--- a/Platform/Hisilicon/D03/Drivers/SasPlatform/SasPlatform.inf
+++ /dev/null
@@ -1,24 +0,0 @@
-#/** @file
-#
-#    Copyright (c) 2017, Hisilicon Limited. All rights reserved.
-#    Copyright (c) 2017, Linaro Limited. All rights reserved.
-#
-#    This program and the accompanying materials
-#    are licensed and made available under the terms and conditions of the BSD License
-#    which accompanies this distribution. The full text of the license may be found at
-#    http://opensource.org/licenses/bsd-license.php
-#
-#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#**/
-
-[Defines]
-  INF_VERSION                    = 0x00010019
-  BASE_NAME                      = SasPlatform
-  FILE_GUID                      = 102D8FC9-20a4-42EB-aC14-1C98BA5b26A4
-  MODULE_TYPE                    = DXE_DRIVER
-  VERSION_STRING                 = 1.0
-
-[Binaries.AARCH64]
-  PE32|SasPlatform.efi|*
diff --git a/Platform/Hisilicon/D05/Drivers/SasPlatform/SasPlatform.efi b/Platform/Hisilicon/D05/Drivers/SasPlatform/SasPlatform.efi
deleted file mode 100644
index d2685ab..0000000
Binary files a/Platform/Hisilicon/D05/Drivers/SasPlatform/SasPlatform.efi and /dev/null differ
diff --git a/Platform/Hisilicon/D05/Drivers/SasPlatform/SasPlatform.inf b/Platform/Hisilicon/D05/Drivers/SasPlatform/SasPlatform.inf
deleted file mode 100644
index 0d747a1..0000000
--- a/Platform/Hisilicon/D05/Drivers/SasPlatform/SasPlatform.inf
+++ /dev/null
@@ -1,24 +0,0 @@
-#/** @file
-#
-#    Copyright (c) 2017, Hisilicon Limited. All rights reserved.
-#    Copyright (c) 2017, Linaro Limited. All rights reserved.
-#
-#    This program and the accompanying materials
-#    are licensed and made available under the terms and conditions of the BSD License
-#    which accompanies this distribution. The full text of the license may be found at
-#    http://opensource.org/licenses/bsd-license.php
-#
-#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#**/
-
-[Defines]
-  INF_VERSION                    = 0x00010019
-  BASE_NAME                      = SasPlatform
-  FILE_GUID                      = 102D8FC9-20a4-42EB-aC14-1C98BA5b26A4
-  MODULE_TYPE                    = DXE_DRIVER
-  VERSION_STRING                 = 1.0
-
-[Binaries.AARCH64]
-  PE32|SasPlatform.efi|*
-- 
1.9.1

[PATCH edk2-non-osi v3 2/7] Hisilicon D0x: Fix network interface order issue

[Heyi Guo]

1. Rebuild SnpPV600Dxe binary for switching DmaLib to CoherentDmaLib.
2. Fixed bug:Confusing Ethernet port sequence.
Move the most right Ethernet port (when looking from the front of the
chassis) to the first one in BootManage for PXE boot.
https://bugs.linaro.org/show_bug.cgi?id=2657

Note:
This patch is related to "Open SnpPlatform source code" and
"Change DmaLib to CoherentDmaLib" in edk2-platform.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jason Zhang <zhangjinsong2@huawei.com>
Signed-off-by: Ming Huang <huangming23@huawei.com>
Signed-off-by: Heyi Guo <heyi.guo@linaro.org>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
---
 Platform/Hisilicon/D03/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.efi | Bin 26688 -> 27392 bytes
 Platform/Hisilicon/D05/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.efi | Bin 28544 -> 27680 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/Platform/Hisilicon/D03/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.efi b/Platform/Hisilicon/D03/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.efi
index 8ce6a6d..bcb3e4f 100644
Binary files a/Platform/Hisilicon/D03/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.efi and b/Platform/Hisilicon/D03/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.efi differ
diff --git a/Platform/Hisilicon/D05/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.efi b/Platform/Hisilicon/D05/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.efi
index bc7942a..582f645 100644
Binary files a/Platform/Hisilicon/D05/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.efi and b/Platform/Hisilicon/D05/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.efi differ
-- 
1.9.1

[PATCH edk2-non-osi v3 3/7] Hisilicon D0x: Delete SnpPlatform

[Heyi Guo]

An open-source version coming to edk2-platforms replaces this version.
This patch is related to "Open SnpPlatform source code" and
"Change DmaLib to CoherentDmaLib".

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ming Huang <huangming23@huawei.com>
Signed-off-by: Heyi Guo <heyi.guo@linaro.org>
Signed-off-by: Jason Zhang <zhangjinsong2@huawei.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
---
 Platform/Hisilicon/D03/Drivers/Net/SnpPlatform/SnpPlatform.efi | Bin 3040 -> 0 bytes
 Platform/Hisilicon/D03/Drivers/Net/SnpPlatform/SnpPlatform.inf |  24 --------------------
 Platform/Hisilicon/D05/Drivers/Net/SnpPlatform/SnpPlatform.efi | Bin 3392 -> 0 bytes
 Platform/Hisilicon/D05/Drivers/Net/SnpPlatform/SnpPlatform.inf |  24 --------------------
 4 files changed, 48 deletions(-)

diff --git a/Platform/Hisilicon/D03/Drivers/Net/SnpPlatform/SnpPlatform.efi b/Platform/Hisilicon/D03/Drivers/Net/SnpPlatform/SnpPlatform.efi
deleted file mode 100644
index 5e7d8bd..0000000
Binary files a/Platform/Hisilicon/D03/Drivers/Net/SnpPlatform/SnpPlatform.efi and /dev/null differ
diff --git a/Platform/Hisilicon/D03/Drivers/Net/SnpPlatform/SnpPlatform.inf b/Platform/Hisilicon/D03/Drivers/Net/SnpPlatform/SnpPlatform.inf
deleted file mode 100644
index 10b2003..0000000
--- a/Platform/Hisilicon/D03/Drivers/Net/SnpPlatform/SnpPlatform.inf
+++ /dev/null
@@ -1,24 +0,0 @@
-#/** @file
-#
-#    Copyright (c) 2017, Hisilicon Limited. All rights reserved.
-#    Copyright (c) 2017, Linaro Limited. All rights reserved.
-#
-#    This program and the accompanying materials
-#    are licensed and made available under the terms and conditions of the BSD License
-#    which accompanies this distribution. The full text of the license may be found at
-#    http://opensource.org/licenses/bsd-license.php
-#
-#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#**/
-
-[Defines]
-  INF_VERSION                    = 0x00010019
-  BASE_NAME                      = SnpPlatform
-  FILE_GUID                      = 102D8FC9-20A4-42EB-AC14-1C98BA5B17A8
-  MODULE_TYPE                    = DXE_DRIVER
-  VERSION_STRING                 = 1.0
-
-[Binaries.AARCH64]
-  PE32|SnpPlatform.efi|*
diff --git a/Platform/Hisilicon/D05/Drivers/Net/SnpPlatform/SnpPlatform.efi b/Platform/Hisilicon/D05/Drivers/Net/SnpPlatform/SnpPlatform.efi
deleted file mode 100644
index 42c26de..0000000
Binary files a/Platform/Hisilicon/D05/Drivers/Net/SnpPlatform/SnpPlatform.efi and /dev/null differ
diff --git a/Platform/Hisilicon/D05/Drivers/Net/SnpPlatform/SnpPlatform.inf b/Platform/Hisilicon/D05/Drivers/Net/SnpPlatform/SnpPlatform.inf
deleted file mode 100644
index 10b2003..0000000
--- a/Platform/Hisilicon/D05/Drivers/Net/SnpPlatform/SnpPlatform.inf
+++ /dev/null
@@ -1,24 +0,0 @@
-#/** @file
-#
-#    Copyright (c) 2017, Hisilicon Limited. All rights reserved.
-#    Copyright (c) 2017, Linaro Limited. All rights reserved.
-#
-#    This program and the accompanying materials
-#    are licensed and made available under the terms and conditions of the BSD License
-#    which accompanies this distribution. The full text of the license may be found at
-#    http://opensource.org/licenses/bsd-license.php
-#
-#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#**/
-
-[Defines]
-  INF_VERSION                    = 0x00010019
-  BASE_NAME                      = SnpPlatform
-  FILE_GUID                      = 102D8FC9-20A4-42EB-AC14-1C98BA5B17A8
-  MODULE_TYPE                    = DXE_DRIVER
-  VERSION_STRING                 = 1.0
-
-[Binaries.AARCH64]
-  PE32|SnpPlatform.efi|*
-- 
1.9.1

[PATCH edk2-non-osi v3 4/7] Hisilicon D03/D05: Update SasDriverDxe binary

[Heyi Guo]

Update SasDriverDxe binary for changing DmaLib to CoherentDmaLib.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ming Huang <huangming23@huawei.com>
Signed-off-by: Heyi Guo <heyi.guo@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
---
 Platform/Hisilicon/D03/Drivers/Sas/SasDriverDxe.efi | Bin 98112 -> 100224 bytes
 Platform/Hisilicon/D05/Drivers/Sas/SasDriverDxe.efi | Bin 112832 -> 115008 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/Platform/Hisilicon/D03/Drivers/Sas/SasDriverDxe.efi b/Platform/Hisilicon/D03/Drivers/Sas/SasDriverDxe.efi
index c37b922..6b61504 100644
Binary files a/Platform/Hisilicon/D03/Drivers/Sas/SasDriverDxe.efi and b/Platform/Hisilicon/D03/Drivers/Sas/SasDriverDxe.efi differ
diff --git a/Platform/Hisilicon/D05/Drivers/Sas/SasDriverDxe.efi b/Platform/Hisilicon/D05/Drivers/Sas/SasDriverDxe.efi
index a57b8e1..b74c23b 100644
Binary files a/Platform/Hisilicon/D05/Drivers/Sas/SasDriverDxe.efi and b/Platform/Hisilicon/D05/Drivers/Sas/SasDriverDxe.efi differ
-- 
1.9.1

[PATCH edk2-non-osi v3 5/7] Hisilicon D03/D05: Update NativeOhci binary

[Heyi Guo]

Update NativeOhci bianry for changing DmaLib to CoherentDmaLib.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ming Huang <huangming23@huawei.com>
Signed-off-by: Heyi Guo <heyi.guo@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
---
 Platform/Hisilicon/D03/Drivers/OhciDxe/NativeOhci.efi | Bin 21664 -> 22336 bytes
 Platform/Hisilicon/D05/Drivers/OhciDxe/NativeOhci.efi | Bin 23328 -> 22624 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/Platform/Hisilicon/D03/Drivers/OhciDxe/NativeOhci.efi b/Platform/Hisilicon/D03/Drivers/OhciDxe/NativeOhci.efi
index e1970fd..5472254 100644
Binary files a/Platform/Hisilicon/D03/Drivers/OhciDxe/NativeOhci.efi and b/Platform/Hisilicon/D03/Drivers/OhciDxe/NativeOhci.efi differ
diff --git a/Platform/Hisilicon/D05/Drivers/OhciDxe/NativeOhci.efi b/Platform/Hisilicon/D05/Drivers/OhciDxe/NativeOhci.efi
index 9e7dd0e..7f0ac10 100644
Binary files a/Platform/Hisilicon/D05/Drivers/OhciDxe/NativeOhci.efi and b/Platform/Hisilicon/D05/Drivers/OhciDxe/NativeOhci.efi differ
-- 
1.9.1

[PATCH edk2-non-osi v3 6/7] Hisilicon/D03: Update binary of trusted-firmware

[Heyi Guo]

1 Workarounds for CVE-2017-5715 on Cortex A57/A72/A73 and A75 #1214.
2 Upgrade trusted firmware to 1.4

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ming Huang <huangming23@huawei.com>
Signed-off-by: Heyi Guo <heyi.guo@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 Platform/Hisilicon/D03/bl1.bin | Bin 14336 -> 12416 bytes
 Platform/Hisilicon/D03/fip.bin | Bin 62513 -> 66758 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/Platform/Hisilicon/D03/bl1.bin b/Platform/Hisilicon/D03/bl1.bin
index cdaa743..19ceb9b 100644
Binary files a/Platform/Hisilicon/D03/bl1.bin and b/Platform/Hisilicon/D03/bl1.bin differ
diff --git a/Platform/Hisilicon/D03/fip.bin b/Platform/Hisilicon/D03/fip.bin
index ae4ed1a..e91b0da 100644
Binary files a/Platform/Hisilicon/D03/fip.bin and b/Platform/Hisilicon/D03/fip.bin differ
-- 
1.9.1

[PATCH edk2-non-osi v3 7/7] Hisilicon/D05: Update binary of trusted-firmware

[Heyi Guo]

1 Workarounds for CVE-2017-5715 on Cortex A57/A72/A73 and A75 #1214.
2 Upgrade trusted firmware to 1.4

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ming Huang <huangming23@huawei.com>
Signed-off-by: Heyi Guo <heyi.guo@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 Platform/Hisilicon/D05/bl1.bin | Bin 14344 -> 12424 bytes
 Platform/Hisilicon/D05/fip.bin | Bin 41493 -> 37546 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/Platform/Hisilicon/D05/bl1.bin b/Platform/Hisilicon/D05/bl1.bin
index 7341476..b95257c 100644
Binary files a/Platform/Hisilicon/D05/bl1.bin and b/Platform/Hisilicon/D05/bl1.bin differ
diff --git a/Platform/Hisilicon/D05/fip.bin b/Platform/Hisilicon/D05/fip.bin
index 496a9b8..5958293 100644
Binary files a/Platform/Hisilicon/D05/fip.bin and b/Platform/Hisilicon/D05/fip.bin differ
-- 
1.9.1

Re: [PATCH edk2-non-osi v3 0/7] Improve D0x platforms and bug fix

[Leif Lindholm]

Thanks!

For the series:
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

Pushed as 168344f..1aaec67

On Fri, Feb 02, 2018 at 07:57:21PM +0800, Heyi Guo wrote:
> The major features of this patchset:
> 1 Upgrade trusted firmware to 1.4
> 2 Workarounds for CVE-2017-5715 on Cortex A57/A72/A73 and A75 #1214
> 3 Delete some binary for open-source version
> 4 Update binary follow changing DmaLib to CoherentDmaLib
> 
> Code can also be found in github: https://github.com/hisilicon/OpenPlatformPkg.git
> branch: rp-1802-osi-v3
> 
> 
> Heyi Guo (6):
>   Hisilicon D0x: Fix network interface order issue
>   Hisilicon D0x: Delete SnpPlatform
>   Hisilicon D03/D05: Update SasDriverDxe binary
>   Hisilicon D03/D05: Update NativeOhci binary
>   Hisilicon/D03: Update binary of trusted-firmware
>   Hisilicon/D05: Update binary of trusted-firmware
> 
> Jason Zhang (1):
>   Hisilicon D03/D05: Delete SasPlatform
> 
>  Platform/Hisilicon/D03/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.efi | Bin 26688 -> 27392 bytes
>  Platform/Hisilicon/D03/Drivers/Net/SnpPlatform/SnpPlatform.efi | Bin 3040 -> 0 bytes
>  Platform/Hisilicon/D03/Drivers/Net/SnpPlatform/SnpPlatform.inf |  24 --------------------
>  Platform/Hisilicon/D03/Drivers/OhciDxe/NativeOhci.efi          | Bin 21664 -> 22336 bytes
>  Platform/Hisilicon/D03/Drivers/Sas/SasDriverDxe.efi            | Bin 98112 -> 100224 bytes
>  Platform/Hisilicon/D03/Drivers/SasPlatform/SasPlatform.efi     | Bin 3040 -> 0 bytes
>  Platform/Hisilicon/D03/Drivers/SasPlatform/SasPlatform.inf     |  24 --------------------
>  Platform/Hisilicon/D03/bl1.bin                                 | Bin 14336 -> 12416 bytes
>  Platform/Hisilicon/D03/fip.bin                                 | Bin 62513 -> 66758 bytes
>  Platform/Hisilicon/D05/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.efi | Bin 28544 -> 27680 bytes
>  Platform/Hisilicon/D05/Drivers/Net/SnpPlatform/SnpPlatform.efi | Bin 3392 -> 0 bytes
>  Platform/Hisilicon/D05/Drivers/Net/SnpPlatform/SnpPlatform.inf |  24 --------------------
>  Platform/Hisilicon/D05/Drivers/OhciDxe/NativeOhci.efi          | Bin 23328 -> 22624 bytes
>  Platform/Hisilicon/D05/Drivers/Sas/SasDriverDxe.efi            | Bin 112832 -> 115008 bytes
>  Platform/Hisilicon/D05/Drivers/SasPlatform/SasPlatform.efi     | Bin 3424 -> 0 bytes
>  Platform/Hisilicon/D05/Drivers/SasPlatform/SasPlatform.inf     |  24 --------------------
>  Platform/Hisilicon/D05/bl1.bin                                 | Bin 14344 -> 12424 bytes
>  Platform/Hisilicon/D05/fip.bin                                 | Bin 41493 -> 37546 bytes
>  18 files changed, 96 deletions(-)
>  delete mode 100644 Platform/Hisilicon/D03/Drivers/Net/SnpPlatform/SnpPlatform.efi
>  delete mode 100644 Platform/Hisilicon/D03/Drivers/Net/SnpPlatform/SnpPlatform.inf
>  delete mode 100644 Platform/Hisilicon/D03/Drivers/SasPlatform/SasPlatform.efi
>  delete mode 100644 Platform/Hisilicon/D03/Drivers/SasPlatform/SasPlatform.inf
>  delete mode 100644 Platform/Hisilicon/D05/Drivers/Net/SnpPlatform/SnpPlatform.efi
>  delete mode 100644 Platform/Hisilicon/D05/Drivers/Net/SnpPlatform/SnpPlatform.inf
>  delete mode 100644 Platform/Hisilicon/D05/Drivers/SasPlatform/SasPlatform.efi
>  delete mode 100644 Platform/Hisilicon/D05/Drivers/SasPlatform/SasPlatform.inf
> 
> -- 
> 1.9.1
> 

Re: [PATCH edk2-non-osi v3 7/7] Hisilicon/D05: Update binary of trusted-firmware

[Jeremy Linton]

Hi,

On 02/02/2018 05:57 AM, Heyi Guo wrote:
> 1 Workarounds for CVE-2017-5715 on Cortex A57/A72/A73 and A75 #1214.

I've been trying to verify spectre fixes, and I don't get a smccc 
version from this firmware (see this kernel branch 
https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git/log/?h=kpti) 
image.

This means that the spectre BP hardening isn't activating on the D05. 
So, unless i'm doing something wrong (quite possible) it appears that 
this image isn't utilizing the correct ATF patches.

Can someone please verify/check this image with a SMCCC enabled kernel?

Thanks,


> 2 Upgrade trusted firmware to 1.4
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ming Huang <huangming23@huawei.com>
> Signed-off-by: Heyi Guo <heyi.guo@linaro.org>
> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
>   Platform/Hisilicon/D05/bl1.bin | Bin 14344 -> 12424 bytes
>   Platform/Hisilicon/D05/fip.bin | Bin 41493 -> 37546 bytes
>   2 files changed, 0 insertions(+), 0 deletions(-)
> 
> diff --git a/Platform/Hisilicon/D05/bl1.bin b/Platform/Hisilicon/D05/bl1.bin
> index 7341476..b95257c 100644
> Binary files a/Platform/Hisilicon/D05/bl1.bin and b/Platform/Hisilicon/D05/bl1.bin differ
> diff --git a/Platform/Hisilicon/D05/fip.bin b/Platform/Hisilicon/D05/fip.bin
> index 496a9b8..5958293 100644
> Binary files a/Platform/Hisilicon/D05/fip.bin and b/Platform/Hisilicon/D05/fip.bin differ
> 

Re: [PATCH edk2-non-osi v3 7/7] Hisilicon/D05: Update binary of trusted-firmware

[Guo Heyi]

Hi Jeremy,

This TF binaries have not been patched the latest SMCCC workaround; it is based
on v1.4 release and was only
patched with "disable/enable MMU in PSCI SMC call", as the commit in upstream TF
code:
f62ad322695d16178db464dc062fe0af592c6780 

When we generated these binaries, SMCCC patches had not come out so they are not
contained in these binaries.

Do you recommend using the latest smccc patches?

Thanks and regards,

Heyi

On Thu, Feb 22, 2018 at 08:37:11PM -0600, Jeremy Linton wrote:
> Hi,
> 
> On 02/02/2018 05:57 AM, Heyi Guo wrote:
> >1 Workarounds for CVE-2017-5715 on Cortex A57/A72/A73 and A75 #1214.
> 
> I've been trying to verify spectre fixes, and I don't get a smccc version
> from this firmware (see this kernel branch
> https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git/log/?h=kpti)
> image.
> 
> This means that the spectre BP hardening isn't activating on the D05. So,
> unless i'm doing something wrong (quite possible) it appears that this image
> isn't utilizing the correct ATF patches.
> 
> Can someone please verify/check this image with a SMCCC enabled kernel?
> 
> Thanks,
> 
> 
> >2 Upgrade trusted firmware to 1.4
> >
> >Contributed-under: TianoCore Contribution Agreement 1.1
> >Signed-off-by: Ming Huang <huangming23@huawei.com>
> >Signed-off-by: Heyi Guo <heyi.guo@linaro.org>
> >Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
> >Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> >---
> >  Platform/Hisilicon/D05/bl1.bin | Bin 14344 -> 12424 bytes
> >  Platform/Hisilicon/D05/fip.bin | Bin 41493 -> 37546 bytes
> >  2 files changed, 0 insertions(+), 0 deletions(-)
> >
> >diff --git a/Platform/Hisilicon/D05/bl1.bin b/Platform/Hisilicon/D05/bl1.bin
> >index 7341476..b95257c 100644
> >Binary files a/Platform/Hisilicon/D05/bl1.bin and b/Platform/Hisilicon/D05/bl1.bin differ
> >diff --git a/Platform/Hisilicon/D05/fip.bin b/Platform/Hisilicon/D05/fip.bin
> >index 496a9b8..5958293 100644
> >Binary files a/Platform/Hisilicon/D05/fip.bin and b/Platform/Hisilicon/D05/fip.bin differ
> >
> 

Re: [PATCH edk2-non-osi v3 7/7] Hisilicon/D05: Update binary of trusted-firmware

[Ard Biesheuvel]

On 23 February 2018 at 03:17, Guo Heyi <heyi.guo@linaro.org> wrote:
> Hi Jeremy,
>
> This TF binaries have not been patched the latest SMCCC workaround; it is based
> on v1.4 release and was only
> patched with "disable/enable MMU in PSCI SMC call", as the commit in upstream TF
> code:
> f62ad322695d16178db464dc062fe0af592c6780
>
> When we generated these binaries, SMCCC patches had not come out so they are not
> contained in these binaries.
>
> Do you recommend using the latest smccc patches?
>

Yes.

The Spectre v2 mitigations that landed in v4.16 and were backported to
v4.15 and v4.14 LTS do not use the PSCI_VERSION call anymore to
perform branch predictor invalidation. Instead, it checks for
SMCCCv1.1, and uses the ARCH_WORKAROUND_1 SMC call if supported. If
not, no BP maintenance is performed.

Re: [PATCH edk2-non-osi v3 7/7] Hisilicon/D05: Update binary of trusted-firmware

[Guo Heyi]

On Fri, Feb 23, 2018 at 09:02:46AM +0000, Ard Biesheuvel wrote:
> On 23 February 2018 at 03:17, Guo Heyi <heyi.guo@linaro.org> wrote:
> > Hi Jeremy,
> >
> > This TF binaries have not been patched the latest SMCCC workaround; it is based
> > on v1.4 release and was only
> > patched with "disable/enable MMU in PSCI SMC call", as the commit in upstream TF
> > code:
> > f62ad322695d16178db464dc062fe0af592c6780
> >
> > When we generated these binaries, SMCCC patches had not come out so they are not
> > contained in these binaries.
> >
> > Do you recommend using the latest smccc patches?
> >
> 
> Yes.
> 
> The Spectre v2 mitigations that landed in v4.16 and were backported to
> v4.15 and v4.14 LTS do not use the PSCI_VERSION call anymore to
> perform branch predictor invalidation. Instead, it checks for
> SMCCCv1.1, and uses the ARCH_WORKAROUND_1 SMC call if supported. If
> not, no BP maintenance is performed.

Thanks, we'll try to apply the smccc patch to TF.

Heyi