Add a new powered-while-suspended property to control the behavior of the
TPM suspend/resume.
Signed-off-by: Enric Balletbo i Serra <[email protected]>
Signed-off-by: Sonny Rao <[email protected]>
Reviewed-by: Jason Gunthorpe <[email protected]>
Reviewed-by: Jarkko Sakkinen <[email protected]>
Acked-by: Rob Herring <[email protected]>
---
Changes since v3.
- Rebased on top of linux-next
Rob Herring
- Split DT binding from code patch as is preferred.
Did not exist on previous versions.
Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt b/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt
index 8cb638b..85c8216 100644
--- a/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt
+++ b/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt
@@ -8,6 +8,12 @@ Required properties:
the firmware event log
- linux,sml-size : size of the memory allocated for the firmware event log
+Optional properties:
+
+- powered-while-suspended: present when the TPM is left powered on between
+ suspend and resume (makes the suspend/resume
+ callbacks do nothing).
+
Example (for OpenPower Systems with Nuvoton TPM 2.0 on I2C)
----------------------------------------------------------
--
2.9.3
The suspend/resume behavior of the TPM can be controlled by setting
"powered-while-suspended" in the DTS. This is useful for the cases
when hardware does not power-off the TPM.
Signed-off-by: Sonny Rao <[email protected]>
Signed-off-by: Enric Balletbo i Serra <[email protected]>
Reviewed-by: Jason Gunthorpe <[email protected]>
Reviewed-by: Jarkko Sakkinen <[email protected]>
---
Changes since v3.
- Rebased on top of linux-next
Rob Herring
- Split DT binding from code patch as is preferred.
Changes since v2:
Jarkko Sakkinen
- Add a new TPM_CHIP_FLAG_ALWAYS_POWERED flag instead of using a boolean variable.
- Remove a trailing newline.
Changes since v1:
Jason Gunthorpe :
- Move the code to handle suspend/resume in the common chip code.
drivers/char/tpm/tpm-interface.c | 3 +++
drivers/char/tpm/tpm.h | 1 +
drivers/char/tpm/tpm_of.c | 3 +++
3 files changed, 7 insertions(+)
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index be54159..34ec7ce 100644
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -1099,6 +1099,9 @@ int tpm_pm_suspend(struct device *dev)
if (chip == NULL)
return -ENODEV;
+ if (chip->flags & TPM_CHIP_FLAG_ALWAYS_POWERED)
+ return 0;
+
if (chip->flags & TPM_CHIP_FLAG_TPM2) {
tpm2_shutdown(chip, TPM2_SU_STATE);
return 0;
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index af05c14..b44d39c 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -170,6 +170,7 @@ enum tpm_chip_flags {
TPM_CHIP_FLAG_IRQ = BIT(2),
TPM_CHIP_FLAG_VIRTUAL = BIT(3),
TPM_CHIP_FLAG_HAVE_TIMEOUTS = BIT(4),
+ TPM_CHIP_FLAG_ALWAYS_POWERED = BIT(5),
};
struct tpm_bios_log {
diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_of.c
index de57d4a..aadb7f4 100644
--- a/drivers/char/tpm/tpm_of.c
+++ b/drivers/char/tpm/tpm_of.c
@@ -36,6 +36,9 @@ int tpm_read_log_of(struct tpm_chip *chip)
else
return -ENODEV;
+ if (of_property_read_bool(np, "powered-while-suspended"))
+ chip->flags |= TPM_CHIP_FLAG_ALWAYS_POWERED;
+
sizep = of_get_property(np, "linux,sml-size", NULL);
basep = of_get_property(np, "linux,sml-base", NULL);
if (sizep == NULL && basep == NULL)
--
2.9.3
On Tue, Jun 27, 2017 at 12:27:23PM +0200, Enric Balletbo i Serra wrote:
> Add a new powered-while-suspended property to control the behavior of the
> TPM suspend/resume.
>
> Signed-off-by: Enric Balletbo i Serra <[email protected]>
> Signed-off-by: Sonny Rao <[email protected]>
> Reviewed-by: Jason Gunthorpe <[email protected]>
> Reviewed-by: Jarkko Sakkinen <[email protected]>
> Acked-by: Rob Herring <[email protected]>
> ---
> Changes since v3.
> - Rebased on top of linux-next
> Rob Herring
> - Split DT binding from code patch as is preferred.
>
> Did not exist on previous versions.
>
> Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt b/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt
> index 8cb638b..85c8216 100644
> --- a/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt
> +++ b/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt
> @@ -8,6 +8,12 @@ Required properties:
> the firmware event log
> - linux,sml-size : size of the memory allocated for the firmware event log
>
> +Optional properties:
> +
> +- powered-while-suspended: present when the TPM is left powered on between
> + suspend and resume (makes the suspend/resume
> + callbacks do nothing).
> +
> Example (for OpenPower Systems with Nuvoton TPM 2.0 on I2C)
> ----------------------------------------------------------
>
> --
> 2.9.3
>
So... should I apply this?
/Jarkko
On Tue, Jun 27, 2017 at 12:27:24PM +0200, Enric Balletbo i Serra wrote:
> The suspend/resume behavior of the TPM can be controlled by setting
> "powered-while-suspended" in the DTS. This is useful for the cases
> when hardware does not power-off the TPM.
>
> Signed-off-by: Sonny Rao <[email protected]>
> Signed-off-by: Enric Balletbo i Serra <[email protected]>
> Reviewed-by: Jason Gunthorpe <[email protected]>
> Reviewed-by: Jarkko Sakkinen <[email protected]>
> ---
> Changes since v3.
> - Rebased on top of linux-next
> Rob Herring
> - Split DT binding from code patch as is preferred.
> Changes since v2:
> Jarkko Sakkinen
> - Add a new TPM_CHIP_FLAG_ALWAYS_POWERED flag instead of using a boolean variable.
> - Remove a trailing newline.
> Changes since v1:
> Jason Gunthorpe :
> - Move the code to handle suspend/resume in the common chip code.
>
> drivers/char/tpm/tpm-interface.c | 3 +++
> drivers/char/tpm/tpm.h | 1 +
> drivers/char/tpm/tpm_of.c | 3 +++
> 3 files changed, 7 insertions(+)
>
> diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
> index be54159..34ec7ce 100644
> --- a/drivers/char/tpm/tpm-interface.c
> +++ b/drivers/char/tpm/tpm-interface.c
> @@ -1099,6 +1099,9 @@ int tpm_pm_suspend(struct device *dev)
> if (chip == NULL)
> return -ENODEV;
>
> + if (chip->flags & TPM_CHIP_FLAG_ALWAYS_POWERED)
> + return 0;
> +
> if (chip->flags & TPM_CHIP_FLAG_TPM2) {
> tpm2_shutdown(chip, TPM2_SU_STATE);
> return 0;
> diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
> index af05c14..b44d39c 100644
> --- a/drivers/char/tpm/tpm.h
> +++ b/drivers/char/tpm/tpm.h
> @@ -170,6 +170,7 @@ enum tpm_chip_flags {
> TPM_CHIP_FLAG_IRQ = BIT(2),
> TPM_CHIP_FLAG_VIRTUAL = BIT(3),
> TPM_CHIP_FLAG_HAVE_TIMEOUTS = BIT(4),
> + TPM_CHIP_FLAG_ALWAYS_POWERED = BIT(5),
> };
>
> struct tpm_bios_log {
> diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_of.c
> index de57d4a..aadb7f4 100644
> --- a/drivers/char/tpm/tpm_of.c
> +++ b/drivers/char/tpm/tpm_of.c
> @@ -36,6 +36,9 @@ int tpm_read_log_of(struct tpm_chip *chip)
> else
> return -ENODEV;
>
> + if (of_property_read_bool(np, "powered-while-suspended"))
> + chip->flags |= TPM_CHIP_FLAG_ALWAYS_POWERED;
> +
> sizep = of_get_property(np, "linux,sml-size", NULL);
> basep = of_get_property(np, "linux,sml-base", NULL);
> if (sizep == NULL && basep == NULL)
> --
> 2.9.3
Applied.
/Jarkko
On Mon, Jul 3, 2017 at 5:57 AM, Jarkko Sakkinen
<[email protected]> wrote:
> On Tue, Jun 27, 2017 at 12:27:23PM +0200, Enric Balletbo i Serra wrote:
>> Add a new powered-while-suspended property to control the behavior of the
>> TPM suspend/resume.
>>
>> Signed-off-by: Enric Balletbo i Serra <[email protected]>
>> Signed-off-by: Sonny Rao <[email protected]>
>> Reviewed-by: Jason Gunthorpe <[email protected]>
>> Reviewed-by: Jarkko Sakkinen <[email protected]>
>> Acked-by: Rob Herring <[email protected]>
>> ---
>> Changes since v3.
>> - Rebased on top of linux-next
>> Rob Herring
>> - Split DT binding from code patch as is preferred.
>>
>> Did not exist on previous versions.
>>
>> Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt | 6 ++++++
>> 1 file changed, 6 insertions(+)
>>
>> diff --git a/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt b/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt
>> index 8cb638b..85c8216 100644
>> --- a/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt
>> +++ b/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt
>> @@ -8,6 +8,12 @@ Required properties:
>> the firmware event log
>> - linux,sml-size : size of the memory allocated for the firmware event log
>>
>> +Optional properties:
>> +
>> +- powered-while-suspended: present when the TPM is left powered on between
>> + suspend and resume (makes the suspend/resume
>> + callbacks do nothing).
>> +
>> Example (for OpenPower Systems with Nuvoton TPM 2.0 on I2C)
>> ----------------------------------------------------------
>>
>> --
>> 2.9.3
>>
>
> So... should I apply this?
Hi, since you applied the code part, it would make sense to apply the
documentation too.
>
> /Jarkko
On Wed, Jul 05, 2017 at 10:19:02AM -0700, Sonny Rao wrote:
> On Mon, Jul 3, 2017 at 5:57 AM, Jarkko Sakkinen
> <[email protected]> wrote:
> > On Tue, Jun 27, 2017 at 12:27:23PM +0200, Enric Balletbo i Serra wrote:
> >> Add a new powered-while-suspended property to control the behavior of the
> >> TPM suspend/resume.
> >>
> >> Signed-off-by: Enric Balletbo i Serra <[email protected]>
> >> Signed-off-by: Sonny Rao <[email protected]>
> >> Reviewed-by: Jason Gunthorpe <[email protected]>
> >> Reviewed-by: Jarkko Sakkinen <[email protected]>
> >> Acked-by: Rob Herring <[email protected]>
> >> ---
> >> Changes since v3.
> >> - Rebased on top of linux-next
> >> Rob Herring
> >> - Split DT binding from code patch as is preferred.
> >>
> >> Did not exist on previous versions.
> >>
> >> Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt | 6 ++++++
> >> 1 file changed, 6 insertions(+)
> >>
> >> diff --git a/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt b/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt
> >> index 8cb638b..85c8216 100644
> >> --- a/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt
> >> +++ b/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt
> >> @@ -8,6 +8,12 @@ Required properties:
> >> the firmware event log
> >> - linux,sml-size : size of the memory allocated for the firmware event log
> >>
> >> +Optional properties:
> >> +
> >> +- powered-while-suspended: present when the TPM is left powered on between
> >> + suspend and resume (makes the suspend/resume
> >> + callbacks do nothing).
> >> +
> >> Example (for OpenPower Systems with Nuvoton TPM 2.0 on I2C)
> >> ----------------------------------------------------------
> >>
> >> --
> >> 2.9.3
> >>
> >
> > So... should I apply this?
>
> Hi, since you applied the code part, it would make sense to apply the
> documentation too.
I can do it.
/Jarkko
On Wed, 2017-07-05 at 10:19 -0700, Sonny Rao wrote:
> On Mon, Jul 3, 2017 at 5:57 AM, Jarkko Sakkinen
> <[email protected]> wrote:
> > On Tue, Jun 27, 2017 at 12:27:23PM +0200, Enric Balletbo i Serra
> > wrote:
> > > Add a new powered-while-suspended property to control the
> > > behavior of the
> > > TPM suspend/resume.
> > >
> > > Signed-off-by: Enric Balletbo i Serra <[email protected]
> > > om>
> > > Signed-off-by: Sonny Rao <[email protected]>
> > > Reviewed-by: Jason Gunthorpe <[email protected]>
> > > Reviewed-by: Jarkko Sakkinen <[email protected]>
> > > Acked-by: Rob Herring <[email protected]>
> > > ---
> > > Changes since v3.
> > > - Rebased on top of linux-next
> > > Rob Herring
> > > - Split DT binding from code patch as is preferred.
> > >
> > > Did not exist on previous versions.
> > >
> > > Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt | 6
> > > ++++++
> > > 1 file changed, 6 insertions(+)
> > >
> > > diff --git a/Documentation/devicetree/bindings/security/tpm/tpm-
> > > i2c.txt b/Documentation/devicetree/bindings/security/tpm/tpm-
> > > i2c.txt
> > > index 8cb638b..85c8216 100644
> > > --- a/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt
> > > +++ b/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt
> > > @@ -8,6 +8,12 @@ Required properties:
> > > the firmware event log
> > > - linux,sml-size : size of the memory allocated for the firmware
> > > event log
> > >
> > > +Optional properties:
> > > +
> > > +- powered-while-suspended: present when the TPM is left powered
> > > on between
> > > + suspend and resume (makes the
> > > suspend/resume
> > > + callbacks do nothing).
> > > +
> > > Example (for OpenPower Systems with Nuvoton TPM 2.0 on I2C)
> > > ----------------------------------------------------------
> > >
> > > --
> > > 2.9.3
> > >
> >
> > So... should I apply this?
>
> Hi, since you applied the code part, it would make sense to apply the
> documentation too.
>
> >
> > /Jarkko
Applied. Sorry for the delay.
/Jarkko