SCSI fixes for 5.7-rc1
Subsystems (6)
James Bottomley
maintainerSeven fixes; three in target, one on a sg error leg, two in qla2xxx fixing warnings introduced in the last merge window and updating MAINTAINERS and one in hisi_sas fixing a problem introduced by libata.
The patch is available here:
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes
The short changelog is:
Bodo Stroesser (3):
scsi: target: tcmu: reset_ring should reset TCMU_DEV_BIT_BROKEN
scsi: target: fix PR IN / READ FULL STATUS for FC
scsi: target: Write NULL to *port_nexus_ptr if no ISID
Li Bin (1):
scsi: sg: add sg_remove_request in sg_common_write
Nilesh Javali (2):
scsi: MAINTAINERS: Update qla2xxx FC-SCSI driver maintainer
scsi: qla2xxx: Fix regression warnings
YueHaibing (1):
scsi: hisi_sas: Fix build error without SATA_HOST
And the diffstat:
MAINTAINERS | 3 ++- drivers/scsi/hisi_sas/Kconfig | 1 + drivers/scsi/qla2xxx/qla_dbg.c | 3 ++- drivers/scsi/qla2xxx/qla_init.c | 2 -- drivers/scsi/qla2xxx/qla_isr.c | 1 - drivers/scsi/qla2xxx/qla_mbx.c | 2 -- drivers/scsi/sg.c | 4 +++- drivers/target/target_core_fabric_lib.c | 5 +++-- drivers/target/target_core_user.c | 1 + 9 files changed, 12 insertions(+), 10 deletions(-)
With full diff below.
James
---
MAINTAINERS +2 -1
@@ -13853,7 +13853,8 @@ S: Maintained F: drivers/scsi/qla1280.[ch] QLOGIC QLA2XXX FC-SCSI DRIVER -M: [email protected] +M: Nilesh Javali <[email protected]> +M: [email protected] L: [email protected] S: Supported F: Documentation/scsi/LICENSE.qla2xxx
drivers/scsi/hisi_sas/Kconfig +1 -0
@@ -6,6 +6,7 @@ config SCSI_HISI_SAS select SCSI_SAS_LIBSAS select BLK_DEV_INTEGRITY depends on ATA + select SATA_HOST help This driver supports HiSilicon's SAS HBA, including support based on platform device
drivers/scsi/qla2xxx/qla_dbg.c +2 -1
@@ -2539,7 +2539,6 @@ ql_dbg(uint level, scsi_qla_host_t *vha, uint id, const char *fmt, ...) {va_list va;struct va_format vaf; -char pbuf[64 ];va_start (va, fmt);
@@ -2547,6 +2546,8 @@ ql_dbg(uint level, scsi_qla_host_t *vha, uint id, const char *fmt, ...) vaf.va = &va;if (!ql_mask_match (level)) { +char pbuf[64 ]; +if (vha !=NULL ) {const struct pci_dev *pdev = vha->hw->pdev;/* <module-name> <msg-id>:<host> Message */
drivers/scsi/qla2xxx/qla_init.c +0 -2
@@ -3611,8 +3611,6 @@ qla24xx_detect_sfp(scsi_qla_host_t *vha) ha->lr_distance =LR_DISTANCE_5K ; } -if (!vha->flags.init_done) - rc =QLA_SUCCESS ; out: ql_dbg(ql_dbg_async, vha, 0x507b, "SFP detect: %s-Range SFP %s (nvr=%x ll=%x lr=%x lrd=%x).\n",
drivers/scsi/qla2xxx/qla_isr.c +0 -1
@@ -87,7 +87,6 @@ qla24xx_process_abts(struct scsi_qla_host *vha, void *pkt) }/* terminate exchange */ -memset (rsp_els,0 ,sizeof (*rsp_els)); rsp_els->entry_type =ELS_IOCB_TYPE ; rsp_els->entry_count =1 ; rsp_els->nport_handle = ~0 ;
drivers/scsi/qla2xxx/qla_mbx.c +0 -2
@@ -4894,8 +4894,6 @@ qla25xx_set_els_cmds_supported(scsi_qla_host_t *vha)return QLA_MEMORY_ALLOC_FAILED ; } -memset (els_cmd_map,0 ,ELS_CMD_MAP_SIZE ); - els_cmd_map[index] |=1 << bit; mcp->mb[0 ] =MBC_SET_RNID_PARAMS ;
drivers/scsi/sg.c +3 -1
@@ -793,8 +793,10 @@ sg_common_write(Sg_fd * sfp, Sg_request * srp,"sg_common_write: scsi opcode=0x%02x, cmd_size=%d\n" , (int) cmnd[0], (int) hp->cmd_len)); -if (hp->dxfer_len >=SZ_256M ) +if (hp->dxfer_len >=SZ_256M ) { +sg_remove_request (sfp, srp);return -EINVAL ; + } k =sg_start_req (srp, cmnd);if (k) {
drivers/target/target_core_fabric_lib.c +3 -2
@@ -63,7 +63,7 @@ static int fc_get_pr_transport_id(* encoded TransportID. */ ptr = &se_nacl->initiatorname[0 ]; -for (i =0 ; i <24 ; ) { +for (i =0 ; i <23 ; ) {if (!strncmp (&ptr[i],":" ,1 )) { i++;continue ;
@@ -341,7 +341,8 @@ static char *iscsi_parse_pr_out_transport_id( *p =tolower (*p); p++; } - } + }else + *port_nexus_ptr =NULL ;return &buf[4 ]; }
drivers/target/target_core_user.c +1 -0
@@ -2073,6 +2073,7 @@ static void tcmu_reset_ring(struct tcmu_dev *udev, u8 err_level) mb->cmd_tail =0 ; mb->cmd_head =0 ;tcmu_flush_dcache_range (mb,sizeof (*mb)); +clear_bit (TCMU_DEV_BIT_BROKEN , &udev->flags);del_timer (&udev->cmd_timer);
The pull request you sent on Sat, 18 Apr 2020 13:10:36 -0700:
The pull request you sent on Sat, 18 Apr 2020 13:10:36 -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/50cc09c18985eacbbd666acfd7be2391394733f5
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker