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

Commit 39bef87c authored by Finn Thain's avatar Finn Thain Committed by Martin K. Petersen
Browse files

scsi: NCR5380: Suppress SDTR and WDTR message logging 



The 5380 drivers only support asynchronous transfers and the 5380
controllers only have narrow busses. Hence, the core driver will reject
any SDTR and WDTR messages from target devices. Don't log this, it's
expected behaviour. Also, fix the off-by-one array indices in the
arguments to scmd_printk().

Tested-by: default avatarStan Johnson <userm57@yahoo.com>
Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent d84c198f

drivers/scsi/NCR5380.c

+6 −12
Original line number Diff line number Diff line
@@ -1907,8 +1907,6 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) 
						switch (extended_msg[2]) {

						case EXTENDED_SDTR:

						case EXTENDED_WDTR:

						case EXTENDED_MODIFY_DATA_POINTER:

						case EXTENDED_EXTENDED_IDENTIFY:

							tmp = 0;

						}

					} else if (len) {
@@ -1931,18 +1929,14 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) 
					 * reject it.

					 */

				default:

					if (!tmp) {

						shost_printk(KERN_ERR, instance, "rejecting message ");

						spi_print_msg(extended_msg);

						printk("\n");

					} else if (tmp != EXTENDED_MESSAGE)

						scmd_printk(KERN_INFO, cmd,

						            "rejecting unknown message %02x\n",

						            tmp);

					else

					if (tmp == EXTENDED_MESSAGE)

						scmd_printk(KERN_INFO, cmd,

						            "rejecting unknown extended message code %02x, length %d\n",

						            extended_msg[1], extended_msg[0]);

						            extended_msg[2], extended_msg[1]);

					else if (tmp)

						scmd_printk(KERN_INFO, cmd,

						            "rejecting unknown message code %02x\n",

						            tmp);



					msgout = MESSAGE_REJECT;

					NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_ATN);