Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (f290cbac) · Commits · 戴 / test

Documentation/scsi/g_NCR5380.txt

+23 −23

Original line number	Diff line number	Diff line
		@@ -6,17 +6,15 @@ NCR53c400 extensions (c) 1994,1995,1996 Kevin Lentin
		This file documents the NCR53c400 extensions by Kevin Lentin and some
		enhancements to the NCR5380 core.

		This driver supports both NCR5380 and NCR53c400 cards in port or memory
		mapped modes. Currently this driver can only support one of those mapping
		modes at a time but it does support both of these chips at the same time.
		The next release of this driver will support port & memory mapped cards at
		the same time. It should be able to handle multiple different cards in the
		same machine.
		This driver supports NCR5380 and NCR53c400 and compatible cards in port or
		memory mapped modes.

		The drivers/scsi/Makefile has an override in it for the most common
		NCR53c400 card, the Trantor T130B in its default configuration:
		Port: 0x350
		IRQ : 5
		Use of an interrupt is recommended, if supported by the board, as this will
		allow targets to disconnect and thereby improve SCSI bus utilization.

		If the irq parameter is 254 or is omitted entirely, the driver will probe
		for the correct IRQ line automatically. If the irq parameter is 0 or 255
		then no IRQ will be used.

		The NCR53c400 does not support DMA but it does have Pseudo-DMA which is
		supported by the driver.
		@@ -47,22 +45,24 @@ These old-style parameters can support only one card:
		dtc_3181e=1 to set up for a Domex Technology Corp 3181E board
		hp_c2502=1 to set up for a Hewlett Packard C2502 board

		e.g.
		OLD: modprobe g_NCR5380 ncr_irq=5 ncr_addr=0x350 ncr_5380=1
		NEW: modprobe g_NCR5380 irq=5 base=0x350 card=0
		for a port mapped NCR5380 board or

		OLD: modprobe g_NCR5380 ncr_irq=255 ncr_addr=0xc8000 ncr_53c400=1
		NEW: modprobe g_NCR5380 irq=255 base=0xc8000 card=1
		for a memory mapped NCR53C400 board with interrupts disabled or
		E.g. Trantor T130B in its default configuration:
		modprobe g_NCR5380 irq=5 base=0x350 card=1
		or alternatively, using the old syntax,
		modprobe g_NCR5380 ncr_irq=5 ncr_addr=0x350 ncr_53c400=1

		NEW: modprobe g_NCR5380 irq=0,7 base=0x240,0x300 card=3,4
		for two cards: DTC3181 (in non-PnP mode) at 0x240 with no IRQ
		and HP C2502 at 0x300 with IRQ 7
		E.g. a port mapped NCR5380 board, driver to probe for IRQ:
		modprobe g_NCR5380 base=0x350 card=0
		or alternatively,
		modprobe g_NCR5380 ncr_addr=0x350 ncr_5380=1

		(255 should be specified for no or DMA interrupt, 254 to autoprobe for an
		IRQ line if overridden on the command line.)
		E.g. a memory mapped NCR53C400 board with no IRQ:
		modprobe g_NCR5380 irq=255 base=0xc8000 card=1
		or alternatively,
		modprobe g_NCR5380 ncr_irq=255 ncr_addr=0xc8000 ncr_53c400=1

		E.g. two cards, DTC3181 (in non-PnP mode) at 0x240 with no IRQ
		and HP C2502 at 0x300 with IRQ 7:
		modprobe g_NCR5380 irq=0,7 base=0x240,0x300 card=3,4

		Kevin Lentin
		K.Lentin@cs.monash.edu.au

MAINTAINERS

+7 −1

Original line number	Diff line number	Diff line
		@@ -143,7 +143,7 @@ S: Maintained
		F: drivers/net/ethernet/3com/typhoon*

		3WARE SAS/SATA-RAID SCSI DRIVERS (3W-XXXX, 3W-9XXX, 3W-SAS)
		M: Adam Radford <linuxraid@lsi.com>
		M: Adam Radford <aradford@gmail.com>
		L: linux-scsi@vger.kernel.org
		W: http://www.lsi.com
		S: Supported
		@@ -10136,6 +10136,12 @@ F: drivers/net/ethernet/qlogic/qed/
		F: include/linux/qed/
		F: drivers/net/ethernet/qlogic/qede/

		QLOGIC QL41xxx ISCSI DRIVER
		M: QLogic-Storage-Upstream@cavium.com
		L: linux-scsi@vger.kernel.org
		S: Supported
		F: drivers/scsi/qedi/

		QNX4 FILESYSTEM
		M: Anders Larsen <al@alarsen.net>
		W: http://www.alarsen.net/linux/qnx4fs/

drivers/net/ethernet/chelsio/cxgb4/t4_msg.h

+13 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,7 @@ enum {
		CPL_PASS_ESTABLISH = 0x41,
		CPL_RX_DATA_DDP = 0x42,
		CPL_PASS_ACCEPT_REQ = 0x44,
		CPL_RX_ISCSI_CMP = 0x45,
		CPL_TRACE_PKT_T5 = 0x48,
		CPL_RX_ISCSI_DDP = 0x49,

		@@ -934,6 +935,18 @@ struct cpl_iscsi_data {
		__u8 status;
		};

		struct cpl_rx_iscsi_cmp {
		union opcode_tid ot;
		__be16 pdu_len_ddp;
		__be16 len;
		__be32 seq;
		__be16 urg;
		__u8 rsvd;
		__u8 status;
		__be32 ulp_crc;
		__be32 ddpvld;
		};

		struct cpl_tx_data_iso {
		__be32 op_to_scsi;
		__u8 reserved1;

drivers/s390/scsi/zfcp_dbf.c

+14 −3

Original line number	Diff line number	Diff line
		@@ -289,11 +289,12 @@ void zfcp_dbf_rec_trig(char tag, struct zfcp_adapter adapter,


		/**
		* zfcp_dbf_rec_run - trace event related to running recovery
		* zfcp_dbf_rec_run_lvl - trace event related to running recovery
		* @level: trace level to be used for event
		* @tag: identifier for event
		* @erp: erp_action running
		*/
		void zfcp_dbf_rec_run(char tag, struct zfcp_erp_action erp)
		void zfcp_dbf_rec_run_lvl(int level, char tag, struct zfcp_erp_action erp)
		{
		struct zfcp_dbf *dbf = erp->adapter->dbf;
		struct zfcp_dbf_rec *rec = &dbf->rec_buf;
		@@ -319,10 +320,20 @@ void zfcp_dbf_rec_run(char tag, struct zfcp_erp_action erp)
		else
		rec->u.run.rec_count = atomic_read(&erp->adapter->erp_counter);

		debug_event(dbf->rec, 1, rec, sizeof(*rec));
		debug_event(dbf->rec, level, rec, sizeof(*rec));
		spin_unlock_irqrestore(&dbf->rec_lock, flags);
		}

		/**
		* zfcp_dbf_rec_run - trace event related to running recovery
		* @tag: identifier for event
		* @erp: erp_action running
		*/
		void zfcp_dbf_rec_run(char tag, struct zfcp_erp_action erp)
		{
		zfcp_dbf_rec_run_lvl(1, tag, erp);
		}

		/**
		* zfcp_dbf_rec_run_wka - trace wka port event with info like running recovery
		* @tag: identifier for event

drivers/s390/scsi/zfcp_dbf.h

+39 −2

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		* zfcp device driver
		* debug feature declarations
		*
		* Copyright IBM Corp. 2008, 2015
		* Copyright IBM Corp. 2008, 2016
		*/

		#ifndef ZFCP_DBF_H
		@@ -283,6 +283,30 @@ struct zfcp_dbf {
		struct zfcp_dbf_scsi scsi_buf;
		};

		/**
		* zfcp_dbf_hba_fsf_resp_suppress - true if we should not trace by default
		* @req: request that has been completed
		*
		* Returns true if FCP response with only benign residual under count.
		*/
		static inline
		bool zfcp_dbf_hba_fsf_resp_suppress(struct zfcp_fsf_req *req)
		{
		struct fsf_qtcb *qtcb = req->qtcb;
		u32 fsf_stat = qtcb->header.fsf_status;
		struct fcp_resp *fcp_rsp;
		u8 rsp_flags, fr_status;

		if (qtcb->prefix.qtcb_type != FSF_IO_COMMAND)
		return false; /* not an FCP response */
		fcp_rsp = (struct fcp_resp *)&qtcb->bottom.io.fcp_rsp;
		rsp_flags = fcp_rsp->fr_flags;
		fr_status = fcp_rsp->fr_status;
		return (fsf_stat == FSF_FCP_RSP_AVAILABLE) &&
		(rsp_flags == FCP_RESID_UNDER) &&
		(fr_status == SAM_STAT_GOOD);
		}

		static inline
		void zfcp_dbf_hba_fsf_resp(char tag, int level, struct zfcp_fsf_req req)
		{
		@@ -304,7 +328,9 @@ void zfcp_dbf_hba_fsf_response(struct zfcp_fsf_req *req)
		zfcp_dbf_hba_fsf_resp("fs_perr", 1, req);

		} else if (qtcb->header.fsf_status != FSF_GOOD) {
		zfcp_dbf_hba_fsf_resp("fs_ferr", 1, req);
		zfcp_dbf_hba_fsf_resp("fs_ferr",
		zfcp_dbf_hba_fsf_resp_suppress(req)
		? 5 : 1, req);

		} else if ((req->fsf_command == FSF_QTCB_OPEN_PORT_WITH_DID) \|\|
		(req->fsf_command == FSF_QTCB_OPEN_LUN)) {
		@@ -388,4 +414,15 @@ void zfcp_dbf_scsi_devreset(char tag, struct scsi_cmnd scmnd, u8 flag)
		_zfcp_dbf_scsi(tmp_tag, 1, scmnd, NULL);
		}

		/**
		* zfcp_dbf_scsi_nullcmnd() - trace NULLify of SCSI command in dev/tgt-reset.
		* @scmnd: SCSI command that was NULLified.
		* @fsf_req: request that owned @scmnd.
		*/
		static inline void zfcp_dbf_scsi_nullcmnd(struct scsi_cmnd *scmnd,
		struct zfcp_fsf_req *fsf_req)
		{
		_zfcp_dbf_scsi("scfc__1", 3, scmnd, fsf_req);
		}

		#endif /* ZFCP_DBF_H */

Admin message