* [PATCH] libata: Include WWN ID in inquiry VPD emulation
@ 2011-03-04 8:55 Hannes Reinecke
2011-03-04 11:17 ` Sergei Shtylyov
2011-03-04 17:09 ` Tejun Heo
0 siblings, 2 replies; 12+ messages in thread
From: Hannes Reinecke @ 2011-03-04 8:55 UTC (permalink / raw)
To: Tejun Heo; +Cc: jgarzik, linux-ide
As per SAT-3 the WWN ID should be included in the VPD page 0x83
(device identification) emulation.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/ata/libata-scsi.c | 11 +++++++++++
include/linux/ata.h | 9 +++++++++
2 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 600f635..e60d9e4 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -2056,6 +2056,17 @@ static unsigned int ata_scsiop_inq_83(struct ata_scsi_args *args, u8 *rbuf)
ATA_ID_SERNO_LEN);
num += ATA_ID_SERNO_LEN;
+ if (ata_id_has_wwn(args->id)) {
+ /* SAT defined lu world wide name */
+ /* piv=0, assoc=lu, code_set=binary, designator=NAA */
+ rbuf[num + 0] = 1;
+ rbuf[num + 1] = 3;
+ rbuf[num + 3] = ATA_ID_WWN_LEN;
+ num += 4;
+ ata_id_string(args->id, (unsigned char *) rbuf + num,
+ ATA_ID_WWN, ATA_ID_WWN_LEN);
+ num += ATA_ID_WWN_LEN;
+ }
rbuf[3] = num - 4; /* page len (assume less than 256 bytes) */
return 0;
}
diff --git a/include/linux/ata.h b/include/linux/ata.h
index 0c4929f..f62463e 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -89,6 +89,7 @@ enum {
ATA_ID_SPG = 98,
ATA_ID_LBA_CAPACITY_2 = 100,
ATA_ID_SECTOR_SIZE = 106,
+ ATA_ID_WWN = 108,
ATA_ID_LOGICAL_SECTOR_SIZE = 117, /* and 118 */
ATA_ID_LAST_LUN = 126,
ATA_ID_DLF = 128,
@@ -103,6 +104,7 @@ enum {
ATA_ID_SERNO_LEN = 20,
ATA_ID_FW_REV_LEN = 8,
ATA_ID_PROD_LEN = 40,
+ ATA_ID_WWN_LEN = 8,
ATA_PCI_CTL_OFS = 2,
@@ -815,6 +817,13 @@ static inline int ata_id_has_unload(const u16 *id)
return 0;
}
+static inline int ata_id_has_wwn(const u16 *id)
+{
+ if ((id[ATA_ID_CSF_DEFAULT] & 0xC000) != 0x4000)
+ return 0;
+ return id[ATA_ID_CSF_DEFAULT] & (1 << 8);
+}
+
static inline int ata_id_form_factor(const u16 *id)
{
u16 val = id[168];
--
1.6.0.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH] libata: Include WWN ID in inquiry VPD emulation
2011-03-04 8:55 [PATCH] libata: Include WWN ID in inquiry VPD emulation Hannes Reinecke
@ 2011-03-04 11:17 ` Sergei Shtylyov
2011-03-04 11:36 ` Hannes Reinecke
2011-03-04 17:09 ` Tejun Heo
1 sibling, 1 reply; 12+ messages in thread
From: Sergei Shtylyov @ 2011-03-04 11:17 UTC (permalink / raw)
To: Hannes Reinecke; +Cc: Tejun Heo, jgarzik, linux-ide
Hello.
On 04-03-2011 11:55, Hannes Reinecke wrote:
> As per SAT-3 the WWN ID should be included in the VPD page 0x83
> (device identification) emulation.
> Signed-off-by: Hannes Reinecke<hare@suse.de>
[...]
> diff --git a/include/linux/ata.h b/include/linux/ata.h
> index 0c4929f..f62463e 100644
> --- a/include/linux/ata.h
> +++ b/include/linux/ata.h
[...]
> @@ -815,6 +817,13 @@ static inline int ata_id_has_unload(const u16 *id)
> return 0;
> }
>
> +static inline int ata_id_has_wwn(const u16 *id)
> +{
> + if ((id[ATA_ID_CSF_DEFAULT] & 0xC000) != 0x4000)
> + return 0;
> + return id[ATA_ID_CSF_DEFAULT] & (1 << 8);
Could be compacted to:
return (id[ATA_ID_CSF_DEFAULT] & 0xC100) == 0x4100;
WBR, Sergei
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH] libata: Include WWN ID in inquiry VPD emulation
2011-03-04 11:17 ` Sergei Shtylyov
@ 2011-03-04 11:36 ` Hannes Reinecke
0 siblings, 0 replies; 12+ messages in thread
From: Hannes Reinecke @ 2011-03-04 11:36 UTC (permalink / raw)
To: Sergei Shtylyov; +Cc: Tejun Heo, Jeff Garzik, linux-ide
On 03/04/2011 12:17 PM, Sergei Shtylyov wrote:
> Hello.
>
> On 04-03-2011 11:55, Hannes Reinecke wrote:
>
>> As per SAT-3 the WWN ID should be included in the VPD page 0x83
>> (device identification) emulation.
>
>> Signed-off-by: Hannes Reinecke<hare@suse.de>
> [...]
>
>> diff --git a/include/linux/ata.h b/include/linux/ata.h
>> index 0c4929f..f62463e 100644
>> --- a/include/linux/ata.h
>> +++ b/include/linux/ata.h
> [...]
>> @@ -815,6 +817,13 @@ static inline int ata_id_has_unload(const u16 *id)
>> return 0;
>> }
>>
>> +static inline int ata_id_has_wwn(const u16 *id)
>> +{
>> + if ((id[ATA_ID_CSF_DEFAULT] & 0xC000) != 0x4000)
>> + return 0;
>> + return id[ATA_ID_CSF_DEFAULT] & (1 << 8);
>
> Could be compacted to:
>
> return (id[ATA_ID_CSF_DEFAULT] & 0xC100) == 0x4100;
>
Indeed.
Will be reposting the patch if one of the libata gods gives it's
overall assent.
Tejun?
Cheers,
Hannes
--
Dr. Hannes Reinecke zSeries & Storage
hare@suse.de +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Markus Rex, HRB 16746 (AG Nürnberg)
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] libata: Include WWN ID in inquiry VPD emulation
2011-03-04 8:55 [PATCH] libata: Include WWN ID in inquiry VPD emulation Hannes Reinecke
2011-03-04 11:17 ` Sergei Shtylyov
@ 2011-03-04 17:09 ` Tejun Heo
2011-03-04 17:22 ` Jeff Garzik
1 sibling, 1 reply; 12+ messages in thread
From: Tejun Heo @ 2011-03-04 17:09 UTC (permalink / raw)
To: Hannes Reinecke; +Cc: jgarzik, linux-ide
Hello, Hannes.
On Fri, Mar 04, 2011 at 09:55:01AM +0100, Hannes Reinecke wrote:
> +static inline int ata_id_has_wwn(const u16 *id)
> +{
> + if ((id[ATA_ID_CSF_DEFAULT] & 0xC000) != 0x4000)
> + return 0;
> + return id[ATA_ID_CSF_DEFAULT] & (1 << 8);
> +}
Can you please make this return bool? Otherwise,
Acked-by: Tejun Heo <tj@kernel.org>
Thanks.
--
tejun
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH] libata: Include WWN ID in inquiry VPD emulation
2011-03-04 17:09 ` Tejun Heo
@ 2011-03-04 17:22 ` Jeff Garzik
2011-03-07 7:57 ` Hannes Reinecke
0 siblings, 1 reply; 12+ messages in thread
From: Jeff Garzik @ 2011-03-04 17:22 UTC (permalink / raw)
To: Tejun Heo; +Cc: Hannes Reinecke, linux-ide
On 03/04/2011 12:09 PM, Tejun Heo wrote:
> Hello, Hannes.
>
> On Fri, Mar 04, 2011 at 09:55:01AM +0100, Hannes Reinecke wrote:
>> +static inline int ata_id_has_wwn(const u16 *id)
>> +{
>> + if ((id[ATA_ID_CSF_DEFAULT]& 0xC000) != 0x4000)
>> + return 0;
>> + return id[ATA_ID_CSF_DEFAULT]& (1<< 8);
>> +}
>
> Can you please make this return bool? Otherwise,
And if you're highly motivated, a separate patch to update
include/linux/ata.h to return bool for obvious ata_id_has_xxx functions
would be nice too.
But yes, including WWN here is just fine.
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH] libata: Include WWN ID in inquiry VPD emulation
2011-03-04 17:22 ` Jeff Garzik
@ 2011-03-07 7:57 ` Hannes Reinecke
2011-03-07 8:27 ` Jeff Garzik
0 siblings, 1 reply; 12+ messages in thread
From: Hannes Reinecke @ 2011-03-07 7:57 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Tejun Heo, linux-ide
[-- Attachment #1: Type: text/plain, Size: 854 bytes --]
On 03/04/2011 06:22 PM, Jeff Garzik wrote:
> On 03/04/2011 12:09 PM, Tejun Heo wrote:
>> Hello, Hannes.
>>
>> On Fri, Mar 04, 2011 at 09:55:01AM +0100, Hannes Reinecke wrote:
>>> +static inline int ata_id_has_wwn(const u16 *id)
>>> +{
>>> + if ((id[ATA_ID_CSF_DEFAULT]& 0xC000) != 0x4000)
>>> + return 0;
>>> + return id[ATA_ID_CSF_DEFAULT]& (1<< 8);
>>> +}
>>
>> Can you please make this return bool? Otherwise,
>
> And if you're highly motivated, a separate patch to update
> include/linux/ata.h to return bool for obvious ata_id_has_xxx functions
> would be nice too.
>
> But yes, including WWN here is just fine.
>
>
Like this?
Cheers,
Hannes
--
Dr. Hannes Reinecke zSeries & Storage
hare@suse.de +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Markus Rex, HRB 16746 (AG Nürnberg)
[-- Attachment #2: libata-Use-bool-return-value-for-ata_id_XXX.patch --]
[-- Type: text/x-patch, Size: 8837 bytes --]
>From 195fc330d401d426c316dccd77b22de097048b89 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Mon, 7 Mar 2011 08:43:37 +0100
Subject: [PATCH] libata: Use 'bool' return value for ata_id_XXX
Most ata_id_XXX inlines are simple tests, so we should set
the return value to 'bool' here.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
include/linux/ata.h | 60 +++++++++++++++++++++++++-------------------------
1 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/include/linux/ata.h b/include/linux/ata.h
index 198e1ea..7055d4c 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -600,21 +600,21 @@ static inline bool ata_id_has_dipm(const u16 *id)
}
-static inline int ata_id_has_fua(const u16 *id)
+static inline bool ata_id_has_fua(const u16 *id)
{
if ((id[ATA_ID_CFSSE] & 0xC000) != 0x4000)
return 0;
return id[ATA_ID_CFSSE] & (1 << 6);
}
-static inline int ata_id_has_flush(const u16 *id)
+static inline bool ata_id_has_flush(const u16 *id)
{
if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) != 0x4000)
return 0;
return id[ATA_ID_COMMAND_SET_2] & (1 << 12);
}
-static inline int ata_id_flush_enabled(const u16 *id)
+static inline bool ata_id_flush_enabled(const u16 *id)
{
if (ata_id_has_flush(id) == 0)
return 0;
@@ -623,14 +623,14 @@ static inline int ata_id_flush_enabled(const u16 *id)
return id[ATA_ID_CFS_ENABLE_2] & (1 << 12);
}
-static inline int ata_id_has_flush_ext(const u16 *id)
+static inline bool ata_id_has_flush_ext(const u16 *id)
{
if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) != 0x4000)
return 0;
return id[ATA_ID_COMMAND_SET_2] & (1 << 13);
}
-static inline int ata_id_flush_ext_enabled(const u16 *id)
+static inline bool ata_id_flush_ext_enabled(const u16 *id)
{
if (ata_id_has_flush_ext(id) == 0)
return 0;
@@ -688,7 +688,7 @@ static inline u16 ata_id_logical_sector_offset(const u16 *id,
return 0;
}
-static inline int ata_id_has_lba48(const u16 *id)
+static inline bool ata_id_has_lba48(const u16 *id)
{
if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) != 0x4000)
return 0;
@@ -697,7 +697,7 @@ static inline int ata_id_has_lba48(const u16 *id)
return id[ATA_ID_COMMAND_SET_2] & (1 << 10);
}
-static inline int ata_id_lba48_enabled(const u16 *id)
+static inline bool ata_id_lba48_enabled(const u16 *id)
{
if (ata_id_has_lba48(id) == 0)
return 0;
@@ -706,7 +706,7 @@ static inline int ata_id_lba48_enabled(const u16 *id)
return id[ATA_ID_CFS_ENABLE_2] & (1 << 10);
}
-static inline int ata_id_hpa_enabled(const u16 *id)
+static inline bool ata_id_hpa_enabled(const u16 *id)
{
/* Yes children, word 83 valid bits cover word 82 data */
if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) != 0x4000)
@@ -720,7 +720,7 @@ static inline int ata_id_hpa_enabled(const u16 *id)
return id[ATA_ID_COMMAND_SET_1] & (1 << 10);
}
-static inline int ata_id_has_wcache(const u16 *id)
+static inline bool ata_id_has_wcache(const u16 *id)
{
/* Yes children, word 83 valid bits cover word 82 data */
if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) != 0x4000)
@@ -728,21 +728,21 @@ static inline int ata_id_has_wcache(const u16 *id)
return id[ATA_ID_COMMAND_SET_1] & (1 << 5);
}
-static inline int ata_id_has_pm(const u16 *id)
+static inline bool ata_id_has_pm(const u16 *id)
{
if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) != 0x4000)
return 0;
return id[ATA_ID_COMMAND_SET_1] & (1 << 3);
}
-static inline int ata_id_rahead_enabled(const u16 *id)
+static inline bool ata_id_rahead_enabled(const u16 *id)
{
if ((id[ATA_ID_CSF_DEFAULT] & 0xC000) != 0x4000)
return 0;
return id[ATA_ID_CFS_ENABLE_1] & (1 << 6);
}
-static inline int ata_id_wcache_enabled(const u16 *id)
+static inline bool ata_id_wcache_enabled(const u16 *id)
{
if ((id[ATA_ID_CSF_DEFAULT] & 0xC000) != 0x4000)
return 0;
@@ -775,7 +775,7 @@ static inline unsigned int ata_id_major_version(const u16 *id)
return mver;
}
-static inline int ata_id_is_sata(const u16 *id)
+static inline bool ata_id_is_sata(const u16 *id)
{
/*
* See if word 93 is 0 AND drive is at least ATA-5 compatible
@@ -788,7 +788,7 @@ static inline int ata_id_is_sata(const u16 *id)
return 0;
}
-static inline int ata_id_has_tpm(const u16 *id)
+static inline bool ata_id_has_tpm(const u16 *id)
{
/* The TPM bits are only valid on ATA8 */
if (ata_id_major_version(id) < 8)
@@ -798,7 +798,7 @@ static inline int ata_id_has_tpm(const u16 *id)
return id[48] & (1 << 0);
}
-static inline int ata_id_has_dword_io(const u16 *id)
+static inline bool ata_id_has_dword_io(const u16 *id)
{
/* ATA 8 reuses this flag for "trusted" computing */
if (ata_id_major_version(id) > 7)
@@ -808,7 +808,7 @@ static inline int ata_id_has_dword_io(const u16 *id)
return 0;
}
-static inline int ata_id_has_unload(const u16 *id)
+static inline bool ata_id_has_unload(const u16 *id)
{
if (ata_id_major_version(id) >= 7 &&
(id[ATA_ID_CFSSE] & 0xC000) == 0x4000 &&
@@ -850,7 +850,7 @@ static inline int ata_id_rotation_rate(const u16 *id)
return val;
}
-static inline int ata_id_has_trim(const u16 *id)
+static inline bool ata_id_has_trim(const u16 *id)
{
if (ata_id_major_version(id) >= 7 &&
(id[ATA_ID_DATA_SET_MGMT] & 1))
@@ -858,7 +858,7 @@ static inline int ata_id_has_trim(const u16 *id)
return 0;
}
-static inline int ata_id_has_zero_after_trim(const u16 *id)
+static inline bool 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) &&
@@ -868,7 +868,7 @@ static inline int ata_id_has_zero_after_trim(const u16 *id)
return 0;
}
-static inline int ata_id_current_chs_valid(const u16 *id)
+static inline bool ata_id_current_chs_valid(const u16 *id)
{
/* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command
has not been issued to the device then the values of
@@ -880,7 +880,7 @@ static inline int ata_id_current_chs_valid(const u16 *id)
id[ATA_ID_CUR_SECTORS]; /* sectors in current translation */
}
-static inline int ata_id_is_cfa(const u16 *id)
+static inline bool ata_id_is_cfa(const u16 *id)
{
if ((id[ATA_ID_CONFIG] == 0x848A) || /* Traditional CF */
(id[ATA_ID_CONFIG] == 0x844A)) /* Delkin Devices CF */
@@ -898,12 +898,12 @@ static inline int ata_id_is_cfa(const u16 *id)
return 0;
}
-static inline int ata_id_is_ssd(const u16 *id)
+static inline bool ata_id_is_ssd(const u16 *id)
{
return id[ATA_ID_ROT_SPEED] == 0x01;
}
-static inline int ata_id_pio_need_iordy(const u16 *id, const u8 pio)
+static inline bool ata_id_pio_need_iordy(const u16 *id, const u8 pio)
{
/* CF spec. r4.1 Table 22 says no IORDY on PIO5 and PIO6. */
if (pio > 4 && ata_id_is_cfa(id))
@@ -917,7 +917,7 @@ static inline int ata_id_pio_need_iordy(const u16 *id, const u8 pio)
return 0;
}
-static inline int ata_drive_40wire(const u16 *dev_id)
+static inline bool ata_drive_40wire(const u16 *dev_id)
{
if (ata_id_is_sata(dev_id))
return 0; /* SATA */
@@ -926,7 +926,7 @@ static inline int ata_drive_40wire(const u16 *dev_id)
return 1;
}
-static inline int ata_drive_40wire_relaxed(const u16 *dev_id)
+static inline bool ata_drive_40wire_relaxed(const u16 *dev_id)
{
if ((dev_id[ATA_ID_HW_CONFIG] & 0x2000) == 0x2000)
return 0; /* 80 wire */
@@ -943,12 +943,12 @@ static inline int atapi_cdb_len(const u16 *dev_id)
}
}
-static inline int atapi_command_packet_set(const u16 *dev_id)
+static inline bool atapi_command_packet_set(const u16 *dev_id)
{
return (dev_id[ATA_ID_CONFIG] >> 8) & 0x1f;
}
-static inline int atapi_id_dmadir(const u16 *dev_id)
+static inline bool atapi_id_dmadir(const u16 *dev_id)
{
return ata_id_major_version(dev_id) >= 7 && (dev_id[62] & 0x8000);
}
@@ -961,7 +961,7 @@ static inline int atapi_id_dmadir(const u16 *dev_id)
*
* It is called only once for each device.
*/
-static inline int ata_id_is_lba_capacity_ok(u16 *id)
+static inline bool ata_id_is_lba_capacity_ok(u16 *id)
{
unsigned long lba_sects, chs_sects, head, tail;
@@ -1058,19 +1058,19 @@ static inline int is_multi_taskfile(struct ata_taskfile *tf)
(tf->command == ATA_CMD_WRITE_MULTI_FUA_EXT);
}
-static inline int ata_ok(u8 status)
+static inline bool ata_ok(u8 status)
{
return ((status & (ATA_BUSY | ATA_DRDY | ATA_DF | ATA_DRQ | ATA_ERR))
== ATA_DRDY);
}
-static inline int lba_28_ok(u64 block, u32 n_block)
+static inline bool lba_28_ok(u64 block, u32 n_block)
{
/* check the ending block number: must be LESS THAN 0x0fffffff */
return ((block + n_block) < ((1 << 28) - 1)) && (n_block <= 256);
}
-static inline int lba_48_ok(u64 block, u32 n_block)
+static inline bool lba_48_ok(u64 block, u32 n_block)
{
/* check the ending block number */
return ((block + n_block - 1) < ((u64)1 << 48)) && (n_block <= 65536);
--
1.6.0.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH] libata: Include WWN ID in inquiry VPD emulation
2011-03-07 7:57 ` Hannes Reinecke
@ 2011-03-07 8:27 ` Jeff Garzik
2011-03-07 8:53 ` Hannes Reinecke
0 siblings, 1 reply; 12+ messages in thread
From: Jeff Garzik @ 2011-03-07 8:27 UTC (permalink / raw)
To: Hannes Reinecke; +Cc: Tejun Heo, linux-ide
On 03/07/2011 02:57 AM, Hannes Reinecke wrote:
> On 03/04/2011 06:22 PM, Jeff Garzik wrote:
>> And if you're highly motivated, a separate patch to update
>> include/linux/ata.h to return bool for obvious ata_id_has_xxx functions
>> would be nice too.
> Like this?
> -static inline int ata_id_has_fua(const u16 *id)
> +static inline bool ata_id_has_fua(const u16 *id)
> {
> if ((id[ATA_ID_CFSSE] & 0xC000) != 0x4000)
> return 0;
> return id[ATA_ID_CFSSE] & (1 << 6);
> }
Not _quite_ that easy... one must also s/0/false/ and s/1/true/ where
the return value is explicit, rather than the result of an expression.
Jeff
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH] libata: Include WWN ID in inquiry VPD emulation
2011-03-07 8:27 ` Jeff Garzik
@ 2011-03-07 8:53 ` Hannes Reinecke
2011-03-14 7:01 ` Jeff Garzik
0 siblings, 1 reply; 12+ messages in thread
From: Hannes Reinecke @ 2011-03-07 8:53 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Tejun Heo, linux-ide
[-- Attachment #1: Type: text/plain, Size: 925 bytes --]
On 03/07/2011 09:27 AM, Jeff Garzik wrote:
> On 03/07/2011 02:57 AM, Hannes Reinecke wrote:
>> On 03/04/2011 06:22 PM, Jeff Garzik wrote:
>>> And if you're highly motivated, a separate patch to update
>>> include/linux/ata.h to return bool for obvious ata_id_has_xxx functions
>>> would be nice too.
>
>> Like this?
>
>> -static inline int ata_id_has_fua(const u16 *id)
>> +static inline bool ata_id_has_fua(const u16 *id)
>> {
>> if ((id[ATA_ID_CFSSE] & 0xC000) != 0x4000)
>> return 0;
>> return id[ATA_ID_CFSSE] & (1 << 6);
>> }
>
> Not _quite_ that easy... one must also s/0/false/ and s/1/true/ where
> the return value is explicit, rather than the result of an expression.
>
Ok, there you go.
Cheers,
Hannes
--
Dr. Hannes Reinecke zSeries & Storage
hare@suse.de +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Markus Rex, HRB 16746 (AG Nürnberg)
[-- Attachment #2: libata-Use-bool-return-value-for-ata_id_XXX.patch --]
[-- Type: text/x-patch, Size: 11655 bytes --]
>From 8504e96908fb272c53278b7845bc63679f238358 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Mon, 7 Mar 2011 08:43:37 +0100
Subject: [PATCH] libata: Use 'bool' return value for ata_id_XXX
Most ata_id_XXX inlines are simple tests, so we should set
the return value to 'bool' here.
Signed-off-by: Hannes Reinecke <hare@suse.de>
diff --git a/include/linux/ata.h b/include/linux/ata.h
index 198e1ea..1868213 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -600,42 +600,42 @@ static inline bool ata_id_has_dipm(const u16 *id)
}
-static inline int ata_id_has_fua(const u16 *id)
+static inline bool ata_id_has_fua(const u16 *id)
{
if ((id[ATA_ID_CFSSE] & 0xC000) != 0x4000)
- return 0;
+ return false;
return id[ATA_ID_CFSSE] & (1 << 6);
}
-static inline int ata_id_has_flush(const u16 *id)
+static inline bool ata_id_has_flush(const u16 *id)
{
if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) != 0x4000)
- return 0;
+ return false;
return id[ATA_ID_COMMAND_SET_2] & (1 << 12);
}
-static inline int ata_id_flush_enabled(const u16 *id)
+static inline bool ata_id_flush_enabled(const u16 *id)
{
if (ata_id_has_flush(id) == 0)
- return 0;
+ return false;
if ((id[ATA_ID_CSF_DEFAULT] & 0xC000) != 0x4000)
- return 0;
+ return false;
return id[ATA_ID_CFS_ENABLE_2] & (1 << 12);
}
-static inline int ata_id_has_flush_ext(const u16 *id)
+static inline bool ata_id_has_flush_ext(const u16 *id)
{
if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) != 0x4000)
- return 0;
+ return false;
return id[ATA_ID_COMMAND_SET_2] & (1 << 13);
}
-static inline int ata_id_flush_ext_enabled(const u16 *id)
+static inline bool ata_id_flush_ext_enabled(const u16 *id)
{
if (ata_id_has_flush_ext(id) == 0)
- return 0;
+ return false;
if ((id[ATA_ID_CSF_DEFAULT] & 0xC000) != 0x4000)
- return 0;
+ return false;
/*
* some Maxtor disks have bit 13 defined incorrectly
* so check bit 10 too
@@ -688,64 +688,64 @@ static inline u16 ata_id_logical_sector_offset(const u16 *id,
return 0;
}
-static inline int ata_id_has_lba48(const u16 *id)
+static inline bool ata_id_has_lba48(const u16 *id)
{
if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) != 0x4000)
- return 0;
+ return false;
if (!ata_id_u64(id, ATA_ID_LBA_CAPACITY_2))
- return 0;
+ return false;
return id[ATA_ID_COMMAND_SET_2] & (1 << 10);
}
-static inline int ata_id_lba48_enabled(const u16 *id)
+static inline bool ata_id_lba48_enabled(const u16 *id)
{
if (ata_id_has_lba48(id) == 0)
- return 0;
+ return false;
if ((id[ATA_ID_CSF_DEFAULT] & 0xC000) != 0x4000)
- return 0;
+ return false;
return id[ATA_ID_CFS_ENABLE_2] & (1 << 10);
}
-static inline int ata_id_hpa_enabled(const u16 *id)
+static inline bool ata_id_hpa_enabled(const u16 *id)
{
/* Yes children, word 83 valid bits cover word 82 data */
if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) != 0x4000)
- return 0;
+ return false;
/* And 87 covers 85-87 */
if ((id[ATA_ID_CSF_DEFAULT] & 0xC000) != 0x4000)
- return 0;
+ return false;
/* Check command sets enabled as well as supported */
if ((id[ATA_ID_CFS_ENABLE_1] & (1 << 10)) == 0)
- return 0;
+ return false;
return id[ATA_ID_COMMAND_SET_1] & (1 << 10);
}
-static inline int ata_id_has_wcache(const u16 *id)
+static inline bool ata_id_has_wcache(const u16 *id)
{
/* Yes children, word 83 valid bits cover word 82 data */
if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) != 0x4000)
- return 0;
+ return false;
return id[ATA_ID_COMMAND_SET_1] & (1 << 5);
}
-static inline int ata_id_has_pm(const u16 *id)
+static inline bool ata_id_has_pm(const u16 *id)
{
if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) != 0x4000)
- return 0;
+ return false;
return id[ATA_ID_COMMAND_SET_1] & (1 << 3);
}
-static inline int ata_id_rahead_enabled(const u16 *id)
+static inline bool ata_id_rahead_enabled(const u16 *id)
{
if ((id[ATA_ID_CSF_DEFAULT] & 0xC000) != 0x4000)
- return 0;
+ return false;
return id[ATA_ID_CFS_ENABLE_1] & (1 << 6);
}
-static inline int ata_id_wcache_enabled(const u16 *id)
+static inline bool ata_id_wcache_enabled(const u16 *id)
{
if ((id[ATA_ID_CSF_DEFAULT] & 0xC000) != 0x4000)
- return 0;
+ return false;
return id[ATA_ID_CFS_ENABLE_1] & (1 << 5);
}
@@ -775,7 +775,7 @@ static inline unsigned int ata_id_major_version(const u16 *id)
return mver;
}
-static inline int ata_id_is_sata(const u16 *id)
+static inline bool ata_id_is_sata(const u16 *id)
{
/*
* See if word 93 is 0 AND drive is at least ATA-5 compatible
@@ -784,37 +784,35 @@ static inline int ata_id_is_sata(const u16 *id)
* 0x0000 and 0xffff along with the earlier ATA revisions...
*/
if (id[ATA_ID_HW_CONFIG] == 0 && (short)id[ATA_ID_MAJOR_VER] >= 0x0020)
- return 1;
- return 0;
+ return true;
+ return false;
}
-static inline int ata_id_has_tpm(const u16 *id)
+static inline bool ata_id_has_tpm(const u16 *id)
{
/* The TPM bits are only valid on ATA8 */
if (ata_id_major_version(id) < 8)
- return 0;
+ return false;
if ((id[48] & 0xC000) != 0x4000)
- return 0;
+ return false;
return id[48] & (1 << 0);
}
-static inline int ata_id_has_dword_io(const u16 *id)
+static inline bool ata_id_has_dword_io(const u16 *id)
{
/* ATA 8 reuses this flag for "trusted" computing */
if (ata_id_major_version(id) > 7)
- return 0;
- if (id[ATA_ID_DWORD_IO] & (1 << 0))
- return 1;
- return 0;
+ return false;
+ return id[ATA_ID_DWORD_IO] & (1 << 0);
}
-static inline int ata_id_has_unload(const u16 *id)
+static inline bool ata_id_has_unload(const u16 *id)
{
if (ata_id_major_version(id) >= 7 &&
(id[ATA_ID_CFSSE] & 0xC000) == 0x4000 &&
id[ATA_ID_CFSSE] & (1 << 13))
- return 1;
- return 0;
+ return true;
+ return false;
}
static inline bool ata_id_has_wwn(const u16 *id)
@@ -850,25 +848,25 @@ static inline int ata_id_rotation_rate(const u16 *id)
return val;
}
-static inline int ata_id_has_trim(const u16 *id)
+static inline bool ata_id_has_trim(const u16 *id)
{
if (ata_id_major_version(id) >= 7 &&
(id[ATA_ID_DATA_SET_MGMT] & 1))
- return 1;
- return 0;
+ return true;
+ return false;
}
-static inline int ata_id_has_zero_after_trim(const u16 *id)
+static inline bool 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 true;
- return 0;
+ return false;
}
-static inline int ata_id_current_chs_valid(const u16 *id)
+static inline bool ata_id_current_chs_valid(const u16 *id)
{
/* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command
has not been issued to the device then the values of
@@ -880,11 +878,11 @@ static inline int ata_id_current_chs_valid(const u16 *id)
id[ATA_ID_CUR_SECTORS]; /* sectors in current translation */
}
-static inline int ata_id_is_cfa(const u16 *id)
+static inline bool ata_id_is_cfa(const u16 *id)
{
if ((id[ATA_ID_CONFIG] == 0x848A) || /* Traditional CF */
(id[ATA_ID_CONFIG] == 0x844A)) /* Delkin Devices CF */
- return 1;
+ return true;
/*
* CF specs don't require specific value in the word 0 anymore and yet
* they forbid to report the ATA version in the word 80 and require the
@@ -893,44 +891,40 @@ static inline int ata_id_is_cfa(const u16 *id)
* and while those that don't indicate CFA feature support need some
* sort of quirk list, it seems impractical for the ones that do...
*/
- if ((id[ATA_ID_COMMAND_SET_2] & 0xC004) == 0x4004)
- return 1;
- return 0;
+ return (id[ATA_ID_COMMAND_SET_2] & 0xC004) == 0x4004;
}
-static inline int ata_id_is_ssd(const u16 *id)
+static inline bool ata_id_is_ssd(const u16 *id)
{
return id[ATA_ID_ROT_SPEED] == 0x01;
}
-static inline int ata_id_pio_need_iordy(const u16 *id, const u8 pio)
+static inline bool ata_id_pio_need_iordy(const u16 *id, const u8 pio)
{
/* CF spec. r4.1 Table 22 says no IORDY on PIO5 and PIO6. */
if (pio > 4 && ata_id_is_cfa(id))
- return 0;
+ return false;
/* For PIO3 and higher it is mandatory. */
if (pio > 2)
- return 1;
+ return true;
/* Turn it on when possible. */
- if (ata_id_has_iordy(id))
- return 1;
- return 0;
+ return ata_id_has_iordy(id);
}
-static inline int ata_drive_40wire(const u16 *dev_id)
+static inline bool ata_drive_40wire(const u16 *dev_id)
{
if (ata_id_is_sata(dev_id))
- return 0; /* SATA */
- if ((dev_id[ATA_ID_HW_CONFIG] & 0xE000) == 0x6000)
- return 0; /* 80 wire */
- return 1;
+ return false; /* SATA */
+ if (dev_id[ATA_ID_HW_CONFIG] & 0xE000) == 0x6000;
+ return false; /* 80 wire */
+ return true;
}
-static inline int ata_drive_40wire_relaxed(const u16 *dev_id)
+static inline bool ata_drive_40wire_relaxed(const u16 *dev_id)
{
if ((dev_id[ATA_ID_HW_CONFIG] & 0x2000) == 0x2000)
- return 0; /* 80 wire */
- return 1;
+ return false; /* 80 wire */
+ return true;
}
static inline int atapi_cdb_len(const u16 *dev_id)
@@ -943,12 +937,12 @@ static inline int atapi_cdb_len(const u16 *dev_id)
}
}
-static inline int atapi_command_packet_set(const u16 *dev_id)
+static inline bool atapi_command_packet_set(const u16 *dev_id)
{
return (dev_id[ATA_ID_CONFIG] >> 8) & 0x1f;
}
-static inline int atapi_id_dmadir(const u16 *dev_id)
+static inline bool atapi_id_dmadir(const u16 *dev_id)
{
return ata_id_major_version(dev_id) >= 7 && (dev_id[62] & 0x8000);
}
@@ -961,13 +955,13 @@ static inline int atapi_id_dmadir(const u16 *dev_id)
*
* It is called only once for each device.
*/
-static inline int ata_id_is_lba_capacity_ok(u16 *id)
+static inline bool ata_id_is_lba_capacity_ok(u16 *id)
{
unsigned long lba_sects, chs_sects, head, tail;
/* No non-LBA info .. so valid! */
if (id[ATA_ID_CYLS] == 0)
- return 1;
+ return true;
lba_sects = ata_id_u32(id, ATA_ID_LBA_CAPACITY);
@@ -982,13 +976,13 @@ static inline int ata_id_is_lba_capacity_ok(u16 *id)
id[ATA_ID_SECTORS] == 63 &&
(id[ATA_ID_HEADS] == 15 || id[ATA_ID_HEADS] == 16) &&
(lba_sects >= 16383 * 63 * id[ATA_ID_HEADS]))
- return 1;
+ return true;
chs_sects = id[ATA_ID_CYLS] * id[ATA_ID_HEADS] * id[ATA_ID_SECTORS];
/* perform a rough sanity check on lba_sects: within 10% is OK */
if (lba_sects - chs_sects < chs_sects/10)
- return 1;
+ return true;
/* some drives have the word order reversed */
head = (lba_sects >> 16) & 0xffff;
@@ -997,10 +991,10 @@ static inline int ata_id_is_lba_capacity_ok(u16 *id)
if (lba_sects - chs_sects < chs_sects/10) {
*(__le32 *)&id[ATA_ID_LBA_CAPACITY] = __cpu_to_le32(lba_sects);
- return 1; /* LBA capacity is (now) good */
+ return true; /* LBA capacity is (now) good */
}
- return 0; /* LBA capacity value may be bad */
+ return false; /* LBA capacity value may be bad */
}
static inline void ata_id_to_hd_driveid(u16 *id)
@@ -1058,19 +1052,19 @@ static inline int is_multi_taskfile(struct ata_taskfile *tf)
(tf->command == ATA_CMD_WRITE_MULTI_FUA_EXT);
}
-static inline int ata_ok(u8 status)
+static inline bool ata_ok(u8 status)
{
return ((status & (ATA_BUSY | ATA_DRDY | ATA_DF | ATA_DRQ | ATA_ERR))
== ATA_DRDY);
}
-static inline int lba_28_ok(u64 block, u32 n_block)
+static inline bool lba_28_ok(u64 block, u32 n_block)
{
/* check the ending block number: must be LESS THAN 0x0fffffff */
return ((block + n_block) < ((1 << 28) - 1)) && (n_block <= 256);
}
-static inline int lba_48_ok(u64 block, u32 n_block)
+static inline bool lba_48_ok(u64 block, u32 n_block)
{
/* check the ending block number */
return ((block + n_block - 1) < ((u64)1 << 48)) && (n_block <= 65536);
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH] libata: Include WWN ID in inquiry VPD emulation
2011-03-07 8:53 ` Hannes Reinecke
@ 2011-03-14 7:01 ` Jeff Garzik
2011-03-14 15:56 ` Hannes Reinecke
0 siblings, 1 reply; 12+ messages in thread
From: Jeff Garzik @ 2011-03-14 7:01 UTC (permalink / raw)
To: Hannes Reinecke; +Cc: Tejun Heo, linux-ide
On 03/07/2011 03:53 AM, Hannes Reinecke wrote:
> On 03/07/2011 09:27 AM, Jeff Garzik wrote:
>> On 03/07/2011 02:57 AM, Hannes Reinecke wrote:
>>> On 03/04/2011 06:22 PM, Jeff Garzik wrote:
>>>> And if you're highly motivated, a separate patch to update
>>>> include/linux/ata.h to return bool for obvious ata_id_has_xxx functions
>>>> would be nice too.
>>
>>> Like this?
>>
>>> -static inline int ata_id_has_fua(const u16 *id)
>>> +static inline bool ata_id_has_fua(const u16 *id)
>>> {
>>> if ((id[ATA_ID_CFSSE]& 0xC000) != 0x4000)
>>> return 0;
>>> return id[ATA_ID_CFSSE]& (1<< 6);
>>> }
>>
>> Not _quite_ that easy... one must also s/0/false/ and s/1/true/ where
>> the return value is explicit, rather than the result of an expression.
>>
> Ok, there you go.
looks good, except for the part where it doesn't build ;)
Make that micro-fix, and resend as a normal patch, and I'll apply
straightaway.
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH] libata: Include WWN ID in inquiry VPD emulation
2011-03-14 7:01 ` Jeff Garzik
@ 2011-03-14 15:56 ` Hannes Reinecke
0 siblings, 0 replies; 12+ messages in thread
From: Hannes Reinecke @ 2011-03-14 15:56 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Tejun Heo, linux-ide
On 03/14/2011 08:01 AM, Jeff Garzik wrote:
> On 03/07/2011 03:53 AM, Hannes Reinecke wrote:
>> On 03/07/2011 09:27 AM, Jeff Garzik wrote:
>>> On 03/07/2011 02:57 AM, Hannes Reinecke wrote:
>>>> On 03/04/2011 06:22 PM, Jeff Garzik wrote:
>>>>> And if you're highly motivated, a separate patch to update
>>>>> include/linux/ata.h to return bool for obvious ata_id_has_xxx
>>>>> functions
>>>>> would be nice too.
>>>
>>>> Like this?
>>>
>>>> -static inline int ata_id_has_fua(const u16 *id)
>>>> +static inline bool ata_id_has_fua(const u16 *id)
>>>> {
>>>> if ((id[ATA_ID_CFSSE]& 0xC000) != 0x4000)
>>>> return 0;
>>>> return id[ATA_ID_CFSSE]& (1<< 6);
>>>> }
>>>
>>> Not _quite_ that easy... one must also s/0/false/ and s/1/true/ where
>>> the return value is explicit, rather than the result of an expression.
>>>
>> Ok, there you go.
>
> looks good, except for the part where it doesn't build ;)
>
Ach, building is _much_ overrated.
Proving with sound mathematical principles that is _must_ work
is much more satisfying.
> Make that micro-fix, and resend as a normal patch, and I'll apply
> straightaway.
>
>
--
Dr. Hannes Reinecke zSeries & Storage
hare@suse.de +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Markus Rex, HRB 16746 (AG Nürnberg)
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH] libata: Include WWN ID in inquiry VPD emulation
@ 2011-03-07 7:56 Hannes Reinecke
2011-03-14 7:00 ` Jeff Garzik
0 siblings, 1 reply; 12+ messages in thread
From: Hannes Reinecke @ 2011-03-07 7:56 UTC (permalink / raw)
To: Tejun Heo; +Cc: jgarzik, linux-ide
As per SAT-3 the WWN ID should be included in the VPD page 0x83
(device identification) emulation.
Signed-off-by: Hannes Reinecke <hare@suse.de>
Acked-by: Tejun Heo <tj@kernel.org>
---
drivers/ata/libata-scsi.c | 11 +++++++++++
include/linux/ata.h | 7 +++++++
2 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 600f635..e60d9e4 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -2056,6 +2056,17 @@ static unsigned int ata_scsiop_inq_83(struct ata_scsi_args *args, u8 *rbuf)
ATA_ID_SERNO_LEN);
num += ATA_ID_SERNO_LEN;
+ if (ata_id_has_wwn(args->id)) {
+ /* SAT defined lu world wide name */
+ /* piv=0, assoc=lu, code_set=binary, designator=NAA */
+ rbuf[num + 0] = 1;
+ rbuf[num + 1] = 3;
+ rbuf[num + 3] = ATA_ID_WWN_LEN;
+ num += 4;
+ ata_id_string(args->id, (unsigned char *) rbuf + num,
+ ATA_ID_WWN, ATA_ID_WWN_LEN);
+ num += ATA_ID_WWN_LEN;
+ }
rbuf[3] = num - 4; /* page len (assume less than 256 bytes) */
return 0;
}
diff --git a/include/linux/ata.h b/include/linux/ata.h
index 0c4929f..198e1ea 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -89,6 +89,7 @@ enum {
ATA_ID_SPG = 98,
ATA_ID_LBA_CAPACITY_2 = 100,
ATA_ID_SECTOR_SIZE = 106,
+ ATA_ID_WWN = 108,
ATA_ID_LOGICAL_SECTOR_SIZE = 117, /* and 118 */
ATA_ID_LAST_LUN = 126,
ATA_ID_DLF = 128,
@@ -103,6 +104,7 @@ enum {
ATA_ID_SERNO_LEN = 20,
ATA_ID_FW_REV_LEN = 8,
ATA_ID_PROD_LEN = 40,
+ ATA_ID_WWN_LEN = 8,
ATA_PCI_CTL_OFS = 2,
@@ -815,6 +817,11 @@ static inline int ata_id_has_unload(const u16 *id)
return 0;
}
+static inline bool ata_id_has_wwn(const u16 *id)
+{
+ return (id[ATA_ID_CSF_DEFAULT] & 0xC100) == 0x4100;
+}
+
static inline int ata_id_form_factor(const u16 *id)
{
u16 val = id[168];
--
1.6.0.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH] libata: Include WWN ID in inquiry VPD emulation
2011-03-07 7:56 Hannes Reinecke
@ 2011-03-14 7:00 ` Jeff Garzik
0 siblings, 0 replies; 12+ messages in thread
From: Jeff Garzik @ 2011-03-14 7:00 UTC (permalink / raw)
To: Hannes Reinecke; +Cc: Tejun Heo, linux-ide
On 03/07/2011 02:56 AM, Hannes Reinecke wrote:
>
> As per SAT-3 the WWN ID should be included in the VPD page 0x83
> (device identification) emulation.
>
> Signed-off-by: Hannes Reinecke<hare@suse.de>
> Acked-by: Tejun Heo<tj@kernel.org>
> ---
> drivers/ata/libata-scsi.c | 11 +++++++++++
> include/linux/ata.h | 7 +++++++
> 2 files changed, 18 insertions(+), 0 deletions(-)
applied
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2011-03-14 15:56 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-04 8:55 [PATCH] libata: Include WWN ID in inquiry VPD emulation Hannes Reinecke
2011-03-04 11:17 ` Sergei Shtylyov
2011-03-04 11:36 ` Hannes Reinecke
2011-03-04 17:09 ` Tejun Heo
2011-03-04 17:22 ` Jeff Garzik
2011-03-07 7:57 ` Hannes Reinecke
2011-03-07 8:27 ` Jeff Garzik
2011-03-07 8:53 ` Hannes Reinecke
2011-03-14 7:01 ` Jeff Garzik
2011-03-14 15:56 ` Hannes Reinecke
-- strict thread matches above, loose matches on Subject: below --
2011-03-07 7:56 Hannes Reinecke
2011-03-14 7:00 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).