* [PATCH v3 0/2] tpm/tpm_crb: Enable TPM CRB interface for ARM64
@ 2017-03-17 23:43 Jiandi An
[not found] ` <1489794193-17233-1-git-send-email-anjiandi-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
0 siblings, 1 reply; 6+ messages in thread
From: Jiandi An @ 2017-03-17 23:43 UTC (permalink / raw)
To: tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f
Cc: Jiandi An, rafael.j.wysocki-ral2JQCrhuEAvxtiuMwx3w,
robert.moore-ral2JQCrhuEAvxtiuMwx3w,
lv.zheng-ral2JQCrhuEAvxtiuMwx3w, lenb-DgEjT+Ai2ygdnm+yROfE0A
TCG ACPI Specification Family "1.2" and "2.0" Version 1.2 Revision 8
introduces a new start method (type 11) for ARM64, along with platform
specific parameters for this new start method. This new start method
invokes a Secure Monitor Call to request the firmware to execute or
cancel a TPM 2.0 command.
v3 Change Log:
- Added start method specific parameter offset define
- Moved tpm_crb_smc definition to tpm_crb.c
- Removed platform_params union from acpi_table_tpm2
- Removed clutter on length calculation of acpi_table_tpm2
caused by changing size of acpi_table_tpm2
Jiandi An (2):
ACPICA: Update TPM2 ACPI table
tpm/tpm_crb: Enable TPM CRB interface for ARM64
drivers/char/tpm/Kconfig | 2 +-
drivers/char/tpm/tpm_crb.c | 64 ++++++++++++++++++++++++++++++++++++++++++++--
include/acpi/actbl2.h | 3 +++
3 files changed, 66 insertions(+), 3 deletions(-)
--
Jiandi An
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc.
Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3 1/2] ACPICA: Update TPM2 ACPI table
[not found] ` <1489794193-17233-1-git-send-email-anjiandi-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
@ 2017-03-17 23:43 ` Jiandi An
2017-03-17 23:43 ` [PATCH v3 2/2] tpm/tpm_crb: Enable TPM CRB interface for ARM64 Jiandi An
1 sibling, 0 replies; 6+ messages in thread
From: Jiandi An @ 2017-03-17 23:43 UTC (permalink / raw)
To: tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f
Cc: Jiandi An, rafael.j.wysocki-ral2JQCrhuEAvxtiuMwx3w,
robert.moore-ral2JQCrhuEAvxtiuMwx3w,
lv.zheng-ral2JQCrhuEAvxtiuMwx3w, lenb-DgEjT+Ai2ygdnm+yROfE0A
TCG ACPI Specification Family "1.2" and "2.0" Version 1.2
Revision 8 introduces new start method for ARM SMC.
- Add new start method (type 11) for ARM SMC
- Add start method specific parameters for ARM SMC start method
Signed-off-by: Jiandi An <anjiandi-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
---
include/acpi/actbl2.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index 7aee9fb..2b4af07 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -1294,6 +1294,9 @@ struct acpi_table_tpm2 {
#define ACPI_TPM2_MEMORY_MAPPED 6
#define ACPI_TPM2_COMMAND_BUFFER 7
#define ACPI_TPM2_COMMAND_BUFFER_WITH_START_METHOD 8
+#define ACPI_TPM2_COMMAND_BUFFER_WITH_SMC 11
+
+#define ACPI_TPM2_START_METHOD_PARAMETER_OFFSET 52
/*******************************************************************************
*
--
Jiandi An
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc.
Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v3 2/2] tpm/tpm_crb: Enable TPM CRB interface for ARM64
[not found] ` <1489794193-17233-1-git-send-email-anjiandi-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2017-03-17 23:43 ` [PATCH v3 1/2] ACPICA: Update TPM2 ACPI table Jiandi An
@ 2017-03-17 23:43 ` Jiandi An
[not found] ` <1489794193-17233-3-git-send-email-anjiandi-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
1 sibling, 1 reply; 6+ messages in thread
From: Jiandi An @ 2017-03-17 23:43 UTC (permalink / raw)
To: tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f
Cc: Jiandi An, rafael.j.wysocki-ral2JQCrhuEAvxtiuMwx3w,
robert.moore-ral2JQCrhuEAvxtiuMwx3w,
lv.zheng-ral2JQCrhuEAvxtiuMwx3w, lenb-DgEjT+Ai2ygdnm+yROfE0A
This enables TPM Command Response Buffer interface driver for
ARM64 and implements an ARM specific TPM CRB start method that
invokes a Secure Monitor Call (SMC) to request the TrustZone
Firmware to execute or cancel a TPM 2.0 command.
In ARM, TrustZone security extensions enable a secure software
environment with Secure Monitor mode. A Secure Monitor Call
(SMC) is used to enter the Secure Monitor mode and perform a
Secure Monitor service to communicate with TrustZone firmware
which has control over the TPM hardware.
Signed-off-by: Jiandi An <anjiandi-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
---
drivers/char/tpm/Kconfig | 2 +-
drivers/char/tpm/tpm_crb.c | 64 ++++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 63 insertions(+), 3 deletions(-)
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
index d520ac5..a3035220 100644
--- a/drivers/char/tpm/Kconfig
+++ b/drivers/char/tpm/Kconfig
@@ -136,7 +136,7 @@ config TCG_XEN
config TCG_CRB
tristate "TPM 2.0 CRB Interface"
- depends on X86 && ACPI
+ depends on ACPI
---help---
If you have a TPM security chip that is compliant with the
TCG CRB 2.0 TPM specification say Yes and it will be accessible
diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
index cb6fb13..f8a5470 100644
--- a/drivers/char/tpm/tpm_crb.c
+++ b/drivers/char/tpm/tpm_crb.c
@@ -20,6 +20,9 @@
#include <linux/rculist.h>
#include <linux/module.h>
#include <linux/pm_runtime.h>
+#ifdef CONFIG_ARM64
+#include <linux/arm-smccc.h>
+#endif
#include "tpm.h"
#define ACPI_SIG_TPM2 "TPM2"
@@ -73,6 +76,7 @@ enum crb_status {
enum crb_flags {
CRB_FL_ACPI_START = BIT(0),
CRB_FL_CRB_START = BIT(1),
+ CRB_FL_CRB_SMC_START = BIT(2),
};
struct crb_priv {
@@ -82,6 +86,15 @@ struct crb_priv {
u8 __iomem *cmd;
u8 __iomem *rsp;
u32 cmd_size;
+ u32 smc_func_id;
+};
+
+struct tpm2_crb_smc {
+ u32 interrupt;
+ u8 interrupt_flags;
+ u8 op_flags;
+ u16 reserved2;
+ u32 smc_func_id;
};
/**
@@ -101,7 +114,8 @@ struct crb_priv {
*/
static int __maybe_unused crb_go_idle(struct device *dev, struct crb_priv *priv)
{
- if (priv->flags & CRB_FL_ACPI_START)
+ if ((priv->flags & CRB_FL_ACPI_START) ||
+ (priv->flags & CRB_FL_CRB_SMC_START))
return 0;
iowrite32(CRB_CTRL_REQ_GO_IDLE, &priv->cca->req);
@@ -129,7 +143,8 @@ static int __maybe_unused crb_cmd_ready(struct device *dev,
{
ktime_t stop, start;
- if (priv->flags & CRB_FL_ACPI_START)
+ if ((priv->flags & CRB_FL_ACPI_START) ||
+ (priv->flags & CRB_FL_CRB_SMC_START))
return 0;
iowrite32(CRB_CTRL_REQ_CMD_READY, &priv->cca->req);
@@ -202,6 +217,33 @@ static int crb_do_acpi_start(struct tpm_chip *chip)
return rc;
}
+#ifdef CONFIG_ARM64
+/*
+ * This is a TPM Command Response Buffer start method that invokes a
+ * Secure Monitor Call to requrest the firmware to execute or cancel
+ * a TPM 2.0 command.
+ */
+static inline int tpm_crb_smc_start(struct device *dev, unsigned long func_id)
+{
+ struct arm_smccc_res res;
+
+ arm_smccc_smc(func_id, 0, 0, 0, 0, 0, 0, 0, &res);
+ if (res.a0 != 0) {
+ dev_err(dev, FW_BUG "tpm_crb_smc_start() returns res.a0 = 0x%lx\n",
+ res.a0);
+ return -EIO;
+ }
+
+ return 0;
+}
+#else
+static inline int tpm_crb_smc_start(struct device *dev, unsigned long func_id)
+{
+ dev_err(dev, FW_BUG "tpm_crb: incorrect start method\n");
+ return -EINVAL;
+}
+#endif
+
static int crb_send(struct tpm_chip *chip, u8 *buf, size_t len)
{
struct crb_priv *priv = dev_get_drvdata(&chip->dev);
@@ -229,6 +271,11 @@ static int crb_send(struct tpm_chip *chip, u8 *buf, size_t len)
if (priv->flags & CRB_FL_ACPI_START)
rc = crb_do_acpi_start(chip);
+ if (priv->flags & CRB_FL_CRB_SMC_START) {
+ iowrite32(CRB_START_INVOKE, &priv->cca->start);
+ rc = tpm_crb_smc_start(&chip->dev, priv->smc_func_id);
+ }
+
return rc;
}
@@ -409,6 +456,7 @@ static int crb_acpi_add(struct acpi_device *device)
struct crb_priv *priv;
struct tpm_chip *chip;
struct device *dev = &device->dev;
+ struct tpm2_crb_smc *crb_smc;
acpi_status status;
u32 sm;
int rc;
@@ -441,6 +489,18 @@ static int crb_acpi_add(struct acpi_device *device)
sm == ACPI_TPM2_COMMAND_BUFFER_WITH_START_METHOD)
priv->flags |= CRB_FL_ACPI_START;
+ if (sm == ACPI_TPM2_COMMAND_BUFFER_WITH_SMC) {
+ if (buf->header.length < (sizeof(*buf) + sizeof(*crb_smc))) {
+ dev_err(dev, FW_BUG "TPM2 ACPI table has wrong size %u for start method type %d\n",
+ buf->header.length, ACPI_TPM2_COMMAND_BUFFER_WITH_SMC);
+ return -EINVAL;
+ }
+ crb_smc = (struct tpm2_crb_smc *) (((u8 *) buf) +
+ ACPI_TPM2_START_METHOD_PARAMETER_OFFSET);
+ priv->smc_func_id = crb_smc->smc_func_id;
+ priv->flags |= CRB_FL_CRB_SMC_START;
+ }
+
rc = crb_map_io(device, priv, buf);
if (rc)
return rc;
--
Jiandi An
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc.
Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v3 2/2] tpm/tpm_crb: Enable TPM CRB interface for ARM64
[not found] ` <1489794193-17233-3-git-send-email-anjiandi-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
@ 2017-03-22 6:12 ` Jarkko Sakkinen
[not found] ` <20170322061241.j7avdfpnehcbjg6j-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
0 siblings, 1 reply; 6+ messages in thread
From: Jarkko Sakkinen @ 2017-03-22 6:12 UTC (permalink / raw)
To: Jiandi An
Cc: rafael.j.wysocki-ral2JQCrhuEAvxtiuMwx3w,
robert.moore-ral2JQCrhuEAvxtiuMwx3w,
tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
lv.zheng-ral2JQCrhuEAvxtiuMwx3w, lenb-DgEjT+Ai2ygdnm+yROfE0A
On Fri, Mar 17, 2017 at 06:43:13PM -0500, Jiandi An wrote:
> This enables TPM Command Response Buffer interface driver for
> ARM64 and implements an ARM specific TPM CRB start method that
> invokes a Secure Monitor Call (SMC) to request the TrustZone
> Firmware to execute or cancel a TPM 2.0 command.
>
> In ARM, TrustZone security extensions enable a secure software
> environment with Secure Monitor mode. A Secure Monitor Call
> (SMC) is used to enter the Secure Monitor mode and perform a
> Secure Monitor service to communicate with TrustZone firmware
> which has control over the TPM hardware.
>
> Signed-off-by: Jiandi An <anjiandi-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
Does not compile.
/Jarkko
> ---
> drivers/char/tpm/Kconfig | 2 +-
> drivers/char/tpm/tpm_crb.c | 64 ++++++++++++++++++++++++++++++++++++++++++++--
> 2 files changed, 63 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
> index d520ac5..a3035220 100644
> --- a/drivers/char/tpm/Kconfig
> +++ b/drivers/char/tpm/Kconfig
> @@ -136,7 +136,7 @@ config TCG_XEN
>
> config TCG_CRB
> tristate "TPM 2.0 CRB Interface"
> - depends on X86 && ACPI
> + depends on ACPI
> ---help---
> If you have a TPM security chip that is compliant with the
> TCG CRB 2.0 TPM specification say Yes and it will be accessible
> diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
> index cb6fb13..f8a5470 100644
> --- a/drivers/char/tpm/tpm_crb.c
> +++ b/drivers/char/tpm/tpm_crb.c
> @@ -20,6 +20,9 @@
> #include <linux/rculist.h>
> #include <linux/module.h>
> #include <linux/pm_runtime.h>
> +#ifdef CONFIG_ARM64
> +#include <linux/arm-smccc.h>
> +#endif
> #include "tpm.h"
>
> #define ACPI_SIG_TPM2 "TPM2"
> @@ -73,6 +76,7 @@ enum crb_status {
> enum crb_flags {
> CRB_FL_ACPI_START = BIT(0),
> CRB_FL_CRB_START = BIT(1),
> + CRB_FL_CRB_SMC_START = BIT(2),
> };
>
> struct crb_priv {
> @@ -82,6 +86,15 @@ struct crb_priv {
> u8 __iomem *cmd;
> u8 __iomem *rsp;
> u32 cmd_size;
> + u32 smc_func_id;
> +};
> +
> +struct tpm2_crb_smc {
> + u32 interrupt;
> + u8 interrupt_flags;
> + u8 op_flags;
> + u16 reserved2;
> + u32 smc_func_id;
> };
>
> /**
> @@ -101,7 +114,8 @@ struct crb_priv {
> */
> static int __maybe_unused crb_go_idle(struct device *dev, struct crb_priv *priv)
> {
> - if (priv->flags & CRB_FL_ACPI_START)
> + if ((priv->flags & CRB_FL_ACPI_START) ||
> + (priv->flags & CRB_FL_CRB_SMC_START))
> return 0;
>
> iowrite32(CRB_CTRL_REQ_GO_IDLE, &priv->cca->req);
> @@ -129,7 +143,8 @@ static int __maybe_unused crb_cmd_ready(struct device *dev,
> {
> ktime_t stop, start;
>
> - if (priv->flags & CRB_FL_ACPI_START)
> + if ((priv->flags & CRB_FL_ACPI_START) ||
> + (priv->flags & CRB_FL_CRB_SMC_START))
> return 0;
>
> iowrite32(CRB_CTRL_REQ_CMD_READY, &priv->cca->req);
> @@ -202,6 +217,33 @@ static int crb_do_acpi_start(struct tpm_chip *chip)
> return rc;
> }
>
> +#ifdef CONFIG_ARM64
> +/*
> + * This is a TPM Command Response Buffer start method that invokes a
> + * Secure Monitor Call to requrest the firmware to execute or cancel
> + * a TPM 2.0 command.
> + */
> +static inline int tpm_crb_smc_start(struct device *dev, unsigned long func_id)
> +{
> + struct arm_smccc_res res;
> +
> + arm_smccc_smc(func_id, 0, 0, 0, 0, 0, 0, 0, &res);
> + if (res.a0 != 0) {
> + dev_err(dev, FW_BUG "tpm_crb_smc_start() returns res.a0 = 0x%lx\n",
> + res.a0);
> + return -EIO;
> + }
> +
> + return 0;
> +}
> +#else
> +static inline int tpm_crb_smc_start(struct device *dev, unsigned long func_id)
> +{
> + dev_err(dev, FW_BUG "tpm_crb: incorrect start method\n");
> + return -EINVAL;
> +}
> +#endif
> +
> static int crb_send(struct tpm_chip *chip, u8 *buf, size_t len)
> {
> struct crb_priv *priv = dev_get_drvdata(&chip->dev);
> @@ -229,6 +271,11 @@ static int crb_send(struct tpm_chip *chip, u8 *buf, size_t len)
> if (priv->flags & CRB_FL_ACPI_START)
> rc = crb_do_acpi_start(chip);
>
> + if (priv->flags & CRB_FL_CRB_SMC_START) {
> + iowrite32(CRB_START_INVOKE, &priv->cca->start);
> + rc = tpm_crb_smc_start(&chip->dev, priv->smc_func_id);
> + }
> +
> return rc;
> }
>
> @@ -409,6 +456,7 @@ static int crb_acpi_add(struct acpi_device *device)
> struct crb_priv *priv;
> struct tpm_chip *chip;
> struct device *dev = &device->dev;
> + struct tpm2_crb_smc *crb_smc;
> acpi_status status;
> u32 sm;
> int rc;
> @@ -441,6 +489,18 @@ static int crb_acpi_add(struct acpi_device *device)
> sm == ACPI_TPM2_COMMAND_BUFFER_WITH_START_METHOD)
> priv->flags |= CRB_FL_ACPI_START;
>
> + if (sm == ACPI_TPM2_COMMAND_BUFFER_WITH_SMC) {
> + if (buf->header.length < (sizeof(*buf) + sizeof(*crb_smc))) {
> + dev_err(dev, FW_BUG "TPM2 ACPI table has wrong size %u for start method type %d\n",
> + buf->header.length, ACPI_TPM2_COMMAND_BUFFER_WITH_SMC);
> + return -EINVAL;
> + }
> + crb_smc = (struct tpm2_crb_smc *) (((u8 *) buf) +
> + ACPI_TPM2_START_METHOD_PARAMETER_OFFSET);
> + priv->smc_func_id = crb_smc->smc_func_id;
> + priv->flags |= CRB_FL_CRB_SMC_START;
> + }
> +
> rc = crb_map_io(device, priv, buf);
> if (rc)
> return rc;
> --
> Jiandi An
> Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc.
> Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
>
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 2/2] tpm/tpm_crb: Enable TPM CRB interface for ARM64
[not found] ` <20170322061241.j7avdfpnehcbjg6j-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
@ 2017-03-23 23:28 ` Jiandi An
[not found] ` <58D45A2F.7030505-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
0 siblings, 1 reply; 6+ messages in thread
From: Jiandi An @ 2017-03-23 23:28 UTC (permalink / raw)
To: Jarkko Sakkinen
Cc: rafael.j.wysocki-ral2JQCrhuEAvxtiuMwx3w,
robert.moore-ral2JQCrhuEAvxtiuMwx3w,
tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
lv.zheng-ral2JQCrhuEAvxtiuMwx3w, lenb-DgEjT+Ai2ygdnm+yROfE0A
On 03/22/17 01:12, Jarkko Sakkinen wrote:
> On Fri, Mar 17, 2017 at 06:43:13PM -0500, Jiandi An wrote:
>> This enables TPM Command Response Buffer interface driver for
>> ARM64 and implements an ARM specific TPM CRB start method that
>> invokes a Secure Monitor Call (SMC) to request the TrustZone
>> Firmware to execute or cancel a TPM 2.0 command.
>>
>> In ARM, TrustZone security extensions enable a secure software
>> environment with Secure Monitor mode. A Secure Monitor Call
>> (SMC) is used to enter the Secure Monitor mode and perform a
>> Secure Monitor service to communicate with TrustZone firmware
>> which has control over the TPM hardware.
>>
>> Signed-off-by: Jiandi An <anjiandi-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
>
> Does not compile.
>
> /Jarkko
I appologize for this. I see control area structure has
recently changed. I'll ensure to rebase to your latest in v4.
- Jiandi
>
>> ---
>> drivers/char/tpm/Kconfig | 2 +-
>> drivers/char/tpm/tpm_crb.c | 64 ++++++++++++++++++++++++++++++++++++++++++++--
>> 2 files changed, 63 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
>> index d520ac5..a3035220 100644
>> --- a/drivers/char/tpm/Kconfig
>> +++ b/drivers/char/tpm/Kconfig
>> @@ -136,7 +136,7 @@ config TCG_XEN
>>
>> config TCG_CRB
>> tristate "TPM 2.0 CRB Interface"
>> - depends on X86 && ACPI
>> + depends on ACPI
>> ---help---
>> If you have a TPM security chip that is compliant with the
>> TCG CRB 2.0 TPM specification say Yes and it will be accessible
>> diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
>> index cb6fb13..f8a5470 100644
>> --- a/drivers/char/tpm/tpm_crb.c
>> +++ b/drivers/char/tpm/tpm_crb.c
>> @@ -20,6 +20,9 @@
>> #include <linux/rculist.h>
>> #include <linux/module.h>
>> #include <linux/pm_runtime.h>
>> +#ifdef CONFIG_ARM64
>> +#include <linux/arm-smccc.h>
>> +#endif
>> #include "tpm.h"
>>
>> #define ACPI_SIG_TPM2 "TPM2"
>> @@ -73,6 +76,7 @@ enum crb_status {
>> enum crb_flags {
>> CRB_FL_ACPI_START = BIT(0),
>> CRB_FL_CRB_START = BIT(1),
>> + CRB_FL_CRB_SMC_START = BIT(2),
>> };
>>
>> struct crb_priv {
>> @@ -82,6 +86,15 @@ struct crb_priv {
>> u8 __iomem *cmd;
>> u8 __iomem *rsp;
>> u32 cmd_size;
>> + u32 smc_func_id;
>> +};
>> +
>> +struct tpm2_crb_smc {
>> + u32 interrupt;
>> + u8 interrupt_flags;
>> + u8 op_flags;
>> + u16 reserved2;
>> + u32 smc_func_id;
>> };
>>
>> /**
>> @@ -101,7 +114,8 @@ struct crb_priv {
>> */
>> static int __maybe_unused crb_go_idle(struct device *dev, struct crb_priv *priv)
>> {
>> - if (priv->flags & CRB_FL_ACPI_START)
>> + if ((priv->flags & CRB_FL_ACPI_START) ||
>> + (priv->flags & CRB_FL_CRB_SMC_START))
>> return 0;
>>
>> iowrite32(CRB_CTRL_REQ_GO_IDLE, &priv->cca->req);
>> @@ -129,7 +143,8 @@ static int __maybe_unused crb_cmd_ready(struct device *dev,
>> {
>> ktime_t stop, start;
>>
>> - if (priv->flags & CRB_FL_ACPI_START)
>> + if ((priv->flags & CRB_FL_ACPI_START) ||
>> + (priv->flags & CRB_FL_CRB_SMC_START))
>> return 0;
>>
>> iowrite32(CRB_CTRL_REQ_CMD_READY, &priv->cca->req);
>> @@ -202,6 +217,33 @@ static int crb_do_acpi_start(struct tpm_chip *chip)
>> return rc;
>> }
>>
>> +#ifdef CONFIG_ARM64
>> +/*
>> + * This is a TPM Command Response Buffer start method that invokes a
>> + * Secure Monitor Call to requrest the firmware to execute or cancel
>> + * a TPM 2.0 command.
>> + */
>> +static inline int tpm_crb_smc_start(struct device *dev, unsigned long func_id)
>> +{
>> + struct arm_smccc_res res;
>> +
>> + arm_smccc_smc(func_id, 0, 0, 0, 0, 0, 0, 0, &res);
>> + if (res.a0 != 0) {
>> + dev_err(dev, FW_BUG "tpm_crb_smc_start() returns res.a0 = 0x%lx\n",
>> + res.a0);
>> + return -EIO;
>> + }
>> +
>> + return 0;
>> +}
>> +#else
>> +static inline int tpm_crb_smc_start(struct device *dev, unsigned long func_id)
>> +{
>> + dev_err(dev, FW_BUG "tpm_crb: incorrect start method\n");
>> + return -EINVAL;
>> +}
>> +#endif
>> +
>> static int crb_send(struct tpm_chip *chip, u8 *buf, size_t len)
>> {
>> struct crb_priv *priv = dev_get_drvdata(&chip->dev);
>> @@ -229,6 +271,11 @@ static int crb_send(struct tpm_chip *chip, u8 *buf, size_t len)
>> if (priv->flags & CRB_FL_ACPI_START)
>> rc = crb_do_acpi_start(chip);
>>
>> + if (priv->flags & CRB_FL_CRB_SMC_START) {
>> + iowrite32(CRB_START_INVOKE, &priv->cca->start);
>> + rc = tpm_crb_smc_start(&chip->dev, priv->smc_func_id);
>> + }
>> +
>> return rc;
>> }
>>
>> @@ -409,6 +456,7 @@ static int crb_acpi_add(struct acpi_device *device)
>> struct crb_priv *priv;
>> struct tpm_chip *chip;
>> struct device *dev = &device->dev;
>> + struct tpm2_crb_smc *crb_smc;
>> acpi_status status;
>> u32 sm;
>> int rc;
>> @@ -441,6 +489,18 @@ static int crb_acpi_add(struct acpi_device *device)
>> sm == ACPI_TPM2_COMMAND_BUFFER_WITH_START_METHOD)
>> priv->flags |= CRB_FL_ACPI_START;
>>
>> + if (sm == ACPI_TPM2_COMMAND_BUFFER_WITH_SMC) {
>> + if (buf->header.length < (sizeof(*buf) + sizeof(*crb_smc))) {
>> + dev_err(dev, FW_BUG "TPM2 ACPI table has wrong size %u for start method type %d\n",
>> + buf->header.length, ACPI_TPM2_COMMAND_BUFFER_WITH_SMC);
>> + return -EINVAL;
>> + }
>> + crb_smc = (struct tpm2_crb_smc *) (((u8 *) buf) +
>> + ACPI_TPM2_START_METHOD_PARAMETER_OFFSET);
>> + priv->smc_func_id = crb_smc->smc_func_id;
>> + priv->flags |= CRB_FL_CRB_SMC_START;
>> + }
>> +
>> rc = crb_map_io(device, priv, buf);
>> if (rc)
>> return rc;
>> --
>> Jiandi An
>> Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc.
>> Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
>>
--
Jiandi An
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm
Technologies, Inc.
Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a
Linux Foundation Collaborative Project.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 2/2] tpm/tpm_crb: Enable TPM CRB interface for ARM64
[not found] ` <58D45A2F.7030505-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
@ 2017-03-24 10:17 ` Jarkko Sakkinen
0 siblings, 0 replies; 6+ messages in thread
From: Jarkko Sakkinen @ 2017-03-24 10:17 UTC (permalink / raw)
To: Jiandi An
Cc: rafael.j.wysocki-ral2JQCrhuEAvxtiuMwx3w,
robert.moore-ral2JQCrhuEAvxtiuMwx3w,
tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
lv.zheng-ral2JQCrhuEAvxtiuMwx3w, lenb-DgEjT+Ai2ygdnm+yROfE0A
On Thu, Mar 23, 2017 at 06:28:47PM -0500, Jiandi An wrote:
> On 03/22/17 01:12, Jarkko Sakkinen wrote:
> > On Fri, Mar 17, 2017 at 06:43:13PM -0500, Jiandi An wrote:
> > > This enables TPM Command Response Buffer interface driver for
> > > ARM64 and implements an ARM specific TPM CRB start method that
> > > invokes a Secure Monitor Call (SMC) to request the TrustZone
> > > Firmware to execute or cancel a TPM 2.0 command.
> > >
> > > In ARM, TrustZone security extensions enable a secure software
> > > environment with Secure Monitor mode. A Secure Monitor Call
> > > (SMC) is used to enter the Secure Monitor mode and perform a
> > > Secure Monitor service to communicate with TrustZone firmware
> > > which has control over the TPM hardware.
> > >
> > > Signed-off-by: Jiandi An <anjiandi-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
> >
> > Does not compile.
> >
> > /Jarkko
>
> I appologize for this. I see control area structure has
> recently changed. I'll ensure to rebase to your latest in v4.
>
> - Jiandi
No need for apologies, just remember to always rebase just before
you git send-email.
/Jarkko
>
> >
> > > ---
> > > drivers/char/tpm/Kconfig | 2 +-
> > > drivers/char/tpm/tpm_crb.c | 64 ++++++++++++++++++++++++++++++++++++++++++++--
> > > 2 files changed, 63 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
> > > index d520ac5..a3035220 100644
> > > --- a/drivers/char/tpm/Kconfig
> > > +++ b/drivers/char/tpm/Kconfig
> > > @@ -136,7 +136,7 @@ config TCG_XEN
> > >
> > > config TCG_CRB
> > > tristate "TPM 2.0 CRB Interface"
> > > - depends on X86 && ACPI
> > > + depends on ACPI
> > > ---help---
> > > If you have a TPM security chip that is compliant with the
> > > TCG CRB 2.0 TPM specification say Yes and it will be accessible
> > > diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
> > > index cb6fb13..f8a5470 100644
> > > --- a/drivers/char/tpm/tpm_crb.c
> > > +++ b/drivers/char/tpm/tpm_crb.c
> > > @@ -20,6 +20,9 @@
> > > #include <linux/rculist.h>
> > > #include <linux/module.h>
> > > #include <linux/pm_runtime.h>
> > > +#ifdef CONFIG_ARM64
> > > +#include <linux/arm-smccc.h>
> > > +#endif
> > > #include "tpm.h"
> > >
> > > #define ACPI_SIG_TPM2 "TPM2"
> > > @@ -73,6 +76,7 @@ enum crb_status {
> > > enum crb_flags {
> > > CRB_FL_ACPI_START = BIT(0),
> > > CRB_FL_CRB_START = BIT(1),
> > > + CRB_FL_CRB_SMC_START = BIT(2),
> > > };
> > >
> > > struct crb_priv {
> > > @@ -82,6 +86,15 @@ struct crb_priv {
> > > u8 __iomem *cmd;
> > > u8 __iomem *rsp;
> > > u32 cmd_size;
> > > + u32 smc_func_id;
> > > +};
> > > +
> > > +struct tpm2_crb_smc {
> > > + u32 interrupt;
> > > + u8 interrupt_flags;
> > > + u8 op_flags;
> > > + u16 reserved2;
> > > + u32 smc_func_id;
> > > };
> > >
> > > /**
> > > @@ -101,7 +114,8 @@ struct crb_priv {
> > > */
> > > static int __maybe_unused crb_go_idle(struct device *dev, struct crb_priv *priv)
> > > {
> > > - if (priv->flags & CRB_FL_ACPI_START)
> > > + if ((priv->flags & CRB_FL_ACPI_START) ||
> > > + (priv->flags & CRB_FL_CRB_SMC_START))
> > > return 0;
> > >
> > > iowrite32(CRB_CTRL_REQ_GO_IDLE, &priv->cca->req);
> > > @@ -129,7 +143,8 @@ static int __maybe_unused crb_cmd_ready(struct device *dev,
> > > {
> > > ktime_t stop, start;
> > >
> > > - if (priv->flags & CRB_FL_ACPI_START)
> > > + if ((priv->flags & CRB_FL_ACPI_START) ||
> > > + (priv->flags & CRB_FL_CRB_SMC_START))
> > > return 0;
> > >
> > > iowrite32(CRB_CTRL_REQ_CMD_READY, &priv->cca->req);
> > > @@ -202,6 +217,33 @@ static int crb_do_acpi_start(struct tpm_chip *chip)
> > > return rc;
> > > }
> > >
> > > +#ifdef CONFIG_ARM64
> > > +/*
> > > + * This is a TPM Command Response Buffer start method that invokes a
> > > + * Secure Monitor Call to requrest the firmware to execute or cancel
> > > + * a TPM 2.0 command.
> > > + */
> > > +static inline int tpm_crb_smc_start(struct device *dev, unsigned long func_id)
> > > +{
> > > + struct arm_smccc_res res;
> > > +
> > > + arm_smccc_smc(func_id, 0, 0, 0, 0, 0, 0, 0, &res);
> > > + if (res.a0 != 0) {
> > > + dev_err(dev, FW_BUG "tpm_crb_smc_start() returns res.a0 = 0x%lx\n",
> > > + res.a0);
> > > + return -EIO;
> > > + }
> > > +
> > > + return 0;
> > > +}
> > > +#else
> > > +static inline int tpm_crb_smc_start(struct device *dev, unsigned long func_id)
> > > +{
> > > + dev_err(dev, FW_BUG "tpm_crb: incorrect start method\n");
> > > + return -EINVAL;
> > > +}
> > > +#endif
> > > +
> > > static int crb_send(struct tpm_chip *chip, u8 *buf, size_t len)
> > > {
> > > struct crb_priv *priv = dev_get_drvdata(&chip->dev);
> > > @@ -229,6 +271,11 @@ static int crb_send(struct tpm_chip *chip, u8 *buf, size_t len)
> > > if (priv->flags & CRB_FL_ACPI_START)
> > > rc = crb_do_acpi_start(chip);
> > >
> > > + if (priv->flags & CRB_FL_CRB_SMC_START) {
> > > + iowrite32(CRB_START_INVOKE, &priv->cca->start);
> > > + rc = tpm_crb_smc_start(&chip->dev, priv->smc_func_id);
> > > + }
> > > +
> > > return rc;
> > > }
> > >
> > > @@ -409,6 +456,7 @@ static int crb_acpi_add(struct acpi_device *device)
> > > struct crb_priv *priv;
> > > struct tpm_chip *chip;
> > > struct device *dev = &device->dev;
> > > + struct tpm2_crb_smc *crb_smc;
> > > acpi_status status;
> > > u32 sm;
> > > int rc;
> > > @@ -441,6 +489,18 @@ static int crb_acpi_add(struct acpi_device *device)
> > > sm == ACPI_TPM2_COMMAND_BUFFER_WITH_START_METHOD)
> > > priv->flags |= CRB_FL_ACPI_START;
> > >
> > > + if (sm == ACPI_TPM2_COMMAND_BUFFER_WITH_SMC) {
> > > + if (buf->header.length < (sizeof(*buf) + sizeof(*crb_smc))) {
> > > + dev_err(dev, FW_BUG "TPM2 ACPI table has wrong size %u for start method type %d\n",
> > > + buf->header.length, ACPI_TPM2_COMMAND_BUFFER_WITH_SMC);
> > > + return -EINVAL;
> > > + }
> > > + crb_smc = (struct tpm2_crb_smc *) (((u8 *) buf) +
> > > + ACPI_TPM2_START_METHOD_PARAMETER_OFFSET);
> > > + priv->smc_func_id = crb_smc->smc_func_id;
> > > + priv->flags |= CRB_FL_CRB_SMC_START;
> > > + }
> > > +
> > > rc = crb_map_io(device, priv, buf);
> > > if (rc)
> > > return rc;
> > > --
> > > Jiandi An
> > > Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc.
> > > Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
> > >
>
>
> --
> Jiandi An
> Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm
> Technologies, Inc.
> Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a
> Linux Foundation Collaborative Project.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-03-24 10:17 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-17 23:43 [PATCH v3 0/2] tpm/tpm_crb: Enable TPM CRB interface for ARM64 Jiandi An
[not found] ` <1489794193-17233-1-git-send-email-anjiandi-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2017-03-17 23:43 ` [PATCH v3 1/2] ACPICA: Update TPM2 ACPI table Jiandi An
2017-03-17 23:43 ` [PATCH v3 2/2] tpm/tpm_crb: Enable TPM CRB interface for ARM64 Jiandi An
[not found] ` <1489794193-17233-3-git-send-email-anjiandi-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2017-03-22 6:12 ` Jarkko Sakkinen
[not found] ` <20170322061241.j7avdfpnehcbjg6j-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2017-03-23 23:28 ` Jiandi An
[not found] ` <58D45A2F.7030505-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2017-03-24 10:17 ` Jarkko Sakkinen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.