efi_loader: add EFI_TCG2_PROTOCOL.SubmitCommand

This commit adds the EFI_TCG2_PROTOCOL.SubmitCommand
required in the TCG PC Client PFP spec.
SubmitCommand enables to send the raw command to the TPM device.

To implement this api, tpm2_submit_command() is added
into tpm-v2.c.

Signed-off-by: Masahisa Kojima <masahisa.kojima@linaro.org>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>

diff --git a/include/tpm-v2.h b/include/tpm-v2.h
index 13b3db67c60f1dbb59eb201d89fcb622b699556b..947458b0bdfdf018449d67de61f4046baab84f29 100644 (file)
--- a/include/tpm-v2.h
+++ b/include/tpm-v2.h
@@ -641,4 +641,17 @@ u32 tpm2_write_lock(struct udevice *dev, u32 index);
  */
 u32 tpm2_disable_platform_hierarchy(struct udevice *dev);
 
+/**
+ * submit user specified data to the TPM and get response
+ *
+ * @dev                TPM device
+ * @sendbuf:   Buffer of the data to send
+ * @recvbuf:   Buffer to save the response to
+ * @recv_size: Pointer to the size of the response buffer
+ *
+ * @return code of the operation
+ */
+u32 tpm2_submit_command(struct udevice *dev, const u8 *sendbuf,
+                       u8 *recvbuf, size_t *recv_size);
+
 #endif /* __TPM_V2_H */

diff --git a/lib/efi_loader/efi_tcg2.c b/lib/efi_loader/efi_tcg2.c
index 64d3d326795210b4a72b131ddb9fe5490798c0c7..586f73af6d8120efdcb9d1e90f20df655947031b 100644 (file)
--- a/lib/efi_loader/efi_tcg2.c
+++ b/lib/efi_loader/efi_tcg2.c
@@ -1034,13 +1034,39 @@ out:
  * Return:     status code
  */
 static efi_status_t EFIAPI
-efi_tcg2_submit_command(__maybe_unused struct efi_tcg2_protocol *this,
-                       u32 __maybe_unused input_param_block_size,
-                       u8 __maybe_unused *input_param_block,
-                       u32 __maybe_unused output_param_block_size,
-                       u8 __maybe_unused *output_param_block)
+efi_tcg2_submit_command(struct efi_tcg2_protocol *this,
+                       u32 input_param_block_size,
+                       u8 *input_param_block,
+                       u32 output_param_block_size,
+                       u8 *output_param_block)
 {
-       return EFI_UNSUPPORTED;
+       struct udevice *dev;
+       efi_status_t ret;
+       u32 rc;
+       size_t resp_buf_size = output_param_block_size;
+
+       EFI_ENTRY("%p, %u, %p, %u, %p", this, input_param_block_size,
+                 input_param_block, output_param_block_size, output_param_block);
+
+       if (!this || !input_param_block || !input_param_block_size) {
+               ret = EFI_INVALID_PARAMETER;
+               goto out;
+       }
+
+       ret = platform_get_tpm2_device(&dev);
+       if (ret != EFI_SUCCESS)
+               goto out;
+
+       rc = tpm2_submit_command(dev, input_param_block,
+                                output_param_block, &resp_buf_size);
+       if (rc) {
+               ret = (rc == -ENOSPC) ? EFI_OUT_OF_RESOURCES : EFI_DEVICE_ERROR;
+
+               goto out;
+       }
+
+out:
+       return EFI_EXIT(ret);
 }
 
 /**

diff --git a/lib/tpm-v2.c b/lib/tpm-v2.c
index 235f8c20d4349b1ac5ea783d79369945456c4869..2e7b27bd6bbaa7bf72d3ba837bd157db9dccbd4c 100644 (file)
--- a/lib/tpm-v2.c
+++ b/lib/tpm-v2.c
@@ -659,3 +659,9 @@ u32 tpm2_disable_platform_hierarchy(struct udevice *dev)
 
        return 0;
 }
+
+u32 tpm2_submit_command(struct udevice *dev, const u8 *sendbuf,
+                       u8 *recvbuf, size_t *recv_size)
+{
+       return tpm_sendrecv_command(dev, sendbuf, recvbuf, recv_size);
+}