[SCSI] qla2xxx: Don't depend on mailbox return values while enabling FCE tracing.

avasquez01 · James Bottomley · commit fa0926df0f5c · 2008-05-15T16:39:29.000+01:00
Recent firmwares no longer return the 'number of buffers' in
mailbox6.  The original code may result in a potential panic
during a FW-dump process due to the driver misinterpreting the
size of the allocated buffer.

Signed-off-by: Andrew Vasquez &lt;andrew.vasquez@qlogic.com&gt;
Signed-off-by: James Bottomley &lt;James.Bottomley@HansenPartnership.com&gt;
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -2508,7 +2508,7 @@ qla2x00_enable_fce_trace(scsi_qla_host_t *ha, dma_addr_t fce_dma,
 		if (mb)
 			memcpy(mb, mcp->mb, 8 * sizeof(*mb));
 		if (dwords)
-			*dwords = mcp->mb[6];
+			*dwords = buffers;
 	}
 
 	return rval;

Original file line number	Diff line number	Diff line change
`@@ -2508,7 +2508,7 @@ qla2x00_enable_fce_trace(scsi_qla_host_t *ha, dma_addr_t fce_dma,`
`2508`	`2508`	`if (mb)`
`2509`	`2509`	`memcpy(mb, mcp->mb, 8 * sizeof(*mb));`
`2510`	`2510`	`if (dwords)`
`2511`		`- *dwords = mcp->mb[6];`
	`2511`	`+ *dwords = buffers;`
`2512`	`2512`	`}`
`2513`	`2513`
`2514`	`2514`	`return rval;`