Message-ID: <d0dbaa48d39079322826bc5e5783db635bf6dc03.camel@kernel.org>
Subject: Re: [PATCH v3] char: tpm: cr50: Set TPM_FIRMWARE_POWER_MANAGED
 based on device property
From:   Jarkko Sakkinen <jarkko@kernel.org>
To:     Rob Barnes <robbarnes@google.com>, Peter Huewe <peterhuewe@gmx.de>,
        Jason Gunthorpe <jgg@ziepe.ca>
Cc:     linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org
Date:   Sat, 11 Dec 2021 07:06:05 +0200
In-Reply-To: <20211206120311.2844838-1-robbarnes@google.com>
References: <Yaut12SfSYPGcs6S@iki.fi>
         <20211206120311.2844838-1-robbarnes@google.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.42.2 
MIME-Version: 1.0
Precedence: bulk

On Mon, 2021-12-06 at 12:03 +0000, Rob Barnes wrote:
> Set TPM_FIRMWARE_POWER_MANAGED flag based on 'firmware-power-managed'
> ACPI DSD property. For the CR50 TPM, this flag defaults to true when
> the property is unset.
>=20
> When this flag is set to false, the CR50 TPM driver will always send
> a shutdown command whenever the system suspends.
>=20
> Signed-off-by: Rob Barnes <robbarnes@google.com>
> ---
>  drivers/char/tpm/tpm_tis_i2c_cr50.c | 16 +++++++++++++++-
>  drivers/char/tpm/tpm_tis_spi_cr50.c | 16 +++++++++++++++-
>  2 files changed, 30 insertions(+), 2 deletions(-)
>=20
> diff --git a/drivers/char/tpm/tpm_tis_i2c_cr50.c b/drivers/char/tpm/tpm_t=
is_i2c_cr50.c
> index c89278103703..f6c0affbb456 100644
> --- a/drivers/char/tpm/tpm_tis_i2c_cr50.c
> +++ b/drivers/char/tpm/tpm_tis_i2c_cr50.c
> @@ -628,6 +628,19 @@ static bool tpm_cr50_i2c_req_canceled(struct tpm_chi=
p *chip, u8 status)
>  	return status =3D=3D TPM_STS_COMMAND_READY;
>  }
> =20
> +static bool tpm_cr50_i2c_is_firmware_power_managed(struct device *dev)
> +{
> +	u8 val;
> +	int ret;
> +
> +	/* This flag should default true when the device property is not presen=
t */
> +	ret =3D device_property_read_u8(dev, "firmware-power-managed", &val);
> +	if (ret)
> +		return true;
> +
> +	return val;
> +}
> +
>  static const struct tpm_class_ops cr50_i2c =3D {
>  	.flags =3D TPM_OPS_AUTO_STARTUP,
>  	.status =3D &tpm_cr50_i2c_tis_status,
> @@ -686,7 +699,8 @@ static int tpm_cr50_i2c_probe(struct i2c_client *clie=
nt)
> =20
>  	/* cr50 is a TPM 2.0 chip */
>  	chip->flags |=3D TPM_CHIP_FLAG_TPM2;
> -	chip->flags |=3D TPM_CHIP_FLAG_FIRMWARE_POWER_MANAGED;
> +	if (tpm_cr50_i2c_is_firmware_power_managed(dev))
> +		chip->flags |=3D TPM_CHIP_FLAG_FIRMWARE_POWER_MANAGED;
> =20
>  	/* Default timeouts */
>  	chip->timeout_a =3D msecs_to_jiffies(TIS_SHORT_TIMEOUT);
> diff --git a/drivers/char/tpm/tpm_tis_spi_cr50.c b/drivers/char/tpm/tpm_t=
is_spi_cr50.c
> index dae98dbeeeac..7bf123d3c537 100644
> --- a/drivers/char/tpm/tpm_tis_spi_cr50.c
> +++ b/drivers/char/tpm/tpm_tis_spi_cr50.c
> @@ -185,6 +185,19 @@ static int cr50_spi_flow_control(struct tpm_tis_spi_=
phy *phy,
>  	return 0;
>  }
> =20
> +static bool tpm_cr50_spi_is_firmware_power_managed(struct device *dev)
> +{
> +	u8 val;
> +	int ret;
> +
> +	/* This flag should default true when the device property is not presen=
t */
> +	ret =3D device_property_read_u8(dev, "firmware-power-managed", &val);
> +	if (ret)
> +		return true;
> +
> +	return val;
> +}
> +
>  static int tpm_tis_spi_cr50_transfer(struct tpm_tis_data *data, u32 addr=
, u16 len,
>  				     u8 *in, const u8 *out)
>  {
> @@ -309,7 +322,8 @@ int cr50_spi_probe(struct spi_device *spi)
>  	cr50_print_fw_version(&phy->priv);
> =20
>  	chip =3D dev_get_drvdata(&spi->dev);
> -	chip->flags |=3D TPM_CHIP_FLAG_FIRMWARE_POWER_MANAGED;
> +	if (tpm_cr50_spi_is_firmware_power_managed(&spi->dev))
> +		chip->flags |=3D TPM_CHIP_FLAG_FIRMWARE_POWER_MANAGED;
> =20
>  	return 0;
>  }

Thank you.

Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>

I applied this to my tree, and it should be visible in linux-next soon.

/Jarkko