starlingx
/
gplv2
Code Issues Proposed changes

Merge "Update TPM patches to be built with upstream code"

This commit is contained in:
Zuul 2018-07-18 15:33:56 +00:00 committed by Gerrit Code Review
parent ac1aded3ed b6192f6498
commit 66e114e54f
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tpmdd/centos/build_srpm.data
View File

@ -1,5 +1,5 @@
COPY_LIST=" \
$PKG_BASE/files/* \
$PKG_BASE/patches/* \
$STX_BASE/downloads/tpm-kmod-668a8270.tar.gz"
$STX_BASE/downloads/tpm-kmod-e6aef069.tar.gz"
TIS_PATCH_VER=5

2
tpmdd/centos/tpm-kmod.spec
View File

@ -22,7 +22,7 @@ ExclusiveArch: x86_64
# Sources.
# the tpmdd is available as a tarball, with
# the git commit Id referenced in the name
Source0: %{kmod_name}-kmod-668a8270.tar.gz
Source0: %{kmod_name}-kmod-e6aef069.tar.gz
Source1: modules-load.conf
Source2: COPYING
Source3: README

7
tpmdd/patches/0001-disable-arm64-acpi-command.patch
View File

@ -24,13 +24,12 @@ Subject: [PATCH] ARM64 based ACPI commands should not be compiled
if (sm == ACPI_TPM2_COMMAND_BUFFER_WITH_SMC) {
if (buf->header.length < (sizeof(*buf) + sizeof(*crb_smc))) {
dev_err(dev,
@@ -572,11 +572,12 @@ static int crb_acpi_add(struct acpi_devi
@@ -572,10 +572,11 @@ static int crb_acpi_add(struct acpi_devi
ACPI_TPM2_COMMAND_BUFFER_WITH_SMC);
return -EINVAL;
}
- crb_smc = ACPI_ADD_PTR(struct tpm2_crb_smc, buf,
+ struct tpm2_crb_smc *crb_smc = ACPI_ADD_PTR(struct tpm2_crb_smc, buf,
ACPI_TPM2_START_METHOD_PARAMETER_OFFSET);
- crb_smc = ACPI_ADD_PTR(struct tpm2_crb_smc, buf, sizeof(*buf));
+ struct tpm2_crb_smc *crb_smc = ACPI_ADD_PTR(struct tpm2_crb_smc, buf, sizeof(*buf));
priv->smc_func_id = crb_smc->smc_func_id;
priv->flags |= CRB_FL_CRB_SMC_START;
}