Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b833558 authored Aug 27, 2013 by Oleksandr Khoshaba Committed by James Bottomley Sep 03, 2013

[SCSI] qla2xxx: Print some variables to hexadecimal string via %*phN format

The patch changes a specifier used to output some variables. Instead of using
stack for each byte the '%*ph[CN]' allows to take a one pointer and prints
entire buffer as a hexadecimal string with the separator ':' or ''.

Signed-off-by: Oleksandr Khoshaba <Oleksandr.Khoshaba@gmail.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

parent 963ba22b

drivers/scsi/qla2xxx/qla_bsg.c

+3 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1318,12 +1318,9 @@ qla24xx_iidma(struct fc_bsg_job *bsg_job)

	if (rval) {		if (rval) {
	ql_log(ql_log_warn, vha, 0x704c,		ql_log(ql_log_warn, vha, 0x704c,
	"iIDMA cmd failed for %02x%02x%02x%02x%02x%02x%02x%02x -- "		"iIDMA cmd failed for %8phN -- "
	"%04x %x %04x %04x.\n", fcport->port_name[0],		"%04x %x %04x %04x.\n", fcport->port_name,
	fcport->port_name[1], fcport->port_name[2],		rval, fcport->fp_speed, mb[0], mb[1]);
	fcport->port_name[3], fcport->port_name[4],
	fcport->port_name[5], fcport->port_name[6],
	fcport->port_name[7], rval, fcport->fp_speed, mb[0], mb[1]);
	rval = (DID_ERROR << 16);		rval = (DID_ERROR << 16);
	} else {		} else {
	if (!port_param->mode) {		if (!port_param->mode) {

drivers/scsi/qla2xxx/qla_gs.c

+15 −76

Original line number	Original line	Diff line number	Diff line
	@@ -226,17 +226,9 @@ qla2x00_ga_nxt(scsi_qla_host_t vha, fc_port_t fcport)
	fcport->d_id.b.domain = 0xf0;		fcport->d_id.b.domain = 0xf0;

	ql_dbg(ql_dbg_disc, vha, 0x2063,		ql_dbg(ql_dbg_disc, vha, 0x2063,
	"GA_NXT entry - nn %02x%02x%02x%02x%02x%02x%02x%02x "		"GA_NXT entry - nn %8phN pn %8phN "
	"pn %02x%02x%02x%02x%02x%02x%02x%02x "
	"port_id=%02x%02x%02x.\n",		"port_id=%02x%02x%02x.\n",
	fcport->node_name[0], fcport->node_name[1],		fcport->node_name, fcport->port_name,
	fcport->node_name[2], fcport->node_name[3],
	fcport->node_name[4], fcport->node_name[5],
	fcport->node_name[6], fcport->node_name[7],
	fcport->port_name[0], fcport->port_name[1],
	fcport->port_name[2], fcport->port_name[3],
	fcport->port_name[4], fcport->port_name[5],
	fcport->port_name[6], fcport->port_name[7],
	fcport->d_id.b.domain, fcport->d_id.b.area,		fcport->d_id.b.domain, fcport->d_id.b.area,
	fcport->d_id.b.al_pa);		fcport->d_id.b.al_pa);
	}		}
	@@ -447,17 +439,9 @@ qla2x00_gnn_id(scsi_qla_host_t vha, sw_info_t list)
	ct_rsp->rsp.gnn_id.node_name, WWN_SIZE);		ct_rsp->rsp.gnn_id.node_name, WWN_SIZE);

	ql_dbg(ql_dbg_disc, vha, 0x2058,		ql_dbg(ql_dbg_disc, vha, 0x2058,
	"GID_PT entry - nn %02x%02x%02x%02x%02x%02x%02X%02x "		"GID_PT entry - nn %8phN pn %8phN "
	"pn %02x%02x%02x%02x%02x%02x%02X%02x "
	"portid=%02x%02x%02x.\n",		"portid=%02x%02x%02x.\n",
	list[i].node_name[0], list[i].node_name[1],		list[i].node_name, list[i].port_name,
	list[i].node_name[2], list[i].node_name[3],
	list[i].node_name[4], list[i].node_name[5],
	list[i].node_name[6], list[i].node_name[7],
	list[i].port_name[0], list[i].port_name[1],
	list[i].port_name[2], list[i].port_name[3],
	list[i].port_name[4], list[i].port_name[5],
	list[i].port_name[6], list[i].port_name[7],
	list[i].d_id.b.domain, list[i].d_id.b.area,		list[i].d_id.b.domain, list[i].d_id.b.area,
	list[i].d_id.b.al_pa);		list[i].d_id.b.al_pa);
	}		}
	@@ -796,17 +780,9 @@ qla2x00_sns_ga_nxt(scsi_qla_host_t vha, fc_port_t fcport)
	fcport->d_id.b.domain = 0xf0;		fcport->d_id.b.domain = 0xf0;

	ql_dbg(ql_dbg_disc, vha, 0x2061,		ql_dbg(ql_dbg_disc, vha, 0x2061,
	"GA_NXT entry - nn %02x%02x%02x%02x%02x%02x%02x%02x "		"GA_NXT entry - nn %8phN pn %8phN "
	"pn %02x%02x%02x%02x%02x%02x%02x%02x "
	"port_id=%02x%02x%02x.\n",		"port_id=%02x%02x%02x.\n",
	fcport->node_name[0], fcport->node_name[1],		fcport->node_name, fcport->port_name,
	fcport->node_name[2], fcport->node_name[3],
	fcport->node_name[4], fcport->node_name[5],
	fcport->node_name[6], fcport->node_name[7],
	fcport->port_name[0], fcport->port_name[1],
	fcport->port_name[2], fcport->port_name[3],
	fcport->port_name[4], fcport->port_name[5],
	fcport->port_name[6], fcport->port_name[7],
	fcport->d_id.b.domain, fcport->d_id.b.area,		fcport->d_id.b.domain, fcport->d_id.b.area,
	fcport->d_id.b.al_pa);		fcport->d_id.b.al_pa);
	}		}
	@@ -991,17 +967,9 @@ qla2x00_sns_gnn_id(scsi_qla_host_t vha, sw_info_t list)
	WWN_SIZE);		WWN_SIZE);

	ql_dbg(ql_dbg_disc, vha, 0x206e,		ql_dbg(ql_dbg_disc, vha, 0x206e,
	"GID_PT entry - nn %02x%02x%02x%02x%02x%02x%02x%02x "		"GID_PT entry - nn %8phN pn %8phN "
	"pn %02x%02x%02x%02x%02x%02x%02x%02x "
	"port_id=%02x%02x%02x.\n",		"port_id=%02x%02x%02x.\n",
	list[i].node_name[0], list[i].node_name[1],		list[i].node_name, list[i].port_name,
	list[i].node_name[2], list[i].node_name[3],
	list[i].node_name[4], list[i].node_name[5],
	list[i].node_name[6], list[i].node_name[7],
	list[i].port_name[0], list[i].port_name[1],
	list[i].port_name[2], list[i].port_name[3],
	list[i].port_name[4], list[i].port_name[5],
	list[i].port_name[6], list[i].port_name[7],
	list[i].d_id.b.domain, list[i].d_id.b.area,		list[i].d_id.b.domain, list[i].d_id.b.area,
	list[i].d_id.b.al_pa);		list[i].d_id.b.al_pa);
	}		}
	@@ -1321,11 +1289,7 @@ qla2x00_fdmi_rhba(scsi_qla_host_t *vha)
	size += 4 + WWN_SIZE;		size += 4 + WWN_SIZE;

	ql_dbg(ql_dbg_disc, vha, 0x2025,		ql_dbg(ql_dbg_disc, vha, 0x2025,
	"NodeName = %02x%02x%02x%02x%02x%02x%02x%02x.\n",		"NodeName = %8phN.\n", eiter->a.node_name);
	eiter->a.node_name[0], eiter->a.node_name[1],
	eiter->a.node_name[2], eiter->a.node_name[3],
	eiter->a.node_name[4], eiter->a.node_name[5],
	eiter->a.node_name[6], eiter->a.node_name[7]);

	/* Manufacturer. */		/* Manufacturer. */
	eiter = (struct ct_fdmi_hba_attr *) (entries + size);		eiter = (struct ct_fdmi_hba_attr *) (entries + size);
	@@ -1428,16 +1392,8 @@ qla2x00_fdmi_rhba(scsi_qla_host_t *vha)
	qla2x00_update_ms_fdmi_iocb(vha, size + 16);		qla2x00_update_ms_fdmi_iocb(vha, size + 16);

	ql_dbg(ql_dbg_disc, vha, 0x202e,		ql_dbg(ql_dbg_disc, vha, 0x202e,
	"RHBA identifier = "		"RHBA identifier = %8phN size=%d.\n",
	"%02x%02x%02x%02x%02x%02x%02x%02x size=%d.\n",		ct_req->req.rhba.hba_identifier, size);
	ct_req->req.rhba.hba_identifier[0],
	ct_req->req.rhba.hba_identifier[1],
	ct_req->req.rhba.hba_identifier[2],
	ct_req->req.rhba.hba_identifier[3],
	ct_req->req.rhba.hba_identifier[4],
	ct_req->req.rhba.hba_identifier[5],
	ct_req->req.rhba.hba_identifier[6],
	ct_req->req.rhba.hba_identifier[7], size);
	ql_dump_buffer(ql_dbg_disc + ql_dbg_buffer, vha, 0x2076,		ql_dump_buffer(ql_dbg_disc + ql_dbg_buffer, vha, 0x2076,
	entries, size);		entries, size);

	@@ -1494,11 +1450,7 @@ qla2x00_fdmi_dhba(scsi_qla_host_t *vha)
	memcpy(ct_req->req.dhba.port_name, vha->port_name, WWN_SIZE);		memcpy(ct_req->req.dhba.port_name, vha->port_name, WWN_SIZE);

	ql_dbg(ql_dbg_disc, vha, 0x2036,		ql_dbg(ql_dbg_disc, vha, 0x2036,
	"DHBA portname = %02x%02x%02x%02x%02x%02x%02x%02x.\n",		"DHBA portname = %8phN.\n", ct_req->req.dhba.port_name);
	ct_req->req.dhba.port_name[0], ct_req->req.dhba.port_name[1],
	ct_req->req.dhba.port_name[2], ct_req->req.dhba.port_name[3],
	ct_req->req.dhba.port_name[4], ct_req->req.dhba.port_name[5],
	ct_req->req.dhba.port_name[6], ct_req->req.dhba.port_name[7]);

	/* Execute MS IOCB */		/* Execute MS IOCB */
	rval = qla2x00_issue_iocb(vha, ha->ms_iocb, ha->ms_iocb_dma,		rval = qla2x00_issue_iocb(vha, ha->ms_iocb, ha->ms_iocb_dma,
	@@ -1678,12 +1630,7 @@ qla2x00_fdmi_rpa(scsi_qla_host_t *vha)
	qla2x00_update_ms_fdmi_iocb(vha, size + 16);		qla2x00_update_ms_fdmi_iocb(vha, size + 16);

	ql_dbg(ql_dbg_disc, vha, 0x203e,		ql_dbg(ql_dbg_disc, vha, 0x203e,
	"RPA portname= %02x%02x%02x%02x%02X%02x%02x%02x size=%d.\n",		"RPA portname= %8phN size=%d.\n", ct_req->req.rpa.port_name, size);
	ct_req->req.rpa.port_name[0], ct_req->req.rpa.port_name[1],
	ct_req->req.rpa.port_name[2], ct_req->req.rpa.port_name[3],
	ct_req->req.rpa.port_name[4], ct_req->req.rpa.port_name[5],
	ct_req->req.rpa.port_name[6], ct_req->req.rpa.port_name[7],
	size);
	ql_dump_buffer(ql_dbg_disc + ql_dbg_buffer, vha, 0x2079,		ql_dump_buffer(ql_dbg_disc + ql_dbg_buffer, vha, 0x2079,
	entries, size);		entries, size);

	@@ -1940,16 +1887,8 @@ qla2x00_gpsc(scsi_qla_host_t vha, sw_info_t list)

	ql_dbg(ql_dbg_disc, vha, 0x205b,		ql_dbg(ql_dbg_disc, vha, 0x205b,
	"GPSC ext entry - fpn "		"GPSC ext entry - fpn "
	"%02x%02x%02x%02x%02x%02x%02x%02x speeds=%04x "		"%8phN speeds=%04x speed=%04x.\n",
	"speed=%04x.\n",		list[i].fabric_port_name,
	list[i].fabric_port_name[0],
	list[i].fabric_port_name[1],
	list[i].fabric_port_name[2],
	list[i].fabric_port_name[3],
	list[i].fabric_port_name[4],
	list[i].fabric_port_name[5],
	list[i].fabric_port_name[6],
	list[i].fabric_port_name[7],
	be16_to_cpu(ct_rsp->rsp.gpsc.speeds),		be16_to_cpu(ct_rsp->rsp.gpsc.speeds),
	be16_to_cpu(ct_rsp->rsp.gpsc.speed));		be16_to_cpu(ct_rsp->rsp.gpsc.speed));
	}		}

drivers/scsi/qla2xxx/qla_init.c

+5 −19

Original line number	Original line	Diff line number	Diff line
	@@ -564,12 +564,7 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha)
	if (ha->flags.disable_serdes) {		if (ha->flags.disable_serdes) {
	/* Mask HBA via NVRAM settings? */		/* Mask HBA via NVRAM settings? */
	ql_log(ql_log_info, vha, 0x0077,		ql_log(ql_log_info, vha, 0x0077,
	"Masking HBA WWPN "		"Masking HBA WWPN %8phN (via NVRAM).\n", vha->port_name);
	"%02x%02x%02x%02x%02x%02x%02x%02x (via NVRAM).\n",
	vha->port_name[0], vha->port_name[1],
	vha->port_name[2], vha->port_name[3],
	vha->port_name[4], vha->port_name[5],
	vha->port_name[6], vha->port_name[7]);
	return QLA_FUNCTION_FAILED;		return QLA_FUNCTION_FAILED;
	}		}

	@@ -3061,22 +3056,13 @@ qla2x00_iidma_fcport(scsi_qla_host_t vha, fc_port_t fcport)
	mb);		mb);
	if (rval != QLA_SUCCESS) {		if (rval != QLA_SUCCESS) {
	ql_dbg(ql_dbg_disc, vha, 0x2004,		ql_dbg(ql_dbg_disc, vha, 0x2004,
	"Unable to adjust iIDMA "		"Unable to adjust iIDMA %8phN -- %04x %x %04x %04x.\n",
	"%02x%02x%02x%02x%02x%02x%02x%02x -- %04x %x %04x "		fcport->port_name, rval, fcport->fp_speed, mb[0], mb[1]);
	"%04x.\n", fcport->port_name[0], fcport->port_name[1],
	fcport->port_name[2], fcport->port_name[3],
	fcport->port_name[4], fcport->port_name[5],
	fcport->port_name[6], fcport->port_name[7], rval,
	fcport->fp_speed, mb[0], mb[1]);
	} else {		} else {
	ql_dbg(ql_dbg_disc, vha, 0x2005,		ql_dbg(ql_dbg_disc, vha, 0x2005,
	"iIDMA adjusted to %s GB/s "		"iIDMA adjusted to %s GB/s on %8phN.\n",
	"on %02x%02x%02x%02x%02x%02x%02x%02x.\n",
	qla2x00_get_link_speed_str(ha, fcport->fp_speed),		qla2x00_get_link_speed_str(ha, fcport->fp_speed),
	fcport->port_name[0], fcport->port_name[1],		fcport->port_name);
	fcport->port_name[2], fcport->port_name[3],
	fcport->port_name[4], fcport->port_name[5],
	fcport->port_name[6], fcport->port_name[7]);
	}		}
	}		}

drivers/scsi/qla2xxx/qla_isr.c

+3 −6

Original line number	Original line	Diff line number	Diff line
	@@ -2212,16 +2212,13 @@ check_scsi_status:
	out:		out:
	if (logit)		if (logit)
	ql_dbg(ql_dbg_io, fcport->vha, 0x3022,		ql_dbg(ql_dbg_io, fcport->vha, 0x3022,
	"FCP command status: 0x%x-0x%x (0x%x) "		"FCP command status: 0x%x-0x%x (0x%x) nexus=%ld:%d:%d "
	"nexus=%ld:%d:%d portid=%02x%02x%02x oxid=0x%x "		"portid=%02x%02x%02x oxid=0x%x cdb=%10phN len=0x%x "
	"cdb=%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x len=0x%x "
	"rsp_info=0x%x resid=0x%x fw_resid=0x%x.\n",		"rsp_info=0x%x resid=0x%x fw_resid=0x%x.\n",
	comp_status, scsi_status, res, vha->host_no,		comp_status, scsi_status, res, vha->host_no,
	cp->device->id, cp->device->lun, fcport->d_id.b.domain,		cp->device->id, cp->device->lun, fcport->d_id.b.domain,
	fcport->d_id.b.area, fcport->d_id.b.al_pa, ox_id,		fcport->d_id.b.area, fcport->d_id.b.al_pa, ox_id,
	cp->cmnd[0], cp->cmnd[1], cp->cmnd[2], cp->cmnd[3],		cp->cmnd, scsi_bufflen(cp), rsp_info_len,
	cp->cmnd[4], cp->cmnd[5], cp->cmnd[6], cp->cmnd[7],
	cp->cmnd[8], cp->cmnd[9], scsi_bufflen(cp), rsp_info_len,
	resid_len, fw_resid_len);		resid_len, fw_resid_len);

	if (!res)		if (!res)

drivers/scsi/qla2xxx/qla_mr.c

+5 −8

Original line number	Original line	Diff line number	Diff line
	@@ -2526,16 +2526,13 @@ check_scsi_status:

	if (logit)		if (logit)
	ql_dbg(ql_dbg_io, fcport->vha, 0x3058,		ql_dbg(ql_dbg_io, fcport->vha, 0x3058,
	"FCP command status: 0x%x-0x%x (0x%x) "		"FCP command status: 0x%x-0x%x (0x%x) nexus=%ld:%d:%d "
	"nexus=%ld:%d:%d tgt_id: 0x%x lscsi_status: 0x%x"		"tgt_id: 0x%x lscsi_status: 0x%x cdb=%10phN len=0x%x "
	"cdb=%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x len=0x%x "		"rsp_info=0x%x resid=0x%x fw_resid=0x%x sense_len=0x%x, "
	"rsp_info=0x%x resid=0x%x fw_resid=0x%x "		"par_sense_len=0x%x, rsp_info_len=0x%x\n",
	"sense_len=0x%x, par_sense_len=0x%x, rsp_info_len=0x%x\n",
	comp_status, scsi_status, res, vha->host_no,		comp_status, scsi_status, res, vha->host_no,
	cp->device->id, cp->device->lun, fcport->tgt_id,		cp->device->id, cp->device->lun, fcport->tgt_id,
	lscsi_status, cp->cmnd[0], cp->cmnd[1], cp->cmnd[2],		lscsi_status, cp->cmnd, scsi_bufflen(cp),
	cp->cmnd[3], cp->cmnd[4], cp->cmnd[5], cp->cmnd[6],
	cp->cmnd[7], cp->cmnd[8], cp->cmnd[9], scsi_bufflen(cp),
	rsp_info_len, resid_len, fw_resid_len, sense_len,		rsp_info_len, resid_len, fw_resid_len, sense_len,
	par_sense_len, rsp_info_len);		par_sense_len, rsp_info_len);