public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Mara Sophie Grosch" <littlefox@lf-net.org>
To: devel@edk2.groups.io
Cc: hao.a.wu@intel.com, Mara Sophie Grosch <littlefox@lf-net.org>
Subject: [PATCH v2 1/2] MdeModulePkg/NvmExpressDxe: fix check for Cap.Css
Date: Wed, 23 Mar 2022 11:22:33 +0100	[thread overview]
Message-ID: <5cae05f846015b8316e47c500ce8650b92365411.1648029370.git.littlefox@lf-net.org> (raw)
In-Reply-To: <cover.1648029370.git.littlefox@lf-net.org>

Fix the check for NVMe command set being supported by the controller.

Was problematic with qemu (6.2.0, Debian 1:6.2+dfsg-3), which sets 0xC1
in that register, making the OVMF think the NVMe controller does not
support NVMe.

Uncovered by commit 9dd14fc91c174eae87fd122c7ac70073a363527f, which
changed the number of bits included in the Css register from 4 to 8.

Signed-off-by: Mara Sophie Grosch <littlefox@lf-net.org>
---
 MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c
index d87212ffb2..b90c48731c 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c
+++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c
@@ -761,7 +761,7 @@ NvmeControllerInit (
     return Status;
   }
 
-  if (Private->Cap.Css != 0x01) {
+  if ((Private->Cap.Css & BIT0) == 0) {
     DEBUG ((DEBUG_INFO, "NvmeControllerInit: the controller doesn't support NVMe command set\n"));
     return EFI_UNSUPPORTED;
   }
-- 
2.35.1


  reply	other threads:[~2022-03-23 10:22 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <16DE909798871558.18232@groups.io>
2022-03-23 10:22 ` [PATCH v2 0/2] MdeModulePkg: fix checks for NVM command set Mara Sophie Grosch
2022-03-23 10:22   ` Mara Sophie Grosch [this message]
2022-03-23 10:22   ` [PATCH v2 2/2] MdeModulePkg/NvmExpressPei: fix check " Mara Sophie Grosch
2022-03-23 10:31   ` [edk2-devel] [PATCH v2 0/2] MdeModulePkg: fix checks " Mara Sophie Grosch
2022-03-24  0:05   ` Wu, Hao A
2022-03-25  1:04     ` Wu, Hao A
2022-03-25  8:44       ` Mara Sophie Grosch
2022-03-25  8:49         ` Wu, Hao A

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5cae05f846015b8316e47c500ce8650b92365411.1648029370.git.littlefox@lf-net.org \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox