aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-15 12:04:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-15 12:04:49 -0700
commit8c21f34126222239450717b78dda0c4962d9ebfa (patch)
tree3ed64c828f8bf8896e684a6ae471ed56b926b0d8 /include
parent3346857f6fab1d6d1237a3ec7cfa159ec9b52db5 (diff)
parent4bca3286433585b5f1c3e7d8ac37a2f4b3def9ca (diff)
downloadmrst-s0i3-test-8c21f34126222239450717b78dda0c4962d9ebfa.tar.gz
mrst-s0i3-test-8c21f34126222239450717b78dda0c4962d9ebfa.tar.xz
mrst-s0i3-test-8c21f34126222239450717b78dda0c4962d9ebfa.zip
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: Media rotation rate and form factor heuristics libata: Report disk alignment and physical block size sata_fsl: Fix the command description of FSL SATA controller sata_fsl: Fix compile warnings [libata] sata_sx4: fixup interrupt handling [libata] sata_sx4: convert to new exception handling methods
Diffstat (limited to 'include')
-rw-r--r--include/linux/ata.h28
1 files changed, 28 insertions, 0 deletions
diff --git a/include/linux/ata.h b/include/linux/ata.h
index cb79b7a208e..915da43edee 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -730,6 +730,34 @@ static inline int ata_id_has_unload(const u16 *id)
return 0;
}
+static inline int ata_id_form_factor(const u16 *id)
+{
+ u16 val = id[168];
+
+ if (ata_id_major_version(id) < 7 || val == 0 || val == 0xffff)
+ return 0;
+
+ val &= 0xf;
+
+ if (val > 5)
+ return 0;
+
+ return val;
+}
+
+static inline int ata_id_rotation_rate(const u16 *id)
+{
+ u16 val = id[217];
+
+ if (ata_id_major_version(id) < 7 || val == 0 || val == 0xffff)
+ return 0;
+
+ if (val > 1 && val < 0x401)
+ return 0;
+
+ return val;
+}
+
static inline int ata_id_has_trim(const u16 *id)
{
if (ata_id_major_version(id) >= 7 &&