Commit d49f8a52 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 SCSI updates from James Bottomley:
 "This is mostly updates of the usual drivers: UFS, esp_scsi, NCR5380,
  qla2xxx, lpfc, libsas, hisi_sas.

  In addition there's a set of mostly small updates to the target
  subsystem a set of conversions to the generic DMA API, which do have
  some potential for issues in the older drivers but we'll handle those
  as case by case fixes.

  A new myrs driver for the DAC960/mylex raid controllers to replace the
  block based DAC960 which is also being removed by Jens in this merge
  window.

  Plus the usual slew of trivial changes"

[ "myrs" stands for "MYlex Raid Scsi". Obviously. Silly of me to even
  wonder. There's also a "myrb" driver, where the 'b' stands for
  'block'. Truly, somebody has got mad naming skillz. - Linus ]

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (237 commits)
  scsi: myrs: Fix the processor absent message in processor_show()
  scsi: myrs: Fix a logical vs bitwise bug
  scsi: hisi_sas: Fix NULL pointer dereference
  scsi: myrs: fix build failure on 32 bit
  scsi: fnic: replace gross legacy tag hack with blk-mq hack
  scsi: mesh: switch to generic DMA API
  scsi: ips: switch to generic DMA API
  scsi: smartpqi: fully convert to the generic DMA API
  scsi: vmw_pscsi: switch to generic DMA API
  scsi: snic: switch to generic DMA API
  scsi: qla4xxx: fully convert to the generic DMA API
  scsi: qla2xxx: fully convert to the generic DMA API
  scsi: qla1280: switch to generic DMA API
  scsi: qedi: fully convert to the generic DMA API
  scsi: qedf: fully convert to the generic DMA API
  scsi: pm8001: switch to generic DMA API
  scsi: nsp32: switch to generic DMA API
  scsi: mvsas: fully convert to the generic DMA API
  scsi: mvumi: switch to generic DMA API
  scsi: mpt3sas: switch to generic DMA API
  ...
parents bd6bf7c1 a0db8a75

Documentation/scsi/ufs.txt

+20 −0
Original line number Diff line number Diff line
@@ -128,6 +128,26 @@ The current UFSHCD implementation supports following functionality, 
In this version of UFSHCD Query requests and power management

functionality are not implemented.



4. BSG Support

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



This transport driver supports exchanging UFS protocol information units

(UPIUs) with a UFS device. Typically, user space will allocate

struct ufs_bsg_request and struct ufs_bsg_reply (see ufs_bsg.h) as

request_upiu and reply_upiu respectively.  Filling those UPIUs should

be done in accordance with JEDEC spec UFS2.1 paragraph 10.7.

*Caveat emptor*: The driver makes no further input validations and sends the

UPIU to the device as it is.  Open the bsg device in /dev/ufs-bsg and

send SG_IO with the applicable sg_io_v4:



	io_hdr_v4.guard = 'Q';

	io_hdr_v4.protocol = BSG_PROTOCOL_SCSI;

	io_hdr_v4.subprotocol = BSG_SUB_PROTOCOL_SCSI_TRANSPORT;

	io_hdr_v4.response = (__u64)reply_upiu;

	io_hdr_v4.max_response_len = reply_len;

	io_hdr_v4.request_len = request_len;

	io_hdr_v4.request = (__u64)request_upiu;



UFS Specifications can be found at,

UFS - http://www.jedec.org/sites/default/files/docs/JESD220.pdf

UFSHCI - http://www.jedec.org/sites/default/files/docs/JESD223.pdf

MAINTAINERS

+8 −1
Original line number Diff line number Diff line
@@ -4055,7 +4055,7 @@ M: Uma Krishnan <ukrishn@linux.vnet.ibm.com> 
L:	linux-scsi@vger.kernel.org

S:	Supported

F:	drivers/scsi/cxlflash/

F:	include/uapi/scsi/cxlflash_ioctls.h

F:	include/uapi/scsi/cxlflash_ioctl.h

F:	Documentation/powerpc/cxlflash.txt



CYBERPRO FB DRIVER
@@ -10011,6 +10011,13 @@ S: Supported 
F:	drivers/gpu/drm/mxsfb/

F:	Documentation/devicetree/bindings/display/mxsfb.txt



MYLEX DAC960 PCI RAID Controller

M:	Hannes Reinecke <hare@kernel.org>

L:	linux-scsi@vger.kernel.org

S:	Supported

F:	drivers/scsi/myrb.*

F:	drivers/scsi/myrs.*



MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)

M:	Chris Lee <christopher.lee@cspi.com>

L:	netdev@vger.kernel.org

drivers/message/fusion/lsi/mpi_cnfg.h

+1 −1
Original line number Diff line number Diff line
@@ -2004,7 +2004,7 @@ typedef struct _CONFIG_PAGE_FC_PORT_6 
    U64                     LinkFailureCount;           /* 50h */

    U64                     LossOfSyncCount;            /* 58h */

    U64                     LossOfSignalCount;          /* 60h */

    U64                     PrimativeSeqErrCount;       /* 68h */

    U64                     PrimitiveSeqErrCount;       /* 68h */

    U64                     InvalidTxWordCount;         /* 70h */

    U64                     InvalidCrcCount;            /* 78h */

    U64                     FcpInitiatorIoCount;        /* 80h */

drivers/message/fusion/mptbase.c

+6 −6
Original line number Diff line number Diff line
@@ -335,11 +335,11 @@ static int mpt_remove_dead_ioc_func(void *arg) 
	MPT_ADAPTER *ioc = (MPT_ADAPTER *)arg;

	struct pci_dev *pdev;



	if ((ioc == NULL))

	if (!ioc)

		return -1;



	pdev = ioc->pcidev;

	if ((pdev == NULL))

	if (!pdev)

		return -1;



	pci_stop_and_remove_bus_device_locked(pdev);
@@ -7570,11 +7570,11 @@ mpt_display_event_info(MPT_ADAPTER *ioc, EventNotificationReply_t *pEventReply) 
		u8 phy_num = (u8)(evData0);

		u8 port_num = (u8)(evData0 >> 8);

		u8 port_width = (u8)(evData0 >> 16);

		u8 primative = (u8)(evData0 >> 24);

		u8 primitive = (u8)(evData0 >> 24);

		snprintf(evStr, EVENT_DESCR_STR_SZ,

		    "SAS Broadcase Primative: phy=%d port=%d "

		    "width=%d primative=0x%02x",

		    phy_num, port_num, port_width, primative);

		    "SAS Broadcast Primitive: phy=%d port=%d "

		    "width=%d primitive=0x%02x",

		    phy_num, port_num, port_width, primitive);

		break;

	}

drivers/message/fusion/mptsas.c

+4 −4
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static void mptsas_expander_delete(MPT_ADAPTER *ioc, 
static void mptsas_send_expander_event(struct fw_event_work *fw_event);

static void mptsas_not_responding_devices(MPT_ADAPTER *ioc);

static void mptsas_scan_sas_topology(MPT_ADAPTER *ioc);

static void mptsas_broadcast_primative_work(struct fw_event_work *fw_event);

static void mptsas_broadcast_primitive_work(struct fw_event_work *fw_event);

static void mptsas_handle_queue_full_event(struct fw_event_work *fw_event);

static void mptsas_volume_delete(MPT_ADAPTER *ioc, u8 id);

void	mptsas_schedule_target_reset(void *ioc);
@@ -1665,7 +1665,7 @@ mptsas_firmware_event_work(struct work_struct *work) 
		mptsas_free_fw_event(ioc, fw_event);

		break;

	case MPI_EVENT_SAS_BROADCAST_PRIMITIVE:

		mptsas_broadcast_primative_work(fw_event);

		mptsas_broadcast_primitive_work(fw_event);

		break;

	case MPI_EVENT_SAS_EXPANDER_STATUS_CHANGE:

		mptsas_send_expander_event(fw_event);
@@ -4826,13 +4826,13 @@ mptsas_issue_tm(MPT_ADAPTER *ioc, u8 type, u8 channel, u8 id, u64 lun, 
}



/**

 *	mptsas_broadcast_primative_work - Handle broadcast primitives

 *	mptsas_broadcast_primitive_work - Handle broadcast primitives

 *	@work: work queue payload containing info describing the event

 *

 *	this will be handled in workqueue context.

 */

static void

mptsas_broadcast_primative_work(struct fw_event_work *fw_event)

mptsas_broadcast_primitive_work(struct fw_event_work *fw_event)

{

	MPT_ADAPTER *ioc = fw_event->ioc;

	MPT_FRAME_HDR	*mf;

CRA Git | Maintained and supported by SUSTech CRA and CCSE