From patchwork Mon Oct 17 23:57:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lino Sanfilippo X-Patchwork-Id: 13009715 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 CADC1C4332F for ; Mon, 17 Oct 2022 23:58:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229905AbiJQX6N (ORCPT ); Mon, 17 Oct 2022 19:58:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229828AbiJQX6M (ORCPT ); Mon, 17 Oct 2022 19:58:12 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B94F87E320; Mon, 17 Oct 2022 16:58:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1666051071; bh=vmr8i0HILdqGMwVhgOxfm//3j+C4M5iWtBnT+hrsrRw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=UGR6R5tth0NiE2sA+sAhH8DeYrTP+DQD34wTB2Wlw0RCmkXhFI6No+HlWROdxyAeP PEYttZNttt5RXA/1U8R/o99TEuYgGKoDjji0pZT2CdQDzKFTu/VR+0BksmmQtzCKOl ijJVnIpnkVNup3ylMPgX4aapOK4wrjV1iZ9YyZcQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from Venus.speedport.ip ([84.162.5.241]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1Mwfac-1p4jAL1OIc-00yD3U; Tue, 18 Oct 2022 01:57:51 +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, jandryuk@gmail.com, pmenzel@molgen.mpg.de, l.sanfilippo@kunbus.com, LinoSanfilippo@gmx.de, lukas@wunner.de, p.rosenberger@kunbus.com Subject: [PATCH v8 03/11] tpm, tpm_tis: Disable interrupts if tpm_tis_probe_irq() failed Date: Tue, 18 Oct 2022 01:57:24 +0200 Message-Id: <20221017235732.10145-4-LinoSanfilippo@gmx.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221017235732.10145-1-LinoSanfilippo@gmx.de> References: <20221017235732.10145-1-LinoSanfilippo@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:hwsqVwRGmzxbKnmZok/36mfl4BodcJBOVORnYPI4rKLdbIMNacV c0iREGdvWzG7xr0Rs07Wt5kCpgSm1hz0agH5T5HR2glpgCNTu5qJGmIalB2EJuBwb665zx9 GdENV1JJqCu8AVSKSz80BvpQCkp5ghJPfHvI9yQSXQSAXlVowtXoAeviPKPWLkY4xWrBS9e W7pcPzws0Tr4/6laWoAsw== X-UI-Out-Filterresults: notjunk:1;V03:K0:9A3C9J8xsi0=:xhEDeVdqtWK8nVvwgkjcyb kVMgGVABNovTfkpUcW04gaoZ0euRCyHixetKp83nqUYtpQWULBsPIdyvgBDsi0rNp3tdxigPf muYfytgqFZWLRAExG6NO2TIRJ6lSYUBquNRIfoX1J9A0Vbv6iDNkNXWXg/TKWRK7eLkMtYqSi TVi4QfHGSXd/PP3Rued4iw6i73iSxjRKMUT5ubtvnuY1fvRJjL+WNfSt0Tv6kIdOCndK9B30i Ne+P7k4PD7id7VSW4AS81MqOQxgRw96LiQY7xcGmNtcLvLAIt1TVQ4jgHRPhm/Ror3fNNTa2P yuXsf+M0PfVivN6jkzohLsKEzAH84KqZjJkczHcQbkkBfwnbfVjkRHLB/eSckzzuuuiIQtxT+ cscYqmtS9s7PpfjA8/7tGstHf2c+V/022h04oerkZ/EUQ0fWUbSjcHYPUcDHyDyhHO2PGscuQ SxDB7sei+bd54L//LXnmAV6zTnuSsITIDMoc38VAq5mH1XpEzcUTHdZgJQVE4y+ruGLbC3wo7 TUfDgot0I+0Bf+kp4TZgqRZgAjEGRbVrogeyc+9JNJrtpI0NYY7YiGEcvtxyPqrbV76VgU/JM z8v1OHqIatILgR4+qvrvmH2mAjLxvgIcavvGW5nyD/X1m7wyK0jFE/2Ob4Tbd7Or4yK/+FDlF fwFhXM1d64vKxPDlGJybSqYsR4AomLf/LUF1o1VzRn/YjIgk4mCB3HfBrabCa+6Oc1O0dKAl8 +nY0NheI8O8AwNW/IIfX1RxJTmAxC5l37NEgi5f57xF8fAXZunim5iujrfX8vyIENu/2v12UH qfytwMK7gu2BqJoUGYSMxAOTwd1lEd/niN+TQ+JiIRSrd2/iaw13NGINwPVEG1VJyNXtkzt72 vzR9EC/kYYRrFzirzLLqDzFz8C8wd1TaFMk/nWwe8AMZ76Xfl+g8OXeRcm8owVHoiWFuaXbTF oK424Mo21Z1Bj6vLUD2IP+rRZf7CtpWUM7HInGsXv9wlB2v14QJifKNPWbeBa+LOratVtBQBE /44+wpUGmGnqF1ryjNWKKa6Mzf9sYVrNA08uckZO7Bk6PcHIX4UgOarWUsQ0HIINgqoLUMSYD znNxcTzI6ma5S51w5TJNQCOlU/SPkdn/2r4fJuqWukdOv77gRPWNA14qjm6bvao0bNCq2Lbso 1mw38xRtG6puqwTzmI+LseVvPlw0hSdrx6NKN+cYWgBQv0FHPQfimUDL/sNLJaWNH1HSkNEoq it3YMPXgXKnetGD4DQEuYeX9Ndhepk6ssBIQSkIjoysdAYXavcJdPxFGIxKftwW5qG+gxWWXY 1Y2+RHUAd9VgSZNLploXaWMYPWrbaEASLU1UnT147svmsirifjx0TxiouQuqskzROt+r4hJjh +aIR0xtkhmhjlVYfCAv60IkDYHYOyt9H3zmMAc4RNsqamNeXVyxJgS22cFqlHzBp5/bbKlKBw maOiSmc5D+TQit/tBaPkjj5r8TH+OgbTLrTMW1N6fAq2Alt6jyfEhq3HBliJHChs9lcwYWu4M ntXcDj552AgAwEiWwgLE88aUeTllycuX5qlAYqk1UBL4t Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org From: Lino Sanfilippo Both functions tpm_tis_probe_irq_single() and tpm_tis_probe_irq() may setup the interrupts and then return with an error. This case is indicated by a missing TPM_CHIP_FLAG_IRQ flag in chip->flags. Currently the interrupt setup is only undone if tpm_tis_probe_irq_single() fails. Undo the setup also if tpm_tis_probe_irq() fails. Signed-off-by: Lino Sanfilippo Reviewed-by: Jarkko Sakkinen Tested-by: Michael Niewöhner --- drivers/char/tpm/tpm_tis_core.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c index d2c9c9d76893..603b82ca56da 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -1091,21 +1091,21 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, goto out_err; } - if (irq) { + if (irq) tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED, irq); - if (!(chip->flags & TPM_CHIP_FLAG_IRQ)) { - dev_err(&chip->dev, FW_BUG + else + tpm_tis_probe_irq(chip, intmask); + + if (!(chip->flags & TPM_CHIP_FLAG_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); + rc = request_locality(chip, 0); + if (rc < 0) + goto out_err; + disable_interrupts(chip); + release_locality(chip, 0); } }