From patchwork Thu Jan 9 18:48:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerry Snitselaar X-Patchwork-Id: 234230 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E239C282DD for ; Thu, 9 Jan 2020 18:49:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 428BE20721 for ; Thu, 9 Jan 2020 18:49:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="NC1edDrd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388553AbgAIStX (ORCPT ); Thu, 9 Jan 2020 13:49:23 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:23018 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1732156AbgAIStX (ORCPT ); Thu, 9 Jan 2020 13:49:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578595762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Oqc3MMQw8O1qNIVg8hSlbU7+hvRjZ2to1iSNBj/pjyU=; b=NC1edDrdWYyAxnnnxN6vpEb8jG9P4vNmcxWvyPldY0bcZQKeG6Qe+WTR7uQYiNzv3CsED1 NY996fn7te/m5hlsmPgWESpzP8wnVCfxsrOdlqLBJ++DFVG+nASt5+2uIO7U5wmpN8g/5R abh7aaPna9FObMXLNStglTHjxGfLGA0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-130-xRHamForM8qjwjMPloRdvg-1; Thu, 09 Jan 2020 13:49:15 -0500 X-MC-Unique: xRHamForM8qjwjMPloRdvg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6F3FC100725A; Thu, 9 Jan 2020 18:49:14 +0000 (UTC) Received: from cantor.redhat.com (ovpn-116-184.phx2.redhat.com [10.3.116.184]) by smtp.corp.redhat.com (Postfix) with ESMTP id EE5BE1A8E4; Thu, 9 Jan 2020 18:49:13 +0000 (UTC) From: Jerry Snitselaar To: rhkernel-list@redhat.com Cc: stable@vger.kernel.org, Dan Williams , Xiaoping Zhou , Stefan Berger , Jarkko Sakkinen Subject: [RHEL8.2 PATCH BZ1789088 2/2] tpm: Revert "tpm_tis_core: Turn on the TPM before probing IRQ's" Date: Thu, 9 Jan 2020 11:48:59 -0700 Message-Id: <20200109184859.6755-3-jsnitsel@redhat.com> In-Reply-To: <20200109184859.6755-1-jsnitsel@redhat.com> References: <20200109184859.6755-1-jsnitsel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Bugzilla: 1789088 Upstream Status: aa4a63dd981682b1742baa01237036e48bc11923 Build Info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=25656672 commit aa4a63dd981682b1742baa01237036e48bc11923 Author: Stefan Berger Date: Tue Nov 26 08:17:53 2019 -0500 tpm: Revert "tpm_tis_core: Turn on the TPM before probing IRQ's" There has been a bunch of reports (one from kernel bugzilla linked) reporting that when this commit is applied it causes on some machines boot freezes. Unfortunately hardware where this commit causes a failure is not widely available (only one I'm aware is Lenovo T490), which means we cannot predict yet how long it will take to properly fix tpm_tis interrupt probing. Thus, the least worst short term action is to revert the code to the state before this commit. In long term we need fix the tpm_tis probing code to work on machines that Stefan's fix was supposed to fix. Fixes: 21df4a8b6018 ("tpm_tis: reserve chip for duration of tpm_tis_core_init") Link: https://bugzilla.kernel.org/show_bug.cgi?id=205935 Cc: stable@vger.kernel.org Cc: Jerry Snitselaar Cc: Dan Williams Tested-by: Dan Williams Tested-by: Xiaoping Zhou Signed-off-by: Stefan Berger Reported-by: Jerry Snitselaar Signed-off-by: Jarkko Sakkinen (cherry picked from commit aa4a63dd981682b1742baa01237036e48bc11923) Signed-off-by: Jerry Snitselaar --- drivers/char/tpm/tpm_tis_core.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c index ffa9048d8f6c..c3181ea9f271 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -980,7 +980,6 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, goto out_err; } - tpm_chip_start(chip); if (irq) { tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED, irq); @@ -990,7 +989,6 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, } else { tpm_tis_probe_irq(chip, intmask); } - tpm_chip_stop(chip); } rc = tpm_chip_register(chip);