From patchwork Sun Nov 20 13:31:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lino Sanfilippo X-Patchwork-Id: 13050035 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 DF955C43217 for ; Sun, 20 Nov 2022 13:32:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229701AbiKTNcn (ORCPT ); Sun, 20 Nov 2022 08:32:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229645AbiKTNcb (ORCPT ); Sun, 20 Nov 2022 08:32:31 -0500 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B80DF27D; Sun, 20 Nov 2022 05:32:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1668951125; bh=1jiHlANZ8thD5aPn63BXGYT+VamFBFNIAjBcdG+2s2o=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=ESJFfUJNvLFaEbcb5D3Iaq5mvXH433duVgAaH2oyhqUEKANpXBFF9tTRw3dFazHOh IgHsxvR12p7evjL6IepKdvLMZDYDSeupz7pSEGkEnwlkSVrFJvVcnyW9VpLJO1237y eF957fI/wjSTAnnFjLpOFznT7mfzeoMxZ/UdsgJo0Eu/+BxIDrvaluYjn5lZDGeTmL aZId0F8IzQFs6s0uADyJMNztiI2TBATIV3tIY11712gTAOPDQ6a1kzWiIJcAdCeHad sjton3aicJ/bR2BIudzVQgGBB5TyYcMoYzn4hQT4jHtZQYXh1rqix5uKf8aru981L5 OQ+2R5FifreNw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from Venus.speedport.ip ([84.162.7.17]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1Msq2E-1pCLRF13qi-00tC3L; Sun, 20 Nov 2022 14:32:05 +0100 From: Lino Sanfilippo 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 02/14] tpm, tpm_tis: Claim locality before writing TPM_INT_ENABLE register Date: Sun, 20 Nov 2022 14:31:22 +0100 Message-Id: <20221120133134.28926-3-LinoSanfilippo@gmx.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221120133134.28926-1-LinoSanfilippo@gmx.de> References: <20221120133134.28926-1-LinoSanfilippo@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:dVUxQWuZX1rElk66a9cVkpJrvR06Gi4LdaXs27+gK9dEmE056yk 33YAC81FsrqNb+F/GS0ziIoLFBYuf/Ser1dsjsD/4e5vFweOIsrVSUSvXBwt6aOzbT7gOOK SdR3z4KY3rT6/XHhk1JAXxj5+whdmoKD9QehN5J9EQM2t2eLs4CbNOI1MR3o2UDfAEfp7W8 ddAtyJyMrv1Gn4egUOHCQ== UI-OutboundReport: notjunk:1;M01:P0:OxC45659cqI=;3PIefNXqEQ/fzKvFqqkFufmg4bn cPo5ZmNr4LTUzuafbBkqgupOfwG0K2zz5Mh19dzlindm2ufM7EfiLxzeKUPSawBTZcbExOwk4 7VQl1T7s/TXiZwnncMLq6svmx0TYUZpZaOeeveOXc7WGZ0EX2+IV6Ushkib+46S35AQFEh803 bwlOFwNC3L3EASKmpSAhoJ8+ehkaofXuCt3Q17YfvLLFZ2k8aNp9YZUxTDXK4x8Rv1aJ5HTyt 8ec/w2OT/BG5Y8lvlYW4L+5++wWGbO5ef8p9KYv1nlulGQk97jridFM0CamkOIWod4OO0944E M3600oGGFMgmNZxw/85j4l+o4XnUavuGtq9nsxitroj1T8zyOzJ1JmiiBC4YCkj0hB87o3Aaf SKfSru4E/+2BMLt36y4XHOhWe202lL97RzPqYJZCiknrd/UNcIfQwq5zW6iiAYYHr2hU/h9P4 UZ0xNxlmsCcvkc4ZQH7sHvhXkdq1qLc9xkLOBpubGgtT+OcESJ1fbQ3pCKxex6Mx7sgK0geE3 gSzXuhYjzOS0UDGDEmANFbI723PRjqhUb2Ib3zy4wIS/2x2Ig5FOdGoFTWgokNECtcW3EaTzo NxMGuIooMpSRGtJpF+gI2vEPn2SyUXMvjhHmXzwRUVGAaNSYi0np1AU0mJBgu5lnYYefKWS3c okCLpGmWO/Xh7HOvIqfi0N/XlDlZZdHd1DBZl3jgBCtn5PZZOeSp/CNYQ8KRnOq0OeJS3nWjA NKrcnMKIUp3Mh6yXW0mGVH/LmiqryJpQnBYmF0OV81pthYhcwIDkoHFQYkAEZstIQwiarM4XF 3egErqiaJzc+PVN6mxcOrsv9XeJ8HarLD9ERs09I7+RIWLiszG5HNS1ttFsFUDqZ+gqMmud+O kXLQu6gVbuvQ19HNOvZMqV83AAe6LKWA7JGMxPiR18XHRDAwicxWt882u6Efhj8cHDxK5h+U6 98uJew== Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org From: Lino Sanfilippo In disable_interrupts() the TPM_GLOBAL_INT_ENABLE bit is unset in the TPM_INT_ENABLE register to shut the interrupts off. However modifying the register is only possible with a held locality. So claim the locality before disable_interrupts() is called. Signed-off-by: Lino Sanfilippo Reviewed-by: Jarkko Sakkinen Tested-by: Michael Niewöhner --- drivers/char/tpm/tpm_tis_core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c index c0008efb95dc..d2c9c9d76893 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -1098,7 +1098,11 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, dev_err(&chip->dev, FW_BUG "TPM interrupt not working, polling instead\n"); + rc = request_locality(chip, 0); + if (rc < 0) + goto out_err; disable_interrupts(chip); + release_locality(chip, 0); } } else { tpm_tis_probe_irq(chip, intmask);