colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'tpm-20012023' of https://source.denx.de/u-boot/custodians/u-boot-tpm

Browse Source 
TPM fixes and state reporting
This commit is contained in:
Tom Rini
2023-01-20 10:36:00 -05:00
parent 53c47c59e6 eda976d36a
commit 8bd3c0a7e1
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MAINTAINERS
View File

@@ -1452,6 +1452,7 @@ F: configs/j721s2_hs_evm_r5_defconfig
TPM DRIVERS TPM DRIVERS
M: Ilias Apalodimas <ilias.apalodimas@linaro.org> M: Ilias Apalodimas <ilias.apalodimas@linaro.org>
S: Maintained S: Maintained
T: git https://source.denx.de/u-boot/custodians/u-boot-tpm.git
F: drivers/tpm/ F: drivers/tpm/
TQ GROUP TQ GROUP
@@ -1461,6 +1462,8 @@ T: git git://git.denx.de/u-boot-tq-group.git
TEE TEE
M: Jens Wiklander <jens.wiklander@linaro.org> M: Jens Wiklander <jens.wiklander@linaro.org>
M: Ilias Apalodimas <ilias.apalodimas@linaro.org>
T: git https://source.denx.de/u-boot/custodians/u-boot-tpm.git
S: Maintained S: Maintained
F: drivers/tee/ F: drivers/tee/
F: include/tee.h F: include/tee.h

4
drivers/tee/optee/core.c
View File

@@ -73,7 +73,7 @@ static struct optee_service *find_service_driver(const struct tee_optee_ta_uuid
for (idx = 0; idx < service_cnt; idx++, service++) { for (idx = 0; idx < service_cnt; idx++, service++) {
tee_optee_ta_uuid_to_octets(loc_uuid, &service->uuid); tee_optee_ta_uuid_to_octets(loc_uuid, &service->uuid);
if (!memcmp(uuid, loc_uuid, sizeof(uuid))) if (!memcmp(uuid, loc_uuid, sizeof(*uuid)))
return service; return service;
} }
@@ -850,7 +850,7 @@ static int optee_probe(struct udevice *dev)
ret = device_bind_driver_to_node(dev, "optee-rng", "optee-rng", ret = device_bind_driver_to_node(dev, "optee-rng", "optee-rng",
dev_ofnode(dev), NULL); dev_ofnode(dev), NULL);
if (ret) if (ret)
dev_warn(dev, "ftpm_tee failed to bind: %d\n", ret); dev_warn(dev, "optee-rng failed to bind: %d\n", ret);
} }
return 0; return 0;

3
drivers/tpm/tpm2_ftpm_tee.c
View File

@@ -18,10 +18,13 @@
#include <log.h> #include <log.h>
#include <tpm-v2.h> #include <tpm-v2.h>
#include <tee.h> #include <tee.h>
#include <tee/optee_service.h>
#include "tpm_tis.h" #include "tpm_tis.h"
#include "tpm2_ftpm_tee.h" #include "tpm2_ftpm_tee.h"
OPTEE_SERVICE_DRIVER(optee_ftpm, TA_FTPM_UUID, "ftpm_tee");
/** /**
* ftpm_tee_transceive() - send fTPM commands and retrieve fTPM response. * ftpm_tee_transceive() - send fTPM commands and retrieve fTPM response.
* @sendbuf - address of the data to send, byte by byte * @sendbuf - address of the data to send, byte by byte