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

Commit e777d192 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 



Pull first round of SCSI updates from James Bottomley:
 "This patch set includes two large new drivers: mpt3sas (for the next
  gen fusion SAS hardware) and csiostor a FCoE offload driver for the
  Chelsio converged network cards (this includes some net changes which
  I've OK'd with DaveM).

  The rest of the patch is driver updates (qla2xxx, lpfc, hptiop,
  be2iscsi) plus a few assorted updates and bug fixes.

  We also have a Power Management rework in the Upper Layer Drivers
  preparatory to doing ACPI zero power optical devices, but the actual
  enabler is still being worked on.

  Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com&gt;">

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (72 commits)
  [SCSI] mpt3sas: add new driver supporting 12GB SAS
  [SCSI] scsi_transport_sas: add 12GB definitions for mpt3sas
  [SCSI] miscdevice: Adding support for MPT3SAS_MINOR(222)
  [SCSI] csiostor: remove unneeded memset()
  [SCSI] csiostor: Fix sparse warnings.
  [SCSI] qla2xxx: Display that driver is operating in legacy interrupt mode.
  [SCSI] qla2xxx: Dont clear drv active on iospace config failure.
  [SCSI] qla2xxx: Fix typo in qla2xxx driver.
  [SCSI] qla2xxx: Update ql2xextended_error_logging parameter description with new option.
  [SCSI] qla2xxx: Parameterize the link speed of hba rather than fcport.
  [SCSI] qla2xxx: Add 16Gb/s case to get port speed capability.
  [SCSI] qla2xxx: Move marking fcport online ahead of setting iiDMA speed.
  [SCSI] qla2xxx: Add acquiring of risc semaphore before doing ISP reset.
  [SCSI] qla2xxx: Ignore driver ack bit if corresponding presence bit is not set.
  [SCSI] qla2xxx: Fix typo in qla83xx_fw_dump function.
  [SCSI] qla2xxx: Add Gen3 PCIe speed 8GT/s to the log message.
  [SCSI] qla2xxx: Use correct Request-Q-Out register during bidirectional request processing
  [SCSI] qla2xxx: Move noisy Start scsi failed messages to verbose logging level.
  [SCSI] qla2xxx: Fix coccinelle warnings in qla2x00_relogin.
  [SCSI] qla2xxx: No fcport FC-4 type assignment in GA_NXT response.
  ...
parents f132c54e f92363d1

Documentation/scsi/hptiop.txt

+65 −4
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ For Intel IOP based adapters, the controller IOP is accessed via PCI BAR0: 
            0x40    Inbound Queue Port

            0x44    Outbound Queue Port



For Marvell IOP based adapters, the IOP is accessed via PCI BAR0 and BAR1:

For Marvell not Frey IOP based adapters, the IOP is accessed via PCI BAR0 and BAR1:



     BAR0 offset    Register

         0x20400    Inbound Doorbell Register
@@ -55,9 +55,31 @@ For Marvell IOP based adapters, the IOP is accessed via PCI BAR0 and BAR1: 
     0x40-0x1040    Inbound Queue

   0x1040-0x2040    Outbound Queue



For Marvell Frey IOP based adapters, the IOP is accessed via PCI BAR0 and BAR1:



I/O Request Workflow

----------------------

     BAR0 offset    Register

             0x0    IOP configuration information.



     BAR1 offset    Register

          0x4000    Inbound List Base Address Low

          0x4004    Inbound List Base Address High

          0x4018    Inbound List Write Pointer

          0x402C    Inbound List Configuration and Control

          0x4050    Outbound List Base Address Low

          0x4054    Outbound List Base Address High

          0x4058    Outbound List Copy Pointer Shadow Base Address Low

          0x405C    Outbound List Copy Pointer Shadow Base Address High

          0x4088    Outbound List Interrupt Cause

          0x408C    Outbound List Interrupt Enable

         0x1020C    PCIe Function 0 Interrupt Enable

         0x10400    PCIe Function 0 to CPU Message A

         0x10420    CPU to PCIe Function 0 Message A

         0x10480    CPU to PCIe Function 0 Doorbell

         0x10484    CPU to PCIe Function 0 Doorbell Enable





I/O Request Workflow of Not Marvell Frey

------------------------------------------



All queued requests are handled via inbound/outbound queue port.

A request packet can be allocated in either IOP or host memory.
@@ -101,6 +123,45 @@ register 0. An outbound message with the same value indicates the completion 
of an inbound message.





I/O Request Workflow of Marvell Frey

--------------------------------------



All queued requests are handled via inbound/outbound list.



To send a request to the controller:



    - Allocate a free request in host DMA coherent memory.



      Requests allocated in host memory must be aligned on 32-bytes boundary.



    - Fill the request with index of the request in the flag.



      Fill a free inbound list unit with the physical address and the size of

      the request.



      Set up the inbound list write pointer with the index of previous unit,

      round to 0 if the index reaches the supported count of requests.



    - Post the inbound list writer pointer to IOP.



    - The IOP process the request. When the request is completed, the flag of

      the request with or-ed IOPMU_QUEUE_MASK_HOST_BITS will be put into a

      free outbound list unit and the index of the outbound list unit will be

      put into the copy pointer shadow register. An outbound interrupt will be

      generated.



    - The host read the outbound list copy pointer shadow register and compare

      with previous saved read ponter N. If they are different, the host will

      read the (N+1)th outbound list unit.



      The host get the index of the request from the (N+1)th outbound list

      unit and complete the request.



Non-queued requests (reset communication/reset/flush etc) can be sent via PCIe

Function 0 to CPU Message A register. The CPU to PCIe Function 0 Message register

with the same value indicates the completion of message.





User-level Interface

---------------------
@@ -112,7 +173,7 @@ The driver exposes following sysfs attributes: 




-----------------------------------------------------------------------------

Copyright (C) 2006-2009 HighPoint Technologies, Inc. All Rights Reserved.

Copyright (C) 2006-2012 HighPoint Technologies, Inc. All Rights Reserved.



  This file is distributed in the hope that it will be useful,

  but WITHOUT ANY WARRANTY; without even the implied warranty of

MAINTAINERS

+4 −1
Original line number Diff line number Diff line
@@ -4655,13 +4655,16 @@ S: Maintained 
F:	fs/logfs/



LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)

M:	Eric Moore <Eric.Moore@lsi.com>

M:	Nagalakshmi Nandigama <Nagalakshmi.Nandigama@lsi.com>

M:	Sreekanth Reddy <Sreekanth.Reddy@lsi.com>

M:	support@lsi.com

L:	DL-MPTFusionLinux@lsi.com

L:	linux-scsi@vger.kernel.org

W:	http://www.lsilogic.com/support

S:	Supported

F:	drivers/message/fusion/

F:	drivers/scsi/mpt2sas/

F:	drivers/scsi/mpt3sas/



LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers

M:	Matthew Wilcox <matthew@wil.cx>

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+5 −5
Original line number Diff line number Diff line
@@ -3203,7 +3203,7 @@ static int adap_init1(struct adapter *adap, struct fw_caps_config_cmd *c) 
	memset(c, 0, sizeof(*c));

	c->op_to_write = htonl(FW_CMD_OP(FW_CAPS_CONFIG_CMD) |

			       FW_CMD_REQUEST | FW_CMD_READ);

	c->retval_len16 = htonl(FW_LEN16(*c));

	c->cfvalid_to_len16 = htonl(FW_LEN16(*c));

	ret = t4_wr_mbox(adap, adap->fn, c, sizeof(*c), c);

	if (ret < 0)

		return ret;
@@ -3397,7 +3397,7 @@ static int adap_init0_config(struct adapter *adapter, int reset) 
		htonl(FW_CMD_OP(FW_CAPS_CONFIG_CMD) |

		      FW_CMD_REQUEST |

		      FW_CMD_READ);

	caps_cmd.retval_len16 =

	caps_cmd.cfvalid_to_len16 =

		htonl(FW_CAPS_CONFIG_CMD_CFVALID |

		      FW_CAPS_CONFIG_CMD_MEMTYPE_CF(mtype) |

		      FW_CAPS_CONFIG_CMD_MEMADDR64K_CF(maddr >> 16) |
@@ -3422,7 +3422,7 @@ static int adap_init0_config(struct adapter *adapter, int reset) 
		htonl(FW_CMD_OP(FW_CAPS_CONFIG_CMD) |

		      FW_CMD_REQUEST |

		      FW_CMD_WRITE);

	caps_cmd.retval_len16 = htonl(FW_LEN16(caps_cmd));

	caps_cmd.cfvalid_to_len16 = htonl(FW_LEN16(caps_cmd));

	ret = t4_wr_mbox(adapter, adapter->mbox, &caps_cmd, sizeof(caps_cmd),

			 NULL);

	if (ret < 0)
@@ -3497,7 +3497,7 @@ static int adap_init0_no_config(struct adapter *adapter, int reset) 
	memset(&caps_cmd, 0, sizeof(caps_cmd));

	caps_cmd.op_to_write = htonl(FW_CMD_OP(FW_CAPS_CONFIG_CMD) |

				     FW_CMD_REQUEST | FW_CMD_READ);

	caps_cmd.retval_len16 = htonl(FW_LEN16(caps_cmd));

	caps_cmd.cfvalid_to_len16 = htonl(FW_LEN16(caps_cmd));

	ret = t4_wr_mbox(adapter, adapter->mbox, &caps_cmd, sizeof(caps_cmd),

			 &caps_cmd);

	if (ret < 0)
@@ -3929,7 +3929,7 @@ static int adap_init0(struct adapter *adap) 
	memset(&caps_cmd, 0, sizeof(caps_cmd));

	caps_cmd.op_to_write = htonl(FW_CMD_OP(FW_CAPS_CONFIG_CMD) |

				     FW_CMD_REQUEST | FW_CMD_READ);

	caps_cmd.retval_len16 = htonl(FW_LEN16(caps_cmd));

	caps_cmd.cfvalid_to_len16 = htonl(FW_LEN16(caps_cmd));

	ret = t4_wr_mbox(adap, adap->mbox, &caps_cmd, sizeof(caps_cmd),

			 &caps_cmd);

	if (ret < 0)

drivers/net/ethernet/chelsio/cxgb4/sge.c

+3 −3
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ static inline void ring_fl_db(struct adapter *adap, struct sge_fl *q) 
{

	if (q->pend_cred >= 8) {

		wmb();

		t4_write_reg(adap, MYPF_REG(SGE_PF_KDOORBELL), DBPRIO |

		t4_write_reg(adap, MYPF_REG(SGE_PF_KDOORBELL), DBPRIO(1) |

			     QID(q->cntxt_id) | PIDX(q->pend_cred / 8));

		q->pend_cred &= 7;

	}
@@ -2082,10 +2082,10 @@ int t4_sge_alloc_rxq(struct adapter *adap, struct sge_rspq *iq, bool fwevtq, 
			goto fl_nomem;



		flsz = fl->size / 8 + s->stat_len / sizeof(struct tx_desc);

		c.iqns_to_fl0congen = htonl(FW_IQ_CMD_FL0PACKEN |

		c.iqns_to_fl0congen = htonl(FW_IQ_CMD_FL0PACKEN(1) |

					    FW_IQ_CMD_FL0FETCHRO(1) |

					    FW_IQ_CMD_FL0DATARO(1) |

					    FW_IQ_CMD_FL0PADEN);

					    FW_IQ_CMD_FL0PADEN(1));

		c.fl0dcaen_to_fl0cidxfthresh = htons(FW_IQ_CMD_FL0FBMIN(2) |

				FW_IQ_CMD_FL0FBMAX(3));

		c.fl0size = htons(flsz);

drivers/net/ethernet/chelsio/cxgb4/t4_hw.c

+10 −10
Original line number Diff line number Diff line
@@ -648,12 +648,12 @@ static int sf1_read(struct adapter *adapter, unsigned int byte_cnt, int cont, 


	if (!byte_cnt || byte_cnt > 4)

		return -EINVAL;

	if (t4_read_reg(adapter, SF_OP) & BUSY)

	if (t4_read_reg(adapter, SF_OP) & SF_BUSY)

		return -EBUSY;

	cont = cont ? SF_CONT : 0;

	lock = lock ? SF_LOCK : 0;

	t4_write_reg(adapter, SF_OP, lock | cont | BYTECNT(byte_cnt - 1));

	ret = t4_wait_op_done(adapter, SF_OP, BUSY, 0, SF_ATTEMPTS, 5);

	ret = t4_wait_op_done(adapter, SF_OP, SF_BUSY, 0, SF_ATTEMPTS, 5);

	if (!ret)

		*valp = t4_read_reg(adapter, SF_DATA);

	return ret;
@@ -676,14 +676,14 @@ static int sf1_write(struct adapter *adapter, unsigned int byte_cnt, int cont, 
{

	if (!byte_cnt || byte_cnt > 4)

		return -EINVAL;

	if (t4_read_reg(adapter, SF_OP) & BUSY)

	if (t4_read_reg(adapter, SF_OP) & SF_BUSY)

		return -EBUSY;

	cont = cont ? SF_CONT : 0;

	lock = lock ? SF_LOCK : 0;

	t4_write_reg(adapter, SF_DATA, val);

	t4_write_reg(adapter, SF_OP, lock |

		     cont | BYTECNT(byte_cnt - 1) | OP_WR);

	return t4_wait_op_done(adapter, SF_OP, BUSY, 0, SF_ATTEMPTS, 5);

	return t4_wait_op_done(adapter, SF_OP, SF_BUSY, 0, SF_ATTEMPTS, 5);

}



/**
@@ -2252,14 +2252,14 @@ int t4_wol_pat_enable(struct adapter *adap, unsigned int port, unsigned int map, 
		t4_write_reg(adap, EPIO_REG(DATA0), mask0);

		t4_write_reg(adap, EPIO_REG(OP), ADDRESS(i) | EPIOWR);

		t4_read_reg(adap, EPIO_REG(OP));                /* flush */

		if (t4_read_reg(adap, EPIO_REG(OP)) & BUSY)

		if (t4_read_reg(adap, EPIO_REG(OP)) & SF_BUSY)

			return -ETIMEDOUT;



		/* write CRC */

		t4_write_reg(adap, EPIO_REG(DATA0), crc);

		t4_write_reg(adap, EPIO_REG(OP), ADDRESS(i + 32) | EPIOWR);

		t4_read_reg(adap, EPIO_REG(OP));                /* flush */

		if (t4_read_reg(adap, EPIO_REG(OP)) & BUSY)

		if (t4_read_reg(adap, EPIO_REG(OP)) & SF_BUSY)

			return -ETIMEDOUT;

	}

#undef EPIO_REG
@@ -2405,7 +2405,7 @@ int t4_fw_hello(struct adapter *adap, unsigned int mbox, unsigned int evt_mbox, 
retry:

	memset(&c, 0, sizeof(c));

	INIT_CMD(c, HELLO, WRITE);

	c.err_to_mbasyncnot = htonl(

	c.err_to_clearinit = htonl(

		FW_HELLO_CMD_MASTERDIS(master == MASTER_CANT) |

		FW_HELLO_CMD_MASTERFORCE(master == MASTER_MUST) |

		FW_HELLO_CMD_MBMASTER(master == MASTER_MUST ? mbox :
@@ -2426,7 +2426,7 @@ retry: 
		return ret;

	}



	v = ntohl(c.err_to_mbasyncnot);

	v = ntohl(c.err_to_clearinit);

	master_mbox = FW_HELLO_CMD_MBMASTER_GET(v);

	if (state) {

		if (v & FW_HELLO_CMD_ERR)
@@ -2774,7 +2774,7 @@ int t4_fw_config_file(struct adapter *adap, unsigned int mbox, 
		htonl(FW_CMD_OP(FW_CAPS_CONFIG_CMD) |

		      FW_CMD_REQUEST |

		      FW_CMD_READ);

	caps_cmd.retval_len16 =

	caps_cmd.cfvalid_to_len16 =

		htonl(FW_CAPS_CONFIG_CMD_CFVALID |

		      FW_CAPS_CONFIG_CMD_MEMTYPE_CF(mtype) |

		      FW_CAPS_CONFIG_CMD_MEMADDR64K_CF(maddr >> 16) |
@@ -2797,7 +2797,7 @@ int t4_fw_config_file(struct adapter *adap, unsigned int mbox, 
		htonl(FW_CMD_OP(FW_CAPS_CONFIG_CMD) |

		      FW_CMD_REQUEST |

		      FW_CMD_WRITE);

	caps_cmd.retval_len16 = htonl(FW_LEN16(caps_cmd));

	caps_cmd.cfvalid_to_len16 = htonl(FW_LEN16(caps_cmd));

	return t4_wr_mbox(adap, mbox, &caps_cmd, sizeof(caps_cmd), NULL);

}