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

Commit b23c9cc0 authored Feb 23, 2008 by Linus Torvalds

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (25 commits)
  [SCSI] qlogicpt: section fixes
  [SCSI] mvsas: convert from rough draft to working driver
  [SCSI] mvsas: Add Marvell 6440 SAS/SATA driver
  [SCSI] libsas: correctly flush the LU queue on error recovery
  [SCSI] aic94xx: fix sequencer hang on error recovery
  [SCSI] st: compile fix when DEBUG set to one
  [SCSI] stex: stex_internal_copy should be called with sg_count in struct st_ccb
  [SCSI] stex: stex_direct_copy shouldn't call dma_map_sg
  [SCSI] lpfc: Balance locking
  [SCSI] qla4xxx: fix up residual handling
  [SCSI] libsas: fix error handling
  [SCSI] arcmsr: fix message allocation
  [SCSI] mptbase: fix use-after-free's
  [SCSI] iscsi transport: make 2 functions static
  [SCSI] lpfc: make lpfc_disable_node() static
  [SCSI] ips: fix data buffer accessors conversion bug
  [SCSI] gdth: don't call pci_free_consistent under spinlock
  [SCSI] qla2xxx: fix compile warning for printk format
  [SCSI] aic7xx: mitigate HOST_MSG_LOOP invalid SCB ff panic
  [SCSI] scsi_debug: disable clustering
  ...

parents 1e835278 cfb37ae1

drivers/message/fusion/mptbase.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1481,15 +1481,15 @@ mpt_attach(struct pci_dev pdev, const struct pci_device_id id)

	ioc->bars = pci_select_bars(pdev, IORESOURCE_MEM);		ioc->bars = pci_select_bars(pdev, IORESOURCE_MEM);
	if (pci_enable_device_mem(pdev)) {		if (pci_enable_device_mem(pdev)) {
	kfree(ioc);
	printk(MYIOC_s_ERR_FMT "pci_enable_device_mem() "		printk(MYIOC_s_ERR_FMT "pci_enable_device_mem() "
	"failed\n", ioc->name);		"failed\n", ioc->name);
			kfree(ioc);
	return r;		return r;
	}		}
	if (pci_request_selected_regions(pdev, ioc->bars, "mpt")) {		if (pci_request_selected_regions(pdev, ioc->bars, "mpt")) {
	kfree(ioc);
	printk(MYIOC_s_ERR_FMT "pci_request_selected_regions() with "		printk(MYIOC_s_ERR_FMT "pci_request_selected_regions() with "
	"MEM failed\n", ioc->name);		"MEM failed\n", ioc->name);
			kfree(ioc);
	return r;		return r;
	}		}

drivers/message/fusion/mptbase.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -923,7 +923,7 @@ extern struct proc_dir_entry *mpt_proc_root_dir;
	/=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=/		/=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=/
	#endif /* } __KERNEL__ */		#endif /* } __KERNEL__ */

	#if defined(__alpha__) \|\| defined(__sparc_v9__) \|\| defined(__ia64__) \|\| defined(__x86_64__) \|\| defined(__powerpc__)		#ifdef CONFIG_64BIT
	#define CAST_U32_TO_PTR(x) ((void *)(u64)x)		#define CAST_U32_TO_PTR(x) ((void *)(u64)x)
	#define CAST_PTR_TO_U32(x) ((u32)(u64)x)		#define CAST_PTR_TO_U32(x) ((u32)(u64)x)
	#else		#else

drivers/scsi/Kconfig

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -992,6 +992,16 @@ config SCSI_IZIP_SLOW_CTR

	Generally, saying N is fine.		Generally, saying N is fine.

			config SCSI_MVSAS
			tristate "Marvell 88SE6440 SAS/SATA support"
			depends on PCI && SCSI
			select SCSI_SAS_LIBSAS
			help
			This driver supports Marvell SAS/SATA PCI devices.

			To compiler this driver as a module, choose M here: the module
			will be called mvsas.

	config SCSI_NCR53C406A		config SCSI_NCR53C406A
	tristate "NCR53c406a SCSI support"		tristate "NCR53c406a SCSI support"
	depends on ISA && SCSI		depends on ISA && SCSI

drivers/scsi/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -119,6 +119,7 @@ obj-$(CONFIG_SCSI_IBMVSCSI) += ibmvscsi/
	obj-$(CONFIG_SCSI_IBMVSCSIS) += ibmvscsi/		obj-$(CONFIG_SCSI_IBMVSCSIS) += ibmvscsi/
	obj-$(CONFIG_SCSI_HPTIOP) += hptiop.o		obj-$(CONFIG_SCSI_HPTIOP) += hptiop.o
	obj-$(CONFIG_SCSI_STEX) += stex.o		obj-$(CONFIG_SCSI_STEX) += stex.o
			obj-$(CONFIG_SCSI_MVSAS) += mvsas.o
	obj-$(CONFIG_PS3_ROM) += ps3rom.o		obj-$(CONFIG_PS3_ROM) += ps3rom.o

	obj-$(CONFIG_ARM) += arm/		obj-$(CONFIG_ARM) += arm/

drivers/scsi/aic7xxx/aic7xxx_core.c

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -695,15 +695,16 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
	scb_index = ahc_inb(ahc, SCB_TAG);		scb_index = ahc_inb(ahc, SCB_TAG);
	scb = ahc_lookup_scb(ahc, scb_index);		scb = ahc_lookup_scb(ahc, scb_index);
	if (devinfo.role == ROLE_INITIATOR) {		if (devinfo.role == ROLE_INITIATOR) {
			if (bus_phase == P_MESGOUT) {
	if (scb == NULL)		if (scb == NULL)
	panic("HOST_MSG_LOOP with "		panic("HOST_MSG_LOOP with "
	"invalid SCB %x\n", scb_index);		"invalid SCB %x\n",
			scb_index);

	if (bus_phase == P_MESGOUT)
	ahc_setup_initiator_msgout(ahc,		ahc_setup_initiator_msgout(ahc,
	&devinfo,		&devinfo,
	scb);		scb);
	else {		} else {
	ahc->msg_type =		ahc->msg_type =
	MSG_TYPE_INITIATOR_MSGIN;		MSG_TYPE_INITIATOR_MSGIN;
	ahc->msgin_index = 0;		ahc->msgin_index = 0;