From patchwork Tue Jun 27 10:27:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Enric Balletbo i Serra X-Patchwork-Id: 9811341 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 B570D603D7 for ; Tue, 27 Jun 2017 10:28:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F6252807B for ; Tue, 27 Jun 2017 10:27:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5439728589; Tue, 27 Jun 2017 10:27:46 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 817B228113 for ; Tue, 27 Jun 2017 10:27:44 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=sfs-ml-3.v29.ch3.sourceforge.com) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1dPnig-0000Iu-Gj; Tue, 27 Jun 2017 10:27:42 +0000 Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1dPnif-0000In-0o for tpmdd-devel@lists.sourceforge.net; Tue, 27 Jun 2017 10:27:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=S9Mts538uZ8oPDUQf0ecaTUIRtlW8Lgn+kn3px1ftL4=; b=ac6uBBI68nEA0cT/TSV0VlL8wP66VmH3dvXaaTwkw2RMQBcV00KRtddaQ6SesZmCdKUZMmZQpkvRLSuivu6+aw4WDqaDWfzgj/ubPnt9dwGY/kJsttNBLVT5lPTiKqNDVLoJZE/Knzc3xkoUAdPlp4jZlNTciACqPL4UpE4RP60=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=S9Mts538uZ8oPDUQf0ecaTUIRtlW8Lgn+kn3px1ftL4=; b=T92hiv8+5KNbhsdc2SHELN54ZF4WVKTysPXQj8vZAfMxCuVkVuWuPyRsqNK30ctD+OkH96jHxn4igWVTuAZrrH/LuqYQ8Kz6m0FahPls5galgTgetMoyhrU4S9nAk6RnkZHz7XS6na+y0/s5c0EXLD2WNf7oxl/3ylRLIAZ/39Y=; Received-SPF: pass (sog-mx-2.v43.ch3.sourceforge.com: domain of collabora.com designates 46.235.227.227 as permitted sender) client-ip=46.235.227.227; envelope-from=enric.balletbo@collabora.com; helo=bhuna.collabora.co.uk; Received: from bhuna.collabora.co.uk ([46.235.227.227]) by sog-mx-2.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1dPnie-00072Z-16 for tpmdd-devel@lists.sourceforge.net; Tue, 27 Jun 2017 10:27:41 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: eballetbo) with ESMTPSA id 3C37B26BE6D From: Enric Balletbo i Serra To: Rob Herring , Jarkko Sakkinen , Peter Huewe Date: Tue, 27 Jun 2017 12:27:24 +0200 Message-Id: <20170627102724.23861-2-enric.balletbo@collabora.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170627102724.23861-1-enric.balletbo@collabora.com> References: <20170627102724.23861-1-enric.balletbo@collabora.com> X-Headers-End: 1dPnie-00072Z-16 Subject: [tpmdd-devel] [PATCH v4 RESEND 2/2] tpm: do not suspend/resume if power stays on X-BeenThere: tpmdd-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: Tpm Device Driver maintainance List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, tpmdd-devel@lists.sourceforge.net, groeck@chromium.org, Sonny Rao MIME-Version: 1.0 Errors-To: tpmdd-devel-bounces@lists.sourceforge.net X-Virus-Scanned: ClamAV using ClamSMTP The suspend/resume behavior of the TPM can be controlled by setting "powered-while-suspended" in the DTS. This is useful for the cases when hardware does not power-off the TPM. Signed-off-by: Sonny Rao Signed-off-by: Enric Balletbo i Serra Reviewed-by: Jason Gunthorpe Reviewed-by: Jarkko Sakkinen --- Changes since v3. - Rebased on top of linux-next Rob Herring - Split DT binding from code patch as is preferred. Changes since v2: Jarkko Sakkinen - Add a new TPM_CHIP_FLAG_ALWAYS_POWERED flag instead of using a boolean variable. - Remove a trailing newline. Changes since v1: Jason Gunthorpe : - Move the code to handle suspend/resume in the common chip code. drivers/char/tpm/tpm-interface.c | 3 +++ drivers/char/tpm/tpm.h | 1 + drivers/char/tpm/tpm_of.c | 3 +++ 3 files changed, 7 insertions(+) diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index be54159..34ec7ce 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -1099,6 +1099,9 @@ int tpm_pm_suspend(struct device *dev) if (chip == NULL) return -ENODEV; + if (chip->flags & TPM_CHIP_FLAG_ALWAYS_POWERED) + return 0; + if (chip->flags & TPM_CHIP_FLAG_TPM2) { tpm2_shutdown(chip, TPM2_SU_STATE); return 0; diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index af05c14..b44d39c 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -170,6 +170,7 @@ enum tpm_chip_flags { TPM_CHIP_FLAG_IRQ = BIT(2), TPM_CHIP_FLAG_VIRTUAL = BIT(3), TPM_CHIP_FLAG_HAVE_TIMEOUTS = BIT(4), + TPM_CHIP_FLAG_ALWAYS_POWERED = BIT(5), }; struct tpm_bios_log { diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_of.c index de57d4a..aadb7f4 100644 --- a/drivers/char/tpm/tpm_of.c +++ b/drivers/char/tpm/tpm_of.c @@ -36,6 +36,9 @@ int tpm_read_log_of(struct tpm_chip *chip) else return -ENODEV; + if (of_property_read_bool(np, "powered-while-suspended")) + chip->flags |= TPM_CHIP_FLAG_ALWAYS_POWERED; + sizep = of_get_property(np, "linux,sml-size", NULL); basep = of_get_property(np, "linux,sml-base", NULL); if (sizep == NULL && basep == NULL)