Blame tpm-fix-stall-on-boot.patch
|
Kyle McMartin |
bd61adb |
Fix TPM timeouts on boot (#530393)
|
|
Kyle McMartin |
bd61adb |
|
|
Kyle McMartin |
bd61adb |
--- a/drivers/char/tpm/tpm.c
|
|
Kyle McMartin |
bd61adb |
+++ a/drivers/char/tpm/tpm.c
|
|
Kyle McMartin |
bd61adb |
@@ -354,12 +354,14 @@ unsigned long tpm_calc_ordinal_duration(struct tpm_chip *chip,
|
|
Kyle McMartin |
bd61adb |
tpm_protected_ordinal_duration[ordinal &
|
|
Kyle McMartin |
bd61adb |
TPM_PROTECTED_ORDINAL_MASK];
|
|
Kyle McMartin |
bd61adb |
|
|
Kyle McMartin |
bd61adb |
- if (duration_idx != TPM_UNDEFINED)
|
|
Kyle McMartin |
bd61adb |
+ if (duration_idx != TPM_UNDEFINED) {
|
|
Kyle McMartin |
bd61adb |
duration = chip->vendor.duration[duration_idx];
|
|
Kyle McMartin |
bd61adb |
- if (duration <= 0)
|
|
Kyle McMartin |
bd61adb |
+ /* if duration is 0, it's because chip->vendor.duration wasn't */
|
|
Kyle McMartin |
bd61adb |
+ /* filled yet, so we set the lowest timeout just to give enough */
|
|
Kyle McMartin |
bd61adb |
+ /* time to tpm_get_timeouts() succeed */
|
|
Kyle McMartin |
bd61adb |
+ return (duration <= 0 ? HZ : duration);
|
|
Kyle McMartin |
bd61adb |
+ } else
|
|
Kyle McMartin |
bd61adb |
return 2 * 60 * HZ;
|
|
Kyle McMartin |
bd61adb |
- else
|
|
Kyle McMartin |
bd61adb |
- return duration;
|
|
Kyle McMartin |
bd61adb |
}
|
|
Kyle McMartin |
bd61adb |
EXPORT_SYMBOL_GPL(tpm_calc_ordinal_duration);
|
|
Kyle McMartin |
bd61adb |
|
|
Kyle McMartin |
bd61adb |
|