tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

scsi: pm8001: Improve pm80XX_send_abort_all()

Both pm8001_send_abort_all() and pm80xx_send_abort_all() are called only
for a non null device with the NCQ_READ_LOG_FLAG set, so remove the device
check on entry of these functions. Furthermore, setting the
NCQ_ABORT_ALL_FLAG device id flag and clearing the NCQ_READ_LOG_FLAG is
always done before calling these functions. Move these operations inside
the functions.

Link: https://lore.kernel.org/r/20220220031810.738362-31-damien.lemoal@opensource.wdc.com
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>

authored by

Damien Le Moal and committed by
Martin K. Petersen ca44f98d 304fe11b

+8 -22
+4 -10
drivers/scsi/pm8001/pm8001_hwi.c
··· 1748 1748 struct pm8001_device *pm8001_ha_dev) 1749 1749 { 1750 1750 struct pm8001_ccb_info *ccb; 1751 - struct sas_task *task = NULL; 1751 + struct sas_task *task; 1752 1752 struct task_abort_req task_abort; 1753 1753 u32 opc = OPC_INB_SATA_ABORT; 1754 1754 int ret; 1755 1755 1756 - if (!pm8001_ha_dev) { 1757 - pm8001_dbg(pm8001_ha, FAIL, "dev is null\n"); 1758 - return; 1759 - } 1756 + pm8001_ha_dev->id |= NCQ_ABORT_ALL_FLAG; 1757 + pm8001_ha_dev->id &= ~NCQ_READ_LOG_FLAG; 1760 1758 1761 1759 task = sas_alloc_slow_task(GFP_ATOMIC); 1762 1760 if (!task) { ··· 2356 2358 ts->stat = SAS_SAM_STAT_GOOD; 2357 2359 /* check if response is for SEND READ LOG */ 2358 2360 if (pm8001_dev && 2359 - (pm8001_dev->id & NCQ_READ_LOG_FLAG)) { 2360 - /* set new bit for abort_all */ 2361 - pm8001_dev->id |= NCQ_ABORT_ALL_FLAG; 2362 - /* clear bit for read log */ 2363 - pm8001_dev->id = pm8001_dev->id & 0x7FFFFFFF; 2361 + (pm8001_dev->id & NCQ_READ_LOG_FLAG)) { 2364 2362 pm8001_send_abort_all(pm8001_ha, pm8001_dev); 2365 2363 /* Free the tag */ 2366 2364 pm8001_tag_free(pm8001_ha, tag);
+4 -12
drivers/scsi/pm8001/pm80xx_hwi.c
··· 1761 1761 struct pm8001_device *pm8001_ha_dev) 1762 1762 { 1763 1763 struct pm8001_ccb_info *ccb; 1764 - struct sas_task *task = NULL; 1764 + struct sas_task *task; 1765 1765 struct task_abort_req task_abort; 1766 1766 u32 opc = OPC_INB_SATA_ABORT; 1767 1767 int ret; 1768 1768 1769 - if (!pm8001_ha_dev) { 1770 - pm8001_dbg(pm8001_ha, FAIL, "dev is null\n"); 1771 - return; 1772 - } 1769 + pm8001_ha_dev->id |= NCQ_ABORT_ALL_FLAG; 1770 + pm8001_ha_dev->id &= ~NCQ_READ_LOG_FLAG; 1773 1771 1774 1772 task = sas_alloc_slow_task(GFP_ATOMIC); 1775 - 1776 1773 if (!task) { 1777 1774 pm8001_dbg(pm8001_ha, FAIL, "cannot allocate task\n"); 1778 1775 return; 1779 1776 } 1780 - 1781 1777 task->task_done = pm8001_task_done; 1782 1778 1783 1779 ccb = pm8001_ccb_alloc(pm8001_ha, pm8001_ha_dev, task); ··· 2442 2446 ts->stat = SAS_SAM_STAT_GOOD; 2443 2447 /* check if response is for SEND READ LOG */ 2444 2448 if (pm8001_dev && 2445 - (pm8001_dev->id & NCQ_READ_LOG_FLAG)) { 2446 - /* set new bit for abort_all */ 2447 - pm8001_dev->id |= NCQ_ABORT_ALL_FLAG; 2448 - /* clear bit for read log */ 2449 - pm8001_dev->id = pm8001_dev->id & 0x7FFFFFFF; 2449 + (pm8001_dev->id & NCQ_READ_LOG_FLAG)) { 2450 2450 pm80xx_send_abort_all(pm8001_ha, pm8001_dev); 2451 2451 /* Free the tag */ 2452 2452 pm8001_tag_free(pm8001_ha, tag);