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

Commit a3b4924b 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 more SCSI updates from James Bottomley:
 "This is the set of stuff that didn't quite make the initial pull and a
  set of fixes for stuff which did.

  The new stuff is basically lpfc (nvme), qedi and aacraid. The fixes
  cover a lot of previously submitted stuff, the most important of which
  probably covers some of the failing irq vectors allocation and other
  fallout from having the SCSI command allocated as part of the block
  allocation functions"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (59 commits)
  scsi: qedi: Fix memory leak in tmf response processing.
  scsi: aacraid: remove redundant zero check on ret
  scsi: lpfc: use proper format string for dma_addr_t
  scsi: lpfc: use div_u64 for 64-bit division
  scsi: mac_scsi: Fix MAC_SCSI=m option when SCSI=m
  scsi: cciss: correct check map error.
  scsi: qla2xxx: fix spelling mistake: "seperator" -> "separator"
  scsi: aacraid: Fixed expander hotplug for SMART family
  scsi: mpt3sas: switch to pci_alloc_irq_vectors
  scsi: qedf: fixup compilation warning about atomic_t usage
  scsi: remove scsi_execute_req_flags
  scsi: merge __scsi_execute into scsi_execute
  scsi: simplify scsi_execute_req_flags
  scsi: make the sense header argument to scsi_test_unit_ready mandatory
  scsi: sd: improve TUR handling in sd_check_events
  scsi: always zero sshdr in scsi_normalize_sense
  scsi: scsi_dh_emc: return success in clariion_std_inquiry()
  scsi: fix memory leak of sdpk on when gd fails to allocate
  scsi: sd: make sd_devt_release() static
  scsi: qedf: Add QLogic FastLinQ offload FCoE driver framework.
  ...
parents 0b94da8d 42a70abd

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -10336,6 +10336,12 @@ L: linux-scsi@vger.kernel.org 
S:	Supported

F:	drivers/scsi/qedi/



QLOGIC QL41xxx FCOE DRIVER

M:	QLogic-Storage-Upstream@cavium.com

L:	linux-scsi@vger.kernel.org

S:	Supported

F:	drivers/scsi/qedf/



QNX4 FILESYSTEM

M:	Anders Larsen <al@alarsen.net>

W:	http://www.alarsen.net/linux/qnx4fs/

drivers/ata/libata-scsi.c

+4 −8
Original line number Diff line number Diff line
@@ -600,6 +600,7 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg) 
	u8 args[4], *argbuf = NULL, *sensebuf = NULL;

	int argsize = 0;

	enum dma_data_direction data_dir;

	struct scsi_sense_hdr sshdr;

	int cmd_result;



	if (arg == NULL)
@@ -648,7 +649,7 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg) 
	/* Good values for timeout and retries?  Values below

	   from scsi_ioctl_send_command() for default case... */

	cmd_result = scsi_execute(scsidev, scsi_cmd, data_dir, argbuf, argsize,

				  sensebuf, (10*HZ), 5, 0, NULL);

				  sensebuf, &sshdr, (10*HZ), 5, 0, 0, NULL);



	if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */

		u8 *desc = sensebuf + 8;
@@ -657,9 +658,6 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg) 
		/* If we set cc then ATA pass-through will cause a

		 * check condition even if no error. Filter that. */

		if (cmd_result & SAM_STAT_CHECK_CONDITION) {

			struct scsi_sense_hdr sshdr;

			scsi_normalize_sense(sensebuf, SCSI_SENSE_BUFFERSIZE,

					     &sshdr);

			if (sshdr.sense_key == RECOVERED_ERROR &&

			    sshdr.asc == 0 && sshdr.ascq == 0x1d)

				cmd_result &= ~SAM_STAT_CHECK_CONDITION;
@@ -707,6 +705,7 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg) 
	int rc = 0;

	u8 scsi_cmd[MAX_COMMAND_SIZE];

	u8 args[7], *sensebuf = NULL;

	struct scsi_sense_hdr sshdr;

	int cmd_result;



	if (arg == NULL)
@@ -734,7 +733,7 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg) 
	/* Good values for timeout and retries?  Values below

	   from scsi_ioctl_send_command() for default case... */

	cmd_result = scsi_execute(scsidev, scsi_cmd, DMA_NONE, NULL, 0,

				sensebuf, (10*HZ), 5, 0, NULL);

				sensebuf, &sshdr, (10*HZ), 5, 0, 0, NULL);



	if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */

		u8 *desc = sensebuf + 8;
@@ -743,9 +742,6 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg) 
		/* If we set cc then ATA pass-through will cause a

		 * check condition even if no error. Filter that. */

		if (cmd_result & SAM_STAT_CHECK_CONDITION) {

			struct scsi_sense_hdr sshdr;

			scsi_normalize_sense(sensebuf, SCSI_SENSE_BUFFERSIZE,

						&sshdr);

			if (sshdr.sense_key == RECOVERED_ERROR &&

			    sshdr.asc == 0 && sshdr.ascq == 0x1d)

				cmd_result &= ~SAM_STAT_CHECK_CONDITION;

drivers/block/cciss.c

+28 −4
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static void cciss_unmap_sg_chain_block(ctlr_info_t *h, CommandList_struct *c) 
	pci_unmap_single(h->pdev, temp64.val, chain_sg->Len, PCI_DMA_TODEVICE);

}



static void cciss_map_sg_chain_block(ctlr_info_t *h, CommandList_struct *c,

static int cciss_map_sg_chain_block(ctlr_info_t *h, CommandList_struct *c,

	SGDescriptor_struct *chain_block, int len)

{

	SGDescriptor_struct *chain_sg;
@@ -359,8 +359,16 @@ static void cciss_map_sg_chain_block(ctlr_info_t *h, CommandList_struct *c, 
	chain_sg->Len = len;

	temp64.val = pci_map_single(h->pdev, chain_block, len,

				PCI_DMA_TODEVICE);

	if (dma_mapping_error(&h->pdev->dev, temp64.val)) {

		dev_warn(&h->pdev->dev,

			"%s: error mapping chain block for DMA\n",

			__func__);

		return -1;

	}

	chain_sg->Addr.lower = temp64.val32.lower;

	chain_sg->Addr.upper = temp64.val32.upper;



	return 0;

}



#include "cciss_scsi.c"		/* For SCSI tape support */
@@ -3369,15 +3377,31 @@ static void do_cciss_request(struct request_queue *q) 
		temp64.val = (__u64) pci_map_page(h->pdev, sg_page(&tmp_sg[i]),

						tmp_sg[i].offset,

						tmp_sg[i].length, dir);

		if (dma_mapping_error(&h->pdev->dev, temp64.val)) {

			dev_warn(&h->pdev->dev,

				"%s: error mapping page for DMA\n", __func__);

			creq->errors = make_status_bytes(SAM_STAT_GOOD,

							0, DRIVER_OK,

							DID_SOFT_ERROR);

			cmd_free(h, c);

			return;

		}

		curr_sg[sg_index].Addr.lower = temp64.val32.lower;

		curr_sg[sg_index].Addr.upper = temp64.val32.upper;

		curr_sg[sg_index].Ext = 0;  /* we are not chaining */

		++sg_index;

	}

	if (chained)

		cciss_map_sg_chain_block(h, c, h->cmd_sg_list[c->cmdindex],

	if (chained) {

		if (cciss_map_sg_chain_block(h, c, h->cmd_sg_list[c->cmdindex],

			(seg - (h->max_cmd_sgentries - 1)) *

				sizeof(SGDescriptor_struct));

				sizeof(SGDescriptor_struct))) {

			creq->errors = make_status_bytes(SAM_STAT_GOOD,

							0, DRIVER_OK,

							DID_SOFT_ERROR);

			cmd_free(h, c);

			return;

		}

	}



	/* track how many SG entries we are using */

	if (seg > h->maxSG)

drivers/scsi/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -1235,11 +1235,13 @@ config SCSI_QLOGICPTI 
source "drivers/scsi/qla2xxx/Kconfig"

source "drivers/scsi/qla4xxx/Kconfig"

source "drivers/scsi/qedi/Kconfig"

source "drivers/scsi/qedf/Kconfig"



config SCSI_LPFC

	tristate "Emulex LightPulse Fibre Channel Support"

	depends on PCI && SCSI

	depends on SCSI_FC_ATTRS

	depends on NVME_FC && NVME_TARGET_FC

	select CRC_T10DIF

	help

          This lpfc driver supports the Emulex LightPulse
@@ -1478,7 +1480,7 @@ config ATARI_SCSI 


config MAC_SCSI

	tristate "Macintosh NCR5380 SCSI"

	depends on MAC && SCSI=y

	depends on MAC && SCSI

	select SCSI_SPI_ATTRS

	help

	  This is the NCR 5380 SCSI controller included on most of the 68030

drivers/scsi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ obj-$(CONFIG_FCOE) += fcoe/ 
obj-$(CONFIG_FCOE_FNIC)		+= fnic/

obj-$(CONFIG_SCSI_SNIC)		+= snic/

obj-$(CONFIG_SCSI_BNX2X_FCOE)	+= libfc/ fcoe/ bnx2fc/

obj-$(CONFIG_QEDF)		+= qedf/

obj-$(CONFIG_ISCSI_TCP) 	+= libiscsi.o	libiscsi_tcp.o iscsi_tcp.o

obj-$(CONFIG_INFINIBAND_ISER) 	+= libiscsi.o

obj-$(CONFIG_ISCSI_BOOT_SYSFS)	+= iscsi_boot_sysfs.o