From patchwork Mon Dec 18 12:22:28 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: 10119109 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 898A160390 for ; Mon, 18 Dec 2017 12:22:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7623428FC4 for ; Mon, 18 Dec 2017 12:22:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A63428FCB; Mon, 18 Dec 2017 12:22:33 +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 E99E628FC9 for ; Mon, 18 Dec 2017 12:22:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758489AbdLRMWc (ORCPT ); Mon, 18 Dec 2017 07:22:32 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:46128 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752845AbdLRMWb (ORCPT ); Mon, 18 Dec 2017 07:22:31 -0500 Received: by mail-wm0-f66.google.com with SMTP id r78so28915407wme.5 for ; Mon, 18 Dec 2017 04:22:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=epoStsU5+nt3sy+U2ONMkwGRlcNGiiwe1ZlVeOqee/M=; b=pWSg3qtee3z6F9moJf8/8TXzyazBxSuAVBHbeq3NkMOJBswfF/hTlQWLJBkcfevvAi bMSmluj/SBi/AhfGOdqmMb0Zp8lMcjl929za7Te1v+EPBj10QZaqySwxO13ZfvzidEQj aiBioArRZLq42MjZec8fACznb+QZBikOHXoPICdbHdHrIxOyYOaKmgykSqXDDHE7mESS FXfngWzPZ5w00fM6g/kUAZh6zsF8prj+lBoNHsU16s9Yh/5CUWew35Q1FLD35UtOwF3X Q8spAssUO/e/p7Mm8MOIiQWHSNiVVVum4jwLy2onZDYp4/zN5ft4dO0mYMMaZ94Fj+Ti ULgA== X-Gm-Message-State: AKGB3mLyo4TJ5D1eGjAiiOL2d4IGwz5jgHI5uC/cnvQHKlWkW01whTgi 9bxKFdzkzIbW0JFBUoGdIn0G9g== X-Google-Smtp-Source: ACJfBovKghGiOHGOfSy+UbUSrd8ufLtxNrLBYCs1rghMLJW5SU7AjvCYGNjTh9BPHtFCH8Oi3h/Meg== X-Received: by 10.28.122.18 with SMTP id v18mr13925747wmc.3.1513599749890; Mon, 18 Dec 2017 04:22:29 -0800 (PST) Received: from [192.168.1.13] ([90.77.100.34]) by smtp.gmail.com with ESMTPSA id e16sm1302020wra.0.2017.12.18.04.22.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Dec 2017 04:22:29 -0800 (PST) Subject: Re: [BISECTED] tpm CLKRUN breaks PS/2 keyboard and touchpad on Braswell system To: Jarkko Sakkinen , Jason Gunthorpe Cc: James Ettle , linux-integrity@vger.kernel.org, azhar.shaikh@intel.com, linux-kernel@vger.kernel.org, james.l.morris@oracle.com References: <57d96314-cc9c-0656-186e-4eb77a132b70@ettle.org.uk> <34b361bf-cce7-a1ac-f8a3-76ef22f5b6b0@redhat.com> <5fb5de24-5a4c-4c01-1f72-49fc5844516c@ettle.org.uk> <011b4d29-9d93-4b7a-90dd-0c25cf184c3e@redhat.com> <20171214191052.GA20833@ziepe.ca> <20171215145630.ftsnj4azqqhzqwsh@linux.intel.com> <20171215173826.GD12434@ziepe.ca> <1513443676.29063.0.camel@linux.intel.com> From: Javier Martinez Canillas Message-ID: Date: Mon, 18 Dec 2017 13:22:28 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <1513443676.29063.0.camel@linux.intel.com> Content-Language: en-US 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 On 12/16/2017 06:01 PM, Jarkko Sakkinen wrote: > On Fri, 2017-12-15 at 10:38 -0700, Jason Gunthorpe wrote: >> On Fri, Dec 15, 2017 at 04:56:30PM +0200, Jarkko Sakkinen wrote: >>> On Thu, Dec 14, 2017 at 12:10:52PM -0700, Jason Gunthorpe wrote: >>>> On Thu, Dec 14, 2017 at 08:08:58PM +0100, Javier Martinez Canillas wrote: >>>> >>>>> Although probably reverting the offending commits is the right thing to do >>>>> until a proper solution is proposed. >>>> >>>> Yes, if a fix is not forthcoming soon Jarkko should revert. >>>> >>> >>> I think I should drop the current patch going to 4.16 and revert the old >>> patch. Do we agree on this? >> >> I think the entire is_bsw thing needs to go, clearly manipulating >> CLKRUN directly was not fully thought out? >> >> Hopefully Intel will come up with a fix patch to preserve PS/2 >> functionality and it won't come to a revert.. > > Agreed. One flaw I found with the logic is that it assumes that the CLKRUN signal will always be enabled. And so the driver enables it unconditionally after is probed (I believe Jason mentioned that before?). But I wonder if what's causing issues with the PS/2 devices is that the devices assume the CLKRUN signal is disabled but this changes because of the tpm driver? James, Can you please test the following (untested) patch on top of the other two mentioned patches to see if it makes a difference for you? From 72a57eaa425d639d2622339173ff6bf9d9c86ff3 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Mon, 18 Dec 2017 12:56:28 +0100 Subject: [PATCH 1/1] tpm: only attempt to disable the LPC CLKRUN if is already enabled 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, the signal will remain enabled which may break other devices transactions since the clocks will be restarted by the CLKRUN# signal. Fixes: 5e572cab92f0 ("tpm: Enable CLKRUN protocol for Braswell systems") Signed-off-by: Javier Martinez Canillas --- drivers/char/tpm/tpm_tis_core.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c index e7bd2e750f69..42eb2c54494e 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -746,7 +746,7 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, const struct tpm_tis_phy_ops *phy_ops, acpi_handle acpi_dev_handle) { - u32 vendor, intfcaps, intmask; + u32 vendor, intfcaps, intmask, clkrun_val; u8 rid; int rc, probe; struct tpm_chip *chip; @@ -772,6 +772,15 @@ 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)) { + priv->flags |= TPM_TIS_CLK_ENABLE; + iounmap(priv->ilb_base_addr); + priv->ilb_base_addr = NULL; + chip->ops->clk_enable = NULL; + } } if (chip->ops->clk_enable != NULL) @@ -868,7 +877,7 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, } rc = tpm_chip_register(chip); - if (rc && is_bsw()) + if (rc && is_bsw() && priv->ilb_base_addr) iounmap(priv->ilb_base_addr); if (chip->ops->clk_enable != NULL)