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

Commit 11604612 authored by Mahesh Rajashekhara's avatar Mahesh Rajashekhara Committed by James Bottomley
Browse files

[SCSI] aacraid: Added Sync.mode to support series 7/8/9 controllers 



Added Sync. mode to support Series 7/8/9 controller families: This is a
compatibility mode for all these controller families. The Async. (Performance)
mode can be changed in the future.  First Async. mode version added for Series
7; Controller parameter aac_sync_mode added

Signed-off-by: default avatarMahesh Rajashekhara <aacraid@pmc-sierra.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 70fc872c

drivers/scsi/aacraid/aachba.c

+4 −0
Original line number Diff line number Diff line
@@ -151,7 +151,11 @@ int aac_msi; 
int aac_commit = -1;

int startup_timeout = 180;

int aif_timeout = 120;

int aac_sync_mode;  /* Only Sync. transfer - disabled */



module_param(aac_sync_mode, int, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(aac_sync_mode, "Force sync. transfer mode"

	" 0=off, 1=on");

module_param(nondasd, int, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(nondasd, "Control scanning of hba for nondasd devices."

	" 0=off, 1=on");

drivers/scsi/aacraid/aacraid.h

+23 −4
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
 *----------------------------------------------------------------------------*/



#ifndef AAC_DRIVER_BUILD

# define AAC_DRIVER_BUILD 28000

# define AAC_DRIVER_BUILD 28900

# define AAC_DRIVER_BRANCH "-ms"

#endif

#define MAXIMUM_NUM_CONTAINERS	32
@@ -756,8 +756,16 @@ struct src_mu_registers { 


struct src_registers {

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

	union {

		struct {

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

			struct src_inbound IndexRegs;	/* 7fc60h */

		} tupelo;

		struct {

			__le32 reserved1[974];		/* c8h - fffh */

			struct src_inbound IndexRegs;	/* 1000h */

		} denali;

	} u;

};



#define src_readb(AEP, CSR)		readb(&((AEP)->regs.src.bar0->CSR))
@@ -999,6 +1007,10 @@ struct aac_bus_info_response { 
#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)

#define AAC_OPT_NEW_COMM_TYPE2		cpu_to_le32(1<<29)

#define AAC_OPT_NEW_COMM_TYPE3		cpu_to_le32(1<<30)

#define AAC_OPT_NEW_COMM_TYPE4		cpu_to_le32(1<<31)





struct aac_dev

{
@@ -1076,6 +1088,8 @@ struct aac_dev 
#	define AAC_MIN_FOOTPRINT_SIZE 8192

#	define AAC_MIN_SRC_BAR0_SIZE 0x400000

#	define AAC_MIN_SRC_BAR1_SIZE 0x800

#	define AAC_MIN_SRCV_BAR0_SIZE 0x100000

#	define AAC_MIN_SRCV_BAR1_SIZE 0x400

#endif

	union

	{
@@ -1116,7 +1130,10 @@ struct aac_dev 
	u8			msi;

	int			management_fib_count;

	spinlock_t		manage_lock;



	spinlock_t		sync_lock;

	int			sync_mode;

	struct fib		*sync_fib;

	struct list_head	sync_fib_list;

};



#define aac_adapter_interrupt(dev) \
@@ -1163,6 +1180,7 @@ struct aac_dev 


#define FIB_CONTEXT_FLAG_TIMED_OUT		(0x00000001)

#define FIB_CONTEXT_FLAG			(0x00000002)

#define FIB_CONTEXT_FLAG_WAIT			(0x00000004)



/*

 *	Define the command values
@@ -1970,6 +1988,7 @@ 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_srcv_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);

drivers/scsi/aacraid/comminit.c

+16 −5
Original line number Diff line number Diff line
@@ -325,12 +325,14 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev) 
{

	u32 status[5];

	struct Scsi_Host * host = dev->scsi_host_ptr;

	extern int aac_sync_mode;



	/*

	 *	Check the preferred comm settings, defaults from template.

	 */

	dev->management_fib_count = 0;

	spin_lock_init(&dev->manage_lock);

	spin_lock_init(&dev->sync_lock);

	dev->max_fib_size = sizeof(struct hw_fib);

	dev->sg_tablesize = host->sg_tablesize = (dev->max_fib_size

		- sizeof(struct aac_fibhdr)
@@ -344,13 +346,21 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev) 
	 		(status[0] == 0x00000001)) {

		if (status[1] & le32_to_cpu(AAC_OPT_NEW_COMM_64))

			dev->raw_io_64 = 1;

		if (dev->a_ops.adapter_comm) {

			if (status[1] & le32_to_cpu(AAC_OPT_NEW_COMM_TYPE1)) {

				dev->comm_interface = AAC_COMM_MESSAGE_TYPE1;

				dev->raw_io_interface = 1;

			} else if (status[1] & le32_to_cpu(AAC_OPT_NEW_COMM)) {

		dev->sync_mode = aac_sync_mode;

		if (dev->a_ops.adapter_comm &&

			(status[1] & le32_to_cpu(AAC_OPT_NEW_COMM))) {

				dev->comm_interface = AAC_COMM_MESSAGE;

				dev->raw_io_interface = 1;

			if ((status[1] & le32_to_cpu(AAC_OPT_NEW_COMM_TYPE1))) {

				/* driver supports TYPE1 (Tupelo) */

				dev->comm_interface = AAC_COMM_MESSAGE_TYPE1;

			} else if ((status[1] & le32_to_cpu(AAC_OPT_NEW_COMM_TYPE4)) ||

				  (status[1] & le32_to_cpu(AAC_OPT_NEW_COMM_TYPE3)) ||

				  (status[1] & le32_to_cpu(AAC_OPT_NEW_COMM_TYPE2))) {

					/* driver doesn't support TYPE2 (Series7), TYPE3 and TYPE4 */

					/* switch to sync. mode */

					dev->comm_interface = AAC_COMM_MESSAGE_TYPE1;

					dev->sync_mode = 1;

			}

		}

		if ((dev->comm_interface == AAC_COMM_MESSAGE) &&
@@ -455,6 +465,7 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev) 
	}

		

	INIT_LIST_HEAD(&dev->fib_list);

	INIT_LIST_HEAD(&dev->sync_fib_list);



	return dev;

}

drivers/scsi/aacraid/commsup.c

+26 −0
Original line number Diff line number Diff line
@@ -416,6 +416,7 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size, 
	unsigned long flags = 0;

	unsigned long qflags;

	unsigned long mflags = 0;

	unsigned long sflags = 0;





	if (!(hw_fib->header.XferState & cpu_to_le32(HostOwned)))
@@ -512,6 +513,31 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size, 
		spin_lock_irqsave(&fibptr->event_lock, flags);

	}



	if (dev->sync_mode) {

		if (wait)

			spin_unlock_irqrestore(&fibptr->event_lock, flags);

		spin_lock_irqsave(&dev->sync_lock, sflags);

		if (dev->sync_fib) {

			list_add_tail(&fibptr->fiblink, &dev->sync_fib_list);

			spin_unlock_irqrestore(&dev->sync_lock, sflags);

		} else {

			dev->sync_fib = fibptr;

			spin_unlock_irqrestore(&dev->sync_lock, sflags);

			aac_adapter_sync_cmd(dev, SEND_SYNCHRONOUS_FIB,

				(u32)fibptr->hw_fib_pa, 0, 0, 0, 0, 0,

				NULL, NULL, NULL, NULL, NULL);

		}

		if (wait) {

			fibptr->flags |= FIB_CONTEXT_FLAG_WAIT;

			if (down_interruptible(&fibptr->event_wait)) {

				fibptr->flags &= ~FIB_CONTEXT_FLAG_WAIT;

				return -EFAULT;

			}

			return 0;

		}

		return -EINPROGRESS;

	}



	if (aac_adapter_deliver(fibptr) != 0) {

		printk(KERN_ERR "aac_fib_send: returned -EBUSY\n");

		if (wait) {

drivers/scsi/aacraid/linit.c

+25 −3
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 


#include "aacraid.h"



#define AAC_DRIVER_VERSION		"1.1-7"

#define AAC_DRIVER_VERSION		"1.2-0"

#ifndef AAC_DRIVER_BRANCH

#define AAC_DRIVER_BRANCH		""

#endif
@@ -162,7 +162,10 @@ static const struct pci_device_id aac_pci_tbl[] __devinitdata = { 
	{ 0x9005, 0x0285, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 59 }, /* Adaptec Catch All */

	{ 0x9005, 0x0286, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 60 }, /* Adaptec Rocket Catch All */

	{ 0x9005, 0x0288, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 61 }, /* Adaptec NEMER/ARK Catch All */

	{ 0x9005, 0x028b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 62 }, /* Adaptec PMC Catch All */

	{ 0x9005, 0x028b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 62 }, /* Adaptec PMC Series 6 (Tupelo) */

	{ 0x9005, 0x028c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 63 }, /* Adaptec PMC Series 7 (Denali) */

	{ 0x9005, 0x028d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 64 }, /* Adaptec PMC Series 8 */

	{ 0x9005, 0x028f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 65 }, /* Adaptec PMC Series 9 */

	{ 0,}

};

MODULE_DEVICE_TABLE(pci, aac_pci_tbl);
@@ -238,7 +241,10 @@ static struct aac_driver_ident aac_drivers[] = { 
	{ aac_rx_init, "aacraid",  "ADAPTEC ", "RAID            ", 2 }, /* Adaptec Catch All */

	{ aac_rkt_init, "aacraid", "ADAPTEC ", "RAID            ", 2 }, /* Adaptec Rocket Catch All */

	{ aac_nark_init, "aacraid", "ADAPTEC ", "RAID           ", 2 }, /* Adaptec NEMER/ARK Catch All */

	{ aac_src_init, "aacraid", "ADAPTEC ", "RAID            ", 2 } /* Adaptec PMC Catch All */

	{ aac_src_init, "aacraid", "ADAPTEC ", "RAID            ", 2 }, /* Adaptec PMC Series 6 (Tupelo) */

	{ aac_srcv_init, "aacraid", "ADAPTEC ", "RAID            ", 2 }, /* Adaptec PMC Series 7 (Denali) */

	{ aac_srcv_init, "aacraid", "ADAPTEC ", "RAID            ", 2 }, /* Adaptec PMC Series 8 */

	{ aac_srcv_init, "aacraid", "ADAPTEC ", "RAID            ", 2 } /* Adaptec PMC Series 9 */

};



/**
@@ -1102,6 +1108,7 @@ static int __devinit aac_probe_one(struct pci_dev *pdev, 
	int error = -ENODEV;

	int unique_id = 0;

	u64 dmamask;

	extern int aac_sync_mode;



	list_for_each_entry(aac, &aac_devices, entry) {

		if (aac->id > unique_id)
@@ -1162,6 +1169,21 @@ static int __devinit aac_probe_one(struct pci_dev *pdev, 
	if ((*aac_drivers[index].init)(aac))

		goto out_unmap;



	if (aac->sync_mode) {

		if (aac_sync_mode)

			printk(KERN_INFO "%s%d: Sync. mode enforced "

				"by driver parameter. This will cause "

				"a significant performance decrease!\n",

				aac->name,

				aac->id);

		else

			printk(KERN_INFO "%s%d: Async. mode not supported "

				"by current driver, sync. mode enforced."

				"\nPlease update driver to get full performance.\n",

				aac->name,

				aac->id);

	}



	/*

	 *	Start any kernel threads needed

	 */