Please backport support for discovery from NBFT: https://github.com/linux-nvme/nvme-cli/pull/2315 (still on review upstream, may have more changes).

Although not strictly required for regular boot, it covers a recovery scenario when firmware failed to discover yet the OS was able to perform discovery successfully.

Included in the patchset is a fix to avoid connecting SSNS record pointing to a well-known discovery NQN (as produced by later EDK2 firmware versions). Without this change a connection to a discovery controller is made, without performing actual discovery, lingering in the system as an unused controller.