From 8049a528402f0a6d9e2d2eac8461e6431974cff3 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Tue, 26 Aug 2014 12:33:40 +0100 Subject: [PATCH] [mromprefix] Allow for .mrom images larger than 128kB The .mrom payload has a code type of 0xff and so the initialisation length field (single byte at offset 0x02) does not need to be present. Use only the PCI header's image length field, which allows the .mrom payload to be up to 32MB in size. Inspired-by: Swift Geek Signed-off-by: Michael Brown --- src/arch/i386/prefix/mromprefix.S | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/arch/i386/prefix/mromprefix.S b/src/arch/i386/prefix/mromprefix.S index 43f0d97d..4c94457c 100644 --- a/src/arch/i386/prefix/mromprefix.S +++ b/src/arch/i386/prefix/mromprefix.S @@ -196,7 +196,7 @@ find_mem_bar: movl %eax, %esi addr32 es movzbl 2(%esi), %ecx shll $7, %ecx - addr32 es movzbl 2(%esi,%ecx,4), %edx + addr32 es movzwl mpciheader_image_length(%esi,%ecx,4), %edx shll $7, %edx addl %edx, %ecx addr32 es rep movsl @@ -463,20 +463,12 @@ pci_set_mem_access: .org 0x00 mromheader: .word 0xaa55 /* BIOS extension signature */ -mromheader_size: .byte 0 /* Size in 512-byte blocks */ .org 0x18 .word mpciheader .org 0x1a .word 0 .size mromheader, . - mromheader - .section ".zinfo.fixup", "a", @progbits /* Compressor fixups */ - .ascii "APPB" - .long mromheader_size - .long 512 - .long 0 - .previous - mpciheader: .ascii "PCIR" /* Signature */ .word pci_vendor_id /* Vendor identification */