linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] tpm_tis_core: convert max timeouts from msec to jiffies
@ 2016-07-15  0:29 Andrey Pronin
  2016-07-15  3:06 ` Jason Gunthorpe
  2016-07-18 18:45 ` Jarkko Sakkinen
  0 siblings, 2 replies; 6+ messages in thread
From: Andrey Pronin @ 2016-07-15  0:29 UTC (permalink / raw)
  To: Jarkko Sakkinen
  Cc: Peter Huewe, Marcel Selhorst, Jason Gunthorpe, tpmdd-devel,
	linux-kernel, groeck, smbarber, dianders, Andrey Pronin

tpm_tis_core was missing conversion from msec when assigning
max timeouts from constants.

Signed-off-by: Andrey Pronin <apronin@chromium.org>
---
 drivers/char/tpm/tpm_tis_core.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index 8110b52..fb8c3de 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -666,10 +666,10 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
 #endif
 
 	/* Maximum timeouts */
-	chip->timeout_a = TIS_TIMEOUT_A_MAX;
-	chip->timeout_b = TIS_TIMEOUT_B_MAX;
-	chip->timeout_c = TIS_TIMEOUT_C_MAX;
-	chip->timeout_d = TIS_TIMEOUT_D_MAX;
+	chip->timeout_a = msecs_to_jiffies(TIS_TIMEOUT_A_MAX);
+	chip->timeout_b = msecs_to_jiffies(TIS_TIMEOUT_B_MAX);
+	chip->timeout_c = msecs_to_jiffies(TIS_TIMEOUT_C_MAX);
+	chip->timeout_d = msecs_to_jiffies(TIS_TIMEOUT_D_MAX);
 	priv->phy_ops = phy_ops;
 	dev_set_drvdata(&chip->dev, priv);
 
-- 
2.6.6

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] tpm_tis_core: convert max timeouts from msec to jiffies
  2016-07-15  0:29 [PATCH] tpm_tis_core: convert max timeouts from msec to jiffies Andrey Pronin
@ 2016-07-15  3:06 ` Jason Gunthorpe
  2016-07-18 18:45 ` Jarkko Sakkinen
  1 sibling, 0 replies; 6+ messages in thread
From: Jason Gunthorpe @ 2016-07-15  3:06 UTC (permalink / raw)
  To: Andrey Pronin
  Cc: Jarkko Sakkinen, Peter Huewe, Marcel Selhorst, tpmdd-devel,
	linux-kernel, groeck, smbarber, dianders

On Thu, Jul 14, 2016 at 05:29:40PM -0700, Andrey Pronin wrote:
> tpm_tis_core was missing conversion from msec when assigning
> max timeouts from constants.

Yep.

Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>

Jason

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] tpm_tis_core: convert max timeouts from msec to jiffies
  2016-07-15  0:29 [PATCH] tpm_tis_core: convert max timeouts from msec to jiffies Andrey Pronin
  2016-07-15  3:06 ` Jason Gunthorpe
@ 2016-07-18 18:45 ` Jarkko Sakkinen
  2016-07-18 18:48   ` Jarkko Sakkinen
  2016-07-18 18:49   ` Jason Gunthorpe
  1 sibling, 2 replies; 6+ messages in thread
From: Jarkko Sakkinen @ 2016-07-18 18:45 UTC (permalink / raw)
  To: Andrey Pronin
  Cc: Peter Huewe, Marcel Selhorst, Jason Gunthorpe, tpmdd-devel,
	linux-kernel, groeck, smbarber, dianders

On Thu, Jul 14, 2016 at 05:29:40PM -0700, Andrey Pronin wrote:
> tpm_tis_core was missing conversion from msec when assigning
> max timeouts from constants.
> 
> Signed-off-by: Andrey Pronin <apronin@chromium.org>

Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Fixes: 41a5e1cf1fe1

/Jarkko

> ---
>  drivers/char/tpm/tpm_tis_core.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
> index 8110b52..fb8c3de 100644
> --- a/drivers/char/tpm/tpm_tis_core.c
> +++ b/drivers/char/tpm/tpm_tis_core.c
> @@ -666,10 +666,10 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
>  #endif
>  
>  	/* Maximum timeouts */
> -	chip->timeout_a = TIS_TIMEOUT_A_MAX;
> -	chip->timeout_b = TIS_TIMEOUT_B_MAX;
> -	chip->timeout_c = TIS_TIMEOUT_C_MAX;
> -	chip->timeout_d = TIS_TIMEOUT_D_MAX;
> +	chip->timeout_a = msecs_to_jiffies(TIS_TIMEOUT_A_MAX);
> +	chip->timeout_b = msecs_to_jiffies(TIS_TIMEOUT_B_MAX);
> +	chip->timeout_c = msecs_to_jiffies(TIS_TIMEOUT_C_MAX);
> +	chip->timeout_d = msecs_to_jiffies(TIS_TIMEOUT_D_MAX);
>  	priv->phy_ops = phy_ops;
>  	dev_set_drvdata(&chip->dev, priv);
>  
> -- 
> 2.6.6
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] tpm_tis_core: convert max timeouts from msec to jiffies
  2016-07-18 18:45 ` Jarkko Sakkinen
@ 2016-07-18 18:48   ` Jarkko Sakkinen
  2016-07-18 18:49   ` Jason Gunthorpe
  1 sibling, 0 replies; 6+ messages in thread
From: Jarkko Sakkinen @ 2016-07-18 18:48 UTC (permalink / raw)
  To: Andrey Pronin
  Cc: Peter Huewe, Marcel Selhorst, Jason Gunthorpe, tpmdd-devel,
	linux-kernel, groeck, smbarber, dianders

On Mon, Jul 18, 2016 at 09:45:32PM +0300, Jarkko Sakkinen wrote:
> On Thu, Jul 14, 2016 at 05:29:40PM -0700, Andrey Pronin wrote:
> > tpm_tis_core was missing conversion from msec when assigning
> > max timeouts from constants.
> > 
> > Signed-off-by: Andrey Pronin <apronin@chromium.org>
> 
> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> Fixes: 41a5e1cf1fe1

Applied.

/Jarkko

> /Jarkko
> 
> > ---
> >  drivers/char/tpm/tpm_tis_core.c | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
> > index 8110b52..fb8c3de 100644
> > --- a/drivers/char/tpm/tpm_tis_core.c
> > +++ b/drivers/char/tpm/tpm_tis_core.c
> > @@ -666,10 +666,10 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
> >  #endif
> >  
> >  	/* Maximum timeouts */
> > -	chip->timeout_a = TIS_TIMEOUT_A_MAX;
> > -	chip->timeout_b = TIS_TIMEOUT_B_MAX;
> > -	chip->timeout_c = TIS_TIMEOUT_C_MAX;
> > -	chip->timeout_d = TIS_TIMEOUT_D_MAX;
> > +	chip->timeout_a = msecs_to_jiffies(TIS_TIMEOUT_A_MAX);
> > +	chip->timeout_b = msecs_to_jiffies(TIS_TIMEOUT_B_MAX);
> > +	chip->timeout_c = msecs_to_jiffies(TIS_TIMEOUT_C_MAX);
> > +	chip->timeout_d = msecs_to_jiffies(TIS_TIMEOUT_D_MAX);
> >  	priv->phy_ops = phy_ops;
> >  	dev_set_drvdata(&chip->dev, priv);
> >  
> > -- 
> > 2.6.6
> > 

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] tpm_tis_core: convert max timeouts from msec to jiffies
  2016-07-18 18:45 ` Jarkko Sakkinen
  2016-07-18 18:48   ` Jarkko Sakkinen
@ 2016-07-18 18:49   ` Jason Gunthorpe
  2016-07-19 12:53     ` Jarkko Sakkinen
  1 sibling, 1 reply; 6+ messages in thread
From: Jason Gunthorpe @ 2016-07-18 18:49 UTC (permalink / raw)
  To: Jarkko Sakkinen
  Cc: Andrey Pronin, Peter Huewe, Marcel Selhorst, tpmdd-devel,
	linux-kernel, groeck, smbarber, dianders

On Mon, Jul 18, 2016 at 09:45:32PM +0300, Jarkko Sakkinen wrote:
> On Thu, Jul 14, 2016 at 05:29:40PM -0700, Andrey Pronin wrote:
> > tpm_tis_core was missing conversion from msec when assigning
> > max timeouts from constants.
> > 
> > Signed-off-by: Andrey Pronin <apronin@chromium.org>
> 
> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> Fixes: 41a5e1cf1fe1

Not sure that fixes isn't right, it looks like it has been broken for
a really long time..

Jason

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] tpm_tis_core: convert max timeouts from msec to jiffies
  2016-07-18 18:49   ` Jason Gunthorpe
@ 2016-07-19 12:53     ` Jarkko Sakkinen
  0 siblings, 0 replies; 6+ messages in thread
From: Jarkko Sakkinen @ 2016-07-19 12:53 UTC (permalink / raw)
  To: Jason Gunthorpe
  Cc: Andrey Pronin, Peter Huewe, Marcel Selhorst, tpmdd-devel,
	linux-kernel, groeck, smbarber, dianders

On Mon, Jul 18, 2016 at 12:49:29PM -0600, Jason Gunthorpe wrote:
> On Mon, Jul 18, 2016 at 09:45:32PM +0300, Jarkko Sakkinen wrote:
> > On Thu, Jul 14, 2016 at 05:29:40PM -0700, Andrey Pronin wrote:
> > > tpm_tis_core was missing conversion from msec when assigning
> > > max timeouts from constants.
> > > 
> > > Signed-off-by: Andrey Pronin <apronin@chromium.org>
> > 
> > Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> > Fixes: 41a5e1cf1fe1
> 
> Not sure that fixes isn't right, it looks like it has been broken for
> a really long time..

Thanks, I fixed the commit ID (in my GIT).

> Jason

/Jarkko

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2016-07-19 12:53 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-15  0:29 [PATCH] tpm_tis_core: convert max timeouts from msec to jiffies Andrey Pronin
2016-07-15  3:06 ` Jason Gunthorpe
2016-07-18 18:45 ` Jarkko Sakkinen
2016-07-18 18:48   ` Jarkko Sakkinen
2016-07-18 18:49   ` Jason Gunthorpe
2016-07-19 12:53     ` Jarkko Sakkinen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).