From patchwork Mon May 29 09:09:40 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: 768090 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id 3wbrY867P0z9s7h for ; Mon, 29 May 2017 19:10:04 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sourceforge.net header.i=@sourceforge.net header.b="Sie+LIwp"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sf.net header.i=@sf.net header.b="I8dZOJkY"; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=sfs-ml-2.v29.ch3.sourceforge.com) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1dFGgY-0000fi-3G; Mon, 29 May 2017 09:09:58 +0000 Received: from sog-mx-4.v43.ch3.sourceforge.com ([172.29.43.194] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1dFGgX-0000fd-5D for tpmdd-devel@lists.sourceforge.net; Mon, 29 May 2017 09:09:57 +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=Sie+LIwp9ZWfa/rBnFzwwHHSyUw0YZgJgOXRyTyzKJQBtuUHMK0ukAHxvKJ5CPKMD4Eyjj5wYLh53+2GVa+q9XEB2jP1kXsP9ChY2ui+0yA0mZ3L6GrLijY8HIYbZIBx6W9s/R0VEcJL0PIFGrA1+eIK2odOZSu00yYA5UNzV8o=; 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=I8dZOJkYA2L+jg6PahzaPcwJvzj73amJ9iTgsj7AO8EMUV6blpAP1T85ZQDELKba9mTx/WxGdSBdy0ddQJxXVyY9AedKEiB4Lcp/fqejdNKIlp92UwZLdnnITgufYReu2g63qoaGvEbxLiO+ItG38uLvrZ85pDfWdNLHTSL7PnQ=; Received-SPF: pass (sog-mx-4.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-4.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1dFGgW-00053w-98 for tpmdd-devel@lists.sourceforge.net; Mon, 29 May 2017 09:09:57 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: eballetbo) with ESMTPSA id 9CE5326B4D8 From: Enric Balletbo i Serra To: Rob Herring , Jarkko Sakkinen , tpmdd-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Date: Mon, 29 May 2017 11:09:40 +0200 Message-Id: <20170529090940.9874-2-enric.balletbo@collabora.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170529090940.9874-1-enric.balletbo@collabora.com> References: <20170529090940.9874-1-enric.balletbo@collabora.com> X-Spam-Score: -1.5 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [46.235.227.227 listed in list.dnswl.org] -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-Headers-End: 1dFGgW-00053w-98 Subject: [tpmdd-devel] [PATCH v4 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 , Sonny Rao MIME-Version: 1.0 Errors-To: tpmdd-devel-bounces@lists.sourceforge.net 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)