diff mbox

[U-Boot,08/12] x86: Support writing configuration tables in high area

Message ID 1456642686-18887-9-git-send-email-bmeng.cn@gmail.com
State Accepted
Commit ff94c219e95843fe24710c16a66efdfb6ca536a9
Delegated to: Bin Meng
Headers show

Commit Message

Bin Meng Feb. 28, 2016, 6:58 a.m. UTC 
For those secondary bootloaders like SeaBIOS who want to live in
the F segment, which conflicts the configuration table address,
now we allow write_tables() to write the configuration tables in
high area (malloc'ed memory).

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 arch/x86/lib/tables.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

Comments

Simon Glass Feb. 29, 2016, 4:19 a.m. UTC | #1 
On 27 February 2016 at 23:58, Bin Meng <bmeng.cn@gmail.com> wrote:
> For those secondary bootloaders like SeaBIOS who want to live in
> the F segment, which conflicts the configuration table address,
> now we allow write_tables() to write the configuration tables in
> high area (malloc'ed memory).
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
>  arch/x86/lib/tables.c | 11 +++++++++++
>  1 file changed, 11 insertions(+)

Reviewed-by: Simon Glass <sjg@chromium.org>
Bin Meng Feb. 29, 2016, 7:32 a.m. UTC | #2 
On Mon, Feb 29, 2016 at 12:19 PM, Simon Glass <sjg@chromium.org> wrote:
> On 27 February 2016 at 23:58, Bin Meng <bmeng.cn@gmail.com> wrote:
>> For those secondary bootloaders like SeaBIOS who want to live in
>> the F segment, which conflicts the configuration table address,
>> now we allow write_tables() to write the configuration tables in
>> high area (malloc'ed memory).
>>
>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>> ---
>>
>>  arch/x86/lib/tables.c | 11 +++++++++++
>>  1 file changed, 11 insertions(+)
>
> Reviewed-by: Simon Glass <sjg@chromium.org>

applied to u-boot-x86/next, thanks!
diff mbox

Patch

diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c
index 9f0d928..eccef8a 100644
--- a/arch/x86/lib/tables.c
+++ b/arch/x86/lib/tables.c
@@ -67,11 +67,22 @@  void write_tables(void)
 {
 	u32 rom_table_start = ROM_TABLE_ADDR;
 	u32 rom_table_end;
+	u32 high_table, table_size;
 	int i;
 
 	for (i = 0; i < ARRAY_SIZE(table_write_funcs); i++) {
 		rom_table_end = table_write_funcs[i](rom_table_start);
 		rom_table_end = ALIGN(rom_table_end, ROM_TABLE_ALIGN);
+
+		table_size = rom_table_end - rom_table_start;
+		high_table = (u32)memalign(ROM_TABLE_ALIGN, table_size);
+		if (high_table) {
+			memset((void *)high_table, 0, table_size);
+			table_write_funcs[i](high_table);
+		} else {
+			printf("%d: no memory for configuration tables\n", i);
+		}
+
 		rom_table_start = rom_table_end;
 	}
 }