From patchwork Wed Dec 20 11:35:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 10125511 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 235996057F for ; Wed, 20 Dec 2017 11:36:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1D17529709 for ; Wed, 20 Dec 2017 11:36:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1237829710; Wed, 20 Dec 2017 11:36:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 78FB829709 for ; Wed, 20 Dec 2017 11:36:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755159AbdLTLf7 (ORCPT ); Wed, 20 Dec 2017 06:35:59 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:42908 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754857AbdLTLfw (ORCPT ); Wed, 20 Dec 2017 06:35:52 -0500 Received: by mail-wm0-f66.google.com with SMTP id b199so9297502wme.1 for ; Wed, 20 Dec 2017 03:35:51 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wJO+UGsQyAQbEaAwZ+GUNOJK1itwrReofPMl3OSDPCs=; b=TIngE/RyLAaru7gLWMumMv8Adwd0NBP3Y5oyaOZvV7NQJSgU1ok1BsGlMWAtsUw4YX IgB1iWsyxOGdnqvnOBeYfLiJWmTMs69/CBpI3PHFx7KdKh+ajaABx6lOfR464o/47ETO cfVA9xA964LTVdqXYENS1RL8XAJwGjJotl1dalV1RZr2h0Jl1reyGMgjq9ohIqmGlk6b lrlEEkqthoucNKPy0o/Xd9KPJUx+trveBk0b2/qtHzoC7UNkonCDsJJ96BO/kZ1dtUbU 7iwhJ+epo/2e0AlLdOVqiePYYXDBL7Pao5WPRiqABN+GVxGMy2N3rUOSBKy4lkXasDJp LNcg== X-Gm-Message-State: AKGB3mK1R/NOpcVWxoMtau7RN7gRsaQQvFlG5eeEqzL9jgF1okmEW0yH H7NpkpFow2gqRI1ej+2jmVApag== X-Google-Smtp-Source: ACJfBovojXWVFHXhJbbUIxcWCG7aHLOwjuGQtPbaldsFwJBZUKoCpltgmuaY5wmjZHENnL0fE5sxpQ== X-Received: by 10.28.173.213 with SMTP id w204mr6755580wme.126.1513769751102; Wed, 20 Dec 2017 03:35:51 -0800 (PST) Received: from minerva.home ([90.77.100.34]) by smtp.gmail.com with ESMTPSA id b18sm18353767wra.44.2017.12.20.03.35.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Dec 2017 03:35:50 -0800 (PST) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: James Ettle , Hans de Goede , Azhar Shaikh , Javier Martinez Canillas , Arnd Bergmann , Jarkko Sakkinen , Peter Huewe , Jason Gunthorpe , Greg Kroah-Hartman , linux-integrity@vger.kernel.org Subject: [PATCH 4/4] tpm: only attempt to disable the LPC CLKRUN if is already enabled Date: Wed, 20 Dec 2017 12:35:38 +0100 Message-Id: <20171220113538.16099-5-javierm@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171220113538.16099-1-javierm@redhat.com> References: <20171220113538.16099-1-javierm@redhat.com> Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 5e572cab92f0 ("tpm: Enable CLKRUN protocol for Braswell systems") added logic in the TPM TIS driver to disable the Low Pin Count CLKRUN signal during TPM transactions. Unfortunately this breaks other devices that are attached to the LPC bus like for example PS/2 mouse and keyboards. One flaw with the logic is that it assumes that the CLKRUN is always enabled, and so it unconditionally enables it after a TPM transaction. But it could be that the CLKRUN# signal was already disabled in the LPC bus and so after the driver probes, CLKRUN_EN will remain enabled which may break other devices that are attached to the LPC bus but don't have support for the CLKRUN protocol. Fixes: 5e572cab92f0 ("tpm: Enable CLKRUN protocol for Braswell systems") Signed-off-by: Javier Martinez Canillas Tested-by: James Ettle Reviewed-by: Jarkko Sakkinen Tested-by: Jarkko Sakkinen --- This patch fixes the bug reported for the Fedora kernel [0] and the kernel bugzilla [1]. The issue and the propossed solution were discussed in this [2] thread. [0]: https://bugzilla.redhat.com/show_bug.cgi?id=1498987 [1]: https://bugzilla.kernel.org/show_bug.cgi?id=197287 [2]: https://patchwork.kernel.org/patch/10119417/ drivers/char/tpm/tpm_tis.c | 2 +- drivers/char/tpm/tpm_tis_core.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index d0ad9a89b02b..c79193f6d092 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c @@ -314,7 +314,7 @@ static int tpm_tis_plat_remove(struct platform_device *pdev) tpm_chip_unregister(chip); tpm_tis_remove(chip); - if (is_bsw()) + if (is_bsw() && priv->ilb_base_addr) iounmap(priv->ilb_base_addr); return 0; diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c index 534cd46fdfae..17fb9c600d0e 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -742,7 +742,8 @@ static void tpm_tis_clkrun_enable(struct tpm_chip *chip, bool value) struct tpm_tis_data *data = dev_get_drvdata(&chip->dev); u32 clkrun_val; - if (!IS_ENABLED(CONFIG_X86) || !is_bsw()) + if (!IS_ENABLED(CONFIG_X86) || !is_bsw() || + !data->ilb_base_addr) return; if (value) { @@ -801,6 +802,7 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, u32 vendor; u32 intfcaps; u32 intmask; + u32 clkrun_val; u8 rid; int rc, probe; struct tpm_chip *chip; @@ -826,6 +828,13 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, ILB_REMAP_SIZE); if (!priv->ilb_base_addr) return -ENOMEM; + + clkrun_val = ioread32(priv->ilb_base_addr + LPC_CNTRL_OFFSET); + /* Check if CLKRUN# is already not enabled in the LPC bus */ + if (!(clkrun_val & LPC_CLKRUN_EN)) { + iounmap(priv->ilb_base_addr); + priv->ilb_base_addr = NULL; + } } if (chip->ops->clk_enable != NULL) @@ -935,7 +944,7 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, if (chip->ops->clk_enable != NULL) chip->ops->clk_enable(chip, false); - if (is_bsw()) + if (is_bsw() && priv->ilb_base_addr) iounmap(priv->ilb_base_addr); return rc;