Skip to content

Commit 7f99da6

Browse files
dcrowell77Nick Bofferding
authored and
Nick Bofferding
committed
Remove simics enforcement of TPM Required
On early systems we wanted to always enforce TPM Required in Simics before we could set the default in production firmware. The time has long passed for this to be relevant. Change-Id: I597fa85dd86cb4e6f67519311b6a8c60a87ea887 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/129877 Tested-by: Jenkins OP Build CI <[email protected]> Tested-by: Jenkins Server <[email protected]> Tested-by: Jenkins Combined Simics CI <[email protected]> Tested-by: FSP CI Jenkins <[email protected]> Tested-by: Jenkins OP HW <[email protected]> Tested-by: Hostboot CI <[email protected]> Reviewed-by: Michael Baiocchi <[email protected]> Reviewed-by: Ilya Smirnov <[email protected]> Reviewed-by: Nick Bofferding <[email protected]>
1 parent 482b6d8 commit 7f99da6

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

src/usr/secureboot/trusted/trustedboot.C

+3-12
Original file line numberDiff line numberDiff line change
@@ -2612,18 +2612,9 @@ bool isTpmRequired()
26122612
bool retVal = false;
26132613
do
26142614
{
2615-
// TPM always required in simics
2616-
if(Util::isSimicsRunning())
2617-
{
2618-
retVal = true;
2619-
}
2620-
else
2621-
{
2622-
// On HW, use ATTR_TPM_REQUIRED
2623-
TARGETING::Target* pTopLevel =
2624-
TARGETING::UTIL::assertGetToplevelTarget();
2625-
retVal = pTopLevel->getAttr<TARGETING::ATTR_TPM_REQUIRED>();
2626-
}
2615+
TARGETING::Target* pTopLevel =
2616+
TARGETING::UTIL::assertGetToplevelTarget();
2617+
retVal = pTopLevel->getAttr<TARGETING::ATTR_TPM_REQUIRED>();
26272618

26282619
TRACUCOMP( g_trac_trustedboot, "isTpmRequired: Using ATTR_TPM_REQUIRED:"
26292620
" retVal=%d",

0 commit comments

Comments
 (0)