mirror of
https://github.com/smaeul/u-boot.git
synced 2025-10-13 20:36:02 +01:00
tpm: Export the TPM-version functions
These functions should really be available outside the TPM code, so that other callers can find out which version the TPM is. Rename them to have a tpm_ prefix() and add them to the header file. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
This commit is contained in:
Simon Glass
Ilias Apalodimas
parent
707b17f64e
commit
5e5937822a
@ -319,4 +319,14 @@ u32 tpm_write_lock(struct udevice *dev, u32 index);
|
||||
*/
|
||||
u32 tpm_resume(struct udevice *dev);
|
||||
|
||||
static inline bool tpm_is_v1(struct udevice *dev)
|
||||
{
|
||||
return IS_ENABLED(CONFIG_TPM_V1) && tpm_get_version(dev) == TPM_V1;
|
||||
}
|
||||
|
||||
static inline bool tpm_is_v2(struct udevice *dev)
|
||||
{
|
||||
return IS_ENABLED(CONFIG_TPM_V2) && tpm_get_version(dev) == TPM_V2;
|
||||
}
|
||||
|
||||
#endif /* __TPM_API_H */
|
||||
|
||||
@ -11,21 +11,11 @@
|
||||
#include <tpm-v2.h>
|
||||
#include <tpm_api.h>
|
||||
|
||||
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 (tpm_is_v1(dev)) {
|
||||
return tpm1_startup(dev, mode);
|
||||
} else if (is_tpm2(dev)) {
|
||||
} else if (tpm_is_v2(dev)) {
|
||||
enum tpm2_startup_types type;
|
||||
|
||||
switch (mode) {
|
||||
@ -47,9 +37,9 @@ u32 tpm_startup(struct udevice *dev, enum tpm_startup_type mode)
|
||||
|
||||
u32 tpm_resume(struct udevice *dev)
|
||||
{
|
||||
if (is_tpm1(dev))
|
||||
if (tpm_is_v1(dev))
|
||||
return tpm1_startup(dev, TPM_ST_STATE);
|
||||
else if (is_tpm2(dev))
|
||||
else if (tpm_is_v2(dev))
|
||||
return tpm2_startup(dev, TPM2_SU_STATE);
|
||||
else
|
||||
return -ENOSYS;
|
||||
@ -57,9 +47,9 @@ u32 tpm_resume(struct udevice *dev)
|
||||
|
||||
u32 tpm_self_test_full(struct udevice *dev)
|
||||
{
|
||||
if (is_tpm1(dev))
|
||||
if (tpm_is_v1(dev))
|
||||
return tpm1_self_test_full(dev);
|
||||
else if (is_tpm2(dev))
|
||||
else if (tpm_is_v2(dev))
|
||||
return tpm2_self_test(dev, TPMI_YES);
|
||||
else
|
||||
return -ENOSYS;
|
||||
@ -67,9 +57,9 @@ u32 tpm_self_test_full(struct udevice *dev)
|
||||
|
||||
u32 tpm_continue_self_test(struct udevice *dev)
|
||||
{
|
||||
if (is_tpm1(dev))
|
||||
if (tpm_is_v1(dev))
|
||||
return tpm1_continue_self_test(dev);
|
||||
else if (is_tpm2(dev))
|
||||
else if (tpm_is_v2(dev))
|
||||
return tpm2_self_test(dev, TPMI_NO);
|
||||
else
|
||||
return -ENOSYS;
|
||||
@ -86,7 +76,7 @@ u32 tpm_clear_and_reenable(struct udevice *dev)
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (is_tpm1(dev)) {
|
||||
if (tpm_is_v1(dev)) {
|
||||
ret = tpm1_physical_enable(dev);
|
||||
if (ret != TPM_SUCCESS) {
|
||||
log_err("TPM: Can't set enabled state\n");
|
||||
@ -105,9 +95,9 @@ u32 tpm_clear_and_reenable(struct udevice *dev)
|
||||
|
||||
u32 tpm_nv_enable_locking(struct udevice *dev)
|
||||
{
|
||||
if (is_tpm1(dev))
|
||||
if (tpm_is_v1(dev))
|
||||
return tpm1_nv_define_space(dev, TPM_NV_INDEX_LOCK, 0, 0);
|
||||
else if (is_tpm2(dev))
|
||||
else if (tpm_is_v2(dev))
|
||||
return -ENOSYS;
|
||||
else
|
||||
return -ENOSYS;
|
||||
@ -115,9 +105,9 @@ u32 tpm_nv_enable_locking(struct udevice *dev)
|
||||
|
||||
u32 tpm_nv_read_value(struct udevice *dev, u32 index, void *data, u32 count)
|
||||
{
|
||||
if (is_tpm1(dev))
|
||||
if (tpm_is_v1(dev))
|
||||
return tpm1_nv_read_value(dev, index, data, count);
|
||||
else if (is_tpm2(dev))
|
||||
else if (tpm_is_v2(dev))
|
||||
return tpm2_nv_read_value(dev, index, data, count);
|
||||
else
|
||||
return -ENOSYS;
|
||||
@ -126,9 +116,9 @@ u32 tpm_nv_read_value(struct udevice *dev, u32 index, void *data, u32 count)
|
||||
u32 tpm_nv_write_value(struct udevice *dev, u32 index, const void *data,
|
||||
u32 count)
|
||||
{
|
||||
if (is_tpm1(dev))
|
||||
if (tpm_is_v1(dev))
|
||||
return tpm1_nv_write_value(dev, index, data, count);
|
||||
else if (is_tpm2(dev))
|
||||
else if (tpm_is_v2(dev))
|
||||
return tpm2_nv_write_value(dev, index, data, count);
|
||||
else
|
||||
return -ENOSYS;
|
||||
@ -141,9 +131,9 @@ u32 tpm_set_global_lock(struct udevice *dev)
|
||||
|
||||
u32 tpm_write_lock(struct udevice *dev, u32 index)
|
||||
{
|
||||
if (is_tpm1(dev))
|
||||
if (tpm_is_v1(dev))
|
||||
return -ENOSYS;
|
||||
else if (is_tpm2(dev))
|
||||
else if (tpm_is_v2(dev))
|
||||
return tpm2_write_lock(dev, index);
|
||||
else
|
||||
return -ENOSYS;
|
||||
@ -152,9 +142,9 @@ u32 tpm_write_lock(struct udevice *dev, u32 index)
|
||||
u32 tpm_pcr_extend(struct udevice *dev, u32 index, const void *in_digest,
|
||||
void *out_digest)
|
||||
{
|
||||
if (is_tpm1(dev))
|
||||
if (tpm_is_v1(dev))
|
||||
return tpm1_extend(dev, index, in_digest, out_digest);
|
||||
else if (is_tpm2(dev))
|
||||
else if (tpm_is_v2(dev))
|
||||
return tpm2_pcr_extend(dev, index, TPM2_ALG_SHA256, in_digest,
|
||||
TPM2_DIGEST_LEN);
|
||||
else
|
||||
@ -163,9 +153,9 @@ u32 tpm_pcr_extend(struct udevice *dev, u32 index, const void *in_digest,
|
||||
|
||||
u32 tpm_pcr_read(struct udevice *dev, u32 index, void *data, size_t count)
|
||||
{
|
||||
if (is_tpm1(dev))
|
||||
if (tpm_is_v1(dev))
|
||||
return tpm1_pcr_read(dev, index, data, count);
|
||||
else if (is_tpm2(dev))
|
||||
else if (tpm_is_v2(dev))
|
||||
return -ENOSYS;
|
||||
else
|
||||
return -ENOSYS;
|
||||
@ -173,14 +163,14 @@ u32 tpm_pcr_read(struct udevice *dev, u32 index, void *data, size_t count)
|
||||
|
||||
u32 tpm_tsc_physical_presence(struct udevice *dev, u16 presence)
|
||||
{
|
||||
if (is_tpm1(dev))
|
||||
if (tpm_is_v1(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))
|
||||
else if (tpm_is_v2(dev))
|
||||
return 0;
|
||||
else
|
||||
return -ENOSYS;
|
||||
@ -188,11 +178,11 @@ u32 tpm_tsc_physical_presence(struct udevice *dev, u16 presence)
|
||||
|
||||
u32 tpm_finalise_physical_presence(struct udevice *dev)
|
||||
{
|
||||
if (is_tpm1(dev))
|
||||
if (tpm_is_v1(dev))
|
||||
return tpm1_finalise_physical_presence(dev);
|
||||
|
||||
/* Nothing needs to be done with tpm2 */
|
||||
else if (is_tpm2(dev))
|
||||
else if (tpm_is_v2(dev))
|
||||
return 0;
|
||||
else
|
||||
return -ENOSYS;
|
||||
@ -200,9 +190,9 @@ u32 tpm_finalise_physical_presence(struct udevice *dev)
|
||||
|
||||
u32 tpm_read_pubek(struct udevice *dev, void *data, size_t count)
|
||||
{
|
||||
if (is_tpm1(dev))
|
||||
if (tpm_is_v1(dev))
|
||||
return tpm1_read_pubek(dev, data, count);
|
||||
else if (is_tpm2(dev))
|
||||
else if (tpm_is_v2(dev))
|
||||
return -ENOSYS; /* not implemented yet */
|
||||
else
|
||||
return -ENOSYS;
|
||||
@ -210,9 +200,9 @@ u32 tpm_read_pubek(struct udevice *dev, void *data, size_t count)
|
||||
|
||||
u32 tpm_force_clear(struct udevice *dev)
|
||||
{
|
||||
if (is_tpm1(dev))
|
||||
if (tpm_is_v1(dev))
|
||||
return tpm1_force_clear(dev);
|
||||
else if (is_tpm2(dev))
|
||||
else if (tpm_is_v2(dev))
|
||||
return tpm2_clear(dev, TPM2_RH_PLATFORM, NULL, 0);
|
||||
else
|
||||
return -ENOSYS;
|
||||
@ -220,11 +210,11 @@ u32 tpm_force_clear(struct udevice *dev)
|
||||
|
||||
u32 tpm_physical_enable(struct udevice *dev)
|
||||
{
|
||||
if (is_tpm1(dev))
|
||||
if (tpm_is_v1(dev))
|
||||
return tpm1_physical_enable(dev);
|
||||
|
||||
/* Nothing needs to be done with tpm2 */
|
||||
else if (is_tpm2(dev))
|
||||
else if (tpm_is_v2(dev))
|
||||
return 0;
|
||||
else
|
||||
return -ENOSYS;
|
||||
@ -232,11 +222,11 @@ u32 tpm_physical_enable(struct udevice *dev)
|
||||
|
||||
u32 tpm_physical_disable(struct udevice *dev)
|
||||
{
|
||||
if (is_tpm1(dev))
|
||||
if (tpm_is_v1(dev))
|
||||
return tpm1_physical_disable(dev);
|
||||
|
||||
/* Nothing needs to be done with tpm2 */
|
||||
else if (is_tpm2(dev))
|
||||
else if (tpm_is_v2(dev))
|
||||
return 0;
|
||||
else
|
||||
return -ENOSYS;
|
||||
@ -244,10 +234,10 @@ u32 tpm_physical_disable(struct udevice *dev)
|
||||
|
||||
u32 tpm_physical_set_deactivated(struct udevice *dev, u8 state)
|
||||
{
|
||||
if (is_tpm1(dev))
|
||||
if (tpm_is_v1(dev))
|
||||
return tpm1_physical_set_deactivated(dev, state);
|
||||
/* Nothing needs to be done with tpm2 */
|
||||
else if (is_tpm2(dev))
|
||||
else if (tpm_is_v2(dev))
|
||||
return 0;
|
||||
else
|
||||
return -ENOSYS;
|
||||
@ -256,9 +246,9 @@ u32 tpm_physical_set_deactivated(struct udevice *dev, u8 state)
|
||||
u32 tpm_get_capability(struct udevice *dev, u32 cap_area, u32 sub_cap,
|
||||
void *cap, size_t count)
|
||||
{
|
||||
if (is_tpm1(dev))
|
||||
if (tpm_is_v1(dev))
|
||||
return tpm1_get_capability(dev, cap_area, sub_cap, cap, count);
|
||||
else if (is_tpm2(dev))
|
||||
else if (tpm_is_v2(dev))
|
||||
return tpm2_get_capability(dev, cap_area, sub_cap, cap, count);
|
||||
else
|
||||
return -ENOSYS;
|
||||
@ -266,9 +256,9 @@ u32 tpm_get_capability(struct udevice *dev, u32 cap_area, u32 sub_cap,
|
||||
|
||||
u32 tpm_get_permissions(struct udevice *dev, u32 index, u32 *perm)
|
||||
{
|
||||
if (is_tpm1(dev))
|
||||
if (tpm_is_v1(dev))
|
||||
return tpm1_get_permissions(dev, index, perm);
|
||||
else if (is_tpm2(dev))
|
||||
else if (tpm_is_v2(dev))
|
||||
return -ENOSYS; /* not implemented yet */
|
||||
else
|
||||
return -ENOSYS;
|
||||
@ -276,9 +266,9 @@ u32 tpm_get_permissions(struct udevice *dev, u32 index, u32 *perm)
|
||||
|
||||
u32 tpm_get_random(struct udevice *dev, void *data, u32 count)
|
||||
{
|
||||
if (is_tpm1(dev))
|
||||
if (tpm_is_v1(dev))
|
||||
return tpm1_get_random(dev, data, count);
|
||||
else if (is_tpm2(dev))
|
||||
else if (tpm_is_v2(dev))
|
||||
return -ENOSYS; /* not implemented yet */
|
||||
else
|
||||
return -ENOSYS;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user