From patchwork Tue Jan 14 10:00:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 233986 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.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 9AC26C33CB2 for ; Tue, 14 Jan 2020 10:03:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6E58A24672 for ; Tue, 14 Jan 2020 10:03:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578996190; bh=y2ZNNeksxz04GyUAfYwbbjFlxdCvRnMbvISORCrrBYo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vB55cu7tK7muqMvK3TlaYgiqaVSzHZC9m16kEGpwtQmmH3xjQsZvHXap0wseyipE+ kC4GLtA1wphqMGXo4kRTo7H60rLFRhBhiufCbNzmq6lj3eGS8+KBUT74Ovk5T2nM41 y5lmmif3L9DdSaS92jzpLW2fwN/E7nUgcGV1fSXA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729416AbgANKDG (ORCPT ); Tue, 14 Jan 2020 05:03:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:57692 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726169AbgANKDF (ORCPT ); Tue, 14 Jan 2020 05:03:05 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 862FA24672; Tue, 14 Jan 2020 10:03:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578996185; bh=y2ZNNeksxz04GyUAfYwbbjFlxdCvRnMbvISORCrrBYo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PmIQujExr1UeHHDY2H/BO14GxstEcVUQ5zoH1iKUuZeYKMy2xt9lFsTfUjJY9A3Dm bq8t0KyM6BwXWT6G9xiixgRV8dC125zeHrfz7NeNBwBFG5qEkNNmAmeOOtwWNDkWXm XiAwL1mfHAUHH/rV44WjfRPPyOPG4/nyOX8fVPj4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jerry Snitselaar , Dan Williams , Xiaoping Zhou , Stefan Berger , Jarkko Sakkinen Subject: [PATCH 5.4 10/78] tpm: Revert "tpm_tis_core: Set TPM_CHIP_FLAG_IRQ before probing for interrupts" Date: Tue, 14 Jan 2020 11:00:44 +0100 Message-Id: <20200114094353.967524292@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200114094352.428808181@linuxfoundation.org> References: <20200114094352.428808181@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Stefan Berger commit dda8b2af395b2ed508e2ef314ae32e122841b447 upstream. 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. Link: https://bugzilla.kernel.org/show_bug.cgi?id=205935 Fixes: 1ea32c83c699 ("tpm_tis_core: Set TPM_CHIP_FLAG_IRQ before probing for interrupts") 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 Signed-off-by: Greg Kroah-Hartman --- drivers/char/tpm/tpm_tis_core.c | 1 - 1 file changed, 1 deletion(-) --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -981,7 +981,6 @@ int tpm_tis_core_init(struct device *dev } tpm_chip_start(chip); - chip->flags |= TPM_CHIP_FLAG_IRQ; if (irq) { tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED, irq);