scsi: aacraid: Correct hba_send to include iu_type
commitb60710ec7d
("scsi: aacraid: enable sending of TMFs from aac_hba_send()") allows aac_hba_send() to send scsi commands, and TMF requests, but the existing code only updates the iu_type for scsi commands. For TMF requests we are sending an unknown iu_type to firmware, which causes a fault. Include iu_type prior to determining the validity of the command Reported-by: Noah Misner <nmisner@us.ibm.com> Fixes:b60710ec7d
("aacraid: enable sending of TMFs from aac_hba_send()") Fixes:423400e64d
("aacraid: Include HBA direct interface") Tested-by: Noah Misner <nmisner@us.ibm.com> cc: stable@vger.kernel.org Signed-off-by: Dave Carroll <david.carroll@microsemi.com> Reviewed-by: Raghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com> Reviewed-by: Brian King <brking@linux.vnet.ibm.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
parent
f4b024271a
commit
7d3af7d96a
|
@ -724,6 +724,8 @@ int aac_hba_send(u8 command, struct fib *fibptr, fib_callback callback,
|
|||
int wait;
|
||||
unsigned long flags = 0;
|
||||
unsigned long mflags = 0;
|
||||
struct aac_hba_cmd_req *hbacmd = (struct aac_hba_cmd_req *)
|
||||
fibptr->hw_fib_va;
|
||||
|
||||
fibptr->flags = (FIB_CONTEXT_FLAG | FIB_CONTEXT_FLAG_NATIVE_HBA);
|
||||
if (callback) {
|
||||
|
@ -734,11 +736,9 @@ int aac_hba_send(u8 command, struct fib *fibptr, fib_callback callback,
|
|||
wait = 1;
|
||||
|
||||
|
||||
if (command == HBA_IU_TYPE_SCSI_CMD_REQ) {
|
||||
struct aac_hba_cmd_req *hbacmd =
|
||||
(struct aac_hba_cmd_req *)fibptr->hw_fib_va;
|
||||
hbacmd->iu_type = command;
|
||||
|
||||
hbacmd->iu_type = command;
|
||||
if (command == HBA_IU_TYPE_SCSI_CMD_REQ) {
|
||||
/* bit1 of request_id must be 0 */
|
||||
hbacmd->request_id =
|
||||
cpu_to_le32((((u32)(fibptr - dev->fibs)) << 2) + 1);
|
||||
|
|
Loading…
Reference in New Issue