Skip to contentSkip to conversation

FAILED: patch "[PATCH] tpm_tis_core: Set TPM_CHIP_FLAG_IRQ before probing for" failed to apply to 4.9-stable tree

PATCH [email protected] 3 participants 4 messages Oct 3, 2019 – Oct 6, 2019

Subsystems (2)
Stable branch TPM device driver
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 1ea32c83c699df32689d329b2415796b7bfc2f6e Mon Sep 17 00:00:00 2001
From: Stefan Berger <[email protected]>
Date: Thu, 29 Aug 2019 20:09:06 -0400
Subject: [PATCH] tpm_tis_core: Set TPM_CHIP_FLAG_IRQ before probing for
interrupts

The tpm_tis_core has to set the TPM_CHIP_FLAG_IRQ before probing for interrupts since there is no other place in the code that would set it.

Cc [email protected]
Fixes 570a36097f30 ("tpm: drop 'irq' from struct tpm_vendor_specific")
Signed-off-by Stefan Berger <[email protected]>
Signed-off-by Jarkko Sakkinen <[email protected]>
drivers/char/tpm/tpm_tis_core.c +1 -0
index ffa9048d8f6c..270f43acbb77 100644
@@ -981,6 +981,7 @@ 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);
#1 lore raw
Quoted 9 lines · On Thu, Oct 03, 2019 at 09:46:29AM +0200, [email protected] wrote:

The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

Inspecting next week.

/Jarkko

maintainer
#2 lore raw
Quoted 7 lines · Jarkko Sakkinen
Quoted 6 lines · On Thu, Oct 03, 2019 at 09:46:29AM +0200, [email protected] wrote:

The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Quoted 5 lines
Quoted 3 lines

thanks,

greg k-h

Inspecting next week.

It looks to me like it's not relevant for 4.19 and older because it needs 5b359c7c43727 ("tpm_tis_core: Turn on the TPM before probing IRQ's"), which isn't present in 4.19.

Signature · 2 lines
Thanks,
Sasha
#3 lore raw
Quoted 10 lines · Sasha Levin
Quoted 9 lines · Jarkko Sakkinen
Quoted 8 lines · On Thu, Oct 03, 2019 at 09:46:29AM +0200, [email protected] wrote:

The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

greg k-h

Inspecting next week.

It looks to me like it's not relevant for 4.19 and older because it needs 5b359c7c43727 ("tpm_tis_core: Turn on the TPM before probing IRQ's"), which isn't present in 4.19.

Thanks. I'll take no action.

/Jarkko