diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-19 10:38:34 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-19 10:38:34 +0300 |
| commit | d5e65d1fb75ffbe3aba33de81a72752ace28295e (patch) | |
| tree | 0ee5916f6c4a90afe88d50e9fd8144f2d576bc48 /tools | |
| parent | 18aa0ddd4ca60571516ba7e41157c3f746e2036a (diff) | |
| parent | f168c000d27f8134160d4a52dfc474a948a3d7e9 (diff) | |
| download | linux-d5e65d1fb75ffbe3aba33de81a72752ace28295e.tar.xz | |
Merge tag 'tpmdd-next-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd
Pull tpm updates from Jarkko Sakkinen:
"Just updates and fixes, no major changes"
* tag 'tpmdd-next-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
tpm: export tpm2_sessions_init() to fix ibmvtpm building
tpm: Drop explicit initialization of struct i2c_device_id::driver_data to 0
selftests: tpm2: test_smoke: Run only when TPM2 is avaialable.
MAINTAINERS: Add selftest files to TPM section
tpm: Clean up TPM space after command failure
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/testing/selftests/tpm2/test_smoke.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/testing/selftests/tpm2/test_smoke.sh b/tools/testing/selftests/tpm2/test_smoke.sh index 20fa70f970a9..168f4b166234 100755 --- a/tools/testing/selftests/tpm2/test_smoke.sh +++ b/tools/testing/selftests/tpm2/test_smoke.sh @@ -5,5 +5,7 @@ ksft_skip=4 [ -e /dev/tpm0 ] || exit $ksft_skip +read tpm_version < /sys/class/tpm/tpm0/tpm_version_major +[ "$tpm_version" == 2 ] || exit $ksft_skip python3 -m unittest -v tpm2_tests.SmokeTest 2>&1 |