From: "Guomin Jiang" <guomin.jiang@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>,
"michael.kubacki@outlook.com" <michael.kubacki@outlook.com>
Cc: Kun Qin <Kun.Qin@microsoft.com>,
"Wang, Jian J" <jian.j.wang@intel.com>,
"Yao, Jiewen" <jiewen.yao@intel.com>,
"Zhang, Chao B" <chao.b.zhang@intel.com>
Subject: Re: [edk2-devel] [PATCH v1 2/2] SecurityPkg Tcg: Use SW SMI IO port PCD in Tpm.asl
Date: Wed, 8 Apr 2020 01:29:11 +0000 [thread overview]
Message-ID: <DM6PR11MB2955C86D64A407F3A5D729119DC00@DM6PR11MB2955.namprd11.prod.outlook.com> (raw)
In-Reply-To: <MWHPR07MB3440CE798B986C8B579BA810E9C20@MWHPR07MB3440.namprd07.prod.outlook.com>
Reviewed-by: Guomin Jiang <guomin.jiang@intel.com>
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael
> Kubacki
> Sent: Tuesday, April 7, 2020 2:34 AM
> To: devel@edk2.groups.io
> Cc: Kun Qin <Kun.Qin@microsoft.com>; Wang, Jian J
> <jian.j.wang@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>; Zhang,
> Chao B <chao.b.zhang@intel.com>
> Subject: [edk2-devel] [PATCH v1 2/2] SecurityPkg Tcg: Use SW SMI IO port
> PCD in Tpm.asl
>
> From: Michael Kubacki <michael.kubacki@microsoft.com>
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2416
>
> Replaces the hardcoded value of 0xB2 with a PCD for the SMI port access
> operation region. This allows platforms to customize the IO port value if
> necessary.
>
> Cc: Kun Qin <Kun.Qin@microsoft.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Chao Zhang <chao.b.zhang@intel.com>
> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> ---
> SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf | 4 ++++
> SecurityPkg/Tcg/Tcg2Smm/Tpm.asl | 18 +++++++++---------
> SecurityPkg/Tcg/TcgSmm/TcgSmm.inf | 4 ++++
> SecurityPkg/Tcg/TcgSmm/Tpm.asl | 17 +++++++++--------
> 4 files changed, 26 insertions(+), 17 deletions(-)
>
> diff --git a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf
> b/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf
> index e33cbcc49152..2ebf2e05f2ea 100644
> --- a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf
> +++ b/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf
> @@ -21,6 +21,7 @@
> # This external input must be validated carefully to avoid security issue.
> #
> # Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) Microsoft Corporation.<BR>
> # SPDX-License-Identifier: BSD-2-Clause-Patent # ## @@ -70,6 +71,9 @@
> gEfiSmmVariableProtocolGuid ## CONSUMES
> gEfiAcpiTableProtocolGuid ## CONSUMES
>
> +[FixedPcd]
> + gEfiSecurityPkgTokenSpaceGuid.PcdSmiCommandIoPort ##
> CONSUMES
> +
> [Pcd]
> gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid ##
> CONSUMES
> gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId ##
> SOMETIMES_CONSUMES
> diff --git a/SecurityPkg/Tcg/Tcg2Smm/Tpm.asl
> b/SecurityPkg/Tcg/Tcg2Smm/Tpm.asl index 7a91708a1a34..95f9d7eae841
> 100644
> --- a/SecurityPkg/Tcg/Tcg2Smm/Tpm.asl
> +++ b/SecurityPkg/Tcg/Tcg2Smm/Tpm.asl
> @@ -4,7 +4,7 @@
>
> Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
> (c)Copyright 2016 HP Development Company, L.P.<BR> -Copyright (c) 2017,
> Microsoft Corporation. All rights reserved. <BR>
> +Copyright (c) Microsoft Corporation.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> @@ -41,10 +41,10 @@ DefinitionBlock (
> //
> // Operational region for Smi port access
> //
> - OperationRegion (SMIP, SystemIO, 0xB2, 1)
> + OperationRegion (SMIP, SystemIO, FixedPcdGet16
> + (PcdSmiCommandIoPort), 1)
> Field (SMIP, ByteAcc, NoLock, Preserve)
> {
> - IOB2, 8
> + IOPN, 8
> }
>
> //
> @@ -258,7 +258,7 @@ DefinitionBlock (
> //
> // Trigger the SMI interrupt
> //
> - Store (MCIN, IOB2)
> + Store (MCIN, IOPN)
> }
> }
> Return (0)
> @@ -359,7 +359,7 @@ DefinitionBlock (
> //
> // Trigger the SMI interrupt
> //
> - Store (PPIN, IOB2)
> + Store (PPIN, IOPN)
> Return (FRET)
>
>
> @@ -390,7 +390,7 @@ DefinitionBlock (
> //
> // Trigger the SMI interrupt
> //
> - Store (PPIN, IOB2)
> + Store (PPIN, IOPN)
>
> Store (LPPR, Index (TPM3, 0x01))
> Store (PPRP, Index (TPM3, 0x02)) @@ -422,7 +422,7 @@
> DefinitionBlock (
> //
> // Trigger the SMI interrupt
> //
> - Store (PPIN, IOB2)
> + Store (PPIN, IOPN)
> Return (FRET)
> }
> Case (8)
> @@ -436,7 +436,7 @@ DefinitionBlock (
> //
> // Trigger the SMI interrupt
> //
> - Store (PPIN, IOB2)
> + Store (PPIN, IOPN)
>
> Return (FRET)
> }
> @@ -475,7 +475,7 @@ DefinitionBlock (
> //
> // Trigger the SMI interrupt
> //
> - Store (MCIN, IOB2)
> + Store (MCIN, IOPN)
> Return (MRET)
> }
> Default {BreakPoint}
> diff --git a/SecurityPkg/Tcg/TcgSmm/TcgSmm.inf
> b/SecurityPkg/Tcg/TcgSmm/TcgSmm.inf
> index 29f9c15b0e02..9fac896dde8b 100644
> --- a/SecurityPkg/Tcg/TcgSmm/TcgSmm.inf
> +++ b/SecurityPkg/Tcg/TcgSmm/TcgSmm.inf
> @@ -10,6 +10,7 @@
> # This external input must be validated carefully to avoid security issue.
> #
> # Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) Microsoft Corporation.<BR>
> # SPDX-License-Identifier: BSD-2-Clause-Patent # ## @@ -63,6 +64,9 @@
> gEfiSmmVariableProtocolGuid ## CONSUMES
> gEfiAcpiTableProtocolGuid ## CONSUMES
>
> +[FixedPcd]
> + gEfiSecurityPkgTokenSpaceGuid.PcdSmiCommandIoPort ## CONSUMES
> +
> [Pcd]
> gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid ## CONSUMES
> gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId ##
> SOMETIMES_CONSUMES
> diff --git a/SecurityPkg/Tcg/TcgSmm/Tpm.asl
> b/SecurityPkg/Tcg/TcgSmm/Tpm.asl index 739067dbec03..9d5e6ddc110b
> 100644
> --- a/SecurityPkg/Tcg/TcgSmm/Tpm.asl
> +++ b/SecurityPkg/Tcg/TcgSmm/Tpm.asl
> @@ -3,6 +3,7 @@
> and MemoryClear.
>
> Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) Microsoft Corporation.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> @@ -41,10 +42,10 @@ DefinitionBlock (
> //
> // Operational region for Smi port access
> //
> - OperationRegion (SMIP, SystemIO, 0xB2, 1)
> + OperationRegion (SMIP, SystemIO, FixedPcdGet16
> + (PcdSmiCommandIoPort), 1)
> Field (SMIP, ByteAcc, NoLock, Preserve)
> {
> - IOB2, 8
> + IOPN, 8
> }
>
> //
> @@ -96,7 +97,7 @@ DefinitionBlock (
> //
> // Trigger the SMI interrupt
> //
> - Store (MCIN, IOB2)
> + Store (MCIN, IOPN)
> }
> }
> Return (0)
> @@ -196,7 +197,7 @@ DefinitionBlock (
> //
> // Trigger the SMI interrupt
> //
> - Store (PPIN, IOB2)
> + Store (PPIN, IOPN)
> Return (FRET)
>
>
> @@ -227,7 +228,7 @@ DefinitionBlock (
> //
> // Trigger the SMI interrupt
> //
> - Store (PPIN, IOB2)
> + Store (PPIN, IOPN)
>
> Store (LPPR, Index (TPM3, 0x01))
> Store (PPRP, Index (TPM3, 0x02)) @@ -255,7 +256,7 @@
> DefinitionBlock (
> //
> // Trigger the SMI interrupt
> //
> - Store (PPIN, IOB2)
> + Store (PPIN, IOPN)
> Return (FRET)
> }
> Case (8)
> @@ -269,7 +270,7 @@ DefinitionBlock (
> //
> // Trigger the SMI interrupt
> //
> - Store (PPIN, IOB2)
> + Store (PPIN, IOPN)
>
> Return (FRET)
> }
> @@ -308,7 +309,7 @@ DefinitionBlock (
> //
> // Trigger the SMI interrupt
> //
> - Store (MCIN, IOB2)
> + Store (MCIN, IOPN)
> Return (MRET)
> }
> Default {BreakPoint}
> --
> 2.16.3.windows.1
>
>
>
prev parent reply other threads:[~2020-04-08 1:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200406183422.37140-1-michael.kubacki@outlook.com>
2020-04-06 18:34 ` [PATCH v1 1/2] SecurityPkg: Add PCD for SW SMI Command port Michael Kubacki
2020-04-07 22:34 ` [EXTERNAL] [edk2-devel] " Bret Barkelew
2020-04-08 1:30 ` Guomin Jiang
2020-04-06 18:34 ` [PATCH v1 2/2] SecurityPkg Tcg: Use SW SMI IO port PCD in Tpm.asl Michael Kubacki
2020-04-07 22:35 ` [EXTERNAL] [edk2-devel] " Bret Barkelew
2020-04-08 1:29 ` Guomin Jiang [this message]
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=DM6PR11MB2955C86D64A407F3A5D729119DC00@DM6PR11MB2955.namprd11.prod.outlook.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