From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ilias Apalodimas Date: Mon, 25 Jan 2021 10:33:27 +0200 Subject: [PATCH v3 06/11] tpm: Add a basic API implementation for TPMv2 In-Reply-To: <20210123172607.2879600-6-sjg@chromium.org> References: <20210123172607.2879600-1-sjg@chromium.org> <20210123172607.2879600-6-sjg@chromium.org> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Sat, Jan 23, 2021 at 10:26:02AM -0700, Simon Glass wrote: > Add support for TPMv2 versions of API functions. So far this is not > complete as the standard is quite large, but it implements everything > currently available for TPMv2 in U-Boot. > > Signed-off-by: Simon Glass > --- > > (no changes since v1) > > lib/tpm_api.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++----- > 1 file changed, 77 insertions(+), 7 deletions(-) > > diff --git a/lib/tpm_api.c b/lib/tpm_api.c > index 758350bd18d..f1553512cc5 100644 > --- a/lib/tpm_api.c > +++ b/lib/tpm_api.c > @@ -16,18 +16,41 @@ static bool is_tpm1(struct udevice *dev) > return IS_ENABLED(CONFIG_TPM_V1) && tpm_get_version(dev) == TPM_V1; > } > > +static bool is_tpm2(struct udevice *dev) > +{ > + return IS_ENABLED(CONFIG_TPM_V2) && tpm_get_version(dev) == TPM_V2; > +} > + > u32 tpm_startup(struct udevice *dev, enum tpm_startup_type mode) > { > - if (is_tpm1(dev)) > + if (is_tpm1(dev)) { > return tpm1_startup(dev, mode); > - else > + } else if (is_tpm2(dev)) { > + enum tpm2_startup_types type; > + > + switch (mode) { > + case TPM_ST_CLEAR: > + type = TPM2_SU_CLEAR; > + break; > + case TPM_ST_STATE: > + type = TPM2_SU_STATE; > + break; > + default: > + case TPM_ST_DEACTIVATED: > + return -EINVAL; > + } > + return tpm2_startup(dev, type); > + } else { > return -ENOSYS; > + } > } > > u32 tpm_resume(struct udevice *dev) > { > if (is_tpm1(dev)) > return tpm1_startup(dev, TPM_ST_STATE); > + else if (is_tpm2(dev)) > + return tpm2_startup(dev, TPM2_SU_STATE); > else > return -ENOSYS; > } > @@ -36,6 +59,8 @@ u32 tpm_self_test_full(struct udevice *dev) > { > if (is_tpm1(dev)) > return tpm1_self_test_full(dev); > + else if (is_tpm2(dev)) > + return tpm2_self_test(dev, TPMI_YES); > else > return -ENOSYS; > } > @@ -44,6 +69,8 @@ u32 tpm_continue_self_test(struct udevice *dev) > { > if (is_tpm1(dev)) > return tpm1_continue_self_test(dev); > + else if (is_tpm2(dev)) > + return tpm2_self_test(dev, TPMI_NO); > else > return -ENOSYS; > } > @@ -71,8 +98,6 @@ u32 tpm_clear_and_reenable(struct udevice *dev) > log_err("TPM: Can't set deactivated state\n"); > return ret; > } > - } else { > - return -ENOSYS; > } > > return TPM_SUCCESS; > @@ -82,6 +107,8 @@ u32 tpm_nv_enable_locking(struct udevice *dev) > { > if (is_tpm1(dev)) > return tpm1_nv_define_space(dev, TPM_NV_INDEX_LOCK, 0, 0); > + else if (is_tpm2(dev)) > + return -ENOSYS; > else > return -ENOSYS; > } > @@ -90,6 +117,8 @@ u32 tpm_nv_read_value(struct udevice *dev, u32 index, void *data, u32 count) > { > if (is_tpm1(dev)) > return tpm1_nv_read_value(dev, index, data, count); > + else if (is_tpm2(dev)) > + return -ENOSYS; > else > return -ENOSYS; > } > @@ -99,6 +128,8 @@ u32 tpm_nv_write_value(struct udevice *dev, u32 index, const void *data, > { > if (is_tpm1(dev)) > return tpm1_nv_write_value(dev, index, data, count); > + else if (is_tpm2(dev)) > + return -ENOSYS; > else > return -ENOSYS; > } > @@ -112,6 +143,8 @@ u32 tpm_write_lock(struct udevice *dev, u32 index) > { > if (is_tpm1(dev)) > return -ENOSYS; > + else if (is_tpm2(dev)) > + return -ENOSYS; > else > return -ENOSYS; > } > @@ -121,6 +154,9 @@ u32 tpm_pcr_extend(struct udevice *dev, u32 index, const void *in_digest, > { > if (is_tpm1(dev)) > return tpm1_extend(dev, index, in_digest, out_digest); > + else if (is_tpm2(dev)) > + return tpm2_pcr_extend(dev, index, TPM2_ALG_SHA256, in_digest, > + TPM2_DIGEST_LEN); > else > return -ENOSYS; > } > @@ -129,6 +165,8 @@ u32 tpm_pcr_read(struct udevice *dev, u32 index, void *data, size_t count) > { > if (is_tpm1(dev)) > return tpm1_pcr_read(dev, index, data, count); > + else if (is_tpm2(dev)) > + return -ENOSYS; > else > return -ENOSYS; > } > @@ -137,6 +175,13 @@ u32 tpm_tsc_physical_presence(struct udevice *dev, u16 presence) > { > if (is_tpm1(dev)) > return tpm1_tsc_physical_presence(dev, presence); > + > + /* > + * Nothing to do on TPM2 for this; use platform hierarchy availability > + * instead. > + */ > + else if (is_tpm2(dev)) > + return 0; > else > return -ENOSYS; > } > @@ -145,6 +190,10 @@ u32 tpm_finalise_physical_presence(struct udevice *dev) > { > if (is_tpm1(dev)) > return tpm1_finalise_physical_presence(dev); > + > + /* Nothing needs to be done with tpm2 */ > + else if (is_tpm2(dev)) > + return 0; > else > return -ENOSYS; > } > @@ -153,14 +202,18 @@ u32 tpm_read_pubek(struct udevice *dev, void *data, size_t count) > { > if (is_tpm1(dev)) > return tpm1_read_pubek(dev, data, count); > - else > + else if (is_tpm2(dev)) > return -ENOSYS; /* not implemented yet */ > + else > + return -ENOSYS; > } > > u32 tpm_force_clear(struct udevice *dev) > { > if (is_tpm1(dev)) > return tpm1_force_clear(dev); > + else if (is_tpm2(dev)) > + return tpm2_clear(dev, TPM2_RH_PLATFORM, NULL, 0); > else > return -ENOSYS; > } > @@ -169,6 +222,10 @@ u32 tpm_physical_enable(struct udevice *dev) > { > if (is_tpm1(dev)) > return tpm1_physical_enable(dev); > + > + /* Nothing needs to be done with tpm2 */ > + else if (is_tpm2(dev)) > + return 0; > else > return -ENOSYS; > } > @@ -177,6 +234,10 @@ u32 tpm_physical_disable(struct udevice *dev) > { > if (is_tpm1(dev)) > return tpm1_physical_disable(dev); > + > + /* Nothing needs to be done with tpm2 */ > + else if (is_tpm2(dev)) > + return 0; > else > return -ENOSYS; > } > @@ -185,6 +246,9 @@ u32 tpm_physical_set_deactivated(struct udevice *dev, u8 state) > { > if (is_tpm1(dev)) > return tpm1_physical_set_deactivated(dev, state); > + /* Nothing needs to be done with tpm2 */ > + else if (is_tpm2(dev)) > + return 0; > else > return -ENOSYS; > } > @@ -194,6 +258,8 @@ u32 tpm_get_capability(struct udevice *dev, u32 cap_area, u32 sub_cap, > { > if (is_tpm1(dev)) > return tpm1_get_capability(dev, cap_area, sub_cap, cap, count); > + else if (is_tpm2(dev)) > + return tpm2_get_capability(dev, cap_area, sub_cap, cap, count); > else > return -ENOSYS; > } > @@ -202,14 +268,18 @@ u32 tpm_get_permissions(struct udevice *dev, u32 index, u32 *perm) > { > if (is_tpm1(dev)) > return tpm1_get_permissions(dev, index, perm); > - else > + else if (is_tpm2(dev)) > return -ENOSYS; /* not implemented yet */ > + else > + return -ENOSYS; > } > > u32 tpm_get_random(struct udevice *dev, void *data, u32 count) > { > if (is_tpm1(dev)) > return tpm1_get_random(dev, data, count); > - else > + else if (is_tpm2(dev)) > return -ENOSYS; /* not implemented yet */ > + else > + return -ENOSYS; > } > -- > 2.30.0.280.ga3ce27912f-goog > Acked-by: Ilias Apalodimas