Skip to content

L
linux-davinci-2.6.23
Commit f880632f authored by Mike Miller's avatar Mike Miller Committed by Linus Torvalds
Browse files
Options

[PATCH] cciss: increase number of commands on controller 

Remove #define NR_CMDS and replace it w/hba[i]->nr_cmds.  Most Smart Array
controllers can support up to 1024 commands but the E200 family can only
support 128.  To prevent annoying "fifo full" messages we define nr_cmds on a
per controller basis by adding it the product table.
Signed-off-by: default avatarMike Miller <mike.miller@hp.com>
Acked-by: default avatarJens Axboe <jens.axboe@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4ff9a9a4
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 36 deletions
drivers/block/cciss.c
View file @ f880632f
...@@ -93,28 +93,29 @@ MODULE_DEVICE_TABLE(pci, cciss_pci_device_id); ...@@ -93,28 +93,29 @@ MODULE_DEVICE_TABLE(pci, cciss_pci_device_id);
/* board_id = Subsystem Device ID & Vendor ID /* board_id = Subsystem Device ID & Vendor ID
* product = Marketing Name for the board * product = Marketing Name for the board
* access = Address of the struct of function pointers * access = Address of the struct of function pointers
* nr_cmds = Number of commands supported by controller
*/ */
static struct board_type products[] = { static struct board_type products[] = {
{0x40700E11, "Smart Array 5300", &SA5_access}, {0x40700E11, "Smart Array 5300", &SA5_access, 512},
{0x40800E11, "Smart Array 5i", &SA5B_access}, {0x40800E11, "Smart Array 5i", &SA5B_access, 512},
{0x40820E11, "Smart Array 532", &SA5B_access}, {0x40820E11, "Smart Array 532", &SA5B_access, 512},
{0x40830E11, "Smart Array 5312", &SA5B_access}, {0x40830E11, "Smart Array 5312", &SA5B_access, 512},
{0x409A0E11, "Smart Array 641", &SA5_access}, {0x409A0E11, "Smart Array 641", &SA5_access, 512},
{0x409B0E11, "Smart Array 642", &SA5_access}, {0x409B0E11, "Smart Array 642", &SA5_access, 512},
{0x409C0E11, "Smart Array 6400", &SA5_access}, {0x409C0E11, "Smart Array 6400", &SA5_access, 512},
{0x409D0E11, "Smart Array 6400 EM", &SA5_access}, {0x409D0E11, "Smart Array 6400 EM", &SA5_access, 512},
{0x40910E11, "Smart Array 6i", &SA5_access}, {0x40910E11, "Smart Array 6i", &SA5_access, 512},
{0x3225103C, "Smart Array P600", &SA5_access}, {0x3225103C, "Smart Array P600", &SA5_access, 512},
{0x3223103C, "Smart Array P800", &SA5_access}, {0x3223103C, "Smart Array P800", &SA5_access, 512},
{0x3234103C, "Smart Array P400", &SA5_access}, {0x3234103C, "Smart Array P400", &SA5_access, 512},
{0x3235103C, "Smart Array P400i", &SA5_access}, {0x3235103C, "Smart Array P400i", &SA5_access, 512},
{0x3211103C, "Smart Array E200i", &SA5_access}, {0x3211103C, "Smart Array E200i", &SA5_access, 120},
{0x3212103C, "Smart Array E200", &SA5_access}, {0x3212103C, "Smart Array E200", &SA5_access, 120},
{0x3213103C, "Smart Array E200i", &SA5_access}, {0x3213103C, "Smart Array E200i", &SA5_access, 120},
{0x3214103C, "Smart Array E200i", &SA5_access}, {0x3214103C, "Smart Array E200i", &SA5_access, 120},
{0x3215103C, "Smart Array E200i", &SA5_access}, {0x3215103C, "Smart Array E200i", &SA5_access, 120},
{0x3233103C, "Smart Array E500", &SA5_access}, {0x3233103C, "Smart Array E500", &SA5_access, 512},
{0xFFFF103C, "Unknown Smart Array", &SA5_access}, {0xFFFF103C, "Unknown Smart Array", &SA5_access, 120},
}; };
/* How long to wait (in milliseconds) for board to go into simple mode */ /* How long to wait (in milliseconds) for board to go into simple mode */
...@@ -125,7 +126,6 @@ static struct board_type products[] = { ...@@ -125,7 +126,6 @@ static struct board_type products[] = {
#define MAX_CMD_RETRIES 3 #define MAX_CMD_RETRIES 3
#define READ_AHEAD 1024 #define READ_AHEAD 1024
#define NR_CMDS 384 /* #commands that can be outstanding */
#define MAX_CTLR 32 #define MAX_CTLR 32
/* Originally cciss driver only supports 8 major numbers */ /* Originally cciss driver only supports 8 major numbers */
...@@ -404,8 +404,8 @@ static CommandList_struct *cmd_alloc(ctlr_info_t *h, int get_from_pool) ...@@ -404,8 +404,8 @@ static CommandList_struct *cmd_alloc(ctlr_info_t *h, int get_from_pool)
} else { /* get it out of the controllers pool */ } else { /* get it out of the controllers pool */
do { do {
i = find_first_zero_bit(h->cmd_pool_bits, NR_CMDS); i = find_first_zero_bit(h->cmd_pool_bits, h->nr_cmds);
if (i == NR_CMDS) if (i == h->nr_cmds)
return NULL; return NULL;
} while (test_and_set_bit } while (test_and_set_bit
(i & (BITS_PER_LONG - 1), (i & (BITS_PER_LONG - 1),
...@@ -1247,7 +1247,7 @@ static void cciss_check_queues(ctlr_info_t *h) ...@@ -1247,7 +1247,7 @@ static void cciss_check_queues(ctlr_info_t *h)
* in case the interrupt we serviced was from an ioctl and did not * in case the interrupt we serviced was from an ioctl and did not
* free any new commands. * free any new commands.
*/ */
if ((find_first_zero_bit(h->cmd_pool_bits, NR_CMDS)) == NR_CMDS) if ((find_first_zero_bit(h->cmd_pool_bits, h->nr_cmds)) == h->nr_cmds)
return; return;
/* We have room on the queue for more commands. Now we need to queue /* We have room on the queue for more commands. Now we need to queue
...@@ -1266,7 +1266,7 @@ static void cciss_check_queues(ctlr_info_t *h) ...@@ -1266,7 +1266,7 @@ static void cciss_check_queues(ctlr_info_t *h)
/* check to see if we have maxed out the number of commands /* check to see if we have maxed out the number of commands
* that can be placed on the queue. * that can be placed on the queue.
*/ */
if ((find_first_zero_bit(h->cmd_pool_bits, NR_CMDS)) == NR_CMDS) { if ((find_first_zero_bit(h->cmd_pool_bits, h->nr_cmds)) == h->nr_cmds) {
if (curr_queue == start_queue) { if (curr_queue == start_queue) {
h->next_to_run = h->next_to_run =
(start_queue + 1) % (h->highest_lun + 1); (start_queue + 1) % (h->highest_lun + 1);
...@@ -2140,7 +2140,7 @@ static int add_sendcmd_reject(__u8 cmd, int ctlr, unsigned long complete) ...@@ -2140,7 +2140,7 @@ static int add_sendcmd_reject(__u8 cmd, int ctlr, unsigned long complete)
/* We've sent down an abort or reset, but something else /* We've sent down an abort or reset, but something else
has completed */ has completed */
if (srl->ncompletions >= (NR_CMDS + 2)) { if (srl->ncompletions >= (hba[ctlr]->nr_cmds + 2)) {
/* Uh oh. No room to save it for later... */ /* Uh oh. No room to save it for later... */
printk(KERN_WARNING "cciss%d: Sendcmd: Invalid command addr, " printk(KERN_WARNING "cciss%d: Sendcmd: Invalid command addr, "
"reject list overflow, command lost!\n", ctlr); "reject list overflow, command lost!\n", ctlr);
...@@ -2677,7 +2677,7 @@ static irqreturn_t do_cciss_intr(int irq, void *dev_id) ...@@ -2677,7 +2677,7 @@ static irqreturn_t do_cciss_intr(int irq, void *dev_id)
a1 = a; a1 = a;
if ((a & 0x04)) { if ((a & 0x04)) {
a2 = (a >> 3); a2 = (a >> 3);
if (a2 >= NR_CMDS) { if (a2 >= h->nr_cmds) {
printk(KERN_WARNING printk(KERN_WARNING
"cciss: controller cciss%d failed, stopping.\n", "cciss: controller cciss%d failed, stopping.\n",
h->ctlr); h->ctlr);
...@@ -2960,6 +2960,7 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev) ...@@ -2960,6 +2960,7 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
if (board_id == products[i].board_id) { if (board_id == products[i].board_id) {
c->product_name = products[i].product_name; c->product_name = products[i].product_name;
c->access = *(products[i].access); c->access = *(products[i].access);
c->nr_cmds = products[i].nr_cmds;
break; break;
} }
} }
...@@ -2979,6 +2980,7 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev) ...@@ -2979,6 +2980,7 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
if (subsystem_vendor_id == PCI_VENDOR_ID_HP) { if (subsystem_vendor_id == PCI_VENDOR_ID_HP) {
c->product_name = products[i-1].product_name; c->product_name = products[i-1].product_name;
c->access = *(products[i-1].access); c->access = *(products[i-1].access);
c->nr_cmds = products[i-1].nr_cmds;
printk(KERN_WARNING "cciss: This is an unknown " printk(KERN_WARNING "cciss: This is an unknown "
"Smart Array controller.\n" "Smart Array controller.\n"
"cciss: Please update to the latest driver " "cciss: Please update to the latest driver "
...@@ -3286,15 +3288,15 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, ...@@ -3286,15 +3288,15 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
hba[i]->intr[SIMPLE_MODE_INT], dac ? "" : " not"); hba[i]->intr[SIMPLE_MODE_INT], dac ? "" : " not");
hba[i]->cmd_pool_bits = hba[i]->cmd_pool_bits =
kmalloc(((NR_CMDS + BITS_PER_LONG - kmalloc(((hba[i]->nr_cmds + BITS_PER_LONG -
1) / BITS_PER_LONG) * sizeof(unsigned long), GFP_KERNEL); 1) / BITS_PER_LONG) * sizeof(unsigned long), GFP_KERNEL);
hba[i]->cmd_pool = (CommandList_struct *) hba[i]->cmd_pool = (CommandList_struct *)
pci_alloc_consistent(hba[i]->pdev, pci_alloc_consistent(hba[i]->pdev,
NR_CMDS * sizeof(CommandList_struct), hba[i]->nr_cmds * sizeof(CommandList_struct),
&(hba[i]->cmd_pool_dhandle)); &(hba[i]->cmd_pool_dhandle));
hba[i]->errinfo_pool = (ErrorInfo_struct *) hba[i]->errinfo_pool = (ErrorInfo_struct *)
pci_alloc_consistent(hba[i]->pdev, pci_alloc_consistent(hba[i]->pdev,
NR_CMDS * sizeof(ErrorInfo_struct), hba[i]->nr_cmds * sizeof(ErrorInfo_struct),
&(hba[i]->errinfo_pool_dhandle)); &(hba[i]->errinfo_pool_dhandle));
if ((hba[i]->cmd_pool_bits == NULL) if ((hba[i]->cmd_pool_bits == NULL)
|| (hba[i]->cmd_pool == NULL) || (hba[i]->cmd_pool == NULL)
...@@ -3305,7 +3307,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, ...@@ -3305,7 +3307,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
#ifdef CONFIG_CISS_SCSI_TAPE #ifdef CONFIG_CISS_SCSI_TAPE
hba[i]->scsi_rejects.complete = hba[i]->scsi_rejects.complete =
kmalloc(sizeof(hba[i]->scsi_rejects.complete[0]) * kmalloc(sizeof(hba[i]->scsi_rejects.complete[0]) *
(NR_CMDS + 5), GFP_KERNEL); (hba[i]->nr_cmds + 5), GFP_KERNEL);
if (hba[i]->scsi_rejects.complete == NULL) { if (hba[i]->scsi_rejects.complete == NULL) {
printk(KERN_ERR "cciss: out of memory"); printk(KERN_ERR "cciss: out of memory");
goto clean4; goto clean4;
...@@ -3319,7 +3321,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, ...@@ -3319,7 +3321,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
/* command and error info recs zeroed out before /* command and error info recs zeroed out before
they are used */ they are used */
memset(hba[i]->cmd_pool_bits, 0, memset(hba[i]->cmd_pool_bits, 0,
((NR_CMDS + BITS_PER_LONG - ((hba[i]->nr_cmds + BITS_PER_LONG -
1) / BITS_PER_LONG) * sizeof(unsigned long)); 1) / BITS_PER_LONG) * sizeof(unsigned long));
#ifdef CCISS_DEBUG #ifdef CCISS_DEBUG
...@@ -3388,11 +3390,11 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, ...@@ -3388,11 +3390,11 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
kfree(hba[i]->cmd_pool_bits); kfree(hba[i]->cmd_pool_bits);
if (hba[i]->cmd_pool) if (hba[i]->cmd_pool)
pci_free_consistent(hba[i]->pdev, pci_free_consistent(hba[i]->pdev,
NR_CMDS * sizeof(CommandList_struct), hba[i]->nr_cmds * sizeof(CommandList_struct),
hba[i]->cmd_pool, hba[i]->cmd_pool_dhandle); hba[i]->cmd_pool, hba[i]->cmd_pool_dhandle);
if (hba[i]->errinfo_pool) if (hba[i]->errinfo_pool)
pci_free_consistent(hba[i]->pdev, pci_free_consistent(hba[i]->pdev,
NR_CMDS * sizeof(ErrorInfo_struct), hba[i]->nr_cmds * sizeof(ErrorInfo_struct),
hba[i]->errinfo_pool, hba[i]->errinfo_pool,
hba[i]->errinfo_pool_dhandle); hba[i]->errinfo_pool_dhandle);
free_irq(hba[i]->intr[SIMPLE_MODE_INT], hba[i]); free_irq(hba[i]->intr[SIMPLE_MODE_INT], hba[i]);
...@@ -3459,9 +3461,9 @@ static void __devexit cciss_remove_one(struct pci_dev *pdev) ...@@ -3459,9 +3461,9 @@ static void __devexit cciss_remove_one(struct pci_dev *pdev)
} }
} }
pci_free_consistent(hba[i]->pdev, NR_CMDS * sizeof(CommandList_struct), pci_free_consistent(hba[i]->pdev, hba[i]->nr_cmds * sizeof(CommandList_struct),
hba[i]->cmd_pool, hba[i]->cmd_pool_dhandle); hba[i]->cmd_pool, hba[i]->cmd_pool_dhandle);
pci_free_consistent(hba[i]->pdev, NR_CMDS * sizeof(ErrorInfo_struct), pci_free_consistent(hba[i]->pdev, hba[i]->nr_cmds * sizeof(ErrorInfo_struct),
hba[i]->errinfo_pool, hba[i]->errinfo_pool_dhandle); hba[i]->errinfo_pool, hba[i]->errinfo_pool_dhandle);
kfree(hba[i]->cmd_pool_bits); kfree(hba[i]->cmd_pool_bits);
#ifdef CONFIG_CISS_SCSI_TAPE #ifdef CONFIG_CISS_SCSI_TAPE
......
drivers/block/cciss.h
View file @ f880632f
...@@ -60,6 +60,7 @@ struct ctlr_info ...@@ -60,6 +60,7 @@ struct ctlr_info
__u32 board_id; __u32 board_id;
void __iomem *vaddr; void __iomem *vaddr;
unsigned long paddr; unsigned long paddr;
int nr_cmds; /* Number of commands allowed on this controller */
CfgTable_struct __iomem *cfgtable; CfgTable_struct __iomem *cfgtable;
int interrupts_enabled; int interrupts_enabled;
int major; int major;
...@@ -282,6 +283,7 @@ struct board_type { ...@@ -282,6 +283,7 @@ struct board_type {
__u32 board_id; __u32 board_id;
char *product_name; char *product_name;
struct access_method *access; struct access_method *access;
int nr_cmds; /* Max cmds this kind of ctlr can handle. */
}; };
#define CCISS_LOCK(i) (&hba[i]->lock) #define CCISS_LOCK(i) (&hba[i]->lock)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment