david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

[mromprefix] Use PCI length field to obtain length of individual images 

mromprefix.S currently uses the initialisation length field (single
byte at offset 0x02) to determine the length of a ROM image within a
multi-image ROM BAR.  For PCI ROM images with a code type other than
0, the initialisation length field may not be present.

Fix by using the PCI header's image length field instead.

Inspired-by: Swift Geek <swiftgeek@gmail.com>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2014-08-26 12:29:54 +01:00
parent ee0c24902a
commit 3937274cfb
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/arch/i386/prefix/mromprefix.S
View File

@ -30,6 +30,8 @@ FILE_LICENCE ( GPL2_OR_LATER )
#define PCI_BAR_5 0x24
#define PCI_BAR_EXPROM 0x30
#define PCIR_SIGNATURE ( 'P' + ( 'C' << 8 ) + ( 'I' << 16 ) + ( 'R' << 24 ) )
#define ROMPREFIX_EXCLUDE_PAYLOAD 1
#define ROMPREFIX_MORE_IMAGES 1
#define _pcirom_start _mrom_start
@ -158,18 +160,26 @@ find_mem_bar:
call pci_write_config_dword
/* Locate our ROM image */
1: movl $0xaa55, %ecx /* 55aa signature */
1: movl $0xaa55, %ecx /* 55aa signature */
addr32 es cmpw %cx, (%eax)
je 2f
stc
movl %eax, %esi /* Report failure address */
jmp 99f
2: addr32 es cmpl $_build_id, build_id(%eax)
jne 2f
movl $PCIR_SIGNATURE, %ecx /* PCIR signature */
addr32 es movzwl 0x18(%eax), %edx
addr32 es cmpl %ecx, (%eax,%edx)
jne 2f
addr32 es cmpl $_build_id, build_id(%eax) /* iPXE build ID */
je 3f
addr32 es movzbl 2(%eax), %ecx
movl $0x80, %ecx /* Last image */
addr32 es testb %cl, 0x15(%eax,%edx)
jnz 2f
addr32 es movzwl 0x10(%eax,%edx), %ecx /* PCIR image length */
shll $9, %ecx
addl %ecx, %eax
jmp 1b
2: /* Failure */
stc
movl %eax, %esi /* Report failure address */
jmp 99f
3:
/* Copy payload to buffer, or set buffer address to BAR address */