tpm_tis: Move setting of TPM_CHIP_FLAG_IRQ into tpm_tis_probe_irq_single
diff mbox series

Message ID 20191112202725.3009814-1-stefanb@linux.vnet.ibm.com
State New
Headers show
Series
  • tpm_tis: Move setting of TPM_CHIP_FLAG_IRQ into tpm_tis_probe_irq_single
Related show

Commit Message

Stefan Berger Nov. 12, 2019, 8:27 p.m. UTC
From: Stefan Berger <stefanb@linux.ibm.com>

Move the setting of the TPM_CHIP_FLAG_IRQ for irq probing into
tpm_tis_probe_irq_single before calling tpm_tis_gen_interrupt.
This move handles error conditions better that may arise if anything
before fails in tpm_tis_probe_irq_single.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Suggested-by: Jerry Snitselaar <jsnitsel@redhat.com>
---
 drivers/char/tpm/tpm_tis_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jarkko Sakkinen Nov. 14, 2019, 4:41 p.m. UTC | #1
On Tue, Nov 12, 2019 at 03:27:25PM -0500, Stefan Berger wrote:
> From: Stefan Berger <stefanb@linux.ibm.com>
> 
> Move the setting of the TPM_CHIP_FLAG_IRQ for irq probing into
> tpm_tis_probe_irq_single before calling tpm_tis_gen_interrupt.
> This move handles error conditions better that may arise if anything
> before fails in tpm_tis_probe_irq_single.
> 
> Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> Suggested-by: Jerry Snitselaar <jsnitsel@redhat.com>

What about just changing the condition?

/Jarkko
Jarkko Sakkinen Nov. 14, 2019, 4:44 p.m. UTC | #2
On Thu, Nov 14, 2019 at 06:41:51PM +0200, Jarkko Sakkinen wrote:
> On Tue, Nov 12, 2019 at 03:27:25PM -0500, Stefan Berger wrote:
> > From: Stefan Berger <stefanb@linux.ibm.com>
> > 
> > Move the setting of the TPM_CHIP_FLAG_IRQ for irq probing into
> > tpm_tis_probe_irq_single before calling tpm_tis_gen_interrupt.
> > This move handles error conditions better that may arise if anything
> > before fails in tpm_tis_probe_irq_single.
> > 
> > Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> > Suggested-by: Jerry Snitselaar <jsnitsel@redhat.com>
> 
> What about just changing the condition?

Also cannot take this since it is not a bug (no fixes tag).

/Jarkko
Stefan Berger Nov. 16, 2019, 2:32 p.m. UTC | #3
On 11/14/19 11:44 AM, Jarkko Sakkinen wrote:
> On Thu, Nov 14, 2019 at 06:41:51PM +0200, Jarkko Sakkinen wrote:
>> On Tue, Nov 12, 2019 at 03:27:25PM -0500, Stefan Berger wrote:
>>> From: Stefan Berger <stefanb@linux.ibm.com>
>>>
>>> Move the setting of the TPM_CHIP_FLAG_IRQ for irq probing into
>>> tpm_tis_probe_irq_single before calling tpm_tis_gen_interrupt.
>>> This move handles error conditions better that may arise if anything
>>> before fails in tpm_tis_probe_irq_single.
>>>
>>> Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
>>> Suggested-by: Jerry Snitselaar <jsnitsel@redhat.com>
>> What about just changing the condition?
> Also cannot take this since it is not a bug (no fixes tag).

I'll repost but will wait until Jerry has tested it on that machine.

    Stefan


>
> /Jarkko
Jerry Snitselaar Nov. 17, 2019, 6:08 p.m. UTC | #4
On Sat Nov 16 19, Stefan Berger wrote:
>On 11/14/19 11:44 AM, Jarkko Sakkinen wrote:
>>On Thu, Nov 14, 2019 at 06:41:51PM +0200, Jarkko Sakkinen wrote:
>>>On Tue, Nov 12, 2019 at 03:27:25PM -0500, Stefan Berger wrote:
>>>>From: Stefan Berger <stefanb@linux.ibm.com>
>>>>
>>>>Move the setting of the TPM_CHIP_FLAG_IRQ for irq probing into
>>>>tpm_tis_probe_irq_single before calling tpm_tis_gen_interrupt.
>>>>This move handles error conditions better that may arise if anything
>>>>before fails in tpm_tis_probe_irq_single.
>>>>
>>>>Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
>>>>Suggested-by: Jerry Snitselaar <jsnitsel@redhat.com>
>>>What about just changing the condition?
>>Also cannot take this since it is not a bug (no fixes tag).
>
>I'll repost but will wait until Jerry has tested it on that machine.
>
>   Stefan
>

Sorry, I'm still waiting to hear back from the reporter, and logistics
for some reason has been silent on my request so far.

>
>>
>>/Jarkko
>
>
Jarkko Sakkinen Nov. 18, 2019, 5:59 p.m. UTC | #5
On Sat, Nov 16, 2019 at 09:32:06AM -0500, Stefan Berger wrote:
> On 11/14/19 11:44 AM, Jarkko Sakkinen wrote:
> > On Thu, Nov 14, 2019 at 06:41:51PM +0200, Jarkko Sakkinen wrote:
> > > On Tue, Nov 12, 2019 at 03:27:25PM -0500, Stefan Berger wrote:
> > > > From: Stefan Berger <stefanb@linux.ibm.com>
> > > > 
> > > > Move the setting of the TPM_CHIP_FLAG_IRQ for irq probing into
> > > > tpm_tis_probe_irq_single before calling tpm_tis_gen_interrupt.
> > > > This move handles error conditions better that may arise if anything
> > > > before fails in tpm_tis_probe_irq_single.
> > > > 
> > > > Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> > > > Suggested-by: Jerry Snitselaar <jsnitsel@redhat.com>
> > > What about just changing the condition?
> > Also cannot take this since it is not a bug (no fixes tag).
> 
> I'll repost but will wait until Jerry has tested it on that machine.

OK, great, thank you.

This is really needs some reasoning on why this was the right way to
fix the issue. In addition, a source code comment might make sense.

/Jarkko
Jerry Snitselaar Nov. 21, 2019, 6:49 p.m. UTC | #6
On Sat Nov 16 19, Stefan Berger wrote:
>On 11/14/19 11:44 AM, Jarkko Sakkinen wrote:
>>On Thu, Nov 14, 2019 at 06:41:51PM +0200, Jarkko Sakkinen wrote:
>>>On Tue, Nov 12, 2019 at 03:27:25PM -0500, Stefan Berger wrote:
>>>>From: Stefan Berger <stefanb@linux.ibm.com>
>>>>
>>>>Move the setting of the TPM_CHIP_FLAG_IRQ for irq probing into
>>>>tpm_tis_probe_irq_single before calling tpm_tis_gen_interrupt.
>>>>This move handles error conditions better that may arise if anything
>>>>before fails in tpm_tis_probe_irq_single.
>>>>
>>>>Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
>>>>Suggested-by: Jerry Snitselaar <jsnitsel@redhat.com>
>>>What about just changing the condition?
>>Also cannot take this since it is not a bug (no fixes tag).
>
>I'll repost but will wait until Jerry has tested it on that machine.
>
>   Stefan
>
>
>>
>>/Jarkko
>
>

It appears they still have the problem. I'm still waiting on logistics
to send me a system to debug.
Jarkko Sakkinen Nov. 27, 2019, 9:11 p.m. UTC | #7
On Thu, Nov 21, 2019 at 11:49:49AM -0700, Jerry Snitselaar wrote:
> On Sat Nov 16 19, Stefan Berger wrote:
> > On 11/14/19 11:44 AM, Jarkko Sakkinen wrote:
> > > On Thu, Nov 14, 2019 at 06:41:51PM +0200, Jarkko Sakkinen wrote:
> > > > On Tue, Nov 12, 2019 at 03:27:25PM -0500, Stefan Berger wrote:
> > > > > From: Stefan Berger <stefanb@linux.ibm.com>
> > > > > 
> > > > > Move the setting of the TPM_CHIP_FLAG_IRQ for irq probing into
> > > > > tpm_tis_probe_irq_single before calling tpm_tis_gen_interrupt.
> > > > > This move handles error conditions better that may arise if anything
> > > > > before fails in tpm_tis_probe_irq_single.
> > > > > 
> > > > > Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> > > > > Suggested-by: Jerry Snitselaar <jsnitsel@redhat.com>
> > > > What about just changing the condition?
> > > Also cannot take this since it is not a bug (no fixes tag).
> > 
> > I'll repost but will wait until Jerry has tested it on that machine.
> > 
> >    Stefan
> > 
> > 
> > > 
> > > /Jarkko
> > 
> > 
> 
> It appears they still have the problem. I'm still waiting on logistics
> to send me a system to debug.

Which hardware is guaranteed to ignite this? I can try to get test hw
for this from somewhere. Kind of looking into this blinded ATM. Dan?

/Jarkko
Dan Williams Nov. 27, 2019, 9:26 p.m. UTC | #8
[ add Jerry ]

On Wed, Nov 27, 2019 at 1:11 PM Jarkko Sakkinen
<jarkko.sakkinen@linux.intel.com> wrote:
>
> On Thu, Nov 21, 2019 at 11:49:49AM -0700, Jerry Snitselaar wrote:
> > On Sat Nov 16 19, Stefan Berger wrote:
> > > On 11/14/19 11:44 AM, Jarkko Sakkinen wrote:
> > > > On Thu, Nov 14, 2019 at 06:41:51PM +0200, Jarkko Sakkinen wrote:
> > > > > On Tue, Nov 12, 2019 at 03:27:25PM -0500, Stefan Berger wrote:
> > > > > > From: Stefan Berger <stefanb@linux.ibm.com>
> > > > > >
> > > > > > Move the setting of the TPM_CHIP_FLAG_IRQ for irq probing into
> > > > > > tpm_tis_probe_irq_single before calling tpm_tis_gen_interrupt.
> > > > > > This move handles error conditions better that may arise if anything
> > > > > > before fails in tpm_tis_probe_irq_single.
> > > > > >
> > > > > > Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> > > > > > Suggested-by: Jerry Snitselaar <jsnitsel@redhat.com>
> > > > > What about just changing the condition?
> > > > Also cannot take this since it is not a bug (no fixes tag).
> > >
> > > I'll repost but will wait until Jerry has tested it on that machine.
> > >
> > >    Stefan
> > >
> > >
> > > >
> > > > /Jarkko
> > >
> > >
> >
> > It appears they still have the problem. I'm still waiting on logistics
> > to send me a system to debug.
>
> Which hardware is guaranteed to ignite this? I can try to get test hw
> for this from somewhere. Kind of looking into this blinded ATM. Dan?

Jerry had mentioned that this was also occurring on T490s. Otherwise
I'll ping you offline about the system I saw this on internally.
Jerry Snitselaar Nov. 28, 2019, 12:14 a.m. UTC | #9
On Wed Nov 27 19, Dan Williams wrote:
>[ add Jerry ]
>
>On Wed, Nov 27, 2019 at 1:11 PM Jarkko Sakkinen
><jarkko.sakkinen@linux.intel.com> wrote:
>>
>> On Thu, Nov 21, 2019 at 11:49:49AM -0700, Jerry Snitselaar wrote:
>> > On Sat Nov 16 19, Stefan Berger wrote:
>> > > On 11/14/19 11:44 AM, Jarkko Sakkinen wrote:
>> > > > On Thu, Nov 14, 2019 at 06:41:51PM +0200, Jarkko Sakkinen wrote:
>> > > > > On Tue, Nov 12, 2019 at 03:27:25PM -0500, Stefan Berger wrote:
>> > > > > > From: Stefan Berger <stefanb@linux.ibm.com>
>> > > > > >
>> > > > > > Move the setting of the TPM_CHIP_FLAG_IRQ for irq probing into
>> > > > > > tpm_tis_probe_irq_single before calling tpm_tis_gen_interrupt.
>> > > > > > This move handles error conditions better that may arise if anything
>> > > > > > before fails in tpm_tis_probe_irq_single.
>> > > > > >
>> > > > > > Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
>> > > > > > Suggested-by: Jerry Snitselaar <jsnitsel@redhat.com>
>> > > > > What about just changing the condition?
>> > > > Also cannot take this since it is not a bug (no fixes tag).
>> > >
>> > > I'll repost but will wait until Jerry has tested it on that machine.
>> > >
>> > >    Stefan
>> > >
>> > >
>> > > >
>> > > > /Jarkko
>> > >
>> > >
>> >
>> > It appears they still have the problem. I'm still waiting on logistics
>> > to send me a system to debug.
>>
>> Which hardware is guaranteed to ignite this? I can try to get test hw
>> for this from somewhere. Kind of looking into this blinded ATM. Dan?
>
>Jerry had mentioned that this was also occurring on T490s. Otherwise
>I'll ping you offline about the system I saw this on internally.
>

I've been trying for about 3 weeks now to get one of the laptops from
logistics here, but unfortunately they have been silent. Pinged one
of their email addresses today to see if they could respond to the
ticket, so hopefully next week I will have something.
Jarkko Sakkinen Nov. 29, 2019, 11:26 p.m. UTC | #10
On Wed, Nov 27, 2019 at 01:26:07PM -0800, Dan Williams wrote:
> [ add Jerry ]
> 
> On Wed, Nov 27, 2019 at 1:11 PM Jarkko Sakkinen
> <jarkko.sakkinen@linux.intel.com> wrote:
> >
> > On Thu, Nov 21, 2019 at 11:49:49AM -0700, Jerry Snitselaar wrote:
> > > On Sat Nov 16 19, Stefan Berger wrote:
> > > > On 11/14/19 11:44 AM, Jarkko Sakkinen wrote:
> > > > > On Thu, Nov 14, 2019 at 06:41:51PM +0200, Jarkko Sakkinen wrote:
> > > > > > On Tue, Nov 12, 2019 at 03:27:25PM -0500, Stefan Berger wrote:
> > > > > > > From: Stefan Berger <stefanb@linux.ibm.com>
> > > > > > >
> > > > > > > Move the setting of the TPM_CHIP_FLAG_IRQ for irq probing into
> > > > > > > tpm_tis_probe_irq_single before calling tpm_tis_gen_interrupt.
> > > > > > > This move handles error conditions better that may arise if anything
> > > > > > > before fails in tpm_tis_probe_irq_single.
> > > > > > >
> > > > > > > Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> > > > > > > Suggested-by: Jerry Snitselaar <jsnitsel@redhat.com>
> > > > > > What about just changing the condition?
> > > > > Also cannot take this since it is not a bug (no fixes tag).
> > > >
> > > > I'll repost but will wait until Jerry has tested it on that machine.
> > > >
> > > >    Stefan
> > > >
> > > >
> > > > >
> > > > > /Jarkko
> > > >
> > > >
> > >
> > > It appears they still have the problem. I'm still waiting on logistics
> > > to send me a system to debug.
> >
> > Which hardware is guaranteed to ignite this? I can try to get test hw
> > for this from somewhere. Kind of looking into this blinded ATM. Dan?
> 
> Jerry had mentioned that this was also occurring on T490s. Otherwise
> I'll ping you offline about the system I saw this on internally.

I'll see if I can get my hands on T490 or T490s or something with
equivalent hardware.

/Jarkko

Patch
diff mbox series

diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index 8af2cee1a762..6b6605890c7d 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -790,6 +790,7 @@  static int tpm_tis_probe_irq_single(struct tpm_chip *chip, u32 intmask,
 		return rc;
 
 	priv->irq_tested = false;
+	chip->flags |= TPM_CHIP_FLAG_IRQ;
 
 	/* Generate an interrupt by having the core call through to
 	 * tpm_tis_send
@@ -1060,7 +1061,6 @@  int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
 		}
 
 		tpm_chip_start(chip);
-		chip->flags |= TPM_CHIP_FLAG_IRQ;
 		if (irq) {
 			tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED,
 						 irq);