soc/amd/*/uart: commonize UART code and MMIO device driver

Now that the SoC-specific UART controller data and the common code part
are cleanly separated, move the code to the common AMD UART support
block folder. The code is identical to the UART code in Cezanne,
Mendocino, Morgana and Picasso while Stoneyridge doesn't use the parts
related to the MMIO device driver.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: Id9429dac44bc02147a839db89d06e8eded7f1af2
Reviewed-on: https://review.coreboot.org/c/coreboot/+/68561
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>

2 files changed, 5 insertions, 98 deletions

diff --git a/src/soc/amd/picasso/chipset.cb b/src/soc/amd/picasso/chipset.cb
index ab286de864..e44ca8d098 100644
--- a/src/soc/amd/picasso/chipset.cb
+++ b/src/soc/amd/picasso/chipset.cb
@@ -49,8 +49,8 @@ chip soc/amd/picasso
 
 	device mmio 0xfedc4000 alias i2c_2 off ops soc_amd_i2c_mmio_ops end
 	device mmio 0xfedc5000 alias i2c_3 off ops soc_amd_i2c_mmio_ops end
-	device mmio 0xfedc9000 alias uart_0 off ops picasso_uart_mmio_ops end
-	device mmio 0xfedca000 alias uart_1 off ops picasso_uart_mmio_ops end
-	device mmio 0xfedce000 alias uart_2 off ops picasso_uart_mmio_ops end
-	device mmio 0xfedcf000 alias uart_3 off ops picasso_uart_mmio_ops end
+	device mmio 0xfedc9000 alias uart_0 off ops amd_uart_mmio_ops end
+	device mmio 0xfedca000 alias uart_1 off ops amd_uart_mmio_ops end
+	device mmio 0xfedce000 alias uart_2 off ops amd_uart_mmio_ops end
+	device mmio 0xfedcf000 alias uart_3 off ops amd_uart_mmio_ops end
 end
diff --git a/src/soc/amd/picasso/uart.c b/src/soc/amd/picasso/uart.c
index 5bb67da4b0..e3e3aa9792 100644
--- a/src/soc/amd/picasso/uart.c
+++ b/src/soc/amd/picasso/uart.c
@@ -5,7 +5,6 @@
 #include <device/device.h>
 #include <device/mmio.h>
 #include <amdblocks/gpio.h>
-#include <amdblocks/aoac.h>
 #include <amdblocks/uart.h>
 #include <soc/aoac_defs.h>
 #include <soc/gpio.h>
@@ -33,105 +32,13 @@ static const struct soc_uart_ctrlr_info uart_info[] = {
 		} },
 };
 
-static const struct soc_uart_ctrlr_info *soc_get_uart_ctrlr_info(size_t *num_ctrlrs)
+const struct soc_uart_ctrlr_info *soc_get_uart_ctrlr_info(size_t *num_ctrlrs)
 {
 	*num_ctrlrs = ARRAY_SIZE(uart_info);
 	return uart_info;
 }
 
-uintptr_t get_uart_base(unsigned int idx)
-{
-	size_t num_ctrlrs;
-	const struct soc_uart_ctrlr_info *ctrlr = soc_get_uart_ctrlr_info(&num_ctrlrs);
-
-	if (idx >= num_ctrlrs)
-		return 0;
-
-	return ctrlr[idx].base;
-}
-
-static enum cb_err get_uart_idx(uintptr_t base, const struct soc_uart_ctrlr_info *ctrlr,
-				size_t num_ctrlrs, unsigned int *idx)
-{
-	unsigned int i;
-	for (i = 0; i < num_ctrlrs; i++) {
-		if (base == ctrlr[i].base) {
-			*idx = i;
-			return CB_SUCCESS;
-		}
-	}
-	return CB_ERR;
-}
-
-static enum cb_err get_uart_aoac_device(uintptr_t base, unsigned int *aoac_dev)
-{
-	unsigned int idx;
-	size_t num_ctrlrs;
-	const struct soc_uart_ctrlr_info *ctrlr = soc_get_uart_ctrlr_info(&num_ctrlrs);
-
-	if (get_uart_idx(base, ctrlr, num_ctrlrs, &idx) == CB_ERR)
-		return CB_ERR;
-
-	*aoac_dev = ctrlr[idx].aoac_device;
-	return CB_SUCCESS;
-}
-
 void clear_uart_legacy_config(void)
 {
 	write16p(FCH_LEGACY_UART_DECODE, 0);
 }
-
-void set_uart_config(unsigned int idx)
-{
-	size_t num_ctrlrs;
-	const struct soc_uart_ctrlr_info *ctrlr = soc_get_uart_ctrlr_info(&num_ctrlrs);
-
-	if (idx >= num_ctrlrs)
-		return;
-
-	gpio_configure_pads(ctrlr[idx].mux, 2);
-}
-
-static const char *uart_acpi_name(const struct device *dev)
-{
-	unsigned int idx;
-	size_t num_ctrlrs;
-	const struct soc_uart_ctrlr_info *ctrlr = soc_get_uart_ctrlr_info(&num_ctrlrs);
-
-	if (get_uart_idx(dev->path.mmio.addr, ctrlr, num_ctrlrs, &idx) == CB_SUCCESS)
-		return ctrlr[idx].acpi_name;
-	else
-		return NULL;
-}
-
-/* Even though this is called enable, it gets called for both enabled and disabled devices. */
-static void uart_enable(struct device *dev)
-{
-	unsigned int dev_id;
-
-	if (get_uart_aoac_device(dev->path.mmio.addr, &dev_id) == CB_ERR) {
-		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);
-	}
-}
-
-static void uart_read_resources(struct device *dev)
-{
-	mmio_resource_kb(dev, 0, dev->path.mmio.addr / KiB, 4);
-}
-
-struct device_operations picasso_uart_mmio_ops = {
-	.read_resources = uart_read_resources,
-	.set_resources = noop_set_resources,
-	.scan_bus = scan_static_bus,
-	.acpi_name = uart_acpi_name,
-	.enable = uart_enable,
-	.acpi_fill_ssdt = uart_inject_ssdt,
-};