tpmdd-devel Archive on lore.kernel.org
 help / color / Atom feed
From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: stable@vger.kernel.org,
	Enric Balletbo i Serra <enric.balletbo@collabora.com>,
	Sonny Rao <sonnyrao@chromium.org>,
	James Morris <james.l.morris@oracle.com>,
	Peter Huewe <peterhuewe@gmx.de>,
	Marcel Selhorst <tpmdd@selhorst.net>,
	Jason Gunthorpe <jgunthorpe@obsidianresearch.com>,
	"moderated list:TPM DEVICE DRIVER"
	<tpmdd-devel@lists.sourceforge.net>,
	open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 1/2] tpm: do not suspend/resume if power stays on
Date: Tue, 8 May 2018 13:56:14 +0300
Message-ID: <20180508105614.GC6132@linux.intel.com> (raw)
In-Reply-To: <20180505022713.GA29590@kroah.com>

On Fri, May 04, 2018 at 07:27:13PM -0700, Greg KH wrote:
> On Wed, May 02, 2018 at 05:38:28PM +0300, Jarkko Sakkinen wrote:
> > From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> > 
> > commit b5d0ebc99bf5d0801a5ecbe958caa3d68b8eaee8 upstream
> > 
> > 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 <sonnyrao@chromium.org>
> > Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> > Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> > Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> > Signed-off-by: James Morris <james.l.morris@oracle.com>
> > ---
> >  drivers/char/tpm/tpm-interface.c | 3 +++
> >  drivers/char/tpm/tpm.h           | 2 ++
> >  drivers/char/tpm/tpm_of.c        | 3 +++
> >  3 files changed, 8 insertions(+)
> > 
> > diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
> > index 830d7e30e508..5463b649bdf1 100644
> > --- a/drivers/char/tpm/tpm-interface.c
> > +++ b/drivers/char/tpm/tpm-interface.c
> > @@ -969,6 +969,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 aa4299cf7e5a..41756a9e9ad8 100644
> > --- a/drivers/char/tpm/tpm.h
> > +++ b/drivers/char/tpm/tpm.h
> > @@ -143,6 +143,8 @@ enum tpm_chip_flags {
> >  	TPM_CHIP_FLAG_TPM2		= BIT(1),
> >  	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_chip {
> > diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_of.c
> > index 570f30c5c5f4..669f4a046398 100644
> > --- a/drivers/char/tpm/tpm_of.c
> > +++ b/drivers/char/tpm/tpm_of.c
> > @@ -37,6 +37,9 @@ int read_log(struct tpm_bios_log *log)
> >  		return -ENODEV;
> >  	}
> >  
> > +	if (of_property_read_bool(np, "powered-while-suspended"))
> > +		chip->flags |= TPM_CHIP_FLAG_ALWAYS_POWERED;
> > +
> 
> This last line here blows up the build, there is no chip variable
> defined in this function :(
> 
> So I have to drop both of these patches, from both 4.4.y and 4.9.y
> queues right now.  Can you fix this up and resend them?
> 
> thanks,
> 
> greg k-h

Yes. Sorry. I'll do that.

/Jarkko

  reply index

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-02 14:38 [PATCH 0/2] fixes for 4.9.96 Jarkko Sakkinen
2018-05-02 14:38 ` [PATCH 1/2] tpm: do not suspend/resume if power stays on Jarkko Sakkinen
2018-05-05  2:27   ` Greg KH
2018-05-08 10:56     ` Jarkko Sakkinen [this message]
2018-05-09 11:52       ` Jarkko Sakkinen
2018-05-02 14:38 ` [PATCH 2/2] tpm: self test failure should not cause suspend to fail Jarkko Sakkinen
2018-05-02 20:52 ` [PATCH 0/2] fixes for 4.9.96 Greg KH
2018-05-03  6:37   ` Jarkko Sakkinen
2018-05-03 12:43 [PATCH 0/2] fixes for v4.4 Jarkko Sakkinen
2018-05-03 12:43 ` [PATCH 1/2] tpm: do not suspend/resume if power stays on Jarkko Sakkinen

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180508105614.GC6132@linux.intel.com \
    --to=jarkko.sakkinen@linux.intel.com \
    --cc=enric.balletbo@collabora.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=james.l.morris@oracle.com \
    --cc=jgunthorpe@obsidianresearch.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=peterhuewe@gmx.de \
    --cc=sonnyrao@chromium.org \
    --cc=stable@vger.kernel.org \
    --cc=tpmdd-devel@lists.sourceforge.net \
    --cc=tpmdd@selhorst.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

tpmdd-devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/tpmdd-devel/0 tpmdd-devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 tpmdd-devel tpmdd-devel/ https://lore.kernel.org/tpmdd-devel \
		tpmdd-devel@lists.sourceforge.net tpmdd-devel@archiver.kernel.org
	public-inbox-index tpmdd-devel


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/net.sourceforge.lists.tpmdd-devel


AGPL code for this site: git clone https://public-inbox.org/ public-inbox