On Thu, Mar 01, 2018 at 11:08:13PM +0200, Tomas Winkler wrote:
> The correct sequence is to first request locality and only after
> that perform cmd_ready handshake, otherwise the hardware will drop
> the subsequent message as from the device point of view the cmd_ready
> handshake wasn't performed. Symmetrically locality has to be relinquished
> only after going idle handshake has completed, this requires that
> go_idle has to poll for the completion and as well locality
> relinquish has to poll for completion so it is not overridden
> in back to back commands flow.
>
> Two wrapper functions are added (request_locality relinquish_locality)
> to simplify the error handling.
>
> The issue is only visible on devices that support multiple localities.
>
> Fixes: 877c57d0d0ca ("tpm_crb: request and relinquish locality 0")
> Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
> ---
> V2: 1. Poll for locality relinquish completion.
> V3: 1. Print error message upon locality relinquish failure
> 2. Don't override rc code on error path with locality relinquish
> return value.
> V4: 1. Don't capture locality relinquish error code in rc, just print
> the error message.
> V5: 1. Fix a coding style issue.
> 2. Add Fixes: reference.
> V6: 1. Add locality wrappers.
>
> drivers/char/tpm/tpm-interface.c | 54 +++++++++++++++-----
> drivers/char/tpm/tpm_crb.c | 108 +++++++++++++++++++++++++++------------
> drivers/char/tpm/tpm_tis_core.c | 4 +-
> include/linux/tpm.h | 2 +-
> 4 files changed, 120 insertions(+), 48 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
> index 9e80a953d693..b57bf449abfc 100644
> --- a/drivers/char/tpm/tpm-interface.c
> +++ b/drivers/char/tpm/tpm-interface.c
> @@ -369,6 +369,36 @@ static int tpm_validate_command(struct tpm_chip *chip,
> return -EINVAL;
> }
>
> +static int request_locality(struct tpm_chip *chip)
> +{
> + int rc;
> +
> + if (!chip->ops->request_locality)
> + return 0;
> +
> + rc = chip->ops->request_locality(chip, 0);
> + if (rc < 0)
> + return rc;
> +
> + chip->locality = rc;
> +
> + return 0;
> +}
> +
> +static void relinquish_locality(struct tpm_chip *chip)
I would require the tpm_ prefix here. It's great with ftrace function
tracer. That is why it was also in the response where I proposed this.
It is so mechanical change I can do it myself if you don't mind so you
don't have send a new version. I'll only do renames, no other changes.
/Jarkko
