Commit e1638172 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'scsi-fixes' of... 

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

 into for-5.5/drivers-post

SCSI fixes on 20191101

Nine changes, eight in drivers [ufs, target, lpfc x 2, qla2xxx x 4]
and one core change in sd that fixes an I/O failure on DIF type 3
devices.

Signed-off-by: default avatarJames E.J. Bottomley <jejb@linux.ibm.com>

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (23 commits)
  scsi: qla2xxx: stop timer in shutdown path
  scsi: sd: define variable dif as unsigned int instead of bool
  scsi: target: cxgbit: Fix cxgbit_fw4_ack()
  scsi: qla2xxx: Fix partial flash write of MBI
  scsi: qla2xxx: Initialized mailbox to prevent driver load failure
  scsi: lpfc: Honor module parameter lpfc_use_adisc
  scsi: ufs-bsg: Wake the device before sending raw upiu commands
  scsi: lpfc: Check queue pointer before use
  scsi: qla2xxx: fixup incorrect usage of host_byte
  scsi: lpfc: remove left-over BUILD_NVME defines
  scsi: core: try to get module before removing device
  scsi: hpsa: add missing hunks in reset-patch
  scsi: target: core: Do not overwrite CDB byte 1
  scsi: ch: Make it possible to open a ch device multiple times again
  scsi: fix kconfig dependency warning related to 53C700_LE_ON_BE
  scsi: sni_53c710: fix compilation error
  scsi: scsi_dh_alua: handle RTPG sense code correctly during state transitions
  scsi: qla2xxx: fix a potential NULL pointer dereference
  scsi: MAINTAINERS: Update qla2xxx driver
  scsi: zfcp: fix reaction on bit error threshold notification
  ...
parents da644b2c d3566abb

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -13363,7 +13363,7 @@ S: Maintained 
F:	drivers/scsi/qla1280.[ch]















QLOGIC QLA2XXX FC-SCSI DRIVER













M:	qla2xxx-upstream@qlogic.com













M:	hmadhani@marvell.com















L:	linux-scsi@vger.kernel.org















S:	Supported















F:	Documentation/scsi/LICENSE.qla2xxx

































drivers/s390/scsi/zfcp_fsf.c



+13
−3






























Original line number
Diff line number
Diff line








@@ -27,6 +27,11 @@





























struct kmem_cache *zfcp_fsf_qtcb_cache;





























static bool ber_stop = true;













module_param(ber_stop, bool, 0600);













MODULE_PARM_DESC(ber_stop,













		 "Shuts down FCP devices for FCP channels that report a bit-error count in excess of its threshold (default on)");





























static void zfcp_fsf_request_timeout_handler(struct timer_list *t)















{















	struct zfcp_fsf_req *fsf_req = from_timer(fsf_req, t, timer);










@@ -236,10 +241,15 @@ static void zfcp_fsf_status_read_handler(struct zfcp_fsf_req *req)













	case FSF_STATUS_READ_SENSE_DATA_AVAIL:















		break;















	case FSF_STATUS_READ_BIT_ERROR_THRESHOLD:













		dev_warn(&adapter->ccw_device->dev,













			 "The error threshold for checksum statistics "













			 "has been exceeded\n");















		zfcp_dbf_hba_bit_err("fssrh_3", req);













		if (ber_stop) {













			dev_warn(&adapter->ccw_device->dev,













				 "All paths over this FCP device are disused because of excessive bit errors\n");













			zfcp_erp_adapter_shutdown(adapter, 0, "fssrh_b");













		} else {













			dev_warn(&adapter->ccw_device->dev,













				 "The error threshold for checksum statistics has been exceeded\n");













		}















		break;















	case FSF_STATUS_READ_LINK_DOWN:















		zfcp_fsf_status_read_link_down(req);

































drivers/scsi/Kconfig



+1
−1






























Original line number
Diff line number
Diff line








@@ -898,7 +898,7 @@ config SCSI_SNI_53C710





























config 53C700_LE_ON_BE















	bool













	depends on SCSI_LASI700













	depends on SCSI_LASI700 || SCSI_SNI_53C710















	default y































config SCSI_STEX

































drivers/scsi/ch.c



+0
−1






























Original line number
Diff line number
Diff line








@@ -579,7 +579,6 @@ ch_release(struct inode *inode, struct file *file)













	scsi_changer *ch = file->private_data;































	scsi_device_put(ch->device);













	ch->device = NULL;















	file->private_data = NULL;















	kref_put(&ch->ref, ch_destroy);















	return 0;

































drivers/scsi/device_handler/scsi_dh_alua.c



+16
−5






























Original line number
Diff line number
Diff line








@@ -512,6 +512,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg)













	unsigned int tpg_desc_tbl_off;















	unsigned char orig_transition_tmo;















	unsigned long flags;













	bool transitioning_sense = false;































	if (!pg->expiry) {















		unsigned long transition_tmo = ALUA_FAILOVER_TIMEOUT * HZ;










@@ -572,13 +573,19 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg)













			goto retry;















		}















		/*













		 * Retry on ALUA state transition or if any













		 * UNIT ATTENTION occurred.













		 * If the array returns with 'ALUA state transition'













		 * sense code here it cannot return RTPG data during













		 * transition. So set the state to 'transitioning' directly.















		 */















		if (sense_hdr.sense_key == NOT_READY &&













		    sense_hdr.asc == 0x04 && sense_hdr.ascq == 0x0a)













			err = SCSI_DH_RETRY;













		else if (sense_hdr.sense_key == UNIT_ATTENTION)













		    sense_hdr.asc == 0x04 && sense_hdr.ascq == 0x0a) {













			transitioning_sense = true;













			goto skip_rtpg;













		}













		/*













		 * Retry on any other UNIT ATTENTION occurred.













		 */













		if (sense_hdr.sense_key == UNIT_ATTENTION)















			err = SCSI_DH_RETRY;















		if (err == SCSI_DH_RETRY &&















		    pg->expiry != 0 && time_before(jiffies, pg->expiry)) {










@@ -666,7 +673,11 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg)













		off = 8 + (desc[7] * 4);















	}





























 skip_rtpg:















	spin_lock_irqsave(&pg->lock, flags);













	if (transitioning_sense)













		pg->state = SCSI_ACCESS_STATE_TRANSITIONING;





























	sdev_printk(KERN_INFO, sdev,















		    "%s: port group %02x state %c %s supports %c%c%c%c%c%c%c\n",















		    ALUA_DH_NAME, pg->group_id, print_alua_state(pg->state),









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE