summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/arm/tables.c34
-rw-r--r--src/arch/arm64/tables.c34
-rw-r--r--src/arch/mips/tables.c34
-rw-r--r--src/arch/power8/tables.c35
-rw-r--r--src/arch/riscv/tables.c34
-rw-r--r--src/arch/x86/tables.c65
6 files changed, 16 insertions, 220 deletions
diff --git a/src/arch/arm/tables.c b/src/arch/arm/tables.c
index 92213c5b9c..eef6bf2ffd 100644
--- a/src/arch/arm/tables.c
+++ b/src/arch/arm/tables.c
@@ -15,14 +15,9 @@
* GNU General Public License for more details.
*/
-#include <console/console.h>
-#include <cpu/cpu.h>
#include <bootmem.h>
#include <boot/tables.h>
#include <boot/coreboot_tables.h>
-#include <string.h>
-#include <cbmem.h>
-#include <lib.h>
void arch_write_tables(uintptr_t coreboot_table)
{
@@ -32,35 +27,6 @@ void bootmem_arch_add_ranges(void)
{
}
-#define MAX_COREBOOT_TABLE_SIZE CONFIG_COREBOOT_TABLE_SIZE
-
-void write_tables(void)
-{
- unsigned long table_pointer, new_table_pointer;
-
- post_code(0x9d);
-
- table_pointer = (unsigned long)cbmem_add(CBMEM_ID_CBTABLE,
- MAX_COREBOOT_TABLE_SIZE);
- if (!table_pointer) {
- printk(BIOS_ERR, "Could not add CBMEM for coreboot table.\n");
- return;
- }
-
- new_table_pointer = write_coreboot_table(0UL, 0UL,
- table_pointer, table_pointer);
-
- if (new_table_pointer > (table_pointer + MAX_COREBOOT_TABLE_SIZE)) {
- printk(BIOS_ERR, "coreboot table didn't fit (%lx/%x bytes)\n",
- new_table_pointer - table_pointer, MAX_COREBOOT_TABLE_SIZE);
- }
-
- printk(BIOS_DEBUG, "coreboot table: %ld bytes.\n",
- new_table_pointer - table_pointer);
-
- post_code(0x9e);
-}
-
void lb_arch_add_records(struct lb_header *header)
{
}
diff --git a/src/arch/arm64/tables.c b/src/arch/arm64/tables.c
index 92213c5b9c..eef6bf2ffd 100644
--- a/src/arch/arm64/tables.c
+++ b/src/arch/arm64/tables.c
@@ -15,14 +15,9 @@
* GNU General Public License for more details.
*/
-#include <console/console.h>
-#include <cpu/cpu.h>
#include <bootmem.h>
#include <boot/tables.h>
#include <boot/coreboot_tables.h>
-#include <string.h>
-#include <cbmem.h>
-#include <lib.h>
void arch_write_tables(uintptr_t coreboot_table)
{
@@ -32,35 +27,6 @@ void bootmem_arch_add_ranges(void)
{
}
-#define MAX_COREBOOT_TABLE_SIZE CONFIG_COREBOOT_TABLE_SIZE
-
-void write_tables(void)
-{
- unsigned long table_pointer, new_table_pointer;
-
- post_code(0x9d);
-
- table_pointer = (unsigned long)cbmem_add(CBMEM_ID_CBTABLE,
- MAX_COREBOOT_TABLE_SIZE);
- if (!table_pointer) {
- printk(BIOS_ERR, "Could not add CBMEM for coreboot table.\n");
- return;
- }
-
- new_table_pointer = write_coreboot_table(0UL, 0UL,
- table_pointer, table_pointer);
-
- if (new_table_pointer > (table_pointer + MAX_COREBOOT_TABLE_SIZE)) {
- printk(BIOS_ERR, "coreboot table didn't fit (%lx/%x bytes)\n",
- new_table_pointer - table_pointer, MAX_COREBOOT_TABLE_SIZE);
- }
-
- printk(BIOS_DEBUG, "coreboot table: %ld bytes.\n",
- new_table_pointer - table_pointer);
-
- post_code(0x9e);
-}
-
void lb_arch_add_records(struct lb_header *header)
{
}
diff --git a/src/arch/mips/tables.c b/src/arch/mips/tables.c
index 32e73bc1e2..50d2a55650 100644
--- a/src/arch/mips/tables.c
+++ b/src/arch/mips/tables.c
@@ -16,14 +16,9 @@
* GNU General Public License for more details.
*/
-#include <console/console.h>
-#include <cpu/cpu.h>
#include <bootmem.h>
#include <boot/tables.h>
#include <boot/coreboot_tables.h>
-#include <string.h>
-#include <cbmem.h>
-#include <lib.h>
void arch_write_tables(uintptr_t coreboot_table)
{
@@ -33,35 +28,6 @@ void bootmem_arch_add_ranges(void)
{
}
-#define MAX_COREBOOT_TABLE_SIZE CONFIG_COREBOOT_TABLE_SIZE
-
-void write_tables(void)
-{
- unsigned long table_pointer, new_table_pointer;
-
- post_code(0x9d);
-
- table_pointer = (unsigned long)cbmem_add(CBMEM_ID_CBTABLE,
- MAX_COREBOOT_TABLE_SIZE);
- if (!table_pointer) {
- printk(BIOS_ERR, "Could not add CBMEM for coreboot table.\n");
- return;
- }
-
- new_table_pointer = write_coreboot_table(0UL, 0UL, table_pointer,
- table_pointer);
-
- if (new_table_pointer > (table_pointer + MAX_COREBOOT_TABLE_SIZE))
- printk(BIOS_ERR, "coreboot table didn't fit (%lx/%x bytes)\n",
- new_table_pointer - table_pointer,
- MAX_COREBOOT_TABLE_SIZE);
-
- printk(BIOS_DEBUG, "coreboot table: %ld bytes.\n",
- new_table_pointer - table_pointer);
-
- post_code(0x9e);
-}
-
void lb_arch_add_records(struct lb_header *header)
{
}
diff --git a/src/arch/power8/tables.c b/src/arch/power8/tables.c
index ff07c31066..eef6bf2ffd 100644
--- a/src/arch/power8/tables.c
+++ b/src/arch/power8/tables.c
@@ -15,14 +15,9 @@
* GNU General Public License for more details.
*/
-#include <console/console.h>
-#include <cpu/cpu.h>
#include <bootmem.h>
#include <boot/tables.h>
#include <boot/coreboot_tables.h>
-#include <string.h>
-#include <cbmem.h>
-#include <lib.h>
void arch_write_tables(uintptr_t coreboot_table)
{
@@ -32,36 +27,6 @@ void bootmem_arch_add_ranges(void)
{
}
-#define MAX_COREBOOT_TABLE_SIZE CONFIG_COREBOOT_TABLE_SIZE
-
-void write_tables(void)
-{
- unsigned long table_pointer, new_table_pointer;
-
- post_code(0x9d);
-
- table_pointer = (unsigned long)cbmem_add(CBMEM_ID_CBTABLE,
- MAX_COREBOOT_TABLE_SIZE);
- if (!table_pointer) {
- printk(BIOS_ERR, "Could not add CBMEM for coreboot table.\n");
- return;
- }
-
- new_table_pointer = write_coreboot_table(0UL, 0UL,
- table_pointer, table_pointer);
-
- if (new_table_pointer > (table_pointer + MAX_COREBOOT_TABLE_SIZE)) {
- printk(BIOS_ERR, "coreboot table didn't fit (%lx/%x bytes)\n",
- new_table_pointer - table_pointer,
- MAX_COREBOOT_TABLE_SIZE);
- }
-
- printk(BIOS_DEBUG, "coreboot table: %ld bytes.\n",
- new_table_pointer - table_pointer);
-
- post_code(0x9e);
-}
-
void lb_arch_add_records(struct lb_header *header)
{
}
diff --git a/src/arch/riscv/tables.c b/src/arch/riscv/tables.c
index 92213c5b9c..eef6bf2ffd 100644
--- a/src/arch/riscv/tables.c
+++ b/src/arch/riscv/tables.c
@@ -15,14 +15,9 @@
* GNU General Public License for more details.
*/
-#include <console/console.h>
-#include <cpu/cpu.h>
#include <bootmem.h>
#include <boot/tables.h>
#include <boot/coreboot_tables.h>
-#include <string.h>
-#include <cbmem.h>
-#include <lib.h>
void arch_write_tables(uintptr_t coreboot_table)
{
@@ -32,35 +27,6 @@ void bootmem_arch_add_ranges(void)
{
}
-#define MAX_COREBOOT_TABLE_SIZE CONFIG_COREBOOT_TABLE_SIZE
-
-void write_tables(void)
-{
- unsigned long table_pointer, new_table_pointer;
-
- post_code(0x9d);
-
- table_pointer = (unsigned long)cbmem_add(CBMEM_ID_CBTABLE,
- MAX_COREBOOT_TABLE_SIZE);
- if (!table_pointer) {
- printk(BIOS_ERR, "Could not add CBMEM for coreboot table.\n");
- return;
- }
-
- new_table_pointer = write_coreboot_table(0UL, 0UL,
- table_pointer, table_pointer);
-
- if (new_table_pointer > (table_pointer + MAX_COREBOOT_TABLE_SIZE)) {
- printk(BIOS_ERR, "coreboot table didn't fit (%lx/%x bytes)\n",
- new_table_pointer - table_pointer, MAX_COREBOOT_TABLE_SIZE);
- }
-
- printk(BIOS_DEBUG, "coreboot table: %ld bytes.\n",
- new_table_pointer - table_pointer);
-
- post_code(0x9e);
-}
-
void lb_arch_add_records(struct lb_header *header)
{
}
diff --git a/src/arch/x86/tables.c b/src/arch/x86/tables.c
index 94fe691bcb..edcb71705c 100644
--- a/src/arch/x86/tables.c
+++ b/src/arch/x86/tables.c
@@ -27,8 +27,6 @@
#include <cbmem.h>
#include <smbios.h>
-#define MAX_COREBOOT_TABLE_SIZE CONFIG_COREBOOT_TABLE_SIZE
-
static unsigned long write_pirq_table(unsigned long rom_table_end)
{
unsigned long high_table_pointer;
@@ -181,8 +179,15 @@ static unsigned long write_smbios_table(unsigned long rom_table_end)
return rom_table_end;
}
+/* Start forwarding table at 0x500, so we don't run into conflicts with the BDA
+ * in case our data structures grow beyond 0x400. Only GDT
+ * and the coreboot table use low_tables.
+ */
+static uintptr_t forwarding_table = 0x500;
+
void arch_write_tables(uintptr_t coreboot_table)
{
+ size_t sz;
unsigned long rom_table_end = 0xf0000;
/* This table must be between 0x0f0000 and 0x100000 */
@@ -198,56 +203,18 @@ void arch_write_tables(uintptr_t coreboot_table)
if (IS_ENABLED(CONFIG_GENERATE_SMBIOS_TABLES))
rom_table_end = write_smbios_table(rom_table_end);
-}
-void bootmem_arch_add_ranges(void)
-{
+ sz = write_coreboot_forwarding_table(forwarding_table, coreboot_table);
+
+ forwarding_table += sz;
+ /* Align up to page boundary for historical consistency. */
+ forwarding_table = ALIGN_UP(forwarding_table, 4*KiB);
}
-void write_tables(void)
+void bootmem_arch_add_ranges(void)
{
- unsigned long low_table_start, low_table_end;
-
- /* Even if high tables are configured, some tables are copied both to
- * the low and the high area, so payloads and OSes don't need to know
- * about the high tables.
- */
- unsigned long high_table_pointer;
-
- /* Start low addr at 0x500, so we don't run into conflicts with the BDA
- * in case our data structures grow beyond 0x400. Only GDT
- * and the coreboot table use low_tables.
- */
- low_table_start = 0;
- low_table_end = 0x500;
+ /* Memory from 0 through the forwarding_table is reserved. */
+ const uintptr_t base = 0;
- post_code(0x9e);
-
- post_code(0x9d);
-
- high_table_pointer = (unsigned long)cbmem_add(CBMEM_ID_CBTABLE, MAX_COREBOOT_TABLE_SIZE);
-
- if (high_table_pointer) {
- unsigned long new_high_table_pointer;
-
- /* FIXME: The high_table_base parameter is not reference when tables are high,
- * or high_table_pointer >1 MB.
- */
- u64 fixme_high_tables_base = 0;
-
- /* Also put a forwarder entry into 0-4K */
- new_high_table_pointer = write_coreboot_table(low_table_start, low_table_end,
- fixme_high_tables_base, high_table_pointer);
-
- if (new_high_table_pointer > (high_table_pointer +
- MAX_COREBOOT_TABLE_SIZE))
- printk(BIOS_ERR, "%s: coreboot table didn't fit (%lx)\n",
- __func__, new_high_table_pointer -
- high_table_pointer);
-
- printk(BIOS_DEBUG, "coreboot table: %ld bytes.\n",
- new_high_table_pointer - high_table_pointer);
- } else {
- printk(BIOS_ERR, "Could not add CBMEM for coreboot table.\n");
- }
+ bootmem_add_range(base, forwarding_table - base, LB_MEM_TABLE);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 19:27:23 +0000