update to upstream commit ee3198e672e2
This commit is contained in:
parent
b7103cb49a
commit
7ae6f1596c
2
.gitignore
vendored
2
.gitignore
vendored
@ -14,3 +14,5 @@
|
||||
/edk2-20171011-92d07e4.tar.xz
|
||||
/openssl-1.1.0e-hobbled.tar.xz
|
||||
/qemu-ovmf-secureboot-1.1.2.tar.gz
|
||||
/openssl-1.1.0h-hobbled.tar.xz
|
||||
/edk2-20180529-ee3198e672e2.tar.xz
|
||||
|
@ -1,12 +1,15 @@
|
||||
From 08cfa34b6f97605c72426eefc7753d423f2fc0fa Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Wed, 27 Jan 2016 03:05:18 +0100
|
||||
Subject: [PATCH] OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in NvmExpressDxe
|
||||
Subject: [PATCH 01/16] OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in
|
||||
NvmExpressDxe
|
||||
|
||||
NvmExpressDxe logs all BlockIo read & write calls on the EFI_D_VERBOSE
|
||||
level.
|
||||
|
||||
Contributed-under: TianoCore Contribution Agreement 1.0
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
---
|
||||
OvmfPkg/OvmfPkgIa32.dsc | 5 ++++-
|
||||
OvmfPkg/OvmfPkgIa32X64.dsc | 5 ++++-
|
||||
@ -14,10 +17,10 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
3 files changed, 12 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
index 3f4d42d..048a144 100644
|
||||
index 2d6c4c4..7530e1a 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
@@ -635,7 +635,10 @@
|
||||
@@ -733,7 +733,10 @@
|
||||
OvmfPkg/SataControllerDxe/SataControllerDxe.inf
|
||||
MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
|
||||
MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
|
||||
@ -30,10 +33,10 @@ index 3f4d42d..048a144 100644
|
||||
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
|
||||
MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
index 5688475..fac0cf0 100644
|
||||
index 43158c5..de8edfd 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
@@ -644,7 +644,10 @@
|
||||
@@ -742,7 +742,10 @@
|
||||
OvmfPkg/SataControllerDxe/SataControllerDxe.inf
|
||||
MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
|
||||
MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
|
||||
@ -46,10 +49,10 @@ index 5688475..fac0cf0 100644
|
||||
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
|
||||
MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
||||
index dcf64b9..bc62a64 100644
|
||||
index d1fdf7c..484b8c4 100644
|
||||
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||||
@@ -642,7 +642,10 @@
|
||||
@@ -740,7 +740,10 @@
|
||||
OvmfPkg/SataControllerDxe/SataControllerDxe.inf
|
||||
MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
|
||||
MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
|
||||
@ -61,3 +64,6 @@ index dcf64b9..bc62a64 100644
|
||||
MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
|
||||
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
|
||||
MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
|
||||
--
|
||||
2.17.0
|
||||
|
||||
|
@ -1,6 +1,8 @@
|
||||
From d45f1192743f3721936d531ca024894409dcf887 Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Wed, 27 Jan 2016 03:05:18 +0100
|
||||
Subject: [PATCH] OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in the DXE core
|
||||
Subject: [PATCH 02/16] OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in the DXE
|
||||
core
|
||||
|
||||
The DXE core logs a bunch of Properties Table and Memory Attributes Table
|
||||
related information, on the EFI_D_VERBOSE level, that I am at the moment
|
||||
@ -8,6 +10,7 @@ not interested in. Suppress said output.
|
||||
|
||||
Contributed-under: TianoCore Contribution Agreement 1.0
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
---
|
||||
OvmfPkg/OvmfPkgIa32.dsc | 2 ++
|
||||
OvmfPkg/OvmfPkgIa32X64.dsc | 2 ++
|
||||
@ -15,10 +18,10 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
3 files changed, 6 insertions(+)
|
||||
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
index 767fd7d..40688dd 100644
|
||||
index 7530e1a..613b390 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
@@ -562,6 +562,8 @@
|
||||
@@ -639,6 +639,8 @@
|
||||
<LibraryClasses>
|
||||
NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
|
||||
DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
|
||||
@ -28,10 +31,10 @@ index 767fd7d..40688dd 100644
|
||||
|
||||
MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
index 7460d50..3e75388 100644
|
||||
index de8edfd..b8e39ac 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
@@ -571,6 +571,8 @@
|
||||
@@ -648,6 +648,8 @@
|
||||
<LibraryClasses>
|
||||
NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
|
||||
DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
|
||||
@ -41,10 +44,10 @@ index 7460d50..3e75388 100644
|
||||
|
||||
MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
||||
index 765506a..e169f13 100644
|
||||
index 484b8c4..f69a5bd 100644
|
||||
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||||
@@ -569,6 +569,8 @@
|
||||
@@ -646,6 +646,8 @@
|
||||
<LibraryClasses>
|
||||
NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
|
||||
DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
|
||||
@ -53,3 +56,6 @@ index 765506a..e169f13 100644
|
||||
}
|
||||
|
||||
MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
|
||||
--
|
||||
2.17.0
|
||||
|
||||
|
@ -1,10 +1,12 @@
|
||||
From ce0900e38fcb54a7ea8a160204860b34b75610ca Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Sun, 8 Jul 2012 14:26:07 +0200
|
||||
Subject: [PATCH] OvmfPkg: enable DEBUG_VERBOSE
|
||||
Subject: [PATCH 03/16] OvmfPkg: enable DEBUG_VERBOSE
|
||||
|
||||
Enable verbose debug logs.
|
||||
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
---
|
||||
OvmfPkg/OvmfPkgIa32.dsc | 2 +-
|
||||
OvmfPkg/OvmfPkgIa32X64.dsc | 2 +-
|
||||
@ -12,10 +14,10 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
index c0440d9..fa9661c 100644
|
||||
index 613b390..054839f 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
@@ -408,7 +408,7 @@
|
||||
@@ -481,7 +481,7 @@
|
||||
# DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may
|
||||
# // significantly impact boot performance
|
||||
# DEBUG_ERROR 0x80000000 // Error
|
||||
@ -25,10 +27,10 @@ index c0440d9..fa9661c 100644
|
||||
!ifdef $(SOURCE_DEBUG_ENABLE)
|
||||
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
index 6f94bc7..667584a 100644
|
||||
index b8e39ac..d033fcf 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
@@ -413,7 +413,7 @@
|
||||
@@ -486,7 +486,7 @@
|
||||
# DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may
|
||||
# // significantly impact boot performance
|
||||
# DEBUG_ERROR 0x80000000 // Error
|
||||
@ -38,10 +40,10 @@ index 6f94bc7..667584a 100644
|
||||
!ifdef $(SOURCE_DEBUG_ENABLE)
|
||||
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
|
||||
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
||||
index a92bf19..5ae8469 100644
|
||||
index f69a5bd..de335a1 100644
|
||||
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||||
@@ -413,7 +413,7 @@
|
||||
@@ -486,7 +486,7 @@
|
||||
# DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may
|
||||
# // significantly impact boot performance
|
||||
# DEBUG_ERROR 0x80000000 // Error
|
||||
@ -50,3 +52,6 @@ index a92bf19..5ae8469 100644
|
||||
|
||||
!ifdef $(SOURCE_DEBUG_ENABLE)
|
||||
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
|
||||
--
|
||||
2.17.0
|
||||
|
||||
|
@ -1,14 +1,22 @@
|
||||
From c946d99c660e5b5e6d28bf432f91711e28c37746 Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Thu, 20 Feb 2014 22:54:45 +0100
|
||||
Subject: [PATCH] OvmfPkg: increase max debug message length to 512
|
||||
Subject: [PATCH 04/16] OvmfPkg: increase max debug message length to 512
|
||||
|
||||
Contributed-under: TianoCore Contribution Agreement 1.0
|
||||
Upstream prefers short debug messages (sometimes even limited to 80
|
||||
characters), but any line length under 512 characters is just unsuitable
|
||||
for effective debugging. (For example, config strings in HII routing,
|
||||
logged by the platform driver "OvmfPkg/PlatformDxe" on DEBUG_VERBOSE
|
||||
level, can be several hundred characters long.) 512 is an empirically good
|
||||
value.
|
||||
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
---
|
||||
OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
||||
index 44850a9..b6927d0 100644
|
||||
index 36cde54..c0c4eae 100644
|
||||
--- a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
||||
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
||||
@@ -27,7 +27,7 @@
|
||||
@ -19,4 +27,7 @@ index 44850a9..b6927d0 100644
|
||||
+#define MAX_DEBUG_MESSAGE_LENGTH 0x200
|
||||
|
||||
/**
|
||||
This constructor function does not have to do anything.
|
||||
Prints a debug message to the debug output device if the specified error level is enabled.
|
||||
--
|
||||
2.17.0
|
||||
|
||||
|
@ -1,45 +0,0 @@
|
||||
From e4133f594621fa9e8936348f4d0aa4bbd2976d2f Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Sun, 8 Jul 2012 11:55:50 +0200
|
||||
Subject: BuildEnv: override "set -C" (noclobber) of sourcing env
|
||||
|
||||
The BuildEnv utility is sourced (executed by the user's interactive shell)
|
||||
when the user sets up the build session. Some users like to set -C
|
||||
(noclobber) for some additional safety in their shells, which trips up
|
||||
BuildEnv. Update the redirection operator so that it overrides noclobber.
|
||||
|
||||
Notes about the c9e5618 -> b9ffeab rebase:
|
||||
|
||||
- Adapted to new BaseTools feature (= out of tree modules).
|
||||
|
||||
Notes about the 20160608b-988715a -> 20170228-c325e41585e3 rebase:
|
||||
|
||||
- no changes
|
||||
|
||||
Notes about the 20170228-c325e41585e3 -> 20171011-92d07e48907f rebase:
|
||||
|
||||
- no changes
|
||||
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
(cherry picked from commit 7df892b6f1c0dead5b177b3866e127b684cdc001)
|
||||
(cherry picked from commit 06d17db0523920d95fb18b3629f523dcd63d9499)
|
||||
---
|
||||
BaseTools/BuildEnv | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv
|
||||
index f748811..ff0c511 100755
|
||||
--- a/BaseTools/BuildEnv
|
||||
+++ b/BaseTools/BuildEnv
|
||||
@@ -90,7 +90,7 @@ StoreCurrentConfiguration() {
|
||||
#
|
||||
OUTPUT_FILE=$CONF_PATH/BuildEnv.sh
|
||||
#echo Storing current configuration into $OUTPUT_FILE
|
||||
- echo "# Auto-generated by ${BASH_SOURCE[0]}" > $OUTPUT_FILE
|
||||
+ echo "# Auto-generated by ${BASH_SOURCE[0]}" >| $OUTPUT_FILE
|
||||
GenerateShellCodeToSetVariable WORKSPACE $OUTPUT_FILE
|
||||
GenerateShellCodeToSetVariable EDK_TOOLS_PATH $OUTPUT_FILE
|
||||
GenerateShellCodeToUpdatePath $OUTPUT_FILE
|
||||
--
|
||||
1.8.3.1
|
||||
|
@ -1,7 +1,8 @@
|
||||
From eee4229af92be4c5545590118b7b0fcfaf5982cc Mon Sep 17 00:00:00 2001
|
||||
From 38c6368813e06e9e52a9c8e0dbd3713a6dec4d23 Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Wed, 11 Jun 2014 23:33:33 +0200
|
||||
Subject: [PATCH] advertise OpenSSL on TianoCore splash screen / boot logo
|
||||
Subject: [PATCH 05/16] advertise OpenSSL on TianoCore splash screen / boot
|
||||
logo
|
||||
|
||||
Because we may include the OpenSSL library in our OVMF and AAVMF builds
|
||||
now, we should advertise it as required by its license. This patch takes
|
||||
@ -89,11 +90,12 @@ Notes about the 20170228-c325e41585e3 -> 20171011-92d07e48907f rebase:
|
||||
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
(cherry picked from commit 32192c62e289f261f5ce74acee48e5a94561f10b)
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
---
|
||||
ArmVirtPkg/ArmVirtQemu.dsc | 4 +
|
||||
ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 4 +
|
||||
ArmVirtPkg/ArmVirtQemuKernel.dsc | 4 +
|
||||
MdeModulePkg/Logo/Logo-OpenSSL.bmp.b64 | 2743 ++++++++++++++++++++++++++++++++
|
||||
MdeModulePkg/Logo/Logo-OpenSSL.bmp.b64 | 2743 ++++++++++++++++++++++++
|
||||
MdeModulePkg/Logo/Logo-OpenSSL.idf | 18 +
|
||||
MdeModulePkg/Logo/LogoOpenSSLDxe.inf | 61 +
|
||||
MdeModulePkg/Logo/LogoOpenSSLDxe.uni | 22 +
|
||||
@ -110,10 +112,10 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
create mode 100644 MdeModulePkg/Logo/LogoOpenSSLDxe.uni
|
||||
|
||||
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
|
||||
index 8a60b61..045333d 100644
|
||||
index d74feb7..7331597 100644
|
||||
--- a/ArmVirtPkg/ArmVirtQemu.dsc
|
||||
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
|
||||
@@ -325,7 +325,11 @@
|
||||
@@ -329,7 +329,11 @@
|
||||
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
|
||||
MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf
|
||||
MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
|
||||
@ -126,10 +128,10 @@ index 8a60b61..045333d 100644
|
||||
<LibraryClasses>
|
||||
NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
|
||||
diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
|
||||
index 744006d..8fc2cbc 100644
|
||||
index 89f95b2..8941b7f 100644
|
||||
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
|
||||
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
|
||||
@@ -190,7 +190,11 @@ READ_LOCK_STATUS = TRUE
|
||||
@@ -191,7 +191,11 @@ READ_LOCK_STATUS = TRUE
|
||||
#
|
||||
# TianoCore logo (splash screen)
|
||||
#
|
||||
@ -142,10 +144,10 @@ index 744006d..8fc2cbc 100644
|
||||
#
|
||||
# Ramdisk support
|
||||
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
||||
index 9a31ec9..a221641 100644
|
||||
index 1e823ae..1981aae 100644
|
||||
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
||||
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
||||
@@ -316,7 +316,11 @@
|
||||
@@ -318,7 +318,11 @@
|
||||
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
|
||||
MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf
|
||||
MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
|
||||
@ -3026,10 +3028,10 @@ index 0000000..7227ac3
|
||||
+#string STR_MODULE_DESCRIPTION #language en-US "This module provides the logo bitmap picture (with OpenSSL advertisment) shown on setup screen, through EDKII Platform Logo protocol."
|
||||
+
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
index 92e943d..8af11ff 100644
|
||||
index 054839f..889735a 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
@@ -644,7 +644,11 @@
|
||||
@@ -689,7 +689,11 @@
|
||||
NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf
|
||||
!endif
|
||||
}
|
||||
@ -3042,10 +3044,10 @@ index 92e943d..8af11ff 100644
|
||||
<LibraryClasses>
|
||||
NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
|
||||
index 7515224..a967904 100644
|
||||
index 0427ded..f552bc9 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
||||
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
||||
@@ -290,7 +290,11 @@ INF ShellPkg/Application/Shell/Shell.inf
|
||||
@@ -295,7 +295,11 @@ INF ShellPkg/Application/Shell/Shell.inf
|
||||
INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
|
||||
!endif
|
||||
|
||||
@ -3058,10 +3060,10 @@ index 7515224..a967904 100644
|
||||
#
|
||||
# Network modules
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
index 7f9220c..9e09a50 100644
|
||||
index d033fcf..af2cdf1 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
@@ -653,7 +653,11 @@
|
||||
@@ -698,7 +698,11 @@
|
||||
NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf
|
||||
!endif
|
||||
}
|
||||
@ -3074,10 +3076,10 @@ index 7f9220c..9e09a50 100644
|
||||
<LibraryClasses>
|
||||
NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
|
||||
index f1a2044..f5a1d86 100644
|
||||
index 6df47f4..ee77ae1 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
||||
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
||||
@@ -291,7 +291,11 @@ INF ShellPkg/Application/Shell/Shell.inf
|
||||
@@ -296,7 +296,11 @@ INF ShellPkg/Application/Shell/Shell.inf
|
||||
INF RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf
|
||||
!endif
|
||||
|
||||
@ -3090,10 +3092,10 @@ index f1a2044..f5a1d86 100644
|
||||
#
|
||||
# Network modules
|
||||
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
||||
index 36c60fc..a31dbf1 100644
|
||||
index de335a1..3572e42 100644
|
||||
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||||
@@ -651,7 +651,11 @@
|
||||
@@ -696,7 +696,11 @@
|
||||
NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf
|
||||
!endif
|
||||
}
|
||||
@ -3106,10 +3108,10 @@ index 36c60fc..a31dbf1 100644
|
||||
<LibraryClasses>
|
||||
NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
|
||||
index 32000a3..0bba313 100644
|
||||
index 2e2a174..505d25d 100644
|
||||
--- a/OvmfPkg/OvmfPkgX64.fdf
|
||||
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
||||
@@ -291,7 +291,11 @@ INF ShellPkg/Application/Shell/Shell.inf
|
||||
@@ -296,7 +296,11 @@ INF ShellPkg/Application/Shell/Shell.inf
|
||||
INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
|
||||
!endif
|
||||
|
||||
@ -3122,5 +3124,5 @@ index 32000a3..0bba313 100644
|
||||
#
|
||||
# Network modules
|
||||
--
|
||||
2.14.3
|
||||
2.17.0
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 9a8a034ebc082f86fdbb54dc1303a5059508e14c Mon Sep 17 00:00:00 2001
|
||||
From 3a78f0402caa01f9d33d5b0c22c5dbaff2f42b31 Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Thu, 12 Jun 2014 00:17:59 +0200
|
||||
Subject: OvmfPkg: QemuVideoDxe: enable debug messages in VbeShim
|
||||
Subject: [PATCH 06/16] OvmfPkg: QemuVideoDxe: enable debug messages in VbeShim
|
||||
|
||||
The Int10h VBE Shim is capable of emitting short debug messages when the
|
||||
win2k8r2 UEFI guest uses (emulates) the Video BIOS. In upstream the quiet
|
||||
@ -22,9 +22,10 @@ Notes about the 20170228-c325e41585e3 -> 20171011-92d07e48907f rebase:
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
(cherry picked from commit ccda46526bb2e573d9b54f0db75d27e442b4566f)
|
||||
(cherry picked from commit ed45b26dbeadd63dd8f2edf627290957d8bbb3b2)
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
---
|
||||
OvmfPkg/QemuVideoDxe/VbeShim.asm | 2 +-
|
||||
OvmfPkg/QemuVideoDxe/VbeShim.h | 481 +++++++++++++++++++++++++--------------
|
||||
OvmfPkg/QemuVideoDxe/VbeShim.h | 481 ++++++++++++++++++++-----------
|
||||
2 files changed, 308 insertions(+), 175 deletions(-)
|
||||
|
||||
diff --git a/OvmfPkg/QemuVideoDxe/VbeShim.asm b/OvmfPkg/QemuVideoDxe/VbeShim.asm
|
||||
@ -538,5 +539,5 @@ index cc9b6e1..325d647 100644
|
||||
};
|
||||
#endif
|
||||
--
|
||||
1.8.3.1
|
||||
2.17.0
|
||||
|
@ -1,7 +1,7 @@
|
||||
From d2066c1748f885043026c51dec1bc8d6d406ae8f Mon Sep 17 00:00:00 2001
|
||||
From f14bf6eae4a923d944194c78f71d4c71c38842e6 Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Tue, 25 Feb 2014 18:40:35 +0100
|
||||
Subject: MdeModulePkg: TerminalDxe: add other text resolutions
|
||||
Subject: [PATCH 07/16] MdeModulePkg: TerminalDxe: add other text resolutions
|
||||
|
||||
When the console output is multiplexed to several devices by
|
||||
ConSplitterDxe, then ConSplitterDxe builds an intersection of text modes
|
||||
@ -70,12 +70,13 @@ Notes about the 20170228-c325e41585e3 -> 20171011-92d07e48907f rebase:
|
||||
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
(cherry picked from commit 99dc3720ac86059f60156197328cc433603c536e)
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
---
|
||||
.../Universal/Console/TerminalDxe/Terminal.c | 41 ++++++++++++++++++++--
|
||||
.../Universal/Console/TerminalDxe/Terminal.c | 41 +++++++++++++++++--
|
||||
1 file changed, 38 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
|
||||
index 60de2d4..c90879b 100644
|
||||
index 66dd3ad..78a1983 100644
|
||||
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
|
||||
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
|
||||
@@ -113,9 +113,44 @@ TERMINAL_DEV mTerminalDevTemplate = {
|
||||
@ -127,5 +128,5 @@ index 60de2d4..c90879b 100644
|
||||
// New modes can be added here.
|
||||
//
|
||||
--
|
||||
1.8.3.1
|
||||
2.17.0
|
||||
|
@ -1,43 +0,0 @@
|
||||
From 58e1d1ebb78bfdaf05f4c6e8abf8d4908dfa038a Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Thu, 20 Feb 2014 22:54:45 +0100
|
||||
Subject: OvmfPkg: increase max debug message length to 512
|
||||
|
||||
Upstream prefers short debug messages (sometimes even limited to 80
|
||||
characters), but any line length under 512 characters is just unsuitable
|
||||
for effective debugging. (For example, config strings in HII routing,
|
||||
logged by the platform driver "OvmfPkg/PlatformDxe" on DEBUG_VERBOSE
|
||||
level, can be several hundred characters long.) 512 is an empirically good
|
||||
value.
|
||||
|
||||
Notes about the 20160608b-988715a -> 20170228-c325e41585e3 rebase:
|
||||
|
||||
- no changes
|
||||
|
||||
Notes about the 20170228-c325e41585e3 -> 20171011-92d07e48907f rebase:
|
||||
|
||||
- no changes
|
||||
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
(cherry picked from commit bfe568d18dba15602604f155982e3b73add63dfb)
|
||||
(cherry picked from commit 29435a32ec9428720c74c454ce9817662e601fb6)
|
||||
---
|
||||
OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
||||
index 5435767..01016c3 100644
|
||||
--- a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
||||
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
||||
@@ -27,7 +27,7 @@
|
||||
//
|
||||
// Define the maximum debug and assert message length that this library supports
|
||||
//
|
||||
-#define MAX_DEBUG_MESSAGE_LENGTH 0x100
|
||||
+#define MAX_DEBUG_MESSAGE_LENGTH 0x200
|
||||
|
||||
/**
|
||||
This constructor function does not have to do anything.
|
||||
--
|
||||
1.8.3.1
|
||||
|
@ -1,8 +1,8 @@
|
||||
From b9c5c901f25e48d68eef6e78a4abca00e153f574 Mon Sep 17 00:00:00 2001
|
||||
From e4342f9f5ddd4d45e0098697c38a55f9402d4e0f Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Tue, 25 Feb 2014 22:40:01 +0100
|
||||
Subject: MdeModulePkg: TerminalDxe: set xterm resolution on mode change (RH
|
||||
only)
|
||||
Subject: [PATCH 08/16] MdeModulePkg: TerminalDxe: set xterm resolution on mode
|
||||
change (RH only)
|
||||
|
||||
The
|
||||
|
||||
@ -29,17 +29,18 @@ Reference: <http://rtfm.etla.org/xterm/ctlseq.html>
|
||||
Contributed-under: TianoCore Contribution Agreement 1.0
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
(cherry picked from commit 2909e025db6878723b49644a8a0cf160d07e6444)
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
---
|
||||
MdeModulePkg/MdeModulePkg.dec | 4 +++
|
||||
.../Universal/Console/TerminalDxe/TerminalConOut.c | 30 ++++++++++++++++++++++
|
||||
.../Universal/Console/TerminalDxe/TerminalDxe.inf | 2 ++
|
||||
.../Console/TerminalDxe/TerminalConOut.c | 30 +++++++++++++++++++
|
||||
.../Console/TerminalDxe/TerminalDxe.inf | 2 ++
|
||||
3 files changed, 36 insertions(+)
|
||||
|
||||
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
|
||||
index a3c0633..cd0264e 100644
|
||||
index cc39718..384d901 100644
|
||||
--- a/MdeModulePkg/MdeModulePkg.dec
|
||||
+++ b/MdeModulePkg/MdeModulePkg.dec
|
||||
@@ -1758,6 +1758,10 @@
|
||||
@@ -1914,6 +1914,10 @@
|
||||
# @Prompt The address mask when memory encryption is enabled.
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask|0x0|UINT64|0x30001047
|
||||
|
||||
@ -51,7 +52,7 @@ index a3c0633..cd0264e 100644
|
||||
## Specify memory size with page number for PEI code when
|
||||
# Loading Module at Fixed Address feature is enabled.
|
||||
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
|
||||
index e677a76..e2bdc31 100644
|
||||
index 5a83431..fbc1e0a 100644
|
||||
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
|
||||
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
|
||||
@@ -13,6 +13,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
@ -63,10 +64,11 @@ index e677a76..e2bdc31 100644
|
||||
#include "Terminal.h"
|
||||
|
||||
//
|
||||
@@ -87,6 +89,16 @@ CHAR16 mCursorForwardString[] = { ESC, '[', '0', '0', 'C', 0 };
|
||||
@@ -86,6 +88,16 @@ CHAR16 mSetCursorPositionString[] = { ESC, '[', '0', '0', ';', '0', '0', 'H', 0
|
||||
CHAR16 mCursorForwardString[] = { ESC, '[', '0', '0', 'C', 0 };
|
||||
CHAR16 mCursorBackwardString[] = { ESC, '[', '0', '0', 'D', 0 };
|
||||
|
||||
//
|
||||
+//
|
||||
+// Note that this is an ASCII format string, taking two INT32 arguments:
|
||||
+// rows, columns.
|
||||
+//
|
||||
@ -76,10 +78,9 @@ index e677a76..e2bdc31 100644
|
||||
+#define RESIZE_SEQ_SIZE (sizeof mResizeTextAreaFormatString + 2 * (11 - 2))
|
||||
+
|
||||
+
|
||||
+//
|
||||
//
|
||||
// Body of the ConOut functions
|
||||
//
|
||||
|
||||
@@ -508,6 +520,24 @@ TerminalConOutSetMode (
|
||||
return EFI_DEVICE_ERROR;
|
||||
}
|
||||
@ -126,5 +127,5 @@ index 0780296..bd2ba82 100644
|
||||
# [Event]
|
||||
# # Relative timer event set by UnicodeToEfiKey(), used to be one 2 seconds input timeout.
|
||||
--
|
||||
1.8.3.1
|
||||
2.17.0
|
||||
|
@ -1,7 +1,8 @@
|
||||
From b311932d3841c017a0f0fec553edcac365cc2038 Mon Sep 17 00:00:00 2001
|
||||
From 7ea5e9e4f9c358fe9cc10e57e34bb5ada33f1176 Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Wed, 14 Oct 2015 15:59:06 +0200
|
||||
Subject: OvmfPkg: take PcdResizeXterm from the QEMU command line (RH only)
|
||||
Subject: [PATCH 09/16] OvmfPkg: take PcdResizeXterm from the QEMU command line
|
||||
(RH only)
|
||||
|
||||
Notes about the 20160608b-988715a -> 20170228-c325e41585e3 rebase:
|
||||
|
||||
@ -18,6 +19,7 @@ Contributed-under: TianoCore Contribution Agreement 1.0
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
(cherry picked from commit 6fa0c4d67c0bb8bde2ddd6db41c19eb0c40b2721)
|
||||
(cherry picked from commit 8abc2a6ddad25af7e88dc0cf57d55dfb75fbf92d)
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
---
|
||||
OvmfPkg/OvmfPkgIa32.dsc | 1 +
|
||||
OvmfPkg/OvmfPkgIa32X64.dsc | 1 +
|
||||
@ -27,10 +29,10 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
5 files changed, 5 insertions(+)
|
||||
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
index 8af11ff..61e606a 100644
|
||||
index 889735a..571118d 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
@@ -504,6 +504,7 @@
|
||||
@@ -530,6 +530,7 @@
|
||||
# ($(SMM_REQUIRE) == FALSE)
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
||||
|
||||
@ -39,10 +41,10 @@ index 8af11ff..61e606a 100644
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
index 9e09a50..bfe3baf 100644
|
||||
index af2cdf1..c0b5271 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
@@ -510,6 +510,7 @@
|
||||
@@ -536,6 +536,7 @@
|
||||
# ($(SMM_REQUIRE) == FALSE)
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
||||
|
||||
@ -51,10 +53,10 @@ index 9e09a50..bfe3baf 100644
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0
|
||||
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
||||
index a31dbf1..4365a7b 100644
|
||||
index 3572e42..f2bb8c8 100644
|
||||
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||||
@@ -509,6 +509,7 @@
|
||||
@@ -535,6 +535,7 @@
|
||||
# ($(SMM_REQUIRE) == FALSE)
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
||||
|
||||
@ -75,10 +77,10 @@ index 5a78668..544ac54 100644
|
||||
|
||||
AmdSevInitialize ();
|
||||
diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf
|
||||
index 16a8db7..9f89e08 100644
|
||||
index 30ceb4b..016c067 100644
|
||||
--- a/OvmfPkg/PlatformPei/PlatformPei.inf
|
||||
+++ b/OvmfPkg/PlatformPei/PlatformPei.inf
|
||||
@@ -90,6 +90,7 @@
|
||||
@@ -94,6 +94,7 @@
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration
|
||||
@ -87,5 +89,5 @@ index 16a8db7..9f89e08 100644
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack
|
||||
--
|
||||
1.8.3.1
|
||||
2.17.0
|
||||
|
@ -1,7 +1,8 @@
|
||||
From 22b073005af491eef177ef5f80ffe71c1ebabb03 Mon Sep 17 00:00:00 2001
|
||||
From fea29c5c217f61d4169f8236711431a5d0c99f05 Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Tue, 12 Apr 2016 20:50:25 +0200
|
||||
Subject: ArmVirtPkg: QemuFwCfgLib: allow UEFI_DRIVER client modules (RH only)
|
||||
Subject: [PATCH 10/16] ArmVirtPkg: QemuFwCfgLib: allow UEFI_DRIVER client
|
||||
modules (RH only)
|
||||
|
||||
Notes about the 20160608b-988715a -> 20170228-c325e41585e3 rebase:
|
||||
|
||||
@ -15,6 +16,7 @@ Contributed-under: TianoCore Contribution Agreement 1.0
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
(cherry picked from commit 8e2153358aa2bba2c91faa87a70beadcaae03fd8)
|
||||
(cherry picked from commit 5af259a93f4bbee5515ae18638068125e170f2cd)
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
---
|
||||
ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
@ -33,5 +35,5 @@ index eff4a21..adf1ff6 100644
|
||||
CONSTRUCTOR = QemuFwCfgInitialize
|
||||
|
||||
--
|
||||
1.8.3.1
|
||||
2.17.0
|
||||
|
@ -1,7 +1,8 @@
|
||||
From c9081ebe3bcd28e5cce4bf58bd8d4fca12f9af7c Mon Sep 17 00:00:00 2001
|
||||
From 3be34f5ba685c15e8537e4489589bf01ad7ea731 Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Sun, 26 Jul 2015 08:02:50 +0000
|
||||
Subject: ArmVirtPkg: take PcdResizeXterm from the QEMU command line (RH only)
|
||||
Subject: [PATCH 11/16] ArmVirtPkg: take PcdResizeXterm from the QEMU command
|
||||
line (RH only)
|
||||
|
||||
Notes about the 20160608b-988715a -> 20170228-c325e41585e3 rebase:
|
||||
|
||||
@ -20,19 +21,20 @@ Notes about the 20170228-c325e41585e3 -> 20171011-92d07e48907f rebase:
|
||||
Contributed-under: TianoCore Contribution Agreement 1.0
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
(cherry picked from commit d4564d39dfdbf74e762af43314005a2c026cb262)
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
---
|
||||
ArmVirtPkg/ArmVirtQemu.dsc | 7 +-
|
||||
.../TerminalPcdProducerLib.c | 87 ++++++++++++++++++++++
|
||||
.../TerminalPcdProducerLib.inf | 41 ++++++++++
|
||||
.../TerminalPcdProducerLib.c | 87 +++++++++++++++++++
|
||||
.../TerminalPcdProducerLib.inf | 41 +++++++++
|
||||
3 files changed, 134 insertions(+), 1 deletion(-)
|
||||
create mode 100644 ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c
|
||||
create mode 100644 ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf
|
||||
|
||||
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
|
||||
index 045333d..2b1a383 100644
|
||||
index 7331597..4bf94ce 100644
|
||||
--- a/ArmVirtPkg/ArmVirtQemu.dsc
|
||||
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
|
||||
@@ -212,6 +212,8 @@
|
||||
@@ -208,6 +208,8 @@
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0
|
||||
gUefiOvmfPkgTokenSpaceGuid.PcdQemuSmbiosValidated|FALSE
|
||||
|
||||
@ -194,5 +196,5 @@ index 0000000..fecb37b
|
||||
+[Pcd]
|
||||
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm
|
||||
--
|
||||
1.8.3.1
|
||||
2.17.0
|
||||
|
@ -1,7 +1,8 @@
|
||||
From 23df46ebbe7b09451d3a05034acd4d3a25e7177b Mon Sep 17 00:00:00 2001
|
||||
From dfca43c4da3d1ba70b9f0de4fc041df57709d259 Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Tue, 4 Nov 2014 23:02:53 +0100
|
||||
Subject: OvmfPkg: allow exclusion of the shell from the firmware image
|
||||
Subject: [PATCH 12/16] OvmfPkg: allow exclusion of the shell from the firmware
|
||||
image
|
||||
|
||||
When '-D EXCLUDE_SHELL_FROM_FD' is passed to 'build', exclude the shell
|
||||
binary from the firmware image.
|
||||
@ -47,6 +48,7 @@ Notes about the 20170228-c325e41585e3 -> 20171011-92d07e48907f rebase:
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
(cherry picked from commit 9c391def70366cabae08e6008814299c3372fafd)
|
||||
(cherry picked from commit d9dd9ee42937b2611fe37183cc9ec7f62d946933)
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
---
|
||||
OvmfPkg/OvmfPkgIa32.fdf | 2 ++
|
||||
OvmfPkg/OvmfPkgIa32X64.fdf | 2 ++
|
||||
@ -54,15 +56,16 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
3 files changed, 6 insertions(+)
|
||||
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
|
||||
index a967904..366d6bf 100644
|
||||
index f552bc9..73007dd 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
||||
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
||||
@@ -284,11 +284,13 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
||||
@@ -288,12 +288,14 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
||||
INF FatPkg/EnhancedFatDxe/Fat.inf
|
||||
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
||||
|
||||
+!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
||||
!ifndef $(USE_OLD_SHELL)
|
||||
INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
|
||||
INF ShellPkg/Application/Shell/Shell.inf
|
||||
!else
|
||||
INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
|
||||
@ -72,15 +75,16 @@ index a967904..366d6bf 100644
|
||||
!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
||||
INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
|
||||
index f5a1d86..e4ca33e 100644
|
||||
index ee77ae1..116b3c6 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
||||
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
||||
@@ -285,11 +285,13 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
||||
@@ -289,12 +289,14 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
||||
INF FatPkg/EnhancedFatDxe/Fat.inf
|
||||
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
||||
|
||||
+!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
||||
!ifndef $(USE_OLD_SHELL)
|
||||
INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
|
||||
INF ShellPkg/Application/Shell/Shell.inf
|
||||
!else
|
||||
INF RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf
|
||||
@ -90,15 +94,16 @@ index f5a1d86..e4ca33e 100644
|
||||
!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
||||
INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
|
||||
index 0bba313..3196b26 100644
|
||||
index 505d25d..84d5845 100644
|
||||
--- a/OvmfPkg/OvmfPkgX64.fdf
|
||||
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
||||
@@ -285,11 +285,13 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
||||
@@ -289,12 +289,14 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
||||
INF FatPkg/EnhancedFatDxe/Fat.inf
|
||||
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
||||
|
||||
+!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
||||
!ifndef $(USE_OLD_SHELL)
|
||||
INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
|
||||
INF ShellPkg/Application/Shell/Shell.inf
|
||||
!else
|
||||
INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
|
||||
@ -108,5 +113,5 @@ index 0bba313..3196b26 100644
|
||||
!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
||||
INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
||||
--
|
||||
1.8.3.1
|
||||
2.17.0
|
||||
|
@ -1,7 +1,8 @@
|
||||
From 92424de98ffaf1fa81e6346949b1d2b5f9a637ca Mon Sep 17 00:00:00 2001
|
||||
From 8e8701871ac4e7fe08e4bfedf1ae6d856234a3d2 Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Tue, 4 Nov 2014 23:02:55 +0100
|
||||
Subject: OvmfPkg: EnrollDefaultKeys: application for enrolling default keys
|
||||
Subject: [PATCH 13/16] OvmfPkg: EnrollDefaultKeys: application for enrolling
|
||||
default keys
|
||||
|
||||
This application is meant to be invoked by the management layer, after
|
||||
booting the UEFI shell and getting a shell prompt on the serial console.
|
||||
@ -190,9 +191,10 @@ Notes about the 20170228-c325e41585e3 -> 20171011-92d07e48907f rebase:
|
||||
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
(cherry picked from commit c0b2615a9c0b4a4be1bffe45681a32915449279d)
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
---
|
||||
OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c | 1015 +++++++++++++++++++++++
|
||||
OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf | 52 ++
|
||||
OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c | 1015 +++++++++++++++++
|
||||
.../EnrollDefaultKeys/EnrollDefaultKeys.inf | 52 +
|
||||
OvmfPkg/OvmfPkgIa32.dsc | 4 +
|
||||
OvmfPkg/OvmfPkgIa32X64.dsc | 4 +
|
||||
OvmfPkg/OvmfPkgX64.dsc | 4 +
|
||||
@ -1280,10 +1282,10 @@ index 0000000..0ad86a2
|
||||
+ UefiLib
|
||||
+ UefiRuntimeServicesTableLib
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
index 61e606a..b0ad6e9 100644
|
||||
index 571118d..b8dac8b 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
@@ -821,6 +821,10 @@
|
||||
@@ -870,6 +870,10 @@
|
||||
|
||||
!if $(SECURE_BOOT_ENABLE) == TRUE
|
||||
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
|
||||
@ -1295,10 +1297,10 @@ index 61e606a..b0ad6e9 100644
|
||||
|
||||
OvmfPkg/PlatformDxe/Platform.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
index bfe3baf..bf749d7 100644
|
||||
index c0b5271..a536f8f 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
@@ -830,6 +830,10 @@
|
||||
@@ -879,6 +879,10 @@
|
||||
|
||||
!if $(SECURE_BOOT_ENABLE) == TRUE
|
||||
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
|
||||
@ -1310,10 +1312,10 @@ index bfe3baf..bf749d7 100644
|
||||
|
||||
OvmfPkg/PlatformDxe/Platform.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
||||
index 4365a7b..b677d15 100644
|
||||
index f2bb8c8..04bf911 100644
|
||||
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||||
@@ -828,6 +828,10 @@
|
||||
@@ -877,6 +877,10 @@
|
||||
|
||||
!if $(SECURE_BOOT_ENABLE) == TRUE
|
||||
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
|
||||
@ -1325,5 +1327,5 @@ index 4365a7b..b677d15 100644
|
||||
|
||||
OvmfPkg/PlatformDxe/Platform.inf
|
||||
--
|
||||
1.8.3.1
|
||||
2.17.0
|
||||
|
@ -1,7 +1,8 @@
|
||||
From 6734b88cf7abcaf42632e3d2fc469b2169dd2f16 Mon Sep 17 00:00:00 2001
|
||||
From d23f5e305ee7de36681dbce71826acf8a1b04d84 Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Wed, 14 Oct 2015 13:49:43 +0200
|
||||
Subject: ArmPlatformPkg: introduce fixed PCD for early hello message (RH only)
|
||||
Subject: [PATCH 14/16] ArmPlatformPkg: introduce fixed PCD for early hello
|
||||
message (RH only)
|
||||
|
||||
Drew has proposed that ARM|AARCH64 platform firmware (especially virtual
|
||||
machine firmware) print a reasonably early, simple hello message to the
|
||||
@ -29,17 +30,18 @@ Contributed-under: TianoCore Contribution Agreement 1.0
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
(cherry picked from commit 7ce97b06421434c82095f01a1753a8c9c546cc30)
|
||||
(cherry picked from commit 20b1f1cbd0590aa71c6d99d35e23cf08e0707750)
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
---
|
||||
ArmPlatformPkg/ArmPlatformPkg.dec | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/ArmPlatformPkg/ArmPlatformPkg.dec b/ArmPlatformPkg/ArmPlatformPkg.dec
|
||||
index 2d82ead..2380609 100644
|
||||
index dff4598..3c5c6c7 100644
|
||||
--- a/ArmPlatformPkg/ArmPlatformPkg.dec
|
||||
+++ b/ArmPlatformPkg/ArmPlatformPkg.dec
|
||||
@@ -126,6 +126,13 @@
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L""|VOID*|0x0000001B
|
||||
gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L""|VOID*|0x0000001C
|
||||
@@ -112,6 +112,13 @@
|
||||
## If set, this will swap settings for HDLCD RED_SELECT and BLUE_SELECT registers
|
||||
gArmPlatformTokenSpaceGuid.PcdArmHdLcdSwapBlueRedSelect|FALSE|BOOLEAN|0x00000045
|
||||
|
||||
+ #
|
||||
+ # Early hello message (ASCII string), printed to the serial port.
|
||||
@ -52,5 +54,5 @@ index 2d82ead..2380609 100644
|
||||
## PL031 RealTimeClock
|
||||
gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0|UINT32|0x00000024
|
||||
--
|
||||
1.8.3.1
|
||||
2.17.0
|
||||
|
@ -1,8 +1,8 @@
|
||||
From 93d69eb9393cf05af90676253875c59c1bec67fd Mon Sep 17 00:00:00 2001
|
||||
From 9952e73e166f2cdd9df473b8ac51565204a0d89e Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Wed, 14 Oct 2015 13:59:20 +0200
|
||||
Subject: ArmPlatformPkg: PrePeiCore: write early hello message to the serial
|
||||
port (RH)
|
||||
Subject: [PATCH 15/16] ArmPlatformPkg: PrePeiCore: write early hello message
|
||||
to the serial port (RH)
|
||||
|
||||
The FixedPcdGetSize() macro expands to an integer constant, therefore an
|
||||
optimizing compiler can eliminate the new code, if the platform DSC
|
||||
@ -25,6 +25,7 @@ Contributed-under: TianoCore Contribution Agreement 1.0
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
(cherry picked from commit b16c4c505ce0e27305235533eac9236aa66f132e)
|
||||
(cherry picked from commit 742e5bf6d5ce5a1e73879d6e5c0dd00feda7a9ac)
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
---
|
||||
ArmPlatformPkg/PrePeiCore/MainMPCore.c | 5 +++++
|
||||
ArmPlatformPkg/PrePeiCore/MainUniCore.c | 5 +++++
|
||||
@ -78,7 +79,7 @@ index 1608946..bf843d7 100644
|
||||
#include <PiPei.h>
|
||||
#include <Ppi/TemporaryRamSupport.h>
|
||||
diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
|
||||
index ecdbccb..dd3447c 100644
|
||||
index e3a31fa..1bc0c45 100644
|
||||
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
|
||||
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
|
||||
@@ -72,6 +72,8 @@
|
||||
@ -91,15 +92,15 @@ index ecdbccb..dd3447c 100644
|
||||
gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase
|
||||
gArmTokenSpaceGuid.PcdGicSgiIntId
|
||||
diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
|
||||
index b5d4e38..fdbdc82 100644
|
||||
index ec83cec..20698fc 100644
|
||||
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
|
||||
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
|
||||
@@ -69,3 +69,5 @@
|
||||
gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase
|
||||
gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize
|
||||
@@ -71,3 +71,5 @@
|
||||
gArmPlatformTokenSpaceGuid.PcdCPUCoreSecondaryStackSize
|
||||
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdInitValueInTempStack
|
||||
+
|
||||
+ gArmPlatformTokenSpaceGuid.PcdEarlyHelloMessage
|
||||
--
|
||||
1.8.3.1
|
||||
2.17.0
|
||||
|
@ -1,7 +1,7 @@
|
||||
From ce3f59d0710c24c162d5222bbf5cd7e36180c80c Mon Sep 17 00:00:00 2001
|
||||
From 87e209ac5896384f3d1206fc20e149d8034c08b1 Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Wed, 14 Oct 2015 14:07:17 +0200
|
||||
Subject: ArmVirtPkg: set early hello message (RH only)
|
||||
Subject: [PATCH 16/16] ArmVirtPkg: set early hello message (RH only)
|
||||
|
||||
Print a friendly banner on QEMU, regardless of debug mask settings.
|
||||
|
||||
@ -21,15 +21,16 @@ Contributed-under: TianoCore Contribution Agreement 1.0
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
(cherry picked from commit 5d4a15b9019728b2d96322bc679099da49916925)
|
||||
(cherry picked from commit 179df76dbb0d199bd905236e98775b4059c6502a)
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
---
|
||||
ArmVirtPkg/ArmVirtQemu.dsc | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
|
||||
index 2b1a383..ef6eaf1 100644
|
||||
index 4bf94ce..035b729 100644
|
||||
--- a/ArmVirtPkg/ArmVirtQemu.dsc
|
||||
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
|
||||
@@ -93,6 +93,7 @@
|
||||
@@ -89,6 +89,7 @@
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE
|
||||
|
||||
[PcdsFixedAtBuild.common]
|
||||
@ -38,5 +39,5 @@ index 2b1a383..ef6eaf1 100644
|
||||
!if $(ARCH) == AARCH64
|
||||
gArmTokenSpaceGuid.PcdVFPEnabled|1
|
||||
--
|
||||
1.8.3.1
|
||||
2.17.0
|
||||
|
@ -1,73 +0,0 @@
|
||||
From: Ruiyu Ni <ruiyu.ni@intel.com>
|
||||
Subject: [PATCH] MdeModulePkg/PciBus: Fix bug that PCI BUS claims too much resource
|
||||
Date: Thu, 16 Nov 2017 18:15:14 +0100
|
||||
|
||||
The bug was caused by 728d74973c9262b6c7b7ef4be213223d55affec3
|
||||
"MdeModulePkg/PciBus: Count multiple hotplug resource paddings".
|
||||
|
||||
The patch firstly updated the Bridge->Alignment to the maximum
|
||||
alignment of all devices under the bridge, then aligned the
|
||||
Bridge->Length to Bridge->Alignment.
|
||||
It caused too much resources were claimed.
|
||||
|
||||
The new patch firstly aligns Bridge->Length to Bridge->Alignment,
|
||||
then updates the Bridge->Alignment to the maximum alignment of all
|
||||
devices under the bridge.
|
||||
Because the step to update the Bridge->Alignment is to make sure
|
||||
the resource allocated to the bus under the Bridge meets all
|
||||
devices alignment. But the Bridge->Length doesn't have to align
|
||||
to the maximum alignment.
|
||||
|
||||
Contributed-under: TianoCore Contribution Agreement 1.1
|
||||
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
|
||||
Reviewed-by: Eric Dong <eric.dong@intel.com>
|
||||
(cherry picked from commit 6e3287442774c1a4bc83f127694700eeb07c18dc)
|
||||
---
|
||||
MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c | 24 ++++++++++----------
|
||||
1 file changed, 12 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
|
||||
index 8dbe9a00380f..2f713fcee95e 100644
|
||||
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
|
||||
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
|
||||
@@ -389,18 +389,7 @@ CalculateResourceAperture (
|
||||
}
|
||||
|
||||
//
|
||||
- // Adjust the bridge's alignment to the MAX (first) alignment of all children.
|
||||
- //
|
||||
- CurrentLink = Bridge->ChildList.ForwardLink;
|
||||
- if (CurrentLink != &Bridge->ChildList) {
|
||||
- Node = RESOURCE_NODE_FROM_LINK (CurrentLink);
|
||||
- if (Node->Alignment > Bridge->Alignment) {
|
||||
- Bridge->Alignment = Node->Alignment;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- //
|
||||
- // At last, adjust the aperture with the bridge's alignment
|
||||
+ // Adjust the aperture with the bridge's alignment
|
||||
//
|
||||
Aperture[PciResUsageTypical] = ALIGN_VALUE (Aperture[PciResUsageTypical], Bridge->Alignment + 1);
|
||||
Aperture[PciResUsagePadding] = ALIGN_VALUE (Aperture[PciResUsagePadding], Bridge->Alignment + 1);
|
||||
@@ -410,6 +399,17 @@ CalculateResourceAperture (
|
||||
// Use the larger one between the padding resource and actual occupied resource.
|
||||
//
|
||||
Bridge->Length = MAX (Aperture[PciResUsageTypical], Aperture[PciResUsagePadding]);
|
||||
+
|
||||
+ //
|
||||
+ // Adjust the bridge's alignment to the MAX (first) alignment of all children.
|
||||
+ //
|
||||
+ CurrentLink = Bridge->ChildList.ForwardLink;
|
||||
+ if (CurrentLink != &Bridge->ChildList) {
|
||||
+ Node = RESOURCE_NODE_FROM_LINK (CurrentLink);
|
||||
+ if (Node->Alignment > Bridge->Alignment) {
|
||||
+ Bridge->Alignment = Node->Alignment;
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
|
||||
/**
|
||||
--
|
||||
2.14.1.3.gb7cf6e02401b
|
||||
|
@ -1,34 +0,0 @@
|
||||
From: Ruiyu Ni <ruiyu.ni@intel.com>
|
||||
Subject: [PATCH] MdeModulePkg/Bds: Remove assertion in BmCharToUint
|
||||
Date: Thu, 16 Nov 2017 18:04:42 +0100
|
||||
|
||||
BmCharToUint() could be called using external data and it
|
||||
already contains logic to return -1 when data is invalid,
|
||||
so removing unnecessary assertion to avoid system hang.
|
||||
|
||||
Contributed-under: TianoCore Contribution Agreement 1.1
|
||||
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
|
||||
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
|
||||
Reviewed-by: Star Zeng <star.zeng@intel.com>
|
||||
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
(cherry picked from commit 618ef6f9bae14e1543d61993ab7ab8992063e4cc)
|
||||
---
|
||||
MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c b/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c
|
||||
index 11ab86792a52..a3fa25424592 100644
|
||||
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c
|
||||
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c
|
||||
@@ -420,7 +420,6 @@ BmCharToUint (
|
||||
return (Char - L'A' + 0xA);
|
||||
}
|
||||
|
||||
- ASSERT (FALSE);
|
||||
return (UINTN) -1;
|
||||
}
|
||||
|
||||
--
|
||||
2.14.1.3.gb7cf6e02401b
|
||||
|
||||
|
@ -1,105 +0,0 @@
|
||||
From: Ruiyu Ni <ruiyu.ni@intel.com>
|
||||
Subject: [PATCH] MdeModulePkg/Bds: Check variable name even *if* OptionNumber is NULL
|
||||
Date: Thu, 16 Nov 2017 18:04:43 +0100
|
||||
|
||||
Current implementation skips to check whether the last four
|
||||
characters are digits when the OptionNumber is NULL.
|
||||
Even worse, it may incorrectly return FALSE when OptionNumber is
|
||||
NULL.
|
||||
|
||||
The patch fixes it to always check the variable name even
|
||||
OptionNumber is NULL.
|
||||
|
||||
Contributed-under: TianoCore Contribution Agreement 1.1
|
||||
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
|
||||
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
|
||||
(cherry picked from commit 5e6e2dcc380dcd841f6f979fea8c302c80a87ec3)
|
||||
---
|
||||
MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c | 45 +++++++++++++-------
|
||||
1 file changed, 30 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c b/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c
|
||||
index b0a35058d02b..32918caf324c 100644
|
||||
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c
|
||||
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c
|
||||
@@ -785,6 +785,8 @@ EfiBootManagerIsValidLoadOptionVariableName (
|
||||
UINTN VariableNameLen;
|
||||
UINTN Index;
|
||||
UINTN Uint;
|
||||
+ EFI_BOOT_MANAGER_LOAD_OPTION_TYPE LocalOptionType;
|
||||
+ UINT16 LocalOptionNumber;
|
||||
|
||||
if (VariableName == NULL) {
|
||||
return FALSE;
|
||||
@@ -792,39 +794,52 @@ EfiBootManagerIsValidLoadOptionVariableName (
|
||||
|
||||
VariableNameLen = StrLen (VariableName);
|
||||
|
||||
+ //
|
||||
+ // Return FALSE when the variable name length is too small.
|
||||
+ //
|
||||
if (VariableNameLen <= 4) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
- for (Index = 0; Index < ARRAY_SIZE (mBmLoadOptionName); Index++) {
|
||||
- if ((VariableNameLen - 4 == StrLen (mBmLoadOptionName[Index])) &&
|
||||
- (StrnCmp (VariableName, mBmLoadOptionName[Index], VariableNameLen - 4) == 0)
|
||||
+ //
|
||||
+ // Return FALSE when the variable name doesn't start with Driver/SysPrep/Boot/PlatformRecovery.
|
||||
+ //
|
||||
+ for (LocalOptionType = 0; LocalOptionType < ARRAY_SIZE (mBmLoadOptionName); LocalOptionType++) {
|
||||
+ if ((VariableNameLen - 4 == StrLen (mBmLoadOptionName[LocalOptionType])) &&
|
||||
+ (StrnCmp (VariableName, mBmLoadOptionName[LocalOptionType], VariableNameLen - 4) == 0)
|
||||
) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
+ if (LocalOptionType == ARRAY_SIZE (mBmLoadOptionName)) {
|
||||
+ return FALSE;
|
||||
+ }
|
||||
|
||||
- if (Index == ARRAY_SIZE (mBmLoadOptionName)) {
|
||||
+ //
|
||||
+ // Return FALSE when the last four characters are not hex digits.
|
||||
+ //
|
||||
+ LocalOptionNumber = 0;
|
||||
+ for (Index = VariableNameLen - 4; Index < VariableNameLen; Index++) {
|
||||
+ Uint = BmCharToUint (VariableName[Index]);
|
||||
+ if (Uint == -1) {
|
||||
+ break;
|
||||
+ } else {
|
||||
+ LocalOptionNumber = (UINT16) Uint + LocalOptionNumber * 0x10;
|
||||
+ }
|
||||
+ }
|
||||
+ if (Index != VariableNameLen) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (OptionType != NULL) {
|
||||
- *OptionType = (EFI_BOOT_MANAGER_LOAD_OPTION_TYPE) Index;
|
||||
+ *OptionType = LocalOptionType;
|
||||
}
|
||||
|
||||
if (OptionNumber != NULL) {
|
||||
- *OptionNumber = 0;
|
||||
- for (Index = VariableNameLen - 4; Index < VariableNameLen; Index++) {
|
||||
- Uint = BmCharToUint (VariableName[Index]);
|
||||
- if (Uint == -1) {
|
||||
- break;
|
||||
- } else {
|
||||
- *OptionNumber = (UINT16) Uint + *OptionNumber * 0x10;
|
||||
- }
|
||||
- }
|
||||
+ *OptionNumber = LocalOptionNumber;
|
||||
}
|
||||
|
||||
- return (BOOLEAN) (Index == VariableNameLen);
|
||||
+ return TRUE;
|
||||
}
|
||||
|
||||
/**
|
||||
--
|
||||
2.14.1.3.gb7cf6e02401b
|
||||
|
@ -1,50 +0,0 @@
|
||||
From d9edd0b560db7d32b8b93e82d7051d5cf58e9744 Mon Sep 17 00:00:00 2001
|
||||
From: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Date: Thu, 16 Nov 2017 20:52:57 +0100
|
||||
Subject: [PATCH 1/3] OvmfPkg: make it a proper BASE library
|
||||
|
||||
Remove Uefi.h, which includes UefiSpec.h, and change the
|
||||
return value to match RETURN_STATUS.
|
||||
|
||||
Contributed-under: TianoCore Contribution Agreement 1.1
|
||||
Cc: Laszlo Ersek <lersek@redhat.com>
|
||||
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
Cc: Jordan Justen (Intel address) <jordan.l.justen@intel.com>
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
---
|
||||
OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
||||
index 5435767c1c..74f4d9c2d6 100644
|
||||
--- a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
||||
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
||||
@@ -15,7 +15,6 @@
|
||||
**/
|
||||
|
||||
#include <Base.h>
|
||||
-#include <Uefi.h>
|
||||
#include <Library/DebugLib.h>
|
||||
#include <Library/BaseLib.h>
|
||||
#include <Library/IoLib.h>
|
||||
@@ -32,7 +31,7 @@
|
||||
/**
|
||||
This constructor function does not have to do anything.
|
||||
|
||||
- @retval EFI_SUCCESS The constructor always returns RETURN_SUCCESS.
|
||||
+ @retval RETURN_SUCCESS The constructor always returns RETURN_SUCCESS.
|
||||
|
||||
**/
|
||||
RETURN_STATUS
|
||||
@@ -41,7 +40,7 @@ PlatformDebugLibIoPortConstructor (
|
||||
VOID
|
||||
)
|
||||
{
|
||||
- return EFI_SUCCESS;
|
||||
+ return RETURN_SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
--
|
||||
2.14.3
|
||||
|
@ -1,254 +0,0 @@
|
||||
From ba774b89b5a206c71a2ce0db8184747fac0f6af7 Mon Sep 17 00:00:00 2001
|
||||
From: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Date: Thu, 16 Nov 2017 10:33:29 +0100
|
||||
Subject: [PATCH 2/3] OvmfPkg: create a separate PlatformDebugLibIoPort
|
||||
instance for SEC
|
||||
|
||||
The next patch will want to add a global variable to
|
||||
PlatformDebugLibIoPort, but this is not suitable for the SEC
|
||||
phase, because SEC runs from read-only flash. The solution is
|
||||
to have two library instances, one for SEC and another
|
||||
for all other firmware phases. This patch adds the "plumbing"
|
||||
for the SEC library instance, separating the INF files and
|
||||
moving the constructor to a separate C source file.
|
||||
|
||||
Contributed-under: TianoCore Contribution Agreement 1.1
|
||||
Cc: Laszlo Ersek <lersek@redhat.com>
|
||||
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
Cc: Jordan Justen (Intel address) <jordan.l.justen@intel.com>
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
---
|
||||
OvmfPkg/OvmfPkgIa32.dsc | 2 +-
|
||||
OvmfPkg/OvmfPkgIa32X64.dsc | 2 +-
|
||||
OvmfPkg/OvmfPkgX64.dsc | 2 +-
|
||||
.../PlatformDebugLibIoPort.inf | 3 +-
|
||||
.../PlatformRomDebugLibIoPort.inf | 52 ++++++++++++++++++++++
|
||||
OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c | 15 -------
|
||||
.../PlatformDebugLibIoPort/DebugLibDetect.c | 31 +++++++++++++
|
||||
.../PlatformDebugLibIoPort/DebugLibDetectRom.c | 31 +++++++++++++
|
||||
8 files changed, 119 insertions(+), 19 deletions(-)
|
||||
create mode 100644 OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
||||
create mode 100644 OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetect.c
|
||||
create mode 100644 OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetectRom.c
|
||||
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
index c2f534fdbf..7ccb61147f 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
@@ -207,7 +207,7 @@ [LibraryClasses.common.SEC]
|
||||
!ifdef $(DEBUG_ON_SERIAL_PORT)
|
||||
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
|
||||
!else
|
||||
- DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf
|
||||
+ DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
||||
!endif
|
||||
ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
|
||||
ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
index 9f300a2e6f..237ec71b5e 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
@@ -212,7 +212,7 @@ [LibraryClasses.common.SEC]
|
||||
!ifdef $(DEBUG_ON_SERIAL_PORT)
|
||||
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
|
||||
!else
|
||||
- DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf
|
||||
+ DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
||||
!endif
|
||||
ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
|
||||
ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
||||
index 1ffcf37f8b..a5047fa38e 100644
|
||||
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||||
@@ -212,7 +212,7 @@ [LibraryClasses.common.SEC]
|
||||
!ifdef $(DEBUG_ON_SERIAL_PORT)
|
||||
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
|
||||
!else
|
||||
- DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf
|
||||
+ DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
||||
!endif
|
||||
ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
|
||||
ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.inf
|
||||
diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf b/OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf
|
||||
index 0e74fe94cb..de3c2f542b 100644
|
||||
--- a/OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf
|
||||
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf
|
||||
@@ -21,7 +21,7 @@ [Defines]
|
||||
FILE_GUID = DF934DA3-CD31-49FE-AF50-B3C87C79325F
|
||||
MODULE_TYPE = BASE
|
||||
VERSION_STRING = 1.0
|
||||
- LIBRARY_CLASS = DebugLib
|
||||
+ LIBRARY_CLASS = DebugLib|PEI_CORE PEIM DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER SMM_CORE DXE_SMM_DRIVER UEFI_DRIVER UEFI_APPLICATION
|
||||
CONSTRUCTOR = PlatformDebugLibIoPortConstructor
|
||||
|
||||
#
|
||||
@@ -30,6 +30,7 @@ [Defines]
|
||||
|
||||
[Sources]
|
||||
DebugLib.c
|
||||
+ DebugLibDetect.c
|
||||
|
||||
[Packages]
|
||||
MdePkg/MdePkg.dec
|
||||
diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf b/OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
||||
new file mode 100644
|
||||
index 0000000000..491c0318de
|
||||
--- /dev/null
|
||||
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
||||
@@ -0,0 +1,52 @@
|
||||
+## @file
|
||||
+# Instance of Debug Library for the QEMU debug console port.
|
||||
+# It uses Print Library to produce formatted output strings.
|
||||
+#
|
||||
+# Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
|
||||
+# Copyright (c) 2017, Red Hat, Inc.<BR>
|
||||
+#
|
||||
+# 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 = 0x00010005
|
||||
+ BASE_NAME = PlatformRomDebugLibIoPort
|
||||
+ FILE_GUID = CEB0D9D3-328F-4C24-8C02-28FA1986AE1B
|
||||
+ MODULE_TYPE = BASE
|
||||
+ VERSION_STRING = 1.0
|
||||
+ LIBRARY_CLASS = DebugLib|SEC
|
||||
+ CONSTRUCTOR = PlatformRomDebugLibIoPortConstructor
|
||||
+
|
||||
+#
|
||||
+# VALID_ARCHITECTURES = IA32 X64 IPF EBC
|
||||
+#
|
||||
+
|
||||
+[Sources]
|
||||
+ DebugLib.c
|
||||
+ DebugLibDetectRom.c
|
||||
+
|
||||
+[Packages]
|
||||
+ MdePkg/MdePkg.dec
|
||||
+ OvmfPkg/OvmfPkg.dec
|
||||
+
|
||||
+[LibraryClasses]
|
||||
+ BaseMemoryLib
|
||||
+ IoLib
|
||||
+ PcdLib
|
||||
+ PrintLib
|
||||
+ BaseLib
|
||||
+ DebugPrintErrorLevelLib
|
||||
+
|
||||
+[Pcd]
|
||||
+ gUefiOvmfPkgTokenSpaceGuid.PcdDebugIoPort ## CONSUMES
|
||||
+ gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue ## CONSUMES
|
||||
+ gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask ## CONSUMES
|
||||
+ gEfiMdePkgTokenSpaceGuid.PcdFixedDebugPrintErrorLevel ## CONSUMES
|
||||
+
|
||||
diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
||||
index 74f4d9c2d6..5a1c86f2c3 100644
|
||||
--- a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
||||
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
||||
@@ -28,21 +28,6 @@
|
||||
//
|
||||
#define MAX_DEBUG_MESSAGE_LENGTH 0x200
|
||||
|
||||
-/**
|
||||
- This constructor function does not have to do anything.
|
||||
-
|
||||
- @retval RETURN_SUCCESS The constructor always returns RETURN_SUCCESS.
|
||||
-
|
||||
-**/
|
||||
-RETURN_STATUS
|
||||
-EFIAPI
|
||||
-PlatformDebugLibIoPortConstructor (
|
||||
- VOID
|
||||
- )
|
||||
-{
|
||||
- return RETURN_SUCCESS;
|
||||
-}
|
||||
-
|
||||
/**
|
||||
Prints a debug message to the debug output device if the specified error level is enabled.
|
||||
|
||||
diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetect.c b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetect.c
|
||||
new file mode 100644
|
||||
index 0000000000..bad054f286
|
||||
--- /dev/null
|
||||
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetect.c
|
||||
@@ -0,0 +1,31 @@
|
||||
+/** @file
|
||||
+ Constructor code for QEMU debug port library.
|
||||
+ Non-SEC instance.
|
||||
+
|
||||
+ Copyright (c) 2017, Red Hat, Inc.<BR>
|
||||
+ 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.
|
||||
+
|
||||
+**/
|
||||
+
|
||||
+#include <Base.h>
|
||||
+
|
||||
+/**
|
||||
+ This constructor function does not have anything to do.
|
||||
+
|
||||
+ @retval RETURN_SUCCESS The constructor always returns RETURN_SUCCESS.
|
||||
+
|
||||
+**/
|
||||
+RETURN_STATUS
|
||||
+EFIAPI
|
||||
+PlatformDebugLibIoPortConstructor (
|
||||
+ VOID
|
||||
+ )
|
||||
+{
|
||||
+ return RETURN_SUCCESS;
|
||||
+}
|
||||
diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetectRom.c b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetectRom.c
|
||||
new file mode 100644
|
||||
index 0000000000..83a118a0f7
|
||||
--- /dev/null
|
||||
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetectRom.c
|
||||
@@ -0,0 +1,31 @@
|
||||
+/** @file
|
||||
+ Constructor code for QEMU debug port library.
|
||||
+ SEC instance.
|
||||
+
|
||||
+ Copyright (c) 2017, Red Hat, Inc.<BR>
|
||||
+ 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.
|
||||
+
|
||||
+**/
|
||||
+
|
||||
+#include <Base.h>
|
||||
+
|
||||
+/**
|
||||
+ This constructor function does not have anything to do.
|
||||
+
|
||||
+ @retval RETURN_SUCCESS The constructor always returns RETURN_SUCCESS.
|
||||
+
|
||||
+**/
|
||||
+RETURN_STATUS
|
||||
+EFIAPI
|
||||
+PlatformRomDebugLibIoPortConstructor (
|
||||
+ VOID
|
||||
+ )
|
||||
+{
|
||||
+ return RETURN_SUCCESS;
|
||||
+}
|
||||
--
|
||||
2.14.3
|
||||
|
@ -1,270 +0,0 @@
|
||||
From b23853af6eb71e4c9b2e2d235b1db80541d33116 Mon Sep 17 00:00:00 2001
|
||||
From: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Date: Wed, 15 Nov 2017 18:01:00 +0100
|
||||
Subject: [PATCH 3/3] OvmfPkg: save on I/O port accesses when the debug port is
|
||||
not in use
|
||||
|
||||
When SEV is enabled, every debug message printed by OVMF to the
|
||||
QEMU debug port traps from the guest to QEMU character by character
|
||||
because "REP OUTSB" cannot be used by IoWriteFifo8. Furthermore,
|
||||
when OVMF is built with the DEBUG_VERBOSE bit (value 0x00400000)
|
||||
enabled in "gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel", then the
|
||||
OvmfPkg/IoMmuDxe driver, and the OvmfPkg/Library/BaseMemEncryptSevLib
|
||||
library instance that is built into it, produce a huge amount of
|
||||
log messages. Therefore, in SEV guests, the boot time impact is huge
|
||||
(about 45 seconds _additional_ time spent writing to the debug port).
|
||||
|
||||
While these messages are very useful for analyzing guest behavior,
|
||||
most of the time the user won't be capturing the OVMF debug log.
|
||||
In fact libvirt does not provide a method for configuring log capture;
|
||||
users that wish to do this (or are instructed to do this) have to resort
|
||||
to <qemu:arg>.
|
||||
|
||||
The debug console device provides a handy detection mechanism; when read,
|
||||
it returns 0xE9 (which is very much unlike the 0xFF that is returned by
|
||||
an unused port). Use it to skip the possibly expensive OUT instructions
|
||||
when the debug I/O port isn't plugged anywhere.
|
||||
|
||||
For SEC, the debug port has to be read before each full message.
|
||||
However:
|
||||
|
||||
- if the debug port is available, then reading one byte before writing
|
||||
a full message isn't tragic, especially because SEC doesn't print many
|
||||
messages
|
||||
|
||||
- if the debug port is not available, then reading one byte instead of
|
||||
writing a full message is still a win.
|
||||
|
||||
Contributed-under: TianoCore Contribution Agreement 1.0
|
||||
Cc: Laszlo Ersek <lersek@redhat.com>
|
||||
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
Cc: Jordan Justen (Intel address) <jordan.l.justen@intel.com>
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
---
|
||||
.../PlatformDebugLibIoPort/DebugLibDetect.h | 57 ++++++++++++++++++++++
|
||||
OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c | 28 +++++++++--
|
||||
.../PlatformDebugLibIoPort/DebugLibDetect.c | 30 ++++++++++--
|
||||
.../PlatformDebugLibIoPort/DebugLibDetectRom.c | 21 +++++++-
|
||||
4 files changed, 127 insertions(+), 9 deletions(-)
|
||||
create mode 100644 OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetect.h
|
||||
|
||||
diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetect.h b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetect.h
|
||||
new file mode 100644
|
||||
index 0000000000..1f739b55d8
|
||||
--- /dev/null
|
||||
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetect.h
|
||||
@@ -0,0 +1,57 @@
|
||||
+/** @file
|
||||
+ Base Debug library instance for QEMU debug port.
|
||||
+ It uses PrintLib to send debug messages to a fixed I/O port.
|
||||
+
|
||||
+ Copyright (c) 2017, Red Hat, Inc.<BR>
|
||||
+ 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.
|
||||
+
|
||||
+**/
|
||||
+
|
||||
+#ifndef __DEBUG_IO_PORT_DETECT_H__
|
||||
+#define __DEBUG_IO_PORT_DETECT_H__
|
||||
+
|
||||
+#include <Base.h>
|
||||
+
|
||||
+//
|
||||
+// The constant value that is read from the debug I/O port
|
||||
+//
|
||||
+#define BOCHS_DEBUG_PORT_MAGIC 0xE9
|
||||
+
|
||||
+
|
||||
+/**
|
||||
+ Helper function to return whether the virtual machine has a debug I/O port.
|
||||
+ PlatformDebugLibIoPortFound can call this function directly or cache the
|
||||
+ result.
|
||||
+
|
||||
+ @retval TRUE if the debug I/O port device was detected.
|
||||
+ @retval FALSE otherwise
|
||||
+
|
||||
+**/
|
||||
+BOOLEAN
|
||||
+EFIAPI
|
||||
+PlatformDebugLibIoPortDetect (
|
||||
+ VOID
|
||||
+ );
|
||||
+
|
||||
+/**
|
||||
+ Return whether the virtual machine has a debug I/O port. DebugLib.c
|
||||
+ calls this function instead of PlatformDebugLibIoPortDetect, to allow
|
||||
+ caching if possible.
|
||||
+
|
||||
+ @retval TRUE if the debug I/O port device was detected.
|
||||
+ @retval FALSE otherwise
|
||||
+
|
||||
+**/
|
||||
+BOOLEAN
|
||||
+EFIAPI
|
||||
+PlatformDebugLibIoPortFound (
|
||||
+ VOID
|
||||
+ );
|
||||
+
|
||||
+#endif
|
||||
diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
||||
index 5a1c86f2c3..36cde54976 100644
|
||||
--- a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
||||
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <Library/PcdLib.h>
|
||||
#include <Library/BaseMemoryLib.h>
|
||||
#include <Library/DebugPrintErrorLevelLib.h>
|
||||
+#include "DebugLibDetect.h"
|
||||
|
||||
//
|
||||
// Define the maximum debug and assert message length that this library supports
|
||||
@@ -61,9 +62,10 @@ DebugPrint (
|
||||
ASSERT (Format != NULL);
|
||||
|
||||
//
|
||||
- // Check driver debug mask value and global mask
|
||||
+ // Check if the global mask disables this message or the device is inactive
|
||||
//
|
||||
- if ((ErrorLevel & GetDebugPrintErrorLevel ()) == 0) {
|
||||
+ if ((ErrorLevel & GetDebugPrintErrorLevel ()) == 0 ||
|
||||
+ !PlatformDebugLibIoPortFound ()) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -120,9 +122,11 @@ DebugAssert (
|
||||
FileName, (UINT64)LineNumber, Description);
|
||||
|
||||
//
|
||||
- // Send the print string to the debug I/O port
|
||||
+ // Send the print string to the debug I/O port, if present
|
||||
//
|
||||
- IoWriteFifo8 (PcdGet16 (PcdDebugIoPort), Length, Buffer);
|
||||
+ if (PlatformDebugLibIoPortFound ()) {
|
||||
+ IoWriteFifo8 (PcdGet16 (PcdDebugIoPort), Length, Buffer);
|
||||
+ }
|
||||
|
||||
//
|
||||
// Generate a Breakpoint, DeadLoop, or NOP based on PCD settings
|
||||
@@ -265,3 +269,19 @@ DebugPrintLevelEnabled (
|
||||
{
|
||||
return (BOOLEAN) ((ErrorLevel & PcdGet32(PcdFixedDebugPrintErrorLevel)) != 0);
|
||||
}
|
||||
+
|
||||
+/**
|
||||
+ Return the result of detecting the debug I/O port device.
|
||||
+
|
||||
+ @retval TRUE if the debug I/O port device was detected.
|
||||
+ @retval FALSE otherwise
|
||||
+
|
||||
+**/
|
||||
+BOOLEAN
|
||||
+EFIAPI
|
||||
+PlatformDebugLibIoPortDetect (
|
||||
+ VOID
|
||||
+ )
|
||||
+{
|
||||
+ return IoRead8 (PcdGet16 (PcdDebugIoPort)) == BOCHS_DEBUG_PORT_MAGIC;
|
||||
+}
|
||||
diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetect.c b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetect.c
|
||||
index bad054f286..81c44eece9 100644
|
||||
--- a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetect.c
|
||||
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetect.c
|
||||
@@ -1,6 +1,6 @@
|
||||
/** @file
|
||||
- Constructor code for QEMU debug port library.
|
||||
- Non-SEC instance.
|
||||
+ Detection code for QEMU debug port.
|
||||
+ Non-SEC instance, caches the result of detection.
|
||||
|
||||
Copyright (c) 2017, Red Hat, Inc.<BR>
|
||||
This program and the accompanying materials
|
||||
@@ -14,9 +14,16 @@
|
||||
**/
|
||||
|
||||
#include <Base.h>
|
||||
+#include "DebugLibDetect.h"
|
||||
+
|
||||
+//
|
||||
+// Set to TRUE if the debug I/O port is enabled
|
||||
+//
|
||||
+STATIC BOOLEAN mDebugIoPortFound = FALSE;
|
||||
|
||||
/**
|
||||
- This constructor function does not have anything to do.
|
||||
+ This constructor function checks if the debug I/O port device is present,
|
||||
+ caching the result for later use.
|
||||
|
||||
@retval RETURN_SUCCESS The constructor always returns RETURN_SUCCESS.
|
||||
|
||||
@@ -27,5 +34,22 @@ PlatformDebugLibIoPortConstructor (
|
||||
VOID
|
||||
)
|
||||
{
|
||||
+ mDebugIoPortFound = PlatformDebugLibIoPortDetect();
|
||||
return RETURN_SUCCESS;
|
||||
}
|
||||
+
|
||||
+/**
|
||||
+ Return the cached result of detecting the debug I/O port device.
|
||||
+
|
||||
+ @retval TRUE if the debug I/O port device was detected.
|
||||
+ @retval FALSE otherwise
|
||||
+
|
||||
+**/
|
||||
+BOOLEAN
|
||||
+EFIAPI
|
||||
+PlatformDebugLibIoPortFound (
|
||||
+ VOID
|
||||
+ )
|
||||
+{
|
||||
+ return mDebugIoPortFound;
|
||||
+}
|
||||
diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetectRom.c b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetectRom.c
|
||||
index 83a118a0f7..b950919675 100644
|
||||
--- a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetectRom.c
|
||||
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetectRom.c
|
||||
@@ -1,6 +1,6 @@
|
||||
/** @file
|
||||
- Constructor code for QEMU debug port library.
|
||||
- SEC instance.
|
||||
+ Detection code for QEMU debug port.
|
||||
+ SEC instance, cannot cache the result of detection.
|
||||
|
||||
Copyright (c) 2017, Red Hat, Inc.<BR>
|
||||
This program and the accompanying materials
|
||||
@@ -14,6 +14,7 @@
|
||||
**/
|
||||
|
||||
#include <Base.h>
|
||||
+#include "DebugLibDetect.h"
|
||||
|
||||
/**
|
||||
This constructor function does not have anything to do.
|
||||
@@ -29,3 +30,19 @@ PlatformRomDebugLibIoPortConstructor (
|
||||
{
|
||||
return RETURN_SUCCESS;
|
||||
}
|
||||
+
|
||||
+/**
|
||||
+ Return the result of detecting the debug I/O port device.
|
||||
+
|
||||
+ @retval TRUE if the debug I/O port device was detected.
|
||||
+ @retval FALSE otherwise
|
||||
+
|
||||
+**/
|
||||
+BOOLEAN
|
||||
+EFIAPI
|
||||
+PlatformDebugLibIoPortFound (
|
||||
+ VOID
|
||||
+ )
|
||||
+{
|
||||
+ return PlatformDebugLibIoPortDetect ();
|
||||
+}
|
||||
--
|
||||
2.14.3
|
||||
|
@ -1,72 +0,0 @@
|
||||
From 3416fa678a9b634910faffbf9479a82f4969f7b1 Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Fri, 2 Mar 2018 19:09:22 +0100
|
||||
Subject: [PATCH 1/3] BaseTools/header.makefile: add "-Wno-stringop-truncation"
|
||||
|
||||
gcc-8 (which is part of Fedora 28) enables the new warning
|
||||
"-Wstringop-truncation" in "-Wall". This warning is documented in detail
|
||||
at <https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html>; the
|
||||
introduction says
|
||||
|
||||
> Warn for calls to bounded string manipulation functions such as strncat,
|
||||
> strncpy, and stpncpy that may either truncate the copied string or leave
|
||||
> the destination unchanged.
|
||||
|
||||
It breaks the BaseTools build with:
|
||||
|
||||
> EfiUtilityMsgs.c: In function 'PrintMessage':
|
||||
> EfiUtilityMsgs.c:484:9: error: 'strncat' output may be truncated copying
|
||||
> between 0 and 511 bytes from a string of length 511
|
||||
> [-Werror=stringop-truncation]
|
||||
> strncat (Line, Line2, MAX_LINE_LEN - strlen (Line) - 1);
|
||||
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
> EfiUtilityMsgs.c:469:9: error: 'strncat' output may be truncated copying
|
||||
> between 0 and 511 bytes from a string of length 511
|
||||
> [-Werror=stringop-truncation]
|
||||
> strncat (Line, Line2, MAX_LINE_LEN - strlen (Line) - 1);
|
||||
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
> EfiUtilityMsgs.c:511:5: error: 'strncat' output may be truncated copying
|
||||
> between 0 and 511 bytes from a string of length 511
|
||||
> [-Werror=stringop-truncation]
|
||||
> strncat (Line, Line2, MAX_LINE_LEN - strlen (Line) - 1);
|
||||
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
The right way to fix the warning would be to implement string concat with
|
||||
snprintf(). However, Microsoft does not appear to support snprintf()
|
||||
before VS2015
|
||||
<https://stackoverflow.com/questions/2915672/snprintf-and-visual-studio-2010>,
|
||||
so we just have to shut up the warning. The strncat() calls flagged above
|
||||
are valid BTW.
|
||||
|
||||
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
Cc: Cole Robinson <crobinso@redhat.com>
|
||||
Cc: Liming Gao <liming.gao@intel.com>
|
||||
Cc: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
|
||||
Contributed-under: TianoCore Contribution Agreement 1.1
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
Message-Id: <20180302180924.4312-2-lersek@redhat.com>
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
---
|
||||
BaseTools/Source/C/Makefiles/header.makefile | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
|
||||
index 063982b82f..6c3826aecb 100644
|
||||
--- a/BaseTools/Source/C/Makefiles/header.makefile
|
||||
+++ b/BaseTools/Source/C/Makefiles/header.makefile
|
||||
@@ -47,9 +47,9 @@ INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKE
|
||||
BUILD_CPPFLAGS = $(INCLUDE) -O2
|
||||
ifeq ($(DARWIN),Darwin)
|
||||
# assume clang or clang compatible flags on OS X
|
||||
-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g
|
||||
+BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-self-assign -Wno-unused-result -nostdlib -c -g
|
||||
else
|
||||
-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g
|
||||
+BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-unused-result -nostdlib -c -g
|
||||
endif
|
||||
BUILD_LFLAGS =
|
||||
BUILD_CXXFLAGS = -Wno-unused-result
|
||||
--
|
||||
2.14.3
|
||||
|
@ -1,104 +0,0 @@
|
||||
From 07a446e7f869f79104bcc1d6accdc462e7bf7ba5 Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Fri, 2 Mar 2018 19:09:23 +0100
|
||||
Subject: [PATCH 2/3] BaseTools/header.makefile: add "-Wno-restrict"
|
||||
|
||||
gcc-8 (which is part of Fedora 28) enables the new warning
|
||||
"-Wrestrict" in "-Wall". This warning is documented in detail
|
||||
at <https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html>; the
|
||||
introduction says
|
||||
|
||||
> Warn when an object referenced by a restrict-qualified parameter (or, in
|
||||
> C++, a __restrict-qualified parameter) is aliased by another argument,
|
||||
> or when copies between such objects overlap.
|
||||
|
||||
It breaks the BaseTools build (in the Brotli compression library) with:
|
||||
|
||||
> In function 'ProcessCommandsInternal',
|
||||
> inlined from 'ProcessCommands' at dec/decode.c:1828:10:
|
||||
> dec/decode.c:1781:9: error: 'memcpy' accessing between 17 and 2147483631
|
||||
> bytes at offsets 16 and 16 overlaps between 17 and 2147483631 bytes at
|
||||
> offset 16 [-Werror=restrict]
|
||||
> memcpy(copy_dst + 16, copy_src + 16, (size_t)(i - 16));
|
||||
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
> In function 'ProcessCommandsInternal',
|
||||
> inlined from 'SafeProcessCommands' at dec/decode.c:1833:10:
|
||||
> dec/decode.c:1781:9: error: 'memcpy' accessing between 17 and 2147483631
|
||||
> bytes at offsets 16 and 16 overlaps between 17 and 2147483631 bytes at
|
||||
> offset 16 [-Werror=restrict]
|
||||
> memcpy(copy_dst + 16, copy_src + 16, (size_t)(i - 16));
|
||||
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Paolo Bonzini <pbonzini@redhat.com> analyzed the Brotli source in detail,
|
||||
and concluded that the warning is a false positive:
|
||||
|
||||
> This seems safe to me, because it's preceded by:
|
||||
>
|
||||
> uint8_t* copy_dst = &s->ringbuffer[pos];
|
||||
> uint8_t* copy_src = &s->ringbuffer[src_start];
|
||||
> int dst_end = pos + i;
|
||||
> int src_end = src_start + i;
|
||||
> if (src_end > pos && dst_end > src_start) {
|
||||
> /* Regions intersect. */
|
||||
> goto CommandPostWrapCopy;
|
||||
> }
|
||||
>
|
||||
> If [src_start, src_start + i) and [pos, pos + i) don't intersect, then
|
||||
> neither do [src_start + 16, src_start + i) and [pos + 16, pos + i).
|
||||
>
|
||||
> The if seems okay:
|
||||
>
|
||||
> (src_start + i > pos && pos + i > src_start)
|
||||
>
|
||||
> which can be rewritten to:
|
||||
>
|
||||
> (pos < src_start + i && src_start < pos + i)
|
||||
>
|
||||
> Then the numbers are in one of these two orders:
|
||||
>
|
||||
> pos <= src_start < pos + i <= src_start + i
|
||||
> src_start <= pos < src_start + i <= pos + i
|
||||
>
|
||||
> These two would be allowed by the "if", but they can only happen if pos
|
||||
> == src_start so they degenerate to the same two orders above:
|
||||
>
|
||||
> pos <= src_start < src_start + i <= pos + i
|
||||
> src_start <= pos < pos + i <= src_start + i
|
||||
>
|
||||
> So it is a false positive in GCC.
|
||||
|
||||
Disable the warning for now.
|
||||
|
||||
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
Cc: Cole Robinson <crobinso@redhat.com>
|
||||
Cc: Liming Gao <liming.gao@intel.com>
|
||||
Cc: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
|
||||
Reported-by: Cole Robinson <crobinso@redhat.com>
|
||||
Contributed-under: TianoCore Contribution Agreement 1.1
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
Message-Id: <20180302180924.4312-3-lersek@redhat.com>
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
---
|
||||
BaseTools/Source/C/Makefiles/header.makefile | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
|
||||
index 6c3826aecb..3feae10095 100644
|
||||
--- a/BaseTools/Source/C/Makefiles/header.makefile
|
||||
+++ b/BaseTools/Source/C/Makefiles/header.makefile
|
||||
@@ -47,9 +47,9 @@ INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKE
|
||||
BUILD_CPPFLAGS = $(INCLUDE) -O2
|
||||
ifeq ($(DARWIN),Darwin)
|
||||
# assume clang or clang compatible flags on OS X
|
||||
-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-self-assign -Wno-unused-result -nostdlib -c -g
|
||||
+BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict -Wno-self-assign -Wno-unused-result -nostdlib -c -g
|
||||
else
|
||||
-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-unused-result -nostdlib -c -g
|
||||
+BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict -Wno-unused-result -nostdlib -c -g
|
||||
endif
|
||||
BUILD_LFLAGS =
|
||||
BUILD_CXXFLAGS = -Wno-unused-result
|
||||
--
|
||||
2.14.3
|
||||
|
@ -1,65 +0,0 @@
|
||||
From 8633e2951d8eba59755c82ef10099ed47eafd474 Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Fri, 2 Mar 2018 19:09:24 +0100
|
||||
Subject: [PATCH 3/3] BaseTools/GenVtf: silence false "stringop-overflow"
|
||||
warning with memcpy()
|
||||
|
||||
gcc-8 (which is part of Fedora 28) enables the new warning
|
||||
"-Wstringop-overflow" in "-Wall". This warning is documented in detail at
|
||||
<https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html>; the
|
||||
introduction says
|
||||
|
||||
> Warn for calls to string manipulation functions such as memcpy and
|
||||
> strcpy that are determined to overflow the destination buffer.
|
||||
|
||||
It breaks the BaseTools build with:
|
||||
|
||||
> GenVtf.c: In function 'ConvertVersionInfo':
|
||||
> GenVtf.c:132:7: error: 'strncpy' specified bound depends on the length
|
||||
> of the source argument [-Werror=stringop-overflow=]
|
||||
> strncpy (TemStr + 4 - Length, Str, Length);
|
||||
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
> GenVtf.c:130:14: note: length computed here
|
||||
> Length = strlen(Str);
|
||||
> ^~~~~~~~~~~
|
||||
|
||||
It is a false positive because, while the bound equals the length of the
|
||||
source argument, the destination pointer is moved back towards the
|
||||
beginning of the destination buffer by the same amount (and this amount is
|
||||
range-checked first, so we can't precede the start of the dest buffer).
|
||||
|
||||
Replace both strncpy() calls with memcpy().
|
||||
|
||||
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
Cc: Cole Robinson <crobinso@redhat.com>
|
||||
Cc: Liming Gao <liming.gao@intel.com>
|
||||
Cc: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
|
||||
Reported-by: Cole Robinson <crobinso@redhat.com>
|
||||
Contributed-under: TianoCore Contribution Agreement 1.1
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
Message-Id: <20180302180924.4312-4-lersek@redhat.com>
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
---
|
||||
BaseTools/Source/C/GenVtf/GenVtf.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/BaseTools/Source/C/GenVtf/GenVtf.c b/BaseTools/Source/C/GenVtf/GenVtf.c
|
||||
index 2ae9a7be2c..0cd33e71e9 100644
|
||||
--- a/BaseTools/Source/C/GenVtf/GenVtf.c
|
||||
+++ b/BaseTools/Source/C/GenVtf/GenVtf.c
|
||||
@@ -129,9 +129,9 @@ Returns:
|
||||
} else {
|
||||
Length = strlen(Str);
|
||||
if (Length < 4) {
|
||||
- strncpy (TemStr + 4 - Length, Str, Length);
|
||||
+ memcpy (TemStr + 4 - Length, Str, Length);
|
||||
} else {
|
||||
- strncpy (TemStr, Str + Length - 4, 4);
|
||||
+ memcpy (TemStr, Str + Length - 4, 4);
|
||||
}
|
||||
|
||||
sscanf (
|
||||
--
|
||||
2.14.3
|
||||
|
@ -1,19 +1,21 @@
|
||||
From 63b708ccad8afd0b887258888a53fd4945cff682 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <63b708ccad8afd0b887258888a53fd4945cff682.1478467625.git.crobinso@redhat.com>
|
||||
From 3a25bb77d692c015c3c3135a4d4c39748f195de7 Mon Sep 17 00:00:00 2001
|
||||
From: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Date: Sun, 6 Nov 2016 13:50:31 -0500
|
||||
Subject: [PATCH] Tweak the tools_def to support cross-compiling.
|
||||
|
||||
These files are meant for customization, so this is not upstream.
|
||||
Message-Id: <63b708ccad8afd0b887258888a53fd4945cff682.1478467625.git.crobinso@redhat.com>
|
||||
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
---
|
||||
BaseTools/Conf/tools_def.template | 343 ++++++++++++++++++--------------------
|
||||
BaseTools/Conf/tools_def.template | 343 ++++++++++++++----------------
|
||||
1 file changed, 161 insertions(+), 182 deletions(-)
|
||||
|
||||
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
|
||||
index e93c2a0..2fc16c1 100755
|
||||
index 03d7000..b5dceb7 100755
|
||||
--- a/BaseTools/Conf/tools_def.template
|
||||
+++ b/BaseTools/Conf/tools_def.template
|
||||
@@ -178,27 +178,6 @@ DEFINE CYGWIN_BINIA32 = c:/cygwin/opt/tiano/i386-tiano-pe/i386-tiano-pe
|
||||
@@ -189,27 +189,6 @@ DEFINE CYGWIN_BINIA32 = c:/cygwin/opt/tiano/i386-tiano-pe/i386-tiano-pe
|
||||
DEFINE CYGWIN_BINX64 = c:/cygwin/opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin/
|
||||
DEFINE CYGWIN_BINIPF = c:/cygwin/opt/tiano/gcc/ipf/bin/ia64-pc-elf-
|
||||
|
||||
@ -41,7 +43,7 @@ index e93c2a0..2fc16c1 100755
|
||||
DEFINE UNIX_IASL_BIN = ENV(IASL_PREFIX)iasl
|
||||
DEFINE WIN_IASL_BIN = ENV(IASL_PREFIX)iasl.exe
|
||||
DEFINE WIN_ASL_BIN = ENV(IASL_PREFIX)asl.exe
|
||||
@@ -4598,7 +4577,7 @@ DEFINE GCC5_AARCH64_ASLDLINK_FLAGS = DEF(GCC49_AARCH64_ASLDLINK_FLAGS)
|
||||
@@ -4788,7 +4767,7 @@ DEFINE GCC5_AARCH64_ASLDLINK_FLAGS = DEF(GCC49_AARCH64_ASLDLINK_FLAGS)
|
||||
####################################################################################
|
||||
*_GCC44_*_*_FAMILY = GCC
|
||||
|
||||
@ -50,7 +52,7 @@ index e93c2a0..2fc16c1 100755
|
||||
*_GCC44_*_*_DLL = ENV(GCC44_DLL)
|
||||
*_GCC44_*_ASL_PATH = DEF(UNIX_IASL_BIN)
|
||||
|
||||
@@ -4613,17 +4592,17 @@ DEFINE GCC5_AARCH64_ASLDLINK_FLAGS = DEF(GCC49_AARCH64_ASLDLINK_FLAGS)
|
||||
@@ -4803,17 +4782,17 @@ DEFINE GCC5_AARCH64_ASLDLINK_FLAGS = DEF(GCC49_AARCH64_ASLDLINK_FLAGS)
|
||||
##################
|
||||
# GCC44 IA32 definitions
|
||||
##################
|
||||
@ -79,7 +81,7 @@ index e93c2a0..2fc16c1 100755
|
||||
|
||||
*_GCC44_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32
|
||||
*_GCC44_IA32_ASLDLINK_FLAGS = DEF(GCC44_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386
|
||||
@@ -4641,17 +4620,17 @@ RELEASE_GCC44_IA32_CC_FLAGS = DEF(GCC44_IA32_CC_FLAGS) -Os
|
||||
@@ -4831,17 +4810,17 @@ RELEASE_GCC44_IA32_CC_FLAGS = DEF(GCC44_IA32_CC_FLAGS) -Os
|
||||
##################
|
||||
# GCC44 X64 definitions
|
||||
##################
|
||||
@ -108,7 +110,7 @@ index e93c2a0..2fc16c1 100755
|
||||
|
||||
*_GCC44_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64
|
||||
*_GCC44_X64_ASLDLINK_FLAGS = DEF(GCC44_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64
|
||||
@@ -4674,7 +4653,7 @@ RELEASE_GCC44_X64_CC_FLAGS = DEF(GCC44_X64_CC_FLAGS) -Os
|
||||
@@ -4864,7 +4843,7 @@ RELEASE_GCC44_X64_CC_FLAGS = DEF(GCC44_X64_CC_FLAGS) -Os
|
||||
####################################################################################
|
||||
*_GCC45_*_*_FAMILY = GCC
|
||||
|
||||
@ -117,7 +119,7 @@ index e93c2a0..2fc16c1 100755
|
||||
*_GCC45_*_*_DLL = ENV(GCC45_DLL)
|
||||
*_GCC45_*_ASL_PATH = DEF(UNIX_IASL_BIN)
|
||||
|
||||
@@ -4689,17 +4668,17 @@ RELEASE_GCC44_X64_CC_FLAGS = DEF(GCC44_X64_CC_FLAGS) -Os
|
||||
@@ -4879,17 +4858,17 @@ RELEASE_GCC44_X64_CC_FLAGS = DEF(GCC44_X64_CC_FLAGS) -Os
|
||||
##################
|
||||
# GCC45 IA32 definitions
|
||||
##################
|
||||
@ -146,7 +148,7 @@ index e93c2a0..2fc16c1 100755
|
||||
|
||||
*_GCC45_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32
|
||||
*_GCC45_IA32_ASLDLINK_FLAGS = DEF(GCC45_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386
|
||||
@@ -4717,17 +4696,17 @@ RELEASE_GCC45_IA32_CC_FLAGS = DEF(GCC45_IA32_CC_FLAGS) -Os
|
||||
@@ -4907,17 +4886,17 @@ RELEASE_GCC45_IA32_CC_FLAGS = DEF(GCC45_IA32_CC_FLAGS) -Os
|
||||
##################
|
||||
# GCC45 X64 definitions
|
||||
##################
|
||||
@ -175,7 +177,7 @@ index e93c2a0..2fc16c1 100755
|
||||
|
||||
*_GCC45_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64
|
||||
*_GCC45_X64_ASLDLINK_FLAGS = DEF(GCC45_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64
|
||||
@@ -4750,7 +4729,7 @@ RELEASE_GCC45_X64_CC_FLAGS = DEF(GCC45_X64_CC_FLAGS) -Os
|
||||
@@ -4940,7 +4919,7 @@ RELEASE_GCC45_X64_CC_FLAGS = DEF(GCC45_X64_CC_FLAGS) -Os
|
||||
####################################################################################
|
||||
*_GCC46_*_*_FAMILY = GCC
|
||||
|
||||
@ -183,8 +185,8 @@ index e93c2a0..2fc16c1 100755
|
||||
+*_GCC46_*_MAKE_PATH = make
|
||||
*_GCC46_*_*_DLL = ENV(GCC46_DLL)
|
||||
*_GCC46_*_ASL_PATH = DEF(UNIX_IASL_BIN)
|
||||
*_GCC46_*_DTC_PATH = DEF(DTC_BIN)
|
||||
@@ -4766,17 +4745,17 @@ RELEASE_GCC45_X64_CC_FLAGS = DEF(GCC45_X64_CC_FLAGS) -Os
|
||||
|
||||
@@ -4955,17 +4934,17 @@ RELEASE_GCC45_X64_CC_FLAGS = DEF(GCC45_X64_CC_FLAGS) -Os
|
||||
##################
|
||||
# GCC46 IA32 definitions
|
||||
##################
|
||||
@ -213,7 +215,7 @@ index e93c2a0..2fc16c1 100755
|
||||
|
||||
*_GCC46_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32
|
||||
*_GCC46_IA32_ASLDLINK_FLAGS = DEF(GCC46_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386
|
||||
@@ -4794,17 +4773,17 @@ RELEASE_GCC46_IA32_CC_FLAGS = DEF(GCC46_IA32_CC_FLAGS) -Os -Wno-unused-but
|
||||
@@ -4983,17 +4962,17 @@ RELEASE_GCC46_IA32_CC_FLAGS = DEF(GCC46_IA32_CC_FLAGS) -Os -Wno-unused-but
|
||||
##################
|
||||
# GCC46 X64 definitions
|
||||
##################
|
||||
@ -242,7 +244,7 @@ index e93c2a0..2fc16c1 100755
|
||||
|
||||
*_GCC46_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64
|
||||
*_GCC46_X64_ASLDLINK_FLAGS = DEF(GCC46_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64
|
||||
@@ -4861,7 +4840,7 @@ RELEASE_GCC46_ARM_CC_FLAGS = DEF(GCC46_ARM_CC_FLAGS) -Wno-unused-but-set-v
|
||||
@@ -5050,7 +5029,7 @@ RELEASE_GCC46_ARM_CC_FLAGS = DEF(GCC46_ARM_CC_FLAGS) -Wno-unused-but-set-v
|
||||
####################################################################################
|
||||
*_GCC47_*_*_FAMILY = GCC
|
||||
|
||||
@ -250,8 +252,8 @@ index e93c2a0..2fc16c1 100755
|
||||
+*_GCC47_*_MAKE_PATH = make
|
||||
*_GCC47_*_*_DLL = ENV(GCC47_DLL)
|
||||
*_GCC47_*_ASL_PATH = DEF(UNIX_IASL_BIN)
|
||||
*_GCC47_*_DTC_PATH = DEF(DTC_BIN)
|
||||
@@ -4877,17 +4856,17 @@ RELEASE_GCC46_ARM_CC_FLAGS = DEF(GCC46_ARM_CC_FLAGS) -Wno-unused-but-set-v
|
||||
|
||||
@@ -5065,17 +5044,17 @@ RELEASE_GCC46_ARM_CC_FLAGS = DEF(GCC46_ARM_CC_FLAGS) -Wno-unused-but-set-v
|
||||
##################
|
||||
# GCC47 IA32 definitions
|
||||
##################
|
||||
@ -280,7 +282,7 @@ index e93c2a0..2fc16c1 100755
|
||||
|
||||
*_GCC47_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32
|
||||
*_GCC47_IA32_ASLDLINK_FLAGS = DEF(GCC47_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386
|
||||
@@ -4905,17 +4884,17 @@ RELEASE_GCC47_IA32_CC_FLAGS = DEF(GCC47_IA32_CC_FLAGS) -Os -Wno-unused-but
|
||||
@@ -5093,17 +5072,17 @@ RELEASE_GCC47_IA32_CC_FLAGS = DEF(GCC47_IA32_CC_FLAGS) -Os -Wno-unused-but
|
||||
##################
|
||||
# GCC47 X64 definitions
|
||||
##################
|
||||
@ -309,7 +311,7 @@ index e93c2a0..2fc16c1 100755
|
||||
|
||||
*_GCC47_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64
|
||||
*_GCC47_X64_ASLDLINK_FLAGS = DEF(GCC47_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64
|
||||
@@ -5001,7 +4980,7 @@ RELEASE_GCC47_AARCH64_CC_FLAGS = DEF(GCC47_AARCH64_CC_FLAGS) -Wno-unused-but-s
|
||||
@@ -5189,7 +5168,7 @@ RELEASE_GCC47_AARCH64_CC_FLAGS = DEF(GCC47_AARCH64_CC_FLAGS) -Wno-unused-but-s
|
||||
####################################################################################
|
||||
*_GCC48_*_*_FAMILY = GCC
|
||||
|
||||
@ -317,8 +319,8 @@ index e93c2a0..2fc16c1 100755
|
||||
+*_GCC48_*_MAKE_PATH = make
|
||||
*_GCC48_*_*_DLL = ENV(GCC48_DLL)
|
||||
*_GCC48_*_ASL_PATH = DEF(UNIX_IASL_BIN)
|
||||
*_GCC48_*_DTC_PATH = DEF(DTC_BIN)
|
||||
@@ -5017,17 +4996,17 @@ RELEASE_GCC47_AARCH64_CC_FLAGS = DEF(GCC47_AARCH64_CC_FLAGS) -Wno-unused-but-s
|
||||
|
||||
@@ -5204,17 +5183,17 @@ RELEASE_GCC47_AARCH64_CC_FLAGS = DEF(GCC47_AARCH64_CC_FLAGS) -Wno-unused-but-s
|
||||
##################
|
||||
# GCC48 IA32 definitions
|
||||
##################
|
||||
@ -347,7 +349,7 @@ index e93c2a0..2fc16c1 100755
|
||||
|
||||
*_GCC48_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32
|
||||
*_GCC48_IA32_ASLDLINK_FLAGS = DEF(GCC48_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386
|
||||
@@ -5045,17 +5024,17 @@ RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Os -Wno-unused-but
|
||||
@@ -5232,17 +5211,17 @@ RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Os -Wno-unused-but
|
||||
##################
|
||||
# GCC48 X64 definitions
|
||||
##################
|
||||
@ -376,7 +378,7 @@ index e93c2a0..2fc16c1 100755
|
||||
|
||||
*_GCC48_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64
|
||||
*_GCC48_X64_ASLDLINK_FLAGS = DEF(GCC48_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64
|
||||
@@ -5141,7 +5120,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s
|
||||
@@ -5328,7 +5307,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s
|
||||
####################################################################################
|
||||
*_GCC49_*_*_FAMILY = GCC
|
||||
|
||||
@ -384,8 +386,8 @@ index e93c2a0..2fc16c1 100755
|
||||
+*_GCC49_*_MAKE_PATH = make
|
||||
*_GCC49_*_*_DLL = ENV(GCC49_DLL)
|
||||
*_GCC49_*_ASL_PATH = DEF(UNIX_IASL_BIN)
|
||||
*_GCC49_*_DTC_PATH = DEF(DTC_BIN)
|
||||
@@ -5157,17 +5136,17 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s
|
||||
|
||||
@@ -5343,17 +5322,17 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s
|
||||
##################
|
||||
# GCC49 IA32 definitions
|
||||
##################
|
||||
@ -414,7 +416,7 @@ index e93c2a0..2fc16c1 100755
|
||||
|
||||
*_GCC49_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32
|
||||
*_GCC49_IA32_ASLDLINK_FLAGS = DEF(GCC49_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386
|
||||
@@ -5185,17 +5164,17 @@ RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Os -Wno-unused-but
|
||||
@@ -5371,17 +5350,17 @@ RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Os -Wno-unused-but
|
||||
##################
|
||||
# GCC49 X64 definitions
|
||||
##################
|
||||
@ -443,7 +445,7 @@ index e93c2a0..2fc16c1 100755
|
||||
|
||||
*_GCC49_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64
|
||||
*_GCC49_X64_ASLDLINK_FLAGS = DEF(GCC49_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64
|
||||
@@ -5287,7 +5266,7 @@ RELEASE_GCC49_AARCH64_DLINK_FLAGS = DEF(GCC49_AARCH64_DLINK_FLAGS)
|
||||
@@ -5473,7 +5452,7 @@ RELEASE_GCC49_AARCH64_DLINK_FLAGS = DEF(GCC49_AARCH64_DLINK_FLAGS)
|
||||
####################################################################################
|
||||
*_GCC5_*_*_FAMILY = GCC
|
||||
|
||||
@ -451,8 +453,8 @@ index e93c2a0..2fc16c1 100755
|
||||
+*_GCC5_*_MAKE_PATH = make
|
||||
*_GCC5_*_*_DLL = ENV(GCC5_DLL)
|
||||
*_GCC5_*_ASL_PATH = DEF(UNIX_IASL_BIN)
|
||||
*_GCC5_*_DTC_PATH = DEF(DTC_BIN)
|
||||
@@ -5303,17 +5282,17 @@ RELEASE_GCC49_AARCH64_DLINK_FLAGS = DEF(GCC49_AARCH64_DLINK_FLAGS)
|
||||
|
||||
@@ -5488,17 +5467,17 @@ RELEASE_GCC49_AARCH64_DLINK_FLAGS = DEF(GCC49_AARCH64_DLINK_FLAGS)
|
||||
##################
|
||||
# GCC5 IA32 definitions
|
||||
##################
|
||||
@ -481,7 +483,7 @@ index e93c2a0..2fc16c1 100755
|
||||
|
||||
*_GCC5_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 -fno-lto
|
||||
*_GCC5_IA32_ASLDLINK_FLAGS = DEF(GCC5_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386
|
||||
@@ -5335,17 +5314,17 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,
|
||||
@@ -5520,17 +5499,17 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,
|
||||
##################
|
||||
# GCC5 X64 definitions
|
||||
##################
|
||||
@ -511,5 +513,5 @@ index e93c2a0..2fc16c1 100755
|
||||
*_GCC5_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 -fno-lto
|
||||
*_GCC5_X64_ASLDLINK_FLAGS = DEF(GCC5_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64
|
||||
--
|
||||
2.14.3
|
||||
2.17.0
|
||||
|
||||
|
48
edk2.spec
48
edk2.spec
@ -1,6 +1,6 @@
|
||||
%global edk2_date 20171011
|
||||
%global edk2_githash 92d07e4
|
||||
%global openssl_version 1.1.0e
|
||||
%global edk2_date 20180529
|
||||
%global edk2_githash ee3198e672e2
|
||||
%global openssl_version 1.1.0h
|
||||
%global qosb_version 1.1.2
|
||||
|
||||
%define qosb_testing 0
|
||||
@ -35,7 +35,7 @@
|
||||
|
||||
Name: edk2
|
||||
Version: %{edk2_date}git%{edk2_githash}
|
||||
Release: 7%{dist}
|
||||
Release: 1%{dist}
|
||||
Summary: EFI Development Kit II
|
||||
|
||||
Group: Applications/Emulators
|
||||
@ -55,30 +55,20 @@ Patch0001: 0001-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch
|
||||
Patch0002: 0002-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-the-DXE-.patch
|
||||
Patch0003: 0003-OvmfPkg-enable-DEBUG_VERBOSE.patch
|
||||
Patch0004: 0004-OvmfPkg-increase-max-debug-message-length-to-512.patch
|
||||
Patch0005: 0005-BuildEnv-override-set-C-noclobber-of-sourcing-env.patch
|
||||
Patch0006: 0006-advertise-OpenSSL-on-TianoCore-splash-screen-boot-lo.patch
|
||||
Patch0008: 0008-OvmfPkg-QemuVideoDxe-enable-debug-messages-in-VbeShi.patch
|
||||
Patch0009: 0009-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch
|
||||
Patch0010: 0010-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch
|
||||
Patch0011: 0011-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch
|
||||
Patch0012: 0012-ArmVirtPkg-QemuFwCfgLib-allow-UEFI_DRIVER-client-mod.patch
|
||||
Patch0013: 0013-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch
|
||||
Patch0014: 0014-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch
|
||||
Patch0015: 0015-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch
|
||||
Patch0016: 0016-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch
|
||||
Patch0017: 0017-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch
|
||||
Patch0018: 0018-ArmVirtPkg-set-early-hello-message.patch
|
||||
Patch0005: 0005-advertise-OpenSSL-on-TianoCore-splash-screen-boot-lo.patch
|
||||
Patch0006: 0006-OvmfPkg-QemuVideoDxe-enable-debug-messages-in-VbeShi.patch
|
||||
Patch0007: 0007-MdeModulePkg-TerminalDxe-add-other-text-resolutions.patch
|
||||
Patch0008: 0008-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch
|
||||
Patch0009: 0009-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch
|
||||
Patch0010: 0010-ArmVirtPkg-QemuFwCfgLib-allow-UEFI_DRIVER-client-mod.patch
|
||||
Patch0011: 0011-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch
|
||||
Patch0012: 0012-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch
|
||||
Patch0013: 0013-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch
|
||||
Patch0014: 0014-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch
|
||||
Patch0015: 0015-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch
|
||||
Patch0016: 0016-ArmVirtPkg-set-early-hello-message-RH-only.patch
|
||||
|
||||
# upstream backports
|
||||
Patch0019: 0019-MdeModulePkg-PciBus-Fix-bug-that-PCI-BUS-claims-too-much-resource.patch
|
||||
Patch0020: 0020-MdeModulePkg-Bds-Remove-assertion-in-BmCharToUint.patch
|
||||
Patch0021: 0021-MdeModulePkg-Bds-Check-variable-name-even-if-OptionNumber-is-NULL.patch
|
||||
Patch0022: 0022-OvmfPkg-make-it-a-proper-BASE-library.patch
|
||||
Patch0023: 0023-OvmfPkg-create-a-separate-PlatformDebugLibIoPort-ins.patch
|
||||
Patch0024: 0024-OvmfPkg-save-on-I-O-port-accesses-when-the-debug-por.patch
|
||||
Patch0025: 0025-BaseTools-header.makefile-add-Wno-stringop-truncatio.patch
|
||||
Patch0026: 0026-BaseTools-header.makefile-add-Wno-restrict.patch
|
||||
Patch0027: 0027-BaseTools-GenVtf-silence-false-stringop-overflow-war.patch
|
||||
# upstream backports - None! :)
|
||||
|
||||
%if 0%{?cross:1}
|
||||
# Tweak the tools_def to support cross-compiling.
|
||||
@ -422,6 +412,7 @@ install qemu-ovmf-secureboot-%{qosb_version}/ovmf-vars-generator %{buildroot}%{_
|
||||
%license License.txt
|
||||
%{_bindir}/BootSectImage
|
||||
%{_bindir}/Brotli
|
||||
%{_bindir}/DevicePath
|
||||
%{_bindir}/EfiLdrImage
|
||||
%{_bindir}/EfiRom
|
||||
%{_bindir}/GenCrc32
|
||||
@ -516,6 +507,9 @@ install qemu-ovmf-secureboot-%{qosb_version}/ovmf-vars-generator %{buildroot}%{_
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue May 29 2018 Paolo Bonzini <pbonzini@redhat.com> - 20180529gitee3198e672e2-1
|
||||
- Bump release for new build
|
||||
|
||||
* Tue May 01 2018 Cole Robinson <crobinso@redhat.com> - 20171011git92d07e4-7
|
||||
- Bump release for new build
|
||||
|
||||
|
@ -1,7 +1,8 @@
|
||||
diff -up a/CryptoPkg/Library/OpensslLib/openssl/crypto/bio/bss_fd.c.preserve-nl a/CryptoPkg/Library/OpensslLib/openssl/crypto/bio/bss_fd.c
|
||||
--- a/CryptoPkg/Library/OpensslLib/openssl/crypto/bio/bss_fd.c.preserve-nl 2016-11-10 15:03:44.000000000 +0100
|
||||
+++ b/CryptoPkg/Library/OpensslLib/openssl/crypto/bio/bss_fd.c 2016-12-22 14:36:16.730740423 +0100
|
||||
@@ -202,8 +202,10 @@ static int fd_gets(BIO *bp, char *buf, i
|
||||
diff --git a/CryptoPkg/Library/OpensslLib/openssl/crypto/bio/bss_fd.c b/CryptoPkg/Library/OpensslLib/openssl/crypto/bio/bss_fd.c
|
||||
index 2bd3517..a886655 100644
|
||||
--- a/CryptoPkg/Library/OpensslLib/openssl/crypto/bio/bss_fd.c
|
||||
+++ b/CryptoPkg/Library/OpensslLib/openssl/crypto/bio/bss_fd.c
|
||||
@@ -204,8 +204,10 @@ static int fd_gets(BIO *bp, char *buf, int size)
|
||||
char *ptr = buf;
|
||||
char *end = buf + size - 1;
|
||||
|
||||
@ -14,10 +15,11 @@ diff -up a/CryptoPkg/Library/OpensslLib/openssl/crypto/bio/bss_fd.c.preserve-nl
|
||||
|
||||
ptr[0] = '\0';
|
||||
|
||||
diff -up a/CryptoPkg/Library/OpensslLib/openssl/doc/crypto/BIO_read.pod.preserve-nl a/CryptoPkg/Library/OpensslLib/openssl/doc/crypto/BIO_read.pod
|
||||
--- a/CryptoPkg/Library/OpensslLib/openssl/doc/crypto/BIO_read.pod.preserve-nl 2016-11-10 15:03:45.000000000 +0100
|
||||
+++ b/CryptoPkg/Library/OpensslLib/openssl/doc/crypto/BIO_read.pod 2016-12-22 14:37:22.731245197 +0100
|
||||
@@ -23,7 +23,8 @@ in B<buf>. Usually this operation will a
|
||||
diff --git a/CryptoPkg/Library/OpensslLib/openssl/doc/crypto/BIO_read.pod b/CryptoPkg/Library/OpensslLib/openssl/doc/crypto/BIO_read.pod
|
||||
index 45871c1..fe70e9f 100644
|
||||
--- a/CryptoPkg/Library/OpensslLib/openssl/doc/crypto/BIO_read.pod
|
||||
+++ b/CryptoPkg/Library/OpensslLib/openssl/doc/crypto/BIO_read.pod
|
||||
@@ -23,7 +23,8 @@ in B<buf>. Usually this operation will attempt to read a line of data
|
||||
from the BIO of maximum length B<len-1>. There are exceptions to this,
|
||||
however; for example, BIO_gets() on a digest BIO will calculate and
|
||||
return the digest and other BIOs may not support BIO_gets() at all.
|
||||
@ -27,3 +29,6 @@ diff -up a/CryptoPkg/Library/OpensslLib/openssl/doc/crypto/BIO_read.pod.preserve
|
||||
|
||||
BIO_write() attempts to write B<len> bytes from B<buf> to BIO B<b>.
|
||||
|
||||
--
|
||||
2.17.0
|
||||
|
||||
|
@ -1,7 +1,6 @@
|
||||
diff -up a/CryptoPkg/Library/OpensslLib/openssl/crypto/rsa/rsa_gen.c.cc-reqs b/CryptoPkg/Library/OpensslLib/openssl/crypto/rsa/rsa_gen.c
|
||||
--- a/CryptoPkg/Library/OpensslLib/openssl/crypto/rsa/rsa_gen.c.cc-reqs 2017-01-26 14:10:23.000000000 +0100
|
||||
+++ b/CryptoPkg/Library/OpensslLib/openssl/crypto/rsa/rsa_gen.c 2017-01-26 16:01:52.622308528 +0100
|
||||
@@ -75,6 +75,12 @@ static int rsa_builtin_keygen(RSA *rsa,
|
||||
--- a/CryptoPkg/Library/OpensslLib/openssl/crypto/rsa/rsa_gen.c
|
||||
+++ b/CryptoPkg/Library/OpensslLib/openssl/crypto/rsa/rsa_gen.c
|
||||
@@ -86,6 +86,12 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value,
|
||||
if (!rsa->iqmp && ((rsa->iqmp = BN_secure_new()) == NULL))
|
||||
goto err;
|
||||
|
||||
@ -14,14 +13,17 @@ diff -up a/CryptoPkg/Library/OpensslLib/openssl/crypto/rsa/rsa_gen.c.cc-reqs b/C
|
||||
if (BN_copy(rsa->e, e_value) == NULL)
|
||||
goto err;
|
||||
|
||||
@@ -103,7 +109,9 @@ static int rsa_builtin_keygen(RSA *rsa,
|
||||
@@ -118,7 +124,9 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value,
|
||||
do {
|
||||
if (!BN_generate_prime_ex(rsa->q, bitsq, 0, NULL, NULL, cb))
|
||||
goto err;
|
||||
- } while ((BN_cmp(rsa->p, rsa->q) == 0) && (++degenerate < 3));
|
||||
- } while (BN_cmp(rsa->p, rsa->q) == 0);
|
||||
+ if (!BN_sub(r2, rsa->q, rsa->p))
|
||||
+ goto err;
|
||||
+ } while ((BN_ucmp(r2, r3) <= 0) && (++degenerate < 3));
|
||||
if (degenerate == 3) {
|
||||
ok = 0; /* we set our own err */
|
||||
RSAerr(RSA_F_RSA_BUILTIN_KEYGEN, RSA_R_KEY_SIZE_TOO_SMALL);
|
||||
+ } while (BN_ucmp(r2, r3) <= 0);
|
||||
if (!BN_sub(r2, rsa->q, BN_value_one()))
|
||||
goto err;
|
||||
ERR_set_mark();
|
||||
--
|
||||
2.17.0
|
||||
|
||||
|
@ -1,7 +1,8 @@
|
||||
diff -up a/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_lib.c.disable-ssl3 b/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_lib.c
|
||||
--- a/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_lib.c.disable-ssl3 2016-08-25 17:29:22.000000000 +0200
|
||||
+++ b/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_lib.c 2016-09-08 11:08:05.252082263 +0200
|
||||
@@ -2470,6 +2470,13 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *m
|
||||
diff --git a/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_lib.c b/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_lib.c
|
||||
index 8a190d2..6b4c5ae 100644
|
||||
--- a/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_lib.c
|
||||
+++ b/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_lib.c
|
||||
@@ -2653,6 +2653,13 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth)
|
||||
* or by using the SSL_CONF library.
|
||||
*/
|
||||
ret->options |= SSL_OP_NO_COMPRESSION;
|
||||
@ -15,19 +16,20 @@ diff -up a/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_lib.c.disable-ssl3 b/Cry
|
||||
|
||||
ret->tlsext_status_type = -1;
|
||||
|
||||
diff -up a/CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.c.disable-ssl3 b/CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.c
|
||||
--- a/CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.c.disable-ssl3 2016-09-08 11:08:05.252082263 +0200
|
||||
+++ b/CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.c 2016-09-08 11:11:44.802005886 +0200
|
||||
@@ -258,6 +258,7 @@ static int execute_test(SSL_TEST_FIXTURE
|
||||
diff --git a/CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.c b/CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.c
|
||||
index 2cbbddd..1a409d1 100644
|
||||
--- a/CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.c
|
||||
+++ b/CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.c
|
||||
@@ -277,6 +277,7 @@ static int execute_test(SSL_TEST_FIXTURE fixture)
|
||||
SSL_TEST_SERVERNAME_CB_NONE) {
|
||||
server2_ctx = SSL_CTX_new(TLS_server_method());
|
||||
TEST_check(server2_ctx != NULL);
|
||||
+ SSL_CTX_clear_options(server2_ctx, SSL_OP_NO_SSLv3);
|
||||
}
|
||||
client_ctx = SSL_CTX_new(TLS_client_method());
|
||||
|
||||
@@ -266,11 +267,15 @@ static int execute_test(SSL_TEST_FIXTURE
|
||||
resume_client_ctx = SSL_CTX_new(TLS_client_method());
|
||||
TEST_check(SSL_CTX_set_max_proto_version(client_ctx, TLS_MAX_VERSION));
|
||||
@@ -290,11 +291,15 @@ static int execute_test(SSL_TEST_FIXTURE fixture)
|
||||
TLS_MAX_VERSION));
|
||||
TEST_check(resume_server_ctx != NULL);
|
||||
TEST_check(resume_client_ctx != NULL);
|
||||
+ SSL_CTX_clear_options(resume_server_ctx, SSL_OP_NO_SSLv3);
|
||||
@ -42,10 +44,11 @@ diff -up a/CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.c.disable-ssl3 b/C
|
||||
|
||||
TEST_check(CONF_modules_load(conf, fixture.test_app, 0) > 0);
|
||||
|
||||
diff -up a/CryptoPkg/Library/OpensslLib/openssl/test/ssltest_old.c.disable-ssl3 b/CryptoPkg/Library/OpensslLib/openssl/test/ssltest_old.c
|
||||
--- a/CryptoPkg/Library/OpensslLib/openssl/test/ssltest_old.c.disable-ssl3 2016-08-25 17:29:23.000000000 +0200
|
||||
+++ b/CryptoPkg/Library/OpensslLib/openssl/test/ssltest_old.c 2016-09-08 11:08:05.253082286 +0200
|
||||
@@ -1456,6 +1456,11 @@ int main(int argc, char *argv[])
|
||||
diff --git a/CryptoPkg/Library/OpensslLib/openssl/test/ssltest_old.c b/CryptoPkg/Library/OpensslLib/openssl/test/ssltest_old.c
|
||||
index e77c692..e586072 100644
|
||||
--- a/CryptoPkg/Library/OpensslLib/openssl/test/ssltest_old.c
|
||||
+++ b/CryptoPkg/Library/OpensslLib/openssl/test/ssltest_old.c
|
||||
@@ -1460,6 +1460,11 @@ int main(int argc, char *argv[])
|
||||
ERR_print_errors(bio_err);
|
||||
goto end;
|
||||
}
|
||||
@ -57,3 +60,6 @@ diff -up a/CryptoPkg/Library/OpensslLib/openssl/test/ssltest_old.c.disable-ssl3
|
||||
/*
|
||||
* Since we will use low security ciphersuites and keys for testing set
|
||||
* security level to zero by default. Tests can override this by adding
|
||||
--
|
||||
2.17.0
|
||||
|
||||
|
@ -1,7 +1,6 @@
|
||||
diff -up a/CryptoPkg/Library/OpensslLib/openssl/crypto/x509/x509_cmp.c.issuer-hash b/CryptoPkg/Library/OpensslLib/openssl/crypto/x509/x509_cmp.c
|
||||
--- a/CryptoPkg/Library/OpensslLib/openssl/crypto/x509/x509_cmp.c.issuer-hash 2016-07-18 15:16:32.788881100 +0200
|
||||
+++ b/CryptoPkg/Library/OpensslLib/openssl/crypto/x509/x509_cmp.c 2016-07-18 15:17:16.671871840 +0200
|
||||
@@ -87,6 +87,7 @@ unsigned long X509_issuer_and_serial_has
|
||||
--- a/CryptoPkg/Library/OpensslLib/openssl/crypto/x509/x509_cmp.c
|
||||
+++ b/CryptoPkg/Library/OpensslLib/openssl/crypto/x509/x509_cmp.c
|
||||
@@ -39,6 +39,7 @@ unsigned long X509_issuer_and_serial_hash(X509 *a)
|
||||
|
||||
if (ctx == NULL)
|
||||
goto err;
|
||||
@ -9,3 +8,6 @@ diff -up a/CryptoPkg/Library/OpensslLib/openssl/crypto/x509/x509_cmp.c.issuer-ha
|
||||
f = X509_NAME_oneline(a->cert_info.issuer, NULL, 0);
|
||||
if (!EVP_DigestInit_ex(ctx, EVP_md5(), NULL))
|
||||
goto err;
|
||||
--
|
||||
2.17.0
|
||||
|
||||
|
@ -12,9 +12,9 @@
|
||||
fedpkg switch-branch master
|
||||
gitk -- sources
|
||||
|
||||
# the commit that added the 1.1.0e hobbled tarball is c676ac32d544,
|
||||
# subject "update to upstream version 1.1.0e"
|
||||
git checkout c676ac32d544
|
||||
# the commit that added the 1.1.0h hobbled tarball is 6eb8f620273
|
||||
# subject "update to upstream version 1.1.0h"
|
||||
git checkout 6eb8f620273
|
||||
|
||||
# fetch the hobbled tarball and verify the checksum
|
||||
(
|
||||
@ -32,15 +32,16 @@
|
||||
# unpack the hobbled tarball into edk2, according to
|
||||
# "OpenSSL-HOWTO.txt"; WORKSPACE stands for the root of the edk2 project
|
||||
# tree
|
||||
tar -x --xz -f openssl-1.1.0e-hobbled.tar.xz
|
||||
mv -- openssl-1.1.0e "$WORKSPACE"/CryptoPkg/Library/OpensslLib/openssl
|
||||
tar -x --xz -f openssl-1.1.0h-hobbled.tar.xz
|
||||
mv -- openssl-1.1.0h "$WORKSPACE"/CryptoPkg/Library/OpensslLib/openssl
|
||||
|
||||
# update the INF files as described in "OpenSSL-HOWTO.txt", then save
|
||||
# the results as a single commit
|
||||
cd "$WORKSPACE"/CryptoPkg/Library/OpensslLib
|
||||
perl process_files.pl
|
||||
git add -A
|
||||
git commit
|
||||
(cd "$WORKSPACE"/CryptoPkg/Library/OpensslLib && perl process_files.pl)
|
||||
git rm --cached CryptoPkg/Library/OpensslLib/openssl
|
||||
git commit -m'remove openssl submodule'
|
||||
git add -A CryptoPkg/Library/OpensslLib/openssl
|
||||
git commit -m'add openssl 1.1.0h'
|
||||
git format-patch -1
|
||||
|
||||
Then run the patch through this script which will build a new tar file.
|
||||
|
4
sources
4
sources
@ -1,3 +1,3 @@
|
||||
SHA512 (edk2-20171011-92d07e4.tar.xz) = b7afcefd21470df730648c32455d19e0e31caf15d6a9aedc36a1c390fccddd18719d2710cdd01cf6156bb7551c67fce2a3073bf640b756c32184d889a8d40d46
|
||||
SHA512 (openssl-1.1.0e-hobbled.tar.xz) = 25e7d5bddd28501de3f1488c91f4effb0e271986c836302680ea3754d73dceb1d34dd7460096bc28d3c0bced7dd5736dda15ccf5936d9313f4587f68a256efbc
|
||||
SHA512 (qemu-ovmf-secureboot-1.1.2.tar.gz) = 4dd7e06663bde90cea99849d47d4c94c48d573ac0454e56eab9174ade999b4dcef73fea63a9bc64d2bccecf8f69c9df2945b237a2f95a08c83d42d744e76d687
|
||||
SHA512 (openssl-1.1.0h-hobbled.tar.xz) = 6b544a5560a0a3d59b368e3f216284e79389112c87bb34289f8f6644a2454407161a1755b292e8045ff7c172237b070973b03610fd1da3d5204f4118a8644724
|
||||
SHA512 (edk2-20180529-ee3198e672e2.tar.xz) = ab6860417c035835ef25e0ac1aabeb17a46df61ebf72f55fcf43e4172b2728a61b28e661c06eab63fa3337b1156ba611faefa5a361ee4611ad70dba2a9fcd57b
|
||||
|
Loading…
Reference in New Issue
Block a user