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

Merge branch '6.16/scsi-queue' into 6.16/scsi-fixes

Pull in remaining fixes from queue branch.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

Martin K. Petersen a3da9388 19272b37

+15 -9
+2
drivers/s390/scsi/zfcp_sysfs.c
··· 449 449 if (kstrtoull(buf, 0, (unsigned long long *) &fcp_lun)) 450 450 return -EINVAL; 451 451 452 + flush_work(&port->rport_work); 453 + 452 454 retval = zfcp_unit_add(port, fcp_lun); 453 455 if (retval) 454 456 return retval;
+2 -2
drivers/scsi/mvsas/mv_defs.h
··· 215 215 216 216 /* MVS_Px_INT_STAT, MVS_Px_INT_MASK (per-phy events) */ 217 217 PHYEV_DEC_ERR = (1U << 24), /* Phy Decoding Error */ 218 - PHYEV_DCDR_ERR = (1U << 23), /* STP Deocder Error */ 218 + PHYEV_DCDR_ERR = (1U << 23), /* STP Decoder Error */ 219 219 PHYEV_CRC_ERR = (1U << 22), /* STP CRC Error */ 220 220 PHYEV_UNASSOC_FIS = (1U << 19), /* unassociated FIS rx'd */ 221 221 PHYEV_AN = (1U << 18), /* SATA async notification */ ··· 347 347 CMD_SATA_PORT_MEM_CTL0 = 0x158, /* SATA Port Memory Control 0 */ 348 348 CMD_SATA_PORT_MEM_CTL1 = 0x15c, /* SATA Port Memory Control 1 */ 349 349 CMD_XOR_MEM_BIST_CTL = 0x160, /* XOR Memory BIST Control */ 350 - CMD_XOR_MEM_BIST_STAT = 0x164, /* XOR Memroy BIST Status */ 350 + CMD_XOR_MEM_BIST_STAT = 0x164, /* XOR Memory BIST Status */ 351 351 CMD_DMA_MEM_BIST_CTL = 0x168, /* DMA Memory BIST Control */ 352 352 CMD_DMA_MEM_BIST_STAT = 0x16c, /* DMA Memory BIST Status */ 353 353 CMD_PORT_MEM_BIST_CTL = 0x170, /* Port Memory BIST Control */
+5 -6
drivers/scsi/scsi_transport_iscsi.c
··· 3499 3499 pr_err("%s could not find host no %u\n", 3500 3500 __func__, ev->u.new_flashnode.host_no); 3501 3501 err = -ENODEV; 3502 - goto put_host; 3502 + goto exit_new_fnode; 3503 3503 } 3504 3504 3505 3505 index = transport->new_flashnode(shost, data, len); ··· 3509 3509 else 3510 3510 err = -EIO; 3511 3511 3512 - put_host: 3513 3512 scsi_host_put(shost); 3514 3513 3515 3514 exit_new_fnode: ··· 3533 3534 pr_err("%s could not find host no %u\n", 3534 3535 __func__, ev->u.del_flashnode.host_no); 3535 3536 err = -ENODEV; 3536 - goto put_host; 3537 + goto exit_del_fnode; 3537 3538 } 3538 3539 3539 3540 idx = ev->u.del_flashnode.flashnode_idx; ··· 3575 3576 pr_err("%s could not find host no %u\n", 3576 3577 __func__, ev->u.login_flashnode.host_no); 3577 3578 err = -ENODEV; 3578 - goto put_host; 3579 + goto exit_login_fnode; 3579 3580 } 3580 3581 3581 3582 idx = ev->u.login_flashnode.flashnode_idx; ··· 3627 3628 pr_err("%s could not find host no %u\n", 3628 3629 __func__, ev->u.logout_flashnode.host_no); 3629 3630 err = -ENODEV; 3630 - goto put_host; 3631 + goto exit_logout_fnode; 3631 3632 } 3632 3633 3633 3634 idx = ev->u.logout_flashnode.flashnode_idx; ··· 3677 3678 pr_err("%s could not find host no %u\n", 3678 3679 __func__, ev->u.logout_flashnode.host_no); 3679 3680 err = -ENODEV; 3680 - goto put_host; 3681 + goto exit_logout_sid; 3681 3682 } 3682 3683 3683 3684 session = iscsi_session_lookup(ev->u.logout_flashnode_sid.sid);
+6 -1
drivers/ufs/core/ufshcd.c
··· 6623 6623 up(&hba->host_sem); 6624 6624 return; 6625 6625 } 6626 + spin_unlock_irqrestore(hba->host->host_lock, flags); 6627 + 6628 + ufshcd_err_handling_prepare(hba); 6629 + 6630 + spin_lock_irqsave(hba->host->host_lock, flags); 6626 6631 ufshcd_set_eh_in_progress(hba); 6627 6632 spin_unlock_irqrestore(hba->host->host_lock, flags); 6628 - ufshcd_err_handling_prepare(hba); 6633 + 6629 6634 /* Complete requests that have door-bell cleared by h/w */ 6630 6635 ufshcd_complete_requests(hba, false); 6631 6636 spin_lock_irqsave(hba->host->host_lock, flags);