On Wed, Nov 27, 2019 at 08:09:18AM +0100, Gerd Hoffmann wrote:
On Mon, Nov 25, 2019 at 07:26:17PM -0800, Your Real Name wrote:
From 9ca6590769692b99e98acf48acc3ce700238e451 Mon Sep 17 00:00:00 2001 From: gaobin gaobin@amazon.com Date: Thu, 19 Sep 2019 22:47:43 -0700 Subject: [PATCH 3/4] csm: Enable boot from pci option rom
In csm mode, the bev pointer of the pci option rom was not added to the bootentry list, resulting in failure to boot from pci option rom. This patch fixed it.
Signed-off-by: gaobin gaobin@amazon.com
src/fw/csm.c | 18 ++++++++++++++++++ src/optionroms.c | 2 +- src/util.h | 1 + 3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/src/fw/csm.c b/src/fw/csm.c index c8111cd..8e2a1aa 100644 --- a/src/fw/csm.c +++ b/src/fw/csm.c @@ -19,6 +19,7 @@ #include "std/acpi.h" // RSDP_SIGNATURE #include "std/bda.h" // struct bios_data_area_s #include "std/optionrom.h" // struct rom_header +#include "std/pnpbios.h" // PNP_SIGNATURE #include "util.h" // copy_smbios
#define UINT8 u8 @@ -218,12 +219,16 @@ handle_csm_0003(struct bregs *regs) regs->ax = 1; }
+static int rom_instance;
What is this? Not used anywhere in the patch ...
This is required on calling getRomPriority(). Please check below lines in the patch. boot_add_bev(FLATPTR_TO_SEG(rom), pnp->bev, pnp->productname, getRomPriority(sources, rom, rom_instance++));
cheers, Gerd