[U-Boot,v2,2/8] x86: slimbootloader: Add a function to access HOB
diff mbox series

Message ID A1484485FD99714DB2AB2C5EF81E7AC2AA713E5B@ORSMSX116.amr.corp.intel.com
State Superseded
Delegated to: Bin Meng
Headers show
Series
  • x86: Add basic Slim Bootloader payload support
Related show

Commit Message

Park, Aiden June 25, 2019, 11:17 p.m. UTC
- Added a function to get a GUID HOB data pointer from hob_list

Signed-off-by: Aiden Park <aiden.park@intel.com>
---
 arch/x86/cpu/slimbootloader/Makefile          |  2 +-
 arch/x86/cpu/slimbootloader/hob.c             | 97 +++++++++++++++++++
 .../asm/arch-slimbootloader/slimbootloader.h  | 14 +++
 3 files changed, 112 insertions(+), 1 deletion(-)
 create mode 100644 arch/x86/cpu/slimbootloader/hob.c

Comments

Bin Meng July 2, 2019, 2:13 p.m. UTC | #1
Hi Aiden,

On Wed, Jun 26, 2019 at 7:17 AM Park, Aiden <aiden.park@intel.com> wrote:
>
> - Added a function to get a GUID HOB data pointer from hob_list
>

We need some changes to arch/x86/lib/fsp/fsp_support.c: move these
fsp_get_xxx() APIs to a separate module (hob.c?) and rename them to
get_xxx() for both FSP based board and slim bootloader to use. Some
refactor is needed.

> Signed-off-by: Aiden Park <aiden.park@intel.com>
> ---
>  arch/x86/cpu/slimbootloader/Makefile          |  2 +-
>  arch/x86/cpu/slimbootloader/hob.c             | 97 +++++++++++++++++++
>  .../asm/arch-slimbootloader/slimbootloader.h  | 14 +++
>  3 files changed, 112 insertions(+), 1 deletion(-)
>  create mode 100644 arch/x86/cpu/slimbootloader/hob.c
>

Regards,
Bin
Park, Aiden July 8, 2019, 4:32 p.m. UTC | #2
Hi Bin,

> -----Original Message-----
> From: Bin Meng [mailto:bmeng.cn@gmail.com]
> Sent: Tuesday, July 2, 2019 7:13 AM
> To: Park, Aiden <aiden.park@intel.com>
> Cc: U-Boot Mailing List <u-boot@lists.denx.de>; Simon Glass
> <sjg@chromium.org>
> Subject: Re: [PATCH v2 2/8] x86: slimbootloader: Add a function to access
> HOB
> 
> Hi Aiden,
> 
> On Wed, Jun 26, 2019 at 7:17 AM Park, Aiden <aiden.park@intel.com> wrote:
> >
> > - Added a function to get a GUID HOB data pointer from hob_list
> >
> 
> We need some changes to arch/x86/lib/fsp/fsp_support.c: move these
> fsp_get_xxx() APIs to a separate module (hob.c?) and rename them to
> get_xxx() for both FSP based board and slim bootloader to use. Some
> refactor is needed.
Agree. Let me make a common hob module for FSP and Slim Bootloader.
> 
> > Signed-off-by: Aiden Park <aiden.park@intel.com>
> > ---
> >  arch/x86/cpu/slimbootloader/Makefile          |  2 +-
> >  arch/x86/cpu/slimbootloader/hob.c             | 97 +++++++++++++++++++
> >  .../asm/arch-slimbootloader/slimbootloader.h  | 14 +++
> >  3 files changed, 112 insertions(+), 1 deletion(-)  create mode 100644
> > arch/x86/cpu/slimbootloader/hob.c
> >
> 
> Regards,
> Bin

Best Regards,
Aiden

Patch
diff mbox series

diff --git a/arch/x86/cpu/slimbootloader/Makefile b/arch/x86/cpu/slimbootloader/Makefile
index 627a721e8c..620fc8a139 100644
--- a/arch/x86/cpu/slimbootloader/Makefile
+++ b/arch/x86/cpu/slimbootloader/Makefile
@@ -2,4 +2,4 @@ 
 #
 # Copyright (C) 2019 Intel Corporation <www.intel.com>
 
-obj-y += car.o slimbootloader.o
+obj-y += car.o slimbootloader.o hob.o
diff --git a/arch/x86/cpu/slimbootloader/hob.c b/arch/x86/cpu/slimbootloader/hob.c
new file mode 100644
index 0000000000..dff86b696e
--- /dev/null
+++ b/arch/x86/cpu/slimbootloader/hob.c
@@ -0,0 +1,97 @@ 
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2019 Intel Corporation <www.intel.com>
+ */
+
+#include <common.h>
+#include <asm/arch/slimbootloader.h>
+
+/*
+ * This compares two guids and returns its result(0 or others).
+ *
+ * @guid1:  A pointer to a 128 bit guid
+ * @guid2:  A pointer to a 128 bit guid
+ *
+ * @return: 0 if guid1 and guid2 are identical. Otherwise it returns none 0.
+ */
+static int compare_guid(const struct efi_guid *guid1,
+			const struct efi_guid *guid2)
+{
+	return memcmp(guid1, guid2, sizeof(struct efi_guid));
+}
+
+/**
+ * This returns a hob header pointer which has a specific type from the given
+ * hob list.
+ *
+ * @type:     A specific hob type
+ * @hob_list: A pointer to a hob list
+ *
+ * @return:   A hob header pointer if the specified type is found.
+ *            Otherwise, this returns NULL.
+ */
+static const struct hob_header *get_next_hob_from_hdr(uint type,
+						      const void *hob_list)
+{
+	const struct hob_header *hdr;
+
+	hdr = hob_list;
+
+	/* Parse the HOB list until end of list or matching type is found */
+	while (!end_of_hob(hdr)) {
+		if (hdr->type == type)
+			return hdr;
+
+		hdr = get_next_hob(hdr);
+	}
+
+	return NULL;
+}
+
+/**
+ * This returns a hob header pointer which has a specific guid from the given
+ * hob list.
+ *
+ * @guid:     A pointer to a 128 bit guid
+ * @hob_list: A pointer to a hob list
+ *
+ * @return:   A hob header pointer if the specified guid hob entry is found.
+ *            Otherwise, this returns NULL.
+ */
+static const struct hob_header *get_next_guid_hob(const struct efi_guid *guid,
+						  const void *hob_list)
+{
+	const struct hob_header *hdr;
+	struct hob_guid *guid_hob;
+
+	hdr = hob_list;
+	while ((hdr = get_next_hob_from_hdr(HOB_TYPE_GUID_EXT, hdr))) {
+		guid_hob = (struct hob_guid *)hdr;
+		if (!compare_guid(guid, &guid_hob->name))
+			break;
+		hdr = get_next_hob(hdr);
+	}
+
+	return hdr;
+}
+
+/**
+ * This returns a pointer to hob data buffer if the given guid hob is found.
+ *
+ * @guid:     A pointer to a 128 bit guid
+ * @hob_list: A pointer to a hob list
+ *
+ * @return:   A pointer to hob data buffer if the specified guid hob entry is
+ *            found. Otherwise, this returns NULL.
+ */
+void *get_next_guid_hob_data(const struct efi_guid *guid,
+			     const void *hob_list)
+{
+	const struct hob_header *guid_hob;
+
+	guid_hob = get_next_guid_hob(guid, hob_list);
+	if (!guid_hob)
+		return NULL;
+
+	return get_guid_hob_data(guid_hob);
+}
diff --git a/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h b/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h
index 7309a83724..bd1f4ee374 100644
--- a/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h
+++ b/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h
@@ -7,5 +7,19 @@ 
 #define __SLIMBOOTLOADER_ARCH_H__
 
 #include <common.h>
+#include <asm/fsp/fsp_types.h>
+#include <asm/fsp/fsp_hob.h>
+
+/**
+ * This returns a pointer to hob data buffer if the given guid hob is found.
+ *
+ * @guid:     A pointer to a 128 bit guid
+ * @hob_list: A pointer to a hob list
+ *
+ * @return:   A pointer to hob data buffer if the specified guid hob entry is
+ *            found. Otherwise, this returns NULL.
+ */
+void *get_next_guid_hob_data(const struct efi_guid *guid,
+			     const void *hob_list);
 
 #endif