Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit fc25307d06f524d6c04b371b236dc9e62186058c

Authored by Matthew Wilcox
Committed by James Bottomley
1 parent 1bfc5d9d5e
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[SCSI] Improve message printing code 

Fix a bug where we would consume one byte too many in the message
printing code.
Add support for 256-byte long messages.
Add support for the Modify Bidirectional Data Pointer message.

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Showing 1 changed file with 19 additions and 5 deletions Side-by-side Diff

drivers/scsi/scsi_transport_spi.c
Diff comments   View file @ fc25307
... ... @@ -1105,7 +1105,7 @@
1105 1105 static const char * const extended_msgs[] = {
1106 1106 /* 0x00 */ "Modify Data Pointer", "Synchronous Data Transfer Request",
1107 1107 /* 0x02 */ "SCSI-I Extended Identify", "Wide Data Transfer Request",
1108   -/* 0x04 */ "Parallel Protocol Request"
  1108 +/* 0x04 */ "Parallel Protocol Request", "Modify Bidirectional Data Pointer"
1109 1109 };
1110 1110  
1111 1111 static void print_nego(const unsigned char *msg, int per, int off, int width)
1112 1112  
... ... @@ -1122,11 +1122,20 @@
1122 1122 printk("width = %d ", 8 << msg[width]);
1123 1123 }
1124 1124  
  1125 +static void print_ptr(const unsigned char *msg, int msb, const char *desc)
  1126 +{
  1127 + int ptr = (msg[msb] << 24) | (msg[msb+1] << 16) | (msg[msb+2] << 8) |
  1128 + msg[msb+3];
  1129 + printk("%s = %d ", desc, ptr);
  1130 +}
  1131 +
1125 1132 int spi_print_msg(const unsigned char *msg)
1126 1133 {
1127 1134 int len = 0, i;
1128 1135 if (msg[0] == EXTENDED_MESSAGE) {
1129   - len = 3 + msg[1];
  1136 + len = 2 + msg[1];
  1137 + if (len == 2)
  1138 + len += 256;
1130 1139 if (msg[2] < ARRAY_SIZE(extended_msgs))
1131 1140 printk ("%s ", extended_msgs[msg[2]]);
1132 1141 else
... ... @@ -1134,8 +1143,7 @@
1134 1143 (int) msg[2]);
1135 1144 switch (msg[2]) {
1136 1145 case EXTENDED_MODIFY_DATA_POINTER:
1137   - printk("pointer = %d ", (msg[3] << 24) |
1138   - (msg[4] << 16) | (msg[5] << 8) | msg[6]);
  1146 + print_ptr(msg, 3, "pointer");
1139 1147 break;
1140 1148 case EXTENDED_SDTR:
1141 1149 print_nego(msg, 3, 4, 0);
... ... @@ -1146,6 +1154,10 @@
1146 1154 case EXTENDED_PPR:
1147 1155 print_nego(msg, 3, 5, 6);
1148 1156 break;
  1157 + case EXTENDED_MODIFY_BIDI_DATA_PTR:
  1158 + print_ptr(msg, 3, "out");
  1159 + print_ptr(msg, 7, "in");
  1160 + break;
1149 1161 default:
1150 1162 for (i = 2; i < len; ++i)
1151 1163 printk("%02x ", msg[i]);
... ... @@ -1186,7 +1198,9 @@
1186 1198 int len = 0, i;
1187 1199  
1188 1200 if (msg[0] == EXTENDED_MESSAGE) {
1189   - len = 3 + msg[1];
  1201 + len = 2 + msg[1];
  1202 + if (len == 2)
  1203 + len += 256;
1190 1204 for (i = 0; i < len; ++i)
1191 1205 printk("%02x ", msg[i]);
1192 1206 /* Identify */