tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-25 22:54:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg: BaseSerialPortLib16550: Add Mmio32 support

Browse Source 
Some buses doesn't allow 8 bit MMIO read/write, this adds support for
32 bits read/write

Signed-off-by: "Tien Hock, Loh" <tien.hock.loh@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Reviewed-by: Hao Wu <hao.a.wu@intel.com>
This commit is contained in:
Tien Hock, Loh 2019-04-26 14:26:44 +08:00 committed by Hao Wu
parent 679906d9bd
commit 8a472b1915
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.c
View File

@ -2,7 +2,7 @@
16550 UART Serial Port library functions 16550 UART Serial Port library functions
(C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR> (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>
Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2018, AMD Incorporated. All rights reserved.<BR> Copyright (c) 2018, AMD Incorporated. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent SPDX-License-Identifier: BSD-2-Clause-Patent
@ -62,7 +62,8 @@ typedef struct {
Read an 8-bit 16550 register. If PcdSerialUseMmio is TRUE, then the value is read from 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 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 parameter Offset is added to the base address of the 16550 registers that is specified
by PcdSerialRegisterBase. by PcdSerialRegisterBase. PcdSerialRegisterAccessWidth specifies the MMIO space access
width and defaults to 8 bit access, and supports 8 or 32 bit access.
@param Base The base address register of UART device. @param Base The base address register of UART device.
@param Offset The offset of the 16550 register to read. @param Offset The offset of the 16550 register to read.
@ -77,6 +78,9 @@ SerialPortReadRegister (
) )
{ {
if (PcdGetBool (PcdSerialUseMmio)) { if (PcdGetBool (PcdSerialUseMmio)) {
if (PcdGet8 (PcdSerialRegisterAccessWidth) == 32) {
return (UINT8) MmioRead32 (Base + Offset * PcdGet32 (PcdSerialRegisterStride));
}
return MmioRead8 (Base + Offset * PcdGet32 (PcdSerialRegisterStride)); return MmioRead8 (Base + Offset * PcdGet32 (PcdSerialRegisterStride));
} else { } else {
return IoRead8 (Base + Offset * PcdGet32 (PcdSerialRegisterStride)); return IoRead8 (Base + Offset * PcdGet32 (PcdSerialRegisterStride));
@ -87,7 +91,8 @@ SerialPortReadRegister (
Write an 8-bit 16550 register. If PcdSerialUseMmio is TRUE, then the value is written to 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 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 parameter Offset is added to the base address of the 16550 registers that is specified
by PcdSerialRegisterBase. by PcdSerialRegisterBase. PcdSerialRegisterAccessWidth specifies the MMIO space access
width and defaults to 8 bit access, and supports 8 or 32 bit access.
@param Base The base address register of UART device. @param Base The base address register of UART device.
@param Offset The offset of the 16550 register to write. @param Offset The offset of the 16550 register to write.
@ -104,6 +109,9 @@ SerialPortWriteRegister (
) )
{ {
if (PcdGetBool (PcdSerialUseMmio)) { if (PcdGetBool (PcdSerialUseMmio)) {
if (PcdGet8 (PcdSerialRegisterAccessWidth) == 32) {
return (UINT8) MmioWrite32 (Base + Offset * PcdGet32 (PcdSerialRegisterStride), (UINT8)Value);
}
return MmioWrite8 (Base + Offset * PcdGet32 (PcdSerialRegisterStride), Value); return MmioWrite8 (Base + Offset * PcdGet32 (PcdSerialRegisterStride), Value);
} else { } else {
return IoWrite8 (Base + Offset * PcdGet32 (PcdSerialRegisterStride), Value); return IoWrite8 (Base + Offset * PcdGet32 (PcdSerialRegisterStride), Value);

3
MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
View File

@ -1,7 +1,7 @@
## @file ## @file
# SerialPortLib instance for 16550 UART. # SerialPortLib instance for 16550 UART.
# #
# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
# SPDX-License-Identifier: BSD-2-Clause-Patent # SPDX-License-Identifier: BSD-2-Clause-Patent
# #
## ##
@ -29,6 +29,7 @@
BaseSerialPortLib16550.c BaseSerialPortLib16550.c
[Pcd] [Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterAccessWidth ## SOMETIMES_CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio ## CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl ## CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialDetectCable ## SOMETIMES_CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdSerialDetectCable ## SOMETIMES_CONSUMES

7
MdeModulePkg/MdeModulePkg.dec
View File

@ -1170,6 +1170,13 @@
# @Prompt Serial port registers use MMIO. # @Prompt Serial port registers use MMIO.
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio|FALSE|BOOLEAN|0x00020000 gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio|FALSE|BOOLEAN|0x00020000
## Indicates the access width for 16550 serial port registers.
# Default is 8-bit access mode.<BR><BR>
# 8 - 16550 serial port registers are accessed in 8-bit width.<BR>
# 32 - 16550 serial port registers are accessed in 32-bit width.<BR>
# @Prompt Serial port register access width.
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterAccessWidth|8|UINT8|0x00020007
## Indicates if the 16550 serial port hardware flow control will be enabled. Default is FALSE.<BR><BR> ## Indicates if the 16550 serial port hardware flow control will be enabled. Default is FALSE.<BR><BR>
# TRUE - 16550 serial port hardware flow control will be enabled.<BR> # TRUE - 16550 serial port hardware flow control will be enabled.<BR>
# FALSE - 16550 serial port hardware flow control will be disabled.<BR> # FALSE - 16550 serial port hardware flow control will be disabled.<BR>