diff options
| -rw-r--r-- | src/arch/x86/boot.c | 12 | ||||
| -rw-r--r-- | src/include/program_loading.h | 2 | ||||
| -rw-r--r-- | src/lib/selfboot.c | 13 |
3 files changed, 20 insertions, 7 deletions
diff --git a/src/arch/x86/boot.c b/src/arch/x86/boot.c index 2e1becf0be..d157f96380 100644 --- a/src/arch/x86/boot.c +++ b/src/arch/x86/boot.c @@ -11,6 +11,7 @@ * GNU General Public License for more details. */ +#include <commonlib/helpers.h> #include <console/console.h> #include <arch/stages.h> #include <program_loading.h> @@ -205,6 +206,17 @@ int arch_supports_bounce_buffer(void) return 1; } +int payload_arch_usable_ram_quirk(uint64_t start, uint64_t size) +{ + if (start < 1 * MiB && (start + size) <= 1 * MiB) { + printk(BIOS_DEBUG, + "Payload being loaded at below 1MiB without region being marked as RAM usable.\n"); + return 1; + } + + return 0; +} + static void try_payload(struct prog *prog) { if (prog_type(prog) == PROG_PAYLOAD) { diff --git a/src/include/program_loading.h b/src/include/program_loading.h index e5d26e1d42..3cf1687ffa 100644 --- a/src/include/program_loading.h +++ b/src/include/program_loading.h @@ -188,6 +188,8 @@ void backup_ramstage_section(uintptr_t base, size_t size); * PAYLOAD LOADING * ***********************/ +int payload_arch_usable_ram_quirk(uint64_t start, uint64_t size); + /* Load payload into memory in preparation to run. */ void payload_load(void); diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c index 1cf32e5bd7..42f7efcc28 100644 --- a/src/lib/selfboot.c +++ b/src/lib/selfboot.c @@ -333,9 +333,13 @@ static int build_self_segment_list( return 1; } +__weak int payload_arch_usable_ram_quirk(uint64_t start, uint64_t size) +{ + return 0; +} + static int payload_targets_usable_ram(struct segment *head) { - const unsigned long one_meg = (1UL << 20); struct segment *ptr; for (ptr = head->next; ptr != head; ptr = ptr->next) { @@ -343,13 +347,8 @@ static int payload_targets_usable_ram(struct segment *head) ptr->s_memsz)) continue; - if (ptr->s_dstaddr < one_meg && - (ptr->s_dstaddr + ptr->s_memsz) <= one_meg) { - printk(BIOS_DEBUG, - "Payload being loaded at below 1MiB " - "without region being marked as RAM usable.\n"); + if (payload_arch_usable_ram_quirk(ptr->s_dstaddr, ptr->s_memsz)) continue; - } /* Payload segment not targeting RAM. */ printk(BIOS_ERR, "SELF Payload doesn't target RAM:\n"); |