SCSI fixes for 5.15-rc7
Subsystems (5)
James Bottomley
maintainerThree small fixes, all in drivers, and one sizeable update to the UFS driver to remove the HPB 2.0 feature that has been objected to by Jens and Christoph. Although the UFS patch is large and last minute, it's essentially the least intrusive way of resolving the objections in time for the 5.15 release.
The patch is available here:
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes
The short changelog is:
Avri Altman (1):
scsi: ufs: ufshpb: Remove HPB2.0 flows
Brian King (1):
scsi: ibmvfc: Fix up duplicate response detection
Chanho Park (1):
scsi: ufs: ufs-exynos: Correct timeout value setting registers
Martin K. Petersen (1):
scsi: mpt3sas: Fix reference tag handling for WRITE_INSERT
And the diffstat:
drivers/scsi/ibmvscsi/ibmvfc.c | 3 +- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 9 +- drivers/scsi/ufs/ufs-exynos.c | 6 +- drivers/scsi/ufs/ufshcd.c | 7 +- drivers/scsi/ufs/ufshpb.c | 283 +---------------------------------- drivers/scsi/ufs/ufshpb.h | 2 - 6 files changed, 15 insertions(+), 295 deletions(-)
With full diff below.
James
---
drivers/scsi/ibmvscsi/ibmvfc.c +2 -1
@@ -1696,6 +1696,7 @@ static int ibmvfc_send_event(struct ibmvfc_event *evt,spin_lock_irqsave (&evt->queue->l_lock, flags);list_add_tail (&evt->queue_list, &evt->queue->sent); +atomic_set (&evt->active,1 );mb ();
@@ -1710,6 +1711,7 @@ static int ibmvfc_send_event(struct ibmvfc_event *evt, be64_to_cpu(crq_as_u64[1]));if (rc) { +atomic_set (&evt->active,0 );list_del (&evt->queue_list);spin_unlock_irqrestore (&evt->queue->l_lock, flags);del_timer (&evt->timer);
@@ -1737,7 +1739,6 @@ static int ibmvfc_send_event(struct ibmvfc_event *evt, evt->done (evt); }else { -atomic_set (&evt->active,1 );spin_unlock_irqrestore (&evt->queue->l_lock, flags);ibmvfc_trc_start (evt); }
drivers/scsi/mpt3sas/mpt3sas_scsih.c +6 -3
@@ -5065,9 +5065,12 @@ _scsih_setup_eedp(struct MPT3SAS_ADAPTER *ioc, struct scsi_cmnd *scmd,if (scmd->prot_flags &SCSI_PROT_GUARD_CHECK ) eedp_flags |=MPI2_SCSIIO_EEDPFLAGS_CHECK_GUARD ; -if (scmd->prot_flags &SCSI_PROT_REF_CHECK ) { - eedp_flags |=MPI2_SCSIIO_EEDPFLAGS_INC_PRI_REFTAG | -MPI2_SCSIIO_EEDPFLAGS_CHECK_REFTAG ; +if (scmd->prot_flags &SCSI_PROT_REF_CHECK ) + eedp_flags |=MPI2_SCSIIO_EEDPFLAGS_CHECK_REFTAG ; + +if (scmd->prot_flags &SCSI_PROT_REF_INCREMENT ) { + eedp_flags |=MPI2_SCSIIO_EEDPFLAGS_INC_PRI_REFTAG ; + mpi_request->CDB.EEDP32.PrimaryReferenceTag =cpu_to_be32 (scsi_prot_ref_tag (scmd)); }
drivers/scsi/ufs/ufs-exynos.c +3 -3
@@ -642,9 +642,9 @@ static int exynos_ufs_pre_pwr_mode(struct ufs_hba *hba, }/* setting for three timeout values for traffic class #0 */ -ufshcd_dme_set (hba,UIC_ARG_MIB (PA_PWRMODEUSERDATA0 ),8064 ); -ufshcd_dme_set (hba,UIC_ARG_MIB (PA_PWRMODEUSERDATA1 ),28224 ); -ufshcd_dme_set (hba,UIC_ARG_MIB (PA_PWRMODEUSERDATA2 ),20160 ); +ufshcd_dme_set (hba,UIC_ARG_MIB (DL_FC0PROTTIMEOUTVAL ),8064 ); +ufshcd_dme_set (hba,UIC_ARG_MIB (DL_TC0REPLAYTIMEOUTVAL ),28224 ); +ufshcd_dme_set (hba,UIC_ARG_MIB (DL_AFC0REQTIMEOUTVAL ),20160 );return 0 ; out:
drivers/scsi/ufs/ufshcd.c +1 -6
@@ -2737,12 +2737,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) lrbp->req_abort_skip = false; - err =ufshpb_prep (hba, lrbp); -if (err == -EAGAIN ) { - lrbp->cmd =NULL ; -ufshcd_release (hba); - goto out; - } +ufshpb_prep (hba, lrbp);ufshcd_comp_scsi_upiu (hba, lrbp);
drivers/scsi/ufs/ufshpb.c +3 -280
329 lines not on this page · raw message
drivers/scsi/ufs/ufshpb.h +0 -2
@@ -241,8 +241,6 @@ struct ufshpb_lu {spinlock_t param_lock;struct list_head lh_pre_req_free; -int cur_read_id; -int pre_req_min_tr_len;int pre_req_max_tr_len;/* cached L2P map management worker */
The pull request you sent on Sat, 30 Oct 2021 14:45:43 -0700:
The pull request you sent on Sat, 30 Oct 2021 14:45:43 -0700:
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/180eca540ae06246d594bdd8d8213426a259cc8c
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/prtracker.html