lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 358/846] tpm: add request_locality before write TPM_INT_ENABLE
    Date
    From: Chen Jun <chenjun102@huawei.com>

    [ Upstream commit 0ef333f5ba7f24f5d8478425c163d3097f1c7afd ]

    Locality is not appropriately requested before writing the int mask.
    Add the missing boilerplate.

    Fixes: e6aef069b6e9 ("tpm_tis: convert to using locality callbacks")
    Signed-off-by: Chen Jun <chenjun102@huawei.com>
    Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
    Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/char/tpm/tpm_tis_core.c | 8 ++++++++
    1 file changed, 8 insertions(+)

    diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
    index b2659a4c40168..e2df1098a812f 100644
    --- a/drivers/char/tpm/tpm_tis_core.c
    +++ b/drivers/char/tpm/tpm_tis_core.c
    @@ -994,7 +994,15 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
    intmask |= TPM_INTF_CMD_READY_INT | TPM_INTF_LOCALITY_CHANGE_INT |
    TPM_INTF_DATA_AVAIL_INT | TPM_INTF_STS_VALID_INT;
    intmask &= ~TPM_GLOBAL_INT_ENABLE;
    +
    + rc = request_locality(chip, 0);
    + if (rc < 0) {
    + rc = -ENODEV;
    + goto out_err;
    + }
    +
    tpm_tis_write32(priv, TPM_INT_ENABLE(priv->locality), intmask);
    + release_locality(chip, 0);

    rc = tpm_chip_start(chip);
    if (rc)
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 22:09    [W:4.018 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site