Change in ...coreboot[master]: drivers/pc80/tpm: add support for TPM emulator SwTPM 2.0 module

[Peter Tsung Ho Wu (Code Review)]

Hello TsungHo Wu,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/33302

to review the following change.

Change subject: drivers/pc80/tpm: add support for TPM emulator SwTPM 2.0 module
......................................................................

drivers/pc80/tpm: add support for TPM emulator SwTPM 2.0 module

Add software TPM 2.0 emulator to tpm device probe list.
SwTPM: https://github.com/stefanberger/swtpm

Tested on qemu q35 with MAINBOARD_HAS_LPC_TPM and MAINBOARD_HAS_TPM2
set in qemu-q35 Kconfig.
Qemu: see qemu flags at
https://s3hh.wordpress.com/2018/06/03/tpm-2-0-in-qemu/

Change-Id: I5f58d2c117afbd057bb91697912db826db1d67a1
Signed-off-by: Tsung Ho Wu 
---
M src/drivers/pc80/tpm/tis.c
1 file changed, 8 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/33302/1

diff --git a/src/drivers/pc80/tpm/tis.c b/src/drivers/pc80/tpm/tis.c
index e10332b..23de003 100644
--- a/src/drivers/pc80/tpm/tis.c
+++ b/src/drivers/pc80/tpm/tis.c
@@ -146,10 +146,18 @@
    {0xffff}
 };

+static const struct device_name swtpm_devices[] = {
+#if CONFIG(TPM2)
+	{0x0001, "SwTPM 2.0" },
+#endif
+	{0xffff}
+};
+
 static const struct vendor_name vendor_names[] = {
    {0x1114, "Atmel", atmel_devices},
    {0x15d1, "Infineon", infineon_devices},
    {0x1050, "Nuvoton", nuvoton_devices},
+	{0x1014, "TPM Emulator", swtpm_devices},
    {0x104a, "ST Microelectronics", stmicro_devices},
 };

[Patrick Rudolph (Code Review)]

Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33302 )

Change subject: drivers/pc80/tpm: add support for TPM emulator SwTPM 2.0 module
......................................................................

Patch Set 1: Code-Review+1

Would be great if you could add Documentation and a Kconfig in emulation/qemu-q35 to conditionally enable TPM.

[Peter Tsung Ho Wu (Code Review)]

Hello Patrick Rudolph, TsungHo Wu, Philipp Deppenwiese, build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/33302

to look at the new patch set (#2).

Change subject: drivers/pc80/tpm: add support for TPM emulator SwTPM 2.0 module
......................................................................

drivers/pc80/tpm: add support for TPM emulator SwTPM 2.0 module

Add software TPM 2.0 emulator to tpm device probe list.
SwTPM: https://github.com/stefanberger/swtpm

Tested on qemu q35 with MAINBOARD_HAS_LPC_TPM and MAINBOARD_HAS_TPM2
set in qemu-q35 Kconfig.
Qemu: see qemu flags at
https://s3hh.wordpress.com/2018/06/03/tpm-2-0-in-qemu/

How to see it work.
Ubuntu 18.04:
1. Install SwTPM from https://github.com/stefanberger/swtpm

2. Add MAINBOARD_HAS_LPC_TPM and MAINBOARD_HAS_TPM2 to
src/mainboard/emulation/qemu-q35/Kconfig and rebuild
coreboot.rom

3. mkdir -p swtpm0

4. swtpm socket --tpmstate dir=swtpm0 --tpm2 --ctrl \
type=unixio,path=swtpm0/swtpm-sock --log level=20 &

5. qemu-system-x86_64 -machine q35 -m 2G \
-chardev socket,id=chrtpm,path=swtpm0/swtpm-sock \
-tpmdev emulator,id=tpm0,chardev=chrtpm -device \
tpm-tis,tpmdev=tpm0 -pflash build/coreboot.rom \
-serial $(tty) -display none

6. Check boot log and search 'Found TPM'.

Change-Id: I5f58d2c117afbd057bb91697912db826db1d67a1
Signed-off-by: Tsung Ho Wu 
---
M src/drivers/pc80/tpm/tis.c
1 file changed, 8 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/33302/2

[Peter Tsung Ho Wu (Code Review)]

Peter Tsung Ho Wu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33302 )

Change subject: drivers/pc80/tpm: add support for TPM emulator SwTPM 2.0 module
......................................................................

Patch Set 2:
> Patch Set 1: Code-Review+1
>
> Would be great if you could add Documentation and a Kconfig in emulation/qemu-q35 to conditionally enable TPM.

Add the steps in commit message.

[Philipp Deppenwiese (Code Review)]

Philipp Deppenwiese has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33302 )

Change subject: drivers/pc80/tpm: add support for TPM emulator SwTPM 2.0 module
......................................................................

Patch Set 2: Code-Review+2

[Philipp Deppenwiese (Code Review)]

Philipp Deppenwiese has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/33302 )

Change subject: drivers/pc80/tpm: add support for TPM emulator SwTPM 2.0 module
......................................................................

drivers/pc80/tpm: add support for TPM emulator SwTPM 2.0 module

Add software TPM 2.0 emulator to tpm device probe list.
SwTPM: https://github.com/stefanberger/swtpm

Tested on qemu q35 with MAINBOARD_HAS_LPC_TPM and MAINBOARD_HAS_TPM2
set in qemu-q35 Kconfig.
Qemu: see qemu flags at
https://s3hh.wordpress.com/2018/06/03/tpm-2-0-in-qemu/

How to see it work.
Ubuntu 18.04:
1. Install SwTPM from https://github.com/stefanberger/swtpm

2. Add MAINBOARD_HAS_LPC_TPM and MAINBOARD_HAS_TPM2 to
src/mainboard/emulation/qemu-q35/Kconfig and rebuild
coreboot.rom

3. mkdir -p swtpm0

4. swtpm socket --tpmstate dir=swtpm0 --tpm2 --ctrl \
type=unixio,path=swtpm0/swtpm-sock --log level=20 &

5. qemu-system-x86_64 -machine q35 -m 2G \
-chardev socket,id=chrtpm,path=swtpm0/swtpm-sock \
-tpmdev emulator,id=tpm0,chardev=chrtpm -device \
tpm-tis,tpmdev=tpm0 -pflash build/coreboot.rom \
-serial $(tty) -display none

6. Check boot log and search 'Found TPM'.

Change-Id: I5f58d2c117afbd057bb91697912db826db1d67a1
Signed-off-by: Tsung Ho Wu 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33302
Reviewed-by: Philipp Deppenwiese 
Reviewed-by: Patrick Rudolph 
Tested-by: build bot (Jenkins) 
---
M src/drivers/pc80/tpm/tis.c
1 file changed, 8 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Philipp Deppenwiese: Looks good to me, approved
  Patrick Rudolph: Looks good to me, but someone else must approve

diff --git a/src/drivers/pc80/tpm/tis.c b/src/drivers/pc80/tpm/tis.c
index e10332b..23de003 100644
--- a/src/drivers/pc80/tpm/tis.c
+++ b/src/drivers/pc80/tpm/tis.c
@@ -146,10 +146,18 @@
    {0xffff}
 };

+static const struct device_name swtpm_devices[] = {
+#if CONFIG(TPM2)
+	{0x0001, "SwTPM 2.0" },
+#endif
+	{0xffff}
+};
+
 static const struct vendor_name vendor_names[] = {
    {0x1114, "Atmel", atmel_devices},
    {0x15d1, "Infineon", infineon_devices},
    {0x1050, "Nuvoton", nuvoton_devices},
+	{0x1014, "TPM Emulator", swtpm_devices},
    {0x104a, "ST Microelectronics", stmicro_devices},
 };