Commit 4fedb1f0 authored by Martin K. Petersen's avatar Martin K. Petersen
Browse files

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



Pull in remaining commits from 6.10/scsi-queue.

Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parents 1613e604 d09c05aa

Documentation/cdrom/cdrom-standard.rst

+2 −2
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ current *struct* is:: 
		int (*media_changed)(struct cdrom_device_info *, int);

		int (*tray_move)(struct cdrom_device_info *, int);

		int (*lock_door)(struct cdrom_device_info *, int);

		int (*select_speed)(struct cdrom_device_info *, int);

		int (*select_speed)(struct cdrom_device_info *, unsigned long);

		int (*get_last_session) (struct cdrom_device_info *,

					 struct cdrom_multisession *);

		int (*get_mcn)(struct cdrom_device_info *, struct cdrom_mcn *);
@@ -396,7 +396,7 @@ action need be taken, and the return value should be 0. 


::



	int select_speed(struct cdrom_device_info *cdi, int speed)

	int select_speed(struct cdrom_device_info *cdi, unsigned long speed)



Some CD-ROM drives are capable of changing their head-speed. There

are several reasons for changing the speed of a CD-ROM drive. Badly

drivers/scsi/device_handler/scsi_dh_alua.c

+22 −9
Original line number Diff line number Diff line
@@ -414,28 +414,40 @@ static char print_alua_state(unsigned char state) 
	}

}



static enum scsi_disposition alua_check_sense(struct scsi_device *sdev,

					      struct scsi_sense_hdr *sense_hdr)

static void alua_handle_state_transition(struct scsi_device *sdev)

{

	struct alua_dh_data *h = sdev->handler_data;

	struct alua_port_group *pg;



	switch (sense_hdr->sense_key) {

	case NOT_READY:

		if (sense_hdr->asc == 0x04 && sense_hdr->ascq == 0x0a) {

			/*

			 * LUN Not Accessible - ALUA state transition

			 */

	rcu_read_lock();

	pg = rcu_dereference(h->pg);

	if (pg)

		pg->state = SCSI_ACCESS_STATE_TRANSITIONING;

	rcu_read_unlock();

	alua_check(sdev, false);

}



static enum scsi_disposition alua_check_sense(struct scsi_device *sdev,

					      struct scsi_sense_hdr *sense_hdr)

{

	switch (sense_hdr->sense_key) {

	case NOT_READY:

		if (sense_hdr->asc == 0x04 && sense_hdr->ascq == 0x0a) {

			/*

			 * LUN Not Accessible - ALUA state transition

			 */

			alua_handle_state_transition(sdev);

			return NEEDS_RETRY;

		}

		break;

	case UNIT_ATTENTION:

		if (sense_hdr->asc == 0x04 && sense_hdr->ascq == 0x0a) {

			/*

			 * LUN Not Accessible - ALUA state transition

			 */

			alua_handle_state_transition(sdev);

			return NEEDS_RETRY;

		}

		if (sense_hdr->asc == 0x29 && sense_hdr->ascq == 0x00) {

			/*

			 * Power On, Reset, or Bus Device Reset.
@@ -502,7 +514,8 @@ static int alua_tur(struct scsi_device *sdev) 


	retval = scsi_test_unit_ready(sdev, ALUA_FAILOVER_TIMEOUT * HZ,

				      ALUA_FAILOVER_RETRIES, &sense_hdr);

	if (sense_hdr.sense_key == NOT_READY &&

	if ((sense_hdr.sense_key == NOT_READY ||

	     sense_hdr.sense_key == UNIT_ATTENTION) &&

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

		return SCSI_DH_RETRY;

	else if (retval)

drivers/scsi/mpi3mr/mpi3mr_transport.c

+1 −1
Original line number Diff line number Diff line
@@ -1364,7 +1364,7 @@ static struct mpi3mr_sas_port *mpi3mr_sas_port_add(struct mpi3mr_ioc *mrioc, 
			continue;



		if (i > sizeof(mr_sas_port->phy_mask) * 8) {

			ioc_warn(mrioc, "skipping port %u, max allowed value is %lu\n",

			ioc_warn(mrioc, "skipping port %u, max allowed value is %zu\n",

			    i, sizeof(mr_sas_port->phy_mask) * 8);

			goto out_fail;

		}

drivers/scsi/mpt3sas/mpt3sas_scsih.c

+2 −2
Original line number Diff line number Diff line
@@ -302,8 +302,8 @@ struct _scsi_io_transfer { 


/**

 * _scsih_set_debug_level - global setting of ioc->logging_level.

 * @val: ?

 * @kp: ?

 * @val: value of the parameter to be set

 * @kp: pointer to kernel_param structure

 *

 * Note: The logging levels are defined in mpt3sas_debug.h.

 */

drivers/scsi/qedf/qedf.h

+1 −0
Original line number Diff line number Diff line
@@ -363,6 +363,7 @@ struct qedf_ctx { 
#define QEDF_IN_RECOVERY		5

#define QEDF_DBG_STOP_IO		6

#define QEDF_PROBING			8

#define QEDF_STAG_IN_PROGRESS		9

	unsigned long flags; /* Miscellaneous state flags */

	int fipvlan_retries;

	u8 num_queues;