From: Tomas Winkler <tomas.winkler@intel.com>
To: tpmdd-devel@lists.sourceforge.net,
Jason Gunthorpe <jgunthorpe@obsidianresearch.com>,
Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: linux-kernel@vger.kernel.org, "Winkler, Tomas" <tomas.winkler@intel.com>
Subject: [PATCH 3/4] tpm/tpm_crb: open code the crb_init into acpi_add
Date: Sat, 8 Oct 2016 14:59:38 +0300 [thread overview]
Message-ID: <1475927979-23484-4-git-send-email-tomas.winkler@intel.com> (raw)
In-Reply-To: <1475927979-23484-1-git-send-email-tomas.winkler@intel.com>
From: "Winkler, Tomas" <tomas.winkler@intel.com>
This is preparation step for implementing tpm crb
runtime pm. We need to have tpm chip allocated
and populated before we access the runtime handlers.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
---
V2: new in the series
V3: resend
V4: resend
drivers/char/tpm/tpm_crb.c | 26 ++++++++++----------------
1 file changed, 10 insertions(+), 16 deletions(-)
diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
index 4eb96b85c653..def50b7d47b2 100644
--- a/drivers/char/tpm/tpm_crb.c
+++ b/drivers/char/tpm/tpm_crb.c
@@ -266,21 +266,6 @@ static const struct tpm_class_ops tpm_crb = {
.req_complete_val = CRB_DRV_STS_COMPLETE,
};
-static int crb_init(struct acpi_device *device, struct crb_priv *priv)
-{
- struct tpm_chip *chip;
-
- chip = tpmm_chip_alloc(&device->dev, &tpm_crb);
- if (IS_ERR(chip))
- return PTR_ERR(chip);
-
- dev_set_drvdata(&chip->dev, priv);
- chip->acpi_dev_handle = device->handle;
- chip->flags = TPM_CHIP_FLAG_TPM2;
-
- return tpm_chip_register(chip);
-}
-
static int crb_check_resource(struct acpi_resource *ares, void *data)
{
struct resource *io_res = data;
@@ -402,6 +387,7 @@ static int crb_acpi_add(struct acpi_device *device)
{
struct acpi_table_tpm2 *buf;
struct crb_priv *priv;
+ struct tpm_chip *chip;
struct device *dev = &device->dev;
acpi_status status;
u32 sm;
@@ -439,11 +425,19 @@ static int crb_acpi_add(struct acpi_device *device)
if (rc)
return rc;
+ chip = tpmm_chip_alloc(dev, &tpm_crb);
+ if (IS_ERR(chip))
+ return PTR_ERR(chip);
+
+ dev_set_drvdata(&chip->dev, priv);
+ chip->acpi_dev_handle = device->handle;
+ chip->flags = TPM_CHIP_FLAG_TPM2;
+
rc = crb_cmd_ready(dev, priv);
if (rc)
return rc;
- rc = crb_init(device, priv);
+ rc = tpm_chip_register(chip);
if (rc)
crb_go_idle(dev, priv);
--
2.7.4
next prev parent reply other threads:[~2016-10-08 12:05 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-08 11:59 [PATCH v4 0/4] tpm/tpm_crb: implement power management Tomas Winkler
2016-10-08 11:59 ` [PATCH v4 1/4] tpm/tpm_crb: implement tpm crb idle state Tomas Winkler
2016-10-08 16:30 ` Jarkko Sakkinen
2016-10-08 11:59 ` [PATCH 2/4] tmp/tpm_crb: fix Intel PTT hw bug during " Tomas Winkler
2016-10-08 12:50 ` Jarkko Sakkinen
2016-10-08 14:27 ` Winkler, Tomas
2016-10-08 16:00 ` Jarkko Sakkinen
2016-10-08 16:42 ` Jason Gunthorpe
2016-10-08 16:58 ` Winkler, Tomas
2016-10-08 17:08 ` Jarkko Sakkinen
2016-10-08 16:56 ` Winkler, Tomas
2016-10-08 17:06 ` Jarkko Sakkinen
2016-10-08 17:27 ` Winkler, Tomas
2016-10-08 18:53 ` [tpmdd-devel] " Winkler, Tomas
2016-10-08 11:59 ` Tomas Winkler [this message]
2016-10-08 11:59 ` [PATCH 4/4] tmp/tpm_crb: implement runtime pm for tpm_crb Tomas Winkler
2016-10-08 12:47 ` Jarkko Sakkinen
2016-10-08 13:37 ` Winkler, Tomas
2016-10-08 16:01 ` Jarkko Sakkinen
2016-10-08 18:18 ` Winkler, Tomas
2016-10-08 18:43 ` Jarkko Sakkinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1475927979-23484-4-git-send-email-tomas.winkler@intel.com \
--to=tomas.winkler@intel.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=jgunthorpe@obsidianresearch.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tpmdd-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).