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

Commit f7d57e42 authored Jul 03, 2006 by Linus Torvalds

Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (57 commits)
  [SCSI] fix error handling in scsi_io_completion
  [SCSI] qla1280: fix section mismatch warnings
  [SCSI] mptsas: eliminate ghost devices
  [SCSI] qla2xxx: make some more functions static
  [SCSI] small whitespace cleanup for qlogic driver
  [SCSI] mptbase: mpt_interrupt should return IRQ_NONE
  [SCSI] mptsas: make two functions static
  [SCSI] sg.c: Fix bad error handling in
  [SCSI] 53c700: fix breakage caused by the autosense update
  [SCSI] iscsi: add async notification of session events
  [SCSI] iscsi: pass target nr to session creation
  [SCSI] iscsi: break up session creation into two stages
  [SCSI] iscsi: rm channel usage from iscsi
  [SCSI] iscsi: fix session refcouting
  [SCSI] iscsi: convert iscsi_tcp to new set/get param fns
  [SCSI] iscsi: convert iser to new set/get param fns
  [SCSI] iscsi: fixup set/get param functions
  [SCSI] iscsi: add target discvery event to transport class
  [SCSI] st: remove unused st_buffer.in_use
  [SCSI] atp870u: reduce huge stack usage
  ...

parents 51bece91 c4e00fac

Documentation/scsi/ChangeLog.megaraid_sas

+16 −0

Original line number	Diff line number	Diff line

		1 Release Date : Sun May 14 22:49:52 PDT 2006 - Sumant Patro <Sumant.Patro@lsil.com>
		2 Current Version : 00.00.03.01
		3 Older Version : 00.00.02.04

		i. Added support for ZCR controller.

		New device id 0x413 added.

		ii. Bug fix : Disable controller interrupt before firing INIT cmd to FW.

		Interrupt is enabled after required initialization is over.
		This is done to ensure that driver is ready to handle interrupts when
		it is generated by the controller.

		-Sumant Patro <Sumant.Patro@lsil.com>

		1 Release Date : Wed Feb 03 14:31:44 PST 2006 - Sumant Patro <Sumant.Patro@lsil.com>
		2 Current Version : 00.00.02.04
		3 Older Version : 00.00.02.04

drivers/infiniband/ulp/iser/iscsi_iser.c

+17 −121

Original line number	Diff line number	Diff line
		@@ -437,159 +437,50 @@ iscsi_iser_session_create(struct iscsi_transport *iscsit,
		}

		static int
		iscsi_iser_conn_set_param(struct iscsi_cls_conn *cls_conn,
		enum iscsi_param param, uint32_t value)
		iscsi_iser_set_param(struct iscsi_cls_conn *cls_conn,
		enum iscsi_param param, char *buf, int buflen)
		{
		struct iscsi_conn *conn = cls_conn->dd_data;
		struct iscsi_session *session = conn->session;

		spin_lock_bh(&session->lock);
		if (conn->c_stage != ISCSI_CONN_INITIAL_STAGE &&
		conn->stop_stage != STOP_CONN_RECOVER) {
		printk(KERN_ERR "iscsi_iser: can not change parameter [%d]\n",
		param);
		spin_unlock_bh(&session->lock);
		return 0;
		}
		spin_unlock_bh(&session->lock);
		int value;

		switch (param) {
		case ISCSI_PARAM_MAX_RECV_DLENGTH:
		/* TBD */
		break;
		case ISCSI_PARAM_MAX_XMIT_DLENGTH:
		conn->max_xmit_dlength = value;
		break;
		case ISCSI_PARAM_HDRDGST_EN:
		sscanf(buf, "%d", &value);
		if (value) {
		printk(KERN_ERR "DataDigest wasn't negotiated to None");
		return -EPROTO;
		}
		break;
		case ISCSI_PARAM_DATADGST_EN:
		sscanf(buf, "%d", &value);
		if (value) {
		printk(KERN_ERR "DataDigest wasn't negotiated to None");
		return -EPROTO;
		}
		break;
		case ISCSI_PARAM_INITIAL_R2T_EN:
		session->initial_r2t_en = value;
		break;
		case ISCSI_PARAM_IMM_DATA_EN:
		session->imm_data_en = value;
		break;
		case ISCSI_PARAM_FIRST_BURST:
		session->first_burst = value;
		break;
		case ISCSI_PARAM_MAX_BURST:
		session->max_burst = value;
		break;
		case ISCSI_PARAM_PDU_INORDER_EN:
		session->pdu_inorder_en = value;
		break;
		case ISCSI_PARAM_DATASEQ_INORDER_EN:
		session->dataseq_inorder_en = value;
		break;
		case ISCSI_PARAM_ERL:
		session->erl = value;
		break;
		case ISCSI_PARAM_IFMARKER_EN:
		sscanf(buf, "%d", &value);
		if (value) {
		printk(KERN_ERR "IFMarker wasn't negotiated to No");
		return -EPROTO;
		}
		break;
		case ISCSI_PARAM_OFMARKER_EN:
		sscanf(buf, "%d", &value);
		if (value) {
		printk(KERN_ERR "OFMarker wasn't negotiated to No");
		return -EPROTO;
		}
		break;
		default:
		break;
		}

		return 0;
		}

		static int
		iscsi_iser_session_get_param(struct iscsi_cls_session *cls_session,
		enum iscsi_param param, uint32_t *value)
		{
		struct Scsi_Host *shost = iscsi_session_to_shost(cls_session);
		struct iscsi_session *session = iscsi_hostdata(shost->hostdata);

		switch (param) {
		case ISCSI_PARAM_INITIAL_R2T_EN:
		*value = session->initial_r2t_en;
		break;
		case ISCSI_PARAM_MAX_R2T:
		*value = session->max_r2t;
		break;
		case ISCSI_PARAM_IMM_DATA_EN:
		*value = session->imm_data_en;
		break;
		case ISCSI_PARAM_FIRST_BURST:
		*value = session->first_burst;
		break;
		case ISCSI_PARAM_MAX_BURST:
		*value = session->max_burst;
		break;
		case ISCSI_PARAM_PDU_INORDER_EN:
		*value = session->pdu_inorder_en;
		break;
		case ISCSI_PARAM_DATASEQ_INORDER_EN:
		*value = session->dataseq_inorder_en;
		break;
		case ISCSI_PARAM_ERL:
		*value = session->erl;
		break;
		case ISCSI_PARAM_IFMARKER_EN:
		*value = 0;
		break;
		case ISCSI_PARAM_OFMARKER_EN:
		*value = 0;
		break;
		default:
		return ISCSI_ERR_PARAM_NOT_FOUND;
		}

		return 0;
		}

		static int
		iscsi_iser_conn_get_param(struct iscsi_cls_conn *cls_conn,
		enum iscsi_param param, uint32_t *value)
		{
		struct iscsi_conn *conn = cls_conn->dd_data;

		switch(param) {
		case ISCSI_PARAM_MAX_RECV_DLENGTH:
		*value = conn->max_recv_dlength;
		break;
		case ISCSI_PARAM_MAX_XMIT_DLENGTH:
		*value = conn->max_xmit_dlength;
		break;
		case ISCSI_PARAM_HDRDGST_EN:
		*value = 0;
		break;
		case ISCSI_PARAM_DATADGST_EN:
		*value = 0;
		break;
		/*case ISCSI_PARAM_TARGET_RECV_DLENGTH:
		*value = conn->target_recv_dlength;
		break;
		case ISCSI_PARAM_INITIATOR_RECV_DLENGTH:
		*value = conn->initiator_recv_dlength;
		break;*/
		default:
		return ISCSI_ERR_PARAM_NOT_FOUND;
		return iscsi_set_param(cls_conn, param, buf, buflen);
		}

		return 0;
		}


		static void
		iscsi_iser_conn_get_stats(struct iscsi_cls_conn cls_conn, struct iscsi_stats stats)
		{
		@@ -701,7 +592,12 @@ static struct iscsi_transport iscsi_iser_transport = {
		ISCSI_FIRST_BURST \|
		ISCSI_MAX_BURST \|
		ISCSI_PDU_INORDER_EN \|
		ISCSI_DATASEQ_INORDER_EN,
		ISCSI_DATASEQ_INORDER_EN \|
		ISCSI_EXP_STATSN \|
		ISCSI_PERSISTENT_PORT \|
		ISCSI_PERSISTENT_ADDRESS \|
		ISCSI_TARGET_NAME \|
		ISCSI_TPGT,
		.host_template = &iscsi_iser_sht,
		.conndata_size = sizeof(struct iscsi_conn),
		.max_lun = ISCSI_ISER_MAX_LUN,
		@@ -713,9 +609,9 @@ static struct iscsi_transport iscsi_iser_transport = {
		.create_conn = iscsi_iser_conn_create,
		.bind_conn = iscsi_iser_conn_bind,
		.destroy_conn = iscsi_iser_conn_destroy,
		.set_param = iscsi_iser_conn_set_param,
		.get_conn_param = iscsi_iser_conn_get_param,
		.get_session_param = iscsi_iser_session_get_param,
		.set_param = iscsi_iser_set_param,
		.get_conn_param = iscsi_conn_get_param,
		.get_session_param = iscsi_session_get_param,
		.start_conn = iscsi_iser_conn_start,
		.stop_conn = iscsi_conn_stop,
		/* these are called as part of conn recovery */

drivers/message/fusion/Makefile

+5 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,11 @@
		# For mptfc:
		#CFLAGS_mptfc.o += -DMPT_DEBUG_FC

		# For mptsas:
		#CFLAGS_mptsas.o += -DMPT_DEBUG_SAS
		#CFLAGS_mptsas.o += -DMPT_DEBUG_SAS_WIDE


		#=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-} LSI_LOGIC

		obj-$(CONFIG_FUSION_SPI) += mptbase.o mptscsih.o mptspi.o

drivers/message/fusion/lsi/fc_log.h

deleted100644 → 0

+0 −89

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2000-2001 LSI Logic Corporation. All rights reserved.
		*
		* NAME: fc_log.h
		* SUMMARY: MPI IocLogInfo definitions for the SYMFC9xx chips
		* DESCRIPTION: Contains the enumerated list of values that may be returned
		* in the IOCLogInfo field of a MPI Default Reply Message.
		*
		* CREATION DATE: 6/02/2000
		* ID: $Id: fc_log.h,v 4.6 2001/07/26 14:41:33 sschremm Exp $
		*/


		/*
		* MpiIocLogInfo_t enum
		*
		* These 32 bit values are used in the IOCLogInfo field of the MPI reply
		* messages.
		* The value is 0xabcccccc where
		* a = The type of log info as per the MPI spec. Since these codes are
		* all for Fibre Channel this value will always be 2.
		* b = Specifies a subclass of the firmware where
		* 0 = FCP Initiator
		* 1 = FCP Target
		* 2 = LAN
		* 3 = MPI Message Layer
		* 4 = FC Link
		* 5 = Context Manager
		* 6 = Invalid Field Offset
		* 7 = State Change Info
		* all others are reserved for future use
		* c = A specific value within the subclass.
		*
		* NOTE: Any new values should be added to the end of each subclass so that the
		* codes remain consistent across firmware releases.
		*/
		typedef enum _MpiIocLogInfoFc
		{
		MPI_IOCLOGINFO_FC_INIT_BASE = 0x20000000,
		MPI_IOCLOGINFO_FC_INIT_ERROR_OUT_OF_ORDER_FRAME = 0x20000001, /* received an out of order frame - unsupported */
		MPI_IOCLOGINFO_FC_INIT_ERROR_BAD_START_OF_FRAME = 0x20000002, /* Bad Rx Frame, bad start of frame primative */
		MPI_IOCLOGINFO_FC_INIT_ERROR_BAD_END_OF_FRAME = 0x20000003, /* Bad Rx Frame, bad end of frame primative */
		MPI_IOCLOGINFO_FC_INIT_ERROR_OVER_RUN = 0x20000004, /* Bad Rx Frame, overrun */
		MPI_IOCLOGINFO_FC_INIT_ERROR_RX_OTHER = 0x20000005, /* Other errors caught by IOC which require retries */
		MPI_IOCLOGINFO_FC_INIT_ERROR_SUBPROC_DEAD = 0x20000006, /* Main processor could not initialize sub-processor */
		MPI_IOCLOGINFO_FC_INIT_ERROR_RX_OVERRUN = 0x20000007, /* Scatter Gather overrun */
		MPI_IOCLOGINFO_FC_INIT_ERROR_RX_BAD_STATUS = 0x20000008, /* Receiver detected context mismatch via invalid header */
		MPI_IOCLOGINFO_FC_INIT_ERROR_RX_UNEXPECTED_FRAME= 0x20000009, /* CtxMgr detected unsupported frame type */
		MPI_IOCLOGINFO_FC_INIT_ERROR_LINK_FAILURE = 0x2000000A, /* Link failure occurred */
		MPI_IOCLOGINFO_FC_INIT_ERROR_TX_TIMEOUT = 0x2000000B, /* Transmitter timeout error */

		MPI_IOCLOGINFO_FC_TARGET_BASE = 0x21000000,
		MPI_IOCLOGINFO_FC_TARGET_NO_PDISC = 0x21000001, /* not sent because we are waiting for a PDISC from the initiator */
		MPI_IOCLOGINFO_FC_TARGET_NO_LOGIN = 0x21000002, /* not sent because we are not logged in to the remote node */
		MPI_IOCLOGINFO_FC_TARGET_DOAR_KILLED_BY_LIP = 0x21000003, /* Data Out, Auto Response, not sent due to a LIP */
		MPI_IOCLOGINFO_FC_TARGET_DIAR_KILLED_BY_LIP = 0x21000004, /* Data In, Auto Response, not sent due to a LIP */
		MPI_IOCLOGINFO_FC_TARGET_DIAR_MISSING_DATA = 0x21000005, /* Data In, Auto Response, missing data frames */
		MPI_IOCLOGINFO_FC_TARGET_DONR_KILLED_BY_LIP = 0x21000006, /* Data Out, No Response, not sent due to a LIP */
		MPI_IOCLOGINFO_FC_TARGET_WRSP_KILLED_BY_LIP = 0x21000007, /* Auto-response after a write not sent due to a LIP */
		MPI_IOCLOGINFO_FC_TARGET_DINR_KILLED_BY_LIP = 0x21000008, /* Data In, No Response, not completed due to a LIP */
		MPI_IOCLOGINFO_FC_TARGET_DINR_MISSING_DATA = 0x21000009, /* Data In, No Response, missing data frames */
		MPI_IOCLOGINFO_FC_TARGET_MRSP_KILLED_BY_LIP = 0x2100000a, /* Manual Response not sent due to a LIP */
		MPI_IOCLOGINFO_FC_TARGET_NO_CLASS_3 = 0x2100000b, /* not sent because remote node does not support Class 3 */
		MPI_IOCLOGINFO_FC_TARGET_LOGIN_NOT_VALID = 0x2100000c, /* not sent because login to remote node not validated */
		MPI_IOCLOGINFO_FC_TARGET_FROM_OUTBOUND = 0x2100000e, /* cleared from the outbound queue after a logout */
		MPI_IOCLOGINFO_FC_TARGET_WAITING_FOR_DATA_IN = 0x2100000f, /* cleared waiting for data after a logout */

		MPI_IOCLOGINFO_FC_LAN_BASE = 0x22000000,
		MPI_IOCLOGINFO_FC_LAN_TRANS_SGL_MISSING = 0x22000001, /* Transaction Context Sgl Missing */
		MPI_IOCLOGINFO_FC_LAN_TRANS_WRONG_PLACE = 0x22000002, /* Transaction Context found before an EOB */
		MPI_IOCLOGINFO_FC_LAN_TRANS_RES_BITS_SET = 0x22000003, /* Transaction Context value has reserved bits set */
		MPI_IOCLOGINFO_FC_LAN_WRONG_SGL_FLAG = 0x22000004, /* Invalid SGL Flags */

		MPI_IOCLOGINFO_FC_MSG_BASE = 0x23000000,

		MPI_IOCLOGINFO_FC_LINK_BASE = 0x24000000,
		MPI_IOCLOGINFO_FC_LINK_LOOP_INIT_TIMEOUT = 0x24000001, /* Loop initialization timed out */
		MPI_IOCLOGINFO_FC_LINK_ALREADY_INITIALIZED = 0x24000002, /* Another system controller already initialized the loop */
		MPI_IOCLOGINFO_FC_LINK_LINK_NOT_ESTABLISHED = 0x24000003, /* Not synchronized to signal or still negotiating (possible cable problem) */
		MPI_IOCLOGINFO_FC_LINK_CRC_ERROR = 0x24000004, /* CRC check detected error on received frame */

		MPI_IOCLOGINFO_FC_CTX_BASE = 0x25000000,

		MPI_IOCLOGINFO_FC_INVALID_FIELD_BYTE_OFFSET = 0x26000000, /* The lower 24 bits give the byte offset of the field in the request message that is invalid */
		MPI_IOCLOGINFO_FC_INVALID_FIELD_MAX_OFFSET = 0x26ffffff,

		MPI_IOCLOGINFO_FC_STATE_CHANGE = 0x27000000 /* The lower 24 bits give additional information concerning state change */

		} MpiIocLogInfoFc_t;

drivers/message/fusion/lsi/mpi.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		* Title: MPI Message independent structures and definitions
		* Creation Date: July 27, 2000
		*
		* mpi.h Version: 01.05.10
		* mpi.h Version: 01.05.11
		*
		* Version History
		* ---------------
		@@ -76,6 +76,7 @@
		* Added EEDP IOCStatus codes.
		* 08-03-05 01.05.09 Bumped MPI_HEADER_VERSION_UNIT.
		* 08-30-05 01.05.10 Added 2 new IOCStatus codes for Target.
		* 03-27-06 01.05.11 Bumped MPI_HEADER_VERSION_UNIT.
		* --------------------------------------------------------------------------
		*/

		@@ -106,7 +107,7 @@
		/* Note: The major versions of 0xe0 through 0xff are reserved */

		/* versioning for this MPI header set */
		#define MPI_HEADER_VERSION_UNIT (0x0C)
		#define MPI_HEADER_VERSION_UNIT (0x0D)
		#define MPI_HEADER_VERSION_DEV (0x00)
		#define MPI_HEADER_VERSION_UNIT_MASK (0xFF00)
		#define MPI_HEADER_VERSION_UNIT_SHIFT (8)