Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (61f06db0) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/scsi/3w-9xxx.c

+13 −44

Original line number	Original line	Diff line number	Diff line
	@@ -149,7 +149,6 @@ static int twa_reset_sequence(TW_Device_Extension *tw_dev, int soft_reset);
	static int twa_scsiop_execute_scsi(TW_Device_Extension tw_dev, int request_id, char cdb, int use_sg, TW_SG_Entry *sglistarg);		static int twa_scsiop_execute_scsi(TW_Device_Extension tw_dev, int request_id, char cdb, int use_sg, TW_SG_Entry *sglistarg);
	static void twa_scsiop_execute_scsi_complete(TW_Device_Extension *tw_dev, int request_id);		static void twa_scsiop_execute_scsi_complete(TW_Device_Extension *tw_dev, int request_id);
	static char twa_string_lookup(twa_message_type table, unsigned int aen_code);		static char twa_string_lookup(twa_message_type table, unsigned int aen_code);
	static void twa_unmap_scsi_data(TW_Device_Extension *tw_dev, int request_id);

	/* Functions */		/* Functions */

	@@ -1340,11 +1339,11 @@ static irqreturn_t twa_interrupt(int irq, void *dev_instance)
	}		}

	/* Now complete the io */		/* Now complete the io */
			scsi_dma_unmap(cmd);
			cmd->scsi_done(cmd);
	tw_dev->state[request_id] = TW_S_COMPLETED;		tw_dev->state[request_id] = TW_S_COMPLETED;
	twa_free_request_id(tw_dev, request_id);		twa_free_request_id(tw_dev, request_id);
	tw_dev->posted_request_count--;		tw_dev->posted_request_count--;
	tw_dev->srb[request_id]->scsi_done(tw_dev->srb[request_id]);
	twa_unmap_scsi_data(tw_dev, request_id);
	}		}

	/* Check for valid status after each drain */		/* Check for valid status after each drain */
	@@ -1402,26 +1401,6 @@ static void twa_load_sgl(TW_Device_Extension tw_dev, TW_Command_Full full_comm
	}		}
	} /* End twa_load_sgl() */		} /* End twa_load_sgl() */

	/* This function will perform a pci-dma mapping for a scatter gather list */
	static int twa_map_scsi_sg_data(TW_Device_Extension *tw_dev, int request_id)
	{
	int use_sg;
	struct scsi_cmnd *cmd = tw_dev->srb[request_id];

	use_sg = scsi_dma_map(cmd);
	if (!use_sg)
	return 0;
	else if (use_sg < 0) {
	TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1c, "Failed to map scatter gather list");
	return 0;
	}

	cmd->SCp.phase = TW_PHASE_SGLIST;
	cmd->SCp.have_data_in = use_sg;

	return use_sg;
	} /* End twa_map_scsi_sg_data() */

	/* This function will poll for a response interrupt of a request */		/* This function will poll for a response interrupt of a request */
	static int twa_poll_response(TW_Device_Extension *tw_dev, int request_id, int seconds)		static int twa_poll_response(TW_Device_Extension *tw_dev, int request_id, int seconds)
	{		{
	@@ -1600,9 +1579,11 @@ static int twa_reset_device_extension(TW_Device_Extension *tw_dev)
	(tw_dev->state[i] != TW_S_INITIAL) &&		(tw_dev->state[i] != TW_S_INITIAL) &&
	(tw_dev->state[i] != TW_S_COMPLETED)) {		(tw_dev->state[i] != TW_S_COMPLETED)) {
	if (tw_dev->srb[i]) {		if (tw_dev->srb[i]) {
	tw_dev->srb[i]->result = (DID_RESET << 16);		struct scsi_cmnd *cmd = tw_dev->srb[i];
	tw_dev->srb[i]->scsi_done(tw_dev->srb[i]);
	twa_unmap_scsi_data(tw_dev, i);		cmd->result = (DID_RESET << 16);
			scsi_dma_unmap(cmd);
			cmd->scsi_done(cmd);
	}		}
	}		}
	}		}
	@@ -1781,21 +1762,18 @@ static int twa_scsi_queue_lck(struct scsi_cmnd SCpnt, void (done)(struct scsi_
	/* Save the scsi command for use by the ISR */		/* Save the scsi command for use by the ISR */
	tw_dev->srb[request_id] = SCpnt;		tw_dev->srb[request_id] = SCpnt;

	/* Initialize phase to zero */
	SCpnt->SCp.phase = TW_PHASE_INITIAL;

	retval = twa_scsiop_execute_scsi(tw_dev, request_id, NULL, 0, NULL);		retval = twa_scsiop_execute_scsi(tw_dev, request_id, NULL, 0, NULL);
	switch (retval) {		switch (retval) {
	case SCSI_MLQUEUE_HOST_BUSY:		case SCSI_MLQUEUE_HOST_BUSY:
			scsi_dma_unmap(SCpnt);
	twa_free_request_id(tw_dev, request_id);		twa_free_request_id(tw_dev, request_id);
	twa_unmap_scsi_data(tw_dev, request_id);
	break;		break;
	case 1:		case 1:
	tw_dev->state[request_id] = TW_S_COMPLETED;
	twa_free_request_id(tw_dev, request_id);
	twa_unmap_scsi_data(tw_dev, request_id);
	SCpnt->result = (DID_ERROR << 16);		SCpnt->result = (DID_ERROR << 16);
			scsi_dma_unmap(SCpnt);
	done(SCpnt);		done(SCpnt);
			tw_dev->state[request_id] = TW_S_COMPLETED;
			twa_free_request_id(tw_dev, request_id);
	retval = 0;		retval = 0;
	}		}
	out:		out:
	@@ -1863,8 +1841,8 @@ static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id,
	command_packet->sg_list[0].address = TW_CPU_TO_SGL(tw_dev->generic_buffer_phys[request_id]);		command_packet->sg_list[0].address = TW_CPU_TO_SGL(tw_dev->generic_buffer_phys[request_id]);
	command_packet->sg_list[0].length = cpu_to_le32(TW_MIN_SGL_LENGTH);		command_packet->sg_list[0].length = cpu_to_le32(TW_MIN_SGL_LENGTH);
	} else {		} else {
	sg_count = twa_map_scsi_sg_data(tw_dev, request_id);		sg_count = scsi_dma_map(srb);
	if (sg_count == 0)		if (sg_count < 0)
	goto out;		goto out;

	scsi_for_each_sg(srb, sg, sg_count, i) {		scsi_for_each_sg(srb, sg, sg_count, i) {
	@@ -1979,15 +1957,6 @@ static char twa_string_lookup(twa_message_type table, unsigned int code)
	return(table[index].text);		return(table[index].text);
	} /* End twa_string_lookup() */		} /* End twa_string_lookup() */

	/* This function will perform a pci-dma unmap */
	static void twa_unmap_scsi_data(TW_Device_Extension *tw_dev, int request_id)
	{
	struct scsi_cmnd *cmd = tw_dev->srb[request_id];

	if (cmd->SCp.phase == TW_PHASE_SGLIST)
	scsi_dma_unmap(cmd);
	} /* End twa_unmap_scsi_data() */

	/* This function gets called when a disk is coming on-line */		/* This function gets called when a disk is coming on-line */
	static int twa_slave_configure(struct scsi_device *sdev)		static int twa_slave_configure(struct scsi_device *sdev)
	{		{

drivers/scsi/3w-9xxx.h

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -324,11 +324,6 @@ static twa_message_type twa_error_table[] = {
	#define TW_CURRENT_DRIVER_BUILD 0		#define TW_CURRENT_DRIVER_BUILD 0
	#define TW_CURRENT_DRIVER_BRANCH 0		#define TW_CURRENT_DRIVER_BRANCH 0

	/* Phase defines */
	#define TW_PHASE_INITIAL 0
	#define TW_PHASE_SINGLE 1
	#define TW_PHASE_SGLIST 2

	/* Misc defines */		/* Misc defines */
	#define TW_9550SX_DRAIN_COMPLETED 0xFFFF		#define TW_9550SX_DRAIN_COMPLETED 0xFFFF
	#define TW_SECTOR_SIZE 512		#define TW_SECTOR_SIZE 512

drivers/scsi/3w-sas.c

+10 −40

Original line number	Original line	Diff line number	Diff line
	@@ -290,26 +290,6 @@ static int twl_post_command_packet(TW_Device_Extension *tw_dev, int request_id)
	return 0;		return 0;
	} /* End twl_post_command_packet() */		} /* End twl_post_command_packet() */

	/* This function will perform a pci-dma mapping for a scatter gather list */
	static int twl_map_scsi_sg_data(TW_Device_Extension *tw_dev, int request_id)
	{
	int use_sg;
	struct scsi_cmnd *cmd = tw_dev->srb[request_id];

	use_sg = scsi_dma_map(cmd);
	if (!use_sg)
	return 0;
	else if (use_sg < 0) {
	TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1, "Failed to map scatter gather list");
	return 0;
	}

	cmd->SCp.phase = TW_PHASE_SGLIST;
	cmd->SCp.have_data_in = use_sg;

	return use_sg;
	} /* End twl_map_scsi_sg_data() */

	/* This function hands scsi cdb's to the firmware */		/* This function hands scsi cdb's to the firmware */
	static int twl_scsiop_execute_scsi(TW_Device_Extension tw_dev, int request_id, char cdb, int use_sg, TW_SG_Entry_ISO *sglistarg)		static int twl_scsiop_execute_scsi(TW_Device_Extension tw_dev, int request_id, char cdb, int use_sg, TW_SG_Entry_ISO *sglistarg)
	{		{
	@@ -357,8 +337,8 @@ static int twl_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id,
	if (!sglistarg) {		if (!sglistarg) {
	/* Map sglist from scsi layer to cmd packet */		/* Map sglist from scsi layer to cmd packet */
	if (scsi_sg_count(srb)) {		if (scsi_sg_count(srb)) {
	sg_count = twl_map_scsi_sg_data(tw_dev, request_id);		sg_count = scsi_dma_map(srb);
	if (sg_count == 0)		if (sg_count <= 0)
	goto out;		goto out;

	scsi_for_each_sg(srb, sg, sg_count, i) {		scsi_for_each_sg(srb, sg, sg_count, i) {
	@@ -1102,15 +1082,6 @@ static int twl_initialize_device_extension(TW_Device_Extension *tw_dev)
	return retval;		return retval;
	} /* End twl_initialize_device_extension() */		} /* End twl_initialize_device_extension() */

	/* This function will perform a pci-dma unmap */
	static void twl_unmap_scsi_data(TW_Device_Extension *tw_dev, int request_id)
	{
	struct scsi_cmnd *cmd = tw_dev->srb[request_id];

	if (cmd->SCp.phase == TW_PHASE_SGLIST)
	scsi_dma_unmap(cmd);
	} /* End twl_unmap_scsi_data() */

	/* This function will handle attention interrupts */		/* This function will handle attention interrupts */
	static int twl_handle_attention_interrupt(TW_Device_Extension *tw_dev)		static int twl_handle_attention_interrupt(TW_Device_Extension *tw_dev)
	{		{
	@@ -1251,11 +1222,11 @@ static irqreturn_t twl_interrupt(int irq, void *dev_instance)
	}		}

	/* Now complete the io */		/* Now complete the io */
			scsi_dma_unmap(cmd);
			cmd->scsi_done(cmd);
	tw_dev->state[request_id] = TW_S_COMPLETED;		tw_dev->state[request_id] = TW_S_COMPLETED;
	twl_free_request_id(tw_dev, request_id);		twl_free_request_id(tw_dev, request_id);
	tw_dev->posted_request_count--;		tw_dev->posted_request_count--;
	tw_dev->srb[request_id]->scsi_done(tw_dev->srb[request_id]);
	twl_unmap_scsi_data(tw_dev, request_id);
	}		}

	/* Check for another response interrupt */		/* Check for another response interrupt */
	@@ -1400,10 +1371,12 @@ static int twl_reset_device_extension(TW_Device_Extension *tw_dev, int ioctl_res
	if ((tw_dev->state[i] != TW_S_FINISHED) &&		if ((tw_dev->state[i] != TW_S_FINISHED) &&
	(tw_dev->state[i] != TW_S_INITIAL) &&		(tw_dev->state[i] != TW_S_INITIAL) &&
	(tw_dev->state[i] != TW_S_COMPLETED)) {		(tw_dev->state[i] != TW_S_COMPLETED)) {
	if (tw_dev->srb[i]) {		struct scsi_cmnd *cmd = tw_dev->srb[i];
	tw_dev->srb[i]->result = (DID_RESET << 16);
	tw_dev->srb[i]->scsi_done(tw_dev->srb[i]);		if (cmd) {
	twl_unmap_scsi_data(tw_dev, i);		cmd->result = (DID_RESET << 16);
			scsi_dma_unmap(cmd);
			cmd->scsi_done(cmd);
	}		}
	}		}
	}		}
	@@ -1507,9 +1480,6 @@ static int twl_scsi_queue_lck(struct scsi_cmnd SCpnt, void (done)(struct scsi_
	/* Save the scsi command for use by the ISR */		/* Save the scsi command for use by the ISR */
	tw_dev->srb[request_id] = SCpnt;		tw_dev->srb[request_id] = SCpnt;

	/* Initialize phase to zero */
	SCpnt->SCp.phase = TW_PHASE_INITIAL;

	retval = twl_scsiop_execute_scsi(tw_dev, request_id, NULL, 0, NULL);		retval = twl_scsiop_execute_scsi(tw_dev, request_id, NULL, 0, NULL);
	if (retval) {		if (retval) {
	tw_dev->state[request_id] = TW_S_COMPLETED;		tw_dev->state[request_id] = TW_S_COMPLETED;

drivers/scsi/3w-sas.h

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -103,10 +103,6 @@ static char *twl_aen_severity_table[] =
	#define TW_CURRENT_DRIVER_BUILD 0		#define TW_CURRENT_DRIVER_BUILD 0
	#define TW_CURRENT_DRIVER_BRANCH 0		#define TW_CURRENT_DRIVER_BRANCH 0

	/* Phase defines */
	#define TW_PHASE_INITIAL 0
	#define TW_PHASE_SGLIST 2

	/* Misc defines */		/* Misc defines */
	#define TW_SECTOR_SIZE 512		#define TW_SECTOR_SIZE 512
	#define TW_MAX_UNITS 32		#define TW_MAX_UNITS 32

drivers/scsi/3w-xxxx.c

+6 −36

Original line number	Original line	Diff line number	Diff line
	@@ -1271,32 +1271,6 @@ static int tw_initialize_device_extension(TW_Device_Extension *tw_dev)
	return 0;		return 0;
	} /* End tw_initialize_device_extension() */		} /* End tw_initialize_device_extension() */

	static int tw_map_scsi_sg_data(struct pci_dev pdev, struct scsi_cmnd cmd)
	{
	int use_sg;

	dprintk(KERN_WARNING "3w-xxxx: tw_map_scsi_sg_data()\n");

	use_sg = scsi_dma_map(cmd);
	if (use_sg < 0) {
	printk(KERN_WARNING "3w-xxxx: tw_map_scsi_sg_data(): pci_map_sg() failed.\n");
	return 0;
	}

	cmd->SCp.phase = TW_PHASE_SGLIST;
	cmd->SCp.have_data_in = use_sg;

	return use_sg;
	} /* End tw_map_scsi_sg_data() */

	static void tw_unmap_scsi_data(struct pci_dev pdev, struct scsi_cmnd cmd)
	{
	dprintk(KERN_WARNING "3w-xxxx: tw_unmap_scsi_data()\n");

	if (cmd->SCp.phase == TW_PHASE_SGLIST)
	scsi_dma_unmap(cmd);
	} /* End tw_unmap_scsi_data() */

	/* This function will reset a device extension */		/* This function will reset a device extension */
	static int tw_reset_device_extension(TW_Device_Extension *tw_dev)		static int tw_reset_device_extension(TW_Device_Extension *tw_dev)
	{		{
	@@ -1319,8 +1293,8 @@ static int tw_reset_device_extension(TW_Device_Extension *tw_dev)
	srb = tw_dev->srb[i];		srb = tw_dev->srb[i];
	if (srb != NULL) {		if (srb != NULL) {
	srb->result = (DID_RESET << 16);		srb->result = (DID_RESET << 16);
	tw_dev->srb[i]->scsi_done(tw_dev->srb[i]);		scsi_dma_unmap(srb);
	tw_unmap_scsi_data(tw_dev->tw_pci_dev, tw_dev->srb[i]);		srb->scsi_done(srb);
	}		}
	}		}
	}		}
	@@ -1767,8 +1741,8 @@ static int tw_scsiop_read_write(TW_Device_Extension *tw_dev, int request_id)
	command_packet->byte8.io.lba = lba;		command_packet->byte8.io.lba = lba;
	command_packet->byte6.block_count = num_sectors;		command_packet->byte6.block_count = num_sectors;

	use_sg = tw_map_scsi_sg_data(tw_dev->tw_pci_dev, tw_dev->srb[request_id]);		use_sg = scsi_dma_map(srb);
	if (!use_sg)		if (use_sg <= 0)
	return 1;		return 1;

	scsi_for_each_sg(tw_dev->srb[request_id], sg, use_sg, i) {		scsi_for_each_sg(tw_dev->srb[request_id], sg, use_sg, i) {
	@@ -1955,9 +1929,6 @@ static int tw_scsi_queue_lck(struct scsi_cmnd SCpnt, void (done)(struct scsi_c
	/* Save the scsi command for use by the ISR */		/* Save the scsi command for use by the ISR */
	tw_dev->srb[request_id] = SCpnt;		tw_dev->srb[request_id] = SCpnt;

	/* Initialize phase to zero */
	SCpnt->SCp.phase = TW_PHASE_INITIAL;

	switch (*command) {		switch (*command) {
	case READ_10:		case READ_10:
	case READ_6:		case READ_6:
	@@ -2185,12 +2156,11 @@ static irqreturn_t tw_interrupt(int irq, void *dev_instance)

	/* Now complete the io */		/* Now complete the io */
	if ((error != TW_ISR_DONT_COMPLETE)) {		if ((error != TW_ISR_DONT_COMPLETE)) {
			scsi_dma_unmap(tw_dev->srb[request_id]);
			tw_dev->srb[request_id]->scsi_done(tw_dev->srb[request_id]);
	tw_dev->state[request_id] = TW_S_COMPLETED;		tw_dev->state[request_id] = TW_S_COMPLETED;
	tw_state_request_finish(tw_dev, request_id);		tw_state_request_finish(tw_dev, request_id);
	tw_dev->posted_request_count--;		tw_dev->posted_request_count--;
	tw_dev->srb[request_id]->scsi_done(tw_dev->srb[request_id]);

	tw_unmap_scsi_data(tw_dev->tw_pci_dev, tw_dev->srb[request_id]);
	}		}
	}		}