[SLOF] [PATCH 06/16] Return value of actual log in sml-get-handover-size

[Nikunj A Dadhania]

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

> With the functions for calculating the actual size of the log in place,
> use them to determine the exact size of the log that the firmware
> API call sml-get-handover-size now returns.
>
> Signed-off-by: Stefan Berger <stefanb at linux.vnet.ibm.com>
> ---
>  board-qemu/slof/vtpm-sml.fs |  4 ++--
>  lib/libtpm/tcgbios.c        | 15 +++++++++++++++
>  lib/libtpm/tcgbios.h        |  1 +
>  lib/libtpm/tpm.code         | 10 ++++++++++
>  lib/libtpm/tpm.in           |  1 +
>  5 files changed, 29 insertions(+), 2 deletions(-)
>
> diff --git a/board-qemu/slof/vtpm-sml.fs b/board-qemu/slof/vtpm-sml.fs
> index 741a953..28c30f1 100644
> --- a/board-qemu/slof/vtpm-sml.fs
> +++ b/board-qemu/slof/vtpm-sml.fs
> @@ -37,9 +37,9 @@ log-base LOG-SIZE tpm-set-log-parameters
>
>  : sml-get-handover-size ( -- size )
>      vtpm-debug? IF
> -        ." Call to sml-get-handover-size; size = " LOG-SIZE . cr
> +        ." Call to sml-get-handover-size; size = " tpm-get-logsize . cr
>      THEN
> -    LOG-SIZE
> +    tpm-get-logsize
>  ;

Why call tpm-get-logsize twice in case of debug enabled ?

: sml-get-handover-size ( -- size )
    tpm-get-logsize
    vtpm-debug? IF ." sml-get-handover-size: size = " dup . cr THEN
;

I think you should implement this word in this patch itself, do you need
sml-get-handover-size in the earlier patches ?

>
>  : sml-handover ( dest size -- )
> diff --git a/lib/libtpm/tcgbios.c b/lib/libtpm/tcgbios.c
> index 072ed4d..e86cfc2 100644
> --- a/lib/libtpm/tcgbios.c
> +++ b/lib/libtpm/tcgbios.c
> @@ -416,6 +416,21 @@ static void *get_log_area_address_next(void)
>  	return log_area_address_next;
>  }
>
> +uint32_t tpm_get_logsize(void)
> +{
> +	uint8_t *log_area_start_address = get_log_base_ptr();
> +	uint8_t *log_area_address_next = get_log_area_address_next();
> +	uint32_t logsize;
> +
> +	if (log_area_address_next) {
> +		logsize = log_area_address_next - log_area_start_address;
> +		dprintf("log size: %u\n", logsize);
> +		return logsize;
> +	}
> +
> +	return 0;
> +}
> +
>  static uint32_t tpm_sha1_calc(const uint8_t *data, uint32_t length,
>  			      uint8_t *hash)
>  {
> diff --git a/lib/libtpm/tcgbios.h b/lib/libtpm/tcgbios.h
> index 9b51826..b217dd1 100644
> --- a/lib/libtpm/tcgbios.h
> +++ b/lib/libtpm/tcgbios.h
> @@ -18,5 +18,6 @@
>  uint32_t tpm_start(void);
>  uint32_t tpm_unassert_pp(void);
>  void tpm_set_log_parameters(void *address, unsigned int size);
> +uint32_t tpm_get_logsize(void);
>
>  #endif /* TCGBIOS_H */
> diff --git a/lib/libtpm/tpm.code b/lib/libtpm/tpm.code
> index a6b66a8..b868ca3 100644
> --- a/lib/libtpm/tpm.code
> +++ b/lib/libtpm/tpm.code
> @@ -46,3 +46,13 @@ PRIM(tpm_X2d_set_X2d_log_X2d_parameters)
>  	void *addr = TOS.a; POP;
>  	tpm_set_log_parameters(addr, size);
>  MIRP
> +
> +/************************************************/
> +/* Get the size of the log                      */
> +/* SLOF:   tpm-get-logsize         ( -- size )  */
> +/* LIBTPM: logsize = tpm_get_logsize(void)      */
> +/************************************************/
> +PRIM(tpm_X2d_get_X2d_logsize)
> +	PUSH;
> +	TOS.n = tpm_get_logsize();
> +MIRP
> diff --git a/lib/libtpm/tpm.in b/lib/libtpm/tpm.in
> index a2f7cb9..32d675f 100644
> --- a/lib/libtpm/tpm.in
> +++ b/lib/libtpm/tpm.in
> @@ -16,3 +16,4 @@
>  cod(tpm-start)
>  cod(tpm-unassert-pp)
>  cod(tpm-set-log-parameters)
> +cod(tpm-get-logsize)
> -- 
> 1.9.3

Regards
Nikunj