Commit af995383 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 more SCSI updates from James Bottomley:
 "The set of core changes here is Christoph's submission path cleanups.

  These introduced a couple of regressions when first proposed so they
  got held over from the initial merge window pull request to give more
  testing time, which they've now had and Syzbot has confirmed the
  regression it detected is fixed.

  The other main changes are two driver updates (arcmsr, pm80xx) and
  assorted minor clean ups"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (38 commits)
  scsi: qla2xxx: Fix return of uninitialized value in rval
  scsi: core: Set sc_data_direction to DMA_NONE for no-transfer commands
  scsi: sr: Initialize ->cmd_len
  scsi: arcmsr: Update driver version to v1.50.00.02-20200819
  scsi: arcmsr: Add support for ARC-1886 series RAID controllers
  scsi: arcmsr: Fix device hot-plug monitoring timer stop
  scsi: arcmsr: Remove unnecessary syntax
  scsi: pm80xx: Driver version update
  scsi: pm80xx: Increase the number of outstanding I/O supported to 1024
  scsi: pm80xx: Remove DMA memory allocation for ccb and device structures
  scsi: pm80xx: Increase number of supported queues
  scsi: sym53c8xx_2: Fix sizeof() mismatch
  scsi: isci: Fix a typo in a comment
  scsi: qla4xxx: Fix inconsistent format argument type
  scsi: myrb: Fix inconsistent format argument types
  scsi: myrb: Remove redundant assignment to variable timeout
  scsi: bfa: Fix error return in bfad_pci_init()
  scsi: fcoe: Simplify the return expression of fcoe_sysfs_setup()
  scsi: snic: Simplify the return expression of svnic_cq_alloc()
  scsi: fnic: Simplify the return expression of vnic_wq_copy_alloc()
  ...
parents bd7e8c99 1ef16a40

drivers/scsi/53c700.c

+0 −4
Original line number Diff line number Diff line
@@ -1506,10 +1506,8 @@ NCR_700_intr(int irq, void *dev_id) 
		__u8 sstat0 = 0, dstat = 0;

		__u32 dsp;

		struct scsi_cmnd *SCp = hostdata->cmd;

		enum NCR_700_Host_State state;



		handled = 1;

		state = hostdata->state;

		SCp = hostdata->cmd;



		if(istat & SCSI_INT_PENDING) {
@@ -1760,7 +1758,6 @@ NCR_700_queuecommand_lck(struct scsi_cmnd *SCp, void (*done)(struct scsi_cmnd *) 
	struct NCR_700_Host_Parameters *hostdata = 

		(struct NCR_700_Host_Parameters *)SCp->device->host->hostdata[0];

	__u32 move_ins;

	enum dma_data_direction direction;

	struct NCR_700_command_slot *slot;



	if(hostdata->command_slot_count >= NCR_700_COMMAND_SLOTS_PER_HOST) {
@@ -1877,7 +1874,6 @@ NCR_700_queuecommand_lck(struct scsi_cmnd *SCp, void (*done)(struct scsi_cmnd *) 
	}



	/* now build the scatter gather list */

	direction = SCp->sc_data_direction;

	if(move_ins != 0) {

		int i;

		int sg_count;

drivers/scsi/arcmsr/arcmsr.h

+99 −3
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ struct device_attribute; 
#define ARCMSR_MAX_OUTSTANDING_CMD	1024

#define ARCMSR_DEFAULT_OUTSTANDING_CMD	128

#define ARCMSR_MIN_OUTSTANDING_CMD	32

#define ARCMSR_DRIVER_VERSION		"v1.40.00.10-20190116"

#define ARCMSR_DRIVER_VERSION		"v1.50.00.02-20200819"

#define ARCMSR_SCSI_INITIATOR_ID	255

#define ARCMSR_MAX_XFER_SECTORS		512

#define ARCMSR_MAX_XFER_SECTORS_B	4096
@@ -80,6 +80,7 @@ struct device_attribute; 
#ifndef PCI_DEVICE_ID_ARECA_1884

#define PCI_DEVICE_ID_ARECA_1884	0x1884

#endif

#define PCI_DEVICE_ID_ARECA_1886	0x188A

#define	ARCMSR_HOURS			(1000 * 60 * 60 * 4)

#define	ARCMSR_MINUTES			(1000 * 60 * 60)

/*
@@ -436,6 +437,21 @@ struct FIRMWARE_INFO 
#define ARCMSR_HBEMU_DOORBELL_SYNC		0x100

#define ARCMSR_ARC188X_RESET_ADAPTER		0x00000004

#define ARCMSR_ARC1884_DiagWrite_ENABLE		0x00000080



/*

*******************************************************************************

**                SPEC. for Areca Type F adapter

*******************************************************************************

*/

#define ARCMSR_SIGNATURE_1886			0x188617D3

// Doorbell and interrupt definition are same as Type E adapter

/* ARC-1886 doorbell sync */

#define ARCMSR_HBFMU_DOORBELL_SYNC		0x100

//set host rw buffer physical address at inbound message 0, 1 (low,high)

#define ARCMSR_HBFMU_DOORBELL_SYNC1		0x300

#define ARCMSR_HBFMU_MESSAGE_FIRMWARE_OK	0x80000000

#define ARCMSR_HBFMU_MESSAGE_NO_VOLUME_CHANGE	0x20000000



/*

*******************************************************************************

**    ARECA SCSI COMMAND DESCRIPTOR BLOCK size 0x1F8 (504)
@@ -720,6 +736,80 @@ struct MessageUnit_E{ 
	uint32_t	msgcode_rwbuffer[256];			/*2200 23FF*/

};



/*

*********************************************************************

**     Messaging Unit (MU) of Type F processor(LSI)

*********************************************************************

*/

struct MessageUnit_F {

	uint32_t	iobound_doorbell;			/*0000 0003*/

	uint32_t	write_sequence_3xxx;			/*0004 0007*/

	uint32_t	host_diagnostic_3xxx;			/*0008 000B*/

	uint32_t	posted_outbound_doorbell;		/*000C 000F*/

	uint32_t	master_error_attribute;			/*0010 0013*/

	uint32_t	master_error_address_low;		/*0014 0017*/

	uint32_t	master_error_address_high;		/*0018 001B*/

	uint32_t	hcb_size;				/*001C 001F*/

	uint32_t	inbound_doorbell;			/*0020 0023*/

	uint32_t	diagnostic_rw_data;			/*0024 0027*/

	uint32_t	diagnostic_rw_address_low;		/*0028 002B*/

	uint32_t	diagnostic_rw_address_high;		/*002C 002F*/

	uint32_t	host_int_status;			/*0030 0033*/

	uint32_t	host_int_mask;				/*0034 0037*/

	uint32_t	dcr_data;				/*0038 003B*/

	uint32_t	dcr_address;				/*003C 003F*/

	uint32_t	inbound_queueport;			/*0040 0043*/

	uint32_t	outbound_queueport;			/*0044 0047*/

	uint32_t	hcb_pci_address_low;			/*0048 004B*/

	uint32_t	hcb_pci_address_high;			/*004C 004F*/

	uint32_t	iop_int_status;				/*0050 0053*/

	uint32_t	iop_int_mask;				/*0054 0057*/

	uint32_t	iop_inbound_queue_port;			/*0058 005B*/

	uint32_t	iop_outbound_queue_port;		/*005C 005F*/

	uint32_t	inbound_free_list_index;		/*0060 0063*/

	uint32_t	inbound_post_list_index;		/*0064 0067*/

	uint32_t	reply_post_producer_index;		/*0068 006B*/

	uint32_t	reply_post_consumer_index;		/*006C 006F*/

	uint32_t	inbound_doorbell_clear;			/*0070 0073*/

	uint32_t	i2o_message_unit_control;		/*0074 0077*/

	uint32_t	last_used_message_source_address_low;	/*0078 007B*/

	uint32_t	last_used_message_source_address_high;	/*007C 007F*/

	uint32_t	pull_mode_data_byte_count[4];		/*0080 008F*/

	uint32_t	message_dest_address_index;		/*0090 0093*/

	uint32_t	done_queue_not_empty_int_counter_timer;	/*0094 0097*/

	uint32_t	utility_A_int_counter_timer;		/*0098 009B*/

	uint32_t	outbound_doorbell;			/*009C 009F*/

	uint32_t	outbound_doorbell_clear;		/*00A0 00A3*/

	uint32_t	message_source_address_index;		/*00A4 00A7*/

	uint32_t	message_done_queue_index;		/*00A8 00AB*/

	uint32_t	reserved0;				/*00AC 00AF*/

	uint32_t	inbound_msgaddr0;			/*00B0 00B3*/

	uint32_t	inbound_msgaddr1;			/*00B4 00B7*/

	uint32_t	outbound_msgaddr0;			/*00B8 00BB*/

	uint32_t	outbound_msgaddr1;			/*00BC 00BF*/

	uint32_t	inbound_queueport_low;			/*00C0 00C3*/

	uint32_t	inbound_queueport_high;			/*00C4 00C7*/

	uint32_t	outbound_queueport_low;			/*00C8 00CB*/

	uint32_t	outbound_queueport_high;		/*00CC 00CF*/

	uint32_t	iop_inbound_queue_port_low;		/*00D0 00D3*/

	uint32_t	iop_inbound_queue_port_high;		/*00D4 00D7*/

	uint32_t	iop_outbound_queue_port_low;		/*00D8 00DB*/

	uint32_t	iop_outbound_queue_port_high;		/*00DC 00DF*/

	uint32_t	message_dest_queue_port_low;		/*00E0 00E3*/

	uint32_t	message_dest_queue_port_high;		/*00E4 00E7*/

	uint32_t	last_used_message_dest_address_low;	/*00E8 00EB*/

	uint32_t	last_used_message_dest_address_high;	/*00EC 00EF*/

	uint32_t	message_done_queue_base_address_low;	/*00F0 00F3*/

	uint32_t	message_done_queue_base_address_high;	/*00F4 00F7*/

	uint32_t	host_diagnostic;			/*00F8 00FB*/

	uint32_t	write_sequence;				/*00FC 00FF*/

	uint32_t	reserved1[46];				/*0100 01B7*/

	uint32_t	reply_post_producer_index1;		/*01B8 01BB*/

	uint32_t	reply_post_consumer_index1;		/*01BC 01BF*/

};



#define	MESG_RW_BUFFER_SIZE	(256 * 3)



typedef struct deliver_completeQ {

	uint16_t	cmdFlag;

	uint16_t	cmdSMID;
@@ -739,6 +829,7 @@ struct AdapterControlBlock 
#define ACB_ADAPTER_TYPE_C		0x00000002	/* hbc L IOP */

#define ACB_ADAPTER_TYPE_D		0x00000003	/* hbd M IOP */

#define ACB_ADAPTER_TYPE_E		0x00000004	/* hba L IOP */

#define ACB_ADAPTER_TYPE_F		0x00000005	/* hba L IOP */

	u32			ioqueue_size;

	struct pci_dev *	pdev;

	struct Scsi_Host *	host;
@@ -760,10 +851,16 @@ struct AdapterControlBlock 
		struct MessageUnit_C __iomem *pmuC;

		struct MessageUnit_D 	*pmuD;

		struct MessageUnit_E __iomem *pmuE;

		struct MessageUnit_F __iomem *pmuF;

	};

	/* message unit ATU inbound base address0 */

	void __iomem		*mem_base0;

	void __iomem		*mem_base1;

	//0x000 - COMPORT_IN  (Host sent to ROC)

	uint32_t		*message_wbuffer;

	//0x100 - COMPORT_OUT (ROC sent to Host)

	uint32_t		*message_rbuffer;

	uint32_t		*msgcode_rwbuffer;	//0x200 - BIOS_AREA

	uint32_t		acb_flags;

	u16			dev_id;

	uint8_t			adapter_index;
@@ -836,8 +933,6 @@ struct AdapterControlBlock 
#define	FW_NORMAL			0x0000

#define	FW_BOG				0x0001

#define	FW_DEADLOCK			0x0010

	atomic_t 		rq_map_token;

	atomic_t		ante_token_value;

	uint32_t		maxOutstanding;

	int			vector_count;

	uint32_t		maxFreeCCB;
@@ -848,6 +943,7 @@ struct AdapterControlBlock 
	uint32_t		out_doorbell;

	uint32_t		completionQ_entry;

	pCompletion_Q		pCompletionQ;

	uint32_t		completeQ_size;

};/* HW_DEVICE_EXTENSION */

/*

*******************************************************************************

drivers/scsi/arcmsr/arcmsr_hba.c

+290 −87

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/bfa/bfad.c

+1 −0
Original line number Diff line number Diff line
@@ -749,6 +749,7 @@ bfad_pci_init(struct pci_dev *pdev, struct bfad_s *bfad) 


	if (bfad->pci_bar0_kva == NULL) {

		printk(KERN_ERR "Fail to map bar0\n");

		rc = -ENODEV;

		goto out_release_region;

	}

drivers/scsi/dc395x.c

+1 −24
Original line number Diff line number Diff line
@@ -4721,30 +4721,7 @@ static struct pci_driver dc395x_driver = { 
	.probe          = dc395x_init_one,

	.remove         = dc395x_remove_one,

};





/**

 * dc395x_module_init - Module initialization function

 *

 * Used by both module and built-in driver to initialise this driver.

 **/

static int __init dc395x_module_init(void)

{

	return pci_register_driver(&dc395x_driver);

}





/**

 * dc395x_module_exit - Module cleanup function.

 **/

static void __exit dc395x_module_exit(void)

{

	pci_unregister_driver(&dc395x_driver);

}





module_init(dc395x_module_init);

module_exit(dc395x_module_exit);

module_pci_driver(dc395x_driver);



MODULE_AUTHOR("C.L. Huang / Erich Chen / Kurt Garloff");

MODULE_DESCRIPTION("SCSI host adapter driver for Tekram TRM-S1040 based adapters: Tekram DC395 and DC315 series");

CRA Git | Maintained and supported by SUSTech CRA and CCSE