From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by mx.groups.io with SMTP id smtpd.web12.591.1582743930845765295 for ; Wed, 26 Feb 2020 11:05:31 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=sFz27yfG; spf=pass (domain: linaro.org, ip: 209.85.128.65, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wm1-f65.google.com with SMTP id q9so454992wmj.5 for ; Wed, 26 Feb 2020 11:05:30 -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; bh=8w4acsOOLNN7Bd13BjeOQjYyO2vVX+cL3Fx6qS3uNxo=; b=sFz27yfGYyrGbMFX1lgNsagiZllMMaNmPoAifqXMaNTdsY6ZBaq78PwMXv639hCxni MxDrnVc/JRkujf/EeidKH6UO5HN0vAGVXyVlIYmb9m2/jTELEplz1ybSnew3NEaw/Cz2 6m+OV3H5qwSA23Mr5c6MtulqDoGQrfOG51TuSzdUsAkhSuKWifhFLQL0FiUbrWZwmSnY xk8weajcdE9lfNblGijaZ14gWOYhEc3UfToIJGGa60z+kKVYRqL4mhND5x1CDfnhoOSj 1RmvRdGBOr6IrZy/7/IY9H4RsmHo/bAaTqygMSgEcBl6pwrOehwry6MOgPfRVKAk7stm izNw== 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; bh=8w4acsOOLNN7Bd13BjeOQjYyO2vVX+cL3Fx6qS3uNxo=; b=OpZ5XzchMy7+rQxZhpVgf+LEy7lok5cmv0BzWSvkM9+7J9MzwRhBd4D0rjKNNq+xUL PbB2t6EBJj9Zow5OpMHzBpfPcZAjBWyO69gbJ2UrfX9D4gJhzTybiDHQYlURvLwZ1Ugr fh6N8tHxmsONvPLOjqXieBq3Al5wuTegqbDAeEGueS584ZDP8rcOF9v0pr/uwfZ0UyhI ykYO35RbJzLsmdQOC25uBl0GgjWXH43fgcb9O3YRau8oOpbzmBT8THSq5MDpjq5aVjNt bzZuqXYC1Y+Zn5pkUUe9naOW9JGm/w4xJF4dyvbvTxcPUAwekrRNRWO3tAeCCyey8ztJ 3eqw== X-Gm-Message-State: APjAAAUKKbYfjVYVzi9JBDze8kGqwpp5X2VO9gKwnYI1doLbkdD5Dwu7 UIC0zm4ZEB20XoFpRtWZ8zu1qFI2T5dl3g== X-Google-Smtp-Source: APXvYqy2yAObSQ7w459Ax+ONu1sY0YnFgIrgI0o2zkDeBiFUFxmCWAf9/+DpX9VtGb1WmSm0hF7sdA== X-Received: by 2002:a05:600c:2104:: with SMTP id u4mr307153wml.93.1582743929176; Wed, 26 Feb 2020 11:05:29 -0800 (PST) Return-Path: Received: from e123331-lin.home ([2a01:cb1d:112:6f00:816e:ff0d:fb69:f613]) by smtp.gmail.com with ESMTPSA id z1sm3932823wmf.42.2020.02.26.11.05.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2020 11:05:28 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: Ard Biesheuvel , lersek@redhat.com, eric.auger@redhat.com, philmd@redhat.com, marcandre.lureau@redhat.com, stefanb@linux.ibm.com, leif@nuviainc.com Subject: [PATCH v3 8/9] ArmVirtPkg/ArmVirtQemu: enable the TPM2 configuration module Date: Wed, 26 Feb 2020 20:05:13 +0100 Message-Id: <20200226190514.31395-9-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200226190514.31395-1-ard.biesheuvel@linaro.org> References: <20200226190514.31395-1-ard.biesheuvel@linaro.org> Enable the DXE phase component that publishes the HII pages and associated logic to enable TPM2 parameters to be configured by the user via the setup menu. Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirtQemu.dsc | 9 +++++++++ ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 3 +++ 2 files changed, 12 insertions(+) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 9fe5ab37611c..7cb2d1b42fb8 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -30,6 +30,7 @@ [Defines] DEFINE TTY_TERMINAL = FALSE DEFINE SECURE_BOOT_ENABLE = FALSE DEFINE TPM2_ENABLE = FALSE + DEFINE TPM2_CONFIG_ENABLE = FALSE # # Network definition @@ -268,6 +269,11 @@ [PcdsDynamicDefault.common] [PcdsDynamicHii] gArmVirtTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gArmVirtVariableGuid|0x0|FALSE|NV,BS +!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 @@ -490,6 +496,9 @@ [Components.common] NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf } +!if $(TPM2_CONFIG_ENABLE) == TRUE + SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf +!endif !endif # diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc index 63247fd10058..d481e4b2b8fb 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -188,4 +188,7 @@ [FV.FvMain] # !if $(TPM2_ENABLE) == TRUE INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf +!if $(TPM2_CONFIG_ENABLE) == TRUE + INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf +!endif !endif -- 2.17.1