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

Commit fc6f0700 authored Dec 17, 2009 by Linus Torvalds

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

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (40 commits)
  [SCSI] 3w-9xxx fix bug in sgl loading
  [SCSI] fcoe, libfc: adds enable/disable for fcoe interface
  [SCSI] libfc: reduce hold time on SCSI host lock
  [SCSI] libfc: remote port gets stuck in restart state without really restarting
  [SCSI] pm8001: misc code cleanup
  [SCSI] pm8001: enable read HBA SAS address from VPD
  [SCSI] pm8001: do not reset local sata as it will not be found if reset
  [SCSI] pm8001: bit set pm8001_ha->flags
  [SCSI] pm8001:fix potential NULL pointer dereference
  [SCSI] pm8001: set SSC down-spreading only to get less errors on some 6G device.
  [SCSI] pm8001: fix endian issues with SAS address
  [SCSI] pm8001: enhance error handle for IO patch
  [SCSI] pm8001: Fix for sata io circular lock dependency.
  [SCSI] hpsa: add driver for HP Smart Array controllers.
  [SCSI] cxgb3i: always use negative errno in case of error
  [SCSI] bnx2i: minor code cleanup and update driver version
  [SCSI] bnx2i: Task management ABORT TASK fixes
  [SCSI] bnx2i: update CQ arming algorith for 5771x chipsets
  [SCSI] bnx2i: Adjust sq_size module parametr to power of 2 only if a non-zero value is specified
  [SCSI] bnx2i: Add 5771E device support to bnx2i driver
  ...

parents dbfc9851 53ca3535

drivers/message/fusion/mptbase.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1587,7 +1587,7 @@ mpt_mapresources(MPT_ADAPTER *ioc)
	{		{
	u8 __iomem *mem;		u8 __iomem *mem;
	int ii;		int ii;
	unsigned long mem_phys;		resource_size_t mem_phys;
	unsigned long port;		unsigned long port;
	u32 msize;		u32 msize;
	u32 psize;		u32 psize;
	@@ -1677,8 +1677,8 @@ mpt_mapresources(MPT_ADAPTER *ioc)
	return -EINVAL;		return -EINVAL;
	}		}
	ioc->memmap = mem;		ioc->memmap = mem;
	dinitprintk(ioc, printk(MYIOC_s_INFO_FMT "mem = %p, mem_phys = %lx\n",		dinitprintk(ioc, printk(MYIOC_s_INFO_FMT "mem = %p, mem_phys = %llx\n",
	ioc->name, mem, mem_phys));		ioc->name, mem, (unsigned long long)mem_phys));

	ioc->mem_phys = mem_phys;		ioc->mem_phys = mem_phys;
	ioc->chip = (SYSIF_REGS __iomem *)mem;		ioc->chip = (SYSIF_REGS __iomem *)mem;

drivers/misc/enclosure.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -391,6 +391,7 @@ static const char *const enclosure_status [] = {
	[ENCLOSURE_STATUS_NOT_INSTALLED] = "not installed",		[ENCLOSURE_STATUS_NOT_INSTALLED] = "not installed",
	[ENCLOSURE_STATUS_UNKNOWN] = "unknown",		[ENCLOSURE_STATUS_UNKNOWN] = "unknown",
	[ENCLOSURE_STATUS_UNAVAILABLE] = "unavailable",		[ENCLOSURE_STATUS_UNAVAILABLE] = "unavailable",
			[ENCLOSURE_STATUS_MAX] = NULL,
	};		};

	static const char *const enclosure_type [] = {		static const char *const enclosure_type [] = {

drivers/scsi/3w-9xxx.c

+7 −4

Original line number	Original line	Diff line number	Diff line
	@@ -76,6 +76,7 @@
	Fix bug in twa_get_param() on 4GB+.		Fix bug in twa_get_param() on 4GB+.
	Use pci_resource_len() for ioremap().		Use pci_resource_len() for ioremap().
	2.26.02.012 - Add power management support.		2.26.02.012 - Add power management support.
			2.26.02.013 - Fix bug in twa_load_sgl().
	*/		*/

	#include <linux/module.h>		#include <linux/module.h>
	@@ -100,7 +101,7 @@
	#include "3w-9xxx.h"		#include "3w-9xxx.h"

	/* Globals */		/* Globals */
	#define TW_DRIVER_VERSION "2.26.02.012"		#define TW_DRIVER_VERSION "2.26.02.013"
	static TW_Device_Extension *twa_device_extension_list[TW_MAX_SLOT];		static TW_Device_Extension *twa_device_extension_list[TW_MAX_SLOT];
	static unsigned int twa_device_extension_count;		static unsigned int twa_device_extension_count;
	static int twa_major = -1;		static int twa_major = -1;
	@@ -1382,10 +1383,12 @@ static void twa_load_sgl(TW_Device_Extension tw_dev, TW_Command_Full full_comm
	newcommand = &full_command_packet->command.newcommand;		newcommand = &full_command_packet->command.newcommand;
	newcommand->request_id__lunl =		newcommand->request_id__lunl =
	cpu_to_le16(TW_REQ_LUN_IN(TW_LUN_OUT(newcommand->request_id__lunl), request_id));		cpu_to_le16(TW_REQ_LUN_IN(TW_LUN_OUT(newcommand->request_id__lunl), request_id));
			if (length) {
	newcommand->sg_list[0].address = TW_CPU_TO_SGL(dma_handle + sizeof(TW_Ioctl_Buf_Apache) - 1);		newcommand->sg_list[0].address = TW_CPU_TO_SGL(dma_handle + sizeof(TW_Ioctl_Buf_Apache) - 1);
	newcommand->sg_list[0].length = cpu_to_le32(length);		newcommand->sg_list[0].length = cpu_to_le32(length);
			}
	newcommand->sgl_entries__lunh =		newcommand->sgl_entries__lunh =
	cpu_to_le16(TW_REQ_LUN_IN(TW_LUN_OUT(newcommand->sgl_entries__lunh), 1));		cpu_to_le16(TW_REQ_LUN_IN(TW_LUN_OUT(newcommand->sgl_entries__lunh), length ? 1 : 0));
	} else {		} else {
	oldcommand = &full_command_packet->command.oldcommand;		oldcommand = &full_command_packet->command.oldcommand;
	oldcommand->request_id = request_id;		oldcommand->request_id = request_id;

drivers/scsi/Kconfig

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -388,6 +388,16 @@ config BLK_DEV_3W_XXXX_RAID
	Please read the comments at the top of		Please read the comments at the top of
	<file:drivers/scsi/3w-xxxx.c>.		<file:drivers/scsi/3w-xxxx.c>.

			config SCSI_HPSA
			tristate "HP Smart Array SCSI driver"
			depends on PCI && SCSI
			help
			This driver supports HP Smart Array Controllers (circa 2009).
			It is a SCSI alternative to the cciss driver, which is a block
			driver. Anyone wishing to use HP Smart Array controllers who
			would prefer the devices be presented to linux as SCSI devices,
			rather than as generic block devices should say Y here.

	config SCSI_3W_9XXX		config SCSI_3W_9XXX
	tristate "3ware 9xxx SATA-RAID support"		tristate "3ware 9xxx SATA-RAID support"
	depends on PCI && SCSI		depends on PCI && SCSI

drivers/scsi/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -91,6 +91,7 @@ obj-$(CONFIG_SCSI_BFA_FC) += bfa/
	obj-$(CONFIG_SCSI_PAS16) += pas16.o		obj-$(CONFIG_SCSI_PAS16) += pas16.o
	obj-$(CONFIG_SCSI_T128) += t128.o		obj-$(CONFIG_SCSI_T128) += t128.o
	obj-$(CONFIG_SCSI_DMX3191D) += dmx3191d.o		obj-$(CONFIG_SCSI_DMX3191D) += dmx3191d.o
			obj-$(CONFIG_SCSI_HPSA) += hpsa.o
	obj-$(CONFIG_SCSI_DTC3280) += dtc.o		obj-$(CONFIG_SCSI_DTC3280) += dtc.o
	obj-$(CONFIG_SCSI_SYM53C8XX_2) += sym53c8xx_2/		obj-$(CONFIG_SCSI_SYM53C8XX_2) += sym53c8xx_2/
	obj-$(CONFIG_SCSI_ZALON) += zalon7xx.o		obj-$(CONFIG_SCSI_ZALON) += zalon7xx.o