Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6 (9600c11b) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/message/fusion/Kconfig

+17 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,23 @@ config FUSION_FC
		LSIFC929X
		LSIFC929XL

		config FUSION_SAS
		tristate "Fusion MPT ScsiHost drivers for SAS"
		depends on PCI && SCSI
		select FUSION
		select SCSI_SAS_ATTRS
		---help---
		SCSI HOST support for a SAS host adapters.

		List of supported controllers:

		LSISAS1064
		LSISAS1066
		LSISAS1068
		LSISAS1064E
		LSISAS1066E
		LSISAS1068E

		config FUSION_MAX_SGE
		int "Maximum number of scatter gather entries (16 - 128)"
		depends on FUSION

drivers/message/fusion/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -34,5 +34,6 @@

		obj-$(CONFIG_FUSION_SPI) += mptbase.o mptscsih.o mptspi.o
		obj-$(CONFIG_FUSION_FC) += mptbase.o mptscsih.o mptfc.o
		obj-$(CONFIG_FUSION_SAS) += mptbase.o mptscsih.o mptsas.o
		obj-$(CONFIG_FUSION_CTL) += mptctl.o
		obj-$(CONFIG_FUSION_LAN) += mptlan.o

drivers/message/fusion/mptbase.c

+724 −239

File changed.

Preview size limit exceeded, changes collapsed.

drivers/message/fusion/mptbase.h

+41 −15

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@
		#include "lsi/mpi_fc.h" /* Fibre Channel (lowlevel) support */
		#include "lsi/mpi_targ.h" /* SCSI/FCP Target protcol support */
		#include "lsi/mpi_tool.h" /* Tools support */
		#include "lsi/mpi_sas.h" /* SAS support */

		/=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=/

		@@ -76,8 +77,8 @@
		#define COPYRIGHT "Copyright (c) 1999-2005 " MODULEAUTHOR
		#endif

		#define MPT_LINUX_VERSION_COMMON "3.03.02"
		#define MPT_LINUX_PACKAGE_NAME "@(#)mptlinux-3.03.02"
		#define MPT_LINUX_VERSION_COMMON "3.03.03"
		#define MPT_LINUX_PACKAGE_NAME "@(#)mptlinux-3.03.03"
		#define WHAT_MAGIC_STRING "@" "(" "#" ")"

		#define show_mptmod_ver(s,ver) \
		@@ -423,7 +424,7 @@ typedef struct _MPT_IOCTL {
		/*
		* Event Structure and define
		*/
		#define MPTCTL_EVENT_LOG_SIZE (0x0000000A)
		#define MPTCTL_EVENT_LOG_SIZE (0x000000032)
		typedef struct _mpt_ioctl_events {
		u32 event; /* Specified by define above */
		u32 eventContext; /* Index or counter */
		@@ -451,16 +452,13 @@ typedef struct _mpt_ioctl_events {
		#define MPT_SCSICFG_ALL_IDS 0x02 /* WriteSDP1 to all IDS */
		/* #define MPT_SCSICFG_BLK_NEGO 0x10 WriteSDP1 with WDTR and SDTR disabled */

		typedef struct _ScsiCfgData {
		typedef struct _SpiCfgData {
		u32 PortFlags;
		int nvram; / table of device NVRAM values */
		IOCPage2_t pIocPg2; / table of Raid Volumes */
		IOCPage3_t pIocPg3; / table of physical disks */
		IOCPage4_t pIocPg4; / SEP devices addressing */
		dma_addr_t IocPg4_dma; /* Phys Addr of IOCPage4 data */
		int IocPg4Sz; /* IOCPage4 size */
		u8 dvStatus[MPT_MAX_SCSI_DEVICES];
		int isRaid; /* bit field, 1 if RAID */
		u8 minSyncFactor; /* 0xFF if async */
		u8 maxSyncOffset; /* 0 if async */
		u8 maxBusWidth; /* 0 if narrow, 1 if wide */
		@@ -472,10 +470,28 @@ typedef struct _ScsiCfgData {
		u8 dvScheduled; /* 1 if scheduled */
		u8 forceDv; /* 1 to force DV scheduling */
		u8 noQas; /* Disable QAS for this adapter */
		u8 Saf_Te; /* 1 to force all Processors as SAF-TE if Inquiry data length is too short to check for SAF-TE */
		u8 Saf_Te; /* 1 to force all Processors as
		* SAF-TE if Inquiry data length
		* is too short to check for SAF-TE
		*/
		u8 mpt_dv; /* command line option: enhanced=1, basic=0 */
		u8 bus_reset; /* 1 to allow bus reset */
		u8 rsvd[1];
		} ScsiCfgData;
		}SpiCfgData;

		typedef struct _SasCfgData {
		u8 ptClear; /* 1 to automatically clear the
		* persistent table.
		* 0 to disable
		* automatic clearing.
		*/
		}SasCfgData;

		typedef struct _RaidCfgData {
		IOCPage2_t pIocPg2; / table of Raid Volumes */
		IOCPage3_t pIocPg3; / table of physical disks */
		int isRaid; /* bit field, 1 if RAID */
		}RaidCfgData;

		/*
		* Adapter Structure - pci_dev specific. Maximum: MPT_MAX_ADAPTERS
		@@ -530,11 +546,16 @@ typedef struct _MPT_ADAPTER
		u8 *sense_buf_pool;
		dma_addr_t sense_buf_pool_dma;
		u32 sense_buf_low_dma;
		u8 HostPageBuffer; / SAS - host page buffer support */
		u32 HostPageBuffer_sz;
		dma_addr_t HostPageBuffer_dma;
		int mtrr_reg;
		struct pci_dev pcidev; / struct pci_dev pointer */
		u8 __iomem memmap; / mmap address */
		struct Scsi_Host sh; / Scsi Host pointer */
		ScsiCfgData spi_data; /* Scsi config. data */
		SpiCfgData spi_data; /* Scsi config. data */
		RaidCfgData raid_data; /* Raid config. data */
		SasCfgData sas_data; /* Sas config. data */
		MPT_IOCTL ioctl; / ioctl data pointer */
		struct proc_dir_entry *ioc_dentry;
		struct _MPT_ADAPTER alt_ioc; / ptr to 929 bound adapter port */
		@@ -560,6 +581,9 @@ typedef struct _MPT_ADAPTER
		IOCFactsReply_t facts;
		PortFactsReply_t pfacts[2];
		FCPortPage0_t fc_port_page0[2];
		struct timer_list persist_timer; /* persist table timer */
		int persist_wait_done; /* persist completion flag */
		u8 persist_reply_frame[MPT_DEFAULT_FRAME_SIZE]; /* persist reply */
		LANPage0_t lan_cnfg_page0;
		LANPage1_t lan_cnfg_page1;
		/*
		@@ -579,6 +603,7 @@ typedef struct _MPT_ADAPTER
		int InternalCtx;
		struct list_head list;
		struct net_device *netdev;
		struct list_head sas_topology;
		} MPT_ADAPTER;

		/*
		@@ -964,6 +989,7 @@ extern void mpt_alloc_fw_memory(MPT_ADAPTER *ioc, int size);
		extern void mpt_free_fw_memory(MPT_ADAPTER *ioc);
		extern int mpt_findImVolumes(MPT_ADAPTER *ioc);
		extern int mpt_read_ioc_pg_3(MPT_ADAPTER *ioc);
		extern int mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode);

		/*
		* Public data decl's...

drivers/message/fusion/mptctl.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1326,7 +1326,7 @@ mptctl_gettargetinfo (unsigned long arg)
		*/
		if (hd && hd->Targets) {
		mpt_findImVolumes(ioc);
		pIoc2 = ioc->spi_data.pIocPg2;
		pIoc2 = ioc->raid_data.pIocPg2;
		for ( id = 0; id <= max_id; ) {
		if ( pIoc2 && pIoc2->NumActiveVolumes ) {
		if ( id == pIoc2->RaidVolume[0].VolumeID ) {
		@@ -1348,7 +1348,7 @@ mptctl_gettargetinfo (unsigned long arg)
		--maxWordsLeft;
		goto next_id;
		} else {
		pIoc3 = ioc->spi_data.pIocPg3;
		pIoc3 = ioc->raid_data.pIocPg3;
		for ( jj = 0; jj < pIoc3->NumPhysDisks; jj++ ) {
		if ( pIoc3->PhysDisk[jj].PhysDiskID == id )
		goto next_id;