Commit 532df6f3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (277 commits)
  [SCSI] isci: fix checkpatch errors
  isci: Device reset should request sas_phy_reset(phy, true)
  isci: pare back error messsages
  isci: cleanup silicon revision detection
  isci: merge scu_unsolicited_frame.h into unsolicited_frame_control.h
  isci: merge sata.[ch] into request.c
  isci: kill 'get/set' macros
  isci: retire scic_sds_ and scic_ prefixes
  isci: unify isci_host and scic_sds_controller
  isci: unify isci_remote_device and scic_sds_remote_device
  isci: unify isci_port and scic_sds_port
  isci: fix scic_sds_remote_device_terminate_requests
  isci: unify isci_phy and scic_sds_phy
  isci: unify isci_request and scic_sds_request
  isci: rename / clean up scic_sds_stp_request
  isci: preallocate requests
  isci: combine request flags
  isci: unify can_queue tracking on the tci_pool, uplevel tag assignment
  isci: Terminate dev requests on FIS err bit rx in NCQ
  isci: fix frame received locking
  ...
parents fc52693f a5ec7f86

drivers/scsi/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -830,6 +830,19 @@ config SCSI_GDTH 
	  To compile this driver as a module, choose M here: the

	  module will be called gdth.



config SCSI_ISCI

	tristate "Intel(R) C600 Series Chipset SAS Controller"

	depends on PCI && SCSI

	depends on X86

	# (temporary): known alpha quality driver

	depends on EXPERIMENTAL

	select SCSI_SAS_LIBSAS

	---help---

	  This driver supports the 6Gb/s SAS capabilities of the storage

	  control unit found in the Intel(R) C600 series chipset.



	  The experimental tag will be removed after the driver exits alpha



config SCSI_GENERIC_NCR5380

	tristate "Generic NCR5380/53c400 SCSI PIO support"

	depends on ISA && SCSI

drivers/scsi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ obj-$(CONFIG_SCSI_AACRAID) += aacraid/ 
obj-$(CONFIG_SCSI_AIC7XXX_OLD)	+= aic7xxx_old.o

obj-$(CONFIG_SCSI_AIC94XX)	+= aic94xx/

obj-$(CONFIG_SCSI_PM8001)	+= pm8001/

obj-$(CONFIG_SCSI_ISCI)		+= isci/

obj-$(CONFIG_SCSI_IPS)		+= ips.o

obj-$(CONFIG_SCSI_FD_MCS)	+= fd_mcs.o

obj-$(CONFIG_SCSI_FUTURE_DOMAIN)+= fdomain.o

drivers/scsi/hpsa.c

+11 −5
Original line number Diff line number Diff line
@@ -1037,6 +1037,7 @@ static void complete_scsi_command(struct CommandList *cp) 
	unsigned char sense_key;

	unsigned char asc;      /* additional sense code */

	unsigned char ascq;     /* additional sense code qualifier */

	unsigned long sense_data_size;



	ei = cp->err_info;

	cmd = (struct scsi_cmnd *) cp->scsi_cmd;
@@ -1051,10 +1052,14 @@ static void complete_scsi_command(struct CommandList *cp) 
	cmd->result |= ei->ScsiStatus;



	/* copy the sense data whether we need to or not. */

	memcpy(cmd->sense_buffer, ei->SenseInfo,

		ei->SenseLen > SCSI_SENSE_BUFFERSIZE ?

			SCSI_SENSE_BUFFERSIZE :

			ei->SenseLen);

	if (SCSI_SENSE_BUFFERSIZE < sizeof(ei->SenseInfo))

		sense_data_size = SCSI_SENSE_BUFFERSIZE;

	else

		sense_data_size = sizeof(ei->SenseInfo);

	if (ei->SenseLen < sense_data_size)

		sense_data_size = ei->SenseLen;



	memcpy(cmd->sense_buffer, ei->SenseInfo, sense_data_size);

	scsi_set_resid(cmd, ei->ResidualCnt);



	if (ei->CommandStatus == 0) {
@@ -2580,6 +2585,7 @@ static int hpsa_passthru_ioctl(struct ctlr_info *h, void __user *argp) 
		c->SG[0].Ext = 0; /* we are not chaining*/

	}

	hpsa_scsi_do_simple_cmd_core(h, c);

	if (iocommand.buf_size > 0)

		hpsa_pci_unmap(h->pdev, c, 1, PCI_DMA_BIDIRECTIONAL);

	check_ioctl_unit_attention(h, c);

drivers/scsi/ibmvscsi/ibmvfc.c

+2 −2
Original line number Diff line number Diff line
@@ -4306,7 +4306,7 @@ static void ibmvfc_do_work(struct ibmvfc_host *vhost) 
		spin_lock_irqsave(vhost->host->host_lock, flags);

		if (rc == H_CLOSED)

			vio_enable_interrupts(to_vio_dev(vhost->dev));

		else if (rc || (rc = ibmvfc_send_crq_init(vhost)) ||

		if (rc || (rc = ibmvfc_send_crq_init(vhost)) ||

		    (rc = vio_enable_interrupts(to_vio_dev(vhost->dev)))) {

			ibmvfc_link_down(vhost, IBMVFC_LINK_DEAD);

			dev_err(vhost->dev, "Error after reset (rc=%d)\n", rc);

drivers/scsi/isci/Makefile

0 → 100644
+8 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_SCSI_ISCI) += isci.o

isci-objs := init.o phy.o request.o \

	     remote_device.o port.o \

	     host.o task.o probe_roms.o \

	     remote_node_context.o \

	     remote_node_table.o \

	     unsolicited_frame_control.o \

	     port_config.o \

CRA Git | Maintained and supported by SUSTech CRA and CCSE