diff mbox

tpm_tis_core: convert max timeouts from msec to jiffies

Message ID 1468542580-5296-1-git-send-email-apronin@chromium.org (mailing list archive)
State New, archived
Headers show

Commit Message

Andrey Pronin July 15, 2016, 12:29 a.m. UTC
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(-)

Comments

Jason Gunthorpe July 15, 2016, 3:06 a.m. UTC | #1
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

------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are 
consuming the most bandwidth. Provides multi-vendor support for NetFlow, 
J-Flow, sFlow and other flows. Make informed decisions using capacity planning
reports.http://sdm.link/zohodev2dev
Jarkko Sakkinen July 18, 2016, 6:45 p.m. UTC | #2
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
> 

------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are 
consuming the most bandwidth. Provides multi-vendor support for NetFlow, 
J-Flow, sFlow and other flows. Make informed decisions using capacity planning
reports.http://sdm.link/zohodev2dev
Jarkko Sakkinen July 18, 2016, 6:48 p.m. UTC | #3
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
> > 

------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are 
consuming the most bandwidth. Provides multi-vendor support for NetFlow, 
J-Flow, sFlow and other flows. Make informed decisions using capacity planning
reports.http://sdm.link/zohodev2dev
Jason Gunthorpe July 18, 2016, 6:49 p.m. UTC | #4
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

------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are 
consuming the most bandwidth. Provides multi-vendor support for NetFlow, 
J-Flow, sFlow and other flows. Make informed decisions using capacity planning
reports.http://sdm.link/zohodev2dev
Jarkko Sakkinen July 19, 2016, 12:53 p.m. UTC | #5
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

------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are 
consuming the most bandwidth. Provides multi-vendor support for NetFlow, 
J-Flow, sFlow and other flows. Make informed decisions using capacity planning
reports.http://sdm.link/zohodev2dev
diff mbox

Patch

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);