env: net: U_BOOT_ENV_CALLBACKs should not depend on CMD_NET

[oweals/u-boot.git] / lib / tpm-common.c

diff --git a/lib/tpm-common.c b/lib/tpm-common.c
index a440639cec302fc23d7a0fc31f2f82e2ab9f12ed..86b4f413c2e3930edbbcb88eb58342026006e1e7 100644 (file)
--- a/lib/tpm-common.c
+++ b/lib/tpm-common.c
@@ -12,6 +12,13 @@
 #include <tpm-common.h>
 #include "tpm-utils.h"
 
+enum tpm_version tpm_get_version(struct udevice *dev)
+{
+       struct tpm_chip_priv *priv = dev_get_uclass_priv(dev);
+
+       return priv->version;
+}
+
 int pack_byte_string(u8 *str, size_t size, const char *format, ...)
 {
        va_list args;
@@ -112,7 +119,7 @@ int unpack_byte_string(const u8 *str, size_t size, const char *format, ...)
 
                if (offset + length > size) {
                        va_end(args);
-                       log_err("Failed to read: size=%d, offset=%x, len=%x\n",
+                       log_err("Failed to read: size=%zd, offset=%zx, len=%zx\n",
                                size, offset, length);
                        return -1;
                }
@@ -151,9 +158,9 @@ u32 tpm_return_code(const void *response)
        return get_unaligned_be32(response + return_code_offset);
 }
 
-u32 tpm_sendrecv_command(const void *command, void *response, size_t *size_ptr)
+u32 tpm_sendrecv_command(struct udevice *dev, const void *command,
+                        void *response, size_t *size_ptr)
 {
-       struct udevice *dev;
        int err, ret;
        u8 response_buffer[COMMAND_BUFFER_SIZE];
        size_t response_length;
@@ -166,9 +173,6 @@ u32 tpm_sendrecv_command(const void *command, void *response, size_t *size_ptr)
                response_length = sizeof(response_buffer);
        }
 
-       ret = uclass_first_device_err(UCLASS_TPM, &dev);
-       if (ret)
-               return ret;
        err = tpm_xfer(dev, command, tpm_command_size(command),
                       response, &response_length);
 
@@ -188,14 +192,7 @@ u32 tpm_sendrecv_command(const void *command, void *response, size_t *size_ptr)
        return ret;
 }
 
-int tpm_init(void)
+int tpm_init(struct udevice *dev)
 {
-       struct udevice *dev;
-       int err;
-
-       err = uclass_first_device_err(UCLASS_TPM, &dev);
-       if (err)
-               return err;
-
        return tpm_open(dev);
 }