Prepare v2023.10

[platform/kernel/u-boot.git] / lib / tpm-v2.c

diff --git a/lib/tpm-v2.c b/lib/tpm-v2.c
index 1bf6278..9ab5b46 100644 (file)
--- a/lib/tpm-v2.c
+++ b/lib/tpm-v2.c
@@ -44,6 +44,23 @@ u32 tpm2_self_test(struct udevice *dev, enum tpm2_yes_no full_test)
        return tpm_sendrecv_command(dev, command_v2, NULL, NULL);
 }
 
+u32 tpm2_auto_start(struct udevice *dev)
+{
+       u32 rc;
+
+       rc = tpm2_self_test(dev, TPMI_YES);
+
+       if (rc == TPM2_RC_INITIALIZE) {
+               rc = tpm2_startup(dev, TPM2_SU_CLEAR);
+               if (rc)
+                       return rc;
+
+               rc = tpm2_self_test(dev, TPMI_YES);
+       }
+
+       return rc;
+}
+
 u32 tpm2_clear(struct udevice *dev, u32 handle, const char *pw,
               const ssize_t pw_sz)
 {
@@ -89,14 +106,18 @@ u32 tpm2_nv_define_space(struct udevice *dev, u32 space_index,
         * Calculate the offset of the nv_policy piece by adding each of the
         * chunks below.
         */
-       uint offset = 10 + 8 + 13 + 14;
+       const int platform_len = sizeof(u32);
+       const int session_hdr_len = 13;
+       const int message_len = 14;
+       uint offset = TPM2_HDR_LEN + platform_len + session_hdr_len +
+               message_len;
        u8 command_v2[COMMAND_BUFFER_SIZE] = {
                /* header 10 bytes */
                tpm_u16(TPM2_ST_SESSIONS),      /* TAG */
-               tpm_u32(offset + nv_policy_size),/* Length */
+               tpm_u32(offset + nv_policy_size + 2),/* Length */
                tpm_u32(TPM2_CC_NV_DEFINE_SPACE),/* Command code */
 
-               /* handles 8 bytes */
+               /* handles 4 bytes */
                tpm_u32(TPM2_RH_PLATFORM),      /* Primary platform seed */
 
                /* session header 13 bytes */
@@ -107,12 +128,15 @@ u32 tpm2_nv_define_space(struct udevice *dev, u32 space_index,
                tpm_u16(0),                     /* auth_size */
 
                /* message 14 bytes + policy */
-               tpm_u16(12 + nv_policy_size),   /* size */
+               tpm_u16(message_len + nv_policy_size),  /* size */
                tpm_u32(space_index),
                tpm_u16(TPM2_ALG_SHA256),
                tpm_u32(nv_attributes),
                tpm_u16(nv_policy_size),
-               /* nv_policy */
+               /*
+                * nv_policy
+                * space_size
+                */
        };
        int ret;
 
@@ -120,8 +144,9 @@ u32 tpm2_nv_define_space(struct udevice *dev, u32 space_index,
         * Fill the command structure starting from the first buffer:
         *     - the password (if any)
         */
-       ret = pack_byte_string(command_v2, sizeof(command_v2), "s",
-                              offset, nv_policy, nv_policy_size);
+       ret = pack_byte_string(command_v2, sizeof(command_v2), "sw",
+                              offset, nv_policy, nv_policy_size,
+                              offset + nv_policy_size, space_size);
        if (ret)
                return TPM_LIB_ERROR;
 
@@ -157,6 +182,8 @@ u32 tpm2_pcr_extend(struct udevice *dev, u32 index, u32 algorithm,
        };
        int ret;
 
+       if (!digest)
+               return -EINVAL;
        /*
         * Fill the command structure starting from the first buffer:
         *     - the digest
@@ -669,3 +696,49 @@ u32 tpm2_submit_command(struct udevice *dev, const u8 *sendbuf,
 {
        return tpm_sendrecv_command(dev, sendbuf, recvbuf, recv_size);
 }
+
+u32 tpm2_report_state(struct udevice *dev, uint vendor_cmd, uint vendor_subcmd,
+                     u8 *recvbuf, size_t *recv_size)
+{
+       u8 command_v2[COMMAND_BUFFER_SIZE] = {
+               /* header 10 bytes */
+               tpm_u16(TPM2_ST_NO_SESSIONS),           /* TAG */
+               tpm_u32(10 + 2),                        /* Length */
+               tpm_u32(vendor_cmd),    /* Command code */
+
+               tpm_u16(vendor_subcmd),
+       };
+       int ret;
+
+       ret = tpm_sendrecv_command(dev, command_v2, recvbuf, recv_size);
+       log_debug("ret=%s, %x\n", dev->name, ret);
+       if (ret)
+               return ret;
+       if (*recv_size < 12)
+               return -ENODATA;
+       *recv_size -= 12;
+       memcpy(recvbuf, recvbuf + 12, *recv_size);
+
+       return 0;
+}
+
+u32 tpm2_enable_nvcommits(struct udevice *dev, uint vendor_cmd,
+                         uint vendor_subcmd)
+{
+       u8 command_v2[COMMAND_BUFFER_SIZE] = {
+               /* header 10 bytes */
+               tpm_u16(TPM2_ST_NO_SESSIONS),           /* TAG */
+               tpm_u32(10 + 2),                        /* Length */
+               tpm_u32(vendor_cmd),    /* Command code */
+
+               tpm_u16(vendor_subcmd),
+       };
+       int ret;
+
+       ret = tpm_sendrecv_command(dev, command_v2, NULL, NULL);
+       log_debug("ret=%s, %x\n", dev->name, ret);
+       if (ret)
+               return ret;
+
+       return 0;
+}