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=TSWTHx6T; spf=none, err=permanent DNS error (domain: bombadil.srs.infradead.org, ip: 198.137.202.133, mailfrom: batv+2e1b3bf406a0b60cb2b2+5780+infradead.org+dwmw2@bombadil.srs.infradead.org) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by groups.io with SMTP; Fri, 21 Jun 2019 15:31:58 -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=rhjOkQ4jdsyy8NtO35xzZcEWcmiZEfnKrHVH+m+uUlY=; b=TSWTHx6TCRk6Eu/i6a7h5ReMSa Xf57dQ612yNm5FQVjhco5elk9TpKdmSLhH4w/p+kPCF4FyNMDc5kQ/vMnFIdQQBp4FFlmynDgzzF+ jjsh+rDGX9yCEgdk1XAqZiAR3JcghS7l091SiONng8JLljzHHEC7Ir4AGFTiDY8KB3xFC6gQ//TQN J+dBP7z/UPll5U9MN1OzLhArvaPcsYS8QcHJSkfDTNOnLn7YVnieO1dEoJWzmVO1NIPQ+iiuweoQE kVKHOUhd5qgu3WLNykdePDt0PT2qq/3rZNKhl7g49sYNehiQQ1yLbdi0pKBRBwU+YYSAl+bLeOJbd W0OyWmDg==; 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 1heS4b-0000KQ-QS; Fri, 21 Jun 2019 22:31:57 +0000 Received: from dwoodhou by i7.infradead.org with local (Exim 4.92 #3 (Red Hat Linux)) id 1heS4a-002wVH-Ia; Fri, 21 Jun 2019 23:31:56 +0100 From: "David Woodhouse" To: devel@edk2.groups.io Cc: Laszlo Ersek , Ray Ni Subject: [PATCH 2/7] OvmfPkg/LegacyBbs: Add boot entries for VirtIO and NVME devices Date: Fri, 21 Jun 2019 23:31:51 +0100 Message-Id: <20190621223156.701502-2-dwmw2@infradead.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190621223156.701502-1-dwmw2@infradead.org> References: <20190621223156.701502-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 Iterate over the available block devices in much the same way as BdsLibEnumerateAllBootOption() does, but limiting to those devices which are PCI-backed, which can be represented in the BbsTable. One day we might need to extend the BbsTable to allow us to distinguish between different NVMe namespaces on a device. Signed-off-by: David Woodhouse Acked-by: Laszlo Ersek --- OvmfPkg/Csm/LegacyBiosDxe/LegacyBbs.c | 162 +++++++++++++++++++++++++- 1 file changed, 157 insertions(+), 5 deletions(-) diff --git a/OvmfPkg/Csm/LegacyBiosDxe/LegacyBbs.c b/OvmfPkg/Csm/LegacyBiosDxe/LegacyBbs.c index 6b1dd344f3..cc84712d25 100644 --- a/OvmfPkg/Csm/LegacyBiosDxe/LegacyBbs.c +++ b/OvmfPkg/Csm/LegacyBiosDxe/LegacyBbs.c @@ -140,10 +140,14 @@ LegacyBiosBuildBbs ( IN BBS_TABLE *BbsTable ) { - UINTN BbsIndex; - HDD_INFO *HddInfo; - UINTN HddIndex; - UINTN Index; + UINTN BbsIndex; + HDD_INFO *HddInfo; + UINTN HddIndex; + UINTN Index; + EFI_HANDLE *BlockIoHandles; + UINTN NumberBlockIoHandles; + UINTN BlockIndex; + EFI_STATUS Status; // // First entry is floppy. @@ -252,8 +256,156 @@ LegacyBiosBuildBbs ( } } - return EFI_SUCCESS; + // + // Add non-IDE block devices + // + BbsIndex = HddIndex * 2 + 1; + + Status = gBS->LocateHandleBuffer ( + ByProtocol, + &gEfiBlockIoProtocolGuid, + NULL, + &NumberBlockIoHandles, + &BlockIoHandles + ); + if (!EFI_ERROR(Status)) { + UINTN Removable; + EFI_BLOCK_IO_PROTOCOL *BlkIo; + EFI_PCI_IO_PROTOCOL *PciIo; + EFI_DEVICE_PATH_PROTOCOL *DevicePath; + EFI_DEVICE_PATH_PROTOCOL *DevicePathNode; + EFI_HANDLE PciHandle; + UINTN SegNum; + UINTN BusNum; + UINTN DevNum; + UINTN FuncNum; + + for (Removable = 0; Removable < 2; Removable++) { + for (BlockIndex = 0; BlockIndex < NumberBlockIoHandles; BlockIndex++) { + Status = gBS->HandleProtocol ( + BlockIoHandles[BlockIndex], + &gEfiBlockIoProtocolGuid, + (VOID **) &BlkIo + ); + if (EFI_ERROR (Status)) { + continue; + } + // + // Skip the logical partitions + // + if (BlkIo->Media->LogicalPartition) { + DEBUG((EFI_D_INFO, "Partition\n")); + continue; + } + + // + // Skip the fixed block io then the removable block io + // + if (BlkIo->Media->RemovableMedia == ((Removable == 0) ? FALSE : TRUE)) { + continue; + } + + // + // Get Device Path + // + Status = gBS->HandleProtocol ( + BlockIoHandles[BlockIndex], + &gEfiDevicePathProtocolGuid, + (VOID **) &DevicePath + ); + if (EFI_ERROR (Status)) { + continue; + } + + // + // Skip ATA devices as they have already been handled + // + DevicePathNode = DevicePath; + while (!IsDevicePathEnd (DevicePathNode)) { + if (DevicePathType (DevicePathNode) == MESSAGING_DEVICE_PATH && + DevicePathSubType (DevicePathNode) == MSG_ATAPI_DP) { + break; + } + DevicePathNode = NextDevicePathNode (DevicePathNode); + } + if (!IsDevicePathEnd (DevicePathNode)) { + continue; + } + + // + // Locate which PCI device + // + Status = gBS->LocateDevicePath ( + &gEfiPciIoProtocolGuid, + &DevicePath, + &PciHandle + ); + if (EFI_ERROR (Status)) { + continue; + } + + Status = gBS->HandleProtocol ( + PciHandle, + &gEfiPciIoProtocolGuid, + (VOID **) &PciIo + ); + if (EFI_ERROR (Status)) { + continue; + } + + Status = PciIo->GetLocation ( + PciIo, + &SegNum, + &BusNum, + &DevNum, + &FuncNum + ); + if (EFI_ERROR (Status)) { + continue; + } + + if (SegNum != 0) { + DEBUG((EFI_D_INFO, "CSM cannot use PCI devices in segment %d\n", SegNum)); + continue; + } + + DEBUG_CODE ( + CHAR16 *PathText; + + PathText = ConvertDevicePathToText(DevicePath, FALSE, FALSE); + + DEBUG((EFI_D_INFO, "Add Legacy Bbs entry for PCI %d/%d/%d: %s\n", + BusNum, DevNum, FuncNum, PathText)); + FreePool(PathText); + ); + + BbsTable[BbsIndex].Bus = BusNum; + BbsTable[BbsIndex].Device = DevNum; + BbsTable[BbsIndex].Function = FuncNum; + BbsTable[BbsIndex].Class = 1; + BbsTable[BbsIndex].SubClass = 0x80; + BbsTable[BbsIndex].StatusFlags.OldPosition = 0; + BbsTable[BbsIndex].StatusFlags.Reserved1 = 0; + BbsTable[BbsIndex].StatusFlags.Enabled = 0; + BbsTable[BbsIndex].StatusFlags.Failed = 0; + BbsTable[BbsIndex].StatusFlags.MediaPresent = 0; + BbsTable[BbsIndex].StatusFlags.Reserved2 = 0; + BbsTable[BbsIndex].DeviceType = BBS_HARDDISK; + BbsTable[BbsIndex].BootPriority = BBS_UNPRIORITIZED_ENTRY; + BbsIndex++; + + if (BbsIndex == sizeof(Private->IntThunk->BbsTable) / sizeof(BBS_TABLE)) { + Removable = 2; + break; + } + } + } + + FreePool (BlockIoHandles); + } + + return EFI_SUCCESS; } -- 2.21.0