>
> From: Neerav Parikh <neerav.par...@intel.com>
>
> Adds support for displaying >2TB drive information in
> fcoeadm.
>
> fcoeadm display command issues HBA_ScsiReadCapacity()
> with a buffer of size equal to that of the Scsi Read
> Capacity (10) command's response data.
> With this patch fcoeadm will re-issue HBA_ScsiReadCapacity()
> when the first call returns 0xffffffff as the returned LBA.
> The second call will be made with buffer of size equal to
> that of Scsi Read Capacity (16) command's response data.
>
> Signed-off-by: Neerav Parikh <neerav.par...@intel.com>
> Tested-by: Ross Brattain <ross.b.bratt...@intel.com>
> ---
> fcoeadm_display.c | 54 ++++++++++++++++++++++++++++++++++++++++-------
> ------
> 1 files changed, 41 insertions(+), 13 deletions(-)
>
> diff --git a/fcoeadm_display.c b/fcoeadm_display.c
> index 073b5c9..9df045f 100644
> --- a/fcoeadm_display.c
> +++ b/fcoeadm_display.c
> @@ -715,7 +715,8 @@ show_short_lun_info_header(void)
>
> static void
> show_short_lun_info(HBA_FCP_SCSI_ENTRY *ep, char *inqbuf,
> - struct scsi_rcap10_resp *rcap_resp)
> + u_int32_t blksize,
> + u_int64_t lba)
> {
> struct scsi_inquiry_std *inq = (struct scsi_inquiry_std *)inqbuf;
> char vendor[10];
> @@ -732,8 +733,8 @@ show_short_lun_info(HBA_FCP_SCSI_ENTRY *ep, char
> *inqbuf,
> memset(rev, 0, sizeof(rev));
>
> /* Get device capacity */
> - cap = (u_int64_t) net32_get(&rcap_resp->rc_block_len) *
> - net32_get(&rcap_resp->rc_lba);
> + cap = (u_int64_t)blksize * lba;
> +
> cap_abbr = cap / (1024.0 * 1024.0);
> abbr = "MB";
> if (cap_abbr >= 1024) {
> @@ -761,7 +762,7 @@ show_short_lun_info(HBA_FCP_SCSI_ENTRY *ep, char
> *inqbuf,
> /* Show the LUN info */
> printf("%10d %-11s %10s %7d %s %s (rev %s)\n",
> ep->ScsiId.ScsiOSLun, ep->ScsiId.OSDeviceName,
> - capstr, net32_get(&rcap_resp->rc_block_len),
> + capstr, blksize,
> vendor, model, rev);
> }
>
> @@ -772,7 +773,8 @@ show_full_lun_info(HBA_HANDLE hba_handle,
> HBA_PORTATTRIBUTES *rp_info,
> HBA_FCP_SCSI_ENTRY *ep,
> char *inqbuf,
> - struct scsi_rcap10_resp *rcap_resp)
> + u_int32_t blksize,
> + u_int64_t lba)
> {
> struct scsi_inquiry_std *inq = (struct scsi_inquiry_std *)inqbuf;
> char vendor[10];
> @@ -803,8 +805,8 @@ show_full_lun_info(HBA_HANDLE hba_handle,
> sizeof(inq->is_rev_level));
>
> /* Get device capacity */
> - cap = (u_int64_t) net32_get(&rcap_resp->rc_block_len) *
> - net32_get(&rcap_resp->rc_lba);
> + cap = (u_int64_t)blksize * lba;
> +
> cap_abbr = cap / (1024.0 * 1024.0);
> abbr = "MB";
> if (cap_abbr >= 1024) {
> @@ -843,10 +845,8 @@ show_full_lun_info(HBA_HANDLE hba_handle,
> ep->ScsiId.ScsiOSLun);
>
> printf(" Capacity: %s\n", capstr);
> - printf(" Capacity in Blocks: %u\n",
> - net32_get(&rcap_resp->rc_lba));
> - printf(" Block Size: %d bytes\n",
> - net32_get(&rcap_resp->rc_block_len));
> + printf(" Capacity in Blocks: %llu\n", lba);
> + printf(" Block Size: %u bytes\n", blksize);
The above is causing compiling issue:
fcoeadm_display.c:848:2: warning: format ‘%llu’ expects type ‘long long
unsigned int’, but argument 2 has type ‘u_int64_t’
I have fixed it to use inttypes.h for u_int32/64_t and applied.
yi
> pqual = inq->is_periph & SCSI_INQ_PQUAL_MASK;
> if (pqual == SCSI_PQUAL_ATT)
> printf(" Status: Attached\n");
> @@ -969,6 +969,9 @@ scan_device_map(HBA_HANDLE hba_handle,
> char *dev;
> char inqbuf[256];
> struct scsi_rcap10_resp rcap_resp;
> + struct scsi_rcap16_resp rcap16_resp;
> + u_int64_t lba;
> + u_int32_t blksize;
> int lun_count = 0;
> int print_header = 0;
>
> @@ -1011,17 +1014,42 @@ scan_device_map(HBA_HANDLE hba_handle,
> #endif
> if (status != HBA_STATUS_OK)
> continue;
> +
> + if (net32_get(&rcap_resp.rc_lba) == 0xFFFFFFFFUL) {
> + /* Issue read capacity (16) */
> +#ifdef TEST_HBAAPI_V1
> + status = get_device_capacity_v1(hba_handle, ep,
> + (char *)&rcap16_resp,
> + sizeof(rcap16_resp));
> +#else
> + status = get_device_capacity_v2(hba_handle, lp_info,
> + ep, (char
> *)&rcap16_resp,
> + sizeof(rcap16_resp));
> +#endif
> + if (status != HBA_STATUS_OK)
> + continue;
> +
> + blksize = net32_get(&rcap16_resp.rc_block_len);
> + lba = (u_int64_t)net64_get(&rcap16_resp.rc_lba);
> + } else {
> + blksize = net32_get(&rcap_resp.rc_block_len);
> + lba = (u_int64_t)net32_get(&rcap_resp.rc_lba);
> + }
> +
> + /* Total Number of Blocks */
> + lba = lba + 1;
> +
> switch (style) {
> case DISP_TARG:
> if (!print_header) {
> show_short_lun_info_header();
> print_header = 1;
> }
> - show_short_lun_info(ep, inqbuf, &rcap_resp);
> + show_short_lun_info(ep, inqbuf, blksize, lba);
> break;
> case DISP_LUN:
> show_full_lun_info(hba_handle, hba_info, lp_info,
> - rp_info, ep, inqbuf, &rcap_resp);
> + rp_info, ep, inqbuf, blksize, lba);
> break;
> }
>
>
> _______________________________________________
> devel mailing list
> devel@open-fcoe.org
> https://lists.open-fcoe.org/mailman/listinfo/devel
_______________________________________________
devel mailing list
devel@open-fcoe.org
https://lists.open-fcoe.org/mailman/listinfo/devel
