From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mx.groups.io with SMTP id smtpd.web12.14571.1586454240121200317 for ; Thu, 09 Apr 2020 10:44:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=yNx57r9P; spf=pass (domain: nuviainc.com, ip: 209.85.221.68, mailfrom: leif@nuviainc.com) Received: by mail-wr1-f68.google.com with SMTP id k1so12925703wrm.3 for ; Thu, 09 Apr 2020 10:43:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=sr0PiD0VJoMKs+/IoY3n8j8kcaUUjQCe5hIdv3vNZD4=; b=yNx57r9PspRirjjAJcHmZZEVN/D96111zzSF6AeQp3PCIUG3m+foZ8by+WbUVc3QfE q9Pq1pg5qpy8Lc1yvOSMk+033usBQdirH0ot7iXnk0/dUMyftWtGBS28SY0osR8LMg4R PGHU6D71mshnez+Pqqx54itBjcV4W3D5zjE6P1AK0kCGeQ9oQ1HrrR4FmZZpnVDpVW6r c9v7eKv24siux+9OFTPXBc1zUSAkc+7HViiQ4EnslYlIbie31//wr0AuTqqVOH9jX2a5 ILvV5DQc92zXnjE4cA6nuqU77R7pBKSaf17qJpLtrz5pPeYIoEbanLaGo1rEN5K69L6J pBbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=sr0PiD0VJoMKs+/IoY3n8j8kcaUUjQCe5hIdv3vNZD4=; b=NmU+OOmbhO6rrPdy6xYNCiBAWyjD8eGsA2/L3KK6b3qXeJB56/KmgPrddErCU44AdK AcuYn2gGypZPZoNK3JUJvvImCd1ZkeSJShkBqhRXxcQOy05jEzxBAl1mELCmSlPeyG2Q zzp1APqpiRNhuyP8yfNUzYfAbKya6dRJFCIOmz0C3MRRCed4jAPc3KLnPtLWjJgJoI1r hGJcTBznVqchu2EmaK7hxcV9U34OkziIYtblb55Dc3k7EaFhC/J+ukUSdYEtbBOQehuj fzy/7JQq2FmdzmMqRDCBdD3fjj0MHOG4ohye6vFJ8w4Z0xpO1NbRzwVfUETVRYDE7oWi bVRQ== X-Gm-Message-State: AGi0PuadulKsQlFcyjX1rHMHoVdRZvMXBwKs998jIORFc/ADRwWq0Qw1 ps5OulLwDDt2y4d76n56IykhPA== X-Google-Smtp-Source: APiQypJMAQcUcRlVY1wPZcK4j5VipPGwtp+F6QC0q3pEtJdHKrv+RAhA9trfWZ37ZjmZEIxN49ipsQ== X-Received: by 2002:adf:a482:: with SMTP id g2mr293102wrb.214.1586454238731; Thu, 09 Apr 2020 10:43:58 -0700 (PDT) Return-Path: Received: from vanye ([2001:470:1f09:12f0:b26e:bfff:fea9:f1b8]) by smtp.gmail.com with ESMTPSA id k184sm4467234wmf.9.2020.04.09.10.43.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Apr 2020 10:43:58 -0700 (PDT) Date: Thu, 9 Apr 2020 18:43:56 +0100 From: "Leif Lindholm" To: Laszlo Ersek Cc: devel@edk2.groups.io, Ard Biesheuvel , Leendert van Doorn Subject: Re: [PATCH 1/1] ArmVirtPkg: Include NVMe support in ArmVirtQemu* Message-ID: <20200409174356.GE14075@vanye> References: <20200409121050.15387-1-leif@nuviainc.com> <728eab99-1b9f-6fc8-c566-b5ef6f8b5c0b@redhat.com> <20200409145359.GD14075@vanye> MIME-Version: 1.0 In-Reply-To: <20200409145359.GD14075@vanye> User-Agent: Mutt/1.10.1 (2018-07-13) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Apr 09, 2020 at 15:53:59 +0100, Leif Lindholm wrote: > > > [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. > > I don't. I just succumbed to premature optimization. > Do you want to see a v2, or do I drop the bits before submission? > > Regards, > > Leif > > > 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 Given Ard's stated opinion in other email, I'm taking this and dropping the conditionals. Pushed as a5d8a399635d. Thanks! > > > > 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 > > > # > > > > >