Author: bencollins
Date: Sun, 14 Jul 2002 17:26:38 -0400
New Revision: 524
Modified:
trunk/sbp2.c
Log:
Fix sbp2_broken_inquiry_list list. Also, output better defug messages for workaround
Modified: trunk/sbp2.c
==============================================================================
--- trunk/sbp2.c (original)
+++ trunk/sbp2.c Mon Jul 15 12:38:03 2002
@@ -550,9 +550,10 @@
update: sbp2_update
};
-/* List of device firmware's that require a forced 36 byte inquiry */
+/* List of device firmware's that require a forced 36 byte inquiry. Note
+ * the final 0x0 needs to be there for denoting end of list. */
static u32 sbp2_broken_inquiry_list[] = {
- 0x00002800
+ 0x00002800, 0x0
};
/**************************************
@@ -1937,8 +1938,9 @@
if ((scsi_id->sbp2_firmware_revision & 0xffff00) ==
SBP2_128KB_BROKEN_FIRMWARE &&
(sbp2_max_sectors * 512) > (128 * 1024)) {
- SBP2_WARN("Bridge only supports 128KB max transfer size.");
- SBP2_WARN("WARNING: Current sbp2_max_sectors setting is larger than 128k (%d sectors)!",
+ SBP2_WARN("Node " NODE_BUS_FMT ": Bridge only supports 128KB max transfer size.",
+ NODE_BUS_ARGS(scsi_id->ne->nodeid));
+ SBP2_WARN("WARNING: Current sbp2_max_sectors setting is larger than 128KB (%d sectors)!",
sbp2_max_sectors);
scsi_id->workarounds |= SBP2_BREAKAGE_128K_MAX_TRANSFER;
}
@@ -1953,8 +1955,12 @@
* linux1394-devel mailing list. */
for (i = 0; sbp2_broken_inquiry_list[i]; i++) {
if ((scsi_id->sbp2_firmware_revision & 0xffff00) ==
- sbp2_broken_inquiry_list[i])
+ sbp2_broken_inquiry_list[i]) {
+ SBP2_WARN("Node " NODE_BUS_FMT ": Using 36byte inquiry workaround",
+ NODE_BUS_ARGS(scsi_id->ne->nodeid));
scsi_id->workarounds |= SBP2_BREAKAGE_INQUIRY_HACK;
+ break; // No need to continue.
+ }
}
}
|
