Skip to contentSkip to conversation

ide/libata: fix ata_id_is_cfa()

PATCH In review Sergei Shtylyov 5 participants 50 messages Jan 23, 2009 – Jan 27, 2009 libata

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ide/libata: fix ata_id_is_cfa()

When checking for CFA feature set support, ata_id_is_cfa() tests bit 2 in word 82 of the identify data instead the word 83. It also checks the ATA revision in the word 80 instead of usual validity check for the words 82-83 -- word 83 bit 14 set, bit 15 cleared.

---
I'm not sure who should queue this patch... it's against Linus' tree.

 include/linux/ata.h |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
include/linux/ata.h +2 -3
Index: linux-2.6/include/linux/ata.h
===================================================================
@@ -734,9 +734,8 @@ static inline int ata_id_is_cfa(const u1
 	if (id[ATA_ID_CONFIG] == 0x848A)	/* Standard CF */
 		return 1;
 	/* Could be CF hiding as standard ATA */
-	if (ata_id_major_version(id) >= 3 &&
-	    id[ATA_ID_COMMAND_SET_1] != 0xFFFF &&
-	   (id[ATA_ID_COMMAND_SET_1] & (1 << 2)))
+	if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) == 0x4000 &&
+	    (id[ATA_ID_COMMAND_SET_2] & (1 << 2)))
 		return 1;
 	return 0;
 }
#1 lore raw
Quoted 4 lines · On Fri, 23 Jan 2009 17:15:37 +0400 Sergei Shtylyov <[email protected]>…

When checking for CFA feature set support, ata_id_is_cfa() tests bit 2 in word 82 of the identify data instead the word 83. It also checks the ATA revision in the word 80 instead of usual validity check for the words 82-83 -- word 83 bit 14 set, bit 15 cleared.

The word 82 validity bit is not sufficient as that bit is itself not defined in ATA < 3. Otherwise the change looks correct.

Alan

#2 lore raw

Hello.

Quoted 6 lines · Alan Cox
Quoted 4 lines

When checking for CFA feature set support, ata_id_is_cfa() tests bit 2 in word 82 of the identify data instead the word 83. It also checks the ATA revision in the word 80 instead of usual validity check for the words 82-83 -- word 83 bit 14 set, bit 15 cleared.

The word 82 validity bit is not sufficient as that bit is itself not

There's no word 82 validity bits, its validity bits are in word 83.

Quoted 1 line

defined in ATA < 3. Otherwise the change looks correct.

Well, then we need to fix every case of using *only* the validity bits in
ata.h. Go ahead. ;-)

Quoted 1 line

Alan

WBR, Sergei

#3 lore raw
Quoted 3 lines
Quoted 1 line

The word 82 validity bit is not sufficient as that bit is itself not

There's no word 82 validity bits, its validity bits are in word 83.

Word 83 sorry - I seem to have 82 and 83 bit flipped in my brain, not good for ATA work ;)

Quoted 5 lines
Quoted 2 lines

defined in ATA < 3. Otherwise the change looks correct.

Well, then we need to fix every case of using *only* the validity bits in
ata.h.

No reason to go removing ones that are correct

#4 lore raw

Hello.

Quoted 7 lines · Alan Cox
Quoted 3 lines
Quoted 1 line

The word 82 validity bit is not sufficient as that bit is itself not

There's no word 82 validity bits, its validity bits are in word 83.

Word 83 sorry - I seem to have 82 and 83 bit flipped in my brain, not good for ATA work ;)

Quoted 6 lines
Quoted 4 lines
Quoted 1 line

defined in ATA < 3. Otherwise the change looks correct.

Well, then we need to fix every case of using *only* the validity bits in
ata.h.

No reason to go removing ones that are correct

You've just effectively claimed them to be incorrect with your claim what
validity bits are not sufficient and ATA revision must be checked. Check the source please -- I wouldn't have dropped the revision check if the rest of the inlines that check word 82/82 were using it.

MBR, Sergei

#5 lore raw
Quoted 4 lines
Quoted 1 line

No reason to go removing ones that are correct

You've just effectively claimed them to be incorrect with your claim what
validity bits are not sufficient and ATA revision must be checked. Check the

Nope. Please go re-read what I wrote.

Quoted 2 lines

source please -- I wouldn't have dropped the revision check if the rest of the inlines that check word 82/82 were using it.

In other words, as I said, you removed a correct check rather than correcting others which may not be correct.

#6 lore raw

Hello.

Quoted 6 lines · Alan Cox
Quoted 4 lines
Quoted 1 line

No reason to go removing ones that are correct

You've just effectively claimed them to be incorrect with your claim what
validity bits are not sufficient and ATA revision must be checked. Check the

Nope. Please go re-read what I wrote.

Then I don't understand why you wrote it -- I didn't urge you to fix the
correct inlines.

Quoted 4 lines
Quoted 1 line

source please -- I wouldn't have dropped the revision check if the rest of the inlines that check word 82/82 were using it.

In other words, as I said, you removed a correct check rather than correcting others which may not be correct.

Yes. But I have no time to fix everything for everybody.

MBR, Sergei

#7 lore raw

Sergei Shtylyov wrote:
..

Quoted 4 lines
Quoted 2 lines

In other words, as I said, you removed a correct check rather than correcting others which may not be correct.

Yes. But I have no time to fix everything for everybody.

..

No issue with that, is there?
Just keep the check in the code you're touching, that's all.

Cheers

#8 lore raw

Hello.

Quoted 4 lines · Mark Lord
Quoted 2 lines · Sergei Shtylyov
Quoted 2 lines

In other words, as I said, you removed a correct check rather than correcting others which may not be correct.

I'm now seeing that I misunderstood Alan. I got somewhat angered by
linux-usb mails right before that.

Quoted 5 lines
Quoted 1 line

Yes. But I have no time to fix everything for everybody.

..

No issue with that, is there?

We'll see... :-)

Quoted 1 line

Just keep the check in the code you're touching, that's all.

Sure, I'll repost the patch.

Quoted 1 line

Cheers

MBR, Sergei

#9 lore raw
In reply to Alan Cox
Quoted 7 lines · Alan Cox
Quoted 4 lines

When checking for CFA feature set support, ata_id_is_cfa() tests bit 2 in word 82 of the identify data instead the word 83. It also checks the ATA revision in the word 80 instead of usual validity check for the words 82-83 -- word 83 bit 14 set, bit 15 cleared.

The word 82 validity bit is not sufficient as that bit is itself not defined in ATA < 3. Otherwise the change looks correct.

Besides, I find the necessity of ATA revison check somewhat arguable.
Words 64-127 were reserved since ATA-1 which meant that they shall be set to 0.

Quoted 1 line

Alan

MBR, Sergei

#10 lore raw
Quoted 7 lines · On Fri, 23 Jan 2009 20:27:31 +0300 Sergei Shtylyov <[email protected]>…
Quoted 4 lines · Alan Cox
Quoted 4 lines

When checking for CFA feature set support, ata_id_is_cfa() tests bit 2 in word 82 of the identify data instead the word 83. It also checks the ATA revision in the word 80 instead of usual validity check for the words 82-83 -- word 83 bit 14 set, bit 15 cleared.

Quoted 5 lines
Quoted 2 lines

The word 82 validity bit is not sufficient as that bit is itself not defined in ATA < 3. Otherwise the change looks correct.

Besides, I find the necessity of ATA revison check somewhat arguable.
Words 64-127 were reserved since ATA-1 which meant that they shall be set to 0.

One reason for the 0xC000/0x4000 check is that they were not - various very old devices like to return 0xFFFF for all the spare bits as do a fair number of EIDE devices.

Yes it's probably paranoia but this is ATA ;)

#11 lore raw
Quoted 8 lines · Alan Cox
Quoted 7 lines
Quoted 7 lines
Quoted 4 lines

When checking for CFA feature set support, ata_id_is_cfa() tests bit 2 in word 82 of the identify data instead the word 83. It also checks the ATA revision in the word 80 instead of usual validity check for the words 82-83 -- word 83 bit 14 set, bit 15 cleared.

The word 82 validity bit is not sufficient as that bit is itself not defined in ATA < 3. Otherwise the change looks correct.

Quoted 6 lines
Quoted 2 lines

Besides, I find the necessity of ATA revison check somewhat arguable.
Words 64-127 were reserved since ATA-1 which meant that they shall be set to 0.

One reason for the 0xC000/0x4000 check is that they were not - various very old devices like to return 0xFFFF for all the spare bits as do a fair number of EIDE devices.

Yes, but bit 14/15 check should cover such case without the revision check.

Quoted 1 line

Yes it's probably paranoia but this is ATA ;)

So, we want ot stay paranoid WRT ata_id_is_cf()? We then have to be
paranoid consitently. :-)

MBR, Sergei

#12 lore raw
In reply to Sergei Shtylyov
Quoted 19 lines · Hello, I wrote:

When checking for CFA feature set support, ata_id_is_cfa() tests bit 2 in word 82 of the identify data instead the word 83. It also checks the ATA revision in the word 80 instead of usual validity check for the words 82-83 -- word 83 bit 14 set, bit 15 cleared.

---
I'm not sure who should queue this patch... it's against Linus' tree.

 include/linux/ata.h |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

Index: linux-2.6/include/linux/ata.h
===================================================================

include/linux/ata.h +0 -0
@@ -734,9 +734,8 @@ static inline int ata_id_is_cfa(const u1
 	if (id[ATA_ID_CONFIG] == 0x848A)	/* Standard CF */

include/linux/ata.h static inline int ata_id_is_cfa(const u1 · line 741

Quoted 10 lines
include/linux/ata.h +2 -3
 		return 1;
 	/* Could be CF hiding as standard ATA */
-	if (ata_id_major_version(id) >= 3 &&
-	    id[ATA_ID_COMMAND_SET_1] != 0xFFFF &&
-	   (id[ATA_ID_COMMAND_SET_1] & (1 << 2)))
+	if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) == 0x4000 &&
+	    (id[ATA_ID_COMMAND_SET_2] & (1 << 2)))
 		return 1;
 	return 0;
 }

Jeff, Bart, I've changed my mind about recasting this patch as Alan
has requested, as I do consider it correct now. The version check should be unnecessary since I'm adding the validity bits check (hte fact that ata_id_major_complex() is quite cumbesome way of checking the minumum revision # -- this can be done with a single comparison instead of the bit scan). Note that words 64-127 were marked reserved, and must be set to 0 since ATA-1. Have your say please -- do I still need to recast the patch?

MBR, Sergei

#13 lore raw
Quoted 3 lines

bit scan). Note that words 64-127 were marked reserved, and must be set to 0 since ATA-1. Have your say please -- do I still need to recast the patch?

"Must be" but were not.

#14 lore raw

Hello.

Quoted 5 lines · Alan Cox
Quoted 2 lines

bit scan). Note that words 64-127 were marked reserved, and must be set to 0 since ATA-1. Have your say please -- do I still need to recast the patch?

"Must be" but were not.

Let's see what ATA-3 rev. 7b has to say on this matter:

7.7.38 Words 82-83: Command sets supported

Words 82 and 83 indicate command sets supported. The values 0000h and FFFFh in these words indicate that command set support is not indicated. Bits 4 through 15 of Word 82 are reserved. Bits 0 through 13 of Word 83 are reserved. Bit 14 of Word 83 shall be set to one. Bit 15 of Word 83 shall be cleared to zero.

ATA/PI-4 rev. 18 further clarifies:

8.12.45 Words 82-84: Features/command sets supported

Words 82, 83, and 84 shall indicate features/command sets supported. The value 0000h or FFFFh was placed in each of these words by devices prior to ATA-3 and shall be interpreted by the host as meaning that features/command sets supported are not indicated. Bits 1 through 13 of word 83 and bits 0 through 13 of word 84 are reserved. Bit 14 of word 83 and word 84 shall be set to one and bit 15 of word 83 and word 84 shall be cleared to zero to provide indication that the features/command sets supported words are valid.

Since checking bits 14-15 filters out both 0 and 0xFFFF, I don't see
why we have to check for ATA revision prior to that -- unless we're trying to guard against pre ATA-3 values other than 0 or 0xFFFF.

MBR, Sergei

#15 lore raw
Quoted 2 lines

why we have to check for ATA revision prior to that -- unless we're trying to guard against pre ATA-3 values other than 0 or 0xFFFF.

Which we are. At the point we first use this function we are poking blindly at a device we have not done any other analysis of.

Alan

#16 lore raw
Quoted 3 lines · Alan Cox
Quoted 1 line

why we have to check for ATA revision prior to that -- unless we're trying to guard against pre ATA-3 values other than 0 or 0xFFFF.

Which we are.

On what grounds? Note that ATA-3 only names 0 and 0xFFFF as inappropriate
values.

Quoted 2 lines

At the point we first use this function we are poking blindly at a device we have not done any other analysis of.

Do you mean ata_dev_readid()? I'm seeing no issue with checking for ATA
version there directly if you insist it should be done.

Quoted 1 line

Alan

MBR, Sergei

#17 lore raw
Quoted 9 lines · On Mon, 26 Jan 2009 21:11:33 +0300 Sergei Shtylyov <[email protected]>…
Quoted 4 lines · Alan Cox
Quoted 2 lines

why we have to check for ATA revision prior to that -- unless we're trying to guard against pre ATA-3 values other than 0 or 0xFFFF.

Which we are.

    On what grounds? Note that ATA-3 only names 0 and 0xFFFF as inappropriate 

values.

On the grounds that there are devices that predate ATA-3 and that we should be robust.

#18 lore raw
Quoted 9 lines · Alan Cox
Quoted 6 lines
Quoted 3 lines
Quoted 1 line

why we have to check for ATA revision prior to that -- unless we're trying to guard against pre ATA-3 values other than 0 or 0xFFFF.

Which we are.

On what grounds? Note that ATA-3 only names 0 and 0xFFFF as inappropriate
values.

On the grounds that there are devices that predate ATA-3 and that we should be robust.

ATA/PI-4 states they had 0 or 0xFFFF there. Again, we weren't robust (by
your definition) in other cases of using words 82-83 -- have it caused issues?
Another argument about robustness: CF specifies word 80 as *reserved* but
does specifies words 82-84 since at least 2.1. What to do about that?

MBR, Sergei

#19 lore raw
In reply to Sergei Shtylyov
Quoted 6 lines

Jeff, Bart, I've changed my mind about recasting this patch as Alan
has requested, as I do consider it correct now. The version check should be unnecessary since I'm adding the validity bits check (hte fact that ata_id_major_complex() is quite cumbesome way of checking the minumum revision # -- this can be done with a single comparison instead of the bit scan)

If you want to just do a specific check yes. I agree there it would make some sense to have a ata_has_version(ATA_VER_BITFOO); that was a single inline & check for ATA3+

Alan

#20 lore raw
In reply to Sergei Shtylyov
Quoted 31 lines · Sergei Shtylyov
Quoted 19 lines · Hello, I wrote:

When checking for CFA feature set support, ata_id_is_cfa() tests bit 2 in word 82 of the identify data instead the word 83. It also checks the ATA revision in the word 80 instead of usual validity check for the words 82-83 -- word 83 bit 14 set, bit 15 cleared.

---
I'm not sure who should queue this patch... it's against Linus' tree.

 include/linux/ata.h |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

Index: linux-2.6/include/linux/ata.h
===================================================================

include/linux/ata.h +0 -0
@@ -734,9 +734,8 @@ static inline int ata_id_is_cfa(const u1
 	if (id[ATA_ID_CONFIG] == 0x848A)	/* Standard CF */

include/linux/ata.h static inline int ata_id_is_cfa(const u1 · line 741

Quoted 10 lines
include/linux/ata.h +2 -3
 		return 1;
 	/* Could be CF hiding as standard ATA */
-	if (ata_id_major_version(id) >= 3 &&
-	    id[ATA_ID_COMMAND_SET_1] != 0xFFFF &&
-	   (id[ATA_ID_COMMAND_SET_1] & (1 << 2)))
+	if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) == 0x4000 &&
+	    (id[ATA_ID_COMMAND_SET_2] & (1 << 2)))
 		return 1;
 	return 0;
 }
Quoted 8 lines

Jeff, Bart, I've changed my mind about recasting this patch as Alan
has requested, as I do consider it correct now. The version check should be unnecessary since I'm adding the validity bits check (hte fact that ata_id_major_complex() is quite cumbesome way of checking the minumum revision # -- this can be done with a single comparison instead of the bit scan). Note that words 64-127 were marked reserved, and must be set to 0 since ATA-1. Have your say please -- do I still need to recast the patch?

I'm fine with the current version -- validity checking should take care of handling reserved words (even if they are set to 0xff) and we can always add more detailed checks later if necessary (which is very unlikely)...

Thanks,
Bart

#21 lore raw
Quoted 35 lines · Bartlomiej Zolnierkiewicz
Quoted 26 lines
Quoted 24 lines · Hello, I wrote:

When checking for CFA feature set support, ata_id_is_cfa() tests bit 2 in word 82 of the identify data instead the word 83. It also checks the ATA revision in the word 80 instead of usual validity check for the words 82-83 -- word 83 bit 14 set, bit 15 cleared.

---
I'm not sure who should queue this patch... it's against Linus' tree.

include/linux/ata.h | 5 ++---

1 files changed, 2 insertions(+), 3 deletions(-)

Index: linux-2.6/include/linux/ata.h
===================================================================

include/linux/ata.h +0 -3
@@ -734,9 +734,8 @@ static inline int ata_id_is_cfa(const u1
 	if (id[ATA_ID_CONFIG] == 0x848A)	/* Standard CF */
 		return 1;
 	/* Could be CF hiding as standard ATA */
-	if (ata_id_major_version(id) >= 3 &&
-	    id[ATA_ID_COMMAND_SET_1] != 0xFFFF &&
-	   (id[ATA_ID_COMMAND_SET_1] & (1 << 2)))
Quoted 8 lines

include/linux/ata.h static inline int ata_id_is_cfa(const u1 · line 741

Quoted 5 lines
include/linux/ata.h +2 -0
+	if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) == 0x4000 &&
+	    (id[ATA_ID_COMMAND_SET_2] & (1 << 2)))
 		return 1;
 	return 0;
 }

Jeff, Bart, I've changed my mind about recasting this patch as Alan
has requested, as I do consider it correct now. The version check should be unnecessary since I'm adding the validity bits check (hte fact that ata_id_major_complex() is quite cumbesome way of checking the minumum revision # -- this can be done with a single comparison instead of the bit scan). Note that words 64-127 were marked reserved, and must be set to 0 since ATA-1. Have your say please -- do I still need to recast the patch?

Quoted 3 lines

I'm fine with the current version -- validity checking should take care of handling reserved words (even if they are set to 0xff) and we can always add more detailed checks later if necessary (which is very unlikely)...

The only improvement it needs is referring to the CF specs on why the
version check wasn't really ever correct.

MBR, Sergei

#22 lore raw
In reply to Sergei Shtylyov
Quoted 24 lines · Hello, I wrote:
Quoted 24 lines

When checking for CFA feature set support, ata_id_is_cfa() tests bit 2 in word 82 of the identify data instead the word 83. It also checks the ATA revision in the word 80 instead of usual validity check for the words 82-83 -- word 83 bit 14 set, bit 15 cleared.

---
I'm not sure who should queue this patch... it's against Linus' tree.

 include/linux/ata.h |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

Index: linux-2.6/include/linux/ata.h
===================================================================

include/linux/ata.h +0 -3
@@ -734,9 +734,8 @@ static inline int ata_id_is_cfa(const u1
     if (id[ATA_ID_CONFIG] == 0x848A)    /* Standard CF */
         return 1;
     /* Could be CF hiding as standard ATA */
-    if (ata_id_major_version(id) >= 3 &&
-        id[ATA_ID_COMMAND_SET_1] != 0xFFFF &&
-       (id[ATA_ID_COMMAND_SET_1] & (1 << 2)))
Quoted 8 lines

include/linux/ata.h static inline int ata_id_is_cfa(const u1 · line 741

Quoted 5 lines
include/linux/ata.h +2 -0
+    if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) == 0x4000 &&
+        (id[ATA_ID_COMMAND_SET_2] & (1 << 2)))
         return 1;
     return 0;
 }

Jeff, Bart, I've changed my mind about recasting this patch as Alan
has requested, as I do consider it correct now. The version check should be unnecessary since I'm adding the validity bits check

... replacing 0xFFFF check (with zero value got sorted out by testing bit
2) with it to be precise.

Quoted 1 line

(hte fact that ata_id_major_complex() is quite cumbesome way of checking the minumum revision # -- this can be done with a single comparison instead of the bit scan).

... "added to that" I meant to type.

MBR, Sergei

#23 lore raw

This is what I would favour:

libata: Fix CFA detection & improve version inlines

From: Alan Cox <[email protected]>

Sergei Shtylyov noticed thae ata_id_is_cfa checked the wrong word for the secondary CFA test and posted a patch set to improve this, but which removed the version checks.

This patch keeps the version checks but incorporates the other suggestions Sergei made including a better ata version check for the usual case where we want to know "is version >= x" rather than "what version do you support".

---

 drivers/ata/libata-core.c |    2 +-
 include/linux/ata.h       |   22 +++++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)
drivers/ata/libata-core.c +1 -1
index 88c2428..c17b62a 100644
@@ -2212,7 +2212,7 @@ retry:
 		 * Note that ATA4 says lba is mandatory so the second check
 		 * shoud never trigger.
 		 */
-		if (ata_id_major_version(id) < 4 || !ata_id_has_lba(id)) {
+		if (!ata_id_has_version(id, 4) || !ata_id_has_lba(id)) {
 			err_mask = ata_dev_init_params(dev, id[3], id[6]);
 			if (err_mask) {
 				rc = -EIO;
include/linux/ata.h +15 -7
index a53318b..e35d8de 100644
@@ -675,6 +675,13 @@ static inline unsigned int ata_id_major_version(const u16 *id)
 	return mver;
 }
 
+static inline int ata_id_has_version(const u16 *id, int v)
+{
+	if (id[ATA_ID_MAJOR_VER] == 0xFFFF)
+		return 0;
+	return (id[ATA_ID_MAJOR_VER] & (1 << v)) ? 1 : 0;
+}
+ 
 static inline int ata_id_is_sata(const u16 *id)
 {
 	/*
@@ -691,7 +698,7 @@ static inline int ata_id_is_sata(const u16 *id)
 static inline int ata_id_has_tpm(const u16 *id)
 {
 	/* The TPM bits are only valid on ATA8 */
-	if (ata_id_major_version(id) < 8)
+	if (!ata_id_has_version(id, 8))
 		return 0;
 	if ((id[48] & 0xC000) != 0x4000)
 		return 0;
@@ -701,7 +708,7 @@ static inline int ata_id_has_tpm(const u16 *id)
 static inline int ata_id_has_dword_io(const u16 *id)
 {
 	/* ATA 8 reuses this flag for "trusted" computing */
-	if (ata_id_major_version(id) > 7)
+	if (ata_id_has_version(id, 8))
 		return 0;
 	if (id[ATA_ID_DWORD_IO] & (1 << 0))
 		return 1;
@@ -710,7 +717,7 @@ static inline int ata_id_has_dword_io(const u16 *id)
 
 static inline int ata_id_has_unload(const u16 *id)
 {
-	if (ata_id_major_version(id) >= 7 &&
+	if (ata_id_has_version(id, 7) &&
 	    (id[ATA_ID_CFSSE] & 0xC000) == 0x4000 &&
 	    id[ATA_ID_CFSSE] & (1 << 13))
 		return 1;
@@ -734,15 +741,16 @@ static inline int ata_id_is_cfa(const u16 *id)
 	if (id[ATA_ID_CONFIG] == 0x848A)	/* Standard CF */
 		return 1;
 	/* Could be CF hiding as standard ATA */
-	if (ata_id_major_version(id) >= 3 &&
-	    id[ATA_ID_COMMAND_SET_1] != 0xFFFF &&
-	   (id[ATA_ID_COMMAND_SET_1] & (1 << 2)))
+	if (ata_id_has_version(id, 3) &&
+	   (id[ATA_ID_COMMAND_SET_2] & 0xC000) == 0x4000 &&
+	   (id[ATA_ID_COMMAND_SET_2] & (1 << 2)))
 		return 1;
 	return 0;
 }
 
 static inline int ata_id_is_ssd(const u16 *id)
 {
+	/* FIXME: Check validity of version */
 	return id[ATA_ID_ROT_SPEED] == 0x01;
 }
 
@@ -779,7 +787,7 @@ static inline int atapi_command_packet_set(const u16 *dev_id)
 
 static inline int atapi_id_dmadir(const u16 *dev_id)
 {
-	return ata_id_major_version(dev_id) >= 7 && (dev_id[62] & 0x8000);
+	return ata_id_has_version(dev_id, 7) && (dev_id[62] & 0x8000);
 }
 
 /*
author NAK
#24 lore raw
Quoted 9 lines · Alan Cox

This is what I would favour:

libata: Fix CFA detection & improve version inlines

From: Alan Cox <[email protected]>

Sergei Shtylyov noticed thae ata_id_is_cfa checked the wrong word for the secondary CFA test and posted a patch set to improve this, but which removed the version checks.

And did that completely correctly.

Quoted 4 lines

This patch keeps the version checks but incorporates the other suggestions Sergei made including a better ata version check for the usual case where we want to know "is version >= x" rather than "what version do you support".

Improvements should be mixed with fixes.

Quoted 1 line

NAK.

Quoted 8 lines
drivers/ata/libata-core.c +0 -0
index 88c2428..c17b62a 100644
include/linux/ata.h +0 -0
index a53318b..e35d8de 100644

[...]

include/linux/ata.h static inline int ata_id_is_cfa(const u16 *id) · line 744

Quoted 8 lines
include/linux/ata.h +1 -3
@@ -734,15 +741,16 @@ static inline int ata_id_is_cfa(const u16 *id)
 	if (id[ATA_ID_CONFIG] == 0x848A)	/* Standard CF */
 		return 1;
 	/* Could be CF hiding as standard ATA */
-	if (ata_id_major_version(id) >= 3 &&
-	    id[ATA_ID_COMMAND_SET_1] != 0xFFFF &&
-	   (id[ATA_ID_COMMAND_SET_1] & (1 << 2)))
+	if (ata_id_has_version(id, 3) &&

Refer to the CF specs (google for cfspc<x_><y>.pdf) as to why it's wrong.

WBR, Sergei

#25 lore raw
Quoted 10 lines · Hello, I wrote:
Quoted 9 lines

This is what I would favour:

libata: Fix CFA detection & improve version inlines

From: Alan Cox <[email protected]>

Sergei Shtylyov noticed thae ata_id_is_cfa checked the wrong word for the secondary CFA test and posted a patch set to improve this, but which removed the version checks.

Quoted 8 lines

And did that completely correctly.

Quoted 4 lines

This patch keeps the version checks but incorporates the other suggestions Sergei made including a better ata version check for the usual case where we want to know "is version >= x" rather than "what version do you support".

Improvements should be mixed with fixes.

Should not be, I meant to type.

WBR, Sergei

#26 lore raw
Quoted 3 lines
Quoted 1 line

Improvements should be mixed with fixes.

Should not be, I meant to type.

In this case it makes complete sense to do the work as one. I can pointlessly split it into two patches so you can generate twice as many complaints if it amuses you.

Alan

#27 lore raw
In reply to Sergei Shtylyov
Quoted 3 lines
Quoted 1 line

Improvements should be mixed with fixes.

Should not be, I meant to type.

You neglected to reply to the rest of the mail btw. If you are going to point people at CF specs without explanation as an response to something then perhaps you should bother to explain why you think that magically proves a point we disagree over

#28 lore raw
Quoted 8 lines · Alan Cox
Quoted 3 lines
Quoted 1 line

Improvements should be mixed with fixes.

Should not be, I meant to type.

You neglected to reply to the rest of the mail btw. If you are going to point people at CF specs without explanation as an response to something then perhaps you should bother to explain why you think that magically proves a point we disagree over

I have explained everything in the prior mail. I hadn't expect you to
start the patch fencing.

WBR, Sergei

#29 lore raw
Quoted 2 lines

I have explained everything in the prior mail. I hadn't expect you to
start the patch fencing.

I don't see an explanation just points I queried. I shall draw the obvious conclusion from the fact you don't feel like providing one

The logic is this

ATA-3 or higher - that word has a defined meaning
ATA < 3 that word should be 0x0000
pre ATA (EIDE) or head up backside implementations that would will be anything but usually 0x0000 or 0xFFFF

We cannot test for ATA < 3 because there is no version bit for it (and in fact identify is optional which I need to fix at some point by permitting geometry passing so that support is at parity with old IDE)

Therefore we want to check

	CFA signature -> CFA (good for CFA 1.1 and later devices using it)
	ATA >= 3 claimed - word is trustable bit is 0 or means CFA

Yes the implementation is paranoid, but having done ten years working for a distro dealing with PC hardware in volume day in and day out I've yet to regret being paranoid. Assuming every piece of hardware sucks, nobody ever read the standard and every BIOS table is wrong is a staple part of writing a robust OS for the PC platform.

Alan

#30 lore raw
Quoted 4 lines · Alan Cox
Quoted 2 lines

I have explained everything in the prior mail. I hadn't expect you to
start the patch fencing.

I don't see an explanation just points I queried.

Have you seen this mail:

http://marc.info/?l=linux-ide&m=123299798729575

If you haven't, read it. After you have, the argument must be over.

Quoted 10 lines

I shall draw the obvious conclusion from the fact you don't feel like providing one

The logic is this

ATA-3 or higher - that word has a defined meaning
ATA < 3 that word should be 0x0000
pre ATA (EIDE) or head up backside implementations that would will be anything but usually 0x0000 or 0xFFFF

We cannot test for ATA < 3 because there is no version bit for it

That's not quite true, read the ATA-3 standard better.

Quoted 4 lines

Therefore we want to check

	CFA signature -> CFA (good for CFA 1.1 and later devices using it)
	ATA >= 3 claimed - word is trustable bit is 0 or means CFA

The problem is that the CF specs explicitly forbid (!) to report anything
in word 80 -- it's reserved and must be 0.

Quoted 2 lines

Yes the implementation is paranoid, but having done ten years working for a distro dealing with PC hardware in volume day in and day out I've yet

Working while checking word 82 ISO word 83? Who are you trying to cheat?

Quoted 1 line

to regret being paranoid.

Again, I'm not seeing this kind of version paranoia in any place but the
one that was wrong: ata_id_is_cfa().

Quoted 3 lines

Assuming every piece of hardware sucks, nobody
ever read the standard and every BIOS table is wrong is a staple part of writing a robust OS for the PC platform.

Yes, we just had report of the CF drive which is totally unidentifiable...
but perhaps you still should start reading the specs as more manufacturers are doing it now and following them?

Quoted 1 line

Alan

MBR, Sergei

#31 lore raw
Quoted 18 lines · Hello, I wrote:
Quoted 10 lines

I shall draw the obvious conclusion from the fact you don't feel like providing one

The logic is this

ATA-3 or higher - that word has a defined meaning
ATA < 3 that word should be 0x0000
pre ATA (EIDE) or head up backside implementations that would will be anything but usually 0x0000 or 0xFFFF

We cannot test for ATA < 3 because there is no version bit for it

That's not quite true, read the ATA-3 standard better.

Quoted 4 lines

Therefore we want to check

CFA signature -> CFA (good for CFA 1.1 and later devices using it) ATA >= 3 claimed - word is trustable bit is 0 or means CFA

Quoted 7 lines

The problem is that the CF specs explicitly forbid (!) to report
anything in word 80 -- it's reserved and must be 0.

Quoted 2 lines

Yes the implementation is paranoid, but having done ten years working for a distro dealing with PC hardware in volume day in and day out I've yet

Working while checking word 82 ISO word 83? Who are you trying to cheat?

I'm sorry, that was totally off base. I've misread this whole paragraph in
haste. :-<
The rest of my evening was wasted, sigh.

MBR, Sergei

#32 lore raw
Quoted 3 lines

I'm sorry, that was totally off base. I've misread this whole paragraph in
haste. :-<
The rest of my evening was wasted, sigh.

If it got the CF code fixed it wasn't a waste.

Do I understand rightly that the agreed things to do are

- redo the version check patch using the signed check as you suggested and remove the changes to the CFA check from it
- make the CFA code check word 80 == 0 as a sanity check
- apply your change to check the bit in the right command word for CFA

?

Alan

#33 lore raw
Quoted 10 lines · Alan Cox
Quoted 3 lines

I'm sorry, that was totally off base. I've misread this whole paragraph in
haste. :-<
The rest of my evening was wasted, sigh.

If it got the CF code fixed it wasn't a waste.

Do I understand rightly that the agreed things to do are

- redo the version check patch using the signed check as you suggested and remove the changes to the CFA check from it

Yes, those shouldn't have been intermixed from the very start.

Quoted 1 line

- make the CFA code check word 80 == 0 as a sanity check

That'll work unless we bump into a drive that does follow ATA in that
matter. My vote would still be for ignoring the version...

Quoted 1 line

- apply your change to check the bit in the right command word for CFA

My change wasn't only that. I will repost it after some sleep -- with word
80 check for 0 if you're so adamant about it.

Quoted 1 line

Alan

MBR, Sergei

#34 lore raw
Quoted 11 lines · Hello, I wrote:
Quoted 10 lines
Quoted 3 lines

I'm sorry, that was totally off base. I've misread this whole
paragraph in haste. :-<
The rest of my evening was wasted, sigh.

If it got the CF code fixed it wasn't a waste.

Do I understand rightly that the agreed things to do are

- redo the version check patch using the signed check as you suggested and remove the changes to the CFA check from it

Quoted 6 lines

Yes, those shouldn't have been intermixed from the very start.

Quoted 1 line

- make the CFA code check word 80 == 0 as a sanity check

That'll work unless we bump into a drive that does follow ATA in that
matter.

... because it also does specify the CFA feature set (minus the exotic
PIO/DMA modes). That's what you get for the closed standards. And yet there seem to be CF drives in the wild that follow neither... :-/

MBR, Sergei

#35 lore raw
Quoted 7 lines · Hello, I wrote:
Quoted 4 lines
Quoted 1 line

- make the CFA code check word 80 == 0 as a sanity check

That'll work unless we bump into a drive that does follow ATA in
that matter.

... because it also does specify the CFA feature set (minus the
exotic PIO/DMA modes). That's what you get for the closed standards. And yet there seem to be CF drives in the wild that follow neither... :-/

... or are just not supporting the CFA feature set -- see
http://marc.info/?l=linux-ide&m=123263947330207 if you've missed that Kingston's wonder. :-/

MBR, Sergei

#36 lore raw
In reply to Alan Cox
Quoted 10 lines · Alan Cox
Quoted 2 lines

I have explained everything in the prior mail. I hadn't expect you to
start the patch fencing.

I don't see an explanation just points I queried. I shall draw the obvious conclusion from the fact you don't feel like providing one

The logic is this

ATA-3 or higher - that word has a defined meaning
ATA < 3 that word should be 0x0000

Dunno why but I removed my remark: they are reserved and so "shall be
zero" starting aith ATA-1. I've already stated that.

MBR, Sergei

#37 lore raw
In reply to Sergei Shtylyov

On Mon, 26 Jan 2009 22:28:51 +0300
Sergei Shtylyov <[email protected]> wrote

Quoted 4 lines
Quoted 2 lines

secondary CFA test and posted a patch set to improve this, but which removed the version checks.

And did that completely correctly.

In your opinion but as I've pointed out that seems incorrect so simply repeating ad-nauseum that your patch is correct isn't helpful.

Quoted 6 lines
Quoted 4 lines

This patch keeps the version checks but incorporates the other suggestions Sergei made including a better ata version check for the usual case where we want to know "is version >= x" rather than "what version do you support".

Improvements should be mixed with fixes.

They were.

Which is better than correcting things while intentionally adding flaws by removing sanity checks.

Quoted 1 line

Refer to the CF specs (google for cfspc<x_><y>.pdf) as to why it's wrong.

I've read the CF specs back to 1.1, and the ATA specs back to ATA-1. Prior to ATA-3 you can't rely on the test in question.

#38 lore raw
In reply to Alan Cox
Quoted 22 lines · Alan Cox

This is what I would favour:

libata: Fix CFA detection & improve version inlines

From: Alan Cox <[email protected]>

Sergei Shtylyov noticed thae ata_id_is_cfa checked the wrong word for the secondary CFA test and posted a patch set to improve this, but which removed the version checks.

This patch keeps the version checks but incorporates the other suggestions Sergei made including a better ata version check for the usual case where we want to know "is version >= x" rather than "what version do you support".

include/linux/ata.h +0 -0
index a53318b..e35d8de 100644

include/linux/ata.h static inline unsigned int ata_id_major_version(const u16 *id) · line 682

Quoted 8 lines
include/linux/ata.h +5 -0
@@ -675,6 +675,13 @@ static inline unsigned int ata_id_major_version(const u16 *id)
 	return mver;
 }
 
+static inline int ata_id_has_version(const u16 *id, int v)
+{
+	if (id[ATA_ID_MAJOR_VER] == 0xFFFF)
+		return 0;
+	return (id[ATA_ID_MAJOR_VER] & (1 << v)) ? 1 : 0;

Refer to afa_dev_cf_sata() on how it's done in really optimal way.

WBR, Sergei

#39 lore raw
Quoted 6 lines

include/linux/ata.h static inline unsigned int ata_id_major_version(const u16 *id) · line 682

Quoted 4 lines
include/linux/ata.h +3 -0
+	if (id[ATA_ID_MAJOR_VER] == 0xFFFF)
+		return 0;
+	return (id[ATA_ID_MAJOR_VER] & (1 << v)) ? 1 : 0;

Refer to afa_dev_cf_sata() on how it's done in really optimal way.

To what ? - there is no ata or afa_dev_cf_sata ?

#40 lore raw
Quoted 7 lines · Alan Cox
Quoted 5 lines

include/linux/ata.h static inline unsigned int ata_id_major_version(const u16 *id) · line 682

Quoted 3 lines
include/linux/ata.h +3 -0
+	if (id[ATA_ID_MAJOR_VER] == 0xFFFF)
+		return 0;
+	return (id[ATA_ID_MAJOR_VER] & (1 << v)) ? 1 : 0;

Refer to afa_dev_cf_sata() on how it's done in really optimal way.

To what ? - there is no ata or afa_dev_cf_sata ?

Very funny. Meant to be ata_dev_is_sata(), of course.

MBR, Sergei

#41 lore raw
Quoted 11 lines · On Mon, 26 Jan 2009 22:45:00 +0300 Sergei Shtylyov <[email protected]>…
Quoted 7 lines · Alan Cox
Quoted 5 lines

include/linux/ata.h static inline unsigned int ata_id_major_version(const u16 *id) · line 682

Quoted 3 lines
include/linux/ata.h +3 -0
+	if (id[ATA_ID_MAJOR_VER] == 0xFFFF)
+		return 0;
+	return (id[ATA_ID_MAJOR_VER] & (1 << v)) ? 1 : 0;

Refer to afa_dev_cf_sata() on how it's done in really optimal way.

To what ? - there is no ata or afa_dev_cf_sata ?

Very funny. Meant to be ata_dev_is_sata(), of course.

We don't have one of those either - do you mean ata_id_is_sata ? If so then yes that looks like it might be slightly cleaner although its probably one instruction difference from the .s files.

I'll redo it that way

#42 lore raw
Quoted 6 lines · Alan Cox
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

include/linux/ata.h static inline unsigned int ata_id_major_version(const u16 *id) · line 682

Quoted 3 lines
include/linux/ata.h +3 -0
+	if (id[ATA_ID_MAJOR_VER] == 0xFFFF)
+		return 0;
+	return (id[ATA_ID_MAJOR_VER] & (1 << v)) ? 1 : 0;

Refer to afa_dev_cf_sata() on how it's done in really optimal way.

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

To what ? - there is no ata or afa_dev_cf_sata ?

Very funny. Meant to be ata_dev_is_sata(), of course.

We don't have one of those either - do you mean ata_id_is_sata ? If so then yes that looks like it might be slightly cleaner although its probably one instruction difference from the .s files.

That extra *if* cost more than instruction I think.

Quoted 1 line

I'll redo it that way

OK, just leave ata_dev_is_cfa() alone and rename the patch.

WBR, Sergei

#43 lore raw
Quoted 10 lines · Sergei Shtylyov
Quoted 7 lines · Alan Cox
Quoted 7 lines
Quoted 7 lines
Quoted 5 lines

include/linux/ata.h static inline unsigned int ata_id_major_version(const u16 *id) · line 682

Quoted 3 lines
include/linux/ata.h +3 -0
+    if (id[ATA_ID_MAJOR_VER] == 0xFFFF)
+        return 0;
+    return (id[ATA_ID_MAJOR_VER] & (1 << v)) ? 1 : 0;

Refer to afa_dev_cf_sata() on how it's done in really optimal way.

To what ? - there is no ata or afa_dev_cf_sata ?

Quoted 7 lines
Quoted 5 lines
Quoted 1 line

Very funny. Meant to be ata_dev_is_sata(), of course.

We don't have one of those either - do you mean ata_id_is_sata ? If so then yes that looks like it might be slightly cleaner although its probably one instruction difference from the .s files.

That extra *if* cost more than instruction I think.

Either way, this is irrelevant, since this isn't used in any hot path that I am aware of... :)

Alan just posted a reasonable explanation in the "The logic is this" email, maybe we can reboot the discussion from there?

Responding to a side point, I don't think its a big deal to combine fixes and improvements into a single patch, if you are dealing with the same few lines of code. Just make sure the patch description (and/or code comment) enumerates the fixes and improvements both...

Jeff

#44 lore raw

Hello.

Quoted 14 lines · Jeff Garzik
Quoted 13 lines
Quoted 13 lines
Quoted 9 lines
Quoted 7 lines
Quoted 5 lines

Review

Quoted 3 lines
(quoted diff) +3 -0
+    if (id[ATA_ID_MAJOR_VER] == 0xFFFF)
+        return 0;
+    return (id[ATA_ID_MAJOR_VER] & (1 << v)) ? 1 : 0;

Refer to afa_dev_cf_sata() on how it's done in really optimal way.

To what ? - there is no ata or afa_dev_cf_sata ?

Very funny. Meant to be ata_dev_is_sata(), of course.

We don't have one of those either - do you mean ata_id_is_sata ? If so then yes that looks like it might be slightly cleaner although its probably one instruction difference from the .s files.

Quoted 5 lines
Quoted 1 line

That extra *if* cost more than instruction I think.

Either way, this is irrelevant, since this isn't used in any hot path that I am aware of... :)

Alan just posted a reasonable explanation in the "The logic is this" email, maybe we can reboot the discussion from there?

Please read all the thread, and you'll see that Alan's CFA patch was
totally wrong in that part from the very start -- CF devices don't report ATA standard support in word 80, that's forbidden (!) by the CF specs since at least 2.1.

Quoted 1 line

Responding to a side point, I don't think its a big deal to combine fixes and improvements into a single patch, if you are dealing with the same few lines of code.

Not the case here -- the fix is very local, improvements are spread over
several inlines.

Quoted 1 line

Jeff

MBR, Sergei

#45 lore raw
Quoted 3 lines

totally wrong in that part from the very start -- CF devices don't report ATA standard support in word 80, that's forbidden (!) by the CF specs since at least 2.1.

And the ATA world says that if word 80 doesn't report any standards then the word is potentially undefined....welcome to PC hell

Perhaps the best we can do is to test

	word 80 == 0 && word 83 bit set && word 83 valid

Fortunately the use is almost entirely to print the right CFA/ATA string at boot ?

Now Sergei if you'd said that explicitly (or if you did before I didn't see it) it would have been a bit simpler to work out why you were arguing the needed for these changes.

Alan

#46 lore raw
Quoted 4 lines · Alan Cox
Quoted 1 line

totally wrong in that part from the very start -- CF devices don't report ATA standard support in word 80, that's forbidden (!) by the CF specs since at least 2.1.

And the ATA world says that if word 80 doesn't report any standards then the word is potentially undefined....

It's all your fantasy this time. :-D
Do start reading the specs attentively. All ATA standards only have that
if bits 14:15 are not 1:0, the words are not valid (as a variant, if the word is 0 or 0xFFFF).

Quoted 1 line

welcome to PC hell

I've started on PCs, and spent "the best years of my life" with them -- no
need to welcome me. :-)

Quoted 6 lines

Perhaps the best we can do is to test

	word 80 == 0 && word 83 bit set && word 83 valid

Fortunately the use is almost entirely to print the right CFA/ATA string at boot ?

What about PIO/DMA modes?

Quoted 3 lines

Now Sergei if you'd said that explicitly (or if you did before I didn't see it) it would have been a bit simpler to work out why you were arguing the needed for these changes.

If you think that I now have plenty of time to look into all the CF and
ATA standard, you are very wrong. However, you caused me to lose much time on that pointless argument...

Quoted 1 line

Alan

MBR, Sergei

#47 lore raw
In reply to Alan Cox

Hello.

Quoted 6 lines · Alan Cox
Quoted 2 lines

totally wrong in that part from the very start -- CF devices don't report ATA standard support in word 80, that's forbidden (!) by the CF specs since at least 2.1.

And the ATA world says that if word 80 doesn't report any standards then the word is potentially undefined....welcome to PC hell

Quoted 7 lines

Perhaps the best we can do is to test

	word 80 == 0 && word 83 bit set && word 83 valid

Fortunately the use is almost entirely to print the right CFA/ATA string at boot ?

There was intent to use it for filtering out DMA modes on incapable
CF slots, for the lack of better criterion -- these slots usually has a master/slave switch connected, so can't be tied to the drive #, only to the channel # and the board's DMI ID.

Quoted 4 lines

Now Sergei if you'd said that explicitly (or if you did before I didn't see it) it would have been a bit simpler to work out why you were arguing the needed for these changes.

I was arguing entirely out of thinking that the version check is not
really needed. The fact that CF spec. forbids reporting it was a surprise to me as well.

Quoted 2 lines

Alan

MBR, Sergei

#48 lore raw
In reply to Sergei Shtylyov
Quoted 11 lines · Hello, I wrote:
Quoted 11 lines
Quoted 9 lines
Quoted 7 lines
Quoted 5 lines

include/linux/ata.h static inline unsigned int ata_id_major_version(const u16 *id) · line 682

Quoted 3 lines
include/linux/ata.h +3 -0
+    if (id[ATA_ID_MAJOR_VER] == 0xFFFF)
+        return 0;
+    return (id[ATA_ID_MAJOR_VER] & (1 << v)) ? 1 : 0;

Refer to afa_dev_cf_sata() on how it's done in really optimal way.

To what ? - there is no ata or afa_dev_cf_sata ?

Very funny. Meant to be ata_dev_is_sata(), of course.

We don't have one of those either - do you mean ata_id_is_sata ?

Sure I have, just got used to its original name, ide_dev_is_sata().

Quoted 4 lines
Quoted 2 lines

If so then yes that looks like it might be slightly cleaner although its probably one instruction difference from the .s files.

That extra *if* cost more than instruction I think.

At least 2 on x86.

Quoted 3 lines
Quoted 1 line

I'll redo it that way

OK, just leave ata_dev_is_cfa() alone and rename the patch.

Just reposted my patch with better description.

MBR, Sergei

#49 lore raw
In reply to Alan Cox

Hello.

Quoted 7 lines · Alan Cox

This patch keeps the version checks but incorporates the other suggestions Sergei made including a better ata version check for the usual case where we want to know "is version >= x" rather than "what version do you support".

[...]

Quoted 30 lines
drivers/ata/libata-core.c +1 -1
index 88c2428..c17b62a 100644
@@ -2212,7 +2212,7 @@ retry:
 		 * Note that ATA4 says lba is mandatory so the second check
 		 * shoud never trigger.
 		 */
-		if (ata_id_major_version(id) < 4 || !ata_id_has_lba(id)) {
+		if (!ata_id_has_version(id, 4) || !ata_id_has_lba(id)) {
 			err_mask = ata_dev_init_params(dev, id[3], id[6]);
 			if (err_mask) {
 				rc = -EIO;
include/linux/ata.h +7 -0
index a53318b..e35d8de 100644
@@ -675,6 +675,13 @@ static inline unsigned int ata_id_major_version(const u16 *id)
 	return mver;
 }
 
+static inline int ata_id_has_version(const u16 *id, int v)
+{
+	if (id[ATA_ID_MAJOR_VER] == 0xFFFF)
+		return 0;
+	return (id[ATA_ID_MAJOR_VER] & (1 << v)) ? 1 : 0;
+}
+ 
 

include/linux/ata.h static inline int ata_id_is_sata(const u16 *id) · line 702

Quoted 6 lines
include/linux/ata.h +1 -1
@@ -691,7 +698,7 @@ static inline int ata_id_is_sata(const u16 *id)
 static inline int ata_id_has_tpm(const u16 *id)
 {
 	/* The TPM bits are only valid on ATA8 */
-	if (ata_id_major_version(id) < 8)
+	if (!ata_id_has_version(id, 8))
 		return 0;

Note that this is not equivalent to the old code which didn't require
the bit v to be set, just some bits above it.

MBR, Sergei