diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2014-02-11 19:06:33 +0300 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-05-15 09:55:15 +0200 |
| commit | abab64323b3a12430a55238bc3cd953b5bb016c8 (patch) | |
| tree | 4e1304e4ee651859c5766878c03fd707e361789e | |
| parent | f00a58f0dc09358e7af7f050825bf575a094fee3 (diff) | |
| download | lwn-abab64323b3a12430a55238bc3cd953b5bb016c8.tar.gz lwn-abab64323b3a12430a55238bc3cd953b5bb016c8.zip | |
SCSI: arcmsr: upper 32 of dma address lost
commit e2c70425f05219b142b3a8a9489a622c736db39d upstream.
The original code always set the upper 32 bits to zero because it was
doing a shift of the wrong variable.
Fixes: 1a4f550a09f8 ('[SCSI] arcmsr: 1.20.00.15: add SATA RAID plus other fixes')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | drivers/scsi/arcmsr/arcmsr_hba.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c index 278c9fa62067..1822cb9ec623 100644 --- a/drivers/scsi/arcmsr/arcmsr_hba.c +++ b/drivers/scsi/arcmsr/arcmsr_hba.c @@ -2501,16 +2501,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; /* *********************************************************************** |