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

Commit d04baa15 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-misc-2.6 

SCSI updates for post 3.2 merge window

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (67 commits)
  [SCSI] lpfc 8.3.28: Update driver version to 8.3.28
  [SCSI] lpfc 8.3.28: Add Loopback support for SLI4 adapters
  [SCSI] lpfc 8.3.28: Critical Miscellaneous fixes
  [SCSI] Lpfc 8.3.28: FC and SCSI Discovery Fixes
  [SCSI] lpfc 8.3.28: Add support for ABTS failure handling
  [SCSI] lpfc 8.3.28: SLI fixes and added SLI4 support
  [SCSI] lpfc 8.3.28: Miscellaneous fixes in sysfs and mgmt interfaces
  [SCSI] mpt2sas: Removed redundant calling of _scsih_probe_devices() from _scsih_probe
  [SCSI] mac_scsi: Remove obsolete IRQ_FLG_* users
  [SCSI] qla4xxx: Update driver version to 5.02.00-k10
  [SCSI] qla4xxx: check for FW alive before calling chip_reset
  [SCSI] qla4xxx: Fix qla4xxx_dump_buffer to dump buffer correctly
  [SCSI] qla4xxx: Fix the IDC locking mechanism
  [SCSI] qla4xxx: Wait for disable_acb before doing set_acb
  [SCSI] qla4xxx: Don't recover adapter if device state is FAILED
  [SCSI] qla4xxx: fix call trace on rmmod with ql4xdontresethba=1
  [SCSI] qla4xxx: Fix CPU lockups when ql4xdontresethba set
  [SCSI] qla4xxx: Perform context resets in case of context failures.
  [SCSI] iscsi class: export pid of process that created
  [SCSI] mpt2sas: Remove unused duplicate diag_buffer_enable param
  ...
parents 88266917 5c41dc3a

drivers/message/fusion/lsi/mpi_cnfg.h

+1 −0
Original line number Diff line number Diff line
@@ -583,6 +583,7 @@ typedef struct _MSG_CONFIG_REPLY 
#define MPI_MANUFACTPAGE_DEVID_SAS1066E             (0x005A)

#define MPI_MANUFACTPAGE_DEVID_SAS1068              (0x0054)

#define MPI_MANUFACTPAGE_DEVID_SAS1068E             (0x0058)

#define MPI_MANUFACTPAGE_DEVID_SAS1068_820XELP      (0x0059)

#define MPI_MANUFACTPAGE_DEVID_SAS1078              (0x0062)

drivers/message/fusion/mptbase.c

+4 −3
Original line number Diff line number Diff line
@@ -115,7 +115,8 @@ module_param(mpt_fwfault_debug, int, 0600); 
MODULE_PARM_DESC(mpt_fwfault_debug,

		 "Enable detection of Firmware fault and halt Firmware on fault - (default=0)");



static char	MptCallbacksName[MPT_MAX_PROTOCOL_DRIVERS][50];

static char	MptCallbacksName[MPT_MAX_PROTOCOL_DRIVERS]

				[MPT_MAX_CALLBACKNAME_LEN+1];



#ifdef MFCNT

static int mfcounter = 0;
@@ -717,8 +718,8 @@ mpt_register(MPT_CALLBACK cbfunc, MPT_DRIVER_CLASS dclass, char *func_name) 
			MptDriverClass[cb_idx] = dclass;

			MptEvHandlers[cb_idx] = NULL;

			last_drv_idx = cb_idx;

			memcpy(MptCallbacksName[cb_idx], func_name,

			    strlen(func_name) > 50 ? 50 : strlen(func_name));

			strlcpy(MptCallbacksName[cb_idx], func_name,

				MPT_MAX_CALLBACKNAME_LEN+1);

			break;

		}

	}

drivers/message/fusion/mptbase.h

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ 
 */

#define MPT_MAX_ADAPTERS		18

#define MPT_MAX_PROTOCOL_DRIVERS	16

#define MPT_MAX_CALLBACKNAME_LEN	49

#define MPT_MAX_BUS			1	/* Do not change */

#define MPT_MAX_FC_DEVICES		255

#define MPT_MAX_SCSI_DEVICES		16

drivers/message/fusion/mptsas.c

+2 −0
Original line number Diff line number Diff line
@@ -5376,6 +5376,8 @@ static struct pci_device_id mptsas_pci_table[] = { 
		PCI_ANY_ID, PCI_ANY_ID },

	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1078,

		PCI_ANY_ID, PCI_ANY_ID },

	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068_820XELP,

		PCI_ANY_ID, PCI_ANY_ID },

	{0}	/* Terminating entry */

};

MODULE_DEVICE_TABLE(pci, mptsas_pci_table);

drivers/scsi/be2iscsi/be_main.c

+3 −2
Original line number Diff line number Diff line
@@ -1105,7 +1105,6 @@ be_complete_io(struct beiscsi_conn *beiscsi_conn, 
	struct be_status_bhs *sts_bhs =

				(struct be_status_bhs *)io_task->cmd_bhs;

	struct iscsi_conn *conn = beiscsi_conn->conn;

	unsigned int sense_len;

	unsigned char *sense;

	u32 resid = 0, exp_cmdsn, max_cmdsn;

	u8 rsp, status, flags;
@@ -1153,9 +1152,11 @@ be_complete_io(struct beiscsi_conn *beiscsi_conn, 
	}



	if (status == SAM_STAT_CHECK_CONDITION) {

		u16 sense_len;

		unsigned short *slen = (unsigned short *)sts_bhs->sense_info;



		sense = sts_bhs->sense_info + sizeof(unsigned short);

		sense_len =  cpu_to_be16(*slen);

		sense_len = be16_to_cpu(*slen);

		memcpy(task->sc->sense_buffer, sense,

		       min_t(u16, sense_len, SCSI_SENSE_BUFFERSIZE));

	}