diff mbox series

[linux-kvm,J,SRU] UBUNTU: [Config] Enable TIS and CRB TPMs as modules

Message ID 20220308110518.25685-1-dimitri.ledkov@canonical.com
State New
Headers show
Series [linux-kvm,J,SRU] UBUNTU: [Config] Enable TIS and CRB TPMs as modules | expand

Commit Message

Dimitri John Ledkov March 8, 2022, 11:05 a.m. UTC
Enable TCG_TPM support for measured boot, and build drivers for TIS
and CRB compliant TPMs as modules.

BugLink: https://bugs.launchpad.net/bugs/1963088

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
---
 debian.kvm/config/config.common.ubuntu | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

Comments

Tim Gardner March 15, 2022, 11:56 a.m. UTC | #1
Acked-by: Tim Gardner <tim.gardner@canonical.com>

On 3/8/22 04:05, Dimitri John Ledkov wrote:
> Enable TCG_TPM support for measured boot, and build drivers for TIS
> and CRB compliant TPMs as modules.
> 
> BugLink: https://bugs.launchpad.net/bugs/1963088
> 
> Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
> ---
>   debian.kvm/config/config.common.ubuntu | 10 +++++++++-
>   1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/debian.kvm/config/config.common.ubuntu b/debian.kvm/config/config.common.ubuntu
> index a7df6e3cae..86c3fe40bf 100644
> --- a/debian.kvm/config/config.common.ubuntu
> +++ b/debian.kvm/config/config.common.ubuntu
> @@ -1216,6 +1216,7 @@ CONFIG_HW_RANDOM_AMD=y
>   # CONFIG_HW_RANDOM_BA431 is not set
>   CONFIG_HW_RANDOM_INTEL=y
>   CONFIG_HW_RANDOM_TIMERIOMEM=y
> +CONFIG_HW_RANDOM_TPM=y
>   # CONFIG_HW_RANDOM_VIA is not set
>   CONFIG_HW_RANDOM_VIRTIO=y
>   CONFIG_HW_RANDOM_XIPHERA=m
> @@ -2658,7 +2659,14 @@ CONFIG_TASKS_TRACE_RCU=y
>   CONFIG_TASK_DELAY_ACCT=y
>   CONFIG_TASK_IO_ACCOUNTING=y
>   CONFIG_TASK_XACCT=y
> -# CONFIG_TCG_TPM is not set
> +# CONFIG_TCG_ATMEL is not set
> +CONFIG_TCG_CRB=m
> +# CONFIG_TCG_INFINEON is not set
> +# CONFIG_TCG_NSC is not set
> +CONFIG_TCG_TIS=m
> +CONFIG_TCG_TIS_CORE=m
> +CONFIG_TCG_TPM=y
> +# CONFIG_TCG_VTPM_PROXY is not set
>   # CONFIG_TCM_FILEIO is not set
>   # CONFIG_TCM_IBLOCK is not set
>   # CONFIG_TCM_PSCSI is not set
Stefan Bader May 5, 2022, 8:20 a.m. UTC | #2
On 08.03.22 12:05, Dimitri John Ledkov wrote:
> Enable TCG_TPM support for measured boot, and build drivers for TIS
> and CRB compliant TPMs as modules.
> 
> BugLink: https://bugs.launchpad.net/bugs/1963088
> 
> Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
> ---
>   debian.kvm/config/config.common.ubuntu | 10 +++++++++-
>   1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/debian.kvm/config/config.common.ubuntu b/debian.kvm/config/config.common.ubuntu
> index a7df6e3cae..86c3fe40bf 100644
> --- a/debian.kvm/config/config.common.ubuntu
> +++ b/debian.kvm/config/config.common.ubuntu
> @@ -1216,6 +1216,7 @@ CONFIG_HW_RANDOM_AMD=y
>   # CONFIG_HW_RANDOM_BA431 is not set
>   CONFIG_HW_RANDOM_INTEL=y
>   CONFIG_HW_RANDOM_TIMERIOMEM=y
> +CONFIG_HW_RANDOM_TPM=y
>   # CONFIG_HW_RANDOM_VIA is not set
>   CONFIG_HW_RANDOM_VIRTIO=y
>   CONFIG_HW_RANDOM_XIPHERA=m
> @@ -2658,7 +2659,14 @@ CONFIG_TASKS_TRACE_RCU=y
>   CONFIG_TASK_DELAY_ACCT=y
>   CONFIG_TASK_IO_ACCOUNTING=y
>   CONFIG_TASK_XACCT=y
> -# CONFIG_TCG_TPM is not set
> +# CONFIG_TCG_ATMEL is not set
> +CONFIG_TCG_CRB=m
> +# CONFIG_TCG_INFINEON is not set
> +# CONFIG_TCG_NSC is not set
> +CONFIG_TCG_TIS=m
> +CONFIG_TCG_TIS_CORE=m
> +CONFIG_TCG_TPM=y
> +# CONFIG_TCG_VTPM_PROXY is not set
>   # CONFIG_TCM_FILEIO is not set
>   # CONFIG_TCM_IBLOCK is not set
>   # CONFIG_TCM_PSCSI is not set
Tim Gardner June 7, 2022, 5:32 p.m. UTC | #3
Applied to jammy/linux-kvm:master-next. Thanks.

-rtg

On 3/8/22 04:05, Dimitri John Ledkov wrote:
> Enable TCG_TPM support for measured boot, and build drivers for TIS
> and CRB compliant TPMs as modules.
> 
> BugLink: https://bugs.launchpad.net/bugs/1963088
> 
> Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
> ---
>   debian.kvm/config/config.common.ubuntu | 10 +++++++++-
>   1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/debian.kvm/config/config.common.ubuntu b/debian.kvm/config/config.common.ubuntu
> index a7df6e3cae..86c3fe40bf 100644
> --- a/debian.kvm/config/config.common.ubuntu
> +++ b/debian.kvm/config/config.common.ubuntu
> @@ -1216,6 +1216,7 @@ CONFIG_HW_RANDOM_AMD=y
>   # CONFIG_HW_RANDOM_BA431 is not set
>   CONFIG_HW_RANDOM_INTEL=y
>   CONFIG_HW_RANDOM_TIMERIOMEM=y
> +CONFIG_HW_RANDOM_TPM=y
>   # CONFIG_HW_RANDOM_VIA is not set
>   CONFIG_HW_RANDOM_VIRTIO=y
>   CONFIG_HW_RANDOM_XIPHERA=m
> @@ -2658,7 +2659,14 @@ CONFIG_TASKS_TRACE_RCU=y
>   CONFIG_TASK_DELAY_ACCT=y
>   CONFIG_TASK_IO_ACCOUNTING=y
>   CONFIG_TASK_XACCT=y
> -# CONFIG_TCG_TPM is not set
> +# CONFIG_TCG_ATMEL is not set
> +CONFIG_TCG_CRB=m
> +# CONFIG_TCG_INFINEON is not set
> +# CONFIG_TCG_NSC is not set
> +CONFIG_TCG_TIS=m
> +CONFIG_TCG_TIS_CORE=m
> +CONFIG_TCG_TPM=y
> +# CONFIG_TCG_VTPM_PROXY is not set
>   # CONFIG_TCM_FILEIO is not set
>   # CONFIG_TCM_IBLOCK is not set
>   # CONFIG_TCM_PSCSI is not set
diff mbox series

Patch

diff --git a/debian.kvm/config/config.common.ubuntu b/debian.kvm/config/config.common.ubuntu
index a7df6e3cae..86c3fe40bf 100644
--- a/debian.kvm/config/config.common.ubuntu
+++ b/debian.kvm/config/config.common.ubuntu
@@ -1216,6 +1216,7 @@  CONFIG_HW_RANDOM_AMD=y
 # CONFIG_HW_RANDOM_BA431 is not set
 CONFIG_HW_RANDOM_INTEL=y
 CONFIG_HW_RANDOM_TIMERIOMEM=y
+CONFIG_HW_RANDOM_TPM=y
 # CONFIG_HW_RANDOM_VIA is not set
 CONFIG_HW_RANDOM_VIRTIO=y
 CONFIG_HW_RANDOM_XIPHERA=m
@@ -2658,7 +2659,14 @@  CONFIG_TASKS_TRACE_RCU=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_TASK_XACCT=y
-# CONFIG_TCG_TPM is not set
+# CONFIG_TCG_ATMEL is not set
+CONFIG_TCG_CRB=m
+# CONFIG_TCG_INFINEON is not set
+# CONFIG_TCG_NSC is not set
+CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_CORE=m
+CONFIG_TCG_TPM=y
+# CONFIG_TCG_VTPM_PROXY is not set
 # CONFIG_TCM_FILEIO is not set
 # CONFIG_TCM_IBLOCK is not set
 # CONFIG_TCM_PSCSI is not set