public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Min Xu" <min.m.xu@intel.com>
To: devel@edk2.groups.io
Cc: Min Xu <min.m.xu@intel.com>,
	Michael D Kinney <michael.d.kinney@intel.com>,
	Brijesh Singh <brijesh.singh@amd.com>,
	Erdem Aktas <erdemaktas@google.com>,
	James Bottomley <jejb@linux.ibm.com>,
	Jiewen Yao <jiewen.yao@intel.com>,
	Tom Lendacky <thomas.lendacky@amd.com>,
	Gerd Hoffmann <kraxel@redhat.com>
Subject: [PATCH V5 08/10] OvmfPkg/IncompatiblePciDeviceSupportDxe: Ignore OptionRom in Td guest
Date: Sun, 13 Mar 2022 08:41:09 +0800	[thread overview]
Message-ID: <20220313004111.388-9-min.m.xu@intel.com> (raw)
In-Reply-To: <20220313004111.388-1-min.m.xu@intel.com>

RFC: https://bugzilla.tianocore.org/show_bug.cgi?id=3429

Host VMM may inject OptionRom which is untrusted in Td guest. So PCI
OptionRom needs to be ignored if it is Td guest. According to
"Table 20. ACPI 2.0 & 3.0 QWORD Address Space Descriptor Usage"
PI spec 1.7, type-specific flags can be set to 0 when Address
Translation Offset == 6 to skip device option ROM.

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Brijesh Singh <brijesh.singh@amd.com>
Cc: Erdem Aktas <erdemaktas@google.com>
Cc: James Bottomley <jejb@linux.ibm.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Min Xu <min.m.xu@intel.com>
---
 .../IncompatiblePciDeviceSupport.c            | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c b/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
index f5c03bdf6dd6..2d385d26ef28 100644
--- a/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
+++ b/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
@@ -71,6 +71,40 @@ STATIC CONST EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR  mMmio64Configuration = {
                                                    //   use probed BAR size
 };
 
+//
+// mOptionRomConfiguration is present only in Td guest.
+// Host VMM can inject option ROM which is untrusted in Td guest,
+// so PCI option ROM needs to be ignored.
+// According to "Table 20. ACPI 2.0 & 3.0 QWORD Address Space Descriptor Usage"
+// PI spec 1.7, type-specific flags can be set to 0 when
+// Address Translation Offset == 6 to skip device option ROM.
+//
+STATIC CONST EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR  mOptionRomConfiguration =   {
+  ACPI_ADDRESS_SPACE_DESCRIPTOR,                   // Desc
+  (UINT16)(                                        // Len
+                                                   sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) -
+                                                   OFFSET_OF (
+                                                     EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR,
+                                                     ResType
+                                                     )
+                                                   ),
+  ACPI_ADDRESS_SPACE_TYPE_MEM,                     // ResType
+  0,                                               // GenFlag
+  0,                                               // Disable option roms SpecificFlag
+  64,                                              // AddrSpaceGranularity:
+                                                   //   aperture selection hint
+                                                   //   for BAR allocation
+  MAX_UINT64,                                      // AddrRangeMin
+  MAX_UINT64,                                      // AddrRangeMax:
+                                                   //   no special alignment
+                                                   //   for affected BARs
+  6,                                               // AddrTranslationOffset:
+                                                   //   hint covers all
+                                                   //   eligible BARs
+  0                                                // AddrLen:
+                                                   //   use probed BAR size
+};
+
 STATIC CONST EFI_ACPI_END_TAG_DESCRIPTOR  mEndDesc = {
   ACPI_END_TAG_DESCRIPTOR,                         // Desc
   0                                                // Checksum: to be ignored
@@ -227,6 +261,13 @@ CheckDevice (
   //
   Length = sizeof mMmio64Configuration + sizeof mEndDesc;
 
+  //
+  // In Td guest OptionRom is not allowed.
+  //
+  if (TdIsEnabled ()) {
+    Length += sizeof mOptionRomConfiguration;
+  }
+
   *Configuration = AllocateZeroPool (Length);
 
   if (*Configuration == NULL) {
@@ -245,6 +286,11 @@ CheckDevice (
   CopyMem (Ptr, &mMmio64Configuration, sizeof mMmio64Configuration);
   Length = sizeof mMmio64Configuration;
 
+  if (TdIsEnabled ()) {
+    CopyMem (Ptr + Length, &mOptionRomConfiguration, sizeof mOptionRomConfiguration);
+    Length += sizeof mOptionRomConfiguration;
+  }
+
   CopyMem (Ptr + Length, &mEndDesc, sizeof mEndDesc);
 
   return EFI_SUCCESS;
-- 
2.29.2.windows.2


  parent reply	other threads:[~2022-03-13  0:41 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-13  0:41 [PATCH V5 00/10] Introduce TDVF Config-B (basic) in OvmfPkg Min Xu
2022-03-13  0:41 ` [PATCH V5 01/10] OvmfPkg: Add TdxWorkArea definition Min Xu
2022-03-13  0:41 ` [PATCH V5 02/10] OvmfPkg: Add PrePiHobListPointerLibTdx Min Xu
2022-03-13  0:41 ` [PATCH V5 03/10] OvmfPkg: Add PeilessStartupLib Min Xu
2022-03-13  0:41 ` [PATCH V5 04/10] OvmfPkg/IntelTdx: Add Sec to bring up both Legacy and Tdx guest Min Xu
2022-03-13  0:41 ` [PATCH V5 05/10] OvmfPkg: Update TdxDxe to set TDX PCDs Min Xu
2022-03-13  0:41 ` [PATCH V5 06/10] OvmfPkg: Update DxeAcpiTimerLib to read HostBridgeDevId in PlatformInfoHob Min Xu
2022-03-15 13:46   ` Gerd Hoffmann
2022-03-13  0:41 ` [PATCH V5 07/10] OvmfPkg/IncompatiblePciDeviceSupportDxe: Refine the configuration Min Xu
2022-03-15 13:48   ` Gerd Hoffmann
2022-03-13  0:41 ` Min Xu [this message]
2022-03-15 13:48   ` [PATCH V5 08/10] OvmfPkg/IncompatiblePciDeviceSupportDxe: Ignore OptionRom in Td guest Gerd Hoffmann
2022-03-13  0:41 ` [PATCH V5 09/10] MdeModulePkg: Update PciEnumeratorSupport to ignore OptionRom if needed Min Xu
2022-03-15 13:49   ` Gerd Hoffmann
2022-03-13  0:41 ` [PATCH V5 10/10] OvmfPkg: Introduce IntelTdxX64 for TDVF Config-B Min Xu
2022-04-02  8:20 ` [PATCH V5 00/10] Introduce TDVF Config-B (basic) in OvmfPkg Yao, Jiewen

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=20220313004111.388-9-min.m.xu@intel.com \
    --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