tpm, tpm_tis: correct tpm_tis_flags enumeration values

Commit Message

Lino Sanfilippo May 30, 2023, 4:41 p.m. UTC

From: Lino Sanfilippo <[e-mail]>

With commit 858e8b792d06 ("tpm, tpm_tis: Avoid cache incoherency in test
for interrupts") bit accessor functions are used to access flags in
tpm_tis_data->flags.

However these functions expect bit numbers, while the flags are defined as
bit masks in enum tpm_tis_flag.

Fix this inconsistency by using numbers instead of masks also for the flags
in the enum.

Reported-by: Pavel Machek <[e-mail]>
Fixes: 858e8b792d06 ("tpm, tpm_tis: Avoid cache incoherency in test for interrupts")
Signed-off-by: Lino Sanfilippo <[e-mail]>
Cc: [e-mail]
---
 drivers/char/tpm/tpm_tis_core.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


base-commit: 7877cb91f1081754a1487c144d85dc0d2e2e7fc4

Comments

Pavel Machek June 2, 2023, 7:21 p.m. UTC | #1

Hi!

> From: Lino Sanfilippo <[e-mail]>
> 
> With commit 858e8b792d06 ("tpm, tpm_tis: Avoid cache incoherency in test
> for interrupts") bit accessor functions are used to access flags in
> tpm_tis_data->flags.
> 
> However these functions expect bit numbers, while the flags are defined as
> bit masks in enum tpm_tis_flag.
> 
> Fix this inconsistency by using numbers instead of masks also for the flags
> in the enum.
> 

Reviewed-by: Pavel Machek <[e-mail]>

Thank you!

Best regards,
									Pavel

Patch

diff --git a/drivers/char/tpm/tpm_tis_core.h b/drivers/char/tpm/tpm_tis_core.h
index e978f457fd4d..610bfadb6acf 100644
--- a/drivers/char/tpm/tpm_tis_core.h
+++ b/drivers/char/tpm/tpm_tis_core.h
@@ -84,10 +84,10 @@  enum tis_defaults {
 #define ILB_REMAP_SIZE			0x100
 
 enum tpm_tis_flags {
-	TPM_TIS_ITPM_WORKAROUND		= BIT(0),
-	TPM_TIS_INVALID_STATUS		= BIT(1),
-	TPM_TIS_DEFAULT_CANCELLATION	= BIT(2),
-	TPM_TIS_IRQ_TESTED		= BIT(3),
+	TPM_TIS_ITPM_WORKAROUND		= 0,
+	TPM_TIS_INVALID_STATUS		= 1,
+	TPM_TIS_DEFAULT_CANCELLATION	= 2,
+	TPM_TIS_IRQ_TESTED		= 3,
 };
 
 struct tpm_tis_data {