From: Lino Sanfilippo <LinoSanfilippo@gmx.de>
To: peterhuewe@gmx.de, jarkko@kernel.org, jgg@ziepe.ca
Cc: stefanb@linux.vnet.ibm.com, linux@mniewoehner.de,
linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org,
jandryuk@gmail.com, pmenzel@molgen.mpg.de,
l.sanfilippo@kunbus.com, LinoSanfilippo@gmx.de, lukas@wunner.de,
p.rosenberger@kunbus.com
Subject: [PATCH v10 07/14] tpm, tpm_tis: Move interrupt mask checks into own function
Date: Sun, 20 Nov 2022 14:31:27 +0100 [thread overview]
Message-ID: <20221120133134.28926-8-LinoSanfilippo@gmx.de> (raw)
In-Reply-To: <20221120133134.28926-1-LinoSanfilippo@gmx.de>
From: Lino Sanfilippo <l.sanfilippo@kunbus.com>
Clean up wait_for_tpm_stat() by moving multiple similar interrupt mask
checks into an own function.
Signed-off-by: Lino Sanfilippo <l.sanfilippo@kunbus.com>
Suggested-by: Jarkko Sakkinen <jarkko@kernel.org>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
---
drivers/char/tpm/tpm_tis_core.c | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index fbad92b18788..5ff4ca5fb936 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -44,6 +44,20 @@ static bool wait_for_tpm_stat_cond(struct tpm_chip *chip, u8 mask,
return false;
}
+static u8 tpm_tis_filter_sts_mask(u8 int_mask, u8 sts_mask)
+{
+ if (!(int_mask & TPM_INTF_STS_VALID_INT))
+ sts_mask &= ~TPM_STS_VALID;
+
+ if (!(int_mask & TPM_INTF_DATA_AVAIL_INT))
+ sts_mask &= ~TPM_STS_DATA_AVAIL;
+
+ if (!(int_mask & TPM_INTF_CMD_READY_INT))
+ sts_mask &= ~TPM_STS_COMMAND_READY;
+
+ return sts_mask;
+}
+
static int wait_for_tpm_stat(struct tpm_chip *chip, u8 mask,
unsigned long timeout, wait_queue_head_t *queue,
bool check_cancel)
@@ -53,7 +67,7 @@ static int wait_for_tpm_stat(struct tpm_chip *chip, u8 mask,
long rc;
u8 status;
bool canceled = false;
- u8 sts_mask = 0;
+ u8 sts_mask;
int ret = 0;
/* check current status */
@@ -61,17 +75,10 @@ static int wait_for_tpm_stat(struct tpm_chip *chip, u8 mask,
if ((status & mask) == mask)
return 0;
+ sts_mask = mask & (TPM_STS_VALID | TPM_STS_DATA_AVAIL |
+ TPM_STS_COMMAND_READY);
/* check what status changes can be handled by irqs */
- if (priv->int_mask & TPM_INTF_STS_VALID_INT)
- sts_mask |= TPM_STS_VALID;
-
- if (priv->int_mask & TPM_INTF_DATA_AVAIL_INT)
- sts_mask |= TPM_STS_DATA_AVAIL;
-
- if (priv->int_mask & TPM_INTF_CMD_READY_INT)
- sts_mask |= TPM_STS_COMMAND_READY;
-
- sts_mask &= mask;
+ sts_mask = tpm_tis_filter_sts_mask(priv->int_mask, sts_mask);
stop = jiffies + timeout;
/* process status changes with irq support */
--
2.36.1
next prev parent reply other threads:[~2022-11-20 13:32 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-20 13:31 [PATCH v10 00/14] TPM IRQ fixes Lino Sanfilippo
2022-11-20 13:31 ` [PATCH v10 01/14] tpm, tpm_tis: Avoid cache incoherency in test for interrupts Lino Sanfilippo
2022-11-20 13:31 ` [PATCH v10 02/14] tpm, tpm_tis: Claim locality before writing TPM_INT_ENABLE register Lino Sanfilippo
2022-11-20 13:31 ` [PATCH v10 03/14] tpm, tpm_tis: Disable interrupts if tpm_tis_probe_irq() failed Lino Sanfilippo
2022-11-20 13:31 ` [PATCH v10 04/14] tpm, tpm_tis: Do not skip reset of original interrupt vector Lino Sanfilippo
2022-11-24 6:58 ` Jarkko Sakkinen
2022-11-24 13:25 ` Lino Sanfilippo
2022-11-20 13:31 ` [PATCH v10 05/14] tpm, tpm_tis: Claim locality before writing interrupt registers Lino Sanfilippo
2022-11-24 0:55 ` Jarkko Sakkinen
2022-11-20 13:31 ` [PATCH v10 06/14] tpm, tpm_tis: Only handle supported interrupts Lino Sanfilippo
2022-11-20 13:31 ` Lino Sanfilippo [this message]
2022-11-20 13:31 ` [PATCH v10 08/14] tpm, tpm_tis: do not check for the active locality in interrupt handler Lino Sanfilippo
2022-11-20 13:31 ` [PATCH v10 09/14] tpm, tpm: Implement usage counter for locality Lino Sanfilippo
2022-11-20 13:31 ` [PATCH v10 10/14] tpm, tpm_tis: Request threaded interrupt handler Lino Sanfilippo
2022-11-20 13:31 ` [PATCH v10 11/14] tpm, tpm_tis: Claim locality in " Lino Sanfilippo
2022-11-20 13:31 ` [PATCH v10 12/14] tpm, tpm_tis: Claim locality when interrupts are reenabled on resume Lino Sanfilippo
2022-11-24 0:32 ` Jarkko Sakkinen
2022-11-20 13:31 ` [PATCH v10 13/14] tpm, tpm_tis: startup chip before testing for interrupts Lino Sanfilippo
2022-11-20 13:31 ` [PATCH v10 14/14] tpm, tpm_tis: Enable interrupt test Lino Sanfilippo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221120133134.28926-8-LinoSanfilippo@gmx.de \
--to=linosanfilippo@gmx.de \
--cc=jandryuk@gmail.com \
--cc=jarkko@kernel.org \
--cc=jgg@ziepe.ca \
--cc=l.sanfilippo@kunbus.com \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@mniewoehner.de \
--cc=lukas@wunner.de \
--cc=p.rosenberger@kunbus.com \
--cc=peterhuewe@gmx.de \
--cc=pmenzel@molgen.mpg.de \
--cc=stefanb@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.