From: Michael Brown <mcb30@ipxe.org>
Date: Sun, 10 Jun 2012 18:01:20 +0000 (+0100)
Subject: [romprefix] Allow .mrom image to be placed anywhere within the BAR
X-Git-Tag: v1.20.1~1754
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b58374fe91a4d599c18f2b99501a54f73850f4de;p=thirdparty%2Fipxe.git

[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 <mcb30@ipxe.org>
---

diff --git a/src/arch/i386/prefix/mromprefix.S b/src/arch/i386/prefix/mromprefix.S
index d7b7fc3f7..abe1c9e30 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