ata: add ata_id_pio_need_iordy() helper
PATCH 1/3 ata: add ata_id_pio_need_iordy() helper
---
against Linus' tree
include/linux/ata.h | 11 +++++++++++ 1 file changed, 11 insertions(+)
include/linux/ata.h +11 -0
@@ -800,6 +800,17 @@ static inline int ata_id_is_ssd(const u1return id[ATA_ID_ROT_SPEED ] ==0x01 ; } +static inline int ata_id_pio_need_iordy (const u16 *id,const u8 pio) +{ +/* CF spec. r4.1 Table 22 says no IORDY on PIO5 and PIO6. */ +if (ata_id_is_cfa (id) && pio >4 ) +return 0 ; +/* PIO3 and higher it is mandatory. */ +if (pio >2 ||ata_id_has_iordy (id)) +return 1 ; +return 0 ; +} +static inline int ata_drive_40wire (const u16 *dev_id) {if (ata_id_is_sata (dev_id))
Hello.
Quoted 13 lines · Bartlomiej Zolnierkiewicz
Cc Jeff Garzik <[email protected]>Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>---
against Linus' treeinclude/linux/ata.h | 11 +++++++++++ 1 file changed, 11 insertions(+)Index:
b/include/linux/ata.h
===================================================================
include/linux/ata.h static inline int ata_id_is_ssd(const u1 · line 809
Quoted 10 lines
include/linux/ata.h +6
-0@@ -800,6 +800,17 @@ static inline int ata_id_is_ssd(const u1return id[ATA_ID_ROT_SPEED ] ==0x01 ; } +static inline int ata_id_pio_need_iordy (const u16 *id,const u8 pio) +{ +/* CF spec. r4.1 Table 22 says no IORDY on PIO5 and PIO6. */ +if (ata_id_is_cfa (id) && pio >4 ) +return 0 ; +/* PIO3 and higher it is mandatory. */
You need some puncuation between "higher" and "it" -- colon or long
dash... either that or "for" at the start of the statement. :-)
Quoted 9 lines
include/linux/ata.h +5
-0+if (pio >2 ||ata_id_has_iordy (id)) +return 1 ; +return 0 ; +} +static inline int ata_drive_40wire (const u16 *dev_id) {if (
ata_id_is_sata(dev_id))
MBR, Sergei
Hello.
Quoted 13 lines · Bartlomiej Zolnierkiewicz
Cc Jeff Garzik <[email protected]>Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>---
against Linus' treeinclude/linux/ata.h | 11 +++++++++++ 1 file changed, 11 insertions(+)Index:
b/include/linux/ata.h
===================================================================
include/linux/ata.h static inline int ata_id_is_ssd(const u1 · line 807
Quoted 8 lines
include/linux/ata.h +4
-0@@ -800,6 +800,17 @@ static inline int ata_id_is_ssd(const u1return id[ATA_ID_ROT_SPEED ] ==0x01 ; } +static inline int ata_id_pio_need_iordy (const u16 *id,const u8 pio) +{ +/* CF spec. r4.1 Table 22 says no IORDY on PIO5 and PIO6. */ +if (ata_id_is_cfa (id) && pio >4 )
It actually makes sense to put the cheap 'pio' check first. We
shouldn't call ata_id_is_cfa() for all modes.
include/linux/ata.h static inline int ata_id_is_ssd(const u1 · line 813
Quoted 7 lines
include/linux/ata.h +7
-0+return 0 ; +/* PIO3 and higher it is mandatory. */ +if (pio >2 ||ata_id_has_iordy (id)) +return 1 ; +return 0 ; +} +
MBR, Sergei
Quoted 20 lines · On Saturday 13 June 2009 22:49:26 Sergei Shtylyov wrote:
Hello.
Quoted 16 lines · Bartlomiej Zolnierkiewicz
Cc Jeff Garzik <[email protected]>Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>---
against Linus' treeinclude/linux/ata.h | 11 +++++++++++ 1 file changed, 11 insertions(+)Index:
b/include/linux/ata.h
===================================================================include/linux/ata.h +0
-0@@ -800,6 +800,17 @@ static inline int ata_id_is_ssd(const u1return id[ATA_ID_ROT_SPEED ] ==0x01 ; }
Quoted 8 lines
include/linux/ata.h static inline int ata_id_is_ssd(const u1 · line 807
Quoted 5 lines
include/linux/ata.h +4
-0+static inline int ata_id_pio_need_iordy (const u16 *id,const u8 pio) +{ +/* CF spec. r4.1 Table 22 says no IORDY on PIO5 and PIO6. */ +if (ata_id_is_cfa (id) && pio >4 )It actually makes sense to put the cheap 'pio' check first. We
shouldn't callata_id_is_cfa()for all modes.
It is a micro-optimization but why not... revised version follows.
From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ata: add ata_id_pio_need_iordy() helper (v2)
v2:
Minor fixes per Sergei's review.
---
against Linus' tree
include/linux/ata.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
include/linux/ata.h +14 -0
@@ -800,6 +800,20 @@ static inline int ata_id_is_ssd(const u1return id[ATA_ID_ROT_SPEED ] ==0x01 ; } +static inline int ata_id_pio_need_iordy (const u16 *id,const u8 pio) +{ +/* CF spec. r4.1 Table 22 says no IORDY on PIO5 and PIO6. */ +if (pio >4 &&ata_id_is_cfa (id)) +return 0 ; +/* For PIO3 and higher it is mandatory. */ +if (pio >2 ) +return 1 ; +/* Turn it on when possible. */ +if (ata_id_has_iordy (id)) +return 1 ; +return 0 ; +} +static inline int ata_drive_40wire (const u16 *dev_id) {if (ata_id_is_sata (dev_id))
Quoted 56 lines · Bartlomiej Zolnierkiewicz
Quoted 20 lines · On Saturday 13 June 2009 22:49:26 Sergei Shtylyov wrote:
Hello.
Quoted 16 lines · Bartlomiej Zolnierkiewicz
Cc Jeff Garzik <[email protected]>Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>---
against Linus' treeinclude/linux/ata.h | 11 +++++++++++ 1 file changed, 11 insertions(+)Index:
b/include/linux/ata.h
===================================================================include/linux/ata.h +0
-0@@ -800,6 +800,17 @@ static inline int ata_id_is_ssd(const u1return id[ATA_ID_ROT_SPEED ] ==0x01 ; }Quoted 7 lines
include/linux/ata.h static inline int ata_id_is_ssd(const u1
Quoted 5 lines
include/linux/ata.h +4
-0+static inline int ata_id_pio_need_iordy (const u16 *id,const u8 pio) +{ +/* CF spec. r4.1 Table 22 says no IORDY on PIO5 and PIO6. */ +if (ata_id_is_cfa (id) && pio >4 )It actually makes sense to put the cheap 'pio' check first. We
shouldn't callata_id_is_cfa()for all modes.It is a micro-optimization but why not... revised version follows.
From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ata: addata_id_pio_need_iordy()helper (v2)v2:
Minor fixes per Sergei's review.Cc Sergei Shtylyov <[email protected]>Cc Jeff Garzik <[email protected]>Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>---
against Linus' treeinclude/linux/ata.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+)Index:
b/include/linux/ata.h
===================================================================include/linux/ata.h +2
-0@@ -800,6 +800,20 @@ static inline int ata_id_is_ssd(const u1return id[ATA_ID_ROT_SPEED ] ==0x01 ; } +static inline int ata_id_pio_need_iordy (const u16 *id,const u8 pio) +{
include/linux/ata.h static inline int ata_id_is_ssd(const u1 · line 814
Quoted 10 lines
include/linux/ata.h +10
-0+/* CF spec. r4.1 Table 22 says no IORDY on PIO5 and PIO6. */ +if (pio >4 &&ata_id_is_cfa (id)) +return 0 ; +/* For PIO3 and higher it is mandatory. */ +if (pio >2 ) +return 1 ; +/* Turn it on when possible. */ +if (ata_id_has_iordy (id)) +return 1 ; +return 0 ;
ACK