CorebootPayloadPkg: Use SerialDxe in MdeModulePkg
1. Update fdf and dsc to use SerialDxe in MdeModulePkg. 2. Separate the code that gets SerialRegBase and SerialRegAccessType by CbParseLib from CorebootPayloadPkg/Library/SerialPortLib to PlatformHookLib, and then leverage BaseSerialPortLib16550 in MdeModulePkg. 3. Remove CorebootPayloadPkg/SerialDxe and CorebootPayloadPkg/Library/SerialPortLib. Cc: Michael D Kinney <michael.d.kinney@intel.com> Cc: Liming Gao <liming.gao@intel.com> Cc: Maurice Ma <maurice.ma@intel.com> Cc: Prince Agyeman <prince.agyeman@intel.com> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Star Zeng <star.zeng@intel.com> Reviewed-by: Maurice Ma <maurice.ma@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18968 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Star Zeng
lzeng14
@@ -1,7 +1,7 @@
|
||||
/** @file
|
||||
Head file for BDS Platform specific code
|
||||
|
||||
Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<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
|
||||
@@ -29,7 +29,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
#include <Library/DevicePathLib.h>
|
||||
|
||||
#include <Protocol/PciIo.h>
|
||||
#include <Protocol/SerialIo.h>
|
||||
|
||||
#include <Guid/GlobalVariable.h>
|
||||
extern BDS_CONSOLE_CONNECT_ENTRY gPlatformConsole[];
|
||||
@@ -94,7 +93,7 @@ extern VENDOR_DEVICE_PATH gUartDeviceVenderNode;
|
||||
(UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8) \
|
||||
} \
|
||||
}, \
|
||||
EFI_SERIAL_IO_PROTOCOL_GUID \
|
||||
{0xD3987D4B, 0x971A, 0x435F, {0x8C, 0xAF, 0x49, 0x67, 0xEB, 0x62, 0x72, 0x41}} \
|
||||
}
|
||||
|
||||
#define gUart \
|
||||
|
||||
56
CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.c
Normal file
56
CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.c
Normal file
@@ -0,0 +1,56 @@
|
||||
/** @file
|
||||
Platform Hook Library instance for UART device upon coreboot.
|
||||
|
||||
Copyright (c) 2015, Intel Corporation. All rights reserved.<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>
|
||||
#include <Uefi/UefiBaseType.h>
|
||||
#include <Library/PlatformHookLib.h>
|
||||
#include <Library/CbParseLib.h>
|
||||
#include <Library/PcdLib.h>
|
||||
|
||||
/**
|
||||
Performs platform specific initialization required for the CPU to access
|
||||
the hardware associated with a SerialPortLib instance. This function does
|
||||
not intiailzie the serial port hardware itself. Instead, it initializes
|
||||
hardware devices that are required for the CPU to access the serial port
|
||||
hardware. This function may be called more than once.
|
||||
|
||||
@retval RETURN_SUCCESS The platform specific initialization succeeded.
|
||||
@retval RETURN_DEVICE_ERROR The platform specific initialization could not be completed.
|
||||
|
||||
**/
|
||||
RETURN_STATUS
|
||||
EFIAPI
|
||||
PlatformHookSerialPortInitialize (
|
||||
VOID
|
||||
)
|
||||
{
|
||||
RETURN_STATUS Status;
|
||||
UINT32 SerialRegBase;
|
||||
UINT32 SerialRegAccessType;
|
||||
|
||||
Status = CbParseSerialInfo (&SerialRegBase, &SerialRegAccessType, NULL);
|
||||
if (RETURN_ERROR (Status)) {
|
||||
return Status;
|
||||
}
|
||||
|
||||
if (SerialRegAccessType == 2) { //MMIO
|
||||
PcdSetBoolS (PcdSerialUseMmio, TRUE);
|
||||
} else { //IO
|
||||
PcdSetBoolS (PcdSerialUseMmio, FALSE);
|
||||
}
|
||||
PcdSet64S (PcdSerialRegisterBase, (UINT64) SerialRegBase);
|
||||
|
||||
return RETURN_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
## @file
|
||||
# SerialPortLib instance for UART device upon coreboot
|
||||
# Platform Hook Library instance for UART device upon coreboot.
|
||||
#
|
||||
# Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
|
||||
#
|
||||
# Copyright (c) 2014, Intel Corporation. All rights reserved.<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
|
||||
# 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.
|
||||
#
|
||||
@@ -14,29 +14,25 @@
|
||||
|
||||
[Defines]
|
||||
INF_VERSION = 0x00010005
|
||||
BASE_NAME = SerialPortLib
|
||||
BASE_NAME = PlatformHookLib
|
||||
FILE_GUID = 40A2CBC6-CFB8-447b-A90E-198E88FD345E
|
||||
MODULE_TYPE = BASE
|
||||
VERSION_STRING = 1.0
|
||||
LIBRARY_CLASS = SerialPortLib
|
||||
|
||||
CONSTRUCTOR = SerialPortInitialize
|
||||
|
||||
LIBRARY_CLASS = PlatformHookLib
|
||||
|
||||
[Sources]
|
||||
SerialPortLib.c
|
||||
|
||||
PlatformHookLib.c
|
||||
|
||||
[LibraryClasses]
|
||||
CbParseLib
|
||||
PcdLib
|
||||
|
||||
[Packages]
|
||||
MdePkg/MdePkg.dec
|
||||
MdeModulePkg/MdeModulePkg.dec
|
||||
CorebootModulePkg/CorebootModulePkg.dec
|
||||
|
||||
[LibraryClasses]
|
||||
BaseLib
|
||||
PcdLib
|
||||
IoLib
|
||||
CbParseLib
|
||||
|
||||
[Pcd]
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialBaudRate
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialLineControl
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialFifoControl
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio ## PRODUCES
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase ## PRODUCES
|
||||
|
||||
@@ -1,316 +0,0 @@
|
||||
/** @file
|
||||
SerialPortLib instance for UART device upon coreboot
|
||||
|
||||
Copyright (c) 2014, Intel Corporation. All rights reserved.<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 <Uefi/UefiBaseType.h>
|
||||
#include <Library/SerialPortLib.h>
|
||||
#include <Library/PcdLib.h>
|
||||
#include <Library/IoLib.h>
|
||||
#include <Library/CbParseLib.h>
|
||||
|
||||
//
|
||||
// 16550 UART register offsets and bitfields
|
||||
//
|
||||
#define R_UART_RXBUF 0
|
||||
#define R_UART_TXBUF 0
|
||||
#define R_UART_BAUD_LOW 0
|
||||
#define R_UART_BAUD_HIGH 1
|
||||
#define R_UART_FCR 2
|
||||
#define B_UART_FCR_FIFOE BIT0
|
||||
#define B_UART_FCR_FIFO64 BIT5
|
||||
#define R_UART_LCR 3
|
||||
#define B_UART_LCR_DLAB BIT7
|
||||
#define R_UART_MCR 4
|
||||
#define B_UART_MCR_RTS BIT1
|
||||
#define R_UART_LSR 5
|
||||
#define B_UART_LSR_RXRDY BIT0
|
||||
#define B_UART_LSR_TXRDY BIT5
|
||||
#define B_UART_LSR_TEMT BIT6
|
||||
#define R_UART_MSR 6
|
||||
#define B_UART_MSR_CTS BIT4
|
||||
#define B_UART_MSR_DSR BIT5
|
||||
|
||||
UINT32 mSerialRegBase = 0;
|
||||
UINT32 mSerialRegAccessType = 0;
|
||||
|
||||
/**
|
||||
Read an 8-bit 16550 register. If PcdSerialUseMmio is TRUE, then the value is read from
|
||||
MMIO space. If PcdSerialUseMmio is FALSE, then the value is read from I/O space. The
|
||||
parameter Offset is added to the base address of the 16550 registers that is specified
|
||||
by PcdSerialRegisterBase.
|
||||
|
||||
@param Offset The offset of the 16550 register to read.
|
||||
|
||||
@return The value read from the 16550 register.
|
||||
|
||||
**/
|
||||
UINT8
|
||||
SerialPortReadRegister (
|
||||
UINTN Offset
|
||||
)
|
||||
{
|
||||
if (mSerialRegAccessType == 2) { //MMIO
|
||||
return MmioRead8 (mSerialRegBase + Offset);
|
||||
} else { //IO
|
||||
return IoRead8 ((UINT16)mSerialRegBase + Offset);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
Write an 8-bit 16550 register. If PcdSerialUseMmio is TRUE, then the value is written to
|
||||
MMIO space. If PcdSerialUseMmio is FALSE, then the value is written to I/O space. The
|
||||
parameter Offset is added to the base address of the 16550 registers that is specified
|
||||
by PcdSerialRegisterBase.
|
||||
|
||||
@param Offset The offset of the 16550 register to write.
|
||||
@param Value The value to write to the 16550 register specified by Offset.
|
||||
|
||||
@return The value written to the 16550 register.
|
||||
|
||||
**/
|
||||
UINT8
|
||||
SerialPortWriteRegister (
|
||||
UINTN Offset,
|
||||
UINT8 Value
|
||||
)
|
||||
{
|
||||
if (mSerialRegAccessType == 2) { //MMIO
|
||||
return MmioWrite8 (mSerialRegBase + Offset, Value);
|
||||
} else {// IO
|
||||
return IoWrite8 ((UINT16)mSerialRegBase + Offset, Value);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
Initialize the serial device hardware.
|
||||
|
||||
If no initialization is required, then return RETURN_SUCCESS.
|
||||
If the serial device was successfully initialized, then return RETURN_SUCCESS.
|
||||
If the serial device could not be initialized, then return RETURN_DEVICE_ERROR.
|
||||
|
||||
@retval RETURN_SUCCESS The serial device was initialized.
|
||||
@retval RETURN_DEVICE_ERROR The serial device could not be initialized.
|
||||
|
||||
**/
|
||||
RETURN_STATUS
|
||||
EFIAPI
|
||||
SerialPortInitialize (
|
||||
VOID
|
||||
)
|
||||
{
|
||||
RETURN_STATUS Status;
|
||||
UINTN Divisor;
|
||||
BOOLEAN Initialized;
|
||||
|
||||
Status = CbParseSerialInfo (&mSerialRegBase, &mSerialRegAccessType, NULL);
|
||||
if (RETURN_ERROR (Status)) {
|
||||
return Status;
|
||||
}
|
||||
|
||||
//
|
||||
// See if the serial port is already initialized
|
||||
//
|
||||
Initialized = TRUE;
|
||||
if ((SerialPortReadRegister (R_UART_FCR) & (B_UART_FCR_FIFOE | B_UART_FCR_FIFO64)) !=
|
||||
(PcdGet8 (PcdSerialFifoControl) & (B_UART_FCR_FIFOE | B_UART_FCR_FIFO64)) ) {
|
||||
Initialized = FALSE;
|
||||
}
|
||||
|
||||
if ((SerialPortReadRegister (R_UART_LCR) & 0x3F) != (PcdGet8 (PcdSerialLineControl) & 0x3F)) {
|
||||
Initialized = FALSE;
|
||||
}
|
||||
SerialPortWriteRegister (R_UART_LCR, (UINT8)(SerialPortReadRegister (R_UART_LCR) | B_UART_LCR_DLAB));
|
||||
Divisor = SerialPortReadRegister (R_UART_BAUD_HIGH) << 8;
|
||||
Divisor |= SerialPortReadRegister (R_UART_BAUD_LOW);
|
||||
SerialPortWriteRegister (R_UART_LCR, (UINT8)(SerialPortReadRegister (R_UART_LCR) & ~B_UART_LCR_DLAB));
|
||||
if (Divisor != 115200 / PcdGet32 (PcdSerialBaudRate)) {
|
||||
Initialized = FALSE;
|
||||
}
|
||||
if (Initialized) {
|
||||
return RETURN_SUCCESS;
|
||||
}
|
||||
|
||||
//
|
||||
// Configure baud rate
|
||||
//
|
||||
Divisor = 115200 / PcdGet32 (PcdSerialBaudRate);
|
||||
SerialPortWriteRegister (R_UART_LCR, B_UART_LCR_DLAB);
|
||||
SerialPortWriteRegister (R_UART_BAUD_HIGH, (UINT8) (Divisor >> 8));
|
||||
SerialPortWriteRegister (R_UART_BAUD_LOW, (UINT8) (Divisor & 0xff));
|
||||
|
||||
//
|
||||
// Clear DLAB and configure Data Bits, Parity, and Stop Bits.
|
||||
// Strip reserved bits from PcdSerialLineControl
|
||||
//
|
||||
SerialPortWriteRegister (R_UART_LCR, (UINT8)(PcdGet8 (PcdSerialLineControl) & 0x3F));
|
||||
|
||||
//
|
||||
// Enable and reset FIFOs
|
||||
// Strip reserved bits from PcdSerialFifoControl
|
||||
//
|
||||
SerialPortWriteRegister (R_UART_FCR, (UINT8)(PcdGet8 (PcdSerialFifoControl) & 0x27));
|
||||
|
||||
//
|
||||
// Put Modem Control Register(MCR) into its reset state of 0x00.
|
||||
//
|
||||
SerialPortWriteRegister (R_UART_MCR, 0x00);
|
||||
|
||||
return RETURN_SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
Write data from buffer to serial device.
|
||||
|
||||
Writes NumberOfBytes data bytes from Buffer to the serial device.
|
||||
The number of bytes actually written to the serial device is returned.
|
||||
If the return value is less than NumberOfBytes, then the write operation failed.
|
||||
|
||||
If Buffer is NULL, then ASSERT().
|
||||
|
||||
If NumberOfBytes is zero, then return 0.
|
||||
|
||||
@param Buffer Pointer to the data buffer to be written.
|
||||
@param NumberOfBytes Number of bytes to written to the serial device.
|
||||
|
||||
@retval 0 NumberOfBytes is 0.
|
||||
@retval >0 The number of bytes written to the serial device.
|
||||
If this value is less than NumberOfBytes, then the read operation failed.
|
||||
|
||||
**/
|
||||
UINTN
|
||||
EFIAPI
|
||||
SerialPortWrite (
|
||||
IN UINT8 *Buffer,
|
||||
IN UINTN NumberOfBytes
|
||||
)
|
||||
{
|
||||
UINTN Result;
|
||||
UINTN Index;
|
||||
UINTN FifoSize;
|
||||
|
||||
if (Buffer == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (NumberOfBytes == 0) {
|
||||
//
|
||||
// Flush the hardware
|
||||
//
|
||||
|
||||
//
|
||||
// Wait for both the transmit FIFO and shift register empty.
|
||||
//
|
||||
while ((SerialPortReadRegister (R_UART_LSR) & B_UART_LSR_TEMT) == 0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
//
|
||||
// Compute the maximum size of the Tx FIFO
|
||||
//
|
||||
FifoSize = 1;
|
||||
if ((PcdGet8 (PcdSerialFifoControl) & B_UART_FCR_FIFOE) != 0) {
|
||||
if ((PcdGet8 (PcdSerialFifoControl) & B_UART_FCR_FIFO64) == 0) {
|
||||
FifoSize = 16;
|
||||
} else {
|
||||
FifoSize = 64;
|
||||
}
|
||||
}
|
||||
|
||||
Result = NumberOfBytes;
|
||||
while (NumberOfBytes != 0) {
|
||||
//
|
||||
// Wait for the serial port to be ready, to make sure both the transmit FIFO
|
||||
// and shift register empty.
|
||||
//
|
||||
while ((SerialPortReadRegister (R_UART_LSR) & B_UART_LSR_TEMT) == 0);
|
||||
|
||||
//
|
||||
// Fill then entire Tx FIFO
|
||||
//
|
||||
for (Index = 0; Index < FifoSize && NumberOfBytes != 0; Index++, NumberOfBytes--, Buffer++) {
|
||||
|
||||
//
|
||||
// Write byte to the transmit buffer.
|
||||
//
|
||||
SerialPortWriteRegister (R_UART_TXBUF, *Buffer);
|
||||
}
|
||||
}
|
||||
return Result;
|
||||
}
|
||||
|
||||
/**
|
||||
Reads data from a serial device into a buffer.
|
||||
|
||||
@param Buffer Pointer to the data buffer to store the data read from the serial device.
|
||||
@param NumberOfBytes Number of bytes to read from the serial device.
|
||||
|
||||
@retval 0 NumberOfBytes is 0.
|
||||
@retval >0 The number of bytes read from the serial device.
|
||||
If this value is less than NumberOfBytes, then the read operation failed.
|
||||
|
||||
**/
|
||||
UINTN
|
||||
EFIAPI
|
||||
SerialPortRead (
|
||||
OUT UINT8 *Buffer,
|
||||
IN UINTN NumberOfBytes
|
||||
)
|
||||
{
|
||||
UINTN Result;
|
||||
|
||||
if (NULL == Buffer) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
for (Result = 0; NumberOfBytes-- != 0; Result++, Buffer++) {
|
||||
//
|
||||
// Wait for the serial port to have some data.
|
||||
//
|
||||
while ((SerialPortReadRegister (R_UART_LSR) & B_UART_LSR_RXRDY) == 0);
|
||||
|
||||
//
|
||||
// Read byte from the receive buffer.
|
||||
//
|
||||
*Buffer = SerialPortReadRegister (R_UART_RXBUF);
|
||||
}
|
||||
|
||||
return Result;
|
||||
}
|
||||
|
||||
/**
|
||||
Polls a serial device to see if there is any data waiting to be read.
|
||||
|
||||
Polls aserial device to see if there is any data waiting to be read.
|
||||
If there is data waiting to be read from the serial device, then TRUE is returned.
|
||||
If there is no data waiting to be read from the serial device, then FALSE is returned.
|
||||
|
||||
@retval TRUE Data is waiting to be read from the serial device.
|
||||
@retval FALSE There is no data waiting to be read from the serial device.
|
||||
|
||||
**/
|
||||
BOOLEAN
|
||||
EFIAPI
|
||||
SerialPortPoll (
|
||||
VOID
|
||||
)
|
||||
{
|
||||
//
|
||||
// Read the serial port status
|
||||
//
|
||||
if ((SerialPortReadRegister (R_UART_LSR) & B_UART_LSR_RXRDY) != 0) {
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
Reference in New Issue
Block a user