Commit 4305ca00 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull SCSI updates from James Bottomley:
 "Updates to the usual drivers (ufs, lpfc, qla2xxx, mpi3mr) plus some
  misc small fixes.

  The only core changes are to both bsg and scsi to pass in the device
  instead of setting it afterwards as q->queuedata, so no functional
  change"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (69 commits)
  scsi: aha152x: Use DECLARE_COMPLETION_ONSTACK for non-constant completion
  scsi: qla2xxx: Convert comma to semicolon
  scsi: qla2xxx: Update version to 10.02.09.300-k
  scsi: qla2xxx: Use QP lock to search for bsg
  scsi: qla2xxx: Reduce fabric scan duplicate code
  scsi: qla2xxx: Fix optrom version displayed in FDMI
  scsi: qla2xxx: During vport delete send async logout explicitly
  scsi: qla2xxx: Complete command early within lock
  scsi: qla2xxx: Fix flash read failure
  scsi: qla2xxx: Return ENOBUFS if sg_cnt is more than one for ELS cmds
  scsi: qla2xxx: Fix for possible memory corruption
  scsi: qla2xxx: validate nvme_local_port correctly
  scsi: qla2xxx: Unable to act on RSCN for port online
  scsi: ufs: exynos: Add support for Flash Memory Protector (FMP)
  scsi: ufs: core: Add UFSHCD_QUIRK_KEYS_IN_PRDT
  scsi: ufs: core: Add fill_crypto_prdt variant op
  scsi: ufs: core: Add UFSHCD_QUIRK_BROKEN_CRYPTO_ENABLE
  scsi: ufs: core: fold ufshcd_clear_keyslot() into its caller
  scsi: ufs: core: Add UFSHCD_QUIRK_CUSTOM_CRYPTO_PROFILE
  scsi: ufs: mcq: Make .get_hba_mac() optional
  ...
parents 661fb4e6 23cef42d

Documentation/ABI/testing/sysfs-driver-ufs

+8 −6
Original line number Diff line number Diff line
@@ -920,14 +920,16 @@ Description: This file shows whether the configuration descriptor is locked. 


What:		/sys/bus/platform/drivers/ufshcd/*/attributes/max_number_of_rtt

What:		/sys/bus/platform/devices/*.ufs/attributes/max_number_of_rtt

Date:		February 2018

Contact:	Stanislav Nijnikov <stanislav.nijnikov@wdc.com>

Date:		May 2024

Contact:	Avri Altman <avri.altman@wdc.com>

Description:	This file provides the maximum current number of

		outstanding RTTs in device that is allowed. The full

		information about the attribute could be found at

		UFS specifications 2.1.

		outstanding RTTs in device that is allowed. bMaxNumOfRTT is a

		read-write persistent attribute and is equal to two after device

		manufacturing. It shall not be set to a value greater than

		bDeviceRTTCap value, and it may be set only when the hw queues are

		empty.



		The file is read only.

		The file is read write.



What:		/sys/bus/platform/drivers/ufshcd/*/attributes/exception_event_control

What:		/sys/bus/platform/devices/*.ufs/attributes/exception_event_control

block/bsg-lib.c

+1 −2
Original line number Diff line number Diff line
@@ -385,13 +385,12 @@ struct request_queue *bsg_setup_queue(struct device *dev, const char *name, 
	if (blk_mq_alloc_tag_set(set))

		goto out_tag_set;



	q = blk_mq_alloc_queue(set, lim, NULL);

	q = blk_mq_alloc_queue(set, lim, dev);

	if (IS_ERR(q)) {

		ret = PTR_ERR(q);

		goto out_queue;

	}



	q->queuedata = dev;

	blk_queue_rq_timeout(q, BLK_DEFAULT_SG_TIMEOUT);



	bset->bd = bsg_register_queue(q, dev, name, bsg_transport_sg_io_fn);

drivers/scsi/BusLogic.c

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ static struct blogic_drvr_options blogic_drvr_options[BLOGIC_MAX_ADAPTERS]; 
  BusLogic can be assigned a string by insmod.

*/



MODULE_DESCRIPTION("BusLogic MultiMaster and FlashPoint SCSI Host Adapter driver");

MODULE_LICENSE("GPL");

#ifdef MODULE

static char *BusLogic;

drivers/scsi/advansys.c

+1 −0
Original line number Diff line number Diff line
@@ -11545,6 +11545,7 @@ static void __exit advansys_exit(void) 
module_init(advansys_init);

module_exit(advansys_exit);



MODULE_DESCRIPTION("AdvanSys SCSI Adapter driver");

MODULE_LICENSE("GPL");

MODULE_FIRMWARE("advansys/mcode.bin");

MODULE_FIRMWARE("advansys/3550.bin");

drivers/scsi/aha152x.c

+1 −1
Original line number Diff line number Diff line
@@ -1072,7 +1072,7 @@ static int aha152x_abort(struct scsi_cmnd *SCpnt) 
static int aha152x_device_reset(struct scsi_cmnd * SCpnt)

{

	struct Scsi_Host *shpnt = SCpnt->device->host;

	DECLARE_COMPLETION(done);

	DECLARE_COMPLETION_ONSTACK(done);

	int ret, issued, disconnected;

	unsigned char old_cmd_len = SCpnt->cmd_len;

	unsigned long flags;