浏览代码

[SCSI] aic7xx: mitigate HOST_MSG_LOOP invalid SCB ff panic

The panic occurs if we get a MSGIN or MSGOUT for an unidentified SCB
(meaning we didn't identify the outstanding command it was for).  For
MSGIN this is wrong because it could be an unsolicited negotiation
MSGIN from the target.

Still panic on unsolicited MSGOUT because this would represent a
mistake in the negotiation phases.  However, we should fix this as
well.  The specs say we should go to bus free for unexpected msgin.

Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
James Bottomley 17 年之前
父节点
当前提交
5e2f22d39e
共有 1 个文件被更改,包括 6 次插入5 次删除
  1. 6 5
      drivers/scsi/aic7xxx/aic7xxx_core.c

+ 6 - 5
drivers/scsi/aic7xxx/aic7xxx_core.c

@@ -695,15 +695,16 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
 			scb_index = ahc_inb(ahc, SCB_TAG);
 			scb_index = ahc_inb(ahc, SCB_TAG);
 			scb = ahc_lookup_scb(ahc, scb_index);
 			scb = ahc_lookup_scb(ahc, scb_index);
 			if (devinfo.role == ROLE_INITIATOR) {
 			if (devinfo.role == ROLE_INITIATOR) {
-				if (scb == NULL)
-					panic("HOST_MSG_LOOP with "
-					      "invalid SCB %x\n", scb_index);
+				if (bus_phase == P_MESGOUT) {
+					if (scb == NULL)
+						panic("HOST_MSG_LOOP with "
+						      "invalid SCB %x\n",
+						      scb_index);
 
 
-				if (bus_phase == P_MESGOUT)
 					ahc_setup_initiator_msgout(ahc,
 					ahc_setup_initiator_msgout(ahc,
 								   &devinfo,
 								   &devinfo,
 								   scb);
 								   scb);
-				else {
+				} else {
 					ahc->msg_type =
 					ahc->msg_type =
 					    MSG_TYPE_INITIATOR_MSGIN;
 					    MSG_TYPE_INITIATOR_MSGIN;
 					ahc->msgin_index = 0;
 					ahc->msgin_index = 0;