Commit 9f34217c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: (55 commits)
  [SCSI] tcm_loop: Add multi-fabric Linux/SCSI LLD fabric module
  [SCSI] qla4xxx: Use polling mode for disable interrupt mailbox completion
  [SCSI] Revert "[SCSI] Retrieve the Caching mode page"
  [SCSI] bnx2fc: IO completion not processed due to missed wakeup
  [SCSI] qla4xxx: Update driver version to 5.02.00-k6
  [SCSI] qla4xxx: masking required bits of add_fw_options during initialization
  [SCSI] qla4xxx: added new function qla4xxx_relogin_all_devices
  [SCSI] qla4xxx: add support for ql4xsess_recovery_tmo cmd line param
  [SCSI] qla4xxx: Add support for ql4xmaxqdepth command line parameter
  [SCSI] qla4xxx: cleanup function qla4xxx_process_ddb_changed
  [SCSI] qla4xxx: Prevent other port reinitialization during remove_adapter
  [SCSI] qla4xxx: remove unused ddb flag DF_NO_RELOGIN
  [SCSI] qla4xxx: cleanup DDB relogin logic during initialization
  [SCSI] qla4xxx: Do not retry ISP82XX initialization if H/W state is failed
  [SCSI] qla4xxx: Do not send mbox command if FW is in failed state
  [SCSI] qla4xxx: cleanup qla4xxx_initialize_ddb_list()
  [SCSI] ses: add subenclosure support
  [SCSI] bnx2fc: Bump version to 1.0.1
  [SCSI] bnx2fc: Remove unnecessary module state checks
  [SCSI] bnx2fc: Fix MTU issue by using static MTU
  ...
parents 95e14ed7 3703b2c5

Documentation/target/tcm_mod_builder.py

+9 −9
Original line number Diff line number Diff line
@@ -239,8 +239,8 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
	buf += "#include <target/target_core_configfs.h>\n"

	buf += "#include <target/target_core_base.h>\n"

	buf += "#include <target/configfs_macros.h>\n\n"

	buf += "#include <" + fabric_mod_name + "_base.h>\n"

	buf += "#include <" + fabric_mod_name + "_fabric.h>\n\n"

	buf += "#include \"" + fabric_mod_name + "_base.h\"\n"

	buf += "#include \"" + fabric_mod_name + "_fabric.h\"\n\n"



	buf += "/* Local pointer to allocated TCM configfs fabric module */\n"

	buf += "struct target_fabric_configfs *" + fabric_mod_name + "_fabric_configfs;\n\n"
@@ -289,6 +289,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
	buf += "{\n"

	buf += "	struct " + fabric_mod_name + "_nacl *nacl = container_of(se_acl,\n"

	buf += "				struct " + fabric_mod_name + "_nacl, se_node_acl);\n"

	buf += "	core_tpg_del_initiator_node_acl(se_acl->se_tpg, se_acl, 1);\n"

	buf += "	kfree(nacl);\n"

	buf += "}\n\n"
@@ -583,9 +584,9 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
	buf += "#include <target/target_core_fabric_lib.h>\n"

	buf += "#include <target/target_core_device.h>\n"

	buf += "#include <target/target_core_tpg.h>\n"

	buf += "#include <target/target_core_configfs.h>\n"

	buf += "#include <" + fabric_mod_name + "_base.h>\n"

	buf += "#include <" + fabric_mod_name + "_fabric.h>\n\n"

	buf += "#include <target/target_core_configfs.h>\n\n"

	buf += "#include \"" + fabric_mod_name + "_base.h\"\n"

	buf += "#include \"" + fabric_mod_name + "_fabric.h\"\n\n"



	buf += "int " + fabric_mod_name + "_check_true(struct se_portal_group *se_tpg)\n"

	buf += "{\n"
@@ -973,14 +974,13 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
def tcm_mod_build_kbuild(fabric_mod_dir_var, fabric_mod_name):



	buf = ""

	f = fabric_mod_dir_var + "/Kbuild"

	f = fabric_mod_dir_var + "/Makefile"

	print "Writing file: " + f



	p = open(f, 'w')

	if not p:

		tcm_mod_err("Unable to open file: " + f)



	buf = "EXTRA_CFLAGS += -I$(srctree)/drivers/target/ -I$(srctree)/include/ -I$(srctree)/drivers/scsi/ -I$(srctree)/include/scsi/ -I$(srctree)/drivers/target/" + fabric_mod_name + "\n\n"

	buf += fabric_mod_name + "-objs			:= " + fabric_mod_name + "_fabric.o \\\n"

	buf += "					   " + fabric_mod_name + "_configfs.o\n"

	buf += "obj-$(CONFIG_" + fabric_mod_name.upper() + ")		+= " + fabric_mod_name + ".o\n"
@@ -1018,7 +1018,7 @@ def tcm_mod_build_kconfig(fabric_mod_dir_var, fabric_mod_name): 


def tcm_mod_add_kbuild(tcm_dir, fabric_mod_name):

	buf = "obj-$(CONFIG_" + fabric_mod_name.upper() + ")	+= " + fabric_mod_name.lower() + "/\n"

	kbuild = tcm_dir + "/drivers/target/Kbuild"

	kbuild = tcm_dir + "/drivers/target/Makefile"



	f = open(kbuild, 'a')

	f.write(buf)
@@ -1064,7 +1064,7 @@ def main(modname, proto_ident): 
	tcm_mod_build_kbuild(fabric_mod_dir, fabric_mod_name)

	tcm_mod_build_kconfig(fabric_mod_dir, fabric_mod_name)



	input = raw_input("Would you like to add " + fabric_mod_name + "to drivers/target/Kbuild..? [yes,no]: ")

	input = raw_input("Would you like to add " + fabric_mod_name + "to drivers/target/Makefile..? [yes,no]: ")

	if input == "yes" or input == "y":

		tcm_mod_add_kbuild(tcm_dir, fabric_mod_name)

drivers/scsi/aacraid/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,6 @@ 
obj-$(CONFIG_SCSI_AACRAID) := aacraid.o



aacraid-objs	:= linit.o aachba.o commctrl.o comminit.o commsup.o \

		   dpcsup.o rx.o sa.o rkt.o nark.o

		   dpcsup.o rx.o sa.o rkt.o nark.o src.o



ccflags-y	:= -Idrivers/scsi

drivers/scsi/aacraid/aachba.c

+5 −2
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ 
 * based on the old aacraid driver that is..

 * Adaptec aacraid device driver for Linux.

 *

 * Copyright (c) 2000-2007 Adaptec, Inc. (aacraid@adaptec.com)

 * Copyright (c) 2000-2010 Adaptec, Inc.

 *               2010 PMC-Sierra, Inc. (aacraid@pmc-sierra.com)

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by
@@ -1486,6 +1487,8 @@ int aac_get_adapter_info(struct aac_dev* dev) 
			dev->a_ops.adapter_write = aac_write_block;

		}

		dev->scsi_host_ptr->max_sectors = AAC_MAX_32BIT_SGBCOUNT;

		if (dev->adapter_info.options & AAC_OPT_NEW_COMM_TYPE1)

			dev->adapter_info.options |= AAC_OPT_NEW_COMM;

		if (!(dev->adapter_info.options & AAC_OPT_NEW_COMM)) {

			/*

			 * Worst case size that could cause sg overflow when

drivers/scsi/aacraid/aacraid.h

+96 −10
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
 *----------------------------------------------------------------------------*/



#ifndef AAC_DRIVER_BUILD

# define AAC_DRIVER_BUILD 26400

# define AAC_DRIVER_BUILD 28000

# define AAC_DRIVER_BRANCH "-ms"

#endif

#define MAXIMUM_NUM_CONTAINERS	32
@@ -277,6 +277,16 @@ enum aac_queue_types { 


#define		FsaNormal	1



/* transport FIB header (PMC) */

struct aac_fib_xporthdr {

	u64	HostAddress;	/* FIB host address w/o xport header */

	u32	Size;		/* FIB size excluding xport header */

	u32	Handle;		/* driver handle to reference the FIB */

	u64	Reserved[2];

};



#define		ALIGN32		32



/*

 * Define the FIB. The FIB is the where all the requested data and

 * command information are put to the application on the FSA adapter.
@@ -394,7 +404,9 @@ enum fib_xfer_state { 
	AdapterMicroFib			= (1<<17),

	BIOSFibPath			= (1<<18),

	FastResponseCapable		= (1<<19),

	ApiFib				= (1<<20)	// Its an API Fib.

	ApiFib				= (1<<20),	/* Its an API Fib */

	/* PMC NEW COMM: There is no more AIF data pending */

	NoMoreAifDataAvailable		= (1<<21)

};



/*
@@ -404,6 +416,7 @@ enum fib_xfer_state { 


#define ADAPTER_INIT_STRUCT_REVISION		3

#define ADAPTER_INIT_STRUCT_REVISION_4		4 // rocket science

#define ADAPTER_INIT_STRUCT_REVISION_6		6 /* PMC src */



struct aac_init

{
@@ -428,9 +441,15 @@ struct aac_init 
#define INITFLAGS_NEW_COMM_SUPPORTED	0x00000001

#define INITFLAGS_DRIVER_USES_UTC_TIME	0x00000010

#define INITFLAGS_DRIVER_SUPPORTS_PM	0x00000020

#define INITFLAGS_NEW_COMM_TYPE1_SUPPORTED	0x00000041

	__le32	MaxIoCommands;	/* max outstanding commands */

	__le32	MaxIoSize;	/* largest I/O command */

	__le32	MaxFibSize;	/* largest FIB to adapter */

	/* ADAPTER_INIT_STRUCT_REVISION_5 begins here */

	__le32	MaxNumAif;	/* max number of aif */

	/* ADAPTER_INIT_STRUCT_REVISION_6 begins here */

	__le32	HostRRQ_AddrLow;

	__le32	HostRRQ_AddrHigh;	/* Host RRQ (response queue) for SRC */

};



enum aac_log_level {
@@ -685,7 +704,7 @@ struct rx_inbound { 
#define OutboundDoorbellReg	MUnit.ODR



struct rx_registers {

	struct rx_mu_registers		MUnit;		/* 1300h - 1344h */

	struct rx_mu_registers		MUnit;		/* 1300h - 1347h */

	__le32				reserved1[2];	/* 1348h - 134ch */

	struct rx_inbound		IndexRegs;

};
@@ -703,7 +722,7 @@ struct rx_registers { 
#define rkt_inbound rx_inbound



struct rkt_registers {

	struct rkt_mu_registers		MUnit;		 /* 1300h - 1344h */

	struct rkt_mu_registers		MUnit;		 /* 1300h - 1347h */

	__le32				reserved1[1006]; /* 1348h - 22fch */

	struct rkt_inbound		IndexRegs;	 /* 2300h - */

};
@@ -713,6 +732,44 @@ struct rkt_registers { 
#define rkt_writeb(AEP, CSR, value)	writeb(value, &((AEP)->regs.rkt->CSR))

#define rkt_writel(AEP, CSR, value)	writel(value, &((AEP)->regs.rkt->CSR))



/*

 * PMC SRC message unit registers

 */



#define src_inbound rx_inbound



struct src_mu_registers {

				/*	PCI*| Name */

	__le32	reserved0[8];	/*	00h | Reserved */

	__le32	IDR;		/*	20h | Inbound Doorbell Register */

	__le32	IISR;		/*	24h | Inbound Int. Status Register */

	__le32	reserved1[3];	/*	28h | Reserved */

	__le32	OIMR;		/*	34h | Outbound Int. Mask Register */

	__le32	reserved2[25];	/*	38h | Reserved */

	__le32	ODR_R;		/*	9ch | Outbound Doorbell Read */

	__le32	ODR_C;		/*	a0h | Outbound Doorbell Clear */

	__le32	reserved3[6];	/*	a4h | Reserved */

	__le32	OMR;		/*	bch | Outbound Message Register */

	__le32	IQ_L;		/*  c0h | Inbound Queue (Low address) */

	__le32	IQ_H;		/*  c4h | Inbound Queue (High address) */

};



struct src_registers {

	struct src_mu_registers MUnit;	/* 00h - c7h */

	__le32 reserved1[130790];	/* c8h - 7fc5fh */

	struct src_inbound IndexRegs;	/* 7fc60h */

};



#define src_readb(AEP, CSR)		readb(&((AEP)->regs.src.bar0->CSR))

#define src_readl(AEP, CSR)		readl(&((AEP)->regs.src.bar0->CSR))

#define src_writeb(AEP, CSR, value)	writeb(value, \

						&((AEP)->regs.src.bar0->CSR))

#define src_writel(AEP, CSR, value)	writel(value, \

						&((AEP)->regs.src.bar0->CSR))



#define SRC_ODR_SHIFT		12

#define SRC_IDR_SHIFT		9



typedef void (*fib_callback)(void *ctxt, struct fib *fibctx);



struct aac_fib_context {
@@ -879,6 +936,7 @@ struct aac_supplement_adapter_info 
#define AAC_OPTION_MU_RESET		cpu_to_le32(0x00000001)

#define AAC_OPTION_IGNORE_RESET		cpu_to_le32(0x00000002)

#define AAC_OPTION_POWER_MANAGEMENT	cpu_to_le32(0x00000004)

#define AAC_OPTION_DOORBELL_RESET	cpu_to_le32(0x00004000)

#define AAC_SIS_VERSION_V3	3

#define AAC_SIS_SLOT_UNKNOWN	0xFF
@@ -940,6 +998,7 @@ struct aac_bus_info_response { 
#define AAC_OPT_SUPPLEMENT_ADAPTER_INFO	cpu_to_le32(1<<16)

#define AAC_OPT_NEW_COMM		cpu_to_le32(1<<17)

#define AAC_OPT_NEW_COMM_64		cpu_to_le32(1<<18)

#define AAC_OPT_NEW_COMM_TYPE1		cpu_to_le32(1<<28)



struct aac_dev

{
@@ -952,6 +1011,7 @@ struct aac_dev 
	 */

	unsigned		max_fib_size;

	unsigned		sg_tablesize;

	unsigned		max_num_aif;



	/*

	 *	Map for 128 fib objects (64k)
@@ -980,10 +1040,21 @@ struct aac_dev 
	struct adapter_ops	a_ops;

	unsigned long		fsrev;		/* Main driver's revision number */



	unsigned		base_size;	/* Size of mapped in region */

	unsigned long		dbg_base;	/* address of UART

						 * debug buffer */



	unsigned		base_size, dbg_size;	/* Size of

							 *  mapped in region */



	struct aac_init		*init;		/* Holds initialization info to communicate with adapter */

	dma_addr_t		init_pa;	/* Holds physical address of the init struct */



	u32			*host_rrq;	/* response queue

						 * if AAC_COMM_MESSAGE_TYPE1 */



	dma_addr_t		host_rrq_pa;	/* phys. address */

	u32			host_rrq_idx;	/* index into rrq buffer */



	struct pci_dev		*pdev;		/* Our PCI interface */

	void *			printfbuf;	/* pointer to buffer used for printf's from the adapter */

	void *			comm_addr;	/* Base address of Comm area */
@@ -1003,14 +1074,20 @@ struct aac_dev 
	 */

#ifndef AAC_MIN_FOOTPRINT_SIZE

#	define AAC_MIN_FOOTPRINT_SIZE 8192

#	define AAC_MIN_SRC_BAR0_SIZE 0x400000

#	define AAC_MIN_SRC_BAR1_SIZE 0x800

#endif

	union

	{

		struct sa_registers __iomem *sa;

		struct rx_registers __iomem *rx;

		struct rkt_registers __iomem *rkt;

		struct {

			struct src_registers __iomem *bar0;

			char __iomem *bar1;

		} src;

	} regs;

	volatile void __iomem *base;

	volatile void __iomem *base, *dbg_base_mapped;

	volatile struct rx_inbound __iomem *IndexRegs;

	u32			OIMR; /* Mask Register Cache */

	/*
@@ -1031,9 +1108,8 @@ struct aac_dev 
	u8			comm_interface;

#	define AAC_COMM_PRODUCER 0

#	define AAC_COMM_MESSAGE  1

	/* macro side-effects BEWARE */

#	define			raw_io_interface \

	  init->InitStructRevision==cpu_to_le32(ADAPTER_INIT_STRUCT_REVISION_4)

#	define AAC_COMM_MESSAGE_TYPE1	3

	u8			raw_io_interface;

	u8			raw_io_64;

	u8			printf_enabled;

	u8			in_reset;
@@ -1789,6 +1865,10 @@ extern struct aac_common aac_config; 
#define DoorBellAdapterNormCmdNotFull	(1<<3)	/* Adapter -> Host */

#define DoorBellAdapterNormRespNotFull	(1<<4)	/* Adapter -> Host */

#define DoorBellPrintfReady		(1<<5)	/* Adapter -> Host */

#define DoorBellAifPending		(1<<6)	/* Adapter -> Host */



/* PMC specific outbound doorbell bits */

#define PmDoorBellResponseSent		(1<<1)	/* Adapter -> Host */



/*

 *	For FIB communication, we need all of the following things
@@ -1831,6 +1911,9 @@ extern struct aac_common aac_config; 
#define		AifReqAPIJobUpdate	109	/* Update a job report from the API */

#define		AifReqAPIJobFinish	110	/* Finish a job from the API */



/* PMC NEW COMM: Request the event data */

#define		AifReqEvent		200



/*

 *	Adapter Initiated FIB command structures. Start with the adapter

 *	initiated FIBs that really come from the adapter, and get responded
@@ -1886,10 +1969,13 @@ int aac_rx_init(struct aac_dev *dev); 
int aac_rkt_init(struct aac_dev *dev);

int aac_nark_init(struct aac_dev *dev);

int aac_sa_init(struct aac_dev *dev);

int aac_src_init(struct aac_dev *dev);

int aac_queue_get(struct aac_dev * dev, u32 * index, u32 qid, struct hw_fib * hw_fib, int wait, struct fib * fibptr, unsigned long *nonotify);

unsigned int aac_response_normal(struct aac_queue * q);

unsigned int aac_command_normal(struct aac_queue * q);

unsigned int aac_intr_normal(struct aac_dev * dev, u32 Index);

unsigned int aac_intr_normal(struct aac_dev *dev, u32 Index,

			int isAif, int isFastResponse,

			struct hw_fib *aif_fib);

int aac_reset_adapter(struct aac_dev * dev, int forced);

int aac_check_health(struct aac_dev * dev);

int aac_command_thread(void *data);

drivers/scsi/aacraid/commctrl.c

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ 
 * based on the old aacraid driver that is..

 * Adaptec aacraid device driver for Linux.

 *

 * Copyright (c) 2000-2007 Adaptec, Inc. (aacraid@adaptec.com)

 * Copyright (c) 2000-2010 Adaptec, Inc.

 *               2010 PMC-Sierra, Inc. (aacraid@pmc-sierra.com)

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

CRA Git | Maintained and supported by SUSTech CRA and CCSE