iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: pm8001: Fix NCQ NON DATA command task initialization

Browse Source 
In the pm8001_chip_sata_req() and pm80xx_chip_sata_req() functions, all
tasks with a DMA direction of DMA_NONE (no data transfer) are initialized
using the ATAP value 0x04. However, NCQ NON DATA commands, while being
DMA_NONE commands are NCQ commands and need to be initialized using the
value 0x07 for ATAP, similarly to other NCQ commands.

Make sure that NCQ NON DATA command tasks are initialized similarly to
other NCQ commands by also testing the task "use_ncq" field in addition to
the DMA direction. While at it, reorganize the code into a chain of if -
else if - else to avoid useless affectations and debug messages.

Link: https://lore.kernel.org/r/20220220031810.738362-15-damien.lemoal@opensource.wdc.com
Fixes: dbf9bfe61571 ("[SCSI] pm8001: add SAS/SATA HBA driver")
Reviewed-by: Jack Wang <jinpu.wang@ionos.com>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Damien Le Moal 2022-02-20 12:17:53 +09:00 committed by Martin K. Petersen
parent 23c486d19a
commit aa028141ab
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/scsi/pm8001/pm8001_hwi.c
View File

@ -4265,22 +4265,22 @@ static int pm8001_chip_sata_req(struct pm8001_hba_info *pm8001_ha,
u32 opc = OPC_INB_SATA_HOST_OPSTART; u32 opc = OPC_INB_SATA_HOST_OPSTART;
memset(&sata_cmd, 0, sizeof(sata_cmd)); memset(&sata_cmd, 0, sizeof(sata_cmd));
circularQ = &pm8001_ha->inbnd_q_tbl[0]; circularQ = &pm8001_ha->inbnd_q_tbl[0];
if (task->data_dir == DMA_NONE) {
if (task->data_dir == DMA_NONE && !task->ata_task.use_ncq) {
ATAP = 0x04; /* no data*/ ATAP = 0x04; /* no data*/
pm8001_dbg(pm8001_ha, IO, "no data\n"); pm8001_dbg(pm8001_ha, IO, "no data\n");
} else if (likely(!task->ata_task.device_control_reg_update)) { } else if (likely(!task->ata_task.device_control_reg_update)) {
if (task->ata_task.dma_xfer) { if (task->ata_task.use_ncq &&
dev->sata_dev.class != ATA_DEV_ATAPI) {
ATAP = 0x07; /* FPDMA */
pm8001_dbg(pm8001_ha, IO, "FPDMA\n");
} else if (task->ata_task.dma_xfer) {
ATAP = 0x06; /* DMA */ ATAP = 0x06; /* DMA */
pm8001_dbg(pm8001_ha, IO, "DMA\n"); pm8001_dbg(pm8001_ha, IO, "DMA\n");
} else { } else {
ATAP = 0x05; /* PIO*/ ATAP = 0x05; /* PIO*/
pm8001_dbg(pm8001_ha, IO, "PIO\n"); pm8001_dbg(pm8001_ha, IO, "PIO\n");
} }
if (task->ata_task.use_ncq &&
dev->sata_dev.class != ATA_DEV_ATAPI) {
ATAP = 0x07; /* FPDMA */
pm8001_dbg(pm8001_ha, IO, "FPDMA\n");
}
} }
if (task->ata_task.use_ncq && pm8001_get_ncq_tag(task, &hdr_tag)) { if (task->ata_task.use_ncq && pm8001_get_ncq_tag(task, &hdr_tag)) {
task->ata_task.fis.sector_count |= (u8) (hdr_tag << 3); task->ata_task.fis.sector_count |= (u8) (hdr_tag << 3);

13
drivers/scsi/pm8001/pm80xx_hwi.c
View File

@ -4546,22 +4546,21 @@ static int pm80xx_chip_sata_req(struct pm8001_hba_info *pm8001_ha,
q_index = (u32) (cpu_id) % (pm8001_ha->max_q_num); q_index = (u32) (cpu_id) % (pm8001_ha->max_q_num);
circularQ = &pm8001_ha->inbnd_q_tbl[q_index]; circularQ = &pm8001_ha->inbnd_q_tbl[q_index];
if (task->data_dir == DMA_NONE) { if (task->data_dir == DMA_NONE && !task->ata_task.use_ncq) {
ATAP = 0x04; /* no data*/ ATAP = 0x04; /* no data*/
pm8001_dbg(pm8001_ha, IO, "no data\n"); pm8001_dbg(pm8001_ha, IO, "no data\n");
} else if (likely(!task->ata_task.device_control_reg_update)) { } else if (likely(!task->ata_task.device_control_reg_update)) {
if (task->ata_task.dma_xfer) { if (task->ata_task.use_ncq &&
dev->sata_dev.class != ATA_DEV_ATAPI) {
ATAP = 0x07; /* FPDMA */
pm8001_dbg(pm8001_ha, IO, "FPDMA\n");
} else if (task->ata_task.dma_xfer) {
ATAP = 0x06; /* DMA */ ATAP = 0x06; /* DMA */
pm8001_dbg(pm8001_ha, IO, "DMA\n"); pm8001_dbg(pm8001_ha, IO, "DMA\n");
} else { } else {
ATAP = 0x05; /* PIO*/ ATAP = 0x05; /* PIO*/
pm8001_dbg(pm8001_ha, IO, "PIO\n"); pm8001_dbg(pm8001_ha, IO, "PIO\n");
} }
if (task->ata_task.use_ncq &&
dev->sata_dev.class != ATA_DEV_ATAPI) {
ATAP = 0x07; /* FPDMA */
pm8001_dbg(pm8001_ha, IO, "FPDMA\n");
}
} }
if (task->ata_task.use_ncq && pm8001_get_ncq_tag(task, &hdr_tag)) { if (task->ata_task.use_ncq && pm8001_get_ncq_tag(task, &hdr_tag)) {
task->ata_task.fis.sector_count |= (u8) (hdr_tag << 3); task->ata_task.fis.sector_count |= (u8) (hdr_tag << 3);