GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/amd/picasso: Add ability to enable/disable UART to device tree 

If we are not using the UARTs or they don't have the correct GPIOs
configured we should let the mainboard disable them.

BUG=b:153001807
TEST=Dump SSDT and see UART device is disabled

Signed-off-by: Raul E Rangel <rrangel@chromium.org>
Change-Id: Ifc04e36e0ebe5cce4b6cc228c7174dc76f2ffa4a
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42327
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
This commit is contained in:
Raul E Rangel 2020-06-11 16:57:23 -06:00 committed by Felix Held
parent ef3395d990
commit 34fb9399de
2 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/soc/amd/picasso/acpi/sb_fch.asl
View File

@ -122,11 +122,6 @@ Device (FUR0)
Return (Local0) Return (Local0)
} }
} }
Method (_STA, 0x0, NotSerialized)
{
Return (0x0F)
}
} }
Device (FUR1) { Device (FUR1) {
@ -158,11 +153,6 @@ Device (FUR1) {
Return (Local0) Return (Local0)
} }
} }
Method (_STA, 0x0, NotSerialized)
{
Return (0x0F)
}
} }
Device (FUR2) { Device (FUR2) {
@ -194,11 +184,6 @@ Device (FUR2) {
Return (Local0) Return (Local0)
} }
} }
Method (_STA, 0x0, NotSerialized)
{
Return (0x0F)
}
} }
Device (FUR3) { Device (FUR3) {
@ -230,11 +215,6 @@ Device (FUR3) {
Return (Local0) Return (Local0)
} }
} }
Method (_STA, 0x0, NotSerialized)
{
Return (0x0F)
}
} }
Device (I2C2) { Device (I2C2) {

45
src/soc/amd/picasso/uart.c
View File

@ -1,6 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpigen.h>
#include <console/uart.h> #include <console/uart.h>
#include <console/console.h>
#include <commonlib/helpers.h> #include <commonlib/helpers.h>
#include <device/mmio.h> #include <device/mmio.h>
#include <amdblocks/gpio_banks.h> #include <amdblocks/gpio_banks.h>
@ -108,9 +110,52 @@ static const char *uart_acpi_name(const struct device *dev)
} }
} }
/* Even though this is called enable, it gets called for both enabled and disabled devices. */
static void uart_enable(struct device *dev)
{
int dev_id;
switch (dev->path.mmio.addr) {
case APU_UART0_BASE:
dev_id = FCH_AOAC_DEV_UART0;
break;
case APU_UART1_BASE:
dev_id = FCH_AOAC_DEV_UART1;
break;
case APU_UART2_BASE:
dev_id = FCH_AOAC_DEV_UART2;
break;
case APU_UART3_BASE:
dev_id = FCH_AOAC_DEV_UART3;
break;
default:
printk(BIOS_ERR, "%s: Unknown device: %s\n", __func__, dev_path(dev));
return;
}
if (dev->enabled) {
power_on_aoac_device(dev_id);
wait_for_aoac_enabled(dev_id);
} else {
power_off_aoac_device(dev_id);
}
}
/* This gets called for both enabled and disabled devices. */
static void uart_inject_ssdt(const struct device *dev)
{
acpigen_write_scope(acpi_device_path(dev));
acpigen_write_STA(acpi_device_status(dev));
acpigen_pop_len(); /* Scope */
}
struct device_operations picasso_uart_mmio_ops = { struct device_operations picasso_uart_mmio_ops = {
.read_resources = noop_read_resources, .read_resources = noop_read_resources,
.set_resources = noop_set_resources, .set_resources = noop_set_resources,
.scan_bus = scan_static_bus, .scan_bus = scan_static_bus,
.acpi_name = uart_acpi_name, .acpi_name = uart_acpi_name,
.enable = uart_enable,
.acpi_fill_ssdt = uart_inject_ssdt,
}; };