| Message ID | 20180214134319.4400-3-tomas.winkler@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Feb 14, 2018 at 03:43:19PM +0200, Tomas Winkler wrote: > We cannot use go_idle cmd_ready commands via runtime_pm handles > as with the introduction of localities this is no longer an optional > feature, while runtime pm can be not enabled. > Though cmd_ready/go_idle provides power saving feature, it's also part of > TPM2 protocol and should be called explicitly. > This patch exposes cmd_read/go_idle via tpm class ops and removes > runtime pm support as it is not used by any driver. > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> > --- > V2: resent > V3: resent Only the cover letter needs a backlog but the code change looks good to me. Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> /Jarkko
On Mon, 2018-02-19 at 13:52 +0200, Jarkko Sakkinen wrote: > On Wed, Feb 14, 2018 at 03:43:19PM +0200, Tomas Winkler wrote: > > We cannot use go_idle cmd_ready commands via runtime_pm handles > > as with the introduction of localities this is no longer an > > optional > > feature, while runtime pm can be not enabled. > > Though cmd_ready/go_idle provides power saving feature, it's also > > part of > > TPM2 protocol and should be called explicitly. > > This patch exposes cmd_read/go_idle via tpm class ops and removes > > runtime pm support as it is not used by any driver. > > > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> > > --- > > V2: resent > > V3: resent > > Only the cover letter needs a backlog but the code change looks > good to me. > > Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> /Jarkko
On Tue, Feb 20, 2018 at 04:13:30PM +0200, Jarkko Sakkinen wrote: > On Mon, 2018-02-19 at 13:52 +0200, Jarkko Sakkinen wrote: > > On Wed, Feb 14, 2018 at 03:43:19PM +0200, Tomas Winkler wrote: > > > We cannot use go_idle cmd_ready commands via runtime_pm handles > > > as with the introduction of localities this is no longer an > > > optional > > > feature, while runtime pm can be not enabled. > > > Though cmd_ready/go_idle provides power saving feature, it's also > > > part of > > > TPM2 protocol and should be called explicitly. > > > This patch exposes cmd_read/go_idle via tpm class ops and removes > > > runtime pm support as it is not used by any driver. > > > > > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> > > > --- > > > V2: resent > > > V3: resent > > > > Only the cover letter needs a backlog but the code change looks > > good to me. > > > > Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> > > Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> > > /Jarkko Applied. /Jarkko
On Mon, Mar 05, 2018 at 08:08:31PM +0200, Jarkko Sakkinen wrote: > On Tue, Feb 20, 2018 at 04:13:30PM +0200, Jarkko Sakkinen wrote: > > On Mon, 2018-02-19 at 13:52 +0200, Jarkko Sakkinen wrote: > > > On Wed, Feb 14, 2018 at 03:43:19PM +0200, Tomas Winkler wrote: > > > > We cannot use go_idle cmd_ready commands via runtime_pm handles > > > > as with the introduction of localities this is no longer an > > > > optional > > > > feature, while runtime pm can be not enabled. > > > > Though cmd_ready/go_idle provides power saving feature, it's also > > > > part of > > > > TPM2 protocol and should be called explicitly. > > > > This patch exposes cmd_read/go_idle via tpm class ops and removes > > > > runtime pm support as it is not used by any driver. > > > > > > > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> > > > > --- > > > > V2: resent > > > > V3: resent > > > > > > Only the cover letter needs a backlog but the code change looks > > > good to me. > > > > > > Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> > > > > Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> > > > > /Jarkko > > Applied. > > /Jarkko This commit breaks my smoke tests on Kabylake [1] so I need to drop it. The bug fix for locality works without any issues. [1] $ python -m unittest -v tpm2_smoke test_seal_with_auth (tpm2_smoke.SmokeTest) ... ok test_seal_with_policy (tpm2_smoke.SmokeTest) ... ok test_seal_with_too_long_auth (tpm2_smoke.SmokeTest) ... ok test_too_short_cmd (tpm2_smoke.SmokeTest) ... ok test_unseal_with_wrong_auth (tpm2_smoke.SmokeTest) ... ok test_unseal_with_wrong_policy (tpm2_smoke.SmokeTest) ... ok test_flush_context (tpm2_smoke.SpaceTest) ... ERROR test_get_handles (tpm2_smoke.SpaceTest) ... ERROR test_invalid_cc (tpm2_smoke.SpaceTest) ... ok test_make_two_spaces (tpm2_smoke.SpaceTest) ... ERROR ====================================================================== ERROR: test_flush_context (tpm2_smoke.SpaceTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "tpm2_smoke.py", line 185, in test_flush_context space1.flush_context(root1) File "tpm2.py", line 517, in flush_context self.send_cmd(cmd) File "tpm2.py", line 378, in send_cmd raise ProtocolError(cc, rc) ProtocolError: TPM_RC_UNKNOWN: cc=0x00000165, rc=0x00000165 ====================================================================== ERROR: test_get_handles (tpm2_smoke.SpaceTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "tpm2_smoke.py", line 195, in test_get_handles space2.create_root_key() File "tpm2.py", line 562, in create_root_key return struct.unpack('>I', self.send_cmd(cmd)[10:14])[0] File "tpm2.py", line 378, in send_cmd raise ProtocolError(cc, rc) ProtocolError: TPM_RC_UNBALANCED: cc=0x00000131, rc=0x00000131 ====================================================================== ERROR: test_make_two_spaces (tpm2_smoke.SpaceTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "tpm2_smoke.py", line 171, in test_make_two_spaces root3 = space2.create_root_key() File "tpm2.py", line 562, in create_root_key return struct.unpack('>I', self.send_cmd(cmd)[10:14])[0] File "tpm2.py", line 378, in send_cmd raise ProtocolError(cc, rc) ProtocolError: TPM_RC_UNBALANCED: cc=0x00000131, rc=0x00000131 ---------------------------------------------------------------------- Ran 10 tests in 44.545s FAILED (errors=3) /Jarkko
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index f47b29c1a963..0b6c9641df56 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -29,7 +29,6 @@ #include <linux/mutex.h> #include <linux/spinlock.h> #include <linux/freezer.h> -#include <linux/pm_runtime.h> #include <linux/tpm_eventlog.h> #include "tpm.h" @@ -437,8 +436,11 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space, chip->locality = rc; } - if (chip->dev.parent) - pm_runtime_get_sync(chip->dev.parent); + if (chip->ops->cmd_ready) { + rc = chip->ops->cmd_ready(chip); + if (rc) + goto out; + } rc = tpm2_prepare_space(chip, space, ordinal, buf); if (rc) @@ -500,8 +502,11 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space, rc = tpm2_commit_space(chip, space, ordinal, buf, &len); out: - if (chip->dev.parent) - pm_runtime_put_sync(chip->dev.parent); + if (chip->ops->go_idle) { + rc = chip->ops->go_idle(chip); + if (rc) + goto out; + } if (need_locality && chip->ops->relinquish_locality) { /* this coud be on error path, don't override error code */ diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c index 497edd9848cd..acfcdc6f31af 100644 --- a/drivers/char/tpm/tpm_crb.c +++ b/drivers/char/tpm/tpm_crb.c @@ -132,7 +132,7 @@ static bool crb_wait_for_reg_32(u32 __iomem *reg, u32 mask, u32 value, } /** - * crb_go_idle - request tpm crb device to go the idle state + * __crb_go_idle - request tpm crb device to go the idle state * * @dev: crb device * @priv: crb private data @@ -147,7 +147,7 @@ static bool crb_wait_for_reg_32(u32 __iomem *reg, u32 mask, u32 value, * * Return: 0 always */ -static int crb_go_idle(struct device *dev, struct crb_priv *priv) +static int __crb_go_idle(struct device *dev, struct crb_priv *priv) { if ((priv->sm == ACPI_TPM2_START_METHOD) || (priv->sm == ACPI_TPM2_COMMAND_BUFFER_WITH_START_METHOD) || @@ -166,8 +166,16 @@ static int crb_go_idle(struct device *dev, struct crb_priv *priv) return 0; } +static int crb_go_idle(struct tpm_chip *chip) +{ + struct device *dev = &chip->dev; + struct crb_priv *priv = dev_get_drvdata(dev); + + return __crb_go_idle(dev, priv); +} + /** - * crb_cmd_ready - request tpm crb device to enter ready state + * __crb_cmd_ready - request tpm crb device to enter ready state * * @dev: crb device * @priv: crb private data @@ -181,7 +189,7 @@ static int crb_go_idle(struct device *dev, struct crb_priv *priv) * * Return: 0 on success -ETIME on timeout; */ -static int crb_cmd_ready(struct device *dev, struct crb_priv *priv) +static int __crb_cmd_ready(struct device *dev, struct crb_priv *priv) { if ((priv->sm == ACPI_TPM2_START_METHOD) || (priv->sm == ACPI_TPM2_COMMAND_BUFFER_WITH_START_METHOD) || @@ -200,6 +208,14 @@ static int crb_cmd_ready(struct device *dev, struct crb_priv *priv) return 0; } +static int crb_cmd_ready(struct tpm_chip *chip) +{ + struct device *dev = &chip->dev; + struct crb_priv *priv = dev_get_drvdata(dev); + + return __crb_cmd_ready(dev, priv); +} + static int __crb_request_locality(struct device *dev, struct crb_priv *priv, int loc) { @@ -401,6 +417,8 @@ static const struct tpm_class_ops tpm_crb = { .send = crb_send, .cancel = crb_cancel, .req_canceled = crb_req_canceled, + .go_idle = crb_go_idle, + .cmd_ready = crb_cmd_ready, .request_locality = crb_request_locality, .relinquish_locality = crb_relinquish_locality, .req_complete_mask = CRB_DRV_STS_COMPLETE, @@ -517,7 +535,7 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv, * PTT HW bug w/a: wake up the device to access * possibly not retained registers. */ - ret = crb_cmd_ready(dev, priv); + ret = __crb_cmd_ready(dev, priv); if (ret) return ret; @@ -562,7 +580,7 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv, if (!ret) priv->cmd_size = cmd_size; - crb_go_idle(dev, priv); + __crb_go_idle(dev, priv); __crb_relinquish_locality(dev, priv, 0); @@ -627,23 +645,13 @@ static int crb_acpi_add(struct acpi_device *device) if (rc) return rc; - rc = crb_cmd_ready(dev, priv); + rc = __crb_cmd_ready(dev, priv); if (rc) goto out; - pm_runtime_get_noresume(dev); - pm_runtime_set_active(dev); - pm_runtime_enable(dev); - rc = tpm_chip_register(chip); - if (rc) { - crb_go_idle(dev, priv); - pm_runtime_put_noidle(dev); - pm_runtime_disable(dev); - goto out; - } - pm_runtime_put_sync(dev); + __crb_go_idle(dev, priv); out: __crb_relinquish_locality(dev, priv, 0); @@ -658,43 +666,27 @@ static int crb_acpi_remove(struct acpi_device *device) tpm_chip_unregister(chip); - pm_runtime_disable(dev); - return 0; } -static int __maybe_unused crb_pm_runtime_suspend(struct device *dev) -{ - struct tpm_chip *chip = dev_get_drvdata(dev); - struct crb_priv *priv = dev_get_drvdata(&chip->dev); - - return crb_go_idle(dev, priv); -} - -static int __maybe_unused crb_pm_runtime_resume(struct device *dev) -{ - struct tpm_chip *chip = dev_get_drvdata(dev); - struct crb_priv *priv = dev_get_drvdata(&chip->dev); - - return crb_cmd_ready(dev, priv); -} - static int __maybe_unused crb_pm_suspend(struct device *dev) { + struct tpm_chip *chip = dev_get_drvdata(dev); int ret; ret = tpm_pm_suspend(dev); if (ret) return ret; - return crb_pm_runtime_suspend(dev); + return crb_go_idle(chip); } static int __maybe_unused crb_pm_resume(struct device *dev) { + struct tpm_chip *chip = dev_get_drvdata(dev); int ret; - ret = crb_pm_runtime_resume(dev); + ret = crb_cmd_ready(chip); if (ret) return ret; @@ -703,7 +695,6 @@ static int __maybe_unused crb_pm_resume(struct device *dev) static const struct dev_pm_ops crb_pm = { SET_SYSTEM_SLEEP_PM_OPS(crb_pm_suspend, crb_pm_resume) - SET_RUNTIME_PM_OPS(crb_pm_runtime_suspend, crb_pm_runtime_resume, NULL) }; static const struct acpi_device_id crb_device_ids[] = { diff --git a/include/linux/tpm.h b/include/linux/tpm.h index 06639fb6ab85..8eb5e5ebe136 100644 --- a/include/linux/tpm.h +++ b/include/linux/tpm.h @@ -43,6 +43,8 @@ struct tpm_class_ops { u8 (*status) (struct tpm_chip *chip); bool (*update_timeouts)(struct tpm_chip *chip, unsigned long *timeout_cap); + int (*go_idle)(struct tpm_chip *chip); + int (*cmd_ready)(struct tpm_chip *chip); int (*request_locality)(struct tpm_chip *chip, int loc); int (*relinquish_locality)(struct tpm_chip *chip, int loc); void (*clk_enable)(struct tpm_chip *chip, bool value);
We cannot use go_idle cmd_ready commands via runtime_pm handles as with the introduction of localities this is no longer an optional feature, while runtime pm can be not enabled. Though cmd_ready/go_idle provides power saving feature, it's also part of TPM2 protocol and should be called explicitly. This patch exposes cmd_read/go_idle via tpm class ops and removes runtime pm support as it is not used by any driver. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> --- V2: resent V3: resent drivers/char/tpm/tpm-interface.c | 15 ++++++--- drivers/char/tpm/tpm_crb.c | 69 +++++++++++++++++----------------------- include/linux/tpm.h | 2 ++ 3 files changed, 42 insertions(+), 44 deletions(-)