diff options
Diffstat (limited to 'drivers/scsi/dc395x.c')
-rw-r--r-- | drivers/scsi/dc395x.c | 193 |
1 files changed, 96 insertions, 97 deletions
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c index b10b3841535c..f5b718d3c31b 100644 --- a/drivers/scsi/dc395x.c +++ b/drivers/scsi/dc395x.c | |||
@@ -778,8 +778,8 @@ static void srb_free_insert(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb) | |||
778 | static void srb_waiting_insert(struct DeviceCtlBlk *dcb, | 778 | static void srb_waiting_insert(struct DeviceCtlBlk *dcb, |
779 | struct ScsiReqBlk *srb) | 779 | struct ScsiReqBlk *srb) |
780 | { | 780 | { |
781 | dprintkdbg(DBG_0, "srb_waiting_insert: (pid#%li) <%02i-%i> srb=%p\n", | 781 | dprintkdbg(DBG_0, "srb_waiting_insert: (0x%p) <%02i-%i> srb=%p\n", |
782 | srb->cmd->serial_number, dcb->target_id, dcb->target_lun, srb); | 782 | srb->cmd, dcb->target_id, dcb->target_lun, srb); |
783 | list_add(&srb->list, &dcb->srb_waiting_list); | 783 | list_add(&srb->list, &dcb->srb_waiting_list); |
784 | } | 784 | } |
785 | 785 | ||
@@ -787,16 +787,16 @@ static void srb_waiting_insert(struct DeviceCtlBlk *dcb, | |||
787 | static void srb_waiting_append(struct DeviceCtlBlk *dcb, | 787 | static void srb_waiting_append(struct DeviceCtlBlk *dcb, |
788 | struct ScsiReqBlk *srb) | 788 | struct ScsiReqBlk *srb) |
789 | { | 789 | { |
790 | dprintkdbg(DBG_0, "srb_waiting_append: (pid#%li) <%02i-%i> srb=%p\n", | 790 | dprintkdbg(DBG_0, "srb_waiting_append: (0x%p) <%02i-%i> srb=%p\n", |
791 | srb->cmd->serial_number, dcb->target_id, dcb->target_lun, srb); | 791 | srb->cmd, dcb->target_id, dcb->target_lun, srb); |
792 | list_add_tail(&srb->list, &dcb->srb_waiting_list); | 792 | list_add_tail(&srb->list, &dcb->srb_waiting_list); |
793 | } | 793 | } |
794 | 794 | ||
795 | 795 | ||
796 | static void srb_going_append(struct DeviceCtlBlk *dcb, struct ScsiReqBlk *srb) | 796 | static void srb_going_append(struct DeviceCtlBlk *dcb, struct ScsiReqBlk *srb) |
797 | { | 797 | { |
798 | dprintkdbg(DBG_0, "srb_going_append: (pid#%li) <%02i-%i> srb=%p\n", | 798 | dprintkdbg(DBG_0, "srb_going_append: (0x%p) <%02i-%i> srb=%p\n", |
799 | srb->cmd->serial_number, dcb->target_id, dcb->target_lun, srb); | 799 | srb->cmd, dcb->target_id, dcb->target_lun, srb); |
800 | list_add_tail(&srb->list, &dcb->srb_going_list); | 800 | list_add_tail(&srb->list, &dcb->srb_going_list); |
801 | } | 801 | } |
802 | 802 | ||
@@ -805,8 +805,8 @@ static void srb_going_remove(struct DeviceCtlBlk *dcb, struct ScsiReqBlk *srb) | |||
805 | { | 805 | { |
806 | struct ScsiReqBlk *i; | 806 | struct ScsiReqBlk *i; |
807 | struct ScsiReqBlk *tmp; | 807 | struct ScsiReqBlk *tmp; |
808 | dprintkdbg(DBG_0, "srb_going_remove: (pid#%li) <%02i-%i> srb=%p\n", | 808 | dprintkdbg(DBG_0, "srb_going_remove: (0x%p) <%02i-%i> srb=%p\n", |
809 | srb->cmd->serial_number, dcb->target_id, dcb->target_lun, srb); | 809 | srb->cmd, dcb->target_id, dcb->target_lun, srb); |
810 | 810 | ||
811 | list_for_each_entry_safe(i, tmp, &dcb->srb_going_list, list) | 811 | list_for_each_entry_safe(i, tmp, &dcb->srb_going_list, list) |
812 | if (i == srb) { | 812 | if (i == srb) { |
@@ -821,8 +821,8 @@ static void srb_waiting_remove(struct DeviceCtlBlk *dcb, | |||
821 | { | 821 | { |
822 | struct ScsiReqBlk *i; | 822 | struct ScsiReqBlk *i; |
823 | struct ScsiReqBlk *tmp; | 823 | struct ScsiReqBlk *tmp; |
824 | dprintkdbg(DBG_0, "srb_waiting_remove: (pid#%li) <%02i-%i> srb=%p\n", | 824 | dprintkdbg(DBG_0, "srb_waiting_remove: (0x%p) <%02i-%i> srb=%p\n", |
825 | srb->cmd->serial_number, dcb->target_id, dcb->target_lun, srb); | 825 | srb->cmd, dcb->target_id, dcb->target_lun, srb); |
826 | 826 | ||
827 | list_for_each_entry_safe(i, tmp, &dcb->srb_waiting_list, list) | 827 | list_for_each_entry_safe(i, tmp, &dcb->srb_waiting_list, list) |
828 | if (i == srb) { | 828 | if (i == srb) { |
@@ -836,8 +836,8 @@ static void srb_going_to_waiting_move(struct DeviceCtlBlk *dcb, | |||
836 | struct ScsiReqBlk *srb) | 836 | struct ScsiReqBlk *srb) |
837 | { | 837 | { |
838 | dprintkdbg(DBG_0, | 838 | dprintkdbg(DBG_0, |
839 | "srb_going_to_waiting_move: (pid#%li) <%02i-%i> srb=%p\n", | 839 | "srb_going_to_waiting_move: (0x%p) <%02i-%i> srb=%p\n", |
840 | srb->cmd->serial_number, dcb->target_id, dcb->target_lun, srb); | 840 | srb->cmd, dcb->target_id, dcb->target_lun, srb); |
841 | list_move(&srb->list, &dcb->srb_waiting_list); | 841 | list_move(&srb->list, &dcb->srb_waiting_list); |
842 | } | 842 | } |
843 | 843 | ||
@@ -846,8 +846,8 @@ static void srb_waiting_to_going_move(struct DeviceCtlBlk *dcb, | |||
846 | struct ScsiReqBlk *srb) | 846 | struct ScsiReqBlk *srb) |
847 | { | 847 | { |
848 | dprintkdbg(DBG_0, | 848 | dprintkdbg(DBG_0, |
849 | "srb_waiting_to_going_move: (pid#%li) <%02i-%i> srb=%p\n", | 849 | "srb_waiting_to_going_move: (0x%p) <%02i-%i> srb=%p\n", |
850 | srb->cmd->serial_number, dcb->target_id, dcb->target_lun, srb); | 850 | srb->cmd, dcb->target_id, dcb->target_lun, srb); |
851 | list_move(&srb->list, &dcb->srb_going_list); | 851 | list_move(&srb->list, &dcb->srb_going_list); |
852 | } | 852 | } |
853 | 853 | ||
@@ -982,8 +982,8 @@ static void build_srb(struct scsi_cmnd *cmd, struct DeviceCtlBlk *dcb, | |||
982 | { | 982 | { |
983 | int nseg; | 983 | int nseg; |
984 | enum dma_data_direction dir = cmd->sc_data_direction; | 984 | enum dma_data_direction dir = cmd->sc_data_direction; |
985 | dprintkdbg(DBG_0, "build_srb: (pid#%li) <%02i-%i>\n", | 985 | dprintkdbg(DBG_0, "build_srb: (0x%p) <%02i-%i>\n", |
986 | cmd->serial_number, dcb->target_id, dcb->target_lun); | 986 | cmd, dcb->target_id, dcb->target_lun); |
987 | 987 | ||
988 | srb->dcb = dcb; | 988 | srb->dcb = dcb; |
989 | srb->cmd = cmd; | 989 | srb->cmd = cmd; |
@@ -1086,8 +1086,8 @@ static int dc395x_queue_command_lck(struct scsi_cmnd *cmd, void (*done)(struct s | |||
1086 | struct ScsiReqBlk *srb; | 1086 | struct ScsiReqBlk *srb; |
1087 | struct AdapterCtlBlk *acb = | 1087 | struct AdapterCtlBlk *acb = |
1088 | (struct AdapterCtlBlk *)cmd->device->host->hostdata; | 1088 | (struct AdapterCtlBlk *)cmd->device->host->hostdata; |
1089 | dprintkdbg(DBG_0, "queue_command: (pid#%li) <%02i-%i> cmnd=0x%02x\n", | 1089 | dprintkdbg(DBG_0, "queue_command: (0x%p) <%02i-%i> cmnd=0x%02x\n", |
1090 | cmd->serial_number, cmd->device->id, cmd->device->lun, cmd->cmnd[0]); | 1090 | cmd, cmd->device->id, cmd->device->lun, cmd->cmnd[0]); |
1091 | 1091 | ||
1092 | /* Assume BAD_TARGET; will be cleared later */ | 1092 | /* Assume BAD_TARGET; will be cleared later */ |
1093 | cmd->result = DID_BAD_TARGET << 16; | 1093 | cmd->result = DID_BAD_TARGET << 16; |
@@ -1140,7 +1140,7 @@ static int dc395x_queue_command_lck(struct scsi_cmnd *cmd, void (*done)(struct s | |||
1140 | /* process immediately */ | 1140 | /* process immediately */ |
1141 | send_srb(acb, srb); | 1141 | send_srb(acb, srb); |
1142 | } | 1142 | } |
1143 | dprintkdbg(DBG_1, "queue_command: (pid#%li) done\n", cmd->serial_number); | 1143 | dprintkdbg(DBG_1, "queue_command: (0x%p) done\n", cmd); |
1144 | return 0; | 1144 | return 0; |
1145 | 1145 | ||
1146 | complete: | 1146 | complete: |
@@ -1203,9 +1203,9 @@ static void dump_register_info(struct AdapterCtlBlk *acb, | |||
1203 | dprintkl(KERN_INFO, "dump: srb=%p cmd=%p OOOPS!\n", | 1203 | dprintkl(KERN_INFO, "dump: srb=%p cmd=%p OOOPS!\n", |
1204 | srb, srb->cmd); | 1204 | srb, srb->cmd); |
1205 | else | 1205 | else |
1206 | dprintkl(KERN_INFO, "dump: srb=%p cmd=%p (pid#%li) " | 1206 | dprintkl(KERN_INFO, "dump: srb=%p cmd=%p " |
1207 | "cmnd=0x%02x <%02i-%i>\n", | 1207 | "cmnd=0x%02x <%02i-%i>\n", |
1208 | srb, srb->cmd, srb->cmd->serial_number, | 1208 | srb, srb->cmd, |
1209 | srb->cmd->cmnd[0], srb->cmd->device->id, | 1209 | srb->cmd->cmnd[0], srb->cmd->device->id, |
1210 | srb->cmd->device->lun); | 1210 | srb->cmd->device->lun); |
1211 | printk(" sglist=%p cnt=%i idx=%i len=%zu\n", | 1211 | printk(" sglist=%p cnt=%i idx=%i len=%zu\n", |
@@ -1301,8 +1301,8 @@ static int __dc395x_eh_bus_reset(struct scsi_cmnd *cmd) | |||
1301 | struct AdapterCtlBlk *acb = | 1301 | struct AdapterCtlBlk *acb = |
1302 | (struct AdapterCtlBlk *)cmd->device->host->hostdata; | 1302 | (struct AdapterCtlBlk *)cmd->device->host->hostdata; |
1303 | dprintkl(KERN_INFO, | 1303 | dprintkl(KERN_INFO, |
1304 | "eh_bus_reset: (pid#%li) target=<%02i-%i> cmd=%p\n", | 1304 | "eh_bus_reset: (0%p) target=<%02i-%i> cmd=%p\n", |
1305 | cmd->serial_number, cmd->device->id, cmd->device->lun, cmd); | 1305 | cmd, cmd->device->id, cmd->device->lun, cmd); |
1306 | 1306 | ||
1307 | if (timer_pending(&acb->waiting_timer)) | 1307 | if (timer_pending(&acb->waiting_timer)) |
1308 | del_timer(&acb->waiting_timer); | 1308 | del_timer(&acb->waiting_timer); |
@@ -1368,8 +1368,8 @@ static int dc395x_eh_abort(struct scsi_cmnd *cmd) | |||
1368 | (struct AdapterCtlBlk *)cmd->device->host->hostdata; | 1368 | (struct AdapterCtlBlk *)cmd->device->host->hostdata; |
1369 | struct DeviceCtlBlk *dcb; | 1369 | struct DeviceCtlBlk *dcb; |
1370 | struct ScsiReqBlk *srb; | 1370 | struct ScsiReqBlk *srb; |
1371 | dprintkl(KERN_INFO, "eh_abort: (pid#%li) target=<%02i-%i> cmd=%p\n", | 1371 | dprintkl(KERN_INFO, "eh_abort: (0x%p) target=<%02i-%i> cmd=%p\n", |
1372 | cmd->serial_number, cmd->device->id, cmd->device->lun, cmd); | 1372 | cmd, cmd->device->id, cmd->device->lun, cmd); |
1373 | 1373 | ||
1374 | dcb = find_dcb(acb, cmd->device->id, cmd->device->lun); | 1374 | dcb = find_dcb(acb, cmd->device->id, cmd->device->lun); |
1375 | if (!dcb) { | 1375 | if (!dcb) { |
@@ -1495,8 +1495,8 @@ static u8 start_scsi(struct AdapterCtlBlk* acb, struct DeviceCtlBlk* dcb, | |||
1495 | u16 s_stat2, return_code; | 1495 | u16 s_stat2, return_code; |
1496 | u8 s_stat, scsicommand, i, identify_message; | 1496 | u8 s_stat, scsicommand, i, identify_message; |
1497 | u8 *ptr; | 1497 | u8 *ptr; |
1498 | dprintkdbg(DBG_0, "start_scsi: (pid#%li) <%02i-%i> srb=%p\n", | 1498 | dprintkdbg(DBG_0, "start_scsi: (0x%p) <%02i-%i> srb=%p\n", |
1499 | srb->cmd->serial_number, dcb->target_id, dcb->target_lun, srb); | 1499 | dcb->target_id, dcb->target_lun, srb); |
1500 | 1500 | ||
1501 | srb->tag_number = TAG_NONE; /* acb->tag_max_num: had error read in eeprom */ | 1501 | srb->tag_number = TAG_NONE; /* acb->tag_max_num: had error read in eeprom */ |
1502 | 1502 | ||
@@ -1505,8 +1505,8 @@ static u8 start_scsi(struct AdapterCtlBlk* acb, struct DeviceCtlBlk* dcb, | |||
1505 | s_stat2 = DC395x_read16(acb, TRM_S1040_SCSI_STATUS); | 1505 | s_stat2 = DC395x_read16(acb, TRM_S1040_SCSI_STATUS); |
1506 | #if 1 | 1506 | #if 1 |
1507 | if (s_stat & 0x20 /* s_stat2 & 0x02000 */ ) { | 1507 | if (s_stat & 0x20 /* s_stat2 & 0x02000 */ ) { |
1508 | dprintkdbg(DBG_KG, "start_scsi: (pid#%li) BUSY %02x %04x\n", | 1508 | dprintkdbg(DBG_KG, "start_scsi: (0x%p) BUSY %02x %04x\n", |
1509 | srb->cmd->serial_number, s_stat, s_stat2); | 1509 | s_stat, s_stat2); |
1510 | /* | 1510 | /* |
1511 | * Try anyway? | 1511 | * Try anyway? |
1512 | * | 1512 | * |
@@ -1522,16 +1522,15 @@ static u8 start_scsi(struct AdapterCtlBlk* acb, struct DeviceCtlBlk* dcb, | |||
1522 | } | 1522 | } |
1523 | #endif | 1523 | #endif |
1524 | if (acb->active_dcb) { | 1524 | if (acb->active_dcb) { |
1525 | dprintkl(KERN_DEBUG, "start_scsi: (pid#%li) Attempt to start a" | 1525 | dprintkl(KERN_DEBUG, "start_scsi: (0x%p) Attempt to start a" |
1526 | "command while another command (pid#%li) is active.", | 1526 | "command while another command (0x%p) is active.", |
1527 | srb->cmd->serial_number, | 1527 | srb->cmd, |
1528 | acb->active_dcb->active_srb ? | 1528 | acb->active_dcb->active_srb ? |
1529 | acb->active_dcb->active_srb->cmd->serial_number : 0); | 1529 | acb->active_dcb->active_srb->cmd : 0); |
1530 | return 1; | 1530 | return 1; |
1531 | } | 1531 | } |
1532 | if (DC395x_read16(acb, TRM_S1040_SCSI_STATUS) & SCSIINTERRUPT) { | 1532 | if (DC395x_read16(acb, TRM_S1040_SCSI_STATUS) & SCSIINTERRUPT) { |
1533 | dprintkdbg(DBG_KG, "start_scsi: (pid#%li) Failed (busy)\n", | 1533 | dprintkdbg(DBG_KG, "start_scsi: (0x%p) Failed (busy)\n", srb->cmd); |
1534 | srb->cmd->serial_number); | ||
1535 | return 1; | 1534 | return 1; |
1536 | } | 1535 | } |
1537 | /* Allow starting of SCSI commands half a second before we allow the mid-level | 1536 | /* Allow starting of SCSI commands half a second before we allow the mid-level |
@@ -1603,9 +1602,9 @@ static u8 start_scsi(struct AdapterCtlBlk* acb, struct DeviceCtlBlk* dcb, | |||
1603 | tag_number++; | 1602 | tag_number++; |
1604 | } | 1603 | } |
1605 | if (tag_number >= dcb->max_command) { | 1604 | if (tag_number >= dcb->max_command) { |
1606 | dprintkl(KERN_WARNING, "start_scsi: (pid#%li) " | 1605 | dprintkl(KERN_WARNING, "start_scsi: (0x%p) " |
1607 | "Out of tags target=<%02i-%i>)\n", | 1606 | "Out of tags target=<%02i-%i>)\n", |
1608 | srb->cmd->serial_number, srb->cmd->device->id, | 1607 | srb->cmd, srb->cmd->device->id, |
1609 | srb->cmd->device->lun); | 1608 | srb->cmd->device->lun); |
1610 | srb->state = SRB_READY; | 1609 | srb->state = SRB_READY; |
1611 | DC395x_write16(acb, TRM_S1040_SCSI_CONTROL, | 1610 | DC395x_write16(acb, TRM_S1040_SCSI_CONTROL, |
@@ -1623,8 +1622,8 @@ static u8 start_scsi(struct AdapterCtlBlk* acb, struct DeviceCtlBlk* dcb, | |||
1623 | #endif | 1622 | #endif |
1624 | /*polling:*/ | 1623 | /*polling:*/ |
1625 | /* Send CDB ..command block ......... */ | 1624 | /* Send CDB ..command block ......... */ |
1626 | dprintkdbg(DBG_KG, "start_scsi: (pid#%li) <%02i-%i> cmnd=0x%02x tag=%i\n", | 1625 | dprintkdbg(DBG_KG, "start_scsi: (0x%p) <%02i-%i> cmnd=0x%02x tag=%i\n", |
1627 | srb->cmd->serial_number, srb->cmd->device->id, srb->cmd->device->lun, | 1626 | srb->cmd, srb->cmd->device->id, srb->cmd->device->lun, |
1628 | srb->cmd->cmnd[0], srb->tag_number); | 1627 | srb->cmd->cmnd[0], srb->tag_number); |
1629 | if (srb->flag & AUTO_REQSENSE) { | 1628 | if (srb->flag & AUTO_REQSENSE) { |
1630 | DC395x_write8(acb, TRM_S1040_SCSI_FIFO, REQUEST_SENSE); | 1629 | DC395x_write8(acb, TRM_S1040_SCSI_FIFO, REQUEST_SENSE); |
@@ -1647,8 +1646,8 @@ static u8 start_scsi(struct AdapterCtlBlk* acb, struct DeviceCtlBlk* dcb, | |||
1647 | * we caught an interrupt (must be reset or reselection ... ) | 1646 | * we caught an interrupt (must be reset or reselection ... ) |
1648 | * : Let's process it first! | 1647 | * : Let's process it first! |
1649 | */ | 1648 | */ |
1650 | dprintkdbg(DBG_0, "start_scsi: (pid#%li) <%02i-%i> Failed - busy\n", | 1649 | dprintkdbg(DBG_0, "start_scsi: (0x%p) <%02i-%i> Failed - busy\n", |
1651 | srb->cmd->serial_number, dcb->target_id, dcb->target_lun); | 1650 | srb->cmd, dcb->target_id, dcb->target_lun); |
1652 | srb->state = SRB_READY; | 1651 | srb->state = SRB_READY; |
1653 | free_tag(dcb, srb); | 1652 | free_tag(dcb, srb); |
1654 | srb->msg_count = 0; | 1653 | srb->msg_count = 0; |
@@ -1843,7 +1842,7 @@ static irqreturn_t dc395x_interrupt(int irq, void *dev_id) | |||
1843 | static void msgout_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, | 1842 | static void msgout_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, |
1844 | u16 *pscsi_status) | 1843 | u16 *pscsi_status) |
1845 | { | 1844 | { |
1846 | dprintkdbg(DBG_0, "msgout_phase0: (pid#%li)\n", srb->cmd->serial_number); | 1845 | dprintkdbg(DBG_0, "msgout_phase0: (0x%p)\n", srb->cmd); |
1847 | if (srb->state & (SRB_UNEXPECT_RESEL + SRB_ABORT_SENT)) | 1846 | if (srb->state & (SRB_UNEXPECT_RESEL + SRB_ABORT_SENT)) |
1848 | *pscsi_status = PH_BUS_FREE; /*.. initial phase */ | 1847 | *pscsi_status = PH_BUS_FREE; /*.. initial phase */ |
1849 | 1848 | ||
@@ -1857,18 +1856,18 @@ static void msgout_phase1(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, | |||
1857 | { | 1856 | { |
1858 | u16 i; | 1857 | u16 i; |
1859 | u8 *ptr; | 1858 | u8 *ptr; |
1860 | dprintkdbg(DBG_0, "msgout_phase1: (pid#%li)\n", srb->cmd->serial_number); | 1859 | dprintkdbg(DBG_0, "msgout_phase1: (0x%p)\n", srb->cmd); |
1861 | 1860 | ||
1862 | clear_fifo(acb, "msgout_phase1"); | 1861 | clear_fifo(acb, "msgout_phase1"); |
1863 | if (!(srb->state & SRB_MSGOUT)) { | 1862 | if (!(srb->state & SRB_MSGOUT)) { |
1864 | srb->state |= SRB_MSGOUT; | 1863 | srb->state |= SRB_MSGOUT; |
1865 | dprintkl(KERN_DEBUG, | 1864 | dprintkl(KERN_DEBUG, |
1866 | "msgout_phase1: (pid#%li) Phase unexpected\n", | 1865 | "msgout_phase1: (0x%p) Phase unexpected\n", |
1867 | srb->cmd->serial_number); /* So what ? */ | 1866 | srb->cmd); /* So what ? */ |
1868 | } | 1867 | } |
1869 | if (!srb->msg_count) { | 1868 | if (!srb->msg_count) { |
1870 | dprintkdbg(DBG_0, "msgout_phase1: (pid#%li) NOP msg\n", | 1869 | dprintkdbg(DBG_0, "msgout_phase1: (0x%p) NOP msg\n", |
1871 | srb->cmd->serial_number); | 1870 | srb->cmd); |
1872 | DC395x_write8(acb, TRM_S1040_SCSI_FIFO, MSG_NOP); | 1871 | DC395x_write8(acb, TRM_S1040_SCSI_FIFO, MSG_NOP); |
1873 | DC395x_write16(acb, TRM_S1040_SCSI_CONTROL, DO_DATALATCH); /* it's important for atn stop */ | 1872 | DC395x_write16(acb, TRM_S1040_SCSI_CONTROL, DO_DATALATCH); /* it's important for atn stop */ |
1874 | DC395x_write8(acb, TRM_S1040_SCSI_COMMAND, SCMD_FIFO_OUT); | 1873 | DC395x_write8(acb, TRM_S1040_SCSI_COMMAND, SCMD_FIFO_OUT); |
@@ -1888,7 +1887,7 @@ static void msgout_phase1(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, | |||
1888 | static void command_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, | 1887 | static void command_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, |
1889 | u16 *pscsi_status) | 1888 | u16 *pscsi_status) |
1890 | { | 1889 | { |
1891 | dprintkdbg(DBG_0, "command_phase0: (pid#%li)\n", srb->cmd->serial_number); | 1890 | dprintkdbg(DBG_0, "command_phase0: (0x%p)\n", srb->cmd); |
1892 | DC395x_write16(acb, TRM_S1040_SCSI_CONTROL, DO_DATALATCH); | 1891 | DC395x_write16(acb, TRM_S1040_SCSI_CONTROL, DO_DATALATCH); |
1893 | } | 1892 | } |
1894 | 1893 | ||
@@ -1899,7 +1898,7 @@ static void command_phase1(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, | |||
1899 | struct DeviceCtlBlk *dcb; | 1898 | struct DeviceCtlBlk *dcb; |
1900 | u8 *ptr; | 1899 | u8 *ptr; |
1901 | u16 i; | 1900 | u16 i; |
1902 | dprintkdbg(DBG_0, "command_phase1: (pid#%li)\n", srb->cmd->serial_number); | 1901 | dprintkdbg(DBG_0, "command_phase1: (0x%p)\n", srb->cmd); |
1903 | 1902 | ||
1904 | clear_fifo(acb, "command_phase1"); | 1903 | clear_fifo(acb, "command_phase1"); |
1905 | DC395x_write16(acb, TRM_S1040_SCSI_CONTROL, DO_CLRATN); | 1904 | DC395x_write16(acb, TRM_S1040_SCSI_CONTROL, DO_CLRATN); |
@@ -2041,8 +2040,8 @@ static void data_out_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, | |||
2041 | struct DeviceCtlBlk *dcb = srb->dcb; | 2040 | struct DeviceCtlBlk *dcb = srb->dcb; |
2042 | u16 scsi_status = *pscsi_status; | 2041 | u16 scsi_status = *pscsi_status; |
2043 | u32 d_left_counter = 0; | 2042 | u32 d_left_counter = 0; |
2044 | dprintkdbg(DBG_0, "data_out_phase0: (pid#%li) <%02i-%i>\n", | 2043 | dprintkdbg(DBG_0, "data_out_phase0: (0x%p) <%02i-%i>\n", |
2045 | srb->cmd->serial_number, srb->cmd->device->id, srb->cmd->device->lun); | 2044 | srb->cmd, srb->cmd->device->id, srb->cmd->device->lun); |
2046 | 2045 | ||
2047 | /* | 2046 | /* |
2048 | * KG: We need to drain the buffers before we draw any conclusions! | 2047 | * KG: We need to drain the buffers before we draw any conclusions! |
@@ -2171,8 +2170,8 @@ static void data_out_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, | |||
2171 | static void data_out_phase1(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, | 2170 | static void data_out_phase1(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, |
2172 | u16 *pscsi_status) | 2171 | u16 *pscsi_status) |
2173 | { | 2172 | { |
2174 | dprintkdbg(DBG_0, "data_out_phase1: (pid#%li) <%02i-%i>\n", | 2173 | dprintkdbg(DBG_0, "data_out_phase1: (0x%p) <%02i-%i>\n", |
2175 | srb->cmd->serial_number, srb->cmd->device->id, srb->cmd->device->lun); | 2174 | srb->cmd, srb->cmd->device->id, srb->cmd->device->lun); |
2176 | clear_fifo(acb, "data_out_phase1"); | 2175 | clear_fifo(acb, "data_out_phase1"); |
2177 | /* do prepare before transfer when data out phase */ | 2176 | /* do prepare before transfer when data out phase */ |
2178 | data_io_transfer(acb, srb, XFERDATAOUT); | 2177 | data_io_transfer(acb, srb, XFERDATAOUT); |
@@ -2183,8 +2182,8 @@ static void data_in_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, | |||
2183 | { | 2182 | { |
2184 | u16 scsi_status = *pscsi_status; | 2183 | u16 scsi_status = *pscsi_status; |
2185 | 2184 | ||
2186 | dprintkdbg(DBG_0, "data_in_phase0: (pid#%li) <%02i-%i>\n", | 2185 | dprintkdbg(DBG_0, "data_in_phase0: (0x%p) <%02i-%i>\n", |
2187 | srb->cmd->serial_number, srb->cmd->device->id, srb->cmd->device->lun); | 2186 | srb->cmd, srb->cmd->device->id, srb->cmd->device->lun); |
2188 | 2187 | ||
2189 | /* | 2188 | /* |
2190 | * KG: DataIn is much more tricky than DataOut. When the device is finished | 2189 | * KG: DataIn is much more tricky than DataOut. When the device is finished |
@@ -2204,8 +2203,8 @@ static void data_in_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, | |||
2204 | unsigned int sc, fc; | 2203 | unsigned int sc, fc; |
2205 | 2204 | ||
2206 | if (scsi_status & PARITYERROR) { | 2205 | if (scsi_status & PARITYERROR) { |
2207 | dprintkl(KERN_INFO, "data_in_phase0: (pid#%li) " | 2206 | dprintkl(KERN_INFO, "data_in_phase0: (0x%p) " |
2208 | "Parity Error\n", srb->cmd->serial_number); | 2207 | "Parity Error\n", srb->cmd); |
2209 | srb->status |= PARITY_ERROR; | 2208 | srb->status |= PARITY_ERROR; |
2210 | } | 2209 | } |
2211 | /* | 2210 | /* |
@@ -2394,8 +2393,8 @@ static void data_in_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, | |||
2394 | static void data_in_phase1(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, | 2393 | static void data_in_phase1(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, |
2395 | u16 *pscsi_status) | 2394 | u16 *pscsi_status) |
2396 | { | 2395 | { |
2397 | dprintkdbg(DBG_0, "data_in_phase1: (pid#%li) <%02i-%i>\n", | 2396 | dprintkdbg(DBG_0, "data_in_phase1: (0x%p) <%02i-%i>\n", |
2398 | srb->cmd->serial_number, srb->cmd->device->id, srb->cmd->device->lun); | 2397 | srb->cmd, srb->cmd->device->id, srb->cmd->device->lun); |
2399 | data_io_transfer(acb, srb, XFERDATAIN); | 2398 | data_io_transfer(acb, srb, XFERDATAIN); |
2400 | } | 2399 | } |
2401 | 2400 | ||
@@ -2406,8 +2405,8 @@ static void data_io_transfer(struct AdapterCtlBlk *acb, | |||
2406 | struct DeviceCtlBlk *dcb = srb->dcb; | 2405 | struct DeviceCtlBlk *dcb = srb->dcb; |
2407 | u8 bval; | 2406 | u8 bval; |
2408 | dprintkdbg(DBG_0, | 2407 | dprintkdbg(DBG_0, |
2409 | "data_io_transfer: (pid#%li) <%02i-%i> %c len=%i, sg=(%i/%i)\n", | 2408 | "data_io_transfer: (0x%p) <%02i-%i> %c len=%i, sg=(%i/%i)\n", |
2410 | srb->cmd->serial_number, srb->cmd->device->id, srb->cmd->device->lun, | 2409 | srb->cmd, srb->cmd->device->id, srb->cmd->device->lun, |
2411 | ((io_dir & DMACMD_DIR) ? 'r' : 'w'), | 2410 | ((io_dir & DMACMD_DIR) ? 'r' : 'w'), |
2412 | srb->total_xfer_length, srb->sg_index, srb->sg_count); | 2411 | srb->total_xfer_length, srb->sg_index, srb->sg_count); |
2413 | if (srb == acb->tmp_srb) | 2412 | if (srb == acb->tmp_srb) |
@@ -2579,8 +2578,8 @@ static void data_io_transfer(struct AdapterCtlBlk *acb, | |||
2579 | static void status_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, | 2578 | static void status_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, |
2580 | u16 *pscsi_status) | 2579 | u16 *pscsi_status) |
2581 | { | 2580 | { |
2582 | dprintkdbg(DBG_0, "status_phase0: (pid#%li) <%02i-%i>\n", | 2581 | dprintkdbg(DBG_0, "status_phase0: (0x%p) <%02i-%i>\n", |
2583 | srb->cmd->serial_number, srb->cmd->device->id, srb->cmd->device->lun); | 2582 | srb->cmd, srb->cmd->device->id, srb->cmd->device->lun); |
2584 | srb->target_status = DC395x_read8(acb, TRM_S1040_SCSI_FIFO); | 2583 | srb->target_status = DC395x_read8(acb, TRM_S1040_SCSI_FIFO); |
2585 | srb->end_message = DC395x_read8(acb, TRM_S1040_SCSI_FIFO); /* get message */ | 2584 | srb->end_message = DC395x_read8(acb, TRM_S1040_SCSI_FIFO); /* get message */ |
2586 | srb->state = SRB_COMPLETED; | 2585 | srb->state = SRB_COMPLETED; |
@@ -2593,8 +2592,8 @@ static void status_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, | |||
2593 | static void status_phase1(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, | 2592 | static void status_phase1(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, |
2594 | u16 *pscsi_status) | 2593 | u16 *pscsi_status) |
2595 | { | 2594 | { |
2596 | dprintkdbg(DBG_0, "status_phase1: (pid#%li) <%02i-%i>\n", | 2595 | dprintkdbg(DBG_0, "status_phase1: (0x%p) <%02i-%i>\n", |
2597 | srb->cmd->serial_number, srb->cmd->device->id, srb->cmd->device->lun); | 2596 | srb->cmd, srb->cmd->device->id, srb->cmd->device->lun); |
2598 | srb->state = SRB_STATUS; | 2597 | srb->state = SRB_STATUS; |
2599 | DC395x_write16(acb, TRM_S1040_SCSI_CONTROL, DO_DATALATCH); /* it's important for atn stop */ | 2598 | DC395x_write16(acb, TRM_S1040_SCSI_CONTROL, DO_DATALATCH); /* it's important for atn stop */ |
2600 | DC395x_write8(acb, TRM_S1040_SCSI_COMMAND, SCMD_COMP); | 2599 | DC395x_write8(acb, TRM_S1040_SCSI_COMMAND, SCMD_COMP); |
@@ -2635,8 +2634,8 @@ static struct ScsiReqBlk *msgin_qtag(struct AdapterCtlBlk *acb, | |||
2635 | { | 2634 | { |
2636 | struct ScsiReqBlk *srb = NULL; | 2635 | struct ScsiReqBlk *srb = NULL; |
2637 | struct ScsiReqBlk *i; | 2636 | struct ScsiReqBlk *i; |
2638 | dprintkdbg(DBG_0, "msgin_qtag: (pid#%li) tag=%i srb=%p\n", | 2637 | dprintkdbg(DBG_0, "msgin_qtag: (0x%p) tag=%i srb=%p\n", |
2639 | srb->cmd->serial_number, tag, srb); | 2638 | srb->cmd, tag, srb); |
2640 | 2639 | ||
2641 | if (!(dcb->tag_mask & (1 << tag))) | 2640 | if (!(dcb->tag_mask & (1 << tag))) |
2642 | dprintkl(KERN_DEBUG, | 2641 | dprintkl(KERN_DEBUG, |
@@ -2654,8 +2653,8 @@ static struct ScsiReqBlk *msgin_qtag(struct AdapterCtlBlk *acb, | |||
2654 | if (!srb) | 2653 | if (!srb) |
2655 | goto mingx0; | 2654 | goto mingx0; |
2656 | 2655 | ||
2657 | dprintkdbg(DBG_0, "msgin_qtag: (pid#%li) <%02i-%i>\n", | 2656 | dprintkdbg(DBG_0, "msgin_qtag: (0x%p) <%02i-%i>\n", |
2658 | srb->cmd->serial_number, srb->dcb->target_id, srb->dcb->target_lun); | 2657 | srb->cmd, srb->dcb->target_id, srb->dcb->target_lun); |
2659 | if (dcb->flag & ABORT_DEV_) { | 2658 | if (dcb->flag & ABORT_DEV_) { |
2660 | /*srb->state = SRB_ABORT_SENT; */ | 2659 | /*srb->state = SRB_ABORT_SENT; */ |
2661 | enable_msgout_abort(acb, srb); | 2660 | enable_msgout_abort(acb, srb); |
@@ -2865,7 +2864,7 @@ static void msgin_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, | |||
2865 | u16 *pscsi_status) | 2864 | u16 *pscsi_status) |
2866 | { | 2865 | { |
2867 | struct DeviceCtlBlk *dcb = acb->active_dcb; | 2866 | struct DeviceCtlBlk *dcb = acb->active_dcb; |
2868 | dprintkdbg(DBG_0, "msgin_phase0: (pid#%li)\n", srb->cmd->serial_number); | 2867 | dprintkdbg(DBG_0, "msgin_phase0: (0x%p)\n", srb->cmd); |
2869 | 2868 | ||
2870 | srb->msgin_buf[acb->msg_len++] = DC395x_read8(acb, TRM_S1040_SCSI_FIFO); | 2869 | srb->msgin_buf[acb->msg_len++] = DC395x_read8(acb, TRM_S1040_SCSI_FIFO); |
2871 | if (msgin_completed(srb->msgin_buf, acb->msg_len)) { | 2870 | if (msgin_completed(srb->msgin_buf, acb->msg_len)) { |
@@ -2931,9 +2930,9 @@ static void msgin_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, | |||
2931 | * SAVE POINTER may be ignored as we have the struct | 2930 | * SAVE POINTER may be ignored as we have the struct |
2932 | * ScsiReqBlk* associated with the scsi command. | 2931 | * ScsiReqBlk* associated with the scsi command. |
2933 | */ | 2932 | */ |
2934 | dprintkdbg(DBG_0, "msgin_phase0: (pid#%li) " | 2933 | dprintkdbg(DBG_0, "msgin_phase0: (0x%p) " |
2935 | "SAVE POINTER rem=%i Ignore\n", | 2934 | "SAVE POINTER rem=%i Ignore\n", |
2936 | srb->cmd->serial_number, srb->total_xfer_length); | 2935 | srb->cmd, srb->total_xfer_length); |
2937 | break; | 2936 | break; |
2938 | 2937 | ||
2939 | case RESTORE_POINTERS: | 2938 | case RESTORE_POINTERS: |
@@ -2941,9 +2940,9 @@ static void msgin_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, | |||
2941 | break; | 2940 | break; |
2942 | 2941 | ||
2943 | case ABORT: | 2942 | case ABORT: |
2944 | dprintkdbg(DBG_0, "msgin_phase0: (pid#%li) " | 2943 | dprintkdbg(DBG_0, "msgin_phase0: (0x%p) " |
2945 | "<%02i-%i> ABORT msg\n", | 2944 | "<%02i-%i> ABORT msg\n", |
2946 | srb->cmd->serial_number, dcb->target_id, | 2945 | srb->cmd, dcb->target_id, |
2947 | dcb->target_lun); | 2946 | dcb->target_lun); |
2948 | dcb->flag |= ABORT_DEV_; | 2947 | dcb->flag |= ABORT_DEV_; |
2949 | enable_msgout_abort(acb, srb); | 2948 | enable_msgout_abort(acb, srb); |
@@ -2975,7 +2974,7 @@ static void msgin_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, | |||
2975 | static void msgin_phase1(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, | 2974 | static void msgin_phase1(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb, |
2976 | u16 *pscsi_status) | 2975 | u16 *pscsi_status) |
2977 | { | 2976 | { |
2978 | dprintkdbg(DBG_0, "msgin_phase1: (pid#%li)\n", srb->cmd->serial_number); | 2977 | dprintkdbg(DBG_0, "msgin_phase1: (0x%p)\n", srb->cmd); |
2979 | clear_fifo(acb, "msgin_phase1"); | 2978 | clear_fifo(acb, "msgin_phase1"); |
2980 | DC395x_write32(acb, TRM_S1040_SCSI_COUNTER, 1); | 2979 | DC395x_write32(acb, TRM_S1040_SCSI_COUNTER, 1); |
2981 | if (!(srb->state & SRB_MSGIN)) { | 2980 | if (!(srb->state & SRB_MSGIN)) { |
@@ -3041,7 +3040,7 @@ static void disconnect(struct AdapterCtlBlk *acb) | |||
3041 | } | 3040 | } |
3042 | srb = dcb->active_srb; | 3041 | srb = dcb->active_srb; |
3043 | acb->active_dcb = NULL; | 3042 | acb->active_dcb = NULL; |
3044 | dprintkdbg(DBG_0, "disconnect: (pid#%li)\n", srb->cmd->serial_number); | 3043 | dprintkdbg(DBG_0, "disconnect: (0x%p)\n", srb->cmd); |
3045 | 3044 | ||
3046 | srb->scsi_phase = PH_BUS_FREE; /* initial phase */ | 3045 | srb->scsi_phase = PH_BUS_FREE; /* initial phase */ |
3047 | clear_fifo(acb, "disconnect"); | 3046 | clear_fifo(acb, "disconnect"); |
@@ -3071,14 +3070,14 @@ static void disconnect(struct AdapterCtlBlk *acb) | |||
3071 | && srb->state != SRB_MSGOUT) { | 3070 | && srb->state != SRB_MSGOUT) { |
3072 | srb->state = SRB_READY; | 3071 | srb->state = SRB_READY; |
3073 | dprintkl(KERN_DEBUG, | 3072 | dprintkl(KERN_DEBUG, |
3074 | "disconnect: (pid#%li) Unexpected\n", | 3073 | "disconnect: (0x%p) Unexpected\n", |
3075 | srb->cmd->serial_number); | 3074 | srb->cmd); |
3076 | srb->target_status = SCSI_STAT_SEL_TIMEOUT; | 3075 | srb->target_status = SCSI_STAT_SEL_TIMEOUT; |
3077 | goto disc1; | 3076 | goto disc1; |
3078 | } else { | 3077 | } else { |
3079 | /* Normal selection timeout */ | 3078 | /* Normal selection timeout */ |
3080 | dprintkdbg(DBG_KG, "disconnect: (pid#%li) " | 3079 | dprintkdbg(DBG_KG, "disconnect: (0x%p) " |
3081 | "<%02i-%i> SelTO\n", srb->cmd->serial_number, | 3080 | "<%02i-%i> SelTO\n", srb->cmd, |
3082 | dcb->target_id, dcb->target_lun); | 3081 | dcb->target_id, dcb->target_lun); |
3083 | if (srb->retry_count++ > DC395x_MAX_RETRIES | 3082 | if (srb->retry_count++ > DC395x_MAX_RETRIES |
3084 | || acb->scan_devices) { | 3083 | || acb->scan_devices) { |
@@ -3089,8 +3088,8 @@ static void disconnect(struct AdapterCtlBlk *acb) | |||
3089 | free_tag(dcb, srb); | 3088 | free_tag(dcb, srb); |
3090 | srb_going_to_waiting_move(dcb, srb); | 3089 | srb_going_to_waiting_move(dcb, srb); |
3091 | dprintkdbg(DBG_KG, | 3090 | dprintkdbg(DBG_KG, |
3092 | "disconnect: (pid#%li) Retry\n", | 3091 | "disconnect: (0x%p) Retry\n", |
3093 | srb->cmd->serial_number); | 3092 | srb->cmd); |
3094 | waiting_set_timer(acb, HZ / 20); | 3093 | waiting_set_timer(acb, HZ / 20); |
3095 | } | 3094 | } |
3096 | } else if (srb->state & SRB_DISCONNECT) { | 3095 | } else if (srb->state & SRB_DISCONNECT) { |
@@ -3142,9 +3141,9 @@ static void reselect(struct AdapterCtlBlk *acb) | |||
3142 | } | 3141 | } |
3143 | /* Why the if ? */ | 3142 | /* Why the if ? */ |
3144 | if (!acb->scan_devices) { | 3143 | if (!acb->scan_devices) { |
3145 | dprintkdbg(DBG_KG, "reselect: (pid#%li) <%02i-%i> " | 3144 | dprintkdbg(DBG_KG, "reselect: (0x%p) <%02i-%i> " |
3146 | "Arb lost but Resel win rsel=%i stat=0x%04x\n", | 3145 | "Arb lost but Resel win rsel=%i stat=0x%04x\n", |
3147 | srb->cmd->serial_number, dcb->target_id, | 3146 | srb->cmd, dcb->target_id, |
3148 | dcb->target_lun, rsel_tar_lun_id, | 3147 | dcb->target_lun, rsel_tar_lun_id, |
3149 | DC395x_read16(acb, TRM_S1040_SCSI_STATUS)); | 3148 | DC395x_read16(acb, TRM_S1040_SCSI_STATUS)); |
3150 | arblostflag = 1; | 3149 | arblostflag = 1; |
@@ -3318,7 +3317,7 @@ static void srb_done(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb, | |||
3318 | enum dma_data_direction dir = cmd->sc_data_direction; | 3317 | enum dma_data_direction dir = cmd->sc_data_direction; |
3319 | int ckc_only = 1; | 3318 | int ckc_only = 1; |
3320 | 3319 | ||
3321 | dprintkdbg(DBG_1, "srb_done: (pid#%li) <%02i-%i>\n", srb->cmd->serial_number, | 3320 | dprintkdbg(DBG_1, "srb_done: (0x%p) <%02i-%i>\n", srb->cmd, |
3322 | srb->cmd->device->id, srb->cmd->device->lun); | 3321 | srb->cmd->device->id, srb->cmd->device->lun); |
3323 | dprintkdbg(DBG_SG, "srb_done: srb=%p sg=%i(%i/%i) buf=%p\n", | 3322 | dprintkdbg(DBG_SG, "srb_done: srb=%p sg=%i(%i/%i) buf=%p\n", |
3324 | srb, scsi_sg_count(cmd), srb->sg_index, srb->sg_count, | 3323 | srb, scsi_sg_count(cmd), srb->sg_index, srb->sg_count, |
@@ -3497,9 +3496,9 @@ static void srb_done(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb, | |||
3497 | cmd->SCp.buffers_residual = 0; | 3496 | cmd->SCp.buffers_residual = 0; |
3498 | if (debug_enabled(DBG_KG)) { | 3497 | if (debug_enabled(DBG_KG)) { |
3499 | if (srb->total_xfer_length) | 3498 | if (srb->total_xfer_length) |
3500 | dprintkdbg(DBG_KG, "srb_done: (pid#%li) <%02i-%i> " | 3499 | dprintkdbg(DBG_KG, "srb_done: (0x%p) <%02i-%i> " |
3501 | "cmnd=0x%02x Missed %i bytes\n", | 3500 | "cmnd=0x%02x Missed %i bytes\n", |
3502 | cmd->serial_number, cmd->device->id, cmd->device->lun, | 3501 | cmd, cmd->device->id, cmd->device->lun, |
3503 | cmd->cmnd[0], srb->total_xfer_length); | 3502 | cmd->cmnd[0], srb->total_xfer_length); |
3504 | } | 3503 | } |
3505 | 3504 | ||
@@ -3508,8 +3507,8 @@ static void srb_done(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb, | |||
3508 | if (srb == acb->tmp_srb) | 3507 | if (srb == acb->tmp_srb) |
3509 | dprintkl(KERN_ERR, "srb_done: ERROR! Completed cmd with tmp_srb\n"); | 3508 | dprintkl(KERN_ERR, "srb_done: ERROR! Completed cmd with tmp_srb\n"); |
3510 | else { | 3509 | else { |
3511 | dprintkdbg(DBG_0, "srb_done: (pid#%li) done result=0x%08x\n", | 3510 | dprintkdbg(DBG_0, "srb_done: (0x%p) done result=0x%08x\n", |
3512 | cmd->serial_number, cmd->result); | 3511 | cmd, cmd->result); |
3513 | srb_free_insert(acb, srb); | 3512 | srb_free_insert(acb, srb); |
3514 | } | 3513 | } |
3515 | pci_unmap_srb(acb, srb); | 3514 | pci_unmap_srb(acb, srb); |
@@ -3538,7 +3537,7 @@ static void doing_srb_done(struct AdapterCtlBlk *acb, u8 did_flag, | |||
3538 | p = srb->cmd; | 3537 | p = srb->cmd; |
3539 | dir = p->sc_data_direction; | 3538 | dir = p->sc_data_direction; |
3540 | result = MK_RES(0, did_flag, 0, 0); | 3539 | result = MK_RES(0, did_flag, 0, 0); |
3541 | printk("G:%li(%02i-%i) ", p->serial_number, | 3540 | printk("G:%p(%02i-%i) ", p, |
3542 | p->device->id, p->device->lun); | 3541 | p->device->id, p->device->lun); |
3543 | srb_going_remove(dcb, srb); | 3542 | srb_going_remove(dcb, srb); |
3544 | free_tag(dcb, srb); | 3543 | free_tag(dcb, srb); |
@@ -3568,7 +3567,7 @@ static void doing_srb_done(struct AdapterCtlBlk *acb, u8 did_flag, | |||
3568 | p = srb->cmd; | 3567 | p = srb->cmd; |
3569 | 3568 | ||
3570 | result = MK_RES(0, did_flag, 0, 0); | 3569 | result = MK_RES(0, did_flag, 0, 0); |
3571 | printk("W:%li<%02i-%i>", p->serial_number, p->device->id, | 3570 | printk("W:%p<%02i-%i>", p, p->device->id, |
3572 | p->device->lun); | 3571 | p->device->lun); |
3573 | srb_waiting_remove(dcb, srb); | 3572 | srb_waiting_remove(dcb, srb); |
3574 | srb_free_insert(acb, srb); | 3573 | srb_free_insert(acb, srb); |
@@ -3677,8 +3676,8 @@ static void request_sense(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb, | |||
3677 | struct ScsiReqBlk *srb) | 3676 | struct ScsiReqBlk *srb) |
3678 | { | 3677 | { |
3679 | struct scsi_cmnd *cmd = srb->cmd; | 3678 | struct scsi_cmnd *cmd = srb->cmd; |
3680 | dprintkdbg(DBG_1, "request_sense: (pid#%li) <%02i-%i>\n", | 3679 | dprintkdbg(DBG_1, "request_sense: (0x%p) <%02i-%i>\n", |
3681 | cmd->serial_number, cmd->device->id, cmd->device->lun); | 3680 | cmd, cmd->device->id, cmd->device->lun); |
3682 | 3681 | ||
3683 | srb->flag |= AUTO_REQSENSE; | 3682 | srb->flag |= AUTO_REQSENSE; |
3684 | srb->adapter_status = 0; | 3683 | srb->adapter_status = 0; |
@@ -3708,8 +3707,8 @@ static void request_sense(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb, | |||
3708 | 3707 | ||
3709 | if (start_scsi(acb, dcb, srb)) { /* Should only happen, if sb. else grabs the bus */ | 3708 | if (start_scsi(acb, dcb, srb)) { /* Should only happen, if sb. else grabs the bus */ |
3710 | dprintkl(KERN_DEBUG, | 3709 | dprintkl(KERN_DEBUG, |
3711 | "request_sense: (pid#%li) failed <%02i-%i>\n", | 3710 | "request_sense: (0x%p) failed <%02i-%i>\n", |
3712 | srb->cmd->serial_number, dcb->target_id, dcb->target_lun); | 3711 | srb->cmd, dcb->target_id, dcb->target_lun); |
3713 | srb_going_to_waiting_move(dcb, srb); | 3712 | srb_going_to_waiting_move(dcb, srb); |
3714 | waiting_set_timer(acb, HZ / 100); | 3713 | waiting_set_timer(acb, HZ / 100); |
3715 | } | 3714 | } |
@@ -4717,13 +4716,13 @@ static int dc395x_proc_info(struct Scsi_Host *host, char *buffer, | |||
4717 | dcb->target_id, dcb->target_lun, | 4716 | dcb->target_id, dcb->target_lun, |
4718 | list_size(&dcb->srb_waiting_list)); | 4717 | list_size(&dcb->srb_waiting_list)); |
4719 | list_for_each_entry(srb, &dcb->srb_waiting_list, list) | 4718 | list_for_each_entry(srb, &dcb->srb_waiting_list, list) |
4720 | SPRINTF(" %li", srb->cmd->serial_number); | 4719 | SPRINTF(" %p", srb->cmd); |
4721 | if (!list_empty(&dcb->srb_going_list)) | 4720 | if (!list_empty(&dcb->srb_going_list)) |
4722 | SPRINTF("\nDCB (%02i-%i): Going : %i:", | 4721 | SPRINTF("\nDCB (%02i-%i): Going : %i:", |
4723 | dcb->target_id, dcb->target_lun, | 4722 | dcb->target_id, dcb->target_lun, |
4724 | list_size(&dcb->srb_going_list)); | 4723 | list_size(&dcb->srb_going_list)); |
4725 | list_for_each_entry(srb, &dcb->srb_going_list, list) | 4724 | list_for_each_entry(srb, &dcb->srb_going_list, list) |
4726 | SPRINTF(" %li", srb->cmd->serial_number); | 4725 | SPRINTF(" %p", srb->cmd); |
4727 | if (!list_empty(&dcb->srb_waiting_list) || !list_empty(&dcb->srb_going_list)) | 4726 | if (!list_empty(&dcb->srb_waiting_list) || !list_empty(&dcb->srb_going_list)) |
4728 | SPRINTF("\n"); | 4727 | SPRINTF("\n"); |
4729 | } | 4728 | } |