From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@infradead.org header.s=merlin.20170209 header.b=tex1MWCc; spf=none, err=permanent DNS error (domain: merlin.srs.infradead.org, ip: 205.233.59.134, mailfrom: batv+68c2678543dae80936a2+5784+infradead.org+dwmw2@merlin.srs.infradead.org) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by groups.io with SMTP; Tue, 25 Jun 2019 04:49:02 -0700 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=RVZrpWXZMGGkMM4E0edbQpd+CfSNQvs00sMtkh4/RZ8=; b=tex1MWCcnuM5B6blQqZ0CVQpR QMUqHH2Y1678d7rdr8nwebP9HqUd/ijJHlLgk1TjUC+vLfAxyWPP3trD65YsaoXgIQe/ut7ZyGGPV vXgWLdcIw/OG5rv4fEJ77tc8rs2XzbnPv0hpCrv3WiHKtiy22dAvszZqqsmnlIwiqQFlbZ+kPuw3x fGI2NTnsXtuEzAt0tbDaVVWa7RHJB1/nroXDSu02zhBMqsk+sOdpgLoW5pTlLoCJrI2TLsvW7MWEj /SyAHxHPWM9pIxp7rYhOZtH+8kcxFxpxfkWTUkikQr6CfrmE8frk4vXMj3/XioS7PFlsSvwpANChf i/fnY7JGA==; Received: from [2001:8b0:10b:1::425] (helo=i7.infradead.org) by merlin.infradead.org with esmtpsa (Exim 4.92 #3 (Red Hat Linux)) id 1hfjwZ-0007hB-Rw; Tue, 25 Jun 2019 11:49:00 +0000 Received: from dwoodhou by i7.infradead.org with local (Exim 4.92 #3 (Red Hat Linux)) id 1hfjwZ-003Kub-2g; Tue, 25 Jun 2019 12:48:59 +0100 From: "David Woodhouse" To: devel@edk2.groups.io Cc: Laszlo Ersek , Ray Ni Subject: [PATCH v2 1/7] OvmfPkg/LegacyBios: set NumberBbsEntries to the size of BbsTable Date: Tue, 25 Jun 2019 12:48:53 +0100 Message-Id: <20190625114859.795331-1-dwmw2@infradead.org> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Sender: David Woodhouse X-SRS-Rewrite: SMTP reverse-path rewritten from by merlin.infradead.org. See http://www.infradead.org/rpr.html Content-Transfer-Encoding: 8bit This is hard-coded in the IntThunk structure, and the additional entries will be needed for other devices like VirtIO and NVMe disks. So admit that they exist. Signed-off-by: David Woodhouse Acked-by: Laszlo Ersek --- OvmfPkg/Csm/LegacyBiosDxe/LegacyBios.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/OvmfPkg/Csm/LegacyBiosDxe/LegacyBios.c b/OvmfPkg/Csm/LegacyBiosDxe/LegacyBios.c index 05e3ffd2bb..5e795bfe65 100644 --- a/OvmfPkg/Csm/LegacyBiosDxe/LegacyBios.c +++ b/OvmfPkg/Csm/LegacyBiosDxe/LegacyBios.c @@ -565,12 +565,13 @@ ShadowAndStartLegacy16 ( EfiToLegacy16BootTable->BbsTable = (UINT32)(UINTN)BbsTable; Private->BbsTablePtr = (VOID *) BbsTable; + // - // Skip Floppy and possible onboard IDE drives + // Populate entire table with BBS_IGNORE_ENTRY // - EfiToLegacy16BootTable->NumberBbsEntries = 1 + 2 * MAX_IDE_CONTROLLER; + EfiToLegacy16BootTable->NumberBbsEntries = MAX_BBS_ENTRIES; - for (Index = 0; Index < (sizeof (Private->IntThunk->BbsTable) / sizeof (BBS_TABLE)); Index++) { + for (Index = 0; Index < MAX_BBS_ENTRIES; Index++) { BbsTable[Index].BootPriority = BBS_IGNORE_ENTRY; } // -- 2.21.0