Skip to content

[Feature]: NvmExpressDxe: Proceed with BlockIo if BlockIo2 install fails #1408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Copilot wants to merge 2 commits into from
Closed

[Feature]: NvmExpressDxe: Proceed with BlockIo if BlockIo2 install fails #1408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
664d585
Initial plan for issue
Copilot Jun 12, 2025
e408359
Implement BlockIo2 failure handling with minimal changes
Copilot Jun 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 47 additions & 56 deletions MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,34 +277,25 @@ EnumerateNvmeDevNamespace (
goto Exit;
}

// MU_CHANGE [BEGIN] - Request Number of Queues from Controller
if (NVME_SUPPORT_BLOCKIO2 (Private)) {
// We have multiple data queues, so we can support the BlockIo2 protocol
Status = gBS->InstallMultipleProtocolInterfaces (
&Device->DeviceHandle,
&gEfiBlockIo2ProtocolGuid,
&Device->BlockIo2,
NULL
);

if (EFI_ERROR (Status)) {
gBS->UninstallMultipleProtocolInterfaces (
Device->DeviceHandle,
&gEfiDevicePathProtocolGuid,
Device->DevicePath,
&gEfiBlockIoProtocolGuid,
&Device->BlockIo,
&gEfiDiskInfoProtocolGuid,
&Device->DiskInfo,
NULL
);

DEBUG ((DEBUG_ERROR, "%a: Failed to install BlockIo2 protocol. Error %r\n", __func__, Status));
ASSERT_EFI_ERROR (Status);
goto Exit;
}
}

// MU_CHANGE [BEGIN] - Request Number of Queues from Controller
if (NVME_SUPPORT_BLOCKIO2 (Private)) {
// We have multiple data queues, so we can support the BlockIo2 protocol
Status = gBS->InstallMultipleProtocolInterfaces (
&Device->DeviceHandle,
&gEfiBlockIo2ProtocolGuid,
&Device->BlockIo2,
NULL
);

if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_WARN, "%a: Failed to install BlockIo2 protocol. Error %r. Continuing with BlockIo only.\n", __func__, Status));
Device->BlockIo2Installed = FALSE;
Status = EFI_SUCCESS; // Reset status to continue with remaining protocols
} else {
Device->BlockIo2Installed = TRUE;
}
}

// MU_CHANGE [END] - Request Number of Queues from Controller

//
Expand Down Expand Up @@ -333,17 +324,17 @@ EnumerateNvmeDevNamespace (
NULL
);

// MU_CHANGE [BEGIN] - Request Number of Queues from Controller
if (NVME_SUPPORT_BLOCKIO2 (Private)) {
// We have multiple data queues, so we need to uninstall the BlockIo2 protocol
gBS->UninstallMultipleProtocolInterfaces (
Device->DeviceHandle,
&gEfiBlockIo2ProtocolGuid,
&Device->BlockIo2,
NULL
);
}
// MU_CHANGE [BEGIN] - Request Number of Queues from Controller
if (NVME_SUPPORT_BLOCKIO2 (Private) && Device->BlockIo2Installed) {
// We have multiple data queues and BlockIo2 was successfully installed, so we need to uninstall it
gBS->UninstallMultipleProtocolInterfaces (
Device->DeviceHandle,
&gEfiBlockIo2ProtocolGuid,
&Device->BlockIo2,
NULL
);
}

// MU_CHANGE [END] - Request Number of Queues from Controller

goto Exit;
Expand Down Expand Up @@ -533,23 +524,23 @@ UnregisterNvmeNamespace (
Handle
);

// MU_CHANGE [BEGIN] - Request Number of Queues from Controller
//
// If BlockIo2 is installed, uninstall it.
//
if (NVME_SUPPORT_BLOCKIO2 (Device->Controller)) {
BlockIo2Status = gBS->UninstallMultipleProtocolInterfaces (
Handle,
&gEfiBlockIo2ProtocolGuid,
&Device->BlockIo2,
NULL
);
if (EFI_ERROR (BlockIo2Status)) {
DEBUG ((DEBUG_ERROR, "%a: Failed to uninstall BlockIo2 protocol\n", __func__));
}
}
// MU_CHANGE [BEGIN] - Request Number of Queues from Controller
//
// If BlockIo2 is installed, uninstall it.
//
if (NVME_SUPPORT_BLOCKIO2 (Device->Controller) && Device->BlockIo2Installed) {
BlockIo2Status = gBS->UninstallMultipleProtocolInterfaces (
Handle,
&gEfiBlockIo2ProtocolGuid,
&Device->BlockIo2,
NULL
);

if (EFI_ERROR (BlockIo2Status)) {
DEBUG ((DEBUG_ERROR, "%a: Failed to uninstall BlockIo2 protocol\n", __func__));
}
}

// MU_CHANGE [END] - Request Number of Queues from Controller
//
// The Nvm Express driver installs the BlockIo and DiskInfo in the DriverBindingStart().
Expand Down
15 changes: 8 additions & 7 deletions MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,13 +313,14 @@ struct _NVME_DEVICE_PRIVATE_DATA {

MEDIA_SANITIZE_PROTOCOL MediaSanitize;

LIST_ENTRY AsyncQueue;

EFI_LBA NumBlocks;

CHAR16 ModelName[80];
NVME_ADMIN_NAMESPACE_DATA NamespaceData;

LIST_ENTRY AsyncQueue;

EFI_LBA NumBlocks;
BOOLEAN BlockIo2Installed;

CHAR16 ModelName[80];
NVME_ADMIN_NAMESPACE_DATA NamespaceData;

NVME_CONTROLLER_PRIVATE_DATA *Controller;
};

Expand Down
Loading