diff mbox

libata-scsi: fix D_SENSE bit relection in control mode page

Message ID 57852a86.460b420a.faeba.0b28@mx.google.com
State Not Applicable
Delegated to: David Miller
Headers show

Commit Message

Tom Yan July 12, 2016, 5:35 p.m. UTC 
From: Tom Yan <tom.ty89@gmail.com>

The bit should always be set to 1 when the requested version of
page is "changeable" because we've made it so in ata_mselect_control().
Also, it should always be set to 1 if ATA_DFLAG_D_SENSE is set (when
the requested version of page is "current" or "default").

Signed-off-by: Tom Yan <tom.ty89@gmail.com>

Comments

Tom Yan July 12, 2016, 5:45 p.m. UTC | #1 
Btw, why is the MODE SELECT function called ata_mselect_control()
while the MODE SENSE function is called ata_msense_ctl_mode()?
Shouldn't we make their names consistent?

On 13 July 2016 at 01:35,  <tom.ty89@gmail.com> wrote:
> From: Tom Yan <tom.ty89@gmail.com>
>
> The bit should always be set to 1 when the requested version of
> page is "changeable" because we've made it so in ata_mselect_control().
> Also, it should always be set to 1 if ATA_DFLAG_D_SENSE is set (when
> the requested version of page is "current" or "default").
>
> Signed-off-by: Tom Yan <tom.ty89@gmail.com>
>
> diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
> index bfec66f..7e24f0a 100644
> --- a/drivers/ata/libata-scsi.c
> +++ b/drivers/ata/libata-scsi.c
> @@ -2446,7 +2446,7 @@ static unsigned int ata_msense_ctl_mode(struct ata_device *dev, u8 *buf,
>                                         bool changeable)
>  {
>         modecpy(buf, def_control_mpage, sizeof(def_control_mpage), changeable);
> -       if (changeable && (dev->flags & ATA_DFLAG_D_SENSE))
> +       if (changeable || (dev->flags & ATA_DFLAG_D_SENSE))
>                 buf[2] |= (1 << 2);     /* Descriptor sense requested */
>         return sizeof(def_control_mpage);
>  }
> --
> 2.9.0
>
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tejun Heo July 12, 2016, 6:39 p.m. UTC | #2 
On Wed, Jul 13, 2016 at 01:45:21AM +0800, Tom Yan wrote:
> Btw, why is the MODE SELECT function called ata_mselect_control()
> while the MODE SENSE function is called ata_msense_ctl_mode()?
> Shouldn't we make their names consistent?

Sure, please go ahead.

Thanks.
diff mbox

Patch

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index bfec66f..7e24f0a 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -2446,7 +2446,7 @@  static unsigned int ata_msense_ctl_mode(struct ata_device *dev, u8 *buf,
 					bool changeable)
 {
 	modecpy(buf, def_control_mpage, sizeof(def_control_mpage), changeable);
-	if (changeable && (dev->flags & ATA_DFLAG_D_SENSE))
+	if (changeable || (dev->flags & ATA_DFLAG_D_SENSE))
 		buf[2] |= (1 << 2);	/* Descriptor sense requested */
 	return sizeof(def_control_mpage);
 }