Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6898389 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull SCSI fixes from James Bottomley:
 "Nine fixes: The most important core one is the dma_max_mapping_size
  fix that corrects the boot problem Gunter Roeck was having. A couple
  of other driver only fixes are significant, like the cxgbi selector
  support addition, the alua 2 second delay and the fdomain build fix"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: scsi_dh_alua: always use a 2 second delay before retrying RTPG
  scsi: ibmvfc: fix WARN_ON during event pool release
  scsi: fcoe: fix a typo
  scsi: megaraid_sas: Make some functions static
  scsi: megaraid_sas: fix panic on loading firmware crashdump
  scsi: megaraid_sas: fix spelling mistake "megarid_sas" -> "megaraid_sas"
  scsi: core: fix the dma_max_mapping_size call
  scsi: fdomain: fix building pcmcia front-end
  scsi: target: cxgbit: add support for IEEE_8021QAZ_APP_SEL_STREAM selector
parents e2921f9f 20122994

drivers/scsi/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -1523,10 +1523,10 @@ config SCSI_VIRTIO 


source "drivers/scsi/csiostor/Kconfig"



endif # SCSI_LOWLEVEL



source "drivers/scsi/pcmcia/Kconfig"



endif # SCSI_LOWLEVEL



source "drivers/scsi/device_handler/Kconfig"



endmenu

drivers/scsi/device_handler/scsi_dh_alua.c

+6 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#define ALUA_FAILOVER_TIMEOUT		60

#define ALUA_FAILOVER_RETRIES		5

#define ALUA_RTPG_DELAY_MSECS		5

#define ALUA_RTPG_RETRY_DELAY		2



/* device handler flags */

#define ALUA_OPTIMIZE_STPG		0x01
@@ -682,7 +683,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg) 
	case SCSI_ACCESS_STATE_TRANSITIONING:

		if (time_before(jiffies, pg->expiry)) {

			/* State transition, retry */

			pg->interval = 2;

			pg->interval = ALUA_RTPG_RETRY_DELAY;

			err = SCSI_DH_RETRY;

		} else {

			struct alua_dh_data *h;
@@ -807,6 +808,8 @@ static void alua_rtpg_work(struct work_struct *work) 
				spin_lock_irqsave(&pg->lock, flags);

				pg->flags &= ~ALUA_PG_RUNNING;

				pg->flags |= ALUA_PG_RUN_RTPG;

				if (!pg->interval)

					pg->interval = ALUA_RTPG_RETRY_DELAY;

				spin_unlock_irqrestore(&pg->lock, flags);

				queue_delayed_work(kaluad_wq, &pg->rtpg_work,

						   pg->interval * HZ);
@@ -818,6 +821,8 @@ static void alua_rtpg_work(struct work_struct *work) 
		spin_lock_irqsave(&pg->lock, flags);

		if (err == SCSI_DH_RETRY || pg->flags & ALUA_PG_RUN_RTPG) {

			pg->flags &= ~ALUA_PG_RUNNING;

			if (!pg->interval && !(pg->flags & ALUA_PG_RUN_RTPG))

				pg->interval = ALUA_RTPG_RETRY_DELAY;

			pg->flags |= ALUA_PG_RUN_RTPG;

			spin_unlock_irqrestore(&pg->lock, flags);

			queue_delayed_work(kaluad_wq, &pg->rtpg_work,

drivers/scsi/fcoe/fcoe_ctlr.c

+1 −1
Original line number Diff line number Diff line
@@ -1019,7 +1019,7 @@ static void fcoe_ctlr_recv_adv(struct fcoe_ctlr *fip, struct sk_buff *skb) 
{

	struct fcoe_fcf *fcf;

	struct fcoe_fcf new;

	unsigned long sol_tov = msecs_to_jiffies(FCOE_CTRL_SOL_TOV);

	unsigned long sol_tov = msecs_to_jiffies(FCOE_CTLR_SOL_TOV);

	int first = 0;

	int mtu_valid;

	int found = 0;

drivers/scsi/ibmvscsi/ibmvfc.c

+1 −1
Original line number Diff line number Diff line
@@ -4864,8 +4864,8 @@ static int ibmvfc_remove(struct vio_dev *vdev) 


	spin_lock_irqsave(vhost->host->host_lock, flags);

	ibmvfc_purge_requests(vhost, DID_ERROR);

	ibmvfc_free_event_pool(vhost);

	spin_unlock_irqrestore(vhost->host->host_lock, flags);

	ibmvfc_free_event_pool(vhost);



	ibmvfc_free_mem(vhost);

	spin_lock(&ibmvfc_driver_lock);

drivers/scsi/megaraid/megaraid_sas_base.c

+4 −1
Original line number Diff line number Diff line
@@ -3163,6 +3163,7 @@ fw_crash_buffer_show(struct device *cdev, 
		(struct megasas_instance *) shost->hostdata;

	u32 size;

	unsigned long dmachunk = CRASH_DMA_BUF_SIZE;

	unsigned long chunk_left_bytes;

	unsigned long src_addr;

	unsigned long flags;

	u32 buff_offset;
@@ -3186,6 +3187,8 @@ fw_crash_buffer_show(struct device *cdev, 
	}



	size = (instance->fw_crash_buffer_size * dmachunk) - buff_offset;

	chunk_left_bytes = dmachunk - (buff_offset % dmachunk);

	size = (size > chunk_left_bytes) ? chunk_left_bytes : size;

	size = (size >= PAGE_SIZE) ? (PAGE_SIZE - 1) : size;



	src_addr = (unsigned long)instance->crash_buf[buff_offset / dmachunk] +
@@ -8763,7 +8766,7 @@ static int __init megasas_init(void) 


	if ((event_log_level < MFI_EVT_CLASS_DEBUG) ||

	    (event_log_level > MFI_EVT_CLASS_DEAD)) {

		printk(KERN_WARNING "megarid_sas: provided event log level is out of range, setting it to default 2(CLASS_CRITICAL), permissible range is: -2 to 4\n");

		pr_warn("megaraid_sas: provided event log level is out of range, setting it to default 2(CLASS_CRITICAL), permissible range is: -2 to 4\n");

		event_log_level = MFI_EVT_CLASS_CRITICAL;

	}