Commit 8ba4bc76 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman

SCSI: arcmsr: upper 32 of dma address lost

commit e2c70425 upstream.

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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 41d5d291
...@@ -2500,16 +2500,15 @@ static int arcmsr_polling_ccbdone(struct AdapterControlBlock *acb, ...@@ -2500,16 +2500,15 @@ static int arcmsr_polling_ccbdone(struct AdapterControlBlock *acb,
static int arcmsr_iop_confirm(struct AdapterControlBlock *acb) static int arcmsr_iop_confirm(struct AdapterControlBlock *acb)
{ {
uint32_t cdb_phyaddr, cdb_phyaddr_hi32; uint32_t cdb_phyaddr, cdb_phyaddr_hi32;
dma_addr_t dma_coherent_handle;
/* /*
******************************************************************** ********************************************************************
** here we need to tell iop 331 our freeccb.HighPart ** here we need to tell iop 331 our freeccb.HighPart
** if freeccb.HighPart is not zero ** if freeccb.HighPart is not zero
******************************************************************** ********************************************************************
*/ */
dma_coherent_handle = acb->dma_coherent_handle; cdb_phyaddr = lower_32_bits(acb->dma_coherent_handle);
cdb_phyaddr = (uint32_t)(dma_coherent_handle); cdb_phyaddr_hi32 = upper_32_bits(acb->dma_coherent_handle);
cdb_phyaddr_hi32 = (uint32_t)((cdb_phyaddr >> 16) >> 16);
acb->cdb_phyaddr_hi32 = cdb_phyaddr_hi32; acb->cdb_phyaddr_hi32 = cdb_phyaddr_hi32;
/* /*
*********************************************************************** ***********************************************************************
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment