tpm: move endianness conversion of TPM_TAG_RQU_COMMAND to tpm_input_header

In the long term, TPM 1.2 functions in the driver interface will be
modified to use tpm_buf_init().

However, tag and ordinals cannot be passed directly to tpm_buf_init(),
because this function performs CPU native to big-endian conversion of these
arguments. Since TPM_TAG_RQU_COMMAND and TPM_ORD_ are already converted,
passing them to the function will undo the previous conversion.

This patch moves the conversion of TPM_TAG_RQU_COMMAND from the tpm.h
header file in the driver directory to the tpm_input_header declarations
in the driver interface and tpm-sysfs.c.

Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>

diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index 158c1db83f0516a28def0de92ccad928fd77233e..a60d57d214a650f461fe3073c6ae7488beb71487 100644 (file)
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -544,7 +544,7 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space,
 #define TPM_ORD_GET_RANDOM cpu_to_be32(70)
 
 static const struct tpm_input_header tpm_getcap_header = {
-       .tag = TPM_TAG_RQU_COMMAND,
+       .tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),
        .length = cpu_to_be32(22),
        .ordinal = TPM_ORD_GET_CAP
 };
@@ -586,7 +586,7 @@ EXPORT_SYMBOL_GPL(tpm_getcap);
 #define TPM_ST_STATE cpu_to_be16(2)
 #define TPM_ST_DEACTIVATED cpu_to_be16(3)
 static const struct tpm_input_header tpm_startup_header = {
-       .tag = TPM_TAG_RQU_COMMAND,
+       .tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),
        .length = cpu_to_be32(12),
        .ordinal = TPM_ORD_STARTUP
 };
@@ -737,7 +737,7 @@ EXPORT_SYMBOL_GPL(tpm_get_timeouts);
 #define CONTINUE_SELFTEST_RESULT_SIZE 10
 
 static const struct tpm_input_header continue_selftest_header = {
-       .tag = TPM_TAG_RQU_COMMAND,
+       .tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),
        .length = cpu_to_be32(10),
        .ordinal = cpu_to_be32(TPM_ORD_CONTINUE_SELFTEST),
 };
@@ -764,7 +764,7 @@ static int tpm_continue_selftest(struct tpm_chip *chip)
 #define READ_PCR_RESULT_SIZE 30
 #define READ_PCR_RESULT_BODY_SIZE 20
 static const struct tpm_input_header pcrread_header = {
-       .tag = TPM_TAG_RQU_COMMAND,
+       .tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),
        .length = cpu_to_be32(14),
        .ordinal = TPM_ORDINAL_PCRREAD
 };
@@ -842,7 +842,7 @@ EXPORT_SYMBOL_GPL(tpm_pcr_read);
 #define EXTEND_PCR_RESULT_SIZE 34
 #define EXTEND_PCR_RESULT_BODY_SIZE 20
 static const struct tpm_input_header pcrextend_header = {
-       .tag = TPM_TAG_RQU_COMMAND,
+       .tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),
        .length = cpu_to_be32(34),
        .ordinal = TPM_ORD_PCR_EXTEND
 };
@@ -1064,7 +1064,7 @@ EXPORT_SYMBOL_GPL(wait_for_tpm_stat);
 #define SAVESTATE_RESULT_SIZE 10
 
 static const struct tpm_input_header savestate_header = {
-       .tag = TPM_TAG_RQU_COMMAND,
+       .tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),
        .length = cpu_to_be32(10),
        .ordinal = TPM_ORD_SAVESTATE
 };
@@ -1149,7 +1149,7 @@ EXPORT_SYMBOL_GPL(tpm_pm_resume);
 
 #define TPM_GETRANDOM_RESULT_SIZE      18
 static const struct tpm_input_header tpm_getrandom_header = {
-       .tag = TPM_TAG_RQU_COMMAND,
+       .tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),
        .length = cpu_to_be32(14),
        .ordinal = TPM_ORD_GET_RANDOM
 };

diff --git a/drivers/char/tpm/tpm-sysfs.c b/drivers/char/tpm/tpm-sysfs.c
index 55405dbe43fa6d7f1c2da39b5eddc1c848a509f1..b99fe66ca1b174c3f22604d82d3d8d55fa942cd3 100644 (file)
--- a/drivers/char/tpm/tpm-sysfs.c
+++ b/drivers/char/tpm/tpm-sysfs.c
@@ -24,7 +24,7 @@
 #define READ_PUBEK_RESULT_MIN_BODY_SIZE (28 + 256)
 #define TPM_ORD_READPUBEK cpu_to_be32(124)
 static const struct tpm_input_header tpm_readpubek_header = {
-       .tag = TPM_TAG_RQU_COMMAND,
+       .tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),
        .length = cpu_to_be32(30),
        .ordinal = TPM_ORD_READPUBEK
 };

diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 4b4c8dee30965a44eca191212919db035c19d799..e81d8c7acb39d60f0575060b10754f1eda392eb2 100644 (file)
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -247,7 +247,7 @@ struct tpm_output_header {
        __be32  return_code;
 } __packed;
 
-#define TPM_TAG_RQU_COMMAND cpu_to_be16(193)
+#define TPM_TAG_RQU_COMMAND 193
 
 struct stclear_flags_t {
        __be16  tag;