[coreboot-gerrit] Change in coreboot[master]: arch/x86/walkcbfs.S: Use FMAP instead "cbfs master header"

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/52879 )

Change subject: arch/x86/walkcbfs.S: Use FMAP instead "cbfs master header"
......................................................................

arch/x86/walkcbfs.S: Use FMAP instead "cbfs master header"

Tested on qemu/i440fx on X86_64. Page tables are found in cbfs.

Change-Id: Ibab657cc40cd5c09c3a73c54950b98ac45a98dbf
Signed-off-by: Arthur Heymans 
---
M src/arch/x86/walkcbfs.S
1 file changed, 5 insertions(+), 25 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/79/52879/1

diff --git a/src/arch/x86/walkcbfs.S b/src/arch/x86/walkcbfs.S
index 393bcf5..4608e2c 100644
--- a/src/arch/x86/walkcbfs.S
+++ b/src/arch/x86/walkcbfs.S
@@ -1,13 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */

-#define CBFS_HEADER_PTR 0xfffffffc
-
-#define CBFS_HEADER_MAGIC 0
-#define CBFS_HEADER_VERSION (CBFS_HEADER_MAGIC + 4)
-#define CBFS_HEADER_ROMSIZE (CBFS_HEADER_VERSION + 4)
-#define CBFS_HEADER_BOOTBLOCKSIZE (CBFS_HEADER_ROMSIZE + 4)
-#define CBFS_HEADER_ALIGN (CBFS_HEADER_BOOTBLOCKSIZE + 4)
-#define CBFS_HEADER_OFFSET (CBFS_HEADER_ALIGN + 4)
+#include <fmap_config.h>

/* we use this instead of CBFS_HEADER_ALIGN because the latter is retired. */
 #define CBFS_ALIGNMENT 64
@@ -33,14 +26,7 @@
 walkcbfs_asm:
    cld

-	mov CBFS_HEADER_PTR, %eax
-	mov CBFS_HEADER_ROMSIZE(%eax), %ecx
-	bswap %ecx
-	mov $0, %ebx
-	sub %ecx, %ebx	/* ROM base address in ebx */
-	mov CBFS_HEADER_OFFSET(%eax), %ecx
-	bswap %ecx
-	add %ecx, %ebx	/* address where we start looking for LARCHIVEs */
+	movl $FMAP_SECTION_COREBOOT_START, %ebx

/* determine filename length */
    mov $0, %eax
@@ -96,17 +82,11 @@
    mov %ecx, %ebx

check_for_exit:
-	/* look if we should exit: did we pass into the bootblock already? */
-	mov CBFS_HEADER_PTR, %ecx
-	mov CBFS_HEADER_BOOTBLOCKSIZE(%ecx), %ecx
-	bswap %ecx
-	not %ecx
-	add $1, %ecx
+	/* if addr <= COREBOOT_END - 1, continue */
+#define FMAP_SECTION_COREBOOT_END (FMAP_SECTION_COREBOOT_START - 1 + FMAP_SECTION_COREBOOT_SIZE)

+	movl $FMAP_SECTION_COREBOOT_END, %ecx
    cmp %ecx, %ebx
-	/* if bootblockstart >= addr (==we're still in the data area),
-	 * jump back
-	 */
    jbe walker

out: