From patchwork Tue Jun 21 13:24:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lino Sanfilippo X-Patchwork-Id: 12889295 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 E5311CCA482 for ; Tue, 21 Jun 2022 13:34:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350448AbiFUNeQ (ORCPT ); Tue, 21 Jun 2022 09:34:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351464AbiFUNbC (ORCPT ); Tue, 21 Jun 2022 09:31:02 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97EC62AE10; Tue, 21 Jun 2022 06:25:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1655817937; bh=nG5TFXtaC8PNjcCZBi+MuXoKdmTiTe8KMPDK4ENUAc4=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=iMgMfSK2mXDNnkP+XMQ2NUuY3poFKmqCGW8Yr+3bBrD3YMRL+rFHKgtyfC/tgMdqa qp49iyRDMNH++hD3SuD+xDcPhwf2aYyZ8w7jv5nU01yoO6dw3/9u5shS0snhZrgUXR gNMFibTaRJ6pbwerhP+o39/Pot9npFmZwzg2+/lk= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from Venus.fritz.box ([46.223.2.162]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1N1wlv-1nf0R62K6r-012DYz; Tue, 21 Jun 2022 15:25:37 +0200 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, l.sanfilippo@kunbus.com, LinoSanfilippo@gmx.de, lukas@wunner.de, p.rosenberger@kunbus.com Subject: [PATCH v6 4/9] tpm, tmp_tis: Claim locality before writing interrupt registers Date: Tue, 21 Jun 2022 15:24:42 +0200 Message-Id: <20220621132447.16281-5-LinoSanfilippo@gmx.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220621132447.16281-1-LinoSanfilippo@gmx.de> References: <20220621132447.16281-1-LinoSanfilippo@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:09LnH54cpStXE0uTVUiQV6pfDV4LO4SkQhy0j666VacW70TuVE9 KAkn8YYYXOBaH/wSS05mFd3JxVlYDVOc3xzYxnOq1SKi8zZjP4MOmsG1+s5WSbGRaiZpUA+ wygqgZcfcCIi0zuxxoPkGyIXFXQgdYUbhtL+UwyYk+WNblb/vNaumCEL/Zf4tYTmQAtzxRv cFZ3HVzWsRWgVe3hXaYLA== X-UI-Out-Filterresults: notjunk:1;V03:K0:rv21BbkZ3Vw=:bNA5aVx3G6I9cguEHz5qj9 vpYftr2YlA/UoZAFEP/wyvFTNLEiEHBDCkc9y/1tfKY/N3jdolOXf3hQU0A5FwzDje+u0JEMH 0kunrtDu5JyfHBYGZlPXxRa7V9AcUsXApvJHv9z15EmTsikJVOiP3hRSSwzTxyaUfvDOWFWRd xI9m9aA/ttP5ORA0rFod4qHCke9dOyUMH0oDJ1lcNV3/mTwXZXEdhtTOQXjXJOrzc9Oda/F2J GudKVN3JqCmuoNu8dL827jBbWtg/nRrcR0UFTbzF/g1Ff2i3ffjlJzPolqloLRXGEIrBN9gn+ aDwm+fvBK/m6zewIXTuae3svcSABJ1fOmHxhoJZAyPftfDsIRxEM5msbqDNJSAjyTUroaTtbH IRbRUIFcxfzU1Jl1pVFdYStwIdP0/lTaA7KttAn4BP+ganqVoTvrZJAhVfapbFTAKbLq6wwn6 iGV14dyKc4px3TvGArp4QvBCt/RZeXzB90C0OhnLcj8/pB4iweVMdBieQxeiQ8t0vogrvr1PW GJgQPcDnxP5QuG9wgQp5zINosKDp8VvkpsAs9E+VSeAWGjF9hc+77JtinC3Yc4YlIcJ9Fdc8+ 1n4mKq8guGbD6ewkIOsEb7+llGoIkNRRK3j5OL1kv/VN/DzhIlLThPdKalXb9hQ4WBZE7o+8q k7OtDacirkB/nt++15c38TAW36f5koMSOH1rsnw3LrBymLeVOG93SeFPVZvL062QM7cYqMmuA FUTqYVT+OB19s8pQzUh5Q2p38G63DEzAkFsJIoiCNQ724eR1VyNuUM55O0gBbsSGhxD3wgP7G dJgL3Cx3vFf/fIQOIVRKTFxOKPnYeW26i6wyNgKk/w3TqQ2EhsDumlmnlRbnetDQN2m7LLFi6 BHv7S+nBXCumONzPSYsJwWATD43xs3R78jdVqZoYqJTI3+hrGhyuWs2+P7iJeN0QkORe/Ohh6 w9CbpW0Tuzyv0IWxQmOPyXZFgX2ogPEBWIJ0yh6WhSsvQkpOokpJPIhQz5GORvxJnBuPZH8sI 3GcDhZg8vVf5WqozV1CdMevD6CD2woByZJnoyqijwIyHvRyTCAtWW/vPlCpYbjkTvzf0Qas9j FG8wVH2SYWlGhgGb2QQ1DpPHveQZFsQ/XBsM5HAOMccIf16JYR5pT0a+w== Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org From: Lino Sanfilippo In tpm_tis_probe_single_irq() interrupt registers TPM_INT_VECTOR, TPM_INT_STATUS and TPM_INT_ENABLE are modified to setup the interrupts. Currently these modifications are done without holding a locality thus they have no effect. Fix this by claiming the (default) locality before the registers are written. Signed-off-by: Lino Sanfilippo Reviewed-by: Jarkko Sakkinen --- drivers/char/tpm/tpm_tis_core.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c index d32e93c86f48..09d8f04cbc81 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -756,30 +756,45 @@ static int tpm_tis_probe_irq_single(struct tpm_chip *chip, u32 intmask, } priv->irq = irq; + rc = request_locality(chip, 0); + if (rc < 0) + return rc; + rc = tpm_tis_read8(priv, TPM_INT_VECTOR(priv->locality), &original_int_vec); - if (rc < 0) + if (rc < 0) { + release_locality(chip, priv->locality); return rc; + } rc = tpm_tis_write8(priv, TPM_INT_VECTOR(priv->locality), irq); - if (rc < 0) + if (rc < 0) { + release_locality(chip, priv->locality); return rc; + } rc = tpm_tis_read32(priv, TPM_INT_STATUS(priv->locality), &int_status); - if (rc < 0) + if (rc < 0) { + release_locality(chip, priv->locality); return rc; + } /* Clear all existing */ rc = tpm_tis_write32(priv, TPM_INT_STATUS(priv->locality), int_status); - if (rc < 0) + if (rc < 0) { + release_locality(chip, priv->locality); return rc; + } /* Turn on */ rc = tpm_tis_write32(priv, TPM_INT_ENABLE(priv->locality), intmask | TPM_GLOBAL_INT_ENABLE); - if (rc < 0) + if (rc < 0) { + release_locality(chip, priv->locality); return rc; + } + release_locality(chip, priv->locality); clear_bit(TPM_TIS_IRQ_TESTED, &priv->flags); /* Generate an interrupt by having the core call through to