git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
string: factorize skip_spaces and export it to be generally available
[safe/jmp/linux-2.6]
/
include
/
linux
/
ata.h
diff --git
a/include/linux/ata.h
b/include/linux/ata.h
index
e2595e8
..
38a6948
100644
(file)
--- a/
include/linux/ata.h
+++ b/
include/linux/ata.h
@@
-75,6
+75,7
@@
enum {
ATA_ID_EIDE_DMA_TIME = 66,
ATA_ID_EIDE_PIO = 67,
ATA_ID_EIDE_PIO_IORDY = 68,
ATA_ID_EIDE_DMA_TIME = 66,
ATA_ID_EIDE_PIO = 67,
ATA_ID_EIDE_PIO_IORDY = 68,
+ ATA_ID_ADDITIONAL_SUPP = 69,
ATA_ID_QUEUE_DEPTH = 75,
ATA_ID_MAJOR_VER = 80,
ATA_ID_COMMAND_SET_1 = 82,
ATA_ID_QUEUE_DEPTH = 75,
ATA_ID_MAJOR_VER = 80,
ATA_ID_COMMAND_SET_1 = 82,
@@
-816,6
+817,16
@@
static inline int ata_id_has_trim(const u16 *id)
return 0;
}
return 0;
}
+static inline int ata_id_has_zero_after_trim(const u16 *id)
+{
+ /* DSM supported, deterministic read, and read zero after trim set */
+ if (ata_id_has_trim(id) &&
+ (id[ATA_ID_ADDITIONAL_SUPP] & 0x4020) == 0x4020)
+ return 1;
+
+ return 0;
+}
+
static inline int ata_id_current_chs_valid(const u16 *id)
{
/* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command
static inline int ata_id_current_chs_valid(const u16 *id)
{
/* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command
@@
-971,17
+982,17
@@
static inline void ata_id_to_hd_driveid(u16 *id)
}
/*
}
/*
- * Write
up to 'max' LBA Range Entries to the buffer that will cover the
- *
extent from sector to sector + count. This is used for TRIM and for
- *
ADD LBA(S)
TO NV CACHE PINNED SET.
+ * Write
LBA Range Entries to the buffer that will cover the extent from
+ *
sector to sector + count. This is used for TRIM and for ADD LBA(S)
+ * TO NV CACHE PINNED SET.
*/
*/
-static inline unsigned ata_set_lba_range_entries(void *_buffer,
unsigned max,
-
u64 sector, unsigned long count)
+static inline unsigned ata_set_lba_range_entries(void *_buffer,
+
unsigned buf_size,
u64 sector, unsigned long count)
{
__le64 *buffer = _buffer;
{
__le64 *buffer = _buffer;
- unsigned i = 0;
+ unsigned i = 0
, used_bytes
;
- while (i <
max) {
+ while (i <
buf_size / 8 ) { /* 6-byte LBA + 2-byte range per entry */
u64 entry = sector |
((u64)(count > 0xffff ? 0xffff : count) << 48);
buffer[i++] = __cpu_to_le64(entry);
u64 entry = sector |
((u64)(count > 0xffff ? 0xffff : count) << 48);
buffer[i++] = __cpu_to_le64(entry);
@@
-991,9
+1002,9
@@
static inline unsigned ata_set_lba_range_entries(void *_buffer, unsigned max,
sector += 0xffff;
}
sector += 0xffff;
}
-
max
= ALIGN(i * 8, 512);
- memset(buffer + i, 0,
max
- i * 8);
- return
max
;
+
used_bytes
= ALIGN(i * 8, 512);
+ memset(buffer + i, 0,
used_bytes
- i * 8);
+ return
used_bytes
;
}
static inline int is_multi_taskfile(struct ata_taskfile *tf)
}
static inline int is_multi_taskfile(struct ata_taskfile *tf)