Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2c70425 authored by Dan Carpenter's avatar Dan Carpenter Committed by James Bottomley
Browse files

[SCSI] arcmsr: upper 32 of dma address lost 



The original code always set the upper 32 bits to zero because it was
doing a shift of the wrong variable.

Fixes: 1a4f550a ('[SCSI] arcmsr: 1.20.00.15: add SATA RAID plus other fixes')
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent ee60b2c5

drivers/scsi/arcmsr/arcmsr_hba.c

+3 −4
Original line number Diff line number Diff line
@@ -2500,16 +2500,15 @@ static int arcmsr_polling_ccbdone(struct AdapterControlBlock *acb, 
static int arcmsr_iop_confirm(struct AdapterControlBlock *acb)

{

	uint32_t cdb_phyaddr, cdb_phyaddr_hi32;

	dma_addr_t dma_coherent_handle;



	/*

	********************************************************************

	** here we need to tell iop 331 our freeccb.HighPart

	** if freeccb.HighPart is not zero

	********************************************************************

	*/

	dma_coherent_handle = acb->dma_coherent_handle;

	cdb_phyaddr = (uint32_t)(dma_coherent_handle);

	cdb_phyaddr_hi32 = (uint32_t)((cdb_phyaddr >> 16) >> 16);

	cdb_phyaddr = lower_32_bits(acb->dma_coherent_handle);

	cdb_phyaddr_hi32 = upper_32_bits(acb->dma_coherent_handle);

	acb->cdb_phyaddr_hi32 = cdb_phyaddr_hi32;

	/*

	***********************************************************************