Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0014777f authored by Julia Lawall's avatar Julia Lawall Committed by Jarkko Sakkinen
Browse files

tpm: constify TPM 1.x header structures 



Constify TPM 1.x header structures in order to move them to rodata
section as they are meant to be never changed during runtime.

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
parent 64fba530

drivers/char/tpm/tpm-interface.c

+5 −5
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ EXPORT_SYMBOL_GPL(tpm_get_timeouts); 
#define TPM_ORD_CONTINUE_SELFTEST 83

#define CONTINUE_SELFTEST_RESULT_SIZE 10



static struct tpm_input_header continue_selftest_header = {

static const struct tpm_input_header continue_selftest_header = {

	.tag = TPM_TAG_RQU_COMMAND,

	.length = cpu_to_be32(10),

	.ordinal = cpu_to_be32(TPM_ORD_CONTINUE_SELFTEST),
@@ -649,7 +649,7 @@ static int tpm_continue_selftest(struct tpm_chip *chip) 


#define TPM_ORDINAL_PCRREAD cpu_to_be32(21)

#define READ_PCR_RESULT_SIZE 30

static struct tpm_input_header pcrread_header = {

static const struct tpm_input_header pcrread_header = {

	.tag = TPM_TAG_RQU_COMMAND,

	.length = cpu_to_be32(14),

	.ordinal = TPM_ORDINAL_PCRREAD
@@ -735,7 +735,7 @@ EXPORT_SYMBOL_GPL(tpm_pcr_read); 
 */

#define TPM_ORD_PCR_EXTEND cpu_to_be32(20)

#define EXTEND_PCR_RESULT_SIZE 34

static struct tpm_input_header pcrextend_header = {

static const struct tpm_input_header pcrextend_header = {

	.tag = TPM_TAG_RQU_COMMAND,

	.length = cpu_to_be32(34),

	.ordinal = TPM_ORD_PCR_EXTEND
@@ -937,7 +937,7 @@ EXPORT_SYMBOL_GPL(wait_for_tpm_stat); 
#define TPM_ORD_SAVESTATE cpu_to_be32(152)

#define SAVESTATE_RESULT_SIZE 10



static struct tpm_input_header savestate_header = {

static const struct tpm_input_header savestate_header = {

	.tag = TPM_TAG_RQU_COMMAND,

	.length = cpu_to_be32(10),

	.ordinal = TPM_ORD_SAVESTATE
@@ -1021,7 +1021,7 @@ int tpm_pm_resume(struct device *dev) 
EXPORT_SYMBOL_GPL(tpm_pm_resume);



#define TPM_GETRANDOM_RESULT_SIZE	18

static struct tpm_input_header tpm_getrandom_header = {

static const struct tpm_input_header tpm_getrandom_header = {

	.tag = TPM_TAG_RQU_COMMAND,

	.length = cpu_to_be32(14),

	.ordinal = TPM_ORD_GET_RANDOM

drivers/char/tpm/tpm-sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


#define READ_PUBEK_RESULT_SIZE 314

#define TPM_ORD_READPUBEK cpu_to_be32(124)

static struct tpm_input_header tpm_readpubek_header = {

static const struct tpm_input_header tpm_readpubek_header = {

	.tag = TPM_TAG_RQU_COMMAND,

	.length = cpu_to_be32(30),

	.ordinal = TPM_ORD_READPUBEK