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

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

[SCSI] aacraid: 1024 max outstanding command support for Series 7 and above 



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

drivers/scsi/aacraid/aacraid.h

+6 −2
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@ 
 *----------------------------------------------------------------------------*/



#ifndef AAC_DRIVER_BUILD

# define AAC_DRIVER_BUILD 29801

# define AAC_DRIVER_BUILD 30000

# define AAC_DRIVER_BRANCH "-ms"

#endif

#define MAXIMUM_NUM_CONTAINERS	32



#define AAC_NUM_MGT_FIB         8

#define AAC_NUM_IO_FIB		(512 - AAC_NUM_MGT_FIB)

#define AAC_NUM_IO_FIB		(1024 - AAC_NUM_MGT_FIB)

#define AAC_NUM_FIB		(AAC_NUM_IO_FIB + AAC_NUM_MGT_FIB)



#define AAC_MAX_LUN		(8)
@@ -36,6 +36,10 @@ 
#define CONTAINER_TO_ID(cont)		(cont)

#define CONTAINER_TO_LUN(cont)		(0)



#define PMC_DEVICE_S7	0x28c

#define PMC_DEVICE_S8	0x28d

#define PMC_DEVICE_S9	0x28f



#define aac_phys_to_logical(x)  ((x)+1)

#define aac_logical_to_phys(x)  ((x)?(x)-1:0)

drivers/scsi/aacraid/comminit.c

+10 −1
Original line number Diff line number Diff line
@@ -404,6 +404,12 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev) 
		dev->max_fib_size = status[1] & 0xFFE0;

		host->sg_tablesize = status[2] >> 16;

		dev->sg_tablesize = status[2] & 0xFFFF;

		if (dev->pdev->device == PMC_DEVICE_S7 ||

		    dev->pdev->device == PMC_DEVICE_S8 ||

		    dev->pdev->device == PMC_DEVICE_S9)

			host->can_queue = ((status[3] >> 16) ? (status[3] >> 16) :

				(status[3] & 0xFFFF)) - AAC_NUM_MGT_FIB;

		else

			host->can_queue = (status[3] & 0xFFFF) - AAC_NUM_MGT_FIB;

		dev->max_num_aif = status[4] & 0xFFFF;

		/*
@@ -452,6 +458,9 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev) 
		}

	}



	if (host->can_queue > AAC_NUM_IO_FIB)

		host->can_queue = AAC_NUM_IO_FIB;



	/*

	 *	Ok now init the communication subsystem

	 */