Commit cdc19470 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:
 "This update includes the usual round of major driver updates (ncr5380,
  ufs, lpfc, be2iscsi, hisi_sas, storvsc, cxlflash, aacraid,
  megaraid_sas, ...).

  There's also an assortment of minor fixes and the major update of
  switching a bunch of drivers to pci_alloc_irq_vectors from Christoph"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (188 commits)
  scsi: megaraid_sas: handle dma_addr_t right on 32-bit
  scsi: megaraid_sas: array overflow in megasas_dump_frame()
  scsi: snic: switch to pci_irq_alloc_vectors
  scsi: megaraid_sas: driver version upgrade
  scsi: megaraid_sas: Change RAID_1_10_RMW_CMDS to RAID_1_PEER_CMDS and set value to 2
  scsi: megaraid_sas: Indentation and smatch warning fixes
  scsi: megaraid_sas: Cleanup VD_EXT_DEBUG and SPAN_DEBUG related debug prints
  scsi: megaraid_sas: Increase internal command pool
  scsi: megaraid_sas: Use synchronize_irq to wait for IRQs to complete
  scsi: megaraid_sas: Bail out the driver load if ld_list_query fails
  scsi: megaraid_sas: Change build_mpt_mfi_pass_thru to return void
  scsi: megaraid_sas: During OCR, if get_ctrl_info fails do not continue with OCR
  scsi: megaraid_sas: Do not set fp_possible if TM capable for non-RW syspdIO, change fp_possible to bool
  scsi: megaraid_sas: Remove unused pd_index from megasas_build_ld_nonrw_fusion
  scsi: megaraid_sas: megasas_return_cmd does not memset IO frame to zero
  scsi: megaraid_sas: max_fw_cmds are decremented twice, remove duplicate
  scsi: megaraid_sas: update can_queue only if the new value is less
  scsi: megaraid_sas: Change max_cmd from u32 to u16 in all functions
  scsi: megaraid_sas: set pd_after_lb from MR_BuildRaidContext and initialize pDevHandle to MR_DEVHANDLE_INVALID
  scsi: megaraid_sas: latest controller OCR capability from FW before sending shutdown DCMD
  ...
parents 772c8f6f d1da522f

drivers/ata/libata-eh.c

+1 −0
Original line number Diff line number Diff line
@@ -549,6 +549,7 @@ enum blk_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd) 
	DPRINTK("EXIT, ret=%d\n", ret);

	return ret;

}

EXPORT_SYMBOL(ata_scsi_timed_out);



static void ata_eh_unload(struct ata_port *ap)

{

drivers/ata/libata-transport.c

+0 −1
Original line number Diff line number Diff line
@@ -716,7 +716,6 @@ struct scsi_transport_template *ata_attach_transport(void) 
		return NULL;



	i->t.eh_strategy_handler	= ata_scsi_error;

	i->t.eh_timed_out		= ata_scsi_timed_out;

	i->t.user_scan			= ata_scsi_user_scan;



	i->t.host_attrs.ac.attrs = &i->port_attrs[0];

drivers/ata/libata.h

+0 −1
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ extern unsigned long ata_internal_cmd_timeout(struct ata_device *dev, u8 cmd); 
extern void ata_internal_cmd_timed_out(struct ata_device *dev, u8 cmd);

extern void ata_eh_acquire(struct ata_port *ap);

extern void ata_eh_release(struct ata_port *ap);

extern enum blk_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd);

extern void ata_scsi_error(struct Scsi_Host *host);

extern void ata_eh_fastdrain_timerfn(unsigned long arg);

extern void ata_qc_schedule_eh(struct ata_queued_cmd *qc);

drivers/block/cciss.h

+15 −15
Original line number Diff line number Diff line
@@ -400,27 +400,27 @@ static bool SA5_performant_intr_pending(ctlr_info_t *h) 
}



static struct access_method SA5_access = {

	SA5_submit_command,

	SA5_intr_mask,

	SA5_fifo_full,

	SA5_intr_pending,

	SA5_completed,

	.submit_command = SA5_submit_command,

	.set_intr_mask = SA5_intr_mask,

	.fifo_full = SA5_fifo_full,

	.intr_pending = SA5_intr_pending,

	.command_completed = SA5_completed,

};



static struct access_method SA5B_access = {

        SA5_submit_command,

        SA5B_intr_mask,

        SA5_fifo_full,

        SA5B_intr_pending,

        SA5_completed,

	.submit_command = SA5_submit_command,

	.set_intr_mask = SA5B_intr_mask,

	.fifo_full = SA5_fifo_full,

	.intr_pending = SA5B_intr_pending,

	.command_completed = SA5_completed,

};



static struct access_method SA5_performant_access = {

	SA5_submit_command,

	SA5_performant_intr_mask,

	SA5_fifo_full,

	SA5_performant_intr_pending,

	SA5_performant_completed,

	.submit_command = SA5_submit_command,

	.set_intr_mask = SA5_performant_intr_mask,

	.fifo_full = SA5_fifo_full,

	.intr_pending = SA5_performant_intr_pending,

	.command_completed = SA5_performant_completed,

};



struct board_type {

drivers/infiniband/ulp/iser/iscsi_iser.c

+1 −0
Original line number Diff line number Diff line
@@ -994,6 +994,7 @@ static struct scsi_host_template iscsi_iser_sht = { 
	.change_queue_depth	= scsi_change_queue_depth,

	.sg_tablesize           = ISCSI_ISER_DEF_SG_TABLESIZE,

	.cmd_per_lun            = ISER_DEF_CMD_PER_LUN,

	.eh_timed_out		= iscsi_eh_cmd_timed_out,

	.eh_abort_handler       = iscsi_eh_abort,

	.eh_device_reset_handler= iscsi_eh_device_reset,

	.eh_target_reset_handler = iscsi_eh_recover_target,

CRA Git | Maintained and supported by SUSTech CRA and CCSE