tpm: factor out tpm 1.x duration calculation to tpm1-cmd.c
Factor out TPM 1.x commands calculation into tpm1-cmd.c file. and change the prefix from tpm_ to tpm1_. No functional change is done here. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
This commit is contained in:
Tomas Winkler
committed by
Jarkko Sakkinen
Jarkko Sakkinen
parent
100b16a6f2
commit
b2d6e6de00
@@ -33,7 +33,6 @@
|
||||
|
||||
#include "tpm.h"
|
||||
|
||||
#define TPM_MAX_ORDINAL 243
|
||||
#define TSC_MAX_ORDINAL 12
|
||||
#define TPM_PROTECTED_COMMAND 0x00
|
||||
#define TPM_CONNECTION_COMMAND 0x40
|
||||
@@ -48,285 +47,6 @@ module_param_named(suspend_pcr, tpm_suspend_pcr, uint, 0644);
|
||||
MODULE_PARM_DESC(suspend_pcr,
|
||||
"PCR to use for dummy writes to facilitate flush on suspend.");
|
||||
|
||||
/*
|
||||
* Array with one entry per ordinal defining the maximum amount
|
||||
* of time the chip could take to return the result. The ordinal
|
||||
* designation of short, medium or long is defined in a table in
|
||||
* TCG Specification TPM Main Part 2 TPM Structures Section 17. The
|
||||
* values of the SHORT, MEDIUM, and LONG durations are retrieved
|
||||
* from the chip during initialization with a call to tpm_get_timeouts.
|
||||
*/
|
||||
static const u8 tpm_ordinal_duration[TPM_MAX_ORDINAL] = {
|
||||
TPM_UNDEFINED, /* 0 */
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED, /* 5 */
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_SHORT, /* 10 */
|
||||
TPM_SHORT,
|
||||
TPM_MEDIUM,
|
||||
TPM_LONG,
|
||||
TPM_LONG,
|
||||
TPM_MEDIUM, /* 15 */
|
||||
TPM_SHORT,
|
||||
TPM_SHORT,
|
||||
TPM_MEDIUM,
|
||||
TPM_LONG,
|
||||
TPM_SHORT, /* 20 */
|
||||
TPM_SHORT,
|
||||
TPM_MEDIUM,
|
||||
TPM_MEDIUM,
|
||||
TPM_MEDIUM,
|
||||
TPM_SHORT, /* 25 */
|
||||
TPM_SHORT,
|
||||
TPM_MEDIUM,
|
||||
TPM_SHORT,
|
||||
TPM_SHORT,
|
||||
TPM_MEDIUM, /* 30 */
|
||||
TPM_LONG,
|
||||
TPM_MEDIUM,
|
||||
TPM_SHORT,
|
||||
TPM_SHORT,
|
||||
TPM_SHORT, /* 35 */
|
||||
TPM_MEDIUM,
|
||||
TPM_MEDIUM,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_MEDIUM, /* 40 */
|
||||
TPM_LONG,
|
||||
TPM_MEDIUM,
|
||||
TPM_SHORT,
|
||||
TPM_SHORT,
|
||||
TPM_SHORT, /* 45 */
|
||||
TPM_SHORT,
|
||||
TPM_SHORT,
|
||||
TPM_SHORT,
|
||||
TPM_LONG,
|
||||
TPM_MEDIUM, /* 50 */
|
||||
TPM_MEDIUM,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED, /* 55 */
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_MEDIUM, /* 60 */
|
||||
TPM_MEDIUM,
|
||||
TPM_MEDIUM,
|
||||
TPM_SHORT,
|
||||
TPM_SHORT,
|
||||
TPM_MEDIUM, /* 65 */
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_SHORT, /* 70 */
|
||||
TPM_SHORT,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED, /* 75 */
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_LONG, /* 80 */
|
||||
TPM_UNDEFINED,
|
||||
TPM_MEDIUM,
|
||||
TPM_LONG,
|
||||
TPM_SHORT,
|
||||
TPM_UNDEFINED, /* 85 */
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_SHORT, /* 90 */
|
||||
TPM_SHORT,
|
||||
TPM_SHORT,
|
||||
TPM_SHORT,
|
||||
TPM_SHORT,
|
||||
TPM_UNDEFINED, /* 95 */
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_MEDIUM, /* 100 */
|
||||
TPM_SHORT,
|
||||
TPM_SHORT,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED, /* 105 */
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_SHORT, /* 110 */
|
||||
TPM_SHORT,
|
||||
TPM_SHORT,
|
||||
TPM_SHORT,
|
||||
TPM_SHORT,
|
||||
TPM_SHORT, /* 115 */
|
||||
TPM_SHORT,
|
||||
TPM_SHORT,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_LONG, /* 120 */
|
||||
TPM_LONG,
|
||||
TPM_MEDIUM,
|
||||
TPM_UNDEFINED,
|
||||
TPM_SHORT,
|
||||
TPM_SHORT, /* 125 */
|
||||
TPM_SHORT,
|
||||
TPM_LONG,
|
||||
TPM_SHORT,
|
||||
TPM_SHORT,
|
||||
TPM_SHORT, /* 130 */
|
||||
TPM_MEDIUM,
|
||||
TPM_UNDEFINED,
|
||||
TPM_SHORT,
|
||||
TPM_MEDIUM,
|
||||
TPM_UNDEFINED, /* 135 */
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_SHORT, /* 140 */
|
||||
TPM_SHORT,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED, /* 145 */
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_SHORT, /* 150 */
|
||||
TPM_MEDIUM,
|
||||
TPM_MEDIUM,
|
||||
TPM_SHORT,
|
||||
TPM_SHORT,
|
||||
TPM_UNDEFINED, /* 155 */
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_SHORT, /* 160 */
|
||||
TPM_SHORT,
|
||||
TPM_SHORT,
|
||||
TPM_SHORT,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED, /* 165 */
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_LONG, /* 170 */
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED, /* 175 */
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_MEDIUM, /* 180 */
|
||||
TPM_SHORT,
|
||||
TPM_MEDIUM,
|
||||
TPM_MEDIUM,
|
||||
TPM_MEDIUM,
|
||||
TPM_MEDIUM, /* 185 */
|
||||
TPM_SHORT,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED, /* 190 */
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED, /* 195 */
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_SHORT, /* 200 */
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_SHORT,
|
||||
TPM_SHORT, /* 205 */
|
||||
TPM_SHORT,
|
||||
TPM_SHORT,
|
||||
TPM_SHORT,
|
||||
TPM_SHORT,
|
||||
TPM_MEDIUM, /* 210 */
|
||||
TPM_UNDEFINED,
|
||||
TPM_MEDIUM,
|
||||
TPM_MEDIUM,
|
||||
TPM_MEDIUM,
|
||||
TPM_UNDEFINED, /* 215 */
|
||||
TPM_MEDIUM,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_SHORT,
|
||||
TPM_SHORT, /* 220 */
|
||||
TPM_SHORT,
|
||||
TPM_SHORT,
|
||||
TPM_SHORT,
|
||||
TPM_SHORT,
|
||||
TPM_UNDEFINED, /* 225 */
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_SHORT, /* 230 */
|
||||
TPM_LONG,
|
||||
TPM_MEDIUM,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED, /* 235 */
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_UNDEFINED,
|
||||
TPM_SHORT, /* 240 */
|
||||
TPM_UNDEFINED,
|
||||
TPM_MEDIUM,
|
||||
};
|
||||
|
||||
/*
|
||||
* Returns max number of jiffies to wait
|
||||
*/
|
||||
unsigned long tpm_calc_ordinal_duration(struct tpm_chip *chip,
|
||||
u32 ordinal)
|
||||
{
|
||||
int duration_idx = TPM_UNDEFINED;
|
||||
int duration = 0;
|
||||
|
||||
/*
|
||||
* We only have a duration table for protected commands, where the upper
|
||||
* 16 bits are 0. For the few other ordinals the fallback will be used.
|
||||
*/
|
||||
if (ordinal < TPM_MAX_ORDINAL)
|
||||
duration_idx = tpm_ordinal_duration[ordinal];
|
||||
|
||||
if (duration_idx != TPM_UNDEFINED)
|
||||
duration = chip->duration[duration_idx];
|
||||
if (duration <= 0)
|
||||
return 2 * 60 * HZ;
|
||||
else
|
||||
return duration;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(tpm_calc_ordinal_duration);
|
||||
|
||||
static int tpm_validate_command(struct tpm_chip *chip,
|
||||
struct tpm_space *space,
|
||||
const u8 *cmd,
|
||||
@@ -503,7 +223,7 @@ static ssize_t tpm_try_transmit(struct tpm_chip *chip,
|
||||
if (chip->flags & TPM_CHIP_FLAG_TPM2)
|
||||
stop = jiffies + tpm2_calc_ordinal_duration(chip, ordinal);
|
||||
else
|
||||
stop = jiffies + tpm_calc_ordinal_duration(chip, ordinal);
|
||||
stop = jiffies + tpm1_calc_ordinal_duration(chip, ordinal);
|
||||
do {
|
||||
u8 status = chip->ops->status(chip);
|
||||
if ((status & chip->ops->req_complete_mask) ==
|
||||
@@ -1086,7 +806,7 @@ int tpm_do_selftest(struct tpm_chip *chip)
|
||||
unsigned long duration;
|
||||
u8 dummy[TPM_DIGEST_SIZE];
|
||||
|
||||
duration = tpm_calc_ordinal_duration(chip, TPM_ORD_CONTINUE_SELFTEST);
|
||||
duration = tpm1_calc_ordinal_duration(chip, TPM_ORD_CONTINUE_SELFTEST);
|
||||
|
||||
loops = jiffies_to_msecs(duration) / delay_msec;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user