OrgACRN
/
slimbootloader
mirror of https://github.com/slimbootloader/slimbootloader.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix no SBL serial output after restart Windows (#459) 

SerialPortLib sets UART Scratch Register to a known value at the first
initialization to avoid unnecessary re-initialization afterward. But,
one of Windows driver(SIO) re-configures UART Registers while the Scratch
Register is preserved. As a result, SBL skips serial port initialization
after restarting from Windows.
Therefore, force to initialize Serial Port at Stage1A all the time simply.

Signed-off-by: Aiden Park <aiden.park@intel.com>
This commit is contained in:
Aiden Park 2019-11-18 19:14:44 -08:00 committed by GitHub
parent 94a980625a
commit ae9068e80c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BootloaderCommonPkg/BootloaderCommonPkg.dec
View File

@ -217,3 +217,5 @@
gPlatformCommonLibTokenSpaceGuid.PcdEmmcHs400SupportEnabled | TRUE | BOOLEAN | 0x20000214
# Determine if the Pre-OS checker should be executed or not.
gPlatformCommonLibTokenSpaceGuid.PcdPreOsCheckerEnabled | FALSE | BOOLEAN | 0x20000215
# This PCD will force to initialize SerialPort regardless of its initialized state
gPlatformCommonLibTokenSpaceGuid.PcdForceToInitSerialPort | FALSE | BOOLEAN | 0x20000216

3
BootloaderCommonPkg/Library/SerialPortLib/SerialPortLib.c
View File

@ -122,7 +122,8 @@ SerialPortInitialize (
UINTN Divisor;
UINT8 OutputData;
if (SerialPortReadRegister (SCR_OFFSET) != UART_MAGIC) {
if (FeaturePcdGet (PcdForceToInitSerialPort) || \
(SerialPortReadRegister (SCR_OFFSET) != UART_MAGIC)) {
//
// Calculate divisor for baud generator
//

2
BootloaderCommonPkg/Library/SerialPortLib/SerialPortLib.inf
View File

@ -33,4 +33,4 @@
PlatformHookLib
[Pcd]
gPlatformCommonLibTokenSpaceGuid.PcdForceToInitSerialPort

1
BootloaderCorePkg/BootloaderCorePkg.dsc
View File

@ -336,6 +336,7 @@
$(PLATFORM_PACKAGE)/Stage1A/Stage1A.inf {
<PcdsFeatureFlag>
gPlatformCommonLibTokenSpaceGuid.PcdMinDecompression | TRUE
gPlatformCommonLibTokenSpaceGuid.PcdForceToInitSerialPort | TRUE
<LibraryClasses>
BaseMemoryLib| MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
SocInitLib | Silicon/$(SILICON_PKG_NAME)/Library/Stage1ASocInitLib/Stage1ASocInitLib.inf

3
Silicon/ApollolakePkg/Library/SerialPortLib/SerialPortLib.c
View File

@ -111,7 +111,8 @@ SerialPortInitialize (
UINTN Divisor;
UINT8 OutputData;
if ((SerialPortReadRegister (SCR_OFFSET) & UART_MAGIC_MASK) != UART_MAGIC_VAL) {
if (FeaturePcdGet (PcdForceToInitSerialPort) || \
((SerialPortReadRegister (SCR_OFFSET) & UART_MAGIC_MASK) != UART_MAGIC_VAL)) {
//
// Calculate divisor for baud generator
//

1
Silicon/ApollolakePkg/Library/SerialPortLib/SerialPortLib.inf
View File

@ -33,3 +33,4 @@
PlatformHookLib
[Pcd]
gPlatformCommonLibTokenSpaceGuid.PcdForceToInitSerialPort