summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/amd/cezanne/chipset.cb4
-rw-r--r--src/soc/amd/cezanne/uart.c95
-rw-r--r--src/soc/amd/common/block/include/amdblocks/uart.h4
-rw-r--r--src/soc/amd/common/block/uart/Makefile.inc10
-rw-r--r--src/soc/amd/common/block/uart/uart.c113
-rw-r--r--src/soc/amd/common/block/uart/uart_acpi.c15
-rw-r--r--src/soc/amd/mendocino/chipset_mendocino.cb10
-rw-r--r--src/soc/amd/mendocino/chipset_rembrandt.cb10
-rw-r--r--src/soc/amd/mendocino/uart.c95
-rw-r--r--src/soc/amd/morgana/chipset.cb10
-rw-r--r--src/soc/amd/morgana/uart.c95
-rw-r--r--src/soc/amd/picasso/chipset.cb8
-rw-r--r--src/soc/amd/picasso/uart.c95
-rw-r--r--src/soc/amd/stoneyridge/uart.c25
14 files changed, 150 insertions, 439 deletions
diff --git a/src/soc/amd/cezanne/chipset.cb b/src/soc/amd/cezanne/chipset.cb
index 2c4ff52f43..3b6e0d8349 100644
--- a/src/soc/amd/cezanne/chipset.cb
+++ b/src/soc/amd/cezanne/chipset.cb
@@ -111,7 +111,7 @@ chip soc/amd/cezanne
device mmio 0xfedc3000 alias i2c_1 off ops soc_amd_i2c_mmio_ops end
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 cezanne_uart_mmio_ops end
- device mmio 0xfedca000 alias uart_1 off ops cezanne_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 0xfedd5000 alias emmc off ops amd_emmc_mmio_ops end
end
diff --git a/src/soc/amd/cezanne/uart.c b/src/soc/amd/cezanne/uart.c
index 684786b51e..3ac7deb755 100644
--- a/src/soc/amd/cezanne/uart.c
+++ b/src/soc/amd/cezanne/uart.c
@@ -1,6 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <amdblocks/aoac.h>
#include <amdblocks/gpio.h>
#include <amdblocks/uart.h>
#include <commonlib/helpers.h>
@@ -25,105 +24,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 cezanne_uart_mmio_ops = {
- .read_resources = uart_read_resources,
- .set_resources = noop_set_resources,
- .scan_bus = scan_static_bus,
- .enable = uart_enable,
- .acpi_name = uart_acpi_name,
- .acpi_fill_ssdt = uart_inject_ssdt,
-};
diff --git a/src/soc/amd/common/block/include/amdblocks/uart.h b/src/soc/amd/common/block/include/amdblocks/uart.h
index a613bbec83..fbce4e8167 100644
--- a/src/soc/amd/common/block/include/amdblocks/uart.h
+++ b/src/soc/amd/common/block/include/amdblocks/uart.h
@@ -15,7 +15,9 @@ struct soc_uart_ctrlr_info {
};
uintptr_t get_uart_base(unsigned int idx); /* get MMIO base address of FCH UART */
-void uart_inject_ssdt(const struct device *dev);
void set_uart_config(unsigned int idx); /* configure hardware of FCH UART selected by idx */
+/* Getter function to get the SoC UART Controller Information. */
+const struct soc_uart_ctrlr_info *soc_get_uart_ctrlr_info(size_t *num_ctrlrs);
+
#endif /* AMD_BLOCK_UART_H */
diff --git a/src/soc/amd/common/block/uart/Makefile.inc b/src/soc/amd/common/block/uart/Makefile.inc
index 6982fcf35d..153878cb6b 100644
--- a/src/soc/amd/common/block/uart/Makefile.inc
+++ b/src/soc/amd/common/block/uart/Makefile.inc
@@ -1,11 +1,17 @@
ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_UART),y)
+# all-y can't be used, since verstage on PSP has a different implementation
+bootblock-y += uart.c
+verstage_x86-y += uart.c
+romstage-y += uart.c
+postcar-y += uart.c
+ramstage-y += uart.c
+smm-$(CONFIG_DEBUG_SMI) += uart.c
+
all-$(CONFIG_AMD_SOC_CONSOLE_UART) += uart_console.c
ifeq ($(CONFIG_DEBUG_SMI),y)
smm-$(CONFIG_AMD_SOC_CONSOLE_UART) += uart_console.c
endif
-ramstage-$(CONFIG_HAVE_ACPI_TABLES) += uart_acpi.c
-
endif # CONFIG_SOC_AMD_COMMON_BLOCK_UART
diff --git a/src/soc/amd/common/block/uart/uart.c b/src/soc/amd/common/block/uart/uart.c
new file mode 100644
index 0000000000..125e780e63
--- /dev/null
+++ b/src/soc/amd/common/block/uart/uart.c
@@ -0,0 +1,113 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <acpi/acpigen.h>
+#include <amdblocks/aoac.h>
+#include <amdblocks/gpio.h>
+#include <amdblocks/uart.h>
+#include <device/device.h>
+
+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 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);
+}
+
+#if CONFIG(HAVE_ACPI_TABLES)
+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;
+}
+
+/* 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 */
+}
+#endif
+
+/* 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 amd_uart_mmio_ops = {
+ .read_resources = uart_read_resources,
+ .set_resources = noop_set_resources,
+ .scan_bus = scan_static_bus,
+ .enable = uart_enable,
+#if CONFIG(HAVE_ACPI_TABLES)
+ .acpi_name = uart_acpi_name,
+ .acpi_fill_ssdt = uart_inject_ssdt,
+#endif
+};
diff --git a/src/soc/amd/common/block/uart/uart_acpi.c b/src/soc/amd/common/block/uart/uart_acpi.c
deleted file mode 100644
index eb17322741..0000000000
--- a/src/soc/amd/common/block/uart/uart_acpi.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpigen.h>
-#include <amdblocks/uart.h>
-#include <device/device.h>
-
-/* This gets called for both enabled and disabled devices. */
-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 */
-}
diff --git a/src/soc/amd/mendocino/chipset_mendocino.cb b/src/soc/amd/mendocino/chipset_mendocino.cb
index 170b44cb68..23afdba8a3 100644
--- a/src/soc/amd/mendocino/chipset_mendocino.cb
+++ b/src/soc/amd/mendocino/chipset_mendocino.cb
@@ -88,10 +88,10 @@ chip soc/amd/mendocino
device mmio 0xfedc3000 alias i2c_1 off ops soc_amd_i2c_mmio_ops end
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 mendocino_uart_mmio_ops end
- device mmio 0xfedca000 alias uart_1 off ops mendocino_uart_mmio_ops end
- device mmio 0xfedce000 alias uart_2 off ops mendocino_uart_mmio_ops end
- device mmio 0xfedcf000 alias uart_3 off ops mendocino_uart_mmio_ops end
- device mmio 0xfedd1000 alias uart_4 off ops mendocino_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
+ device mmio 0xfedd1000 alias uart_4 off ops amd_uart_mmio_ops end
device mmio 0xfedd5000 alias emmc off ops amd_emmc_mmio_ops end
end
diff --git a/src/soc/amd/mendocino/chipset_rembrandt.cb b/src/soc/amd/mendocino/chipset_rembrandt.cb
index 170b44cb68..23afdba8a3 100644
--- a/src/soc/amd/mendocino/chipset_rembrandt.cb
+++ b/src/soc/amd/mendocino/chipset_rembrandt.cb
@@ -88,10 +88,10 @@ chip soc/amd/mendocino
device mmio 0xfedc3000 alias i2c_1 off ops soc_amd_i2c_mmio_ops end
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 mendocino_uart_mmio_ops end
- device mmio 0xfedca000 alias uart_1 off ops mendocino_uart_mmio_ops end
- device mmio 0xfedce000 alias uart_2 off ops mendocino_uart_mmio_ops end
- device mmio 0xfedcf000 alias uart_3 off ops mendocino_uart_mmio_ops end
- device mmio 0xfedd1000 alias uart_4 off ops mendocino_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
+ device mmio 0xfedd1000 alias uart_4 off ops amd_uart_mmio_ops end
device mmio 0xfedd5000 alias emmc off ops amd_emmc_mmio_ops end
end
diff --git a/src/soc/amd/mendocino/uart.c b/src/soc/amd/mendocino/uart.c
index 07e831c63f..d4bf2feae9 100644
--- a/src/soc/amd/mendocino/uart.c
+++ b/src/soc/amd/mendocino/uart.c
@@ -1,6 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <amdblocks/aoac.h>
#include <amdblocks/gpio.h>
#include <amdblocks/uart.h>
#include <commonlib/helpers.h>
@@ -37,105 +36,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 mendocino_uart_mmio_ops = {
- .read_resources = uart_read_resources,
- .set_resources = noop_set_resources,
- .scan_bus = scan_static_bus,
- .enable = uart_enable,
- .acpi_name = uart_acpi_name,
- .acpi_fill_ssdt = uart_inject_ssdt,
-};
diff --git a/src/soc/amd/morgana/chipset.cb b/src/soc/amd/morgana/chipset.cb
index 9407e79dd8..ffea57d79b 100644
--- a/src/soc/amd/morgana/chipset.cb
+++ b/src/soc/amd/morgana/chipset.cb
@@ -90,10 +90,10 @@ chip soc/amd/morgana
device mmio 0xfedc3000 alias i2c_1 off ops soc_amd_i2c_mmio_ops end
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 morgana_uart_mmio_ops end
- device mmio 0xfedca000 alias uart_1 off ops morgana_uart_mmio_ops end
- device mmio 0xfedce000 alias uart_2 off ops morgana_uart_mmio_ops end
- device mmio 0xfedcf000 alias uart_3 off ops morgana_uart_mmio_ops end
- device mmio 0xfedd1000 alias uart_4 off ops morgana_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
+ device mmio 0xfedd1000 alias uart_4 off ops amd_uart_mmio_ops end
device mmio 0xfedd5000 alias emmc off ops amd_emmc_mmio_ops end
end
diff --git a/src/soc/amd/morgana/uart.c b/src/soc/amd/morgana/uart.c
index f6c552c8d4..401a134cf5 100644
--- a/src/soc/amd/morgana/uart.c
+++ b/src/soc/amd/morgana/uart.c
@@ -2,7 +2,6 @@
/* TODO: Update for Morgana */
-#include <amdblocks/aoac.h>
#include <amdblocks/gpio.h>
#include <amdblocks/uart.h>
#include <commonlib/helpers.h>
@@ -39,105 +38,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 morgana_uart_mmio_ops = {
- .read_resources = uart_read_resources,
- .set_resources = noop_set_resources,
- .scan_bus = scan_static_bus,
- .enable = uart_enable,
- .acpi_name = uart_acpi_name,
- .acpi_fill_ssdt = uart_inject_ssdt,
-};
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,
-};
diff --git a/src/soc/amd/stoneyridge/uart.c b/src/soc/amd/stoneyridge/uart.c
index 837a1bff7e..86e2626a50 100644
--- a/src/soc/amd/stoneyridge/uart.c
+++ b/src/soc/amd/stoneyridge/uart.c
@@ -1,6 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <amdblocks/aoac.h>
#include <amdblocks/gpio.h>
#include <amdblocks/uart.h>
#include <soc/aoac_defs.h>
@@ -19,30 +18,8 @@ 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;
-}
-
-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);
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 11:25:36 +0000