From patchwork Tue May 30 16:41:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lino Sanfilippo X-Patchwork-Id: 13260763 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5610DC7EE2E for ; Tue, 30 May 2023 16:43:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232592AbjE3QnH (ORCPT ); Tue, 30 May 2023 12:43:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232746AbjE3QnE (ORCPT ); Tue, 30 May 2023 12:43:04 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27744B0; Tue, 30 May 2023 09:43:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1685464952; i=linosanfilippo@gmx.de; bh=u1Qi/uyeai+mxP4oIO4LBNtj6oBBjuv+rvd8DOos6DA=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=HmYDWFS+CGdZg70bqpCf3Dic5L4jdOeIbQtheZlf2nloF21QvWfy3R0GzAwH6M0Se YmPIQZIFHweJaadvK30RDb1frF1IBuu8XhGrhVR5W4gH7NWNuksDpuUA9LUofU5Ts1 IURs2C8PkKITbLoW9Vxc/+UKDdKQEe3P7FQ/6o08iCRWHZFc6mFvpagoRA47vB1rGi 9XpMIiAcaCirUTUxHsorwtucWfC/BZoui+sHcfBOMSFoCwfdH2fW6tpwIJEBiryCVB M5b26FUoUM8PO0N4tmQjnEq5CXMP547iIoeMgy81seS36EEjyNhhQP9v1SH/IPq2D/ s4+QixkHMHsDg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from Venus.speedport.ip ([84.162.2.106]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MtOKi-1qMOan3hwk-00uqW5; Tue, 30 May 2023 18:42:32 +0200 From: Lino Sanfilippo To: jarkko@kernel.org, gregkh@linuxfoundation.org, pavel@denx.de Cc: linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, linux@roeck-us.net, shuah@kernel.org, patches@kernelci.org, lkft-triage@lists.linaro.org, jonathanh@nvidia.com, f.fainelli@gmail.com, sudipm.mukherjee@gmail.com, srw@sladewatkins.net, rwarsow@gmx.de, linux-integrity@vger.kernel.org, l.sanfilippo@kunbus.com, lukas@wunner.de, p.rosenberger@kunbus.com, stable@vger.kernel.org Subject: [PATCH] tpm, tpm_tis: correct tpm_tis_flags enumeration values Date: Tue, 30 May 2023 18:41:16 +0200 Message-Id: <20230530164116.20770-1-LinoSanfilippo@gmx.de> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:TUVoDoK2i79i8sGtpHBNTotsLMum/R0RJEoMsqgZp0r24XisBnL Ff93M1mjHQlxFQsP1RfB5Kv9C260ahJhyrDBi6qcnUq+JWpM40a4WR9u6+Og8dxZVOrLG2Y Wfgy2Bl7jcFaSAk74Ns0UUmBpLCQRhijzMQyGCxpJ7zZKaLeFALX1qLoezM1JTstx9vNjnx Z72OQUfUMCdTI/+Hyq6cA== UI-OutboundReport: notjunk:1;M01:P0:6GuG2S5CW2M=;hPugnMpdH8eeolGEee7DcQ92SGP HPxbNtb/5cmh+ZkisVbeA2rI9JrTZal7+tL4CCeFwKzB2INMLwYfLwin8mw4DHiMLT8xyZ83Q RvldsgU15PEy++idb8Ai3ESxTPQBOO2XTmskknWJz2INdz5H2ZXFhN81MhOj08r87kcY+Ebu4 khWHpGmtw2+hCJAGi567yGwzGaUMEF1uF3TYocbUUZHrV+AChiLW76FCxvo8SsbIV4K0QR/5P skyVGihoRm2C1GsnLmFS4ro7eTVY6byNq1oeFE9EA0FL/8VToLdPbocAb9CT5hytM9IPeAt0o rOS+UFjTfvaZgjdYJ3uwuSw1KVzabCe1htXaorhj2WxSjSUXkixxZ2saeulMXjM4mU1wqButF /twZuoR6c93xC+RC9uwm88sOMOryy4cdU5noh4fGiILrSJc5/pxQQ2KWTFoMgT+y6gwOGSXaJ lypUOhGpIKdyBk7ciyhzOXVe0FB/HXsrynd3Dm/TIa+JSkz51fLIDaC3zuu6aQ4s//mDS8jvt +fTrwTQ3edOl39FzzoSKmWhDHBUIVNrG/vnSicc5UebUNWD9na1LGojjQd0k93lccT1oMHprJ yJFC0YhjIsAD31BUYUEw+iyKmr0aqOpPiqFGMf9WqIvOsabtSOv4XeJMn60DLJSx8Tjfob4Ke Pl1JN7GFezJ0gM11WnCn+CwZNBWdi5ofuhx6pKoWnDOa9B8VNN+H26ZwkOefs7LXDphlJ8sFw 6mdkKt9ODCgt3HRiCy2CWXSVCu7RTeqJAaeg7Z3hiVOFEtrM8IT+/djomWWiPESktzWHz48KK 3K267BwRWA7unQQUanCJW/O2rUjM+7mh5zu95IStXxzP0UV/JI5r5vRcfKaWaPEaUkkm7o83I lKXj/cF45tVQgUmor9mr5wLdknn10o34RqWlooKBrOH25Qxu5LB/y4ovUjF5/ySkh7KRuCpup iKzqYg== Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org From: Lino Sanfilippo 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 Fixes: 858e8b792d06 ("tpm, tpm_tis: Avoid cache incoherency in test for interrupts") Signed-off-by: Lino Sanfilippo Cc: stable@vger.kernel.org Reviewed-by: Pavel Machek --- drivers/char/tpm/tpm_tis_core.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) base-commit: 7877cb91f1081754a1487c144d85dc0d2e2e7fc4 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 {