From patchwork Sun Nov 20 13:31:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lino Sanfilippo X-Patchwork-Id: 13050036 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 DAF77C4332F for ; Sun, 20 Nov 2022 13:32:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229745AbiKTNco (ORCPT ); Sun, 20 Nov 2022 08:32:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229661AbiKTNcb (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 0FBB529A; 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=1668951126; bh=mo0aex3xZinBFgfr39bfyhV1oZv6iyWkgvj5WLXVwQo=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=bkpmWPdYYu4avftPo6rrf1aFmdEju2RTaGGoD+EgwTHfLs5d4OInUCAbLL4Hbin3E zfesiYSlDp9XnmruYuV+ArJ/W+s/DeCwowDA6JB2Ge4zJDGM9oAXclRBk3ZrRvDVPO wb22PxU7zn4TA6Xlp8LTheCZr5UztCUrRuxOOT3RPolVNLu9PUl2cUmzMEztc4h48K bdGsmEjufoPXvbVKlMcE8idw0IAnuDVgt5+EP4mUUv4xEcOBug9oYQpj3FXKSaVqqy 051odHIUS06eYFseOw/IRS1Mv9psTUMlzUWt3VnVXaqdtWH1h546D2v5lQIElBLjP2 mPTiTZ5evz6xg== 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 1MVNAr-1oXCvx1UKV-00SLd2; Sun, 20 Nov 2022 14:32:06 +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 05/14] tpm, tpm_tis: Claim locality before writing interrupt registers Date: Sun, 20 Nov 2022 14:31:25 +0100 Message-Id: <20221120133134.28926-6-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:f6nQ5ZH2k0l7L/RDWWZNUoDawHxfUyilTX7+GGR9iDdgaGyKXhX GYfdpjigd0/KIKMw3uFyAriEijDYFktSMgH8HI76SL9WrnqDB9918GOUJNwl3YaKBRYyW5B V/zsZzfKCf5eAp6imLZkkW2F4RbplVfWw3yG0s9NdTq21Nj1Rwnq2D8dDCymUD9acCzt0B1 U2w6f2RaOYBuCaUjgOdgQ== UI-OutboundReport: notjunk:1;M01:P0:7PKF015SJ3k=;ZQ+6RO+dhA8NmXq+NwqOtgXnECp WdYnA0BoBnscfzWwRbebUA1EK34VYc7scgcqnoNG+aUfoWA3r8MJn229qHZfdEHGBmUCHbYmE Vqcr5KMsin9JBRByyDhiWwXl4yscRtjxYbyYJ7NUP9nDHHY9qX6KWBA0n0Dsw1naS2cfzt2sG awEZQ8xnNV1paExhEojGfl2ZpJOmnjajfWVR1gD3YxeT8YjFQMsH+SPFDhr9Lyo2O7QczUWLW OTDfYUJ6Gn116666pF52nUN4ZvEezhxT8RhawpK/BL7azZsV875GN9vCW9HLjosGyDfjYf/ql Q88hTleVP6cVnDmsaTlrxtgqiffyJP+BjgWO01CRoNHbP1k0/K4DLyyA8hYDcRQVrHX2lvbLM GqnLGbemneIObAAPkMvYEWYxTyQG0JUaXAJu8sdfB7fofO2n47wMtYCqJtr4BU408ahSRadeJ pi/KTaMSRwB7x8VX1K2pY67MKlM7Ygcr0AEcqES6ZYd3r1WfTxM1hhHd7qYuaZ0ii4NvW+HGF r3bghOL8p7DWbiMoNiASu6GuqKoVzyEVBmaPRjYQKGRdsaVwbcPzkUirAC0SGkf9a3en6z1jr X1qV/38cGUlUhWAXesWCxCv8OYoGalm2uR0HAfWgVRIXLOE9/B4qme5+yGv1FWxELqTZSTXSD i8n8m7qjR1VVfQJa7VWfLv9Oyz8CWOML6dNbeEcff78E8QA9QVTjCb32CTX3hJeLrMI6qLdqr OFrOaj4BPmI0s6tfMGB6eYPCqXV0JUsUWiN8axciD9xzBtUgYUJSE+qnm7j9StN9RhF0amd7K JLyJBAXE72cmfQUjHOZZ5WRPYDr0/VXSYmj77c4tGZFUUKFi1KVY4JJsCUUltTYfL2A56A3lD eqXfprcibZuj6lnnfN5a5eHo6M9KB2OXG+tLaNmkPvVhcLuXE8/5DSuWg2VpjnlXFaluPIsyl 1gku5A== 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. Since now tpm_tis_gen_interrupt() is called with the locality already claimed remove locality request and release from this function. Signed-off-by: Lino Sanfilippo Reviewed-by: Jarkko Sakkinen --- drivers/char/tpm/tpm_tis_core.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c index 1eac1279594d..58a53ec534aa 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -734,18 +734,11 @@ static void tpm_tis_gen_interrupt(struct tpm_chip *chip) const char *desc = "attempting to generate an interrupt"; u32 cap2; cap_t cap; - int ret; - - ret = request_locality(chip, 0); - if (ret < 0) - return; if (chip->flags & TPM_CHIP_FLAG_TPM2) tpm2_get_tpm_pt(chip, 0x100, &cap2, desc); else tpm1_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap, desc, 0); - - release_locality(chip, 0); } /* Register the IRQ and issue a command that will cause an interrupt. If an @@ -768,10 +761,16 @@ 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) @@ -805,10 +804,12 @@ static int tpm_tis_probe_irq_single(struct tpm_chip *chip, u32 intmask, if (!(chip->flags & TPM_CHIP_FLAG_IRQ)) { tpm_tis_write8(priv, original_int_vec, TPM_INT_VECTOR(priv->locality)); - return -1; + rc = -1; } - return 0; + release_locality(chip, priv->locality); + + return rc; } /* Try to find the IRQ the TPM is using. This is for legacy x86 systems that