diff -uarN b/drivers/message/fusion/mptbase.h a/drivers/message/fusion/mptbase.h --- b/drivers/message/fusion/mptbase.h 2005-01-27 10:15:09.000000000 -0700 +++ a/drivers/message/fusion/mptbase.h 2005-01-11 11:51:40.000000000 -0700 @@ -83,8 +83,8 @@ #define COPYRIGHT "Copyright (c) 1999-2004 " MODULEAUTHOR #endif -#define MPT_LINUX_VERSION_COMMON "3.01.18" -#define MPT_LINUX_PACKAGE_NAME "@(#)mptlinux-3.01.18" +#define MPT_LINUX_VERSION_COMMON "3.01.19" +#define MPT_LINUX_PACKAGE_NAME "@(#)mptlinux-3.01.19" #define WHAT_MAGIC_STRING "@" "(" "#" ")" #define show_mptmod_ver(s,ver) \ @@ -420,7 +420,6 @@ typedef struct _MPT_IOCTL { struct _MPT_ADAPTER *ioc; - struct timer_list timer; /* timer function for this adapter */ u8 ReplyFrame[MPT_DEFAULT_FRAME_SIZE]; /* reply frame data */ u8 sense[MPT_SENSE_BUFFER_ALLOC]; int wait_done; /* wake-up value for this ioc */ @@ -428,8 +427,6 @@ u8 status; /* current command status */ u8 reset; /* 1 if bus reset allowed */ u8 target; /* target for reset */ - void *tmPtr; - struct timer_list TMtimer; /* timer function for this adapter */ struct semaphore sem_ioc; } MPT_IOCTL; @@ -882,11 +879,9 @@ int port; u32 pad0; struct scsi_cmnd **ScsiLookup; - u32 qtag_tick; VirtDevice **Targets; MPT_LOCAL_REPLY *pLocal; /* used for internal commands */ struct timer_list timer; - struct timer_list TMtimer; /* Timer for TM commands ONLY */ /* Pool of memory for holding SCpnts before doing * OS callbacks. freeQ is the free pool. */ @@ -896,7 +891,6 @@ u8 pad1; u8 tmState; u8 rsvd[2]; - MPT_FRAME_HDR *tmPtr; /* Ptr to TM request*/ MPT_FRAME_HDR *cmdPtr; /* Ptr to nonOS request */ struct scsi_cmnd *abortSCpnt; MPT_LOCAL_REPLY localReply; /* internal cmd reply struct */ diff -uarN b/drivers/message/fusion/mptctl.c a/drivers/message/fusion/mptctl.c --- b/drivers/message/fusion/mptctl.c 2005-01-27 10:15:09.000000000 -0700 +++ a/drivers/message/fusion/mptctl.c 2005-01-23 15:17:47.000000000 -0700 @@ -81,6 +81,7 @@ #include #include #include +#include /* for mdelay */ #include #include #include @@ -142,6 +143,9 @@ static int mptctl_probe(struct pci_dev *, const struct pci_device_id *); static void mptctl_remove(struct pci_dev *); +#ifdef CONFIG_COMPAT +static long compat_mpctl_ioctl(struct file *f, unsigned cmd, unsigned long arg); +#endif /* * Private function calls. */ @@ -151,7 +155,7 @@ struct buflist **blp, dma_addr_t *sglbuf_dma, MPT_ADAPTER *ioc); static void kfree_sgl( MptSge_t *sgl, dma_addr_t sgl_dma, struct buflist *buflist, MPT_ADAPTER *ioc); -static void mptctl_timer_expired (unsigned long data); +static void mptctl_timeout_expired (MPT_IOCTL *ioctl); static int mptctl_bus_reset(MPT_IOCTL *ioctl); static int mptctl_set_tm_flags(MPT_SCSI_HOST *hd); static void mptctl_free_tm_flags(MPT_ADAPTER *ioc); @@ -184,9 +188,6 @@ #define MPT_IOCTL_DEFAULT_TIMEOUT 10 /* Default timeout value (seconds) */ -static u32 fwReplyBuffer[16]; -static pMPIDefaultReply_t ReplyMsg = NULL; - /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ /** * mptctl_syscall_down - Down the MPT adapter syscall semaphore. @@ -204,11 +205,6 @@ int rc = 0; dctlprintk((KERN_INFO MYNAM "::mptctl_syscall_down(%p,%d) called\n", ioc, nonblock)); - if (ioc->ioctl->tmPtr != NULL) { - dctlprintk((KERN_INFO MYNAM "::mptctl_syscall_down BUSY\n")); - return -EBUSY; - } - if (nonblock) { if (down_trylock(&ioc->ioctl->sem_ioc)) rc = -EAGAIN; @@ -235,131 +231,101 @@ u16 iocStatus; u8 cmd; - dctlprintk((MYIOC_s_INFO_FMT ": mptctl_reply()!\n", ioc->name)); + dctlprintk(("mptctl_reply()!\n")); if (req) cmd = req->u.hdr.Function; else return 1; if (ioc->ioctl) { - /* If timer is not running, then an error occurred. - * A timeout will call the reset routine to reload the messaging - * queues. - * Main callback will free message and reply frames. - */ - if (reply && (cmd == MPI_FUNCTION_SCSI_TASK_MGMT) && - (ioc->ioctl->status & MPT_IOCTL_STATUS_TMTIMER_ACTIVE)) { - /* This is internally generated TM - */ - del_timer (&ioc->ioctl->TMtimer); - ioc->ioctl->status &= ~MPT_IOCTL_STATUS_TMTIMER_ACTIVE; - mptctl_free_tm_flags(ioc); + if (reply==NULL) { - /* If TM failed, reset the timer on the existing command, - * will trigger an adapter reset. - */ - iocStatus = reply->u.reply.IOCStatus & MPI_IOCSTATUS_MASK; - if (iocStatus == MPI_IOCSTATUS_SCSI_TASK_MGMT_FAILED) { - if (ioc->ioctl->status & MPT_IOCTL_STATUS_TIMER_ACTIVE) { - ioc->ioctl->reset &= ~MPTCTL_RESET_OK; - del_timer (&ioc->ioctl->timer); - ioc->ioctl->timer.expires = jiffies + HZ; - add_timer(&ioc->ioctl->timer); - } - } - ioc->ioctl->tmPtr = NULL; + dctlprintk(("mptctl_reply() NULL Reply " + "Function=%x!\n", cmd)); - } else if (ioc->ioctl->status & MPT_IOCTL_STATUS_TIMER_ACTIVE) { - /* Delete this timer - */ - del_timer (&ioc->ioctl->timer); - ioc->ioctl->status &= ~MPT_IOCTL_STATUS_TIMER_ACTIVE; + ioc->ioctl->status |= MPT_IOCTL_STATUS_COMMAND_GOOD; + ioc->ioctl->reset &= ~MPTCTL_RESET_OK; - /* Set the overall status byte. Good if: - * IOC status is good OR if no reply and a SCSI IO request - */ - if (reply) { - /* Copy the reply frame (which much exist - * for non-SCSI I/O) to the IOC structure. - */ - dctlprintk((MYIOC_s_INFO_FMT ": Copying Reply Frame @%p to IOC!\n", - ioc->name, reply)); - memcpy(ioc->ioctl->ReplyFrame, reply, - min(ioc->reply_sz, 4*reply->u.reply.MsgLength)); - ioc->ioctl->status |= MPT_IOCTL_STATUS_RF_VALID; + /* We are done, issue wake up + */ + ioc->ioctl->wait_done = 1; + wake_up (&mptctl_wait); + return 1; - /* Set the command status to GOOD if IOC Status is GOOD - * OR if SCSI I/O cmd and data underrun or recovered error. - */ - iocStatus = reply->u.reply.IOCStatus & MPI_IOCSTATUS_MASK; - if (iocStatus == MPI_IOCSTATUS_SUCCESS) - ioc->ioctl->status |= MPT_IOCTL_STATUS_COMMAND_GOOD; - - if ((cmd == MPI_FUNCTION_SCSI_IO_REQUEST) || - (cmd == MPI_FUNCTION_RAID_SCSI_IO_PASSTHROUGH)) { - ioc->ioctl->reset &= ~MPTCTL_RESET_OK; - - if ((iocStatus == MPI_IOCSTATUS_SCSI_DATA_UNDERRUN) || - (iocStatus == MPI_IOCSTATUS_SCSI_RECOVERED_ERROR)) { - ioc->ioctl->status |= MPT_IOCTL_STATUS_COMMAND_GOOD; - } - } + } - /* Copy the sense data - if present - */ - if ((cmd == MPI_FUNCTION_SCSI_IO_REQUEST) && - (reply->u.sreply.SCSIState & MPI_SCSI_STATE_AUTOSENSE_VALID)){ + dctlprintk(("mptctl_reply() with req=%p " + "reply=%p Function=%x!\n", req, reply, cmd)); - sz = req->u.scsireq.SenseBufferLength; - req_index = le16_to_cpu(req->u.frame.hwhdr.msgctxu.fld.req_idx); - sense_data = ((u8 *)ioc->sense_buf_pool + (req_index * MPT_SENSE_BUFFER_ALLOC)); - memcpy(ioc->ioctl->sense, sense_data, sz); - ioc->ioctl->status |= MPT_IOCTL_STATUS_SENSE_VALID; - } + /* Copy the reply frame (which much exist + * for non-SCSI I/O) to the IOC structure. + */ + dctlprintk(("Copying Reply Frame @%p to ioc%d!\n", + reply, ioc->id)); + memcpy(ioc->ioctl->ReplyFrame, reply, + min(ioc->reply_sz, 4*reply->u.reply.MsgLength)); + ioc->ioctl->status |= MPT_IOCTL_STATUS_RF_VALID; - if (cmd == MPI_FUNCTION_SCSI_TASK_MGMT) - mptctl_free_tm_flags(ioc); + /* Set the command status to GOOD if IOC Status is GOOD + * OR if SCSI I/O cmd and data underrun or recovered error. + */ + iocStatus = reply->u.reply.IOCStatus & MPI_IOCSTATUS_MASK; + if (iocStatus == MPI_IOCSTATUS_SUCCESS) + ioc->ioctl->status |= MPT_IOCTL_STATUS_COMMAND_GOOD; + if ((cmd == MPI_FUNCTION_SCSI_IO_REQUEST) || + (cmd == MPI_FUNCTION_RAID_SCSI_IO_PASSTHROUGH)) { + ioc->ioctl->reset &= ~MPTCTL_RESET_OK; - } else if ((cmd == MPI_FUNCTION_SCSI_IO_REQUEST) || - (cmd == MPI_FUNCTION_RAID_SCSI_IO_PASSTHROUGH)) { - ioc->ioctl->status |= MPT_IOCTL_STATUS_COMMAND_GOOD; - ioc->ioctl->reset &= ~MPTCTL_RESET_OK; + if ((iocStatus == MPI_IOCSTATUS_SCSI_DATA_UNDERRUN) || + (iocStatus == MPI_IOCSTATUS_SCSI_RECOVERED_ERROR)) { + ioc->ioctl->status |= MPT_IOCTL_STATUS_COMMAND_GOOD; } + } - /* We are done, issue wake up - */ - ioc->ioctl->wait_done = 1; - wake_up (&mptctl_wait); - } else if (reply && cmd == MPI_FUNCTION_FW_DOWNLOAD) { - /* Two paths to FW DOWNLOAD! */ - // NOTE: Expects/requires non-Turbo reply! - dctlprintk((MYIOC_s_INFO_FMT ":Caching MPI_FUNCTION_FW_DOWNLOAD reply!\n", - ioc->name)); - memcpy(fwReplyBuffer, reply, min_t(int, sizeof(fwReplyBuffer), 4*reply->u.reply.MsgLength)); - ReplyMsg = (pMPIDefaultReply_t) fwReplyBuffer; + /* Copy the sense data - if present + */ + if ((cmd == MPI_FUNCTION_SCSI_IO_REQUEST) && + (reply->u.sreply.SCSIState & + MPI_SCSI_STATE_AUTOSENSE_VALID)){ + sz = req->u.scsireq.SenseBufferLength; + req_index = + le16_to_cpu(req->u.frame.hwhdr.msgctxu.fld.req_idx); + sense_data = + ((u8 *)ioc->sense_buf_pool + + (req_index * MPT_SENSE_BUFFER_ALLOC)); + memcpy(ioc->ioctl->sense, sense_data, sz); + ioc->ioctl->status |= MPT_IOCTL_STATUS_SENSE_VALID; } + + if (cmd == MPI_FUNCTION_SCSI_TASK_MGMT) + mptctl_free_tm_flags(ioc); + + /* We are done, issue wake up + */ + ioc->ioctl->wait_done = 1; + wake_up (&mptctl_wait); } return 1; } /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ -/* mptctl_timer_expired +/* mptctl_timeout_expired * - * Call back for timer process. Used only for ioctl functionality. + * Expecting an interrupt, however timed out. * */ -static void mptctl_timer_expired (unsigned long data) +static void mptctl_timeout_expired (MPT_IOCTL *ioctl) { - MPT_IOCTL *ioctl = (MPT_IOCTL *) data; int rc = 1; - dctlprintk((KERN_NOTICE MYNAM ": Timer Expired! Host %d\n", + dctlprintk((KERN_NOTICE MYNAM ": Timeout Expired! Host %d\n", ioctl->ioc->id)); if (ioctl == NULL) return; + ioctl->wait_done = 0; if (ioctl->reset & MPTCTL_RESET_OK) rc = mptctl_bus_reset(ioctl); @@ -367,6 +333,8 @@ /* Issue a reset for this device. * The IOC is not responding. */ + dctlprintk((MYIOC_s_INFO_FMT "Calling HardReset! \n", + ioctl->ioc->name)); mpt_HardResetHandler(ioctl->ioc, NO_SLEEP); } return; @@ -391,7 +359,7 @@ if (ioctl->ioc->sh == NULL) return -EPERM; - + hd = (MPT_SCSI_HOST *) ioctl->ioc->sh->hostdata; if (hd == NULL) return -EPERM; @@ -431,26 +399,34 @@ pScsiTm->Reserved2[ii] = 0; pScsiTm->TaskMsgContext = 0; - dtmprintk((MYIOC_s_INFO_FMT "mptctl_bus_reset: issued.\n", ioctl->ioc->name)); + dtmprintk((MYIOC_s_INFO_FMT + "mptctl_bus_reset: issued.\n", ioctl->ioc->name)); - ioctl->tmPtr = mf; - ioctl->TMtimer.expires = jiffies + HZ * 20; /* 20 seconds */ - ioctl->status |= MPT_IOCTL_STATUS_TMTIMER_ACTIVE; - add_timer(&ioctl->TMtimer); - - retval = mpt_send_handshake_request(mptctl_id, ioctl->ioc, - sizeof(SCSITaskMgmt_t), (u32*)pScsiTm, NO_SLEEP); - - if (retval != 0) { - dtmprintk((MYIOC_s_WARN_FMT "_send_handshake FAILED!" - " (hd %p, ioc %p, mf %p) \n", ioctl->ioc->name, hd, hd->ioc, mf)); + DBG_DUMP_TM_REQUEST_FRAME((u32 *)mf); - mptctl_free_tm_flags(ioctl->ioc); - del_timer(&ioctl->TMtimer); - mpt_free_msg_frame(ioctl->ioc, mf); - ioctl->tmPtr = NULL; + ioctl->wait_done=0; + if ((retval = mpt_send_handshake_request(mptctl_id, ioctl->ioc, + sizeof(SCSITaskMgmt_t), (u32*)pScsiTm, CAN_SLEEP)) != 0) { + dfailprintk((MYIOC_s_ERR_FMT "_send_handshake FAILED!" + " (hd %p, ioc %p, mf %p) \n", hd->ioc->name, hd, + hd->ioc, mf)); + goto mptctl_bus_reset_done; } + /* Now wait for the command to complete */ + ii = wait_event_interruptible_timeout(mptctl_wait, + ioctl->wait_done == 1, + HZ*5 /* 5 second timeout */); + + if(ii <=0 && (ioctl->wait_done != 1 )) { + ioctl->wait_done = 0; + retval = -1; /* return failure */ + } + +mptctl_bus_reset_done: + + mpt_free_msg_frame(hd->ioc, mf); + mptctl_free_tm_flags(ioctl->ioc); return retval; } @@ -491,7 +467,6 @@ return; } - /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ /* mptctl_ioc_reset * @@ -504,43 +479,22 @@ { MPT_IOCTL *ioctl = ioc->ioctl; dctlprintk((KERN_INFO MYNAM ": IOC %s_reset routed to IOCTL driver!\n", - reset_phase==MPT_IOC_SETUP_RESET ? "setup" : ( - reset_phase==MPT_IOC_PRE_RESET ? "pre" : "post"))); - - if (reset_phase == MPT_IOC_SETUP_RESET){ - ; - } else if (reset_phase == MPT_IOC_PRE_RESET){ - - /* Someone has called the reset handler to - * do a hard reset. No more replies from the FW. - * Delete the timer. TM flags cleaned up by SCSI driver. - * Do not need to free msg frame, as re-initialized - */ - if (ioctl && (ioctl->status & MPT_IOCTL_STATUS_TIMER_ACTIVE)){ - del_timer(&ioctl->timer); - } - if (ioctl && (ioctl->status & MPT_IOCTL_STATUS_TMTIMER_ACTIVE)){ - ioctl->status &= ~MPT_IOCTL_STATUS_TMTIMER_ACTIVE; - del_timer(&ioctl->TMtimer); - mpt_free_msg_frame(ioc, ioctl->tmPtr); - } - - } else { - ioctl->tmPtr = NULL; + reset_phase==MPT_IOC_SETUP_RESET ? "setup" : ( + reset_phase==MPT_IOC_PRE_RESET ? "pre" : "post"))); - /* Set the status and continue IOCTL - * processing. All memory will be free'd - * by originating thread after wake_up is - * called. - */ - if (ioctl && (ioctl->status & MPT_IOCTL_STATUS_TIMER_ACTIVE)){ - ioctl->status |= MPT_IOCTL_STATUS_DID_IOCRESET; + if(ioctl == NULL) + return 1; - /* Wake up the calling process - */ - ioctl->wait_done = 1; - wake_up(&mptctl_wait); - } + switch(reset_phase) { + case MPT_IOC_SETUP_RESET: + ioctl->status |= MPT_IOCTL_STATUS_DID_IOCRESET; + break; + case MPT_IOC_POST_RESET: + ioctl->status &= ~MPT_IOCTL_STATUS_DID_IOCRESET; + break; + case MPT_IOC_PRE_RESET: + default: + break; } return 1; @@ -552,8 +506,8 @@ * cmd - specify the particular IOCTL command to be issued * arg - data specific to the command. Must not be null. */ -static int -mptctl_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) +static long +__mptctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { mpt_ioctl_header __user *uhdr = (void __user *) arg; mpt_ioctl_header khdr; @@ -637,6 +591,16 @@ return ret; } +static long +mptctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +{ + long ret; + lock_kernel(); + ret = __mptctl_ioctl(file, cmd, arg); + unlock_kernel(); + return ret; +} + static int mptctl_do_reset(unsigned long arg) { struct mpt_ioctl_diag_reset __user *urinfo = (void __user *) arg; @@ -735,9 +699,9 @@ u32 nib; int fw_bytes_copied = 0; int i; - int cntdn; int sge_offset = 0; u16 iocstat; + pFWDownloadReply_t ReplyMsg = NULL; dctlprintk((KERN_INFO "mptctl_do_fwdl called. mptctl_id = %xh.\n", mptctl_id)); @@ -868,31 +832,25 @@ /* * Finally, perform firmware download. */ - ReplyMsg = NULL; + iocp->ioctl->wait_done = 0; mpt_put_msg_frame(mptctl_id, iocp, mf); - /* - * Wait until the reply has been received - */ - for (cntdn=HZ*60, i=1; ReplyMsg == NULL; cntdn--, i++) { - if (!cntdn) { - ret = -ETIME; - goto fwdl_out; - } - - if (!(i%HZ)) { - dctlprintk((KERN_INFO "DbG::_do_fwdl: " - "In ReplyMsg loop - iteration %d\n", - i)); - } - - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(1); + /* Now wait for the command to complete */ + ret = wait_event_interruptible_timeout(mptctl_wait, + iocp->ioctl->wait_done == 1, + HZ*60); + + if(ret <=0 && (iocp->ioctl->wait_done != 1 )) { + /* Now we need to reset the board */ + mptctl_timeout_expired(iocp->ioctl); + ret = -ENODATA; + goto fwdl_out; } if (sgl) kfree_sgl(sgl, sgl_dma, buflist, iocp); + ReplyMsg = (pFWDownloadReply_t)iocp->ioctl->ReplyFrame; iocstat = le16_to_cpu(ReplyMsg->IOCStatus) & MPI_IOCSTATUS_MASK; if (iocstat == MPI_IOCSTATUS_SUCCESS) { printk(KERN_INFO MYNAM ": F/W update successfully sent to %s!\n", iocp->name); @@ -1180,14 +1138,14 @@ cim_rev = 0; /* obsolete */ else return -EFAULT; - + karg = kmalloc(data_size, GFP_KERNEL); if (karg == NULL) { printk(KERN_ERR "%s::mpt_ioctl_iocinfo() @%d - no memory available!\n", __FILE__, __LINE__); return -ENOMEM; } - + if (copy_from_user(karg, uarg, data_size)) { printk(KERN_ERR "%s@%d::mptctl_getiocinfo - " "Unable to read in mpt_ioctl_iocinfo struct @ %p\n", @@ -1812,8 +1770,8 @@ int iocnum, flagsLength; int sz, rc = 0; int msgContext; - int tm_flags_set = 0; u16 req_idx; + ulong timeout; dctlprintk(("mptctl_do_mpt_command called.\n")); bufIn.kptr = bufOut.kptr = NULL; @@ -2029,7 +1987,6 @@ rc = -EPERM; goto done_free_mem; } - tm_flags_set = 1; } break; @@ -2181,136 +2138,108 @@ mpt_add_sge(psge, flagsLength, (dma_addr_t) -1); } - /* The request is complete. Set the timer parameters - * and issue the request. - */ - if (karg.timeout > 0) { - ioc->ioctl->timer.expires = jiffies + HZ*karg.timeout; - } else { - ioc->ioctl->timer.expires = jiffies + HZ*MPT_IOCTL_DEFAULT_TIMEOUT; - } - ioc->ioctl->wait_done = 0; - ioc->ioctl->status |= MPT_IOCTL_STATUS_TIMER_ACTIVE; - add_timer(&ioc->ioctl->timer); - if (hdr->Function == MPI_FUNCTION_SCSI_TASK_MGMT) { + DBG_DUMP_TM_REQUEST_FRAME((u32 *)mf); - rc = mpt_send_handshake_request(mptctl_id, ioc, - sizeof(SCSITaskMgmt_t), (u32*)mf, CAN_SLEEP); - if (rc == 0) { - wait_event(mptctl_wait, ioc->ioctl->wait_done); - } else { + + if (mpt_send_handshake_request(mptctl_id, ioc, + sizeof(SCSITaskMgmt_t), (u32*)mf, + CAN_SLEEP) != 0) { + dfailprintk((MYIOC_s_ERR_FMT "_send_handshake FAILED!" + " (ioc %p, mf %p) \n", ioc->name, + ioc, mf)); mptctl_free_tm_flags(ioc); - tm_flags_set= 0; - del_timer(&ioc->ioctl->timer); - ioc->ioctl->status &= ~MPT_IOCTL_STATUS_TIMER_ACTIVE; - ioc->ioctl->status |= MPT_IOCTL_STATUS_TM_FAILED; - mpt_free_msg_frame(ioc, mf); + rc = -ENODATA; + goto done_free_mem; } - } else { + + } else mpt_put_msg_frame(mptctl_id, ioc, mf); - wait_event(mptctl_wait, ioc->ioctl->wait_done); + + /* Now wait for the command to complete */ + timeout = (karg.timeout > 0) ? karg.timeout : MPT_IOCTL_DEFAULT_TIMEOUT; + timeout = wait_event_interruptible_timeout(mptctl_wait, + ioc->ioctl->wait_done == 1, + HZ*timeout); + + if(timeout <=0 && (ioc->ioctl->wait_done != 1 )) { + /* Now we need to reset the board */ + + if (hdr->Function == MPI_FUNCTION_SCSI_TASK_MGMT) + mptctl_free_tm_flags(ioc); + + mptctl_timeout_expired(ioc->ioctl); + rc = -ENODATA; + goto done_free_mem; } mf = NULL; - /* MF Cleanup: - * If command failed and failure triggered a diagnostic reset - * OR a diagnostic reset happens during command processing, - * no data, messaging queues are reset (mf cannot be accessed), - * and status is DID_IOCRESET - * - * If a user-requested bus reset fails to be handshaked, then - * mf is returned to free queue and status is TM_FAILED. - * - * Otherise, the command completed and the mf was freed - # by ISR (mf cannot be touched). + /* If a valid reply frame, copy to the user. + * Offset 2: reply length in U32's */ - if (ioc->ioctl->status & MPT_IOCTL_STATUS_DID_IOCRESET) { - /* The timer callback deleted the - * timer and reset the adapter queues. - */ - printk(KERN_WARNING "%s@%d::mptctl_do_mpt_command - " - "Timeout Occurred on IOCTL! Reset IOC.\n", __FILE__, __LINE__); - tm_flags_set= 0; - rc = -ETIME; - } else if (ioc->ioctl->status & MPT_IOCTL_STATUS_TM_FAILED) { - /* User TM request failed! mf has not been freed. - */ - rc = -ENODATA; - } else { - /* If a valid reply frame, copy to the user. - * Offset 2: reply length in U32's - */ - if (ioc->ioctl->status & MPT_IOCTL_STATUS_RF_VALID) { - if (karg.maxReplyBytes < ioc->reply_sz) { - sz = min(karg.maxReplyBytes, 4*ioc->ioctl->ReplyFrame[2]); - } else { - sz = min(ioc->reply_sz, 4*ioc->ioctl->ReplyFrame[2]); - } - - if (sz > 0) { - if (copy_to_user(karg.replyFrameBufPtr, - &ioc->ioctl->ReplyFrame, sz)){ - - printk(KERN_ERR "%s@%d::mptctl_do_mpt_command - " - "Unable to write out reply frame %p\n", - __FILE__, __LINE__, karg.replyFrameBufPtr); - rc = -ENODATA; - goto done_free_mem; - } - } + if (ioc->ioctl->status & MPT_IOCTL_STATUS_RF_VALID) { + if (karg.maxReplyBytes < ioc->reply_sz) { + sz = min(karg.maxReplyBytes, 4*ioc->ioctl->ReplyFrame[2]); + } else { + sz = min(ioc->reply_sz, 4*ioc->ioctl->ReplyFrame[2]); } - /* If valid sense data, copy to user. - */ - if (ioc->ioctl->status & MPT_IOCTL_STATUS_SENSE_VALID) { - sz = min(karg.maxSenseBytes, MPT_SENSE_BUFFER_SIZE); - if (sz > 0) { - if (copy_to_user(karg.senseDataPtr, ioc->ioctl->sense, sz)) { - printk(KERN_ERR "%s@%d::mptctl_do_mpt_command - " - "Unable to write sense data to user %p\n", - __FILE__, __LINE__, - karg.senseDataPtr); - rc = -ENODATA; - goto done_free_mem; - } + if (sz > 0) { + if (copy_to_user(karg.replyFrameBufPtr, + &ioc->ioctl->ReplyFrame, sz)){ + printk(KERN_ERR + "%s@%d::mptctl_do_mpt_command - " + "Unable to write out reply frame %p\n", + __FILE__, __LINE__, karg.replyFrameBufPtr); + rc = -ENODATA; + goto done_free_mem; } } + } - /* If the overall status is _GOOD and data in, copy data - * to user. - */ - if ((ioc->ioctl->status & MPT_IOCTL_STATUS_COMMAND_GOOD) && - (karg.dataInSize > 0) && (bufIn.kptr)) { - - if (copy_to_user(karg.dataInBufPtr, - bufIn.kptr, karg.dataInSize)) { + /* If valid sense data, copy to user. + */ + if (ioc->ioctl->status & MPT_IOCTL_STATUS_SENSE_VALID) { + sz = min(karg.maxSenseBytes, MPT_SENSE_BUFFER_SIZE); + if (sz > 0) { + if (copy_to_user(karg.senseDataPtr, ioc->ioctl->sense, sz)) { printk(KERN_ERR "%s@%d::mptctl_do_mpt_command - " - "Unable to write data to user %p\n", - __FILE__, __LINE__, - karg.dataInBufPtr); + "Unable to write sense data to user %p\n", + __FILE__, __LINE__, + karg.senseDataPtr); rc = -ENODATA; + goto done_free_mem; } } } + /* If the overall status is _GOOD and data in, copy data + * to user. + */ + if ((ioc->ioctl->status & MPT_IOCTL_STATUS_COMMAND_GOOD) && + (karg.dataInSize > 0) && (bufIn.kptr)) { + + if (copy_to_user(karg.dataInBufPtr, + bufIn.kptr, karg.dataInSize)) { + printk(KERN_ERR "%s@%d::mptctl_do_mpt_command - " + "Unable to write data to user %p\n", + __FILE__, __LINE__, + karg.dataInBufPtr); + rc = -ENODATA; + } + } + done_free_mem: - /* Clear all status bits except TMTIMER_ACTIVE, this bit is cleared - * upon completion of the TM command. - * ioc->ioctl->status = 0; - */ - ioc->ioctl->status &= ~(MPT_IOCTL_STATUS_TIMER_ACTIVE | MPT_IOCTL_STATUS_TM_FAILED | - MPT_IOCTL_STATUS_COMMAND_GOOD | MPT_IOCTL_STATUS_SENSE_VALID | - MPT_IOCTL_STATUS_RF_VALID | MPT_IOCTL_STATUS_DID_IOCRESET); - if (tm_flags_set) - mptctl_free_tm_flags(ioc); + ioc->ioctl->status &= ~(MPT_IOCTL_STATUS_COMMAND_GOOD | + MPT_IOCTL_STATUS_SENSE_VALID | + MPT_IOCTL_STATUS_RF_VALID ); /* Free the allocated memory. */ - if (bufOut.kptr != NULL) { + if (bufOut.kptr != NULL) { pci_free_consistent(ioc->pcidev, bufOut.len, (void *) bufOut.kptr, dma_addr_out); } @@ -2549,7 +2478,7 @@ __FILE__, __LINE__, uarg); return -EFAULT; } - + if (((iocnum = mpt_verify_adapter(karg.hdr.iocnum, &ioc)) < 0) || (ioc == NULL)) { dctlprintk((KERN_ERR "%s::mptctl_hp_targetinfo() @%d - ioc%d not found!\n", @@ -2567,7 +2496,7 @@ if (ioc->sh->host_no != karg.hdr.host) return -ENODEV; - + /* Get the data transfer speeds */ data_sz = ioc->spi_data.sdp0length * 4; @@ -2669,7 +2598,10 @@ static struct file_operations mptctl_fops = { .owner = THIS_MODULE, .llseek = no_llseek, - .ioctl = mptctl_ioctl, + .unlocked_ioctl = mptctl_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = compat_mpctl_ioctl, +#endif }; static struct miscdevice mptctl_miscdev = { @@ -2684,29 +2616,9 @@ #include -/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ -/* compat_XXX functions are used to provide a conversion between - * pointers and u32's. If the arg does not contain any pointers, then - * a specialized function (compat_XXX) is not needed. If the arg - * does contain pointer(s), then the specialized function is used - * to ensure the structure contents is properly processed by mptctl. - */ static int -compat_mptctl_ioctl(unsigned int fd, unsigned int cmd, - unsigned long arg, struct file *filp) -{ - int ret; - - lock_kernel(); - dctlprintk((KERN_INFO MYNAM "::compat_mptctl_ioctl() called\n")); - ret = mptctl_ioctl(filp->f_dentry->d_inode, filp, cmd, arg); - unlock_kernel(); - return ret; -} - -static int -compat_mptfwxfer_ioctl(unsigned int fd, unsigned int cmd, - unsigned long arg, struct file *filp) +compat_mptfwxfer_ioctl(struct file *filp, unsigned int cmd, + unsigned long arg) { struct mpt_fw_xfer32 kfw32; struct mpt_fw_xfer kfw; @@ -2744,8 +2656,8 @@ } static int -compat_mpt_command(unsigned int fd, unsigned int cmd, - unsigned long arg, struct file *filp) +compat_mpt_command(struct file *filp, unsigned int cmd, + unsigned long arg) { struct mpt_ioctl_command32 karg32; struct mpt_ioctl_command32 __user *uarg = (struct mpt_ioctl_command32 __user *) arg; @@ -2797,6 +2709,38 @@ return ret; } +static long compat_mpctl_ioctl(struct file *f, unsigned int cmd, unsigned long arg) +{ + long ret; + lock_kernel(); + switch (cmd) { + case MPTIOCINFO: + case MPTIOCINFO1: + case MPTIOCINFO2: + case MPTTARGETINFO: + case MPTEVENTQUERY: + case MPTEVENTENABLE: + case MPTEVENTREPORT: + case MPTHARDRESET: + case HP_GETHOSTINFO: + case HP_GETTARGETINFO: + case MPTTEST: + ret = __mptctl_ioctl(f, cmd, arg); + break; + case MPTCOMMAND32: + ret = compat_mpt_command(f, cmd, arg); + break; + case MPTFWDOWNLOAD32: + ret = compat_mptfwxfer_ioctl(f, cmd, arg); + break; + default: + ret = -ENOIOCTLCMD; + break; + } + unlock_kernel(); + return ret; +} + #endif @@ -2830,12 +2774,6 @@ memset(mem, 0, sz); ioc->ioctl = (MPT_IOCTL *) mem; ioc->ioctl->ioc = ioc; - init_timer (&ioc->ioctl->timer); - ioc->ioctl->timer.data = (unsigned long) ioc->ioctl; - ioc->ioctl->timer.function = mptctl_timer_expired; - init_timer (&ioc->ioctl->TMtimer); - ioc->ioctl->TMtimer.data = (unsigned long) ioc->ioctl; - ioc->ioctl->TMtimer.function = mptctl_timer_expired; sema_init(&ioc->ioctl->sem_ioc, 1); return 0; @@ -2879,36 +2817,6 @@ ": failed to register dd callbacks\n")); } -#ifdef CONFIG_COMPAT - err = register_ioctl32_conversion(MPTIOCINFO, compat_mptctl_ioctl); - if (++where && err) goto out_fail; - err = register_ioctl32_conversion(MPTIOCINFO1, compat_mptctl_ioctl); - if (++where && err) goto out_fail; - err = register_ioctl32_conversion(MPTIOCINFO2, compat_mptctl_ioctl); - if (++where && err) goto out_fail; - err = register_ioctl32_conversion(MPTTARGETINFO, compat_mptctl_ioctl); - if (++where && err) goto out_fail; - err = register_ioctl32_conversion(MPTTEST, compat_mptctl_ioctl); - if (++where && err) goto out_fail; - err = register_ioctl32_conversion(MPTEVENTQUERY, compat_mptctl_ioctl); - if (++where && err) goto out_fail; - err = register_ioctl32_conversion(MPTEVENTENABLE, compat_mptctl_ioctl); - if (++where && err) goto out_fail; - err = register_ioctl32_conversion(MPTEVENTREPORT, compat_mptctl_ioctl); - if (++where && err) goto out_fail; - err = register_ioctl32_conversion(MPTHARDRESET, compat_mptctl_ioctl); - if (++where && err) goto out_fail; - err = register_ioctl32_conversion(MPTCOMMAND32, compat_mpt_command); - if (++where && err) goto out_fail; - err = register_ioctl32_conversion(MPTFWDOWNLOAD32, - compat_mptfwxfer_ioctl); - if (++where && err) goto out_fail; - err = register_ioctl32_conversion(HP_GETHOSTINFO, compat_mptctl_ioctl); - if (++where && err) goto out_fail; - err = register_ioctl32_conversion(HP_GETTARGETINFO, compat_mptctl_ioctl); - if (++where && err) goto out_fail; -#endif - /* Register this device */ err = misc_register(&mptctl_miscdev); if (err < 0) { @@ -2940,24 +2848,6 @@ out_fail: -#ifdef CONFIG_COMPAT - printk(KERN_ERR MYNAM ": ERROR: Failed to register ioctl32_conversion!" - " (%d:err=%d)\n", where, err); - unregister_ioctl32_conversion(MPTIOCINFO); - unregister_ioctl32_conversion(MPTIOCINFO1); - unregister_ioctl32_conversion(MPTIOCINFO2); - unregister_ioctl32_conversion(MPTTARGETINFO); - unregister_ioctl32_conversion(MPTTEST); - unregister_ioctl32_conversion(MPTEVENTQUERY); - unregister_ioctl32_conversion(MPTEVENTENABLE); - unregister_ioctl32_conversion(MPTEVENTREPORT); - unregister_ioctl32_conversion(MPTHARDRESET); - unregister_ioctl32_conversion(MPTCOMMAND32); - unregister_ioctl32_conversion(MPTFWDOWNLOAD32); - unregister_ioctl32_conversion(HP_GETHOSTINFO); - unregister_ioctl32_conversion(HP_GETTARGETINFO); -#endif - mpt_device_driver_deregister(MPTCTL_DRIVER); return err; @@ -2980,22 +2870,6 @@ mpt_device_driver_deregister(MPTCTL_DRIVER); -#ifdef CONFIG_COMPAT - unregister_ioctl32_conversion(MPTIOCINFO); - unregister_ioctl32_conversion(MPTIOCINFO1); - unregister_ioctl32_conversion(MPTIOCINFO2); - unregister_ioctl32_conversion(MPTTARGETINFO); - unregister_ioctl32_conversion(MPTTEST); - unregister_ioctl32_conversion(MPTEVENTQUERY); - unregister_ioctl32_conversion(MPTEVENTENABLE); - unregister_ioctl32_conversion(MPTEVENTREPORT); - unregister_ioctl32_conversion(MPTHARDRESET); - unregister_ioctl32_conversion(MPTCOMMAND32); - unregister_ioctl32_conversion(MPTFWDOWNLOAD32); - unregister_ioctl32_conversion(HP_GETHOSTINFO); - unregister_ioctl32_conversion(HP_GETTARGETINFO); -#endif - } /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ diff -uarN b/drivers/message/fusion/mptlan.c a/drivers/message/fusion/mptlan.c --- b/drivers/message/fusion/mptlan.c 2005-01-27 10:15:09.000000000 -0700 +++ a/drivers/message/fusion/mptlan.c 2005-01-23 15:19:29.000000000 -0700 @@ -179,7 +179,7 @@ #ifdef QLOGIC_NAA_WORKAROUND static struct NAA_Hosed *mpt_bad_naa = NULL; -rwlock_t bad_naa_lock = RW_LOCK_UNLOCKED; +DEFINE_RWLOCK(bad_naa_lock); #endif /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ diff -uarN b/drivers/message/fusion/mptscsih.c a/drivers/message/fusion/mptscsih.c --- b/drivers/message/fusion/mptscsih.c 2005-01-27 10:15:09.000000000 -0700 +++ a/drivers/message/fusion/mptscsih.c 2005-01-23 15:10:43.000000000 -0700 @@ -179,10 +179,11 @@ static void mptscsih_freeChainBuffers(MPT_ADAPTER *ioc, int req_idx); static void copy_sense_data(struct scsi_cmnd *sc, MPT_SCSI_HOST *hd, MPT_FRAME_HDR *mf, SCSIIOReply_t *pScsiReply); static int mptscsih_tm_pending_wait(MPT_SCSI_HOST * hd); +static int mptscsih_tm_wait_for_completion(MPT_SCSI_HOST * hd, ulong timeout ); static u32 SCPNT_TO_LOOKUP_IDX(struct scsi_cmnd *sc); -static int mptscsih_TMHandler(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun, int ctx2abort, ulong timeout, int sleepFlag); -static int mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun, int ctx2abort, ulong timeout, int sleepFlag); +static int mptscsih_TMHandler(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun, int ctx2abort, ulong timeout); +static int mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun, int ctx2abort, ulong timeout); static int mptscsih_ioc_reset(MPT_ADAPTER *ioc, int post_reset); static int mptscsih_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply); @@ -196,13 +197,9 @@ static int mptscsih_writeIOCPage4(MPT_SCSI_HOST *hd, int target_id, int bus); static int mptscsih_scandv_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *r); static void mptscsih_timer_expired(unsigned long data); -static void mptscsih_taskmgmt_timeout(unsigned long data); -static void mptscsih_schedule_reset(void *hd); static int mptscsih_do_cmd(MPT_SCSI_HOST *hd, INTERNAL_CMD *iocmd); static int mptscsih_synchronize_cache(MPT_SCSI_HOST *hd, int portnum); -static struct work_struct mptscsih_rstTask; - #ifdef MPTSCSIH_ENABLE_DOMAIN_VALIDATION static int mptscsih_do_raid(MPT_SCSI_HOST *hd, u8 action, INTERNAL_CMD *io); static void mptscsih_domainValidation(void *hd); @@ -241,7 +238,7 @@ /* * Domain Validation task structure */ -static spinlock_t dvtaskQ_lock = SPIN_LOCK_UNLOCKED; +static DEFINE_SPINLOCK(dvtaskQ_lock); static int dvtaskQ_active = 0; static int dvtaskQ_release = 0; static struct work_struct mptscsih_dvTask; @@ -1207,7 +1204,6 @@ hd->tmState = TM_STATE_NONE; hd->resetPending = 0; hd->abortSCpnt = NULL; - hd->tmPtr = NULL; /* Clear the pointer used to store * single-threaded commands, i.e., those @@ -1224,14 +1220,6 @@ hd->timer.data = (unsigned long) hd; hd->timer.function = mptscsih_timer_expired; - init_timer(&hd->TMtimer); - hd->TMtimer.data = (unsigned long) hd; - hd->TMtimer.function = mptscsih_taskmgmt_timeout; - hd->qtag_tick = jiffies; - - /* Moved Earlier Pam D */ - /* ioc->sh = sh; */ - if (ioc->bus_type == SCSI) { /* Update with the driver setup * values. @@ -1925,7 +1913,6 @@ * @target: Logical Target ID for reset (if appropriate) * @lun: Logical Unit for reset (if appropriate) * @ctx2abort: Context for the task to be aborted (if appropriate) - * @sleepFlag: If set, use udelay instead of schedule in handshake code. * * Remark: Currently invoked from a non-interrupt thread (_bh). * @@ -1935,7 +1922,7 @@ * Returns 0 for SUCCESS or -1 if FAILED. */ static int -mptscsih_TMHandler(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun, int ctx2abort, ulong timeout, int sleepFlag) +mptscsih_TMHandler(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun, int ctx2abort, ulong timeout) { MPT_ADAPTER *ioc; int rc = -1; @@ -2015,7 +2002,7 @@ */ if (hd->hard_resets < -1) hd->hard_resets++; - rc = mptscsih_IssueTaskMgmt(hd, type, channel, target, lun, ctx2abort, timeout, sleepFlag); + rc = mptscsih_IssueTaskMgmt(hd, type, channel, target, lun, ctx2abort, timeout); if (rc) { printk(MYIOC_s_INFO_FMT "Issue of TaskMgmt failed!\n", hd->ioc->name); } else { @@ -2029,7 +2016,7 @@ ioc->reload_fw || (ioc->alt_ioc && ioc->alt_ioc->reload_fw))) { dtmprintk((MYIOC_s_INFO_FMT "Calling HardReset! \n", hd->ioc->name)); - rc = mpt_HardResetHandler(hd->ioc, sleepFlag); + rc = mpt_HardResetHandler(hd->ioc, CAN_SLEEP); } dtmprintk((MYIOC_s_INFO_FMT "TMHandler rc = %d!\n", hd->ioc->name, rc)); @@ -2046,7 +2033,6 @@ * @target: Logical Target ID for reset (if appropriate) * @lun: Logical Unit for reset (if appropriate) * @ctx2abort: Context for the task to be aborted (if appropriate) - * @sleepFlag: If set, use udelay instead of schedule in handshake code. * * Remark: _HardResetHandler can be invoked from an interrupt thread (timer) * or a non-interrupt thread. In the former, must not call schedule(). @@ -2057,7 +2043,7 @@ * else other non-zero value returned. */ static int -mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun, int ctx2abort, ulong timeout, int sleepFlag) +mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun, int ctx2abort, ulong timeout) { MPT_FRAME_HDR *mf; SCSITaskMgmt_t *pScsiTm; @@ -2087,7 +2073,7 @@ pScsiTm->TaskType = type; pScsiTm->Reserved1 = 0; pScsiTm->MsgFlags = (type == MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS) - ? MPI_SCSITASKMGMT_MSGFLAGS_LIPRESET_RESET_OPTION : 0; + ? MPI_SCSITASKMGMT_MSGFLAGS_LIPRESET_RESET_OPTION : 0; for (ii= 0; ii < 8; ii++) { pScsiTm->LUN[ii] = 0; @@ -2099,29 +2085,32 @@ pScsiTm->TaskMsgContext = ctx2abort; - /* MPI v0.10 requires SCSITaskMgmt requests be sent via Doorbell/handshake - mpt_put_msg_frame(hd->ioc->id, mf); - * Save the MF pointer in case the request times out. - */ - hd->tmPtr = mf; - hd->TMtimer.expires = jiffies + timeout; - add_timer(&hd->TMtimer); - - dtmprintk((MYIOC_s_INFO_FMT "IssueTaskMgmt: ctx2abort (0x%08x) type=%d\n", - hd->ioc->name, ctx2abort, type)); + dtmprintk((MYIOC_s_INFO_FMT + "IssueTaskMgmt: ctx2abort (0x%08x) type=%d\n", + hd->ioc->name, ctx2abort, type)); DBG_DUMP_TM_REQUEST_FRAME((u32 *)pScsiTm); if ((retval = mpt_send_handshake_request(ScsiTaskCtx, hd->ioc, - sizeof(SCSITaskMgmt_t), (u32*)pScsiTm, sleepFlag)) - != 0) { + sizeof(SCSITaskMgmt_t), (u32*)pScsiTm, + CAN_SLEEP)) != 0) { dfailprintk((MYIOC_s_ERR_FMT "_send_handshake FAILED!" - " (hd %p, ioc %p, mf %p) \n", hd->ioc->name, hd, hd->ioc, mf)); - hd->tmPtr = NULL; - del_timer(&hd->TMtimer); + " (hd %p, ioc %p, mf %p) \n", hd->ioc->name, hd, + hd->ioc, mf)); mpt_free_msg_frame(hd->ioc, mf); + return retval; } - + + if(mptscsih_tm_wait_for_completion(hd, timeout) == FAILED) { + dfailprintk((MYIOC_s_ERR_FMT "_wait_for_completion FAILED!" + " (hd %p, ioc %p, mf %p) \n", hd->ioc->name, hd, + hd->ioc, mf)); + mpt_free_msg_frame(hd->ioc, mf); + dtmprintk((MYIOC_s_INFO_FMT "Calling HardReset! \n", + hd->ioc->name)); + retval = mpt_HardResetHandler(hd->ioc, CAN_SLEEP); + } + return retval; } @@ -2187,13 +2176,13 @@ */ mf = MPT_INDEX_2_MFPTR(hd->ioc, scpnt_idx); ctx2abort = mf->u.frame.hwhdr.msgctxu.MsgContext; - + hd->abortSCpnt = SCpnt; spin_unlock_irq(host_lock); if (mptscsih_TMHandler(hd, MPI_SCSITASKMGMT_TASKTYPE_ABORT_TASK, SCpnt->device->channel, SCpnt->device->id, SCpnt->device->lun, - ctx2abort, (HZ*2) /* 2 second timeout */,CAN_SLEEP) + ctx2abort, 2 /* 2 second timeout */) < 0) { /* The TM request failed and the subsequent FW-reload failed! @@ -2206,7 +2195,7 @@ */ hd->tmPending = 0; hd->tmState = TM_STATE_NONE; - + spin_lock_irq(host_lock); /* Unmap the DMA buffers, if any. */ @@ -2226,7 +2215,6 @@ } spin_lock_irq(host_lock); return SUCCESS; - } /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ @@ -2259,15 +2247,10 @@ printk(KERN_WARNING MYNAM ": %s: >> Attempting target reset! (sc=%p)\n", hd->ioc->name, SCpnt); - /* Supported for FC only. - */ - if (hd->ioc->bus_type == SCSI) - return FAILED; - spin_unlock_irq(host_lock); if (mptscsih_TMHandler(hd, MPI_SCSITASKMGMT_TASKTYPE_TARGET_RESET, SCpnt->device->channel, SCpnt->device->id, - 0, 0, (HZ*5) /* 5 second timeout */, CAN_SLEEP) + 0, 0, 5 /* 5 second timeout */) < 0){ /* The TM request failed and the subsequent FW-reload failed! * Fatal error case. @@ -2317,7 +2300,7 @@ /* We are now ready to execute the task management request. */ spin_unlock_irq(host_lock); if (mptscsih_TMHandler(hd, MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS, - SCpnt->device->channel, 0, 0, 0, (HZ*5) /* 5 second timeout */, CAN_SLEEP) + SCpnt->device->channel, 0, 0, 0, 5 /* 5 second timeout */) < 0){ /* The TM request failed and the subsequent FW-reload failed! @@ -2398,7 +2381,7 @@ mptscsih_tm_pending_wait(MPT_SCSI_HOST * hd) { unsigned long flags; - int loop_count = 10 * 4; /* Wait 10 seconds */ + int loop_count = 4 * 10; /* Wait 10 seconds */ int status = FAILED; do { @@ -2406,8 +2389,8 @@ if (hd->tmState == TM_STATE_NONE) { hd->tmState = TM_STATE_IN_PROGRESS; hd->tmPending = 1; - spin_unlock_irqrestore(&hd->ioc->FreeQlock, flags); status = SUCCESS; + spin_unlock_irqrestore(&hd->ioc->FreeQlock, flags); break; } spin_unlock_irqrestore(&hd->ioc->FreeQlock, flags); @@ -2419,6 +2402,34 @@ /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ /** + * mptscsih_tm_wait_for_completion - wait for completion of TM task + * @hd: Pointer to MPT host structure. + * + * Returns {SUCCESS,FAILED}. + */ +static int +mptscsih_tm_wait_for_completion(MPT_SCSI_HOST * hd, ulong timeout ) +{ + unsigned long flags; + int loop_count = 4 * timeout; + int status = FAILED; + + do { + spin_lock_irqsave(&hd->ioc->FreeQlock, flags); + if(hd->tmPending == 0) { + status = SUCCESS; + spin_unlock_irqrestore(&hd->ioc->FreeQlock, flags); + break; + } + spin_unlock_irqrestore(&hd->ioc->FreeQlock, flags); + msleep_interruptible(250); + } while (--loop_count); + + return status; +} + +/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ +/** * mptscsih_taskmgmt_complete - Registered with Fusion MPT base driver * @ioc: Pointer to MPT_ADAPTER structure * @mf: Pointer to SCSI task mgmt request frame @@ -2449,9 +2460,6 @@ * Decrement count of outstanding TM requests. */ hd = (MPT_SCSI_HOST *)ioc->sh->hostdata; - if (hd->tmPtr) { - del_timer(&hd->TMtimer); - } } else { dtmprintk((MYIOC_s_WARN_FMT "TaskMgmt Complete: NULL Scsi Host Ptr\n", ioc->name)); @@ -2505,7 +2513,6 @@ } } - hd->tmPtr = NULL; spin_lock_irqsave(&ioc->FreeQlock, flags); hd->tmPending = 0; spin_unlock_irqrestore(&ioc->FreeQlock, flags); @@ -2913,14 +2920,6 @@ mpt_free_msg_frame(ioc, hd->cmdPtr); } - /* 2d. If a task management has not completed, - * free resources associated with this request. - */ - if (hd->tmPtr) { - del_timer(&hd->TMtimer); - mpt_free_msg_frame(ioc, hd->tmPtr); - } - dtmprintk((MYIOC_s_WARN_FMT "Pre-Reset complete.\n", ioc->name)); } else { @@ -2942,12 +2941,6 @@ /* 2. Chain Buffer initialization */ - /* 3. tmPtr clear - */ - if (hd->tmPtr) { - hd->tmPtr = NULL; - } - /* 4. Renegotiate to all devices, if SCSI */ if (ioc->bus_type == SCSI) { @@ -3811,60 +3804,6 @@ } /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ -/* mptscsih_taskmgmt_timeout - Call back for timeout on a - * task management request. - * @data: Pointer to MPT_SCSI_HOST recast as an unsigned long - * - */ -static void mptscsih_taskmgmt_timeout(unsigned long data) -{ - MPT_SCSI_HOST *hd = (MPT_SCSI_HOST *) data; - - dtmprintk((KERN_WARNING MYNAM ": %s: mptscsih_taskmgmt_timeout: " - "TM request timed out!\n", hd->ioc->name)); - - /* Delete the timer that triggered this callback. - * Remark: del_timer checks to make sure timer is active - * before deleting. - */ - del_timer(&hd->TMtimer); - - /* Call the reset handler. Already had a TM request - * timeout - so issue a diagnostic reset - */ - INIT_WORK(&mptscsih_rstTask, mptscsih_schedule_reset, (void *)hd); - schedule_work(&mptscsih_rstTask); - return; -} - -/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ -/* mptscsih_schedule_reset - Call back for timeout on a - * task management request. - * @data: Pointer to MPT_SCSI_HOST recast as an unsigned long - * - */ -static void -mptscsih_schedule_reset(void *arg) -{ - MPT_SCSI_HOST *hd; - hd = (MPT_SCSI_HOST *) arg; - - if (mpt_HardResetHandler(hd->ioc, CAN_SLEEP) < 0) { - printk((KERN_WARNING " Firmware Reload FAILED!!\n")); - } else { - /* Because we have reset the IOC, no TM requests can be - * pending. So let's make sure the tmPending flag is reset. - */ - dtmprintk((KERN_WARNING MYNAM - ": %s: mptscsih_taskmgmt_timeout\n", - hd->ioc->name)); - hd->tmPending = 0; - } - - return; -} - -/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ /* * Bus Scan and Domain Validation functionality ... */