Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1481242 > unrolled thread

[PATCH v3 1/4] tpm/tpm_crb: implement tpm crb idle state

Started byTomas Winkler <tomas.winkler@intel.com>
First post2016-09-12 15:10 +0200
Last post2016-09-15 08:30 +0200
Articles 7 — 3 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCH v3 1/4] tpm/tpm_crb: implement tpm crb idle state Tomas Winkler <tomas.winkler@intel.com> - 2016-09-12 15:10 +0200
    RE: [PATCH v3 1/4] tpm/tpm_crb: implement tpm crb idle state "Winkler, Tomas" <tomas.winkler@intel.com> - 2016-09-15 08:30 +0200
      RE: [PATCH v3 1/4] tpm/tpm_crb: implement tpm crb idle state "Winkler, Tomas" <tomas.winkler@intel.com> - 2016-09-15 10:30 +0200
        Re: [PATCH v3 1/4] tpm/tpm_crb: implement tpm crb idle state Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-09-15 13:00 +0200
          RE: [PATCH v3 1/4] tpm/tpm_crb: implement tpm crb idle state "Winkler, Tomas" <tomas.winkler@intel.com> - 2016-09-15 15:20 +0200
      Re: [PATCH v3 1/4] tpm/tpm_crb: implement tpm crb idle state Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-09-15 10:30 +0200
    Re: [PATCH v3 1/4] tpm/tpm_crb: implement tpm crb idle state Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-09-15 08:30 +0200

#1481242 — [PATCH v3 1/4] tpm/tpm_crb: implement tpm crb idle state

FromTomas Winkler <tomas.winkler@intel.com>
Date2016-09-12 15:10 +0200
Subject[PATCH v3 1/4] tpm/tpm_crb: implement tpm crb idle state
Message-ID<sgz9L-3JB-13@gated-at.bofh.it>
The register TPM_CRB_CTRL_REQ_x contains bits goIdle and cmdReady for
SW to indicate that the device can enter or should exit the idle state.

The legacy ACPI-start (SMI + DMA) based devices do not support these
bits and the idle state management is not exposed to the host SW.
Thus, this functionality only is enabled only for a CRB start (MMIO)
based devices.

Based on Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
oringal patch:
'tpm_crb: implement power tpm crb power management'


Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
V2: do not export the functions via tpm ops
V3: fix lower case corruption; adjust function documentation

 drivers/char/tpm/tpm_crb.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
index 6e9d1bca712f..b6923a8b3ff7 100644
--- a/drivers/char/tpm/tpm_crb.c
+++ b/drivers/char/tpm/tpm_crb.c
@@ -83,6 +83,75 @@ struct crb_priv {
 	u32 cmd_size;
 };
 
+/**
+ * crb_go_idle - request tpm crb device to go the idle state
+ *
+ * @dev:  crb device
+ * @priv: crb private data
+ *
+ * Write CRB_CTRL_REQ_GO_IDLE to TPM_CRB_CTRL_REQ
+ * The device should respond within TIMEOUT_C by clearing the bit.
+ * Anyhow, we do not wait here as a consequent CMD_READY request
+ * will be handled correctly even if idle was not completed.
+ *
+ * The function does nothing for devices with ACPI-start method.
+ *
+ * Return: 0 always
+ */
+static int __maybe_unused crb_go_idle(struct device *dev, struct crb_priv *priv)
+{
+	if (priv->flags & CRB_FL_ACPI_START)
+		return 0;
+
+	iowrite32(CRB_CTRL_REQ_GO_IDLE, &priv->cca->req);
+	/* we don't really care when this settles */
+
+	return 0;
+}
+
+/**
+ * crb_cmd_ready - request tpm crb device to enter ready state
+ *
+ * @dev:  crb device
+ * @priv: crb private data
+ *
+ * Write CRB_CTRL_REQ_CMD_READY to TPM_CRB_CTRL_REQ
+ * and poll till the device acknowledge it by clearing the bit.
+ * The device should respond within TIMEOUT_C.
+ *
+ * The function does nothing for devices with ACPI-start method
+ *
+ * Return: 0 on success -ETIME on timeout;
+ */
+static int __maybe_unused crb_cmd_ready(struct device *dev,
+					struct crb_priv *priv)
+{
+	ktime_t stop, start;
+
+	if (priv->flags & CRB_FL_ACPI_START)
+		return 0;
+
+	iowrite32(CRB_CTRL_REQ_CMD_READY, &priv->cca->req);
+
+	start = ktime_get();
+	stop = ktime_add(start, ms_to_ktime(TPM2_TIMEOUT_C));
+	do {
+		if (!(ioread32(&priv->cca->req) & CRB_CTRL_REQ_CMD_READY)) {
+			dev_dbg(dev, "cmdReady in %lld usecs\n",
+				ktime_to_us(ktime_sub(ktime_get(), start)));
+			return 0;
+		}
+		usleep_range(50, 100);
+	} while (ktime_before(ktime_get(), stop));
+
+	if (ioread32(&priv->cca->req) & CRB_CTRL_REQ_CMD_READY) {
+		dev_warn(dev, "cmdReady timed out\n");
+		return -ETIME;
+	}
+
+	return 0;
+}
+
 static SIMPLE_DEV_PM_OPS(crb_pm, tpm_pm_suspend, tpm_pm_resume);
 
 static u8 crb_status(struct tpm_chip *chip)
-- 
2.7.4

[toc] | [next] | [standalone]

#1483873

From"Winkler, Tomas" <tomas.winkler@intel.com>
Date2016-09-15 08:30 +0200
Message-ID<shylj-3ql-25@gated-at.bofh.it>
In reply to#1481242
> Subject: Re: [PATCH v3 1/4] tpm/tpm_crb: implement tpm crb idle state
> 
> On Mon, Sep 12, 2016 at 04:04:18PM +0300, Tomas Winkler wrote:
> > The register TPM_CRB_CTRL_REQ_x contains bits goIdle and cmdReady for
> > SW to indicate that the device can enter or should exit the idle state.
> >
> > The legacy ACPI-start (SMI + DMA) based devices do not support these
> > bits and the idle state management is not exposed to the host SW.
> > Thus, this functionality only is enabled only for a CRB start (MMIO)
> > based devices.
> >
> > Based on Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> oringal
> > patch:
> > 'tpm_crb: implement power tpm crb power management'
> >
> >
> > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> > ---
> > V2: do not export the functions via tpm ops
> > V3: fix lower case corruption; adjust function documentation
> >
> >  drivers/char/tpm/tpm_crb.c | 69
> > ++++++++++++++++++++++++++++++++++++++++++++++
> >  1 file changed, 69 insertions(+)
> >
> > diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
> > index 6e9d1bca712f..b6923a8b3ff7 100644
> > --- a/drivers/char/tpm/tpm_crb.c
> > +++ b/drivers/char/tpm/tpm_crb.c
> > @@ -83,6 +83,75 @@ struct crb_priv {
> >  	u32 cmd_size;
> >  };
> >
> > +/**
> > + * crb_go_idle - request tpm crb device to go the idle state
> > + *
> > + * @dev:  crb device
> > + * @priv: crb private data
> > + *
> > + * Write CRB_CTRL_REQ_GO_IDLE to TPM_CRB_CTRL_REQ
> > + * The device should respond within TIMEOUT_C by clearing the bit.
> > + * Anyhow, we do not wait here as a consequent CMD_READY request
> > + * will be handled correctly even if idle was not completed.
> > + *
> > + * The function does nothing for devices with ACPI-start method.
> > + *
> > + * Return: 0 always
> > + */
> > +static int __maybe_unused crb_go_idle(struct device *dev, struct
> > +crb_priv *priv) {
> > +	if (priv->flags & CRB_FL_ACPI_START)
> > +		return 0;
> > +
> > +	iowrite32(CRB_CTRL_REQ_GO_IDLE, &priv->cca->req);
> > +	/* we don't really care when this settles */
> > +
> > +	return 0;
> > +}
> > +
> > +/**
> > + * crb_cmd_ready - request tpm crb device to enter ready state
> > + *
> > + * @dev:  crb device
> > + * @priv: crb private data
> > + *
> > + * Write CRB_CTRL_REQ_CMD_READY to TPM_CRB_CTRL_REQ
> > + * and poll till the device acknowledge it by clearing the bit.
> > + * The device should respond within TIMEOUT_C.
> > + *
> > + * The function does nothing for devices with ACPI-start method
> > + *
> > + * Return: 0 on success -ETIME on timeout;  */ static int
> > +__maybe_unused crb_cmd_ready(struct device *dev,
> > +					struct crb_priv *priv)
> > +{
> > +	ktime_t stop, start;
> > +
> > +	if (priv->flags & CRB_FL_ACPI_START)
> > +		return 0;
> > +
> > +	iowrite32(CRB_CTRL_REQ_CMD_READY, &priv->cca->req);
> > +
> > +	start = ktime_get();
> > +	stop = ktime_add(start, ms_to_ktime(TPM2_TIMEOUT_C));
> > +	do {
> > +		if (!(ioread32(&priv->cca->req) &
> CRB_CTRL_REQ_CMD_READY)) {
> > +			dev_dbg(dev, "cmdReady in %lld usecs\n",
> > +				ktime_to_us(ktime_sub(ktime_get(), start)));
> > +			return 0;
> > +		}
> > +		usleep_range(50, 100);
> > +	} while (ktime_before(ktime_get(), stop));
> 
> Since this is HW specific this is right thing to do and not abuse
> wait_for_tpm_stat. However, this should be documented to the commit
> message.
I will respin just this patch and not the whole series, as the fix is only in the commit message. 
Tomas

> Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> 
> /Jarkko

[toc] | [prev] | [next] | [standalone]

#1483908

From"Winkler, Tomas" <tomas.winkler@intel.com>
Date2016-09-15 10:30 +0200
Message-ID<shAds-4BB-5@gated-at.bofh.it>
In reply to#1483873
> > > Subject: Re: [PATCH v3 1/4] tpm/tpm_crb: implement tpm crb idle
> > > state
> > >
> > > On Mon, Sep 12, 2016 at 04:04:18PM +0300, Tomas Winkler wrote:
> > > > The register TPM_CRB_CTRL_REQ_x contains bits goIdle and cmdReady
> > > > for SW to indicate that the device can enter or should exit the idle state.
> > > >
> > > > The legacy ACPI-start (SMI + DMA) based devices do not support
> > > > these bits and the idle state management is not exposed to the host
> SW.
> > > > Thus, this functionality only is enabled only for a CRB start
> > > > (MMIO) based devices.
> > > >
> > > > Based on Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> oringal
> > > > patch:
> > > > 'tpm_crb: implement power tpm crb power management'
> > > >
> > > >
> > > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> > > > ---
> > > > V2: do not export the functions via tpm ops
> > > > V3: fix lower case corruption; adjust function documentation
> > > >
> > > >  drivers/char/tpm/tpm_crb.c | 69
> > > > ++++++++++++++++++++++++++++++++++++++++++++++
> > > >  1 file changed, 69 insertions(+)
> > > >
> > > > diff --git a/drivers/char/tpm/tpm_crb.c
> > > > b/drivers/char/tpm/tpm_crb.c index 6e9d1bca712f..b6923a8b3ff7
> > > > 100644
> > > > --- a/drivers/char/tpm/tpm_crb.c
> > > > +++ b/drivers/char/tpm/tpm_crb.c
> > > > @@ -83,6 +83,75 @@ struct crb_priv {
> > > >  	u32 cmd_size;
> > > >  };
> > > >
> > > > +/**
> > > > + * crb_go_idle - request tpm crb device to go the idle state
> > > > + *
> > > > + * @dev:  crb device
> > > > + * @priv: crb private data
> > > > + *
> > > > + * Write CRB_CTRL_REQ_GO_IDLE to TPM_CRB_CTRL_REQ
> > > > + * The device should respond within TIMEOUT_C by clearing the bit.
> > > > + * Anyhow, we do not wait here as a consequent CMD_READY request
> > > > + * will be handled correctly even if idle was not completed.
> > > > + *
> > > > + * The function does nothing for devices with ACPI-start method.
> > > > + *
> > > > + * Return: 0 always
> > > > + */
> > > > +static int __maybe_unused crb_go_idle(struct device *dev, struct
> > > > +crb_priv *priv) {
> > > > +	if (priv->flags & CRB_FL_ACPI_START)
> > > > +		return 0;
> > > > +
> > > > +	iowrite32(CRB_CTRL_REQ_GO_IDLE, &priv->cca->req);
> > > > +	/* we don't really care when this settles */
> > > > +
> > > > +	return 0;
> > > > +}
> > > > +
> > > > +/**
> > > > + * crb_cmd_ready - request tpm crb device to enter ready state
> > > > + *
> > > > + * @dev:  crb device
> > > > + * @priv: crb private data
> > > > + *
> > > > + * Write CRB_CTRL_REQ_CMD_READY to TPM_CRB_CTRL_REQ
> > > > + * and poll till the device acknowledge it by clearing the bit.
> > > > + * The device should respond within TIMEOUT_C.
> > > > + *
> > > > + * The function does nothing for devices with ACPI-start method
> > > > + *
> > > > + * Return: 0 on success -ETIME on timeout;  */ static int
> > > > +__maybe_unused crb_cmd_ready(struct device *dev,
> > > > +					struct crb_priv *priv)
> > > > +{
> > > > +	ktime_t stop, start;
> > > > +
> > > > +	if (priv->flags & CRB_FL_ACPI_START)
> > > > +		return 0;
> > > > +
> > > > +	iowrite32(CRB_CTRL_REQ_CMD_READY, &priv->cca->req);
> > > > +
> > > > +	start = ktime_get();
> > > > +	stop = ktime_add(start, ms_to_ktime(TPM2_TIMEOUT_C));
> > > > +	do {
> > > > +		if (!(ioread32(&priv->cca->req) &
> > > CRB_CTRL_REQ_CMD_READY)) {
> > > > +			dev_dbg(dev, "cmdReady in %lld usecs\n",
> > > > +				ktime_to_us(ktime_sub(ktime_get(), start)));
> > > > +			return 0;
> > > > +		}
> > > > +		usleep_range(50, 100);
> > > > +	} while (ktime_before(ktime_get(), stop));
> > >
> > > Since this is HW specific this is right thing to do and not abuse
> > > wait_for_tpm_stat. However, this should be documented to the commit
> > > message.
> > I will respin just this patch and not the whole series, as the fix is only in the
> commit message.
> > Tomas
> 
> Works for me. I can update pm_runtime_sync(). Then I'm ready to apply
> these.

What do you mean by pm_runtime_sync()?

Tomas

[toc] | [prev] | [next] | [standalone]

#1483986

FromJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Date2016-09-15 13:00 +0200
Message-ID<shCyB-5VC-1@gated-at.bofh.it>
In reply to#1483908
On Thu, Sep 15, 2016 at 08:23:03AM +0000, Winkler, Tomas wrote:
> > > > Subject: Re: [PATCH v3 1/4] tpm/tpm_crb: implement tpm crb idle
> > > > state
> > > >
> > > > On Mon, Sep 12, 2016 at 04:04:18PM +0300, Tomas Winkler wrote:
> > > > > The register TPM_CRB_CTRL_REQ_x contains bits goIdle and cmdReady
> > > > > for SW to indicate that the device can enter or should exit the idle state.
> > > > >
> > > > > The legacy ACPI-start (SMI + DMA) based devices do not support
> > > > > these bits and the idle state management is not exposed to the host
> > SW.
> > > > > Thus, this functionality only is enabled only for a CRB start
> > > > > (MMIO) based devices.
> > > > >
> > > > > Based on Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> oringal
> > > > > patch:
> > > > > 'tpm_crb: implement power tpm crb power management'
> > > > >
> > > > >
> > > > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> > > > > ---
> > > > > V2: do not export the functions via tpm ops
> > > > > V3: fix lower case corruption; adjust function documentation
> > > > >
> > > > >  drivers/char/tpm/tpm_crb.c | 69
> > > > > ++++++++++++++++++++++++++++++++++++++++++++++
> > > > >  1 file changed, 69 insertions(+)
> > > > >
> > > > > diff --git a/drivers/char/tpm/tpm_crb.c
> > > > > b/drivers/char/tpm/tpm_crb.c index 6e9d1bca712f..b6923a8b3ff7
> > > > > 100644
> > > > > --- a/drivers/char/tpm/tpm_crb.c
> > > > > +++ b/drivers/char/tpm/tpm_crb.c
> > > > > @@ -83,6 +83,75 @@ struct crb_priv {
> > > > >  	u32 cmd_size;
> > > > >  };
> > > > >
> > > > > +/**
> > > > > + * crb_go_idle - request tpm crb device to go the idle state
> > > > > + *
> > > > > + * @dev:  crb device
> > > > > + * @priv: crb private data
> > > > > + *
> > > > > + * Write CRB_CTRL_REQ_GO_IDLE to TPM_CRB_CTRL_REQ
> > > > > + * The device should respond within TIMEOUT_C by clearing the bit.
> > > > > + * Anyhow, we do not wait here as a consequent CMD_READY request
> > > > > + * will be handled correctly even if idle was not completed.
> > > > > + *
> > > > > + * The function does nothing for devices with ACPI-start method.
> > > > > + *
> > > > > + * Return: 0 always
> > > > > + */
> > > > > +static int __maybe_unused crb_go_idle(struct device *dev, struct
> > > > > +crb_priv *priv) {
> > > > > +	if (priv->flags & CRB_FL_ACPI_START)
> > > > > +		return 0;
> > > > > +
> > > > > +	iowrite32(CRB_CTRL_REQ_GO_IDLE, &priv->cca->req);
> > > > > +	/* we don't really care when this settles */
> > > > > +
> > > > > +	return 0;
> > > > > +}
> > > > > +
> > > > > +/**
> > > > > + * crb_cmd_ready - request tpm crb device to enter ready state
> > > > > + *
> > > > > + * @dev:  crb device
> > > > > + * @priv: crb private data
> > > > > + *
> > > > > + * Write CRB_CTRL_REQ_CMD_READY to TPM_CRB_CTRL_REQ
> > > > > + * and poll till the device acknowledge it by clearing the bit.
> > > > > + * The device should respond within TIMEOUT_C.
> > > > > + *
> > > > > + * The function does nothing for devices with ACPI-start method
> > > > > + *
> > > > > + * Return: 0 on success -ETIME on timeout;  */ static int
> > > > > +__maybe_unused crb_cmd_ready(struct device *dev,
> > > > > +					struct crb_priv *priv)
> > > > > +{
> > > > > +	ktime_t stop, start;
> > > > > +
> > > > > +	if (priv->flags & CRB_FL_ACPI_START)
> > > > > +		return 0;
> > > > > +
> > > > > +	iowrite32(CRB_CTRL_REQ_CMD_READY, &priv->cca->req);
> > > > > +
> > > > > +	start = ktime_get();
> > > > > +	stop = ktime_add(start, ms_to_ktime(TPM2_TIMEOUT_C));
> > > > > +	do {
> > > > > +		if (!(ioread32(&priv->cca->req) &
> > > > CRB_CTRL_REQ_CMD_READY)) {
> > > > > +			dev_dbg(dev, "cmdReady in %lld usecs\n",
> > > > > +				ktime_to_us(ktime_sub(ktime_get(), start)));
> > > > > +			return 0;
> > > > > +		}
> > > > > +		usleep_range(50, 100);
> > > > > +	} while (ktime_before(ktime_get(), stop));
> > > >
> > > > Since this is HW specific this is right thing to do and not abuse
> > > > wait_for_tpm_stat. However, this should be documented to the commit
> > > > message.
> > > I will respin just this patch and not the whole series, as the fix is only in the
> > commit message.
> > > Tomas
> > 
> > Works for me. I can update pm_runtime_sync(). Then I'm ready to apply
> > these.
> 
> What do you mean by pm_runtime_sync()?

Typo. I already commente v2 of the series that pm_runtime_put should be
used instead of pm_runtime_put_sync.

/Jarkko

[toc] | [prev] | [next] | [standalone]

#1484154

From"Winkler, Tomas" <tomas.winkler@intel.com>
Date2016-09-15 15:20 +0200
Message-ID<shEK6-7vq-15@gated-at.bofh.it>
In reply to#1483986
> On Thu, Sep 15, 2016 at 08:23:03AM +0000, Winkler, Tomas wrote:
> > > > > Subject: Re: [PATCH v3 1/4] tpm/tpm_crb: implement tpm crb idle
> > > > > state
> > > > >
> > > > > On Mon, Sep 12, 2016 at 04:04:18PM +0300, Tomas Winkler wrote:
> > > > > > The register TPM_CRB_CTRL_REQ_x contains bits goIdle and
> > > > > > cmdReady for SW to indicate that the device can enter or should exit
> the idle state.
> > > > > >
> > > > > > The legacy ACPI-start (SMI + DMA) based devices do not support
> > > > > > these bits and the idle state management is not exposed to the
> > > > > > host
> > > SW.
> > > > > > Thus, this functionality only is enabled only for a CRB start
> > > > > > (MMIO) based devices.
> > > > > >
> > > > > > Based on Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> > > > > > oringal
> > > > > > patch:
> > > > > > 'tpm_crb: implement power tpm crb power management'
> > > > > >
> > > > > >
> > > > > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> > > > > > ---
> > > > > > V2: do not export the functions via tpm ops
> > > > > > V3: fix lower case corruption; adjust function documentation
> > > > > >
> > > > > >  drivers/char/tpm/tpm_crb.c | 69
> > > > > > ++++++++++++++++++++++++++++++++++++++++++++++
> > > > > >  1 file changed, 69 insertions(+)
> > > > > >
> > > > > > diff --git a/drivers/char/tpm/tpm_crb.c
> > > > > > b/drivers/char/tpm/tpm_crb.c index 6e9d1bca712f..b6923a8b3ff7
> > > > > > 100644
> > > > > > --- a/drivers/char/tpm/tpm_crb.c
> > > > > > +++ b/drivers/char/tpm/tpm_crb.c
> > > > > > @@ -83,6 +83,75 @@ struct crb_priv {
> > > > > >  	u32 cmd_size;
> > > > > >  };
> > > > > >
> > > > > > +/**
> > > > > > + * crb_go_idle - request tpm crb device to go the idle state
> > > > > > + *
> > > > > > + * @dev:  crb device
> > > > > > + * @priv: crb private data
> > > > > > + *
> > > > > > + * Write CRB_CTRL_REQ_GO_IDLE to TPM_CRB_CTRL_REQ
> > > > > > + * The device should respond within TIMEOUT_C by clearing the
> bit.
> > > > > > + * Anyhow, we do not wait here as a consequent CMD_READY
> > > > > > +request
> > > > > > + * will be handled correctly even if idle was not completed.
> > > > > > + *
> > > > > > + * The function does nothing for devices with ACPI-start method.
> > > > > > + *
> > > > > > + * Return: 0 always
> > > > > > + */
> > > > > > +static int __maybe_unused crb_go_idle(struct device *dev,
> > > > > > +struct crb_priv *priv) {
> > > > > > +	if (priv->flags & CRB_FL_ACPI_START)
> > > > > > +		return 0;
> > > > > > +
> > > > > > +	iowrite32(CRB_CTRL_REQ_GO_IDLE, &priv->cca->req);
> > > > > > +	/* we don't really care when this settles */
> > > > > > +
> > > > > > +	return 0;
> > > > > > +}
> > > > > > +
> > > > > > +/**
> > > > > > + * crb_cmd_ready - request tpm crb device to enter ready
> > > > > > +state
> > > > > > + *
> > > > > > + * @dev:  crb device
> > > > > > + * @priv: crb private data
> > > > > > + *
> > > > > > + * Write CRB_CTRL_REQ_CMD_READY to TPM_CRB_CTRL_REQ
> > > > > > + * and poll till the device acknowledge it by clearing the bit.
> > > > > > + * The device should respond within TIMEOUT_C.
> > > > > > + *
> > > > > > + * The function does nothing for devices with ACPI-start
> > > > > > +method
> > > > > > + *
> > > > > > + * Return: 0 on success -ETIME on timeout;  */ static int
> > > > > > +__maybe_unused crb_cmd_ready(struct device *dev,
> > > > > > +					struct crb_priv *priv)
> > > > > > +{
> > > > > > +	ktime_t stop, start;
> > > > > > +
> > > > > > +	if (priv->flags & CRB_FL_ACPI_START)
> > > > > > +		return 0;
> > > > > > +
> > > > > > +	iowrite32(CRB_CTRL_REQ_CMD_READY, &priv->cca->req);
> > > > > > +
> > > > > > +	start = ktime_get();
> > > > > > +	stop = ktime_add(start, ms_to_ktime(TPM2_TIMEOUT_C));
> > > > > > +	do {
> > > > > > +		if (!(ioread32(&priv->cca->req) &
> > > > > CRB_CTRL_REQ_CMD_READY)) {
> > > > > > +			dev_dbg(dev, "cmdReady in %lld usecs\n",
> > > > > > +				ktime_to_us(ktime_sub(ktime_get(),
> start)));
> > > > > > +			return 0;
> > > > > > +		}
> > > > > > +		usleep_range(50, 100);
> > > > > > +	} while (ktime_before(ktime_get(), stop));
> > > > >
> > > > > Since this is HW specific this is right thing to do and not
> > > > > abuse wait_for_tpm_stat. However, this should be documented to
> > > > > the commit message.
> > > > I will respin just this patch and not the whole series, as the fix
> > > > is only in the
> > > commit message.
> > > > Tomas
> > >
> > > Works for me. I can update pm_runtime_sync(). Then I'm ready to
> > > apply these.
> >
> > What do you mean by pm_runtime_sync()?
> 
> Typo. I already commente v2 of the series that pm_runtime_put should be
> used instead of pm_runtime_put_sync.

This is not necessary, it's okay to suspend in asynchronous mode.
Tomas

[toc] | [prev] | [next] | [standalone]

#1483909

FromJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Date2016-09-15 10:30 +0200
Message-ID<shAds-4BB-7@gated-at.bofh.it>
In reply to#1483873
On Thu, Sep 15, 2016 at 06:28:27AM +0000, Winkler, Tomas wrote:
> > Subject: Re: [PATCH v3 1/4] tpm/tpm_crb: implement tpm crb idle state
> > 
> > On Mon, Sep 12, 2016 at 04:04:18PM +0300, Tomas Winkler wrote:
> > > The register TPM_CRB_CTRL_REQ_x contains bits goIdle and cmdReady for
> > > SW to indicate that the device can enter or should exit the idle state.
> > >
> > > The legacy ACPI-start (SMI + DMA) based devices do not support these
> > > bits and the idle state management is not exposed to the host SW.
> > > Thus, this functionality only is enabled only for a CRB start (MMIO)
> > > based devices.
> > >
> > > Based on Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> oringal
> > > patch:
> > > 'tpm_crb: implement power tpm crb power management'
> > >
> > >
> > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> > > ---
> > > V2: do not export the functions via tpm ops
> > > V3: fix lower case corruption; adjust function documentation
> > >
> > >  drivers/char/tpm/tpm_crb.c | 69
> > > ++++++++++++++++++++++++++++++++++++++++++++++
> > >  1 file changed, 69 insertions(+)
> > >
> > > diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
> > > index 6e9d1bca712f..b6923a8b3ff7 100644
> > > --- a/drivers/char/tpm/tpm_crb.c
> > > +++ b/drivers/char/tpm/tpm_crb.c
> > > @@ -83,6 +83,75 @@ struct crb_priv {
> > >  	u32 cmd_size;
> > >  };
> > >
> > > +/**
> > > + * crb_go_idle - request tpm crb device to go the idle state
> > > + *
> > > + * @dev:  crb device
> > > + * @priv: crb private data
> > > + *
> > > + * Write CRB_CTRL_REQ_GO_IDLE to TPM_CRB_CTRL_REQ
> > > + * The device should respond within TIMEOUT_C by clearing the bit.
> > > + * Anyhow, we do not wait here as a consequent CMD_READY request
> > > + * will be handled correctly even if idle was not completed.
> > > + *
> > > + * The function does nothing for devices with ACPI-start method.
> > > + *
> > > + * Return: 0 always
> > > + */
> > > +static int __maybe_unused crb_go_idle(struct device *dev, struct
> > > +crb_priv *priv) {
> > > +	if (priv->flags & CRB_FL_ACPI_START)
> > > +		return 0;
> > > +
> > > +	iowrite32(CRB_CTRL_REQ_GO_IDLE, &priv->cca->req);
> > > +	/* we don't really care when this settles */
> > > +
> > > +	return 0;
> > > +}
> > > +
> > > +/**
> > > + * crb_cmd_ready - request tpm crb device to enter ready state
> > > + *
> > > + * @dev:  crb device
> > > + * @priv: crb private data
> > > + *
> > > + * Write CRB_CTRL_REQ_CMD_READY to TPM_CRB_CTRL_REQ
> > > + * and poll till the device acknowledge it by clearing the bit.
> > > + * The device should respond within TIMEOUT_C.
> > > + *
> > > + * The function does nothing for devices with ACPI-start method
> > > + *
> > > + * Return: 0 on success -ETIME on timeout;  */ static int
> > > +__maybe_unused crb_cmd_ready(struct device *dev,
> > > +					struct crb_priv *priv)
> > > +{
> > > +	ktime_t stop, start;
> > > +
> > > +	if (priv->flags & CRB_FL_ACPI_START)
> > > +		return 0;
> > > +
> > > +	iowrite32(CRB_CTRL_REQ_CMD_READY, &priv->cca->req);
> > > +
> > > +	start = ktime_get();
> > > +	stop = ktime_add(start, ms_to_ktime(TPM2_TIMEOUT_C));
> > > +	do {
> > > +		if (!(ioread32(&priv->cca->req) &
> > CRB_CTRL_REQ_CMD_READY)) {
> > > +			dev_dbg(dev, "cmdReady in %lld usecs\n",
> > > +				ktime_to_us(ktime_sub(ktime_get(), start)));
> > > +			return 0;
> > > +		}
> > > +		usleep_range(50, 100);
> > > +	} while (ktime_before(ktime_get(), stop));
> > 
> > Since this is HW specific this is right thing to do and not abuse
> > wait_for_tpm_stat. However, this should be documented to the commit
> > message.
> I will respin just this patch and not the whole series, as the fix is only in the commit message. 
> Tomas

Works for me. I can update pm_runtime_sync(). Then I'm ready
to apply these.

/Jarkko

[toc] | [prev] | [next] | [standalone]

#1483875

FromJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Date2016-09-15 08:30 +0200
Message-ID<shylj-3ql-27@gated-at.bofh.it>
In reply to#1481242
On Mon, Sep 12, 2016 at 04:04:18PM +0300, Tomas Winkler wrote:
> The register TPM_CRB_CTRL_REQ_x contains bits goIdle and cmdReady for
> SW to indicate that the device can enter or should exit the idle state.
> 
> The legacy ACPI-start (SMI + DMA) based devices do not support these
> bits and the idle state management is not exposed to the host SW.
> Thus, this functionality only is enabled only for a CRB start (MMIO)
> based devices.
> 
> Based on Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> oringal patch:
> 'tpm_crb: implement power tpm crb power management'
> 
> 
> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> ---
> V2: do not export the functions via tpm ops
> V3: fix lower case corruption; adjust function documentation
> 
>  drivers/char/tpm/tpm_crb.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 69 insertions(+)
> 
> diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
> index 6e9d1bca712f..b6923a8b3ff7 100644
> --- a/drivers/char/tpm/tpm_crb.c
> +++ b/drivers/char/tpm/tpm_crb.c
> @@ -83,6 +83,75 @@ struct crb_priv {
>  	u32 cmd_size;
>  };
>  
> +/**
> + * crb_go_idle - request tpm crb device to go the idle state
> + *
> + * @dev:  crb device
> + * @priv: crb private data
> + *
> + * Write CRB_CTRL_REQ_GO_IDLE to TPM_CRB_CTRL_REQ
> + * The device should respond within TIMEOUT_C by clearing the bit.
> + * Anyhow, we do not wait here as a consequent CMD_READY request
> + * will be handled correctly even if idle was not completed.
> + *
> + * The function does nothing for devices with ACPI-start method.
> + *
> + * Return: 0 always
> + */
> +static int __maybe_unused crb_go_idle(struct device *dev, struct crb_priv *priv)
> +{
> +	if (priv->flags & CRB_FL_ACPI_START)
> +		return 0;
> +
> +	iowrite32(CRB_CTRL_REQ_GO_IDLE, &priv->cca->req);
> +	/* we don't really care when this settles */
> +
> +	return 0;
> +}
> +
> +/**
> + * crb_cmd_ready - request tpm crb device to enter ready state
> + *
> + * @dev:  crb device
> + * @priv: crb private data
> + *
> + * Write CRB_CTRL_REQ_CMD_READY to TPM_CRB_CTRL_REQ
> + * and poll till the device acknowledge it by clearing the bit.
> + * The device should respond within TIMEOUT_C.
> + *
> + * The function does nothing for devices with ACPI-start method
> + *
> + * Return: 0 on success -ETIME on timeout;
> + */
> +static int __maybe_unused crb_cmd_ready(struct device *dev,
> +					struct crb_priv *priv)
> +{
> +	ktime_t stop, start;
> +
> +	if (priv->flags & CRB_FL_ACPI_START)
> +		return 0;
> +
> +	iowrite32(CRB_CTRL_REQ_CMD_READY, &priv->cca->req);
> +
> +	start = ktime_get();
> +	stop = ktime_add(start, ms_to_ktime(TPM2_TIMEOUT_C));
> +	do {
> +		if (!(ioread32(&priv->cca->req) & CRB_CTRL_REQ_CMD_READY)) {
> +			dev_dbg(dev, "cmdReady in %lld usecs\n",
> +				ktime_to_us(ktime_sub(ktime_get(), start)));
> +			return 0;
> +		}
> +		usleep_range(50, 100);
> +	} while (ktime_before(ktime_get(), stop));

Since this is HW specific this is right thing to do and not abuse
wait_for_tpm_stat. However, this should be documented to the commit
message.

> +
> +	if (ioread32(&priv->cca->req) & CRB_CTRL_REQ_CMD_READY) {
> +		dev_warn(dev, "cmdReady timed out\n");
> +		return -ETIME;
> +	}
> +
> +	return 0;
> +}
> +
>  static SIMPLE_DEV_PM_OPS(crb_pm, tpm_pm_suspend, tpm_pm_resume);
>  
>  static u8 crb_status(struct tpm_chip *chip)
> -- 
> 2.7.4
> 

Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>

/Jarkko

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web