From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=qRewHmNP; spf=none, err=permanent DNS error (domain: bombadil.srs.infradead.org, ip: 198.137.202.133, mailfrom: batv+4ee85e816e9c5e68d393+5785+infradead.org+dwmw2@bombadil.srs.infradead.org) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by groups.io with SMTP; Wed, 26 Jun 2019 04:37:44 -0700 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To: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:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=ZrHrS0Y5ky6mSCYDY44KNgw9kh62aRw/70qw00S4sn0=; b=qRewHmNPiB3oxesea+pqNO6imF g7nVvsjsjec8XLCOMC8AU4oO3SbF07p7MPIWAhx4bAxn3y5xzceTVphFEyJRjXi+uy/DpArICt7MK OqrN6q0CaOMrgQ2FyRwxKQUBqTIb9DweLZRMjyZddkwG1CBFm78WsEA9m4xdXQ5etSE3l5nO4Ho/0 Z12afQlxX7B59L8Qp0H4IBrS+k2XapIdX62O/KuwTeBjkjhkzz/AVs8BQvPOoJ8+Rc1dQiaRujot7 JIaqsHa7RAISH8wgnQSVHab4ezoGZsOmb1uLY5M8JawgqltH0/kWs4G7dSsresNjX7XyO7zHWFgTJ r+1z3cMQ==; Received: from [2001:8b0:10b:1::425] (helo=i7.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.92 #3 (Red Hat Linux)) id 1hg6FD-0007g6-RE; Wed, 26 Jun 2019 11:37:43 +0000 Received: from dwoodhou by i7.infradead.org with local (Exim 4.92 #3 (Red Hat Linux)) id 1hg6FC-003RKA-K3; Wed, 26 Jun 2019 12:37:42 +0100 From: "David Woodhouse" To: devel@edk2.groups.io Cc: Laszlo Ersek Subject: [PATCH v3 1/4] OvmfPkg/LegacyBios: set NumberBbsEntries to the size of BbsTable Date: Wed, 26 Jun 2019 12:37:39 +0100 Message-Id: <20190626113742.819933-2-dwmw2@infradead.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190626113742.819933-1-dwmw2@infradead.org> References: <20190626113742.819933-1-dwmw2@infradead.org> MIME-Version: 1.0 Sender: David Woodhouse X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.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 05e3ffd2bbb8..5e795bfe6570 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