[PATCH 0/3] Few st33zp24 fixes

[PATCH 0/3] Few st33zp24 fixes

[Christophe Ricard]

Hi Jarkko,

After my first tentative and as discussed, please find a dedicated
st33zp24 serie intends to provide few fixes on acpi probing and code
style improvement.

Best Regards
Christophe

Christophe Ricard (3):
  tpm/st33zp24/i2c: Drop two useless checks in ACPI probe path
  tpm/st33zp24/spi: Drop two useless checks in ACPI probe path
  tpm/st33zp24: Remove unneeded tpm_reg in get_burstcount

 drivers/char/tpm/st33zp24/i2c.c      | 13 +------------
 drivers/char/tpm/st33zp24/spi.c      | 13 +------------
 drivers/char/tpm/st33zp24/st33zp24.c | 10 +++++-----
 3 files changed, 7 insertions(+), 29 deletions(-)

-- 
2.5.0


------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351&iu=/4140

[PATCH 1/3] tpm/st33zp24/i2c: Drop two useless checks in ACPI probe path

[Christophe Ricard]

When st33zp24_i2c_acpi_request_resources() gets called we
already know that the entries in ->acpi_match_table have matched ACPI ID
of the device.
In addition I2C client pointer cannot be NULL in any case (otherwise I2C
core would not call ->probe() for the driver in the first place).

Drop the two useless checks from the driver.

Signed-off-by: Christophe Ricard <christophe-h.ricard-qxv4g6HH51o@public.gmane.org>
---
 drivers/char/tpm/st33zp24/i2c.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/drivers/char/tpm/st33zp24/i2c.c b/drivers/char/tpm/st33zp24/i2c.c
index f179aad..f8e8123 100644
--- a/drivers/char/tpm/st33zp24/i2c.c
+++ b/drivers/char/tpm/st33zp24/i2c.c
@@ -113,19 +113,8 @@ static const struct st33zp24_phy_ops i2c_phy_ops = {
 static int st33zp24_i2c_acpi_request_resources(struct i2c_client *client)
 {
 	struct st33zp24_i2c_phy *phy = i2c_get_clientdata(client);
-	const struct acpi_device_id *id;
 	struct gpio_desc *gpiod_lpcpd;
-	struct device *dev;
-
-	if (!client)
-		return -EINVAL;
-
-	dev = &client->dev;
-
-	/* Match the struct device against a given list of ACPI IDs */
-	id = acpi_match_device(dev->driver->acpi_match_table, dev);
-	if (!id)
-		return -ENODEV;
+	struct device *dev = &client->dev;
 
 	/* Get LPCPD GPIO from ACPI */
 	gpiod_lpcpd = devm_gpiod_get_index(dev, "TPM IO LPCPD", 1,
-- 
2.5.0


------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351&iu=/4140

Re: [PATCH 1/3] tpm/st33zp24/i2c: Drop two useless checks in ACPI probe path

[Jarkko Sakkinen]

On Wed, Mar 23, 2016 at 08:55:32AM +0100, Christophe Ricard wrote:
> When st33zp24_i2c_acpi_request_resources() gets called we
> already know that the entries in ->acpi_match_table have matched ACPI ID
> of the device.
> In addition I2C client pointer cannot be NULL in any case (otherwise I2C
> core would not call ->probe() for the driver in the first place).
> 
> Drop the two useless checks from the driver.
> 
> Signed-off-by: Christophe Ricard <christophe-h.ricard-qxv4g6HH51o@public.gmane.org>

Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>

/Jarkko

> ---
>  drivers/char/tpm/st33zp24/i2c.c | 13 +------------
>  1 file changed, 1 insertion(+), 12 deletions(-)
> 
> diff --git a/drivers/char/tpm/st33zp24/i2c.c b/drivers/char/tpm/st33zp24/i2c.c
> index f179aad..f8e8123 100644
> --- a/drivers/char/tpm/st33zp24/i2c.c
> +++ b/drivers/char/tpm/st33zp24/i2c.c
> @@ -113,19 +113,8 @@ static const struct st33zp24_phy_ops i2c_phy_ops = {
>  static int st33zp24_i2c_acpi_request_resources(struct i2c_client *client)
>  {
>  	struct st33zp24_i2c_phy *phy = i2c_get_clientdata(client);
> -	const struct acpi_device_id *id;
>  	struct gpio_desc *gpiod_lpcpd;
> -	struct device *dev;
> -
> -	if (!client)
> -		return -EINVAL;
> -
> -	dev = &client->dev;
> -
> -	/* Match the struct device against a given list of ACPI IDs */
> -	id = acpi_match_device(dev->driver->acpi_match_table, dev);
> -	if (!id)
> -		return -ENODEV;
> +	struct device *dev = &client->dev;
>  
>  	/* Get LPCPD GPIO from ACPI */
>  	gpiod_lpcpd = devm_gpiod_get_index(dev, "TPM IO LPCPD", 1,
> -- 
> 2.5.0
> 

------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351&iu=/4140

[PATCH 2/3] tpm/st33zp24/spi: Drop two useless checks in ACPI probe path

[Christophe Ricard]

When st33zp24_spi_acpi_request_resources() gets called we
already know that the entries in ->acpi_match_table have matched ACPI ID
of the device.
In addition spi_device pointer cannot be NULL in any case (otherwise I2C
core would not call ->probe() for the driver in the first place).

Drop the two useless checks from the driver.

Signed-off-by: Christophe Ricard <christophe-h.ricard-qxv4g6HH51o@public.gmane.org>
---
 drivers/char/tpm/st33zp24/spi.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/drivers/char/tpm/st33zp24/spi.c b/drivers/char/tpm/st33zp24/spi.c
index 6be51ac..608dbc6 100644
--- a/drivers/char/tpm/st33zp24/spi.c
+++ b/drivers/char/tpm/st33zp24/spi.c
@@ -232,19 +232,8 @@ static const struct st33zp24_phy_ops spi_phy_ops = {
 static int st33zp24_spi_acpi_request_resources(struct spi_device *spi_dev)
 {
 	struct st33zp24_spi_phy *phy = spi_get_drvdata(spi_dev);
-	const struct acpi_device_id *id;
 	struct gpio_desc *gpiod_lpcpd;
-	struct device *dev;
-
-	if (!spi_dev)
-		return -EINVAL;
-
-	dev = &spi_dev->dev;
-
-	/* Match the struct device against a given list of ACPI IDs */
-	id = acpi_match_device(dev->driver->acpi_match_table, dev);
-	if (!id)
-		return -ENODEV;
+	struct device *dev = &spi_dev->dev;
 
 	/* Get LPCPD GPIO from ACPI */
 	gpiod_lpcpd = devm_gpiod_get_index(dev, "TPM IO LPCPD", 1,
-- 
2.5.0


------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351&iu=/4140

Re: [PATCH 2/3] tpm/st33zp24/spi: Drop two useless checks in ACPI probe path

[Jarkko Sakkinen]

On Wed, Mar 23, 2016 at 08:55:33AM +0100, Christophe Ricard wrote:
> When st33zp24_spi_acpi_request_resources() gets called we
> already know that the entries in ->acpi_match_table have matched ACPI ID
> of the device.
> In addition spi_device pointer cannot be NULL in any case (otherwise I2C
> core would not call ->probe() for the driver in the first place).
> 
> Drop the two useless checks from the driver.
> 
> Signed-off-by: Christophe Ricard <christophe-h.ricard-qxv4g6HH51o@public.gmane.org>

Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>

/Jarkko

> ---
>  drivers/char/tpm/st33zp24/spi.c | 13 +------------
>  1 file changed, 1 insertion(+), 12 deletions(-)
> 
> diff --git a/drivers/char/tpm/st33zp24/spi.c b/drivers/char/tpm/st33zp24/spi.c
> index 6be51ac..608dbc6 100644
> --- a/drivers/char/tpm/st33zp24/spi.c
> +++ b/drivers/char/tpm/st33zp24/spi.c
> @@ -232,19 +232,8 @@ static const struct st33zp24_phy_ops spi_phy_ops = {
>  static int st33zp24_spi_acpi_request_resources(struct spi_device *spi_dev)
>  {
>  	struct st33zp24_spi_phy *phy = spi_get_drvdata(spi_dev);
> -	const struct acpi_device_id *id;
>  	struct gpio_desc *gpiod_lpcpd;
> -	struct device *dev;
> -
> -	if (!spi_dev)
> -		return -EINVAL;
> -
> -	dev = &spi_dev->dev;
> -
> -	/* Match the struct device against a given list of ACPI IDs */
> -	id = acpi_match_device(dev->driver->acpi_match_table, dev);
> -	if (!id)
> -		return -ENODEV;
> +	struct device *dev = &spi_dev->dev;
>  
>  	/* Get LPCPD GPIO from ACPI */
>  	gpiod_lpcpd = devm_gpiod_get_index(dev, "TPM IO LPCPD", 1,
> -- 
> 2.5.0
> 

------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351&iu=/4140

[PATCH 3/3] tpm/st33zp24: Remove unneeded tpm_reg in get_burstcount

[Christophe Ricard]

We can get rid of tpm_reg variable in get_burstcount.

Signed-off-by: Christophe Ricard <christophe-h.ricard-qxv4g6HH51o@public.gmane.org>
---
 drivers/char/tpm/st33zp24/st33zp24.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/char/tpm/st33zp24/st33zp24.c b/drivers/char/tpm/st33zp24/st33zp24.c
index 944d279..9e91ca7 100644
--- a/drivers/char/tpm/st33zp24/st33zp24.c
+++ b/drivers/char/tpm/st33zp24/st33zp24.c
@@ -208,21 +208,21 @@ static int get_burstcount(struct tpm_chip *chip)
 {
 	unsigned long stop;
 	int burstcnt, status;
-	u8 tpm_reg, temp;
+	u8 temp;
 	struct st33zp24_dev *tpm_dev;
 
 	tpm_dev = (struct st33zp24_dev *)TPM_VPRIV(chip);
 
 	stop = jiffies + chip->vendor.timeout_d;
 	do {
-		tpm_reg = TPM_STS + 1;
-		status = tpm_dev->ops->recv(tpm_dev->phy_id, tpm_reg, &temp, 1);
+		status = tpm_dev->ops->recv(tpm_dev->phy_id, TPM_STS + 1,
+					    &temp, 1);
 		if (status < 0)
 			return -EBUSY;
 
-		tpm_reg = TPM_STS + 2;
 		burstcnt = temp;
-		status = tpm_dev->ops->recv(tpm_dev->phy_id, tpm_reg, &temp, 1);
+		status = tpm_dev->ops->recv(tpm_dev->phy_id, TPM_STS + 2,
+					    &temp, 1);
 		if (status < 0)
 			return -EBUSY;
 
-- 
2.5.0


------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351&iu=/4140

Re: [PATCH 3/3] tpm/st33zp24: Remove unneeded tpm_reg in get_burstcount

[Jarkko Sakkinen]

On Wed, Mar 23, 2016 at 08:55:34AM +0100, Christophe Ricard wrote:
> We can get rid of tpm_reg variable in get_burstcount.
> 
> Signed-off-by: Christophe Ricard <christophe-h.ricard-qxv4g6HH51o@public.gmane.org>

Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>

/Jarkko

> ---
>  drivers/char/tpm/st33zp24/st33zp24.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/char/tpm/st33zp24/st33zp24.c b/drivers/char/tpm/st33zp24/st33zp24.c
> index 944d279..9e91ca7 100644
> --- a/drivers/char/tpm/st33zp24/st33zp24.c
> +++ b/drivers/char/tpm/st33zp24/st33zp24.c
> @@ -208,21 +208,21 @@ static int get_burstcount(struct tpm_chip *chip)
>  {
>  	unsigned long stop;
>  	int burstcnt, status;
> -	u8 tpm_reg, temp;
> +	u8 temp;
>  	struct st33zp24_dev *tpm_dev;
>  
>  	tpm_dev = (struct st33zp24_dev *)TPM_VPRIV(chip);
>  
>  	stop = jiffies + chip->vendor.timeout_d;
>  	do {
> -		tpm_reg = TPM_STS + 1;
> -		status = tpm_dev->ops->recv(tpm_dev->phy_id, tpm_reg, &temp, 1);
> +		status = tpm_dev->ops->recv(tpm_dev->phy_id, TPM_STS + 1,
> +					    &temp, 1);
>  		if (status < 0)
>  			return -EBUSY;
>  
> -		tpm_reg = TPM_STS + 2;
>  		burstcnt = temp;
> -		status = tpm_dev->ops->recv(tpm_dev->phy_id, tpm_reg, &temp, 1);
> +		status = tpm_dev->ops->recv(tpm_dev->phy_id, TPM_STS + 2,
> +					    &temp, 1);
>  		if (status < 0)
>  			return -EBUSY;
>  
> -- 
> 2.5.0
> 

------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351&iu=/4140

Re: [PATCH 0/3] Few st33zp24 fixes

[Jarkko Sakkinen]

On Wed, Mar 23, 2016 at 08:55:31AM +0100, Christophe Ricard wrote:
> Hi Jarkko,
> 
> After my first tentative and as discussed, please find a dedicated
> st33zp24 serie intends to provide few fixes on acpi probing and code
> style improvement.

Thanks. This is also your benefit because these patches probably get
reviewed and merged much faster whereas other patches might go for a few
cycles before taken be accepted.

> Best Regards
> Christophe

/Jarkko

> 
> Christophe Ricard (3):
>   tpm/st33zp24/i2c: Drop two useless checks in ACPI probe path
>   tpm/st33zp24/spi: Drop two useless checks in ACPI probe path
>   tpm/st33zp24: Remove unneeded tpm_reg in get_burstcount
> 
>  drivers/char/tpm/st33zp24/i2c.c      | 13 +------------
>  drivers/char/tpm/st33zp24/spi.c      | 13 +------------
>  drivers/char/tpm/st33zp24/st33zp24.c | 10 +++++-----
>  3 files changed, 7 insertions(+), 29 deletions(-)
> 
> -- 
> 2.5.0
> 

------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351&iu=/4140

Re: [PATCH 0/3] Few st33zp24 fixes

[Christophe Ricard]

Hi Jarkko,

No problem, i will adapt to your feedback.
I have seen you are working on cleaning up tpm_chip and 
tpm_vendor_specific structures which i am doing as well
since then.

May i ask you to try to keep me in copy of this topic so that i don't 
scratch my head looking at what's on going on the mailing list ?

Thanks a lot.
Best Regards
Christophe

On 23/03/2016 09:17, Jarkko Sakkinen wrote:
> On Wed, Mar 23, 2016 at 08:55:31AM +0100, Christophe Ricard wrote:
>> Hi Jarkko,
>>
>> After my first tentative and as discussed, please find a dedicated
>> st33zp24 serie intends to provide few fixes on acpi probing and code
>> style improvement.
> Thanks. This is also your benefit because these patches probably get
> reviewed and merged much faster whereas other patches might go for a few
> cycles before taken be accepted.
>
>> Best Regards
>> Christophe
> /Jarkko
>
>> Christophe Ricard (3):
>>    tpm/st33zp24/i2c: Drop two useless checks in ACPI probe path
>>    tpm/st33zp24/spi: Drop two useless checks in ACPI probe path
>>    tpm/st33zp24: Remove unneeded tpm_reg in get_burstcount
>>
>>   drivers/char/tpm/st33zp24/i2c.c      | 13 +------------
>>   drivers/char/tpm/st33zp24/spi.c      | 13 +------------
>>   drivers/char/tpm/st33zp24/st33zp24.c | 10 +++++-----
>>   3 files changed, 7 insertions(+), 29 deletions(-)
>>
>> -- 
>> 2.5.0
>>


------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351&iu=/4140

Re: [PATCH 0/3] Few st33zp24 fixes

[Jarkko Sakkinen]

On Wed, Mar 23, 2016 at 09:21:06AM +0100, Christophe Ricard wrote:
> Hi Jarkko,
> 
> No problem, i will adapt to your feedback.
> I have seen you are working on cleaning up tpm_chip and tpm_vendor_specific
> structures which i am doing as well
> since then.
> 
> May i ask you to try to keep me in copy of this topic so that i don't
> scratch my head looking at what's on going on the mailing list ?

If you look at my master branch I've pushed them on top. I decided to
put them available to my bleeding edge branch (next is the stable branch
that gets pulled to linux-next) even though they are still undergoing
review because the changes are so obvious.

They might get updated/changed based on review comments.

/Jarkko


> Thanks a lot.
> Best Regards
> Christophe
> 
> On 23/03/2016 09:17, Jarkko Sakkinen wrote:
> >On Wed, Mar 23, 2016 at 08:55:31AM +0100, Christophe Ricard wrote:
> >>Hi Jarkko,
> >>
> >>After my first tentative and as discussed, please find a dedicated
> >>st33zp24 serie intends to provide few fixes on acpi probing and code
> >>style improvement.
> >Thanks. This is also your benefit because these patches probably get
> >reviewed and merged much faster whereas other patches might go for a few
> >cycles before taken be accepted.
> >
> >>Best Regards
> >>Christophe
> >/Jarkko
> >
> >>Christophe Ricard (3):
> >>   tpm/st33zp24/i2c: Drop two useless checks in ACPI probe path
> >>   tpm/st33zp24/spi: Drop two useless checks in ACPI probe path
> >>   tpm/st33zp24: Remove unneeded tpm_reg in get_burstcount
> >>
> >>  drivers/char/tpm/st33zp24/i2c.c      | 13 +------------
> >>  drivers/char/tpm/st33zp24/spi.c      | 13 +------------
> >>  drivers/char/tpm/st33zp24/st33zp24.c | 10 +++++-----
> >>  3 files changed, 7 insertions(+), 29 deletions(-)
> >>
> >>-- 
> >>2.5.0
> >>
> 

------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351&iu=/4140

Re: [PATCH] tpm: drop int_queue from tpm_vendor_specific

[Christophe Ricard]

On Tue, Mar 22, 2016 at 06:20:09AM +0200, Jarkko Sakkinen wrote:
> Drop field int_queue from tpm_vendor_specific as it is used only by
> tpm_tis. Probably all of the fields should be eventually dropped and
> moved to the private structures of different drivers but it is better to
> do this one step at a time in order not to break anything.
>
> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@...>

Don't you think read_queue could be dropped instead and merge with int_queue.
I think they are both used for the same purpose and don't really see a mean to keep 2 queue.

What do you think ?

Best Regards
Christophe


------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351&iu=/4140

Re: [PATCH] tpm: drop int_queue from tpm_vendor_specific

[Jarkko Sakkinen]

On Wed, Mar 23, 2016 at 10:58:08PM +0100, Christophe Ricard wrote:
> On Tue, Mar 22, 2016 at 06:20:09AM +0200, Jarkko Sakkinen wrote:
> >Drop field int_queue from tpm_vendor_specific as it is used only by
> >tpm_tis. Probably all of the fields should be eventually dropped and
> >moved to the private structures of different drivers but it is better to
> >do this one step at a time in order not to break anything.
> >
> >Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@...>
> 
> Don't you think read_queue could be dropped instead and merge with int_queue.
> I think they are both used for the same purpose and don't really see a mean to keep 2 queue.
> 
> What do you think ?

Both should be dropped from tpm_vendor_specific.

> Best Regards
> Christophe

/Jarkko

------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351&iu=/4140

Re: [PATCH 0/3] Few st33zp24 fixes

[Jarkko Sakkinen]

On Wed, Mar 23, 2016 at 08:55:31AM +0100, Christophe Ricard wrote:
> Hi Jarkko,
> 
> After my first tentative and as discussed, please find a dedicated
> st33zp24 serie intends to provide few fixes on acpi probing and code
> style improvement.
> 
> Best Regards
> Christophe
> 
> Christophe Ricard (3):
>   tpm/st33zp24/i2c: Drop two useless checks in ACPI probe path
>   tpm/st33zp24/spi: Drop two useless checks in ACPI probe path
>   tpm/st33zp24: Remove unneeded tpm_reg in get_burstcount

I've applied these patches to my master branch and at some point
merge them to next.

/Jarkko

> 
>  drivers/char/tpm/st33zp24/i2c.c      | 13 +------------
>  drivers/char/tpm/st33zp24/spi.c      | 13 +------------
>  drivers/char/tpm/st33zp24/st33zp24.c | 10 +++++-----
>  3 files changed, 7 insertions(+), 29 deletions(-)
> 
> -- 
> 2.5.0
> 

------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785471&iu=/4140

[PATCH] tpm: drop int_queue from tpm_vendor_specific

[Jarkko Sakkinen]

Drop field int_queue from tpm_vendor_specific as it is used only by
tpm_tis. Probably all of the fields should be eventually dropped and
moved to the private structures of different drivers but it is better to
do this one step at a time in order not to break anything.

Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
---
 drivers/char/tpm/tpm.h             |  1 -
 drivers/char/tpm/tpm_i2c_nuvoton.c |  1 -
 drivers/char/tpm/tpm_tis.c         | 19 ++++++++++++-------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index f197eef..4764545 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -148,7 +148,6 @@ struct tpm_vendor_specific {
 	void *priv;
 
 	wait_queue_head_t read_queue;
-	wait_queue_head_t int_queue;
 
 	u16 manufacturer_id;
 };
diff --git a/drivers/char/tpm/tpm_i2c_nuvoton.c b/drivers/char/tpm/tpm_i2c_nuvoton.c
index d61d43f..a43b5f3 100644
--- a/drivers/char/tpm/tpm_i2c_nuvoton.c
+++ b/drivers/char/tpm/tpm_i2c_nuvoton.c
@@ -540,7 +540,6 @@ static int i2c_nuvoton_probe(struct i2c_client *client,
 		return -ENOMEM;
 
 	init_waitqueue_head(&chip->vendor.read_queue);
-	init_waitqueue_head(&chip->vendor.int_queue);
 
 	/* Default timeouts */
 	chip->vendor.timeout_a = msecs_to_jiffies(TPM_I2C_SHORT_TIMEOUT);
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index eed3bf5..7d7a776 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -95,6 +95,7 @@ struct tpm_info {
 
 struct priv_data {
 	bool irq_tested;
+	wait_queue_head_t int_queue;
 };
 
 #if defined(CONFIG_PNP) && defined(CONFIG_ACPI)
@@ -157,6 +158,7 @@ static void release_locality(struct tpm_chip *chip, int l, int force)
 
 static int request_locality(struct tpm_chip *chip, int l)
 {
+	struct priv_data *priv = chip->vendor.priv;
 	unsigned long stop, timeout;
 	long rc;
 
@@ -173,7 +175,7 @@ again:
 		timeout = stop - jiffies;
 		if ((long)timeout <= 0)
 			return -1;
-		rc = wait_event_interruptible_timeout(chip->vendor.int_queue,
+		rc = wait_event_interruptible_timeout(priv->int_queue,
 						      (check_locality
 						       (chip, l) >= 0),
 						      timeout);
@@ -249,6 +251,7 @@ static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count)
 
 static int tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count)
 {
+	struct priv_data *priv = chip->vendor.priv;
 	int size = 0;
 	int expected, status;
 
@@ -279,7 +282,7 @@ static int tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count)
 	}
 
 	wait_for_tpm_stat(chip, TPM_STS_VALID, chip->vendor.timeout_c,
-			  &chip->vendor.int_queue, false);
+			  &priv->int_queue, false);
 	status = tpm_tis_status(chip);
 	if (status & TPM_STS_DATA_AVAIL) {	/* retry? */
 		dev_err(&chip->dev, "Error left over data\n");
@@ -304,6 +307,7 @@ MODULE_PARM_DESC(itpm, "Force iTPM workarounds (found on some Lenovo laptops)");
  */
 static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len)
 {
+	struct priv_data *priv = chip->vendor.priv;
 	int rc, status, burstcnt;
 	size_t count = 0;
 
@@ -315,7 +319,7 @@ static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len)
 		tpm_tis_ready(chip);
 		if (wait_for_tpm_stat
 		    (chip, TPM_STS_COMMAND_READY, chip->vendor.timeout_b,
-		     &chip->vendor.int_queue, false) < 0) {
+		     &priv->int_queue, false) < 0) {
 			rc = -ETIME;
 			goto out_err;
 		}
@@ -330,7 +334,7 @@ static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len)
 		}
 
 		wait_for_tpm_stat(chip, TPM_STS_VALID, chip->vendor.timeout_c,
-				  &chip->vendor.int_queue, false);
+				  &priv->int_queue, false);
 		status = tpm_tis_status(chip);
 		if (!itpm && (status & TPM_STS_DATA_EXPECT) == 0) {
 			rc = -EIO;
@@ -342,7 +346,7 @@ static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len)
 	iowrite8(buf[count],
 		 chip->vendor.iobase + TPM_DATA_FIFO(chip->vendor.locality));
 	wait_for_tpm_stat(chip, TPM_STS_VALID, chip->vendor.timeout_c,
-			  &chip->vendor.int_queue, false);
+			  &priv->int_queue, false);
 	status = tpm_tis_status(chip);
 	if ((status & TPM_STS_DATA_EXPECT) != 0) {
 		rc = -EIO;
@@ -537,6 +541,7 @@ static const struct tpm_class_ops tpm_tis = {
 static irqreturn_t tis_int_handler(int dummy, void *dev_id)
 {
 	struct tpm_chip *chip = dev_id;
+	struct priv_data *priv = chip->vendor.priv;
 	u32 interrupt;
 	int i;
 
@@ -556,7 +561,7 @@ static irqreturn_t tis_int_handler(int dummy, void *dev_id)
 	if (interrupt &
 	    (TPM_INTF_LOCALITY_CHANGE_INT | TPM_INTF_STS_VALID_INT |
 	     TPM_INTF_CMD_READY_INT))
-		wake_up_interruptible(&chip->vendor.int_queue);
+		wake_up_interruptible(&priv->int_queue);
 
 	/* Clear interrupts handled with TPM_EOI */
 	iowrite32(interrupt,
@@ -773,7 +778,7 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info,
 
 	/* INTERRUPT Setup */
 	init_waitqueue_head(&chip->vendor.read_queue);
-	init_waitqueue_head(&chip->vendor.int_queue);
+	init_waitqueue_head(&priv->int_queue);
 	if (interrupts && tpm_info->irq != -1) {
 		if (tpm_info->irq) {
 			tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED,
-- 
2.7.3


------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351&iu=/4140

Re: [PATCH] tpm: drop int_queue from tpm_vendor_specific

[Jason Gunthorpe]

On Tue, Mar 22, 2016 at 06:20:09AM +0200, Jarkko Sakkinen wrote:
> Drop field int_queue from tpm_vendor_specific as it is used only by
> tpm_tis. Probably all of the fields should be eventually dropped and
> moved to the private structures of different drivers but it is better to
> do this one step at a time in order not to break anything.
> 
> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>

Reviewed-by: Jason Gunthorpe <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>

>  drivers/char/tpm/tpm.h             |  1 -
>  drivers/char/tpm/tpm_i2c_nuvoton.c |  1 -
>  drivers/char/tpm/tpm_tis.c         | 19 ++++++++++++-------
>  3 files changed, 12 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
> index f197eef..4764545 100644
> +++ b/drivers/char/tpm/tpm.h
> @@ -148,7 +148,6 @@ struct tpm_vendor_specific {
>  	void *priv;
>  
>  	wait_queue_head_t read_queue;
> -	wait_queue_head_t int_queue;
>  
>  	u16 manufacturer_id;
>  };
> diff --git a/drivers/char/tpm/tpm_i2c_nuvoton.c b/drivers/char/tpm/tpm_i2c_nuvoton.c
> index d61d43f..a43b5f3 100644
> +++ b/drivers/char/tpm/tpm_i2c_nuvoton.c
> @@ -540,7 +540,6 @@ static int i2c_nuvoton_probe(struct i2c_client *client,
>  		return -ENOMEM;
>  
>  	init_waitqueue_head(&chip->vendor.read_queue);
> -	init_waitqueue_head(&chip->vendor.int_queue);
>  
>  	/* Default timeouts */
>  	chip->vendor.timeout_a = msecs_to_jiffies(TPM_I2C_SHORT_TIMEOUT);
> diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
> index eed3bf5..7d7a776 100644
> +++ b/drivers/char/tpm/tpm_tis.c
> @@ -95,6 +95,7 @@ struct tpm_info {
>  
>  struct priv_data {
>  	bool irq_tested;
> +	wait_queue_head_t int_queue;
>  };
>  
>  #if defined(CONFIG_PNP) && defined(CONFIG_ACPI)
> @@ -157,6 +158,7 @@ static void release_locality(struct tpm_chip *chip, int l, int force)
>  
>  static int request_locality(struct tpm_chip *chip, int l)
>  {
> +	struct priv_data *priv = chip->vendor.priv;
>  	unsigned long stop, timeout;
>  	long rc;
>  
> @@ -173,7 +175,7 @@ again:
>  		timeout = stop - jiffies;
>  		if ((long)timeout <= 0)
>  			return -1;
> -		rc = wait_event_interruptible_timeout(chip->vendor.int_queue,
> +		rc = wait_event_interruptible_timeout(priv->int_queue,
>  						      (check_locality
>  						       (chip, l) >= 0),
>  						      timeout);
> @@ -249,6 +251,7 @@ static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count)
>  
>  static int tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count)
>  {
> +	struct priv_data *priv = chip->vendor.priv;
>  	int size = 0;
>  	int expected, status;
>  
> @@ -279,7 +282,7 @@ static int tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count)
>  	}
>  
>  	wait_for_tpm_stat(chip, TPM_STS_VALID, chip->vendor.timeout_c,
> -			  &chip->vendor.int_queue, false);
> +			  &priv->int_queue, false);
>  	status = tpm_tis_status(chip);
>  	if (status & TPM_STS_DATA_AVAIL) {	/* retry? */
>  		dev_err(&chip->dev, "Error left over data\n");
> @@ -304,6 +307,7 @@ MODULE_PARM_DESC(itpm, "Force iTPM workarounds (found on some Lenovo laptops)");
>   */
>  static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len)
>  {
> +	struct priv_data *priv = chip->vendor.priv;
>  	int rc, status, burstcnt;
>  	size_t count = 0;
>  
> @@ -315,7 +319,7 @@ static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len)
>  		tpm_tis_ready(chip);
>  		if (wait_for_tpm_stat
>  		    (chip, TPM_STS_COMMAND_READY, chip->vendor.timeout_b,
> -		     &chip->vendor.int_queue, false) < 0) {
> +		     &priv->int_queue, false) < 0) {
>  			rc = -ETIME;
>  			goto out_err;
>  		}
> @@ -330,7 +334,7 @@ static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len)
>  		}
>  
>  		wait_for_tpm_stat(chip, TPM_STS_VALID, chip->vendor.timeout_c,
> -				  &chip->vendor.int_queue, false);
> +				  &priv->int_queue, false);
>  		status = tpm_tis_status(chip);
>  		if (!itpm && (status & TPM_STS_DATA_EXPECT) == 0) {
>  			rc = -EIO;
> @@ -342,7 +346,7 @@ static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len)
>  	iowrite8(buf[count],
>  		 chip->vendor.iobase + TPM_DATA_FIFO(chip->vendor.locality));
>  	wait_for_tpm_stat(chip, TPM_STS_VALID, chip->vendor.timeout_c,
> -			  &chip->vendor.int_queue, false);
> +			  &priv->int_queue, false);
>  	status = tpm_tis_status(chip);
>  	if ((status & TPM_STS_DATA_EXPECT) != 0) {
>  		rc = -EIO;
> @@ -537,6 +541,7 @@ static const struct tpm_class_ops tpm_tis = {
>  static irqreturn_t tis_int_handler(int dummy, void *dev_id)
>  {
>  	struct tpm_chip *chip = dev_id;
> +	struct priv_data *priv = chip->vendor.priv;
>  	u32 interrupt;
>  	int i;
>  
> @@ -556,7 +561,7 @@ static irqreturn_t tis_int_handler(int dummy, void *dev_id)
>  	if (interrupt &
>  	    (TPM_INTF_LOCALITY_CHANGE_INT | TPM_INTF_STS_VALID_INT |
>  	     TPM_INTF_CMD_READY_INT))
> -		wake_up_interruptible(&chip->vendor.int_queue);
> +		wake_up_interruptible(&priv->int_queue);
>  
>  	/* Clear interrupts handled with TPM_EOI */
>  	iowrite32(interrupt,
> @@ -773,7 +778,7 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info,
>  
>  	/* INTERRUPT Setup */
>  	init_waitqueue_head(&chip->vendor.read_queue);
> -	init_waitqueue_head(&chip->vendor.int_queue);
> +	init_waitqueue_head(&priv->int_queue);
>  	if (interrupts && tpm_info->irq != -1) {
>  		if (tpm_info->irq) {
>  			tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED,

-- 
Jason Gunthorpe <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>        (780)4406067x832
Chief Technology Officer, Obsidian Research Corp         Edmonton, Canada

------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351&iu=/4140