Received: by 10.192.165.148 with SMTP id m20csp2526608imm; Sun, 22 Apr 2018 08:53:22 -0700 (PDT) X-Google-Smtp-Source: AIpwx48Wf3h3bKN0vBK231+/83Ky1VM49NnnZQ6FMnpd1bBk8YuAfQSK+7zHKnhBeLfyHYlAOOuW X-Received: by 2002:a17:902:44a4:: with SMTP id l33-v6mr17583267pld.27.1524412402710; Sun, 22 Apr 2018 08:53:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524412402; cv=none; d=google.com; s=arc-20160816; b=0JhEg6ln8u4xEqO9tL53bZJy6VzJgCk4sJ7NyMKlqHPc8zoXHPMoausDTxpi1DBz+h 4RiRE8NaHgQsaswZGg2+4pPcZ+stUBTTGl4yQJOEIPi59mjjMwGG3UI3i7itXuHJXNaS jizHRNouf0OblBWX0xzKBI1c+2q+iaz88suM+KiTKhwH50lYm90j3bGdOxbQBsB+X+UF q+uveP8+DdDiZDqDeOkLZzQhrimYx7vOo5+HsUU7efTJ2BZuxKxbwDm+jlRhwe8DpyDJ pUxq6SrNDfctuLPGUbmj13w1aodwUsuMwIWK2+ndYUI9y02cVUSbk/sDQC8TqKEZveUG 8vFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=GT2MSDESAXvaY4Ssh65dxXo6FZO+TLkg+jDFnGpK/zY=; b=dk0F12HnOb6Zfn7WHTe9JW7O2ujB60aGtK6EnQy4tCr2dIsIsfT/wrZu79jFdOATNE BmNSCYxl34xOzmUAo2X6LAPLD1ZZmIrvEvR/ytKtNp98vZQpYEeFj30sBvAuoVk/d4As LUvTLMzA3DKjbprko08Bhhbpx2eCKT6BnXJWHxkp15qwdI1CZdHKqA8F+srLnBvz4bC4 /RHNRExKNqbnTBcVoaMU8TsrvRuXZGXhQ8RfpfyPGj5cGiY4itwfXl/DSM6SJlZ3936W LaDlGrJ/TNEVsn4qEEFR7Fw6otJQVPANbaWe+whWDnZUk1gSpd9nswqwQASWKXFcNSHQ WSOQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k10si7156676pgs.304.2018.04.22.08.53.08; Sun, 22 Apr 2018 08:53:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754758AbeDVPuV (ORCPT + 99 others); Sun, 22 Apr 2018 11:50:21 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:47752 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754611AbeDVOBB (ORCPT ); Sun, 22 Apr 2018 10:01:01 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id C1469C7F; Sun, 22 Apr 2018 14:01:00 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chris Chiu , Daniel Drake , Jarkko Sakkinen Subject: [PATCH 4.16 121/196] tpm: self test failure should not cause suspend to fail Date: Sun, 22 Apr 2018 15:52:21 +0200 Message-Id: <20180422135110.509960922@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180422135104.278511750@linuxfoundation.org> References: <20180422135104.278511750@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chris Chiu commit 0803d7befa15cab5717d667a97a66214d2a4c083 upstream. The Acer Acer Veriton X4110G has a TPM device detected as: tpm_tis 00:0b: 1.2 TPM (device-id 0xFE, rev-id 71) After the first S3 suspend, the following error appears during resume: tpm tpm0: A TPM error(38) occurred continue selftest Any following S3 suspend attempts will now fail with this error: tpm tpm0: Error (38) sending savestate before suspend PM: Device 00:0b failed to suspend: error 38 Error 38 is TPM_ERR_INVALID_POSTINIT which means the TPM is not in the correct state. This indicates that the platform BIOS is not sending the usual TPM_Startup command during S3 resume. >From this point onwards, all TPM commands will fail. The same issue was previously reported on Foxconn 6150BK8MC and Sony Vaio TX3. The platform behaviour seems broken here, but we should not break suspend/resume because of this. When the unexpected TPM state is encountered, set a flag to skip the affected TPM_SaveState command on later suspends. Cc: stable@vger.kernel.org Signed-off-by: Chris Chiu Signed-off-by: Daniel Drake Link: http://lkml.kernel.org/r/CAB4CAwfSCvj1cudi+MWaB5g2Z67d9DwY1o475YOZD64ma23UiQ@mail.gmail.com Link: https://lkml.org/lkml/2011/3/28/192 Link: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=591031 Reviewed-by: Jarkko Sakkinen Signed-off-by: Jarkko Sakkinen Signed-off-by: Greg Kroah-Hartman --- drivers/char/tpm/tpm-interface.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -969,6 +969,10 @@ int tpm_do_selftest(struct tpm_chip *chi loops = jiffies_to_msecs(duration) / delay_msec; rc = tpm_continue_selftest(chip); + if (rc == TPM_ERR_INVALID_POSTINIT) { + chip->flags |= TPM_CHIP_FLAG_ALWAYS_POWERED; + dev_info(&chip->dev, "TPM not ready (%d)\n", rc); + } /* This may fail if there was no TPM driver during a suspend/resume * cycle; some may return 10 (BAD_ORDINAL), others 28 (FAILEDSELFTEST) */