From b58374fe91a4d599c18f2b99501a54f73850f4de Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sun, 10 Jun 2012 19:01:20 +0100 Subject: [PATCH] [romprefix] Allow .mrom image to be placed anywhere within the BAR A .mrom image currently assumes that it is the first image within the expansion ROM BAR, which may not be correct when multiple images are present. Fix by scanning through the BAR until we locate an image matching our build ID. Signed-off-by: Michael Brown --- src/arch/i386/prefix/mromprefix.S | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/arch/i386/prefix/mromprefix.S b/src/arch/i386/prefix/mromprefix.S index d7b7fc3f..abe1c9e3 100644 --- a/src/arch/i386/prefix/mromprefix.S +++ b/src/arch/i386/prefix/mromprefix.S @@ -154,6 +154,18 @@ find_mem_bar: movw $PCI_BAR_EXPROM, %di call pci_write_config_dword + /* Locate our ROM image */ +1: addr32 es cmpw $0xaa55, (%eax) + stc + jne 99f + addr32 es cmpl $_build_id, build_id(%eax) + je 2f + addr32 es movzbl 2(%eax), %ecx + shll $9, %ecx + addl %ecx, %eax + jmp 1b +2: + /* Copy payload to buffer, or set buffer address to BAR address */ testl %esi, %esi jz 1f