scsi: hpsa: fallback to use legacy REPORT PHYS command

Older SmartArray controllers (eg SmartArray 64xx) do not support the
extended REPORT PHYS command, so fallback to use the legacy version
here.

Signed-off-by: Hannes Reinecke <hare@suse.com>
Acked-by: Don Brace <don.brace@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Hannes Reinecke 2016-12-02 11:36:13 +01:00 committed by Martin K. Petersen
parent d29425b065
commit 2a80d5458a

View File

@ -3632,8 +3632,32 @@ static int hpsa_scsi_do_report_luns(struct ctlr_info *h, int logical,
static inline int hpsa_scsi_do_report_phys_luns(struct ctlr_info *h, static inline int hpsa_scsi_do_report_phys_luns(struct ctlr_info *h,
struct ReportExtendedLUNdata *buf, int bufsize) struct ReportExtendedLUNdata *buf, int bufsize)
{ {
return hpsa_scsi_do_report_luns(h, 0, buf, bufsize, int rc;
HPSA_REPORT_PHYS_EXTENDED); struct ReportLUNdata *lbuf;
rc = hpsa_scsi_do_report_luns(h, 0, buf, bufsize,
HPSA_REPORT_PHYS_EXTENDED);
if (!rc || !hpsa_allow_any)
return rc;
/* REPORT PHYS EXTENDED is not supported */
lbuf = kzalloc(sizeof(*lbuf), GFP_KERNEL);
if (!lbuf)
return -ENOMEM;
rc = hpsa_scsi_do_report_luns(h, 0, lbuf, sizeof(*lbuf), 0);
if (!rc) {
int i;
u32 nphys;
/* Copy ReportLUNdata header */
memcpy(buf, lbuf, 8);
nphys = be32_to_cpu(*((__be32 *)lbuf->LUNListLength)) / 8;
for (i = 0; i < nphys; i++)
memcpy(buf->LUN[i].lunid, lbuf->LUN[i], 8);
}
kfree(lbuf);
return rc;
} }
static inline int hpsa_scsi_do_report_log_luns(struct ctlr_info *h, static inline int hpsa_scsi_do_report_log_luns(struct ctlr_info *h,