[SLOF] [PATCH 15/16] Add TPM firmware API call get-state

[Nikunj A Dadhania]

Stefan Berger <stefanb at linux.vnet.ibm.com> writes:

> This patch adds support for the TPM firmware API call get-state.
>
> Signed-off-by: Stefan Berger <stefanb at linux.vnet.ibm.com>

Reviewed-by: Nikunj A Dadhania <nikunj at linux.vnet.ibm.com>

> ---
>  board-qemu/slof/vio-vtpm-cdriver.fs |  8 ++++++++
>  board-qemu/slof/vtpm-sml.fs         |  7 +++++++
>  lib/libtpm/tcgbios.c                | 12 ++++++++++++
>  lib/libtpm/tcgbios.h                |  1 +
>  lib/libtpm/tpm.code                 | 10 ++++++++++
>  lib/libtpm/tpm.in                   |  1 +
>  slof/fs/tpm/tpm-static.fs           | 12 ++++++++++++
>  7 files changed, 51 insertions(+)
>
> diff --git a/board-qemu/slof/vio-vtpm-cdriver.fs b/board-qemu/slof/vio-vtpm-cdriver.fs
> index 5d55148..474c24c 100644
> --- a/board-qemu/slof/vio-vtpm-cdriver.fs
> +++ b/board-qemu/slof/vio-vtpm-cdriver.fs
> @@ -72,6 +72,14 @@ false VALUE vtpm-debug?
>  ;
>
>  \ firmware API call
> +: get-state ( -- state )
> +    " get-state" call-forward IF
> +        \ call-forward failed; return a value
> +        0 \ invalid
> +    THEN
> +;
> +
> +\ firmware API call
>  : hash-all ( data-ptr data-len hash-ptr -- )
>      " hash-all" call-forward IF
>          \ call-forward failed; clean up stack
> diff --git a/board-qemu/slof/vtpm-sml.fs b/board-qemu/slof/vtpm-sml.fs
> index 3ce1ace..449f6fc 100644
> --- a/board-qemu/slof/vtpm-sml.fs
> +++ b/board-qemu/slof/vtpm-sml.fs
> @@ -52,6 +52,13 @@ log-base LOG-SIZE tpm-set-log-parameters
>      move
>  ;
>
> +: get-state ( -- state )
> +    vtpm-debug? IF
> +        ." Call to get-state" cr
> +    THEN
> +    vtpm-driver-get-state
> +;
> +
>  : hash-all ( data-ptr data-len hash-ptr -- )
>      vtpm-debug? IF
>          ." Call to hash-all" cr
> diff --git a/lib/libtpm/tcgbios.c b/lib/libtpm/tcgbios.c
> index 6c991b2..02ad91a 100644
> --- a/lib/libtpm/tcgbios.c
> +++ b/lib/libtpm/tcgbios.c
> @@ -1533,3 +1533,15 @@ err_exit:
>
>  	return 0;
>  }
> +
> +uint32_t tpm_driver_get_state(void)
> +{
> +	struct tpm_driver *td = tpm_state.tpm_driver_to_use;
> +
> +	/* do not check for a working TPM here */
> +
> +	if (!td)
> +		return PFW_DRV_STATE_INVALID;
> +
> +	return td->getstate();
> +}
> diff --git a/lib/libtpm/tcgbios.h b/lib/libtpm/tcgbios.h
> index 6951af3..05cadb0 100644
> --- a/lib/libtpm/tcgbios.h
> +++ b/lib/libtpm/tcgbios.h
> @@ -38,6 +38,7 @@ bool tpm_log_event(struct pcpes *pcpes);
>  uint32_t tpm_hash_all(const void *data, uint32_t datalen, void *hashptr);
>  uint32_t tpm_get_maximum_cmd_size(void);
>  uint32_t tpm_pass_through_to_tpm(unsigned char *buf, uint32_t cmdlen);
> +uint32_t tpm_driver_get_state(void);
>
>  /* flags returned by tpm_get_state */
>  #define TPM_STATE_ENABLED        1
> diff --git a/lib/libtpm/tpm.code b/lib/libtpm/tpm.code
> index e763f45..574c7eb 100644
> --- a/lib/libtpm/tpm.code
> +++ b/lib/libtpm/tpm.code
> @@ -153,6 +153,16 @@ PRIM(tpm_X2d_hash_X2d_log_X2d_extend_X2d_event)
>  	TOS.n = tpm_hash_log_extend_event(eventptr);
>  MIRP
>
> +/****************************************************/
> +/* Firmware API                                     */
> +/* SLOF:   tpm-driver-get-state ( -- state)         */
> +/* LIBTPM: state = tpm_driver_get_state(void)       */
> +/****************************************************/
> +PRIM(tpm_X2d_driver_X2d_get_X2d_state)
> +	PUSH;
> +	TOS.n = tpm_driver_get_state();
> +MIRP
> +
>  /*****************************************************************/
>  /* Firmware API                                                  */
>  /* SLOF:   tpm-hash-all ( data-ptr data-len hash-ptr -- errcode) */
> diff --git a/lib/libtpm/tpm.in b/lib/libtpm/tpm.in
> index 8b7cde8..3dd78f4 100644
> --- a/lib/libtpm/tpm.in
> +++ b/lib/libtpm/tpm.in
> @@ -29,3 +29,4 @@ cod(tpm-hash-log-extend-event)
>  cod(tpm-hash-all)
>  cod(tpm-get-maximum-cmd-size)
>  cod(tpm-pass-through-to-tpm)
> +cod(tpm-driver-get-state)
> diff --git a/slof/fs/tpm/tpm-static.fs b/slof/fs/tpm/tpm-static.fs
> index f9583b0..31ac815 100644
> --- a/slof/fs/tpm/tpm-static.fs
> +++ b/slof/fs/tpm/tpm-static.fs
> @@ -69,6 +69,18 @@ false VALUE vtpm-debug?
>  ;
>
>  \ firmware API function
> +: vtpm-driver-get-state ( -- state )
> +    vtpm-available? IF
> +        tpm-driver-get-state
> +        vtpm-debug? IF
> +            ." VTPM: Return value from tpm-driver-get-state: " dup . cr
> +        THEN
> +    ELSE
> +        0 \ invalid
> +    THEN
> +;
> +
> +\ firmware API function
>  : vtpm-log-event ( event-ptr -- ok? )
>      vtpm-available? IF
>          tpm-log-event
> -- 
> 1.9.3