From b49758c11280a0dfba981632ed6ed06ed80a30d8 Mon Sep 17 00:00:00 2001 From: "Gonzalez Del Cueto, Rodrigo" Date: Mon, 4 Feb 2019 14:06:57 +0800 Subject: SecurityPkg/TcgConfigDxe: Allow enabling TPM 1.2 device from disabled state. BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1511 Currently the TCG config setup form defaults the physical presence action to PHYSICAL_PRESENCE_ENABLE, this prevents the action from being called. When a TPM 1.2 device is in Disabled and Activated state it is not possible to issue the PHYSICAL_PRESENCE_ENABLE using the menu action. By having the form default to PHYSICAL_PRESENCE_NO_ACTION, the user is now able to select PHYSICAL_PRESENCE_ENABLE and toggle the TPM 1.2 device enable state. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Rodrigo Gonzalez del Cueto Cc: Chao Zhang Cc: Jiewen Yao Reviewed-by: Jiewen Yao Reviewed-by: Chao Zhang --- SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr | 8 ++++++-- SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c | 4 ++-- SecurityPkg/Tcg/TcgConfigDxe/TcgConfigStrings.uni | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) (limited to 'SecurityPkg') diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr index b0a7bf6f47..1047475cef 100644 --- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr +++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr @@ -1,7 +1,7 @@ /** @file VFR file used by the TCG configuration component. -Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2011 - 2019, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -43,6 +43,10 @@ formset help = STRING_TOKEN(STR_TPM_OPERATION_HELP), flags = INTERACTIVE | RESET_REQUIRED, // + // Default the form to NO ACTION to allow toggling other options + // + option text = STRING_TOKEN(STR_NO_ACTION), value = PHYSICAL_PRESENCE_NO_ACTION, flags = DEFAULT; + // // Disable (TPM_ORD_PhysicalDisable) command is not available when disabled. // Activate/deactivate (TPM_ORD_physicalSetDeactivated) command is not available when disabled. // @@ -61,7 +65,7 @@ formset option text = STRING_TOKEN(STR_TPM_CLEAR_ENABLE_ACTIVATE), value = PHYSICAL_PRESENCE_CLEAR_ENABLE_ACTIVATE, flags = 0; endif - option text = STRING_TOKEN(STR_ENABLE), value = PHYSICAL_PRESENCE_ENABLE, flags = DEFAULT; + option text = STRING_TOKEN(STR_ENABLE), value = PHYSICAL_PRESENCE_ENABLE, flags = 0; option text = STRING_TOKEN(STR_TPM_ENABLE_ACTIVATE), value = PHYSICAL_PRESENCE_ENABLE_ACTIVATE, flags = 0; option text = STRING_TOKEN(STR_TPM_ENABLE_ACTIVATE_CLEAR), value = PHYSICAL_PRESENCE_ENABLE_ACTIVATE_CLEAR, flags = 0; option text = STRING_TOKEN(STR_TPM_ENABLE_ACTIVATE_CLEAR_E_A), value = PHYSICAL_PRESENCE_ENABLE_ACTIVATE_CLEAR_ENABLE_ACTIVATE, flags = 0; diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c index a306bbbb5c..4455fd2b48 100644 --- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c +++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c @@ -1,7 +1,7 @@ /** @file HII Config Access protocol implementation of TCG configuration module. -Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2011 - 2019, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -176,7 +176,7 @@ TcgExtractConfig ( // // Convert buffer data to by helper function BlockToConfig() // - PrivateData->Configuration->TpmOperation = PHYSICAL_PRESENCE_ENABLE; + PrivateData->Configuration->TpmOperation = PHYSICAL_PRESENCE_NO_ACTION; // // Get current TPM state. diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigStrings.uni b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigStrings.uni index 7a84462a6e..3c3f0f7ddb 100644 --- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigStrings.uni +++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigStrings.uni @@ -1,7 +1,7 @@ /** @file String definitions for TCG configuration form. -Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2011 - 2019, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -23,6 +23,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #string STR_TPM_OPERATION #language en-US "TPM Operation" #string STR_TPM_OPERATION_HELP #language en-US "Select one of the supported operation to change TPM state." +#string STR_NO_ACTION #language en-US "No Action" #string STR_ENABLE #language en-US "Enable" #string STR_DISABLE #language en-US "Disable" #string STR_TPM_ACTIVATE #language en-US "Activate" -- cgit v1.2.3