sandbox: tpm: Support the define-space command

Add support for this command, moving away from the previous approach of
hard-coding the initial data in the driver, now that the kernel-space data
has to be set up by the higher-level vboot code.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/tpm/sandbox_common.c b/drivers/tpm/sandbox_common.c
index 13f5e030a5f57096f591a21e6abb353b92da5780..7e0b2502e35da3de02db0823efee686dc6a807d1 100644 (file)
--- a/drivers/tpm/sandbox_common.c
+++ b/drivers/tpm/sandbox_common.c
@@ -64,3 +64,14 @@ void sb_tpm_write_data(struct nvdata_state nvdata[NV_SEQ_COUNT],
        else
                memcpy(&nvdata[seq].data, buf + data_ofs, length);
 }
+
+void sb_tpm_define_data(struct nvdata_state nvdata[NV_SEQ_COUNT],
+                       enum sandbox_nv_space seq, int length)
+{
+       struct nvdata_state *nvd = &nvdata[seq];
+
+       if (length > NV_DATA_SIZE)
+               log_err("Invalid length %x (max %x)\n", length, NV_DATA_SIZE);
+       nvd->length = length;
+       nvd->present = true;
+}

diff --git a/drivers/tpm/sandbox_common.h b/drivers/tpm/sandbox_common.h
index aa5292d79450a0022ecd39a49200015784392518..e822a200fd3fa3d42cbbd8b4b0f025c4b29521f8 100644 (file)
--- a/drivers/tpm/sandbox_common.h
+++ b/drivers/tpm/sandbox_common.h
@@ -93,4 +93,16 @@ void sb_tpm_write_data(struct nvdata_state nvdata[NV_SEQ_COUNT],
                       enum sandbox_nv_space seq, const u8 *buf, int data_ofs,
                       int length);
 
+/**
+ * sb_tpm_define_data() - Set up non-volatile data
+ *
+ * If @length is too large, an error is logged and nothing is written.
+ *
+ * @nvdata: Current nvdata state
+ * @seq: Sequence number to set up
+ * @length: Length of space in bytes
+ */
+void sb_tpm_define_data(struct nvdata_state nvdata[NV_SEQ_COUNT],
+                       enum sandbox_nv_space seq, int length);
+
 #endif

diff --git a/drivers/tpm/tpm_tis_sandbox.c b/drivers/tpm/tpm_tis_sandbox.c
index f22ed846f0ab8729490df51277abfdb0675a25b6..85b22afa4d9432740d39ac45049aed3adf3059fc 100644 (file)
--- a/drivers/tpm/tpm_tis_sandbox.c
+++ b/drivers/tpm/tpm_tis_sandbox.c
@@ -210,6 +210,17 @@ static int sandbox_tpm_xfer(struct udevice *dev, const uint8_t *sendbuf,
                memset(recvbuf, '\0', *recv_len);
                break;
        case TPM_CMD_NV_DEFINE_SPACE:
+               index = get_unaligned_be32(sendbuf + 12);
+               length = get_unaligned_be32(sendbuf + 77);
+               seq = sb_tpm_index_to_seq(index);
+               if (seq < 0)
+                       return -EINVAL;
+               printf("tpm: define_space index=%#02x, len=%#02x, seq=%#02x\n",
+                      index, length, seq);
+               sb_tpm_define_data(tpm->nvdata, seq, length);
+               *recv_len = 12;
+               memset(recvbuf, '\0', *recv_len);
+               break;
        case 0x15: /* pcr read */
        case 0x5d: /* force clear */
        case 0x6f: /* physical enable */