diff options
author | Christoph Hellwig <hch@lst.de> | 2017-08-29 08:42:06 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2017-08-29 11:33:24 -0400 |
commit | e8f11db956aa09c1618051a7aaf367d6810d8d8c (patch) | |
tree | b4d766f6031e5a231cee41d0f33225ce45a7a009 | |
parent | 35f0b6a779b8b7a98faefd7c1c660b4dac9a5c26 (diff) |
libata: check for trusted computing in IDENTIFY DEVICE data
ATA-8 and later mirrors the TRUSTED COMPUTING SUPPORTED bit in word 48 of
the IDENTIFY DEVICE data. Check this before issuing a READ LOG PAGE
command to avoid issues with buggy devices. The only downside is that
we can't support Security Send / Receive for a device with an older
revision due to the conflicting use of this field in earlier
specifications.
tj: The reason we need this is because some devices which don't
support READ LOG PAGE lock up after getting issued that command.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
-rw-r--r-- | drivers/ata/libata-core.c | 3 | ||||
-rw-r--r-- | include/linux/ata.h | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 697f5f896b19..ca57b03ab950 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -2413,6 +2413,9 @@ static void ata_dev_config_trusted(struct ata_device *dev) | |||
2413 | u64 trusted_cap; | 2413 | u64 trusted_cap; |
2414 | unsigned int err; | 2414 | unsigned int err; |
2415 | 2415 | ||
2416 | if (!ata_id_has_trusted(dev->id)) | ||
2417 | return; | ||
2418 | |||
2416 | if (!ata_identify_page_supported(dev, ATA_LOG_SECURITY)) { | 2419 | if (!ata_identify_page_supported(dev, ATA_LOG_SECURITY)) { |
2417 | ata_dev_warn(dev, | 2420 | ata_dev_warn(dev, |
2418 | "Security Log not supported\n"); | 2421 | "Security Log not supported\n"); |
diff --git a/include/linux/ata.h b/include/linux/ata.h index e65ae4b2ed48..c7a353825450 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h | |||
@@ -60,7 +60,8 @@ enum { | |||
60 | ATA_ID_FW_REV = 23, | 60 | ATA_ID_FW_REV = 23, |
61 | ATA_ID_PROD = 27, | 61 | ATA_ID_PROD = 27, |
62 | ATA_ID_MAX_MULTSECT = 47, | 62 | ATA_ID_MAX_MULTSECT = 47, |
63 | ATA_ID_DWORD_IO = 48, | 63 | ATA_ID_DWORD_IO = 48, /* before ATA-8 */ |
64 | ATA_ID_TRUSTED = 48, /* ATA-8 and later */ | ||
64 | ATA_ID_CAPABILITY = 49, | 65 | ATA_ID_CAPABILITY = 49, |
65 | ATA_ID_OLD_PIO_MODES = 51, | 66 | ATA_ID_OLD_PIO_MODES = 51, |
66 | ATA_ID_OLD_DMA_MODES = 52, | 67 | ATA_ID_OLD_DMA_MODES = 52, |
@@ -889,6 +890,13 @@ static inline bool ata_id_has_dword_io(const u16 *id) | |||
889 | return id[ATA_ID_DWORD_IO] & (1 << 0); | 890 | return id[ATA_ID_DWORD_IO] & (1 << 0); |
890 | } | 891 | } |
891 | 892 | ||
893 | static inline bool ata_id_has_trusted(const u16 *id) | ||
894 | { | ||
895 | if (ata_id_major_version(id) <= 7) | ||
896 | return false; | ||
897 | return id[ATA_ID_TRUSTED] & (1 << 0); | ||
898 | } | ||
899 | |||
892 | static inline bool ata_id_has_unload(const u16 *id) | 900 | static inline bool ata_id_has_unload(const u16 *id) |
893 | { | 901 | { |
894 | if (ata_id_major_version(id) >= 7 && | 902 | if (ata_id_major_version(id) >= 7 && |