Commit a69faebf authored by Roberto Sassu's avatar Roberto Sassu Committed by Jarkko Sakkinen
Browse files

tpm: move endianness conversion of ordinals to tpm_input_header 



Move CPU native value to big-endian conversion of ordinals to the
tpm_input_header declarations.

With the previous and this patch it will now be possible to modify TPM 1.2
functions to use tpm_buf_init(), which expects CPU native value for the
tag and ordinal arguments.

Signed-off-by: default avatarRoberto Sassu <roberto.sassu@huawei.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
parent 06e93279

drivers/char/tpm/tpm-interface.c

+12 −12
Original line number Diff line number Diff line
@@ -540,13 +540,13 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space, 
#define TPM_DIGEST_SIZE 20

#define TPM_RET_CODE_IDX 6

#define TPM_INTERNAL_RESULT_SIZE 200

#define TPM_ORD_GET_CAP cpu_to_be32(101)

#define TPM_ORD_GET_RANDOM cpu_to_be32(70)

#define TPM_ORD_GET_CAP 101

#define TPM_ORD_GET_RANDOM 70



static const struct tpm_input_header tpm_getcap_header = {

	.tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),

	.length = cpu_to_be32(22),

	.ordinal = TPM_ORD_GET_CAP

	.ordinal = cpu_to_be32(TPM_ORD_GET_CAP)

};



ssize_t tpm_getcap(struct tpm_chip *chip, u32 subcap_id, cap_t *cap,
@@ -581,14 +581,14 @@ ssize_t tpm_getcap(struct tpm_chip *chip, u32 subcap_id, cap_t *cap, 
}

EXPORT_SYMBOL_GPL(tpm_getcap);



#define TPM_ORD_STARTUP cpu_to_be32(153)

#define TPM_ORD_STARTUP 153

#define TPM_ST_CLEAR cpu_to_be16(1)

#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 = cpu_to_be16(TPM_TAG_RQU_COMMAND),

	.length = cpu_to_be32(12),

	.ordinal = TPM_ORD_STARTUP

	.ordinal = cpu_to_be32(TPM_ORD_STARTUP)

};



static int tpm_startup(struct tpm_chip *chip, __be16 startup_type)
@@ -760,13 +760,13 @@ static int tpm_continue_selftest(struct tpm_chip *chip) 
	return rc;

}



#define TPM_ORDINAL_PCRREAD cpu_to_be32(21)

#define TPM_ORDINAL_PCRREAD 21

#define READ_PCR_RESULT_SIZE 30

#define READ_PCR_RESULT_BODY_SIZE 20

static const struct tpm_input_header pcrread_header = {

	.tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),

	.length = cpu_to_be32(14),

	.ordinal = TPM_ORDINAL_PCRREAD

	.ordinal = cpu_to_be32(TPM_ORDINAL_PCRREAD)

};



int tpm_pcr_read_dev(struct tpm_chip *chip, int pcr_idx, u8 *res_buf)
@@ -838,13 +838,13 @@ int tpm_pcr_read(u32 chip_num, int pcr_idx, u8 *res_buf) 
}

EXPORT_SYMBOL_GPL(tpm_pcr_read);



#define TPM_ORD_PCR_EXTEND cpu_to_be32(20)

#define TPM_ORD_PCR_EXTEND 20

#define EXTEND_PCR_RESULT_SIZE 34

#define EXTEND_PCR_RESULT_BODY_SIZE 20

static const struct tpm_input_header pcrextend_header = {

	.tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),

	.length = cpu_to_be32(34),

	.ordinal = TPM_ORD_PCR_EXTEND

	.ordinal = cpu_to_be32(TPM_ORD_PCR_EXTEND)

};



/**
@@ -1060,13 +1060,13 @@ again: 
}

EXPORT_SYMBOL_GPL(wait_for_tpm_stat);



#define TPM_ORD_SAVESTATE cpu_to_be32(152)

#define TPM_ORD_SAVESTATE 152

#define SAVESTATE_RESULT_SIZE 10



static const struct tpm_input_header savestate_header = {

	.tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),

	.length = cpu_to_be32(10),

	.ordinal = TPM_ORD_SAVESTATE

	.ordinal = cpu_to_be32(TPM_ORD_SAVESTATE)

};



/*
@@ -1151,7 +1151,7 @@ EXPORT_SYMBOL_GPL(tpm_pm_resume); 
static const struct tpm_input_header tpm_getrandom_header = {

	.tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),

	.length = cpu_to_be32(14),

	.ordinal = TPM_ORD_GET_RANDOM

	.ordinal = cpu_to_be32(TPM_ORD_GET_RANDOM)

};



/**

drivers/char/tpm/tpm-sysfs.c

+2 −2
Original line number Diff line number Diff line
@@ -22,11 +22,11 @@ 


#define READ_PUBEK_RESULT_SIZE 314

#define READ_PUBEK_RESULT_MIN_BODY_SIZE (28 + 256)

#define TPM_ORD_READPUBEK cpu_to_be32(124)

#define TPM_ORD_READPUBEK 124

static const struct tpm_input_header tpm_readpubek_header = {

	.tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),

	.length = cpu_to_be32(30),

	.ordinal = TPM_ORD_READPUBEK

	.ordinal = cpu_to_be32(TPM_ORD_READPUBEK)

};

static ssize_t pubek_show(struct device *dev, struct device_attribute *attr,

			  char *buf)

CRA Git | Maintained and supported by SUSTech CRA and CCSE