From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.120]) by mx.groups.io with SMTP id smtpd.web10.9308.1586440586909831181 for ; Thu, 09 Apr 2020 06:56:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=HcSCx8+V; spf=pass (domain: redhat.com, ip: 207.211.31.120, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586440586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yYULzutx1kkDI+9gcCvh0JlzSaAxdALDkdM66aJ5SAM=; b=HcSCx8+VvdnqxRyiDk9jNyQ9Mue5HHp7EjQheD/6xDfrRpXWYc5iENMTIivDltM8GO0vpD WOwMMxZUdWTkSM0pYNBWowkpFH2hnMMrJ0enU+sS6ywpMO6n26naBV7dbftZLTAN8ohQnK Eo3lQT3DIhidtnHQaQwv9HQx77zjn8I= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-257-LshUdg2YOsmlkfhFXyY2yg-1; Thu, 09 Apr 2020 09:56:24 -0400 X-MC-Unique: LshUdg2YOsmlkfhFXyY2yg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2834E8018A8; Thu, 9 Apr 2020 13:56:23 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-112-213.ams2.redhat.com [10.36.112.213]) by smtp.corp.redhat.com (Postfix) with ESMTP id D86F127BD7; Thu, 9 Apr 2020 13:56:21 +0000 (UTC) Subject: Re: [PATCH 1/1] ArmVirtPkg: Include NVMe support in ArmVirtQemu* To: Leif Lindholm , devel@edk2.groups.io Cc: Ard Biesheuvel , Leendert van Doorn References: <20200409121050.15387-1-leif@nuviainc.com> From: "Laszlo Ersek" Message-ID: <728eab99-1b9f-6fc8-c566-b5ef6f8b5c0b@redhat.com> Date: Thu, 9 Apr 2020 15:56:20 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200409121050.15387-1-leif@nuviainc.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit On 04/09/20 14:10, Leif Lindholm wrote: > From: Leendert van Doorn > > Enable conditional support for NVMe storage in ArmVirtQemu/ > QemVirtQemuKernel in order to simplify booting/installing operating > systems that don't support virtio. (1) We also have UsbMassStorageDxe in ArmVirtQemu*, which can drive QEMU's "usb-storage" device model. In case that device+driver combo has been tested too, and unsuccessfully, then I suggest explicitly stating in the commit message: "don't support virtio or usb-storage". If UsbMassStorageDxe has *not* been tested, then I agree it should not be mentioned here at all. For more details -- in case someone is interested in testing "usb-storage" --, please refer to commit f9c59fa44ae2 ("OvmfPkg/QemuBootOrderLib: recognize "usb-storage" devices in XHCI ports", 2017-09-22). That commit message includes both QEMU command line and libvirt domain XML examples. > > [Conditionalised driver inclusion] > Signed-off-by: Leif Lindholm > --- > ArmVirtPkg/ArmVirtQemu.dsc | 8 ++++++++ > ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 7 +++++++ > ArmVirtPkg/ArmVirtQemuKernel.dsc | 8 ++++++++ > 3 files changed, 23 insertions(+) (2) I realize I'm being arbitrary, with regard to what driver should be conditional and what should always be there. But in OvmfPkg, NvmExpressDxe is included unconditionally, and I think that should work here too. Of course, if you *want* to make NvmExpressDxe excludable from the ArmVirtQemu* platforms, then I'm fine with that. So, I'm proposing (1) and (2) only as food for thought; dependent on your stance on them, I'm OK with this patch: Reviewed-by: Laszlo Ersek Thanks, Laszlo > diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc > index 8c77fc46427b..6f93032ac064 100644 > --- a/ArmVirtPkg/ArmVirtQemu.dsc > +++ b/ArmVirtPkg/ArmVirtQemu.dsc > @@ -28,6 +28,7 @@ [Defines] > # -D FLAG=VALUE > # > DEFINE TTY_TERMINAL = FALSE > + DEFINE NVME_ENABLE = FALSE > DEFINE SECURE_BOOT_ENABLE = FALSE > DEFINE TPM2_ENABLE = FALSE > DEFINE TPM2_CONFIG_ENABLE = FALSE > @@ -447,6 +448,13 @@ [Components.common] > MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf > MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf > > + # > + # NVME Driver > + # > +!if $(NVME_ENABLE) == TRUE > + MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf > +!endif > + > # > # SMBIOS Support > # > diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc > index aaba0b1c8840..45f0dd65be33 100644 > --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc > +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc > @@ -128,6 +128,13 @@ [FV.FvMain] > INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf > INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf > > + # > + # NVME Driver > + # > +!if $(NVME_ENABLE) == TRUE > + INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf > +!endif > + > # > # SMBIOS Support > # > diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc > index 4d82a77213ec..5dd4b1cf29f4 100644 > --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc > +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc > @@ -28,6 +28,7 @@ [Defines] > # -D FLAG=VALUE > # > DEFINE TTY_TERMINAL = FALSE > + DEFINE NVME_ENABLE = FALSE > DEFINE SECURE_BOOT_ENABLE = FALSE > > # > @@ -382,6 +383,13 @@ [Components.common] > MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf > MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf > > + # > + # NVME Driver > + # > +!if $(NVME_ENABLE) == TRUE > + MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf > +!endif > + > # > # SMBIOS Support > # >