diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-23 21:40:32 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-23 21:40:32 -0800 |
| commit | 4fa2b1cde0e3797549f711ce9e51c395b3d6d2a7 (patch) | |
| tree | 312e07715c088d4ed1e79b9b18b1d52e3b585ca9 /include | |
| parent | bdc08942897f6be33d00bb659761516f4652836d (diff) | |
| parent | 4cdfa1b3ce4731dd538ac3ed010bcf127ed6e836 (diff) | |
| download | blackbird-op-linux-4fa2b1cde0e3797549f711ce9e51c395b3d6d2a7.tar.gz blackbird-op-linux-4fa2b1cde0e3797549f711ce9e51c395b3d6d2a7.zip | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata-core: fix kernel-doc warning
sata_fsl: fix build with ATA_VERBOSE_DEBUG
[libata] ahci: AMD SB700/SB800 SATA support 64bit DMA
libata-pmp: clear hob for pmp register accesses
libata: automatically use DMADIR if drive/bridge requires it
power_state: get rid of write-only variable in SATA
pata_atiixp: Use 255 sector limit
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ata.h | 5 | ||||
| -rw-r--r-- | include/linux/libata.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/ata.h b/include/linux/ata.h index 78bbacaed8c4..1c622e2b0504 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h @@ -659,6 +659,11 @@ static inline int atapi_command_packet_set(const u16 *dev_id) return (dev_id[0] >> 8) & 0x1f; } +static inline int atapi_id_dmadir(const u16 *dev_id) +{ + return ata_id_major_version(dev_id) >= 7 && (dev_id[62] & 0x8000); +} + static inline int is_multi_taskfile(struct ata_taskfile *tf) { return (tf->command == ATA_CMD_READ_MULTI) || diff --git a/include/linux/libata.h b/include/linux/libata.h index ce7603a73156..a05f60013642 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -138,6 +138,7 @@ enum { ATA_DFLAG_AN = (1 << 7), /* AN configured */ ATA_DFLAG_HIPM = (1 << 8), /* device supports HIPM */ ATA_DFLAG_DIPM = (1 << 9), /* device supports DIPM */ + ATA_DFLAG_DMADIR = (1 << 10), /* device requires DMADIR */ ATA_DFLAG_CFG_MASK = (1 << 12) - 1, ATA_DFLAG_PIO = (1 << 12), /* device limited to PIO mode */ |
