sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "UPSTREAM: soc/amd/sabrina,vc/amd/fsp/sabrina: Add UART support for Sabrina"

Browse Source 
This reverts commit 78261e308de5361b2ff045091e8fb18cad2a5035.

Reason for revert: Now that PSP supports a soft fuse flag to toggle the
verstage serial logs, prevent PSP verstage from writing to the UART.

BUG=None
TEST=Build and boot to OS in Skyrim with PSP verstage. Ensure that PSP
verstage logs are not seen twice in the console.

Signed-off-by: Karthikeyan Ramasubramanian <kramasub@google.com>
Change-Id: I7ef2d585c320ea5903197939136dd2049a71af95
Reviewed-on: https://review.coreboot.org/c/coreboot/+/66248
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
This commit is contained in:
Karthikeyan Ramasubramanian
2022-07-28 16:57:26 -06:00
committed by Felix Held
parent 63696fcf90
commit 6e3d40f2d1
2 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/soc/amd/sabrina/psp_verstage/uart.c
View File

@ -4,23 +4,8 @@
#include <amdblocks/uart.h> #include <amdblocks/uart.h>
#include <types.h> #include <types.h>
static void *uart_bars[FCH_UART_ID_MAX];
uintptr_t get_uart_base(unsigned int idx) uintptr_t get_uart_base(unsigned int idx)
{ {
uint32_t err; /* Mapping the UART is not supported. */
if (idx >= ARRAY_SIZE(uart_bars))
return 0; return 0;
if (uart_bars[idx])
return (uintptr_t)uart_bars[idx];
err = svc_map_fch_dev(FCH_IO_DEVICE_UART, idx, 0, &uart_bars[idx]);
if (err) {
svc_debug_print("Failed to map UART\n");
return 0;
}
return (uintptr_t)uart_bars[idx];
} }

7
src/vendorcode/amd/fsp/sabrina/include/bl_uapp/bl_syscall_public.h
View File

@ -91,16 +91,9 @@ enum fch_io_device {
FCH_IO_DEVICE_MISC, FCH_IO_DEVICE_MISC,
FCH_IO_DEVICE_AOAC, FCH_IO_DEVICE_AOAC,
FCH_IO_DEVICE_IOPORT, FCH_IO_DEVICE_IOPORT,
FCH_IO_DEVICE_UART,
FCH_IO_DEVICE_END, FCH_IO_DEVICE_END,
}; };
enum fch_uart_id {
FCH_UART_ID_0 = 0,
FCH_UART_ID_1 = 1,
FCH_UART_ID_MAX,
};
enum fch_i2c_controller_id { enum fch_i2c_controller_id {
FCH_I2C_CONTROLLER_ID_0 = 0, FCH_I2C_CONTROLLER_ID_0 = 0,
FCH_I2C_CONTROLLER_ID_1 = 1, FCH_I2C_CONTROLLER_ID_1 = 1,