Pass the HCDP table address to the kernel. If no such table exists,

NULL is passed. The address of the HCDP table can be found by
iterating over the configuration tables in the EFI system table.
To avoid more duplication, a function can be called with the GUID
of interest. The function will do the scanning. Use the function
in all places where we iterate over the configuration tables in
an attempt to find a specific one.

Bump the loader version number as the result of this.

Approved by: re (blanket)

2 files changed, 6 insertions, 14 deletions

diff --git a/sys/boot/ia64/efi/main.c b/sys/boot/ia64/efi/main.c
index 51ac572..82979e2 100644
--- a/sys/boot/ia64/efi/main.c
+++ b/sys/boot/ia64/efi/main.c
@@ -72,13 +72,8 @@ find_pal_proc(void)
 	};
 	u_int8_t *p;
 
-	for (i = 0; i < ST->NumberOfTableEntries; i++) {
-		if (!memcmp(&ST->ConfigurationTable[i].VendorGuid,
-				 &sal, sizeof(EFI_GUID)))
-			saltab = ST->ConfigurationTable[i].VendorTable;
-	}
-
-	if (!saltab) {
+	saltab = efi_get_table(&sal);
+	if (saltab == NULL) {
 		printf("Can't find SAL System Table\n");
 		return;
 	}
@@ -336,13 +331,8 @@ command_sal(int argc, char *argv[])
 	};
 	u_int8_t *p;
 
-	for (i = 0; i < ST->NumberOfTableEntries; i++) {
-		if (!memcmp(&ST->ConfigurationTable[i].VendorGuid,
-				 &sal, sizeof(EFI_GUID)))
-			saltab = ST->ConfigurationTable[i].VendorTable;
-	}
-
-	if (!saltab) {
+	saltab = efi_get_table(&sal);
+	if (saltab == NULL) {
 		printf("Can't find SAL System Table\n");
 		return CMD_ERROR;
 	}
diff --git a/sys/boot/ia64/efi/version b/sys/boot/ia64/efi/version
index 9ef0fcb..71f9400 100644
--- a/sys/boot/ia64/efi/version
+++ b/sys/boot/ia64/efi/version
@@ -3,6 +3,8 @@ $FreeBSD$
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
 
+1.1:	Pass the HCDP table address to the kernel via bootinfo if one
+	is present in the EFI system table.
 1.0:	Don't map the I/O port range. We expect the kernel to do it. It
 	was done in the loader as a debugging aid and not intended as a
 	service/feature.