SCSI fixes for 5.16-rc5
Subsystems (2)
James Bottomley
maintainerOne driver fix: the pm8001 has never actually worked on a system with an IOMMU and this fixes that use case.
The patch is available here:
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes
The short changelog is:
John Garry (1):
scsi: pm8001: Fix phys_to_virt() usage on dma_addr_t
And the diffstat:
drivers/scsi/pm8001/pm80xx_hwi.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-)
With full diff below.
James
---
drivers/scsi/pm8001/pm80xx_hwi.c +21 -17
@@ -3053,7 +3053,6 @@ mpi_smp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)struct smp_completion_resp *psmpPayload;struct task_status_struct *ts;struct pm8001_device *pm8001_dev; -char *pdma_respaddr =NULL ; psmpPayload = (struct smp_completion_resp *)(piomb +4 ); status =le32_to_cpu (psmpPayload->status);
@@ -3080,19 +3079,23 @@ mpi_smp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)if (pm8001_dev)atomic_dec (&pm8001_dev->running_req);if (pm8001_ha->smp_exp_mode ==SMP_DIRECT ) { +struct scatterlist *sg_resp = &t->smp_task.smp_resp; +u8 *payload; +void *to; +pm8001_dbg (pm8001_ha,IO ,"DIRECT RESPONSE Length:%d\n" , param); - pdma_respaddr = (char *)(phys_to_virt (cpu_to_le64 - ((u64 )sg_dma_address - (&t->smp_task.smp_resp)))); + to =kmap_atomic (sg_page (sg_resp)); + payload = to + sg_resp->offset;for (i =0 ; i < param; i++) { - *(pdma_respaddr+i) = psmpPayload->_r_a[i]; + *(payload + i) = psmpPayload->_r_a[i];pm8001_dbg (pm8001_ha,IO ,"SMP Byte%d DMA data 0x%x psmp 0x%x\n" , - i, *(pdma_respaddr + i), + i, *(payload + i), psmpPayload->_r_a[i]); } +kunmap_atomic (to); }break ;case IO_ABORTED :
@@ -4236,14 +4239,14 @@ static int pm80xx_chip_smp_req(struct pm8001_hba_info *pm8001_ha,struct sas_task *task = ccb->task;struct domain_device *dev = task->dev;struct pm8001_device *pm8001_dev = dev->lldd_dev; -struct scatterlist *sg_req, *sg_resp; +struct scatterlist *sg_req, *sg_resp, *smp_req;u32 req_len, resp_len;struct smp_req smp_cmd;u32 opc;struct inbound_queue_table *circularQ; -char *preq_dma_addr =NULL ; -__le64 tmp_addr;u32 i, length; +u8 *payload; +u8 *to;memset (&smp_cmd,0 ,sizeof (smp_cmd));/*
@@ -4280,8 +4283,9 @@ static int pm80xx_chip_smp_req(struct pm8001_hba_info *pm8001_ha, pm8001_ha->smp_exp_mode =SMP_INDIRECT ; - tmp_addr =cpu_to_le64 ((u64 )sg_dma_address (&task->smp_task.smp_req)); - preq_dma_addr = (char *)phys_to_virt (tmp_addr); + smp_req = &task->smp_task.smp_req; + to =kmap_atomic (sg_page (smp_req)); + payload = to + smp_req->offset;/* INDIRECT MODE command settings. Use DMA */ if (pm8001_ha->smp_exp_mode ==SMP_INDIRECT ) {
@@ -4289,7 +4293,7 @@ static int pm80xx_chip_smp_req(struct pm8001_hba_info *pm8001_ha,/* for SPCv indirect mode. Place the top 4 bytes of * SMP Request header here. */ for (i =0 ; i <4 ; i++) - smp_cmd.smp_req16[i] = *(preq_dma_addr + i); + smp_cmd.smp_req16[i] = *(payload + i);/* exclude top 4 bytes for SMP req header */ smp_cmd.long_smp_req.long_req_addr = cpu_to_le64((u64)sg_dma_address
@@ -4320,20 +4324,20 @@ static int pm80xx_chip_smp_req(struct pm8001_hba_info *pm8001_ha,pm8001_dbg (pm8001_ha,IO ,"SMP REQUEST DIRECT MODE\n" );for (i =0 ; i < length; i++)if (i <16 ) { - smp_cmd.smp_req16[i] = *(preq_dma_addr+i); + smp_cmd.smp_req16[i] = *(payload + i);pm8001_dbg (pm8001_ha,IO ,"Byte[%d]:%x (DMA data:%x)\n" , i, smp_cmd.smp_req16[i], - *(preq_dma_addr)); + *(payload)); }else { - smp_cmd.smp_req[i] = *(preq_dma_addr+i); + smp_cmd.smp_req[i] = *(payload + i);pm8001_dbg (pm8001_ha,IO ,"Byte[%d]:%x (DMA data:%x)\n" , i, smp_cmd.smp_req[i], - *(preq_dma_addr)); + *(payload)); } } - +kunmap_atomic (to);build_smp_cmd (pm8001_dev->device_id, smp_cmd.tag, &smp_cmd, pm8001_ha->smp_exp_mode, length); rc = pm8001_mpi_build_cmd(pm8001_ha, circularQ, opc, &smp_cmd,
The pull request you sent on Fri, 17 Dec 2021 16:46:44 -0500:
The pull request you sent on Fri, 17 Dec 2021 16:46:44 -0500:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.gitscsi-fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/5d65f6f3df56021ec76761ea6986bc8139f537d2
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/prtracker.html