From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by mx.groups.io with SMTP id smtpd.web09.8623.1578494332546111883 for ; Wed, 08 Jan 2020 06:38:55 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=uaa7LXQL; spf=pass (domain: linaro.org, ip: 209.85.128.67, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wm1-f67.google.com with SMTP id q9so2711536wmj.5 for ; Wed, 08 Jan 2020 06:38:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SMEIsCTNmBBXP7xjIdusW9QrnSZg69bQHvug6G4luxs=; b=uaa7LXQLzEot+rcAnDvm9JFXfj3meKWECC9oBs5qSuhJ6QVz7LiVlRDouOkmiaWcor 6wEHUNWfxanG5N/Lqp5BsRilS5JHweP2EJvngI2W4FwVhTqxwYbYC3Tecr/wlo81shsw fnAsGYnSXLY8/UATdxOMRpzfYaUnmq+d+FfA8B3r+KVNDFHpJ0SmEXo80qCDmNBu5Tlf 9mv1GxuUZwP3itI1vmavVhpecO5hiiwRBbYLemJ2dVC0X7LuSQatpni1zXc2zVnVX9R8 68dtmxZazsYKM30QV8b0TfLFsflLGxImCBigPfHpGKpaAifM2+k8sWKBKWteFy5QCvdS FTWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SMEIsCTNmBBXP7xjIdusW9QrnSZg69bQHvug6G4luxs=; b=O601bNfGH155lbKk3DdctfJGcpHY9CH9c7bQOPWV3J2RQ4AswuUAhaYug6zTUWpuMP RhjFGTHBrYpqgVdt02E9hqf765Fi/tHPN7axMY9AG/oVBTJxZs1CQ4AhqIddZAFRE5ox qOvH2atEHJS+5CZ5C4eyzKOigC7YwZgLbRzLT+08t+bAGjlyMobN3+lIdeBfCHdunER+ xEpH1uTIqooUzXho/Eft7AxUcyRsAG19d8kQD0n+QgwBrQgv3xm43Mf+tk9at1ihVfUZ pJQBLPRTdqfmLvhClvEHrYAnwzGh4GdkVHwm3oDofCxvOBhUSftXyJ3eOPnpJKGKzjx4 irqA== X-Gm-Message-State: APjAAAU/MnI/N0Nk6SWdZQtJxlGncDWEhEtjHHAjHBHjK7CbtdyE0B8T jmJZh6tTMW3ufSLZiOL8TGQ8uojZ3rSIGQ== X-Google-Smtp-Source: APXvYqxoEcU48iEPPYAhU7RCfAmpqTuyGkO/yTFBqVKS65UguEKMW+3O9kOXwe/5Cf5bWaLWfW8oFw== X-Received: by 2002:a1c:1f56:: with SMTP id f83mr4346977wmf.93.1578494330805; Wed, 08 Jan 2020 06:38:50 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2a01:cb1d:112:6f00:30ac:cba9:9f83:e5db]) by smtp.gmail.com with ESMTPSA id r15sm3934848wmh.21.2020.01.08.06.38.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 06:38:49 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: philmd@redhat.com, lersek@redhat.com, Ard Biesheuvel Subject: [PATCH 2/2] OvmfPkg: use HII type PCDs for TPM2 config related variables Date: Wed, 8 Jan 2020 15:38:43 +0100 Message-Id: <20200108143843.4198-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108143843.4198-1-ard.biesheuvel@linaro.org> References: <20200108143843.4198-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The HII pages that are part of Tcg2ConfigDxe expect the following PCDs to be of dynamic HII type, so declare them as such. gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev Currently, the TPM2 ACPI table is not produced, since we do not incorporate the Tcg2Smm module, which implements the SMI based physical presence interface exposed to the OS. Signed-off-by: Ard Biesheuvel --- OvmfPkg/OvmfPkgIa32.dsc | 6 ++++++ OvmfPkg/OvmfPkgIa32X64.dsc | 6 ++++++ OvmfPkg/OvmfPkgX64.dsc | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index f9e0b4b5bc54..408da4cc19ac 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -575,6 +575,12 @@ [PcdsDynamicDefault] gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} !endif +[PcdsDynamicHii] +!if $(TPM2_CONFIG_ENABLE) == TRUE + gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS + gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|3|NV,BS +!endif + ################################################################################ # # Components Section - list of all EDK II Modules needed by this Platform. diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index ee83bbaa5379..1ec94010c215 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -587,6 +587,12 @@ [PcdsDynamicDefault] gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} !endif +[PcdsDynamicHii] +!if $(TPM2_CONFIG_ENABLE) == TRUE + gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS + gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|3|NV,BS +!endif + ################################################################################ # # Components Section - list of all EDK II Modules needed by this Platform. diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 2b6106ff313f..058ab00e69c6 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -586,6 +586,12 @@ [PcdsDynamicDefault] gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} !endif +[PcdsDynamicHii] +!if $(TPM2_CONFIG_ENABLE) == TRUE + gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS + gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|3|NV,BS +!endif + ################################################################################ # # Components Section - list of all EDK II Modules needed by this Platform. -- 2.20.1