1 files changed, 9 insertions, 3 deletions

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 340a616d226b..e1e186b9dfcc 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -2115,8 +2115,10 @@ static unsigned int ata_scsiop_inq_b0(struct ata_scsi_args *args, u8 *rbuf)
          * that we support some form of unmap - in thise case via WRITE SAME
          * with the unmap bit set.
          */
-        if (ata_id_has_trim(args->id))
+        if (ata_id_has_trim(args->id)) {
+                put_unaligned_be32(65535 * 512 / 8, &rbuf[20]);
                 put_unaligned_be32(1, &rbuf[28]);
+        }
 
         return 0;
 }
@@ -2411,8 +2413,12 @@ static unsigned int ata_scsiop_read_cap(struct ata_scsi_args *args, u8 *rbuf)
                 rbuf[14] = (lowest_aligned >> 8) & 0x3f;
                 rbuf[15] = lowest_aligned;
 
-                if (ata_id_has_trim(args->id))
-                        rbuf[14] |= 0x80;
+                if (ata_id_has_trim(args->id)) {
+                        rbuf[14] |= 0x80; /* TPE */
+
+                        if (ata_id_has_zero_after_trim(args->id))
+                                rbuf[14] |= 0x40; /* TPRZ */
+                }
         }
 
         return 0;