diff options
author | Marc Carino <marc.ceeeee@gmail.com> | 2013-08-24 23:22:48 -0700 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2013-08-25 09:39:11 -0400 |
commit | 8be5ad9acb7c11b9d717bcdbe3d6de0dab081a39 (patch) | |
tree | 528bb497df99021c96fef990ccd4b3ae1b248e28 /drivers/ata | |
parent | f1bc1e4c44b1b78fe34431936c60759b5aad5e3f (diff) | |
download | linux-8be5ad9acb7c11b9d717bcdbe3d6de0dab081a39.tar.bz2 |
libata: Populate host-to-device FIS "auxiliary" field
SATA 3.1 added an "auxiliary" field to the host-to-device FIS.
Populate the host-to-device FIS with the new field via the
taskfile struct.
Signed-off-by: Marc Carino <marc.ceeeee@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/libata-core.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 39e78e4524a3..2b4e92568850 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -546,6 +546,8 @@ int atapi_cmd_type(u8 opcode) */ void ata_tf_to_fis(const struct ata_taskfile *tf, u8 pmp, int is_cmd, u8 *fis) { + const __le32 aux = cpu_to_le32(tf->auxiliary); + fis[0] = 0x27; /* Register - Host to Device FIS */ fis[1] = pmp & 0xf; /* Port multiplier number*/ if (is_cmd) @@ -569,10 +571,10 @@ void ata_tf_to_fis(const struct ata_taskfile *tf, u8 pmp, int is_cmd, u8 *fis) fis[14] = 0; fis[15] = tf->ctl; - fis[16] = 0; - fis[17] = 0; - fis[18] = 0; - fis[19] = 0; + fis[16] = aux & 0xff; + fis[17] = (aux >> 8) & 0xff; + fis[18] = (aux >> 16) & 0xff; + fis[19] = (aux >> 24) & 0xff; } /** |