mpt2sas: mpt2sas_base_get_sense_buffer_dma should be returning little endian
PATCH 15/20 mpt2sas: mpt2sas_base_get_sense_buffer_dma should be returning little endian
Quoted 2 lines
From the function
mpt2sas_base_get_sense_buffer_dmaadd support to call
cpu_to_le64 when calculating the physical dma address. This will properly handle endianess on big endian systems. The return value of this function was changed from dma_addr_t to __le64. Remove the typecasting of u32 when setting the SenseBufferLowAddress, since its already in __le32 format.
Signed-off-by Kashyap Desai <[email protected]>
Signed-off-by Eric Moore <[email protected]>
---
drivers/scsi/mpt2sas/mpt2sas_base.c +4 -3
@@ -1328,12 +1328,13 @@ mpt2sas_base_get_sense_buffer(struct MPT2SAS_ADAPTER *ioc, u16 smid)* @ioc: per adapter object * @smid: system request message index * -* Returns phys pointer to sense buffer. +* Returns phys pointer to the low 32bit address of the sense buffer. */ -dma_addr_t +__le32 mpt2sas_base_get_sense_buffer_dma (struct MPT2SAS_ADAPTER *ioc,u16 smid) { -return ioc->sense_dma + ((smid -1 ) *SCSI_SENSE_BUFFERSIZE ); +return cpu_to_le32 (ioc->sense_dma + + ((smid -1 ) *SCSI_SENSE_BUFFERSIZE )); }/**
drivers/scsi/mpt2sas/mpt2sas_base.h +1 -1
@@ -771,7 +771,7 @@ int mpt2sas_base_hard_reset_handler(struct MPT2SAS_ADAPTER *ioc, int sleep_flag,void *mpt2sas_base_get_msg_frame (struct MPT2SAS_ADAPTER *ioc,u16 smid);void *mpt2sas_base_get_sense_buffer (struct MPT2SAS_ADAPTER *ioc,u16 smid);void mpt2sas_base_build_zero_len_sge (struct MPT2SAS_ADAPTER *ioc,void *paddr); -dma_addr_t mpt2sas_base_get_sense_buffer_dma (struct MPT2SAS_ADAPTER *ioc, +__le32 mpt2sas_base_get_sense_buffer_dma (struct MPT2SAS_ADAPTER *ioc,u16 smid);/* hi-priority queue */
drivers/scsi/mpt2sas/mpt2sas_ctl.c +1 -1
@@ -740,7 +740,7 @@ _ctl_do_mpt_command(struct MPT2SAS_ADAPTER *ioc,Mpi2SCSIIORequest_t *scsiio_request = (Mpi2SCSIIORequest_t *)mpi_request; scsiio_request->SenseBufferLowAddress = - (u32 )mpt2sas_base_get_sense_buffer_dma (ioc, smid); +mpt2sas_base_get_sense_buffer_dma (ioc, smid); priv_sense =mpt2sas_base_get_sense_buffer (ioc, smid);memset (priv_sense,0 ,SCSI_SENSE_BUFFERSIZE ); mpt2sas_base_put_smid_scsi_io(ioc, smid,
drivers/scsi/mpt2sas/mpt2sas_scsih.c +1 -1
@@ -2939,7 +2939,7 @@ _scsih_qcmd(struct scsi_cmnd *scmd, void (*done)(struct scsi_cmnd *)) mpi_request->MsgFlags =MPI2_SCSIIO_MSGFLAGS_SYSTEM_SENSE_ADDR ; mpi_request->SenseBufferLength =SCSI_SENSE_BUFFERSIZE ; mpi_request->SenseBufferLowAddress = - (u32 )mpt2sas_base_get_sense_buffer_dma (ioc, smid); +mpt2sas_base_get_sense_buffer_dma (ioc, smid); mpi_request->SGLOffset0 = offsetof(Mpi2SCSIIORequest_t , SGL) /4 ; mpi_request->SGLFlags =cpu_to_le16 (MPI2_SCSIIO_SGLFLAGS_TYPE_MPI +MPI2_SCSIIO_SGLFLAGS_SYSTEM_ADDR );