Skip to content

L
linux-davinci
Commit 7c832835 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Linus Torvalds
Browse files
Options

[PATCH] CCISS: run through Lindent 

cciss is full of inconsistent style ("for (" vs.  "for(", lines that end with
whitespace, lines beginning with a mix of spaces & tabs, etc).

This patch changes only whitespace.
Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Acked-by: default avatarJeff Garzik <jeff@garzik.org>
Acked-by: default avatarMike Miller <mike.miller@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e2019b58
Show whitespace changes
Inline Side-by-side
Showing with 1581 additions and 1534 deletions
drivers/block/cciss.c
View file @ 7c832835
...@@ -64,44 +64,45 @@ MODULE_LICENSE("GPL"); ...@@ -64,44 +64,45 @@ MODULE_LICENSE("GPL");
/* define the PCI info for the cards we can control */ /* define the PCI info for the cards we can control */
static const struct pci_device_id cciss_pci_device_id[] = { static const struct pci_device_id cciss_pci_device_id[] = {
{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISS, {PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISS,
0x0E11, 0x4070, 0, 0, 0}, 0x0E11, 0x4070, 0, 0, 0},
{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSB, {PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSB,
0x0E11, 0x4080, 0, 0, 0}, 0x0E11, 0x4080, 0, 0, 0},
{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSB, {PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSB,
0x0E11, 0x4082, 0, 0, 0}, 0x0E11, 0x4082, 0, 0, 0},
{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSB, {PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSB,
0x0E11, 0x4083, 0, 0, 0}, 0x0E11, 0x4083, 0, 0, 0},
{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC, {PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,
0x0E11, 0x409A, 0, 0, 0}, 0x0E11, 0x409A, 0, 0, 0},
{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC, {PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,
0x0E11, 0x409B, 0, 0, 0}, 0x0E11, 0x409B, 0, 0, 0},
{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC, {PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,
0x0E11, 0x409C, 0, 0, 0}, 0x0E11, 0x409C, 0, 0, 0},
{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC, {PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,
0x0E11, 0x409D, 0, 0, 0}, 0x0E11, 0x409D, 0, 0, 0},
{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC, {PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,
0x0E11, 0x4091, 0, 0, 0}, 0x0E11, 0x4091, 0, 0, 0},
{ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSA, {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSA,
0x103C, 0x3225, 0, 0, 0}, 0x103C, 0x3225, 0, 0, 0},
{ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC,
0x103c, 0x3223, 0, 0, 0}, 0x103c, 0x3223, 0, 0, 0},
{ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC,
0x103c, 0x3234, 0, 0, 0}, 0x103c, 0x3234, 0, 0, 0},
{ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC,
0x103c, 0x3235, 0, 0, 0}, 0x103c, 0x3235, 0, 0, 0},
{ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD, {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD,
0x103c, 0x3211, 0, 0, 0}, 0x103c, 0x3211, 0, 0, 0},
{ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD, {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD,
0x103c, 0x3212, 0, 0, 0}, 0x103c, 0x3212, 0, 0, 0},
{ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD, {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD,
0x103c, 0x3213, 0, 0, 0}, 0x103c, 0x3213, 0, 0, 0},
{ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD, {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD,
0x103c, 0x3214, 0, 0, 0}, 0x103c, 0x3214, 0, 0, 0},
{ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD, {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD,
0x103c, 0x3215, 0, 0, 0}, 0x103c, 0x3215, 0, 0, 0},
{0,} {0,}
}; };
MODULE_DEVICE_TABLE(pci, cciss_pci_device_id); MODULE_DEVICE_TABLE(pci, cciss_pci_device_id);
/* board_id = Subsystem Device ID & Vendor ID /* board_id = Subsystem Device ID & Vendor ID
...@@ -109,24 +110,24 @@ MODULE_DEVICE_TABLE(pci, cciss_pci_device_id); ...@@ -109,24 +110,24 @@ MODULE_DEVICE_TABLE(pci, cciss_pci_device_id);
* access = Address of the struct of function pointers * access = Address of the struct of function pointers
*/ */
static struct board_type products[] = { static struct board_type products[] = {
{ 0x40700E11, "Smart Array 5300", &SA5_access }, {0x40700E11, "Smart Array 5300", &SA5_access},
{ 0x40800E11, "Smart Array 5i", &SA5B_access}, {0x40800E11, "Smart Array 5i", &SA5B_access},
{ 0x40820E11, "Smart Array 532", &SA5B_access}, {0x40820E11, "Smart Array 532", &SA5B_access},
{ 0x40830E11, "Smart Array 5312", &SA5B_access}, {0x40830E11, "Smart Array 5312", &SA5B_access},
{ 0x409A0E11, "Smart Array 641", &SA5_access}, {0x409A0E11, "Smart Array 641", &SA5_access},
{ 0x409B0E11, "Smart Array 642", &SA5_access}, {0x409B0E11, "Smart Array 642", &SA5_access},
{ 0x409C0E11, "Smart Array 6400", &SA5_access}, {0x409C0E11, "Smart Array 6400", &SA5_access},
{ 0x409D0E11, "Smart Array 6400 EM", &SA5_access}, {0x409D0E11, "Smart Array 6400 EM", &SA5_access},
{ 0x40910E11, "Smart Array 6i", &SA5_access}, {0x40910E11, "Smart Array 6i", &SA5_access},
{ 0x3225103C, "Smart Array P600", &SA5_access}, {0x3225103C, "Smart Array P600", &SA5_access},
{ 0x3223103C, "Smart Array P800", &SA5_access}, {0x3223103C, "Smart Array P800", &SA5_access},
{ 0x3234103C, "Smart Array P400", &SA5_access}, {0x3234103C, "Smart Array P400", &SA5_access},
{ 0x3235103C, "Smart Array P400i", &SA5_access}, {0x3235103C, "Smart Array P400i", &SA5_access},
{ 0x3211103C, "Smart Array E200i", &SA5_access}, {0x3211103C, "Smart Array E200i", &SA5_access},
{ 0x3212103C, "Smart Array E200", &SA5_access}, {0x3212103C, "Smart Array E200", &SA5_access},
{ 0x3213103C, "Smart Array E200i", &SA5_access}, {0x3213103C, "Smart Array E200i", &SA5_access},
{ 0x3214103C, "Smart Array E200i", &SA5_access}, {0x3214103C, "Smart Array E200i", &SA5_access},
{ 0x3215103C, "Smart Array E200i", &SA5_access}, {0x3215103C, "Smart Array E200i", &SA5_access},
}; };
/* 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 */
...@@ -143,7 +144,6 @@ static struct board_type products[] = { ...@@ -143,7 +144,6 @@ static struct board_type products[] = {
/* Originally cciss driver only supports 8 major numbers */ /* Originally cciss driver only supports 8 major numbers */
#define MAX_CTLR_ORIG 8 #define MAX_CTLR_ORIG 8
static ctlr_info_t *hba[MAX_CTLR]; static ctlr_info_t *hba[MAX_CTLR];
static void do_cciss_request(request_queue_t *q); static void do_cciss_request(request_queue_t *q);
...@@ -157,23 +157,27 @@ static int cciss_getgeo(struct block_device *bdev, struct hd_geometry *geo); ...@@ -157,23 +157,27 @@ static int cciss_getgeo(struct block_device *bdev, struct hd_geometry *geo);
static int revalidate_allvol(ctlr_info_t *host); static int revalidate_allvol(ctlr_info_t *host);
static int cciss_revalidate(struct gendisk *disk); static int cciss_revalidate(struct gendisk *disk);
static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk); static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk);
static int deregister_disk(struct gendisk *disk, drive_info_struct *drv, int clear_all); static int deregister_disk(struct gendisk *disk, drive_info_struct *drv,
int clear_all);
static void cciss_read_capacity(int ctlr, int logvol, ReadCapdata_struct *buf, static void cciss_read_capacity(int ctlr, int logvol, ReadCapdata_struct *buf,
int withirq, unsigned int *total_size, unsigned int *block_size); int withirq, unsigned int *total_size,
static void cciss_geometry_inquiry(int ctlr, int logvol, unsigned int *block_size);
int withirq, unsigned int total_size, static void cciss_geometry_inquiry(int ctlr, int logvol, int withirq,
unsigned int block_size, InquiryData_struct *inq_buff, unsigned int total_size,
unsigned int block_size,
InquiryData_struct *inq_buff,
drive_info_struct *drv); drive_info_struct *drv);
static void cciss_getgeometry(int cntl_num); static void cciss_getgeometry(int cntl_num);
static void __devinit cciss_interrupt_mode(ctlr_info_t *, struct pci_dev *, __u32); static void __devinit cciss_interrupt_mode(ctlr_info_t *, struct pci_dev *,
static void start_io( ctlr_info_t *h); __u32);
static int sendcmd( __u8 cmd, int ctlr, void *buff, size_t size, static void start_io(ctlr_info_t *h);
unsigned int use_unit_num, unsigned int log_unit, __u8 page_code, static int sendcmd(__u8 cmd, int ctlr, void *buff, size_t size,
unsigned char *scsi3addr, int cmd_type); unsigned int use_unit_num, unsigned int log_unit,
__u8 page_code, unsigned char *scsi3addr, int cmd_type);
static int sendcmd_withirq(__u8 cmd, int ctlr, void *buff, size_t size, static int sendcmd_withirq(__u8 cmd, int ctlr, void *buff, size_t size,
unsigned int use_unit_num, unsigned int log_unit, __u8 page_code, unsigned int use_unit_num, unsigned int log_unit,
int cmd_type); __u8 page_code, int cmd_type);
static void fail_all_cmds(unsigned long ctlr); static void fail_all_cmds(unsigned long ctlr);
...@@ -182,7 +186,9 @@ static int cciss_proc_get_info(char *buffer, char **start, off_t offset, ...@@ -182,7 +186,9 @@ static int cciss_proc_get_info(char *buffer, char **start, off_t offset,
int length, int *eof, void *data); int length, int *eof, void *data);
static void cciss_procinit(int i); static void cciss_procinit(int i);
#else #else
static void cciss_procinit(int i) {} static void cciss_procinit(int i)
{
}
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_PROC_FS */
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
...@@ -198,7 +204,7 @@ static struct block_device_operations cciss_fops = { ...@@ -198,7 +204,7 @@ static struct block_device_operations cciss_fops = {
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
.compat_ioctl = cciss_compat_ioctl, .compat_ioctl = cciss_compat_ioctl,
#endif #endif
.revalidate_disk= cciss_revalidate, .revalidate_disk = cciss_revalidate,
}; };
/* /*
...@@ -221,7 +227,8 @@ static inline CommandList_struct *removeQ(CommandList_struct **Qptr, ...@@ -221,7 +227,8 @@ static inline CommandList_struct *removeQ(CommandList_struct **Qptr,
CommandList_struct *c) CommandList_struct *c)
{ {
if (c && c->next != c) { if (c && c->next != c) {
if (*Qptr == c) *Qptr = c->next; if (*Qptr == c)
*Qptr = c->next;
c->prev->next = c->next; c->prev->next = c->next;
c->next->prev = c->prev; c->next->prev = c->prev;
} else { } else {
...@@ -240,8 +247,9 @@ static inline CommandList_struct *removeQ(CommandList_struct **Qptr, ...@@ -240,8 +247,9 @@ static inline CommandList_struct *removeQ(CommandList_struct **Qptr,
#define ENG_GIG 1000000000 #define ENG_GIG 1000000000
#define ENG_GIG_FACTOR (ENG_GIG/512) #define ENG_GIG_FACTOR (ENG_GIG/512)
#define RAID_UNKNOWN 6 #define RAID_UNKNOWN 6
static const char *raid_label[] = {"0","4","1(1+0)","5","5+1","ADG", static const char *raid_label[] = { "0", "4", "1(1+0)", "5", "5+1", "ADG",
"UNKNOWN"}; "UNKNOWN"
};
static struct proc_dir_entry *proc_cciss; static struct proc_dir_entry *proc_cciss;
...@@ -251,7 +259,7 @@ static int cciss_proc_get_info(char *buffer, char **start, off_t offset, ...@@ -251,7 +259,7 @@ static int cciss_proc_get_info(char *buffer, char **start, off_t offset,
off_t pos = 0; off_t pos = 0;
off_t len = 0; off_t len = 0;
int size, i, ctlr; int size, i, ctlr;
ctlr_info_t *h = (ctlr_info_t*)data; ctlr_info_t *h = (ctlr_info_t *) data;
drive_info_struct *drv; drive_info_struct *drv;
unsigned long flags; unsigned long flags;
sector_t vol_sz, vol_sz_frac; sector_t vol_sz, vol_sz_frac;
...@@ -282,15 +290,15 @@ static int cciss_proc_get_info(char *buffer, char **start, off_t offset, ...@@ -282,15 +290,15 @@ static int cciss_proc_get_info(char *buffer, char **start, off_t offset,
h->devname, h->devname,
h->product_name, h->product_name,
(unsigned long)h->board_id, (unsigned long)h->board_id,
h->firm_ver[0], h->firm_ver[1], h->firm_ver[2], h->firm_ver[3], h->firm_ver[0], h->firm_ver[1], h->firm_ver[2],
(unsigned int)h->intr[SIMPLE_MODE_INT], h->firm_ver[3], (unsigned int)h->intr[SIMPLE_MODE_INT],
h->num_luns, h->num_luns, h->Qdepth, h->commands_outstanding,
h->Qdepth, h->commands_outstanding,
h->maxQsinceinit, h->max_outstanding, h->maxSG); h->maxQsinceinit, h->max_outstanding, h->maxSG);
pos += size; len += size; pos += size;
len += size;
cciss_proc_tape_report(ctlr, buffer, &pos, &len); cciss_proc_tape_report(ctlr, buffer, &pos, &len);
for(i=0; i<=h->highest_lun; i++) { for (i = 0; i <= h->highest_lun; i++) {
drv = &h->drv[i]; drv = &h->drv[i];
if (drv->heads == 0) if (drv->heads == 0)
...@@ -303,17 +311,18 @@ static int cciss_proc_get_info(char *buffer, char **start, off_t offset, ...@@ -303,17 +311,18 @@ static int cciss_proc_get_info(char *buffer, char **start, off_t offset,
if (drv->raid_level > 5) if (drv->raid_level > 5)
drv->raid_level = RAID_UNKNOWN; drv->raid_level = RAID_UNKNOWN;
size = sprintf(buffer+len, "cciss/c%dd%d:" size = sprintf(buffer + len, "cciss/c%dd%d:"
"\t%4u.%02uGB\tRAID %s\n", "\t%4u.%02uGB\tRAID %s\n",
ctlr, i, (int)vol_sz, (int)vol_sz_frac, ctlr, i, (int)vol_sz, (int)vol_sz_frac,
raid_label[drv->raid_level]); raid_label[drv->raid_level]);
pos += size; len += size; pos += size;
len += size;
} }
*eof = 1; *eof = 1;
*start = buffer+offset; *start = buffer + offset;
len -= offset; len -= offset;
if (len>length) if (len > length)
len = length; len = length;
h->busy_configuring = 0; h->busy_configuring = 0;
return len; return len;
...@@ -330,16 +339,19 @@ cciss_proc_write(struct file *file, const char __user *buffer, ...@@ -330,16 +339,19 @@ cciss_proc_write(struct file *file, const char __user *buffer,
int rc; int rc;
#endif #endif
if (count > sizeof(cmd)-1) return -EINVAL; if (count > sizeof(cmd) - 1)
if (copy_from_user(cmd, buffer, count)) return -EFAULT; return -EINVAL;
if (copy_from_user(cmd, buffer, count))
return -EFAULT;
cmd[count] = '\0'; cmd[count] = '\0';
len = strlen(cmd); // above 3 lines ensure safety len = strlen(cmd); // above 3 lines ensure safety
if (len && cmd[len-1] == '\n') if (len && cmd[len - 1] == '\n')
cmd[--len] = '\0'; cmd[--len] = '\0';
# ifdef CONFIG_CISS_SCSI_TAPE # ifdef CONFIG_CISS_SCSI_TAPE
if (strcmp("engage scsi", cmd)==0) { if (strcmp("engage scsi", cmd) == 0) {
rc = cciss_engage_scsi(h->ctlr); rc = cciss_engage_scsi(h->ctlr);
if (rc != 0) return -rc; if (rc != 0)
return -rc;
return count; return count;
} }
/* might be nice to have "disengage" too, but it's not /* might be nice to have "disengage" too, but it's not
...@@ -376,52 +388,52 @@ static void __devinit cciss_procinit(int i) ...@@ -376,52 +388,52 @@ static void __devinit cciss_procinit(int i)
* to possible sleep, this routine can be called with get_from_pool set to 0. * to possible sleep, this routine can be called with get_from_pool set to 0.
* cmd_free() MUST be called with a got_from_pool set to 0 if cmd_alloc was. * cmd_free() MUST be called with a got_from_pool set to 0 if cmd_alloc was.
*/ */
static CommandList_struct * cmd_alloc(ctlr_info_t *h, int get_from_pool) static CommandList_struct *cmd_alloc(ctlr_info_t *h, int get_from_pool)
{ {
CommandList_struct *c; CommandList_struct *c;
int i; int i;
u64bit temp64; u64bit temp64;
dma_addr_t cmd_dma_handle, err_dma_handle; dma_addr_t cmd_dma_handle, err_dma_handle;
if (!get_from_pool) if (!get_from_pool) {
{ c = (CommandList_struct *) pci_alloc_consistent(h->pdev,
c = (CommandList_struct *) pci_alloc_consistent( sizeof(CommandList_struct), &cmd_dma_handle);
h->pdev, sizeof(CommandList_struct), &cmd_dma_handle); if (c == NULL)
if(c==NULL)
return NULL; return NULL;
memset(c, 0, sizeof(CommandList_struct)); memset(c, 0, sizeof(CommandList_struct));
c->cmdindex = -1; c->cmdindex = -1;
c->err_info = (ErrorInfo_struct *)pci_alloc_consistent( c->err_info = (ErrorInfo_struct *)
h->pdev, sizeof(ErrorInfo_struct), pci_alloc_consistent(h->pdev, sizeof(ErrorInfo_struct),
&err_dma_handle); &err_dma_handle);
if (c->err_info == NULL) if (c->err_info == NULL) {
{
pci_free_consistent(h->pdev, pci_free_consistent(h->pdev,
sizeof(CommandList_struct), c, cmd_dma_handle); sizeof(CommandList_struct), c, cmd_dma_handle);
return NULL; return NULL;
} }
memset(c->err_info, 0, sizeof(ErrorInfo_struct)); memset(c->err_info, 0, sizeof(ErrorInfo_struct));
} 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, NR_CMDS);
if (i == NR_CMDS) if (i == NR_CMDS)
return NULL; return NULL;
} while(test_and_set_bit(i & (BITS_PER_LONG - 1), h->cmd_pool_bits+(i/BITS_PER_LONG)) != 0); } while (test_and_set_bit
(i & (BITS_PER_LONG - 1),
h->cmd_pool_bits + (i / BITS_PER_LONG)) != 0);
#ifdef CCISS_DEBUG #ifdef CCISS_DEBUG
printk(KERN_DEBUG "cciss: using command buffer %d\n", i); printk(KERN_DEBUG "cciss: using command buffer %d\n", i);
#endif #endif
c = h->cmd_pool + i; c = h->cmd_pool + i;
memset(c, 0, sizeof(CommandList_struct)); memset(c, 0, sizeof(CommandList_struct));
cmd_dma_handle = h->cmd_pool_dhandle cmd_dma_handle = h->cmd_pool_dhandle
+ i*sizeof(CommandList_struct); + i * sizeof(CommandList_struct);
c->err_info = h->errinfo_pool + i; c->err_info = h->errinfo_pool + i;
memset(c->err_info, 0, sizeof(ErrorInfo_struct)); memset(c->err_info, 0, sizeof(ErrorInfo_struct));
err_dma_handle = h->errinfo_pool_dhandle err_dma_handle = h->errinfo_pool_dhandle
+ i*sizeof(ErrorInfo_struct); + i * sizeof(ErrorInfo_struct);
h->nr_allocs++; h->nr_allocs++;
c->cmdindex = i; c->cmdindex = i;
...@@ -435,8 +447,6 @@ static CommandList_struct * cmd_alloc(ctlr_info_t *h, int get_from_pool) ...@@ -435,8 +447,6 @@ static CommandList_struct * cmd_alloc(ctlr_info_t *h, int get_from_pool)
c->ctlr = h->ctlr; c->ctlr = h->ctlr;
return c; return c;
} }
/* /*
...@@ -447,18 +457,17 @@ static void cmd_free(ctlr_info_t *h, CommandList_struct *c, int got_from_pool) ...@@ -447,18 +457,17 @@ static void cmd_free(ctlr_info_t *h, CommandList_struct *c, int got_from_pool)
int i; int i;
u64bit temp64; u64bit temp64;
if( !got_from_pool) if (!got_from_pool) {
{
temp64.val32.lower = c->ErrDesc.Addr.lower; temp64.val32.lower = c->ErrDesc.Addr.lower;
temp64.val32.upper = c->ErrDesc.Addr.upper; temp64.val32.upper = c->ErrDesc.Addr.upper;
pci_free_consistent(h->pdev, sizeof(ErrorInfo_struct), pci_free_consistent(h->pdev, sizeof(ErrorInfo_struct),
c->err_info, (dma_addr_t) temp64.val); c->err_info, (dma_addr_t) temp64.val);
pci_free_consistent(h->pdev, sizeof(CommandList_struct), pci_free_consistent(h->pdev, sizeof(CommandList_struct),
c, (dma_addr_t) c->busaddr); c, (dma_addr_t) c->busaddr);
} else } else {
{
i = c - h->cmd_pool; i = c - h->cmd_pool;
clear_bit(i&(BITS_PER_LONG-1), h->cmd_pool_bits+(i/BITS_PER_LONG)); clear_bit(i & (BITS_PER_LONG - 1),
h->cmd_pool_bits + (i / BITS_PER_LONG));
h->nr_frees++; h->nr_frees++;
} }
} }
...@@ -512,6 +521,7 @@ static int cciss_open(struct inode *inode, struct file *filep) ...@@ -512,6 +521,7 @@ static int cciss_open(struct inode *inode, struct file *filep)
host->usage_count++; host->usage_count++;
return 0; return 0;
} }
/* /*
* Close. Sync first. * Close. Sync first.
*/ */
...@@ -521,7 +531,8 @@ static int cciss_release(struct inode *inode, struct file *filep) ...@@ -521,7 +531,8 @@ static int cciss_release(struct inode *inode, struct file *filep)
drive_info_struct *drv = get_drv(inode->i_bdev->bd_disk); drive_info_struct *drv = get_drv(inode->i_bdev->bd_disk);
#ifdef CCISS_DEBUG #ifdef CCISS_DEBUG
printk(KERN_DEBUG "cciss_release %s\n", inode->i_bdev->bd_disk->disk_name); printk(KERN_DEBUG "cciss_release %s\n",
inode->i_bdev->bd_disk->disk_name);
#endif /* CCISS_DEBUG */ #endif /* CCISS_DEBUG */
drv->usage_count--; drv->usage_count--;
...@@ -540,8 +551,10 @@ static int do_ioctl(struct file *f, unsigned cmd, unsigned long arg) ...@@ -540,8 +551,10 @@ static int do_ioctl(struct file *f, unsigned cmd, unsigned long arg)
return ret; return ret;
} }
static int cciss_ioctl32_passthru(struct file *f, unsigned cmd, unsigned long arg); static int cciss_ioctl32_passthru(struct file *f, unsigned cmd,
static int cciss_ioctl32_big_passthru(struct file *f, unsigned cmd, unsigned long arg); unsigned long arg);
static int cciss_ioctl32_big_passthru(struct file *f, unsigned cmd,
unsigned long arg);
static long cciss_compat_ioctl(struct file *f, unsigned cmd, unsigned long arg) static long cciss_compat_ioctl(struct file *f, unsigned cmd, unsigned long arg)
{ {
...@@ -573,7 +586,8 @@ static long cciss_compat_ioctl(struct file *f, unsigned cmd, unsigned long arg) ...@@ -573,7 +586,8 @@ static long cciss_compat_ioctl(struct file *f, unsigned cmd, unsigned long arg)
} }
} }
static int cciss_ioctl32_passthru(struct file *f, unsigned cmd, unsigned long arg) static int cciss_ioctl32_passthru(struct file *f, unsigned cmd,
unsigned long arg)
{ {
IOCTL32_Command_struct __user *arg32 = IOCTL32_Command_struct __user *arg32 =
(IOCTL32_Command_struct __user *) arg; (IOCTL32_Command_struct __user *) arg;
...@@ -583,9 +597,15 @@ static int cciss_ioctl32_passthru(struct file *f, unsigned cmd, unsigned long ar ...@@ -583,9 +597,15 @@ static int cciss_ioctl32_passthru(struct file *f, unsigned cmd, unsigned long ar
u32 cp; u32 cp;
err = 0; err = 0;
err |= copy_from_user(&arg64.LUN_info, &arg32->LUN_info, sizeof(arg64.LUN_info)); err |=
err |= copy_from_user(&arg64.Request, &arg32->Request, sizeof(arg64.Request)); copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
err |= copy_from_user(&arg64.error_info, &arg32->error_info, sizeof(arg64.error_info)); sizeof(arg64.LUN_info));
err |=
copy_from_user(&arg64.Request, &arg32->Request,
sizeof(arg64.Request));
err |=
copy_from_user(&arg64.error_info, &arg32->error_info,
sizeof(arg64.error_info));
err |= get_user(arg64.buf_size, &arg32->buf_size); err |= get_user(arg64.buf_size, &arg32->buf_size);
err |= get_user(cp, &arg32->buf); err |= get_user(cp, &arg32->buf);
arg64.buf = compat_ptr(cp); arg64.buf = compat_ptr(cp);
...@@ -594,28 +614,38 @@ static int cciss_ioctl32_passthru(struct file *f, unsigned cmd, unsigned long ar ...@@ -594,28 +614,38 @@ static int cciss_ioctl32_passthru(struct file *f, unsigned cmd, unsigned long ar
if (err) if (err)
return -EFAULT; return -EFAULT;
err = do_ioctl(f, CCISS_PASSTHRU, (unsigned long) p); err = do_ioctl(f, CCISS_PASSTHRU, (unsigned long)p);
if (err) if (err)
return err; return err;
err |= copy_in_user(&arg32->error_info, &p->error_info, sizeof(arg32->error_info)); err |=
copy_in_user(&arg32->error_info, &p->error_info,
sizeof(arg32->error_info));
if (err) if (err)
return -EFAULT; return -EFAULT;
return err; return err;
} }
static int cciss_ioctl32_big_passthru(struct file *file, unsigned cmd, unsigned long arg) static int cciss_ioctl32_big_passthru(struct file *file, unsigned cmd,
unsigned long arg)
{ {
BIG_IOCTL32_Command_struct __user *arg32 = BIG_IOCTL32_Command_struct __user *arg32 =
(BIG_IOCTL32_Command_struct __user *) arg; (BIG_IOCTL32_Command_struct __user *) arg;
BIG_IOCTL_Command_struct arg64; BIG_IOCTL_Command_struct arg64;
BIG_IOCTL_Command_struct __user *p = compat_alloc_user_space(sizeof(arg64)); BIG_IOCTL_Command_struct __user *p =
compat_alloc_user_space(sizeof(arg64));
int err; int err;
u32 cp; u32 cp;
err = 0; err = 0;
err |= copy_from_user(&arg64.LUN_info, &arg32->LUN_info, sizeof(arg64.LUN_info)); err |=
err |= copy_from_user(&arg64.Request, &arg32->Request, sizeof(arg64.Request)); copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
err |= copy_from_user(&arg64.error_info, &arg32->error_info, sizeof(arg64.error_info)); sizeof(arg64.LUN_info));
err |=
copy_from_user(&arg64.Request, &arg32->Request,
sizeof(arg64.Request));
err |=
copy_from_user(&arg64.error_info, &arg32->error_info,
sizeof(arg64.error_info));
err |= get_user(arg64.buf_size, &arg32->buf_size); err |= get_user(arg64.buf_size, &arg32->buf_size);
err |= get_user(arg64.malloc_size, &arg32->malloc_size); err |= get_user(arg64.malloc_size, &arg32->malloc_size);
err |= get_user(cp, &arg32->buf); err |= get_user(cp, &arg32->buf);
...@@ -625,10 +655,12 @@ static int cciss_ioctl32_big_passthru(struct file *file, unsigned cmd, unsigned ...@@ -625,10 +655,12 @@ static int cciss_ioctl32_big_passthru(struct file *file, unsigned cmd, unsigned
if (err) if (err)
return -EFAULT; return -EFAULT;
err = do_ioctl(file, CCISS_BIG_PASSTHRU, (unsigned long) p); err = do_ioctl(file, CCISS_BIG_PASSTHRU, (unsigned long)p);
if (err) if (err)
return err; return err;
err |= copy_in_user(&arg32->error_info, &p->error_info, sizeof(arg32->error_info)); err |=
copy_in_user(&arg32->error_info, &p->error_info,
sizeof(arg32->error_info));
if (err) if (err)
return -EFAULT; return -EFAULT;
return err; return err;
...@@ -665,27 +697,33 @@ static int cciss_ioctl(struct inode *inode, struct file *filep, ...@@ -665,27 +697,33 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
printk(KERN_DEBUG "cciss_ioctl: Called with cmd=%x %lx\n", cmd, arg); printk(KERN_DEBUG "cciss_ioctl: Called with cmd=%x %lx\n", cmd, arg);
#endif /* CCISS_DEBUG */ #endif /* CCISS_DEBUG */
switch(cmd) { switch (cmd) {
case CCISS_GETPCIINFO: case CCISS_GETPCIINFO:
{ {
cciss_pci_info_struct pciinfo; cciss_pci_info_struct pciinfo;
if (!arg) return -EINVAL; if (!arg)
return -EINVAL;
pciinfo.domain = pci_domain_nr(host->pdev->bus); pciinfo.domain = pci_domain_nr(host->pdev->bus);
pciinfo.bus = host->pdev->bus->number; pciinfo.bus = host->pdev->bus->number;
pciinfo.dev_fn = host->pdev->devfn; pciinfo.dev_fn = host->pdev->devfn;
pciinfo.board_id = host->board_id; pciinfo.board_id = host->board_id;
if (copy_to_user(argp, &pciinfo, sizeof( cciss_pci_info_struct ))) if (copy_to_user
(argp, &pciinfo, sizeof(cciss_pci_info_struct)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
case CCISS_GETINTINFO: case CCISS_GETINTINFO:
{ {
cciss_coalint_struct intinfo; cciss_coalint_struct intinfo;
if (!arg) return -EINVAL; if (!arg)
intinfo.delay = readl(&host->cfgtable->HostWrite.CoalIntDelay); return -EINVAL;
intinfo.count = readl(&host->cfgtable->HostWrite.CoalIntCount); intinfo.delay =
if (copy_to_user(argp, &intinfo, sizeof( cciss_coalint_struct ))) readl(&host->cfgtable->HostWrite.CoalIntDelay);
intinfo.count =
readl(&host->cfgtable->HostWrite.CoalIntCount);
if (copy_to_user
(argp, &intinfo, sizeof(cciss_coalint_struct)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
...@@ -695,25 +733,27 @@ static int cciss_ioctl(struct inode *inode, struct file *filep, ...@@ -695,25 +733,27 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
unsigned long flags; unsigned long flags;
int i; int i;
if (!arg) return -EINVAL; if (!arg)
if (!capable(CAP_SYS_ADMIN)) return -EPERM; return -EINVAL;
if (copy_from_user(&intinfo, argp, sizeof( cciss_coalint_struct))) if (!capable(CAP_SYS_ADMIN))
return -EPERM;
if (copy_from_user
(&intinfo, argp, sizeof(cciss_coalint_struct)))
return -EFAULT; return -EFAULT;
if ( (intinfo.delay == 0 ) && (intinfo.count == 0)) if ((intinfo.delay == 0) && (intinfo.count == 0))
{ {
// printk("cciss_ioctl: delay and count cannot be 0\n"); // printk("cciss_ioctl: delay and count cannot be 0\n");
return -EINVAL; return -EINVAL;
} }
spin_lock_irqsave(CCISS_LOCK(ctlr), flags); spin_lock_irqsave(CCISS_LOCK(ctlr), flags);
/* Update the field, and then ring the doorbell */ /* Update the field, and then ring the doorbell */
writel( intinfo.delay, writel(intinfo.delay,
&(host->cfgtable->HostWrite.CoalIntDelay)); &(host->cfgtable->HostWrite.CoalIntDelay));
writel( intinfo.count, writel(intinfo.count,
&(host->cfgtable->HostWrite.CoalIntCount)); &(host->cfgtable->HostWrite.CoalIntCount));
writel( CFGTBL_ChangeReq, host->vaddr + SA5_DOORBELL); writel(CFGTBL_ChangeReq, host->vaddr + SA5_DOORBELL);
for(i=0;i<MAX_IOCTL_CONFIG_WAIT;i++) { for (i = 0; i < MAX_IOCTL_CONFIG_WAIT; i++) {
if (!(readl(host->vaddr + SA5_DOORBELL) if (!(readl(host->vaddr + SA5_DOORBELL)
& CFGTBL_ChangeReq)) & CFGTBL_ChangeReq))
break; break;
...@@ -730,10 +770,12 @@ static int cciss_ioctl(struct inode *inode, struct file *filep, ...@@ -730,10 +770,12 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
NodeName_type NodeName; NodeName_type NodeName;
int i; int i;
if (!arg) return -EINVAL; if (!arg)
for(i=0;i<16;i++) return -EINVAL;
NodeName[i] = readb(&host->cfgtable->ServerName[i]); for (i = 0; i < 16; i++)
if (copy_to_user(argp, NodeName, sizeof( NodeName_type))) NodeName[i] =
readb(&host->cfgtable->ServerName[i]);
if (copy_to_user(argp, NodeName, sizeof(NodeName_type)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
...@@ -743,21 +785,25 @@ static int cciss_ioctl(struct inode *inode, struct file *filep, ...@@ -743,21 +785,25 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
unsigned long flags; unsigned long flags;
int i; int i;
if (!arg) return -EINVAL; if (!arg)
if (!capable(CAP_SYS_ADMIN)) return -EPERM; return -EINVAL;
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
if (copy_from_user(NodeName, argp, sizeof( NodeName_type))) if (copy_from_user
(NodeName, argp, sizeof(NodeName_type)))
return -EFAULT; return -EFAULT;
spin_lock_irqsave(CCISS_LOCK(ctlr), flags); spin_lock_irqsave(CCISS_LOCK(ctlr), flags);
/* Update the field, and then ring the doorbell */ /* Update the field, and then ring the doorbell */
for(i=0;i<16;i++) for (i = 0; i < 16; i++)
writeb( NodeName[i], &host->cfgtable->ServerName[i]); writeb(NodeName[i],
&host->cfgtable->ServerName[i]);
writel( CFGTBL_ChangeReq, host->vaddr + SA5_DOORBELL); writel(CFGTBL_ChangeReq, host->vaddr + SA5_DOORBELL);
for(i=0;i<MAX_IOCTL_CONFIG_WAIT;i++) { for (i = 0; i < MAX_IOCTL_CONFIG_WAIT; i++) {
if (!(readl(host->vaddr + SA5_DOORBELL) if (!(readl(host->vaddr + SA5_DOORBELL)
& CFGTBL_ChangeReq)) & CFGTBL_ChangeReq))
break; break;
...@@ -774,9 +820,11 @@ static int cciss_ioctl(struct inode *inode, struct file *filep, ...@@ -774,9 +820,11 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
{ {
Heartbeat_type heartbeat; Heartbeat_type heartbeat;
if (!arg) return -EINVAL; if (!arg)
return -EINVAL;
heartbeat = readl(&host->cfgtable->HeartBeat); heartbeat = readl(&host->cfgtable->HeartBeat);
if (copy_to_user(argp, &heartbeat, sizeof( Heartbeat_type))) if (copy_to_user
(argp, &heartbeat, sizeof(Heartbeat_type)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
...@@ -784,9 +832,11 @@ static int cciss_ioctl(struct inode *inode, struct file *filep, ...@@ -784,9 +832,11 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
{ {
BusTypes_type BusTypes; BusTypes_type BusTypes;
if (!arg) return -EINVAL; if (!arg)
return -EINVAL;
BusTypes = readl(&host->cfgtable->BusTypes); BusTypes = readl(&host->cfgtable->BusTypes);
if (copy_to_user(argp, &BusTypes, sizeof( BusTypes_type) )) if (copy_to_user
(argp, &BusTypes, sizeof(BusTypes_type)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
...@@ -794,10 +844,12 @@ static int cciss_ioctl(struct inode *inode, struct file *filep, ...@@ -794,10 +844,12 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
{ {
FirmwareVer_type firmware; FirmwareVer_type firmware;
if (!arg) return -EINVAL; if (!arg)
return -EINVAL;
memcpy(firmware, host->firm_ver, 4); memcpy(firmware, host->firm_ver, 4);
if (copy_to_user(argp, firmware, sizeof( FirmwareVer_type))) if (copy_to_user
(argp, firmware, sizeof(FirmwareVer_type)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
...@@ -805,9 +857,11 @@ static int cciss_ioctl(struct inode *inode, struct file *filep, ...@@ -805,9 +857,11 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
{ {
DriverVer_type DriverVer = DRIVER_VERSION; DriverVer_type DriverVer = DRIVER_VERSION;
if (!arg) return -EINVAL; if (!arg)
return -EINVAL;
if (copy_to_user(argp, &DriverVer, sizeof( DriverVer_type) )) if (copy_to_user
(argp, &DriverVer, sizeof(DriverVer_type)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
...@@ -817,7 +871,7 @@ static int cciss_ioctl(struct inode *inode, struct file *filep, ...@@ -817,7 +871,7 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
return -ENXIO; return -ENXIO;
return revalidate_allvol(host); return revalidate_allvol(host);
case CCISS_GETLUNINFO: { case CCISS_GETLUNINFO:{
LogvolInfo_struct luninfo; LogvolInfo_struct luninfo;
luninfo.LunID = drv->LunID; luninfo.LunID = drv->LunID;
...@@ -843,41 +897,40 @@ static int cciss_ioctl(struct inode *inode, struct file *filep, ...@@ -843,41 +897,40 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
unsigned long flags; unsigned long flags;
DECLARE_COMPLETION(wait); DECLARE_COMPLETION(wait);
if (!arg) return -EINVAL; if (!arg)
return -EINVAL;
if (!capable(CAP_SYS_RAWIO)) return -EPERM; if (!capable(CAP_SYS_RAWIO))
return -EPERM;
if (copy_from_user(&iocommand, argp, sizeof( IOCTL_Command_struct) )) if (copy_from_user
(&iocommand, argp, sizeof(IOCTL_Command_struct)))
return -EFAULT; return -EFAULT;
if((iocommand.buf_size < 1) && if ((iocommand.buf_size < 1) &&
(iocommand.Request.Type.Direction != XFER_NONE)) (iocommand.Request.Type.Direction != XFER_NONE)) {
{
return -EINVAL; return -EINVAL;
} }
#if 0 /* 'buf_size' member is 16-bits, and always smaller than kmalloc limit */ #if 0 /* 'buf_size' member is 16-bits, and always smaller than kmalloc limit */
/* Check kmalloc limits */ /* Check kmalloc limits */
if(iocommand.buf_size > 128000) if (iocommand.buf_size > 128000)
return -EINVAL; return -EINVAL;
#endif #endif
if(iocommand.buf_size > 0) if (iocommand.buf_size > 0) {
{
buff = kmalloc(iocommand.buf_size, GFP_KERNEL); buff = kmalloc(iocommand.buf_size, GFP_KERNEL);
if( buff == NULL) if (buff == NULL)
return -EFAULT; return -EFAULT;
} }
if (iocommand.Request.Type.Direction == XFER_WRITE) if (iocommand.Request.Type.Direction == XFER_WRITE) {
{
/* Copy the data into the buffer we created */ /* Copy the data into the buffer we created */
if (copy_from_user(buff, iocommand.buf, iocommand.buf_size)) if (copy_from_user
{ (buff, iocommand.buf, iocommand.buf_size)) {
kfree(buff); kfree(buff);
return -EFAULT; return -EFAULT;
} }
} else { } else {
memset(buff, 0, iocommand.buf_size); memset(buff, 0, iocommand.buf_size);
} }
if ((c = cmd_alloc(host , 0)) == NULL) if ((c = cmd_alloc(host, 0)) == NULL) {
{
kfree(buff); kfree(buff);
return -ENOMEM; return -ENOMEM;
} }
...@@ -885,14 +938,14 @@ static int cciss_ioctl(struct inode *inode, struct file *filep, ...@@ -885,14 +938,14 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
c->cmd_type = CMD_IOCTL_PEND; c->cmd_type = CMD_IOCTL_PEND;
// Fill in Command Header // Fill in Command Header
c->Header.ReplyQueue = 0; // unused in simple mode c->Header.ReplyQueue = 0; // unused in simple mode
if( iocommand.buf_size > 0) // buffer to fill if (iocommand.buf_size > 0) // buffer to fill
{ {
c->Header.SGList = 1; c->Header.SGList = 1;
c->Header.SGTotal= 1; c->Header.SGTotal = 1;
} else // no buffers to fill } else // no buffers to fill
{ {
c->Header.SGList = 0; c->Header.SGList = 0;
c->Header.SGTotal= 0; c->Header.SGTotal = 0;
} }
c->Header.LUN = iocommand.LUN_info; c->Header.LUN = iocommand.LUN_info;
c->Header.Tag.lower = c->busaddr; // use the kernel address the cmd block for tag c->Header.Tag.lower = c->busaddr; // use the kernel address the cmd block for tag
...@@ -901,9 +954,8 @@ static int cciss_ioctl(struct inode *inode, struct file *filep, ...@@ -901,9 +954,8 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
c->Request = iocommand.Request; c->Request = iocommand.Request;
// Fill in the scatter gather information // Fill in the scatter gather information
if (iocommand.buf_size > 0 ) if (iocommand.buf_size > 0) {
{ temp64.val = pci_map_single(host->pdev, buff,
temp64.val = pci_map_single( host->pdev, buff,
iocommand.buf_size, iocommand.buf_size,
PCI_DMA_BIDIRECTIONAL); PCI_DMA_BIDIRECTIONAL);
c->SG[0].Addr.lower = temp64.val32.lower; c->SG[0].Addr.lower = temp64.val32.lower;
...@@ -925,23 +977,23 @@ static int cciss_ioctl(struct inode *inode, struct file *filep, ...@@ -925,23 +977,23 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
/* unlock the buffers from DMA */ /* unlock the buffers from DMA */
temp64.val32.lower = c->SG[0].Addr.lower; temp64.val32.lower = c->SG[0].Addr.lower;
temp64.val32.upper = c->SG[0].Addr.upper; temp64.val32.upper = c->SG[0].Addr.upper;
pci_unmap_single( host->pdev, (dma_addr_t) temp64.val, pci_unmap_single(host->pdev, (dma_addr_t) temp64.val,
iocommand.buf_size, PCI_DMA_BIDIRECTIONAL); iocommand.buf_size,
PCI_DMA_BIDIRECTIONAL);
/* Copy the error information out */ /* Copy the error information out */
iocommand.error_info = *(c->err_info); iocommand.error_info = *(c->err_info);
if ( copy_to_user(argp, &iocommand, sizeof( IOCTL_Command_struct) ) ) if (copy_to_user
{ (argp, &iocommand, sizeof(IOCTL_Command_struct))) {
kfree(buff); kfree(buff);
cmd_free(host, c, 0); cmd_free(host, c, 0);
return -EFAULT; return -EFAULT;
} }
if (iocommand.Request.Type.Direction == XFER_READ) if (iocommand.Request.Type.Direction == XFER_READ) {
{
/* Copy the data out of the buffer we created */ /* Copy the data out of the buffer we created */
if (copy_to_user(iocommand.buf, buff, iocommand.buf_size)) if (copy_to_user
{ (iocommand.buf, buff, iocommand.buf_size)) {
kfree(buff); kfree(buff);
cmd_free(host, c, 0); cmd_free(host, c, 0);
return -EFAULT; return -EFAULT;
...@@ -951,7 +1003,7 @@ static int cciss_ioctl(struct inode *inode, struct file *filep, ...@@ -951,7 +1003,7 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
cmd_free(host, c, 0); cmd_free(host, c, 0);
return 0; return 0;
} }
case CCISS_BIG_PASSTHRU: { case CCISS_BIG_PASSTHRU:{
BIG_IOCTL_Command_struct *ioc; BIG_IOCTL_Command_struct *ioc;
CommandList_struct *c; CommandList_struct *c;
unsigned char **buff = NULL; unsigned char **buff = NULL;
...@@ -994,12 +1046,13 @@ static int cciss_ioctl(struct inode *inode, struct file *filep, ...@@ -994,12 +1046,13 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
status = -EINVAL; status = -EINVAL;
goto cleanup1; goto cleanup1;
} }
buff = kzalloc(MAXSGENTRIES * sizeof(char *), GFP_KERNEL); buff =
kzalloc(MAXSGENTRIES * sizeof(char *), GFP_KERNEL);
if (!buff) { if (!buff) {
status = -ENOMEM; status = -ENOMEM;
goto cleanup1; goto cleanup1;
} }
buff_size = (int *) kmalloc(MAXSGENTRIES * sizeof(int), buff_size = (int *)kmalloc(MAXSGENTRIES * sizeof(int),
GFP_KERNEL); GFP_KERNEL);
if (!buff_size) { if (!buff_size) {
status = -ENOMEM; status = -ENOMEM;
...@@ -1008,7 +1061,9 @@ static int cciss_ioctl(struct inode *inode, struct file *filep, ...@@ -1008,7 +1061,9 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
left = ioc->buf_size; left = ioc->buf_size;
data_ptr = ioc->buf; data_ptr = ioc->buf;
while (left) { while (left) {
sz = (left > ioc->malloc_size) ? ioc->malloc_size : left; sz = (left >
ioc->malloc_size) ? ioc->
malloc_size : left;
buff_size[sg_used] = sz; buff_size[sg_used] = sz;
buff[sg_used] = kmalloc(sz, GFP_KERNEL); buff[sg_used] = kmalloc(sz, GFP_KERNEL);
if (buff[sg_used] == NULL) { if (buff[sg_used] == NULL) {
...@@ -1016,7 +1071,8 @@ static int cciss_ioctl(struct inode *inode, struct file *filep, ...@@ -1016,7 +1071,8 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
goto cleanup1; goto cleanup1;
} }
if (ioc->Request.Type.Direction == XFER_WRITE) { if (ioc->Request.Type.Direction == XFER_WRITE) {
if (copy_from_user(buff[sg_used], data_ptr, sz)) { if (copy_from_user
(buff[sg_used], data_ptr, sz)) {
status = -ENOMEM; status = -ENOMEM;
goto cleanup1; goto cleanup1;
} }
...@@ -1027,32 +1083,35 @@ static int cciss_ioctl(struct inode *inode, struct file *filep, ...@@ -1027,32 +1083,35 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
data_ptr += sz; data_ptr += sz;
sg_used++; sg_used++;
} }
if ((c = cmd_alloc(host , 0)) == NULL) { if ((c = cmd_alloc(host, 0)) == NULL) {
status = -ENOMEM; status = -ENOMEM;
goto cleanup1; goto cleanup1;
} }
c->cmd_type = CMD_IOCTL_PEND; c->cmd_type = CMD_IOCTL_PEND;
c->Header.ReplyQueue = 0; c->Header.ReplyQueue = 0;
if( ioc->buf_size > 0) { if (ioc->buf_size > 0) {
c->Header.SGList = sg_used; c->Header.SGList = sg_used;
c->Header.SGTotal= sg_used; c->Header.SGTotal = sg_used;
} else { } else {
c->Header.SGList = 0; c->Header.SGList = 0;
c->Header.SGTotal= 0; c->Header.SGTotal = 0;
} }
c->Header.LUN = ioc->LUN_info; c->Header.LUN = ioc->LUN_info;
c->Header.Tag.lower = c->busaddr; c->Header.Tag.lower = c->busaddr;
c->Request = ioc->Request; c->Request = ioc->Request;
if (ioc->buf_size > 0 ) { if (ioc->buf_size > 0) {
int i; int i;
for(i=0; i<sg_used; i++) { for (i = 0; i < sg_used; i++) {
temp64.val = pci_map_single( host->pdev, buff[i], temp64.val =
pci_map_single(host->pdev, buff[i],
buff_size[i], buff_size[i],
PCI_DMA_BIDIRECTIONAL); PCI_DMA_BIDIRECTIONAL);
c->SG[i].Addr.lower = temp64.val32.lower; c->SG[i].Addr.lower =
c->SG[i].Addr.upper = temp64.val32.upper; temp64.val32.lower;
c->SG[i].Addr.upper =
temp64.val32.upper;
c->SG[i].Len = buff_size[i]; c->SG[i].Len = buff_size[i];
c->SG[i].Ext = 0; /* we are not chaining */ c->SG[i].Ext = 0; /* we are not chaining */
} }
...@@ -1066,11 +1125,12 @@ static int cciss_ioctl(struct inode *inode, struct file *filep, ...@@ -1066,11 +1125,12 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags); spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);
wait_for_completion(&wait); wait_for_completion(&wait);
/* unlock the buffers from DMA */ /* unlock the buffers from DMA */
for(i=0; i<sg_used; i++) { for (i = 0; i < sg_used; i++) {
temp64.val32.lower = c->SG[i].Addr.lower; temp64.val32.lower = c->SG[i].Addr.lower;
temp64.val32.upper = c->SG[i].Addr.upper; temp64.val32.upper = c->SG[i].Addr.upper;
pci_unmap_single( host->pdev, (dma_addr_t) temp64.val, pci_unmap_single(host->pdev,
buff_size[i], PCI_DMA_BIDIRECTIONAL); (dma_addr_t) temp64.val, buff_size[i],
PCI_DMA_BIDIRECTIONAL);
} }
/* Copy the error information out */ /* Copy the error information out */
ioc->error_info = *(c->err_info); ioc->error_info = *(c->err_info);
...@@ -1082,8 +1142,9 @@ static int cciss_ioctl(struct inode *inode, struct file *filep, ...@@ -1082,8 +1142,9 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
if (ioc->Request.Type.Direction == XFER_READ) { if (ioc->Request.Type.Direction == XFER_READ) {
/* Copy the data out of the buffer we created */ /* Copy the data out of the buffer we created */
BYTE __user *ptr = ioc->buf; BYTE __user *ptr = ioc->buf;
for(i=0; i< sg_used; i++) { for (i = 0; i < sg_used; i++) {
if (copy_to_user(ptr, buff[i], buff_size[i])) { if (copy_to_user
(ptr, buff[i], buff_size[i])) {
cmd_free(host, c, 0); cmd_free(host, c, 0);
status = -EFAULT; status = -EFAULT;
goto cleanup1; goto cleanup1;
...@@ -1093,9 +1154,9 @@ static int cciss_ioctl(struct inode *inode, struct file *filep, ...@@ -1093,9 +1154,9 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
} }
cmd_free(host, c, 0); cmd_free(host, c, 0);
status = 0; status = 0;
cleanup1: cleanup1:
if (buff) { if (buff) {
for(i=0; i<sg_used; i++) for (i = 0; i < sg_used; i++)
kfree(buff[i]); kfree(buff[i]);
kfree(buff); kfree(buff);
} }
...@@ -1106,7 +1167,6 @@ cleanup1: ...@@ -1106,7 +1167,6 @@ cleanup1:
default: default:
return -ENOTTY; return -ENOTTY;
} }
} }
/* /*
...@@ -1135,7 +1195,7 @@ static int revalidate_allvol(ctlr_info_t *host) ...@@ -1135,7 +1195,7 @@ static int revalidate_allvol(ctlr_info_t *host)
host->usage_count++; host->usage_count++;
spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags); spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);
for(i=0; i< NWD; i++) { for (i = 0; i < NWD; i++) {
struct gendisk *disk = host->gendisk[i]; struct gendisk *disk = host->gendisk[i];
if (disk) { if (disk) {
request_queue_t *q = disk->queue; request_queue_t *q = disk->queue;
...@@ -1189,7 +1249,6 @@ static inline void complete_buffers(struct bio *bio, int status) ...@@ -1189,7 +1249,6 @@ static inline void complete_buffers(struct bio *bio, int status)
bio_endio(bio, nr_sectors << 9, status ? 0 : -EIO); bio_endio(bio, nr_sectors << 9, status ? 0 : -EIO);
bio = xbh; bio = xbh;
} }
} }
static void cciss_softirq_done(struct request *rq) static void cciss_softirq_done(struct request *rq)
...@@ -1207,7 +1266,7 @@ static void cciss_softirq_done(struct request *rq) ...@@ -1207,7 +1266,7 @@ static void cciss_softirq_done(struct request *rq)
/* command did not need to be retried */ /* command did not need to be retried */
/* unmap the DMA mapping for all the scatter gather elements */ /* unmap the DMA mapping for all the scatter gather elements */
for(i=0; i<cmd->Header.SGList; i++) { for (i = 0; i < cmd->Header.SGList; i++) {
temp64.val32.lower = cmd->SG[i].Addr.lower; temp64.val32.lower = cmd->SG[i].Addr.lower;
temp64.val32.upper = cmd->SG[i].Addr.upper; temp64.val32.upper = cmd->SG[i].Addr.upper;
pci_unmap_page(h->pdev, temp64.val, cmd->SG[i].Len, ddir); pci_unmap_page(h->pdev, temp64.val, cmd->SG[i].Len, ddir);
...@@ -1222,7 +1281,7 @@ static void cciss_softirq_done(struct request *rq) ...@@ -1222,7 +1281,7 @@ static void cciss_softirq_done(struct request *rq)
add_disk_randomness(rq->rq_disk); add_disk_randomness(rq->rq_disk);
spin_lock_irqsave(&h->lock, flags); spin_lock_irqsave(&h->lock, flags);
end_that_request_last(rq, rq->errors); end_that_request_last(rq, rq->errors);
cmd_free(h, cmd,1); cmd_free(h, cmd, 1);
spin_unlock_irqrestore(&h->lock, flags); spin_unlock_irqrestore(&h->lock, flags);
} }
...@@ -1233,9 +1292,9 @@ static void cciss_softirq_done(struct request *rq) ...@@ -1233,9 +1292,9 @@ static void cciss_softirq_done(struct request *rq)
* will always be left registered with the kernel since it is also the * will always be left registered with the kernel since it is also the
* controller node. Any changes to disk 0 will show up on the next * controller node. Any changes to disk 0 will show up on the next
* reboot. * reboot.
*/ */
static void cciss_update_drive_info(int ctlr, int drv_index) static void cciss_update_drive_info(int ctlr, int drv_index)
{ {
ctlr_info_t *h = hba[ctlr]; ctlr_info_t *h = hba[ctlr];
struct gendisk *disk; struct gendisk *disk;
ReadCapdata_struct *size_buff = NULL; ReadCapdata_struct *size_buff = NULL;
...@@ -1245,8 +1304,8 @@ static void cciss_update_drive_info(int ctlr, int drv_index) ...@@ -1245,8 +1304,8 @@ static void cciss_update_drive_info(int ctlr, int drv_index)
unsigned long flags = 0; unsigned long flags = 0;
int ret = 0; int ret = 0;
/* if the disk already exists then deregister it before proceeding*/ /* if the disk already exists then deregister it before proceeding */
if (h->drv[drv_index].raid_level != -1){ if (h->drv[drv_index].raid_level != -1) {
spin_lock_irqsave(CCISS_LOCK(h->ctlr), flags); spin_lock_irqsave(CCISS_LOCK(h->ctlr), flags);
h->drv[drv_index].busy_configuring = 1; h->drv[drv_index].busy_configuring = 1;
spin_unlock_irqrestore(CCISS_LOCK(h->ctlr), flags); spin_unlock_irqrestore(CCISS_LOCK(h->ctlr), flags);
...@@ -1259,12 +1318,11 @@ static void cciss_update_drive_info(int ctlr, int drv_index) ...@@ -1259,12 +1318,11 @@ static void cciss_update_drive_info(int ctlr, int drv_index)
if (ret) if (ret)
return; return;
/* Get information about the disk and modify the driver structure */ /* Get information about the disk and modify the driver structure */
size_buff = kmalloc(sizeof( ReadCapdata_struct), GFP_KERNEL); size_buff = kmalloc(sizeof(ReadCapdata_struct), GFP_KERNEL);
if (size_buff == NULL) if (size_buff == NULL)
goto mem_msg; goto mem_msg;
inq_buff = kmalloc(sizeof( InquiryData_struct), GFP_KERNEL); inq_buff = kmalloc(sizeof(InquiryData_struct), GFP_KERNEL);
if (inq_buff == NULL) if (inq_buff == NULL)
goto mem_msg; goto mem_msg;
...@@ -1277,9 +1335,8 @@ static void cciss_update_drive_info(int ctlr, int drv_index) ...@@ -1277,9 +1335,8 @@ static void cciss_update_drive_info(int ctlr, int drv_index)
disk = h->gendisk[drv_index]; disk = h->gendisk[drv_index];
set_capacity(disk, h->drv[drv_index].nr_blocks); set_capacity(disk, h->drv[drv_index].nr_blocks);
/* if it's the controller it's already added */ /* if it's the controller it's already added */
if (drv_index){ if (drv_index) {
disk->queue = blk_init_queue(do_cciss_request, &h->lock); disk->queue = blk_init_queue(do_cciss_request, &h->lock);
/* Set up queue information */ /* Set up queue information */
...@@ -1305,11 +1362,11 @@ static void cciss_update_drive_info(int ctlr, int drv_index) ...@@ -1305,11 +1362,11 @@ static void cciss_update_drive_info(int ctlr, int drv_index)
add_disk(disk); add_disk(disk);
} }
freeret: freeret:
kfree(size_buff); kfree(size_buff);
kfree(inq_buff); kfree(inq_buff);
return; return;
mem_msg: mem_msg:
printk(KERN_ERR "cciss: out of memory\n"); printk(KERN_ERR "cciss: out of memory\n");
goto freeret; goto freeret;
} }
...@@ -1319,13 +1376,13 @@ mem_msg: ...@@ -1319,13 +1376,13 @@ mem_msg:
* where new drives will be added. If the index to be returned is greater * where new drives will be added. If the index to be returned is greater
* than the highest_lun index for the controller then highest_lun is set * than the highest_lun index for the controller then highest_lun is set
* to this new index. If there are no available indexes then -1 is returned. * to this new index. If there are no available indexes then -1 is returned.
*/ */
static int cciss_find_free_drive_index(int ctlr) static int cciss_find_free_drive_index(int ctlr)
{ {
int i; int i;
for (i=0; i < CISS_MAX_LUN; i++){ for (i = 0; i < CISS_MAX_LUN; i++) {
if (hba[ctlr]->drv[i].raid_level == -1){ if (hba[ctlr]->drv[i].raid_level == -1) {
if (i > hba[ctlr]->highest_lun) if (i > hba[ctlr]->highest_lun)
hba[ctlr]->highest_lun = i; hba[ctlr]->highest_lun = i;
return i; return i;
...@@ -1343,7 +1400,7 @@ static int cciss_find_free_drive_index(int ctlr) ...@@ -1343,7 +1400,7 @@ static int cciss_find_free_drive_index(int ctlr)
* h = The controller to perform the operations on * h = The controller to perform the operations on
* del_disk = The disk to remove if specified. If the value given * del_disk = The disk to remove if specified. If the value given
* is NULL then no disk is removed. * is NULL then no disk is removed.
*/ */
static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk) static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk)
{ {
int ctlr = h->ctlr; int ctlr = h->ctlr;
...@@ -1360,12 +1417,12 @@ static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk) ...@@ -1360,12 +1417,12 @@ static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk)
/* Set busy_configuring flag for this operation */ /* Set busy_configuring flag for this operation */
spin_lock_irqsave(CCISS_LOCK(h->ctlr), flags); spin_lock_irqsave(CCISS_LOCK(h->ctlr), flags);
if (h->num_luns >= CISS_MAX_LUN){ if (h->num_luns >= CISS_MAX_LUN) {
spin_unlock_irqrestore(CCISS_LOCK(h->ctlr), flags); spin_unlock_irqrestore(CCISS_LOCK(h->ctlr), flags);
return -EINVAL; return -EINVAL;
} }
if (h->busy_configuring){ if (h->busy_configuring) {
spin_unlock_irqrestore(CCISS_LOCK(h->ctlr), flags); spin_unlock_irqrestore(CCISS_LOCK(h->ctlr), flags);
return -EBUSY; return -EBUSY;
} }
...@@ -1375,7 +1432,7 @@ static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk) ...@@ -1375,7 +1432,7 @@ static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk)
* and update the logical drive table. If it is not NULL then * and update the logical drive table. If it is not NULL then
* we will check if the disk is in use or not. * we will check if the disk is in use or not.
*/ */
if (del_disk != NULL){ if (del_disk != NULL) {
drv = get_drv(del_disk); drv = get_drv(del_disk);
drv->busy_configuring = 1; drv->busy_configuring = 1;
spin_unlock_irqrestore(CCISS_LOCK(h->ctlr), flags); spin_unlock_irqrestore(CCISS_LOCK(h->ctlr), flags);
...@@ -1393,15 +1450,22 @@ static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk) ...@@ -1393,15 +1450,22 @@ static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk)
goto mem_msg; goto mem_msg;
return_code = sendcmd_withirq(CISS_REPORT_LOG, ctlr, ld_buff, return_code = sendcmd_withirq(CISS_REPORT_LOG, ctlr, ld_buff,
sizeof(ReportLunData_struct), 0, 0, 0, sizeof(ReportLunData_struct), 0,
TYPE_CMD); 0, 0, TYPE_CMD);
if (return_code == IO_OK){ if (return_code == IO_OK) {
listlength |= (0xff & (unsigned int)(ld_buff->LUNListLength[0])) << 24; listlength |=
listlength |= (0xff & (unsigned int)(ld_buff->LUNListLength[1])) << 16; (0xff & (unsigned int)(ld_buff->LUNListLength[0]))
listlength |= (0xff & (unsigned int)(ld_buff->LUNListLength[2])) << 8; << 24;
listlength |= 0xff & (unsigned int)(ld_buff->LUNListLength[3]); listlength |=
} else{ /* reading number of logical volumes failed */ (0xff & (unsigned int)(ld_buff->LUNListLength[1]))
<< 16;
listlength |=
(0xff & (unsigned int)(ld_buff->LUNListLength[2]))
<< 8;
listlength |=
0xff & (unsigned int)(ld_buff->LUNListLength[3]);
} else { /* reading number of logical volumes failed */
printk(KERN_WARNING "cciss: report logical volume" printk(KERN_WARNING "cciss: report logical volume"
" command failed\n"); " command failed\n");
listlength = 0; listlength = 0;
...@@ -1409,7 +1473,7 @@ static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk) ...@@ -1409,7 +1473,7 @@ static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk)
} }
num_luns = listlength / 8; /* 8 bytes per entry */ num_luns = listlength / 8; /* 8 bytes per entry */
if (num_luns > CISS_MAX_LUN){ if (num_luns > CISS_MAX_LUN) {
num_luns = CISS_MAX_LUN; num_luns = CISS_MAX_LUN;
printk(KERN_WARNING "cciss: more luns configured" printk(KERN_WARNING "cciss: more luns configured"
" on controller than can be handled by" " on controller than can be handled by"
...@@ -1420,7 +1484,7 @@ static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk) ...@@ -1420,7 +1484,7 @@ static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk)
* Check for updates in the drive information and any new drives * Check for updates in the drive information and any new drives
* on the controller. * on the controller.
*/ */
for (i=0; i < num_luns; i++){ for (i = 0; i < num_luns; i++) {
int j; int j;
drv_found = 0; drv_found = 0;
...@@ -1431,23 +1495,22 @@ static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk) ...@@ -1431,23 +1495,22 @@ static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk)
(unsigned int)(ld_buff->LUN[i][2])) << 16; (unsigned int)(ld_buff->LUN[i][2])) << 16;
lunid |= (0xff & lunid |= (0xff &
(unsigned int)(ld_buff->LUN[i][1])) << 8; (unsigned int)(ld_buff->LUN[i][1])) << 8;
lunid |= 0xff & lunid |= 0xff & (unsigned int)(ld_buff->LUN[i][0]);
(unsigned int)(ld_buff->LUN[i][0]);
/* Find if the LUN is already in the drive array /* Find if the LUN is already in the drive array
* of the controller. If so then update its info * of the controller. If so then update its info
* if not is use. If it does not exist then find * if not is use. If it does not exist then find
* the first free index and add it. * the first free index and add it.
*/ */
for (j=0; j <= h->highest_lun; j++){ for (j = 0; j <= h->highest_lun; j++) {
if (h->drv[j].LunID == lunid){ if (h->drv[j].LunID == lunid) {
drv_index = j; drv_index = j;
drv_found = 1; drv_found = 1;
} }
} }
/* check if the drive was found already in the array */ /* check if the drive was found already in the array */
if (!drv_found){ if (!drv_found) {
drv_index = cciss_find_free_drive_index(ctlr); drv_index = cciss_find_free_drive_index(ctlr);
if (drv_index == -1) if (drv_index == -1)
goto freeret; goto freeret;
...@@ -1458,7 +1521,7 @@ static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk) ...@@ -1458,7 +1521,7 @@ static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk)
} /* end for */ } /* end for */
} /* end else */ } /* end else */
freeret: freeret:
kfree(ld_buff); kfree(ld_buff);
h->busy_configuring = 0; h->busy_configuring = 0;
/* We return -1 here to tell the ACU that we have registered/updated /* We return -1 here to tell the ACU that we have registered/updated
...@@ -1466,7 +1529,7 @@ freeret: ...@@ -1466,7 +1529,7 @@ freeret:
* additional times. * additional times.
*/ */
return -1; return -1;
mem_msg: mem_msg:
printk(KERN_ERR "cciss: out of memory\n"); printk(KERN_ERR "cciss: out of memory\n");
goto freeret; goto freeret;
} }
...@@ -1495,19 +1558,17 @@ static int deregister_disk(struct gendisk *disk, drive_info_struct *drv, ...@@ -1495,19 +1558,17 @@ static int deregister_disk(struct gendisk *disk, drive_info_struct *drv,
return -EPERM; return -EPERM;
/* make sure logical volume is NOT is use */ /* make sure logical volume is NOT is use */
if(clear_all || (h->gendisk[0] == disk)) { if (clear_all || (h->gendisk[0] == disk)) {
if (drv->usage_count > 1) if (drv->usage_count > 1)
return -EBUSY; return -EBUSY;
} } else if (drv->usage_count > 0)
else
if( drv->usage_count > 0 )
return -EBUSY; return -EBUSY;
/* invalidate the devices and deregister the disk. If it is disk /* invalidate the devices and deregister the disk. If it is disk
* zero do not deregister it but just zero out it's values. This * zero do not deregister it but just zero out it's values. This
* allows us to delete disk zero but keep the controller registered. * allows us to delete disk zero but keep the controller registered.
*/ */
if (h->gendisk[0] != disk){ if (h->gendisk[0] != disk) {
if (disk) { if (disk) {
request_queue_t *q = disk->queue; request_queue_t *q = disk->queue;
if (disk->flags & GENHD_FL_UP) if (disk->flags & GENHD_FL_UP)
...@@ -1531,12 +1592,12 @@ static int deregister_disk(struct gendisk *disk, drive_info_struct *drv, ...@@ -1531,12 +1592,12 @@ static int deregister_disk(struct gendisk *disk, drive_info_struct *drv,
* array is free. * array is free.
*/ */
if (clear_all){ if (clear_all) {
/* check to see if it was the last disk */ /* check to see if it was the last disk */
if (drv == h->drv + h->highest_lun) { if (drv == h->drv + h->highest_lun) {
/* if so, find the new hightest lun */ /* if so, find the new hightest lun */
int i, newhighest =-1; int i, newhighest = -1;
for(i=0; i<h->highest_lun; i++) { for (i = 0; i < h->highest_lun; i++) {
/* if the disk has size > 0, it is available */ /* if the disk has size > 0, it is available */
if (h->drv[i].heads) if (h->drv[i].heads)
newhighest = i; newhighest = i;
...@@ -1549,32 +1610,30 @@ static int deregister_disk(struct gendisk *disk, drive_info_struct *drv, ...@@ -1549,32 +1610,30 @@ static int deregister_disk(struct gendisk *disk, drive_info_struct *drv,
return 0; return 0;
} }
static int fill_cmd(CommandList_struct *c, __u8 cmd, int ctlr, void *buff, static int fill_cmd(CommandList_struct *c, __u8 cmd, int ctlr, void *buff, size_t size, unsigned int use_unit_num, /* 0: address the controller,
size_t size,
unsigned int use_unit_num, /* 0: address the controller,
1: address logical volume log_unit, 1: address logical volume log_unit,
2: periph device address is scsi3addr */ 2: periph device address is scsi3addr */
unsigned int log_unit, __u8 page_code, unsigned char *scsi3addr, unsigned int log_unit, __u8 page_code,
int cmd_type) unsigned char *scsi3addr, int cmd_type)
{ {
ctlr_info_t *h= hba[ctlr]; ctlr_info_t *h = hba[ctlr];
u64bit buff_dma_handle; u64bit buff_dma_handle;
int status = IO_OK; int status = IO_OK;
c->cmd_type = CMD_IOCTL_PEND; c->cmd_type = CMD_IOCTL_PEND;
c->Header.ReplyQueue = 0; c->Header.ReplyQueue = 0;
if( buff != NULL) { if (buff != NULL) {
c->Header.SGList = 1; c->Header.SGList = 1;
c->Header.SGTotal= 1; c->Header.SGTotal = 1;
} else { } else {
c->Header.SGList = 0; c->Header.SGList = 0;
c->Header.SGTotal= 0; c->Header.SGTotal = 0;
} }
c->Header.Tag.lower = c->busaddr; c->Header.Tag.lower = c->busaddr;
c->Request.Type.Type = cmd_type; c->Request.Type.Type = cmd_type;
if (cmd_type == TYPE_CMD) { if (cmd_type == TYPE_CMD) {
switch(cmd) { switch (cmd) {
case CISS_INQUIRY: case CISS_INQUIRY:
/* If the logical unit number is 0 then, this is going /* If the logical unit number is 0 then, this is going
to controller so It's a physical command to controller so It's a physical command
...@@ -1584,15 +1643,16 @@ static int fill_cmd(CommandList_struct *c, __u8 cmd, int ctlr, void *buff, ...@@ -1584,15 +1643,16 @@ static int fill_cmd(CommandList_struct *c, __u8 cmd, int ctlr, void *buff,
otherwise, if use_unit_num == 2, otherwise, if use_unit_num == 2,
mode = 0(periph dev addr) target = scsi3addr */ mode = 0(periph dev addr) target = scsi3addr */
if (use_unit_num == 1) { if (use_unit_num == 1) {
c->Header.LUN.LogDev.VolId= c->Header.LUN.LogDev.VolId =
h->drv[log_unit].LunID; h->drv[log_unit].LunID;
c->Header.LUN.LogDev.Mode = 1; c->Header.LUN.LogDev.Mode = 1;
} else if (use_unit_num == 2) { } else if (use_unit_num == 2) {
memcpy(c->Header.LUN.LunAddrBytes,scsi3addr,8); memcpy(c->Header.LUN.LunAddrBytes, scsi3addr,
8);
c->Header.LUN.LogDev.Mode = 0; c->Header.LUN.LogDev.Mode = 0;
} }
/* are we trying to read a vital product page */ /* are we trying to read a vital product page */
if(page_code != 0) { if (page_code != 0) {
c->Request.CDB[1] = 0x01; c->Request.CDB[1] = 0x01;
c->Request.CDB[2] = page_code; c->Request.CDB[2] = page_code;
} }
...@@ -1670,8 +1730,7 @@ static int fill_cmd(CommandList_struct *c, __u8 cmd, int ctlr, void *buff, ...@@ -1670,8 +1730,7 @@ static int fill_cmd(CommandList_struct *c, __u8 cmd, int ctlr, void *buff,
break; break;
default: default:
printk(KERN_WARNING printk(KERN_WARNING
"cciss%d: unknown message type %d\n", "cciss%d: unknown message type %d\n", ctlr, cmd);
ctlr, cmd);
return IO_ERROR; return IO_ERROR;
} }
} else { } else {
...@@ -1682,7 +1741,8 @@ static int fill_cmd(CommandList_struct *c, __u8 cmd, int ctlr, void *buff, ...@@ -1682,7 +1741,8 @@ static int fill_cmd(CommandList_struct *c, __u8 cmd, int ctlr, void *buff,
/* Fill in the scatter gather information */ /* Fill in the scatter gather information */
if (size > 0) { if (size > 0) {
buff_dma_handle.val = (__u64) pci_map_single(h->pdev, buff_dma_handle.val = (__u64) pci_map_single(h->pdev,
buff, size, PCI_DMA_BIDIRECTIONAL); buff, size,
PCI_DMA_BIDIRECTIONAL);
c->SG[0].Addr.lower = buff_dma_handle.val32.lower; c->SG[0].Addr.lower = buff_dma_handle.val32.lower;
c->SG[0].Addr.upper = buff_dma_handle.val32.upper; c->SG[0].Addr.upper = buff_dma_handle.val32.upper;
c->SG[0].Len = size; c->SG[0].Len = size;
...@@ -1690,14 +1750,13 @@ static int fill_cmd(CommandList_struct *c, __u8 cmd, int ctlr, void *buff, ...@@ -1690,14 +1750,13 @@ static int fill_cmd(CommandList_struct *c, __u8 cmd, int ctlr, void *buff,
} }
return status; return status;
} }
static int sendcmd_withirq(__u8 cmd, static int sendcmd_withirq(__u8 cmd,
int ctlr, int ctlr,
void *buff, void *buff,
size_t size, size_t size,
unsigned int use_unit_num, unsigned int use_unit_num,
unsigned int log_unit, unsigned int log_unit, __u8 page_code, int cmd_type)
__u8 page_code,
int cmd_type)
{ {
ctlr_info_t *h = hba[ctlr]; ctlr_info_t *h = hba[ctlr];
CommandList_struct *c; CommandList_struct *c;
...@@ -1706,7 +1765,7 @@ static int sendcmd_withirq(__u8 cmd, ...@@ -1706,7 +1765,7 @@ static int sendcmd_withirq(__u8 cmd,
int return_status; int return_status;
DECLARE_COMPLETION(wait); DECLARE_COMPLETION(wait);
if ((c = cmd_alloc(h , 0)) == NULL) if ((c = cmd_alloc(h, 0)) == NULL)
return -ENOMEM; return -ENOMEM;
return_status = fill_cmd(c, cmd, ctlr, buff, size, use_unit_num, return_status = fill_cmd(c, cmd, ctlr, buff, size, use_unit_num,
log_unit, page_code, NULL, cmd_type); log_unit, page_code, NULL, cmd_type);
...@@ -1714,7 +1773,7 @@ static int sendcmd_withirq(__u8 cmd, ...@@ -1714,7 +1773,7 @@ static int sendcmd_withirq(__u8 cmd,
cmd_free(h, c, 0); cmd_free(h, c, 0);
return return_status; return return_status;
} }
resend_cmd2: resend_cmd2:
c->waiting = &wait; c->waiting = &wait;
/* Put the request on the tail of the queue and send it */ /* Put the request on the tail of the queue and send it */
...@@ -1726,19 +1785,15 @@ resend_cmd2: ...@@ -1726,19 +1785,15 @@ resend_cmd2:
wait_for_completion(&wait); wait_for_completion(&wait);
if(c->err_info->CommandStatus != 0) if (c->err_info->CommandStatus != 0) { /* an error has occurred */
{ /* an error has occurred */ switch (c->err_info->CommandStatus) {
switch(c->err_info->CommandStatus)
{
case CMD_TARGET_STATUS: case CMD_TARGET_STATUS:
printk(KERN_WARNING "cciss: cmd %p has " printk(KERN_WARNING "cciss: cmd %p has "
" completed with errors\n", c); " completed with errors\n", c);
if( c->err_info->ScsiStatus) if (c->err_info->ScsiStatus) {
{
printk(KERN_WARNING "cciss: cmd %p " printk(KERN_WARNING "cciss: cmd %p "
"has SCSI Status = %x\n", "has SCSI Status = %x\n",
c, c, c->err_info->ScsiStatus);
c->err_info->ScsiStatus);
} }
break; break;
...@@ -1756,7 +1811,7 @@ resend_cmd2: ...@@ -1756,7 +1811,7 @@ resend_cmd2:
"protocol error \n", c); "protocol error \n", c);
return_status = IO_ERROR; return_status = IO_ERROR;
break; break;
case CMD_HARDWARE_ERR: case CMD_HARDWARE_ERR:
printk(KERN_WARNING "cciss: cmd %p had " printk(KERN_WARNING "cciss: cmd %p had "
" hardware error\n", c); " hardware error\n", c);
return_status = IO_ERROR; return_status = IO_ERROR;
...@@ -1778,12 +1833,10 @@ case CMD_HARDWARE_ERR: ...@@ -1778,12 +1833,10 @@ case CMD_HARDWARE_ERR:
break; break;
case CMD_UNSOLICITED_ABORT: case CMD_UNSOLICITED_ABORT:
printk(KERN_WARNING printk(KERN_WARNING
"cciss%d: unsolicited abort %p\n", "cciss%d: unsolicited abort %p\n", ctlr, c);
ctlr, c);
if (c->retry_count < MAX_CMD_RETRIES) { if (c->retry_count < MAX_CMD_RETRIES) {
printk(KERN_WARNING printk(KERN_WARNING
"cciss%d: retrying %p\n", "cciss%d: retrying %p\n", ctlr, c);
ctlr, c);
c->retry_count++; c->retry_count++;
/* erase the old error information */ /* erase the old error information */
memset(c->err_info, 0, memset(c->err_info, 0,
...@@ -1804,27 +1857,30 @@ case CMD_HARDWARE_ERR: ...@@ -1804,27 +1857,30 @@ case CMD_HARDWARE_ERR:
/* unlock the buffers from DMA */ /* unlock the buffers from DMA */
buff_dma_handle.val32.lower = c->SG[0].Addr.lower; buff_dma_handle.val32.lower = c->SG[0].Addr.lower;
buff_dma_handle.val32.upper = c->SG[0].Addr.upper; buff_dma_handle.val32.upper = c->SG[0].Addr.upper;
pci_unmap_single( h->pdev, (dma_addr_t) buff_dma_handle.val, pci_unmap_single(h->pdev, (dma_addr_t) buff_dma_handle.val,
c->SG[0].Len, PCI_DMA_BIDIRECTIONAL); c->SG[0].Len, PCI_DMA_BIDIRECTIONAL);
cmd_free(h, c, 0); cmd_free(h, c, 0);
return return_status; return return_status;
} }
static void cciss_geometry_inquiry(int ctlr, int logvol, static void cciss_geometry_inquiry(int ctlr, int logvol,
int withirq, unsigned int total_size, int withirq, unsigned int total_size,
unsigned int block_size, InquiryData_struct *inq_buff, unsigned int block_size,
InquiryData_struct *inq_buff,
drive_info_struct *drv) drive_info_struct *drv)
{ {
int return_code; int return_code;
memset(inq_buff, 0, sizeof(InquiryData_struct)); memset(inq_buff, 0, sizeof(InquiryData_struct));
if (withirq) if (withirq)
return_code = sendcmd_withirq(CISS_INQUIRY, ctlr, return_code = sendcmd_withirq(CISS_INQUIRY, ctlr,
inq_buff, sizeof(*inq_buff), 1, logvol ,0xC1, TYPE_CMD); inq_buff, sizeof(*inq_buff), 1,
logvol, 0xC1, TYPE_CMD);
else else
return_code = sendcmd(CISS_INQUIRY, ctlr, inq_buff, return_code = sendcmd(CISS_INQUIRY, ctlr, inq_buff,
sizeof(*inq_buff), 1, logvol ,0xC1, NULL, TYPE_CMD); sizeof(*inq_buff), 1, logvol, 0xC1, NULL,
TYPE_CMD);
if (return_code == IO_OK) { if (return_code == IO_OK) {
if(inq_buff->data_byte[8] == 0xFF) { if (inq_buff->data_byte[8] == 0xFF) {
printk(KERN_WARNING printk(KERN_WARNING
"cciss: reading geometry failed, volume " "cciss: reading geometry failed, volume "
"does not support reading geometry\n"); "does not support reading geometry\n");
...@@ -1845,7 +1901,7 @@ static void cciss_geometry_inquiry(int ctlr, int logvol, ...@@ -1845,7 +1901,7 @@ static void cciss_geometry_inquiry(int ctlr, int logvol,
drv->raid_level = inq_buff->data_byte[8]; drv->raid_level = inq_buff->data_byte[8];
t = drv->heads * drv->sectors; t = drv->heads * drv->sectors;
if (t > 1) { if (t > 1) {
drv->cylinders = total_size/t; drv->cylinders = total_size / t;
} }
} }
} else { /* Get geometry failed */ } else { /* Get geometry failed */
...@@ -1854,21 +1910,26 @@ static void cciss_geometry_inquiry(int ctlr, int logvol, ...@@ -1854,21 +1910,26 @@ static void cciss_geometry_inquiry(int ctlr, int logvol,
printk(KERN_INFO " heads= %d, sectors= %d, cylinders= %d\n\n", printk(KERN_INFO " heads= %d, sectors= %d, cylinders= %d\n\n",
drv->heads, drv->sectors, drv->cylinders); drv->heads, drv->sectors, drv->cylinders);
} }
static void static void
cciss_read_capacity(int ctlr, int logvol, ReadCapdata_struct *buf, cciss_read_capacity(int ctlr, int logvol, ReadCapdata_struct *buf,
int withirq, unsigned int *total_size, unsigned int *block_size) int withirq, unsigned int *total_size,
unsigned int *block_size)
{ {
int return_code; int return_code;
memset(buf, 0, sizeof(*buf)); memset(buf, 0, sizeof(*buf));
if (withirq) if (withirq)
return_code = sendcmd_withirq(CCISS_READ_CAPACITY, return_code = sendcmd_withirq(CCISS_READ_CAPACITY,
ctlr, buf, sizeof(*buf), 1, logvol, 0, TYPE_CMD); ctlr, buf, sizeof(*buf), 1,
logvol, 0, TYPE_CMD);
else else
return_code = sendcmd(CCISS_READ_CAPACITY, return_code = sendcmd(CCISS_READ_CAPACITY,
ctlr, buf, sizeof(*buf), 1, logvol, 0, NULL, TYPE_CMD); ctlr, buf, sizeof(*buf), 1, logvol, 0,
NULL, TYPE_CMD);
if (return_code == IO_OK) { if (return_code == IO_OK) {
*total_size = be32_to_cpu(*((__be32 *) &buf->total_size[0]))+1; *total_size =
*block_size = be32_to_cpu(*((__be32 *) &buf->block_size[0])); be32_to_cpu(*((__be32 *) & buf->total_size[0])) + 1;
*block_size = be32_to_cpu(*((__be32 *) & buf->block_size[0]));
} else { /* read capacity command failed */ } else { /* read capacity command failed */
printk(KERN_WARNING "cciss: read capacity failed\n"); printk(KERN_WARNING "cciss: read capacity failed\n");
*total_size = 0; *total_size = 0;
...@@ -1884,38 +1945,38 @@ static int cciss_revalidate(struct gendisk *disk) ...@@ -1884,38 +1945,38 @@ static int cciss_revalidate(struct gendisk *disk)
ctlr_info_t *h = get_host(disk); ctlr_info_t *h = get_host(disk);
drive_info_struct *drv = get_drv(disk); drive_info_struct *drv = get_drv(disk);
int logvol; int logvol;
int FOUND=0; int FOUND = 0;
unsigned int block_size; unsigned int block_size;
unsigned int total_size; unsigned int total_size;
ReadCapdata_struct *size_buff = NULL; ReadCapdata_struct *size_buff = NULL;
InquiryData_struct *inq_buff = NULL; InquiryData_struct *inq_buff = NULL;
for(logvol=0; logvol < CISS_MAX_LUN; logvol++) for (logvol = 0; logvol < CISS_MAX_LUN; logvol++) {
{ if (h->drv[logvol].LunID == drv->LunID) {
if(h->drv[logvol].LunID == drv->LunID) { FOUND = 1;
FOUND=1;
break; break;
} }
} }
if (!FOUND) return 1; if (!FOUND)
return 1;
size_buff = kmalloc(sizeof( ReadCapdata_struct), GFP_KERNEL); size_buff = kmalloc(sizeof(ReadCapdata_struct), GFP_KERNEL);
if (size_buff == NULL) if (size_buff == NULL) {
{
printk(KERN_WARNING "cciss: out of memory\n"); printk(KERN_WARNING "cciss: out of memory\n");
return 1; return 1;
} }
inq_buff = kmalloc(sizeof( InquiryData_struct), GFP_KERNEL); inq_buff = kmalloc(sizeof(InquiryData_struct), GFP_KERNEL);
if (inq_buff == NULL) if (inq_buff == NULL) {
{
printk(KERN_WARNING "cciss: out of memory\n"); printk(KERN_WARNING "cciss: out of memory\n");
kfree(size_buff); kfree(size_buff);
return 1; return 1;
} }
cciss_read_capacity(h->ctlr, logvol, size_buff, 1, &total_size, &block_size); cciss_read_capacity(h->ctlr, logvol, size_buff, 1, &total_size,
cciss_geometry_inquiry(h->ctlr, logvol, 1, total_size, block_size, inq_buff, drv); &block_size);
cciss_geometry_inquiry(h->ctlr, logvol, 1, total_size, block_size,
inq_buff, drv);
blk_queue_hardsect_size(drv->queue, drv->block_size); blk_queue_hardsect_size(drv->queue, drv->block_size);
set_capacity(disk, drv->nr_blocks); set_capacity(disk, drv->nr_blocks);
...@@ -1970,7 +2031,7 @@ static int add_sendcmd_reject(__u8 cmd, int ctlr, unsigned long complete) ...@@ -1970,7 +2031,7 @@ static int add_sendcmd_reject(__u8 cmd, int ctlr, unsigned long complete)
/* or reset) then we don't expect anything weird. */ /* or reset) then we don't expect anything weird. */
if (cmd != CCISS_RESET_MSG && cmd != CCISS_ABORT_MSG) { if (cmd != CCISS_RESET_MSG && cmd != CCISS_ABORT_MSG) {
#endif #endif
printk( KERN_WARNING "cciss cciss%d: SendCmd " printk(KERN_WARNING "cciss cciss%d: SendCmd "
"Invalid command list address returned! (%lx)\n", "Invalid command list address returned! (%lx)\n",
ctlr, complete); ctlr, complete);
/* not much we can do. */ /* not much we can do. */
...@@ -1997,23 +2058,16 @@ static int add_sendcmd_reject(__u8 cmd, int ctlr, unsigned long complete) ...@@ -1997,23 +2058,16 @@ static int add_sendcmd_reject(__u8 cmd, int ctlr, unsigned long complete)
* Send a command to the controller, and wait for it to complete. * Send a command to the controller, and wait for it to complete.
* Only used at init time. * Only used at init time.
*/ */
static int sendcmd( static int sendcmd(__u8 cmd, int ctlr, void *buff, size_t size, unsigned int use_unit_num, /* 0: address the controller,
__u8 cmd,
int ctlr,
void *buff,
size_t size,
unsigned int use_unit_num, /* 0: address the controller,
1: address logical volume log_unit, 1: address logical volume log_unit,
2: periph device address is scsi3addr */ 2: periph device address is scsi3addr */
unsigned int log_unit, unsigned int log_unit,
__u8 page_code, __u8 page_code, unsigned char *scsi3addr, int cmd_type)
unsigned char *scsi3addr,
int cmd_type)
{ {
CommandList_struct *c; CommandList_struct *c;
int i; int i;
unsigned long complete; unsigned long complete;
ctlr_info_t *info_p= hba[ctlr]; ctlr_info_t *info_p = hba[ctlr];
u64bit buff_dma_handle; u64bit buff_dma_handle;
int status, done = 0; int status, done = 0;
...@@ -2027,7 +2081,7 @@ static int sendcmd( ...@@ -2027,7 +2081,7 @@ static int sendcmd(
cmd_free(info_p, c, 1); cmd_free(info_p, c, 1);
return status; return status;
} }
resend_cmd1: resend_cmd1:
/* /*
* Disable interrupt * Disable interrupt
*/ */
...@@ -2040,11 +2094,9 @@ resend_cmd1: ...@@ -2040,11 +2094,9 @@ resend_cmd1:
/* Actually it should be completely empty at this time */ /* Actually it should be completely empty at this time */
/* unless we are in here doing error handling for the scsi */ /* unless we are in here doing error handling for the scsi */
/* tape side of the driver. */ /* tape side of the driver. */
for (i = 200000; i > 0; i--) for (i = 200000; i > 0; i--) {
{
/* if fifo isn't full go */ /* if fifo isn't full go */
if (!(info_p->access.fifo_full(info_p))) if (!(info_p->access.fifo_full(info_p))) {
{
break; break;
} }
...@@ -2065,19 +2117,17 @@ resend_cmd1: ...@@ -2065,19 +2117,17 @@ resend_cmd1:
#endif /* CCISS_DEBUG */ #endif /* CCISS_DEBUG */
if (complete == 1) { if (complete == 1) {
printk( KERN_WARNING printk(KERN_WARNING
"cciss cciss%d: SendCmd Timeout out, " "cciss cciss%d: SendCmd Timeout out, "
"No command list address returned!\n", "No command list address returned!\n", ctlr);
ctlr);
status = IO_ERROR; status = IO_ERROR;
done = 1; done = 1;
break; break;
} }
/* This will need to change for direct lookup completions */ /* This will need to change for direct lookup completions */
if ( (complete & CISS_ERROR_BIT) if ((complete & CISS_ERROR_BIT)
&& (complete & ~CISS_ERROR_BIT) == c->busaddr) && (complete & ~CISS_ERROR_BIT) == c->busaddr) {
{
/* if data overrun or underun on Report command /* if data overrun or underun on Report command
ignore it ignore it
*/ */
...@@ -2086,10 +2136,8 @@ resend_cmd1: ...@@ -2086,10 +2136,8 @@ resend_cmd1:
(c->Request.CDB[0] == CISS_INQUIRY)) && (c->Request.CDB[0] == CISS_INQUIRY)) &&
((c->err_info->CommandStatus == ((c->err_info->CommandStatus ==
CMD_DATA_OVERRUN) || CMD_DATA_OVERRUN) ||
(c->err_info->CommandStatus == (c->err_info->CommandStatus == CMD_DATA_UNDERRUN)
CMD_DATA_UNDERRUN) )) {
))
{
complete = c->busaddr; complete = c->busaddr;
} else { } else {
if (c->err_info->CommandStatus == if (c->err_info->CommandStatus ==
...@@ -2105,7 +2153,8 @@ resend_cmd1: ...@@ -2105,7 +2153,8 @@ resend_cmd1:
/* erase the old error */ /* erase the old error */
/* information */ /* information */
memset(c->err_info, 0, memset(c->err_info, 0,
sizeof(ErrorInfo_struct)); sizeof
(ErrorInfo_struct));
goto resend_cmd1; goto resend_cmd1;
} else { } else {
printk(KERN_WARNING printk(KERN_WARNING
...@@ -2114,8 +2163,11 @@ resend_cmd1: ...@@ -2114,8 +2163,11 @@ resend_cmd1:
status = IO_ERROR; status = IO_ERROR;
goto cleanup1; goto cleanup1;
} }
} else if (c->err_info->CommandStatus == CMD_UNABORTABLE) { } else if (c->err_info->CommandStatus ==
printk(KERN_WARNING "cciss%d: command could not be aborted.\n", ctlr); CMD_UNABORTABLE) {
printk(KERN_WARNING
"cciss%d: command could not be aborted.\n",
ctlr);
status = IO_ERROR; status = IO_ERROR;
goto cleanup1; goto cleanup1;
} }
...@@ -2124,10 +2176,14 @@ resend_cmd1: ...@@ -2124,10 +2176,14 @@ resend_cmd1:
c->err_info->CommandStatus); c->err_info->CommandStatus);
printk(KERN_WARNING "ciss ciss%d: sendcmd" printk(KERN_WARNING "ciss ciss%d: sendcmd"
" offensive info\n" " offensive info\n"
" size %x\n num %x value %x\n", ctlr, " size %x\n num %x value %x\n",
c->err_info->MoreErrInfo.Invalid_Cmd.offense_size, ctlr,
c->err_info->MoreErrInfo.Invalid_Cmd.offense_num, c->err_info->MoreErrInfo.Invalid_Cmd.
c->err_info->MoreErrInfo.Invalid_Cmd.offense_value); offense_size,
c->err_info->MoreErrInfo.Invalid_Cmd.
offense_num,
c->err_info->MoreErrInfo.Invalid_Cmd.
offense_value);
status = IO_ERROR; status = IO_ERROR;
goto cleanup1; goto cleanup1;
} }
...@@ -2142,7 +2198,7 @@ resend_cmd1: ...@@ -2142,7 +2198,7 @@ resend_cmd1:
done = 1; done = 1;
} while (!done); } while (!done);
cleanup1: cleanup1:
/* unlock the data buffer from DMA */ /* unlock the data buffer from DMA */
buff_dma_handle.val32.lower = c->SG[0].Addr.lower; buff_dma_handle.val32.lower = c->SG[0].Addr.lower;
buff_dma_handle.val32.upper = c->SG[0].Addr.upper; buff_dma_handle.val32.upper = c->SG[0].Addr.upper;
...@@ -2156,6 +2212,7 @@ cleanup1: ...@@ -2156,6 +2212,7 @@ cleanup1:
cmd_free(info_p, c, 1); cmd_free(info_p, c, 1);
return status; return status;
} }
/* /*
* Map (physical) PCI mem into (virtual) kernel space * Map (physical) PCI mem into (virtual) kernel space
*/ */
...@@ -2163,7 +2220,7 @@ static void __iomem *remap_pci_mem(ulong base, ulong size) ...@@ -2163,7 +2220,7 @@ static void __iomem *remap_pci_mem(ulong base, ulong size)
{ {
ulong page_base = ((ulong) base) & PAGE_MASK; ulong page_base = ((ulong) base) & PAGE_MASK;
ulong page_offs = ((ulong) base) - page_base; ulong page_offs = ((ulong) base) - page_base;
void __iomem *page_remapped = ioremap(page_base, page_offs+size); void __iomem *page_remapped = ioremap(page_base, page_offs + size);
return page_remapped ? (page_remapped + page_offs) : NULL; return page_remapped ? (page_remapped + page_offs) : NULL;
} }
...@@ -2172,12 +2229,11 @@ static void __iomem *remap_pci_mem(ulong base, ulong size) ...@@ -2172,12 +2229,11 @@ static void __iomem *remap_pci_mem(ulong base, ulong size)
* Takes jobs of the Q and sends them to the hardware, then puts it on * Takes jobs of the Q and sends them to the hardware, then puts it on
* the Q to wait for completion. * the Q to wait for completion.
*/ */
static void start_io( ctlr_info_t *h) static void start_io(ctlr_info_t *h)
{ {
CommandList_struct *c; CommandList_struct *c;
while(( c = h->reqQ) != NULL ) while ((c = h->reqQ) != NULL) {
{
/* can't do anything if fifo is full */ /* can't do anything if fifo is full */
if ((h->access.fifo_full(h))) { if ((h->access.fifo_full(h))) {
printk(KERN_WARNING "cciss: fifo full\n"); printk(KERN_WARNING "cciss: fifo full\n");
...@@ -2192,21 +2248,22 @@ static void start_io( ctlr_info_t *h) ...@@ -2192,21 +2248,22 @@ static void start_io( ctlr_info_t *h)
h->access.submit_command(h, c); h->access.submit_command(h, c);
/* Put job onto the completed Q */ /* Put job onto the completed Q */
addQ (&(h->cmpQ), c); addQ(&(h->cmpQ), c);
} }
} }
/* Assumes that CCISS_LOCK(h->ctlr) is held. */ /* Assumes that CCISS_LOCK(h->ctlr) is held. */
/* Zeros out the error record and then resends the command back */ /* Zeros out the error record and then resends the command back */
/* to the controller */ /* to the controller */
static inline void resend_cciss_cmd( ctlr_info_t *h, CommandList_struct *c) static inline void resend_cciss_cmd(ctlr_info_t *h, CommandList_struct *c)
{ {
/* erase the old error information */ /* erase the old error information */
memset(c->err_info, 0, sizeof(ErrorInfo_struct)); memset(c->err_info, 0, sizeof(ErrorInfo_struct));
/* add it to software queue and then send it to the controller */ /* add it to software queue and then send it to the controller */
addQ(&(h->reqQ),c); addQ(&(h->reqQ), c);
h->Qdepth++; h->Qdepth++;
if(h->Qdepth > h->maxQsinceinit) if (h->Qdepth > h->maxQsinceinit)
h->maxQsinceinit = h->Qdepth; h->maxQsinceinit = h->Qdepth;
start_io(h); start_io(h);
...@@ -2216,7 +2273,7 @@ static inline void resend_cciss_cmd( ctlr_info_t *h, CommandList_struct *c) ...@@ -2216,7 +2273,7 @@ static inline void resend_cciss_cmd( ctlr_info_t *h, CommandList_struct *c)
* buffers for the completed job. Note that this function does not need * buffers for the completed job. Note that this function does not need
* to hold the hba/queue lock. * to hold the hba/queue lock.
*/ */
static inline void complete_command( ctlr_info_t *h, CommandList_struct *cmd, static inline void complete_command(ctlr_info_t *h, CommandList_struct *cmd,
int timeout) int timeout)
{ {
int status = 1; int status = 1;
...@@ -2225,32 +2282,25 @@ static inline void complete_command( ctlr_info_t *h, CommandList_struct *cmd, ...@@ -2225,32 +2282,25 @@ static inline void complete_command( ctlr_info_t *h, CommandList_struct *cmd,
if (timeout) if (timeout)
status = 0; status = 0;
if(cmd->err_info->CommandStatus != 0) if (cmd->err_info->CommandStatus != 0) { /* an error has occurred */
{ /* an error has occurred */ switch (cmd->err_info->CommandStatus) {
switch(cmd->err_info->CommandStatus)
{
unsigned char sense_key; unsigned char sense_key;
case CMD_TARGET_STATUS: case CMD_TARGET_STATUS:
status = 0; status = 0;
if( cmd->err_info->ScsiStatus == 0x02) if (cmd->err_info->ScsiStatus == 0x02) {
{
printk(KERN_WARNING "cciss: cmd %p " printk(KERN_WARNING "cciss: cmd %p "
"has CHECK CONDITION " "has CHECK CONDITION "
" byte 2 = 0x%x\n", cmd, " byte 2 = 0x%x\n", cmd,
cmd->err_info->SenseInfo[2] cmd->err_info->SenseInfo[2]
); );
/* check the sense key */ /* check the sense key */
sense_key = 0xf & sense_key = 0xf & cmd->err_info->SenseInfo[2];
cmd->err_info->SenseInfo[2];
/* no status or recovered error */ /* no status or recovered error */
if((sense_key == 0x0) || if ((sense_key == 0x0) || (sense_key == 0x1)) {
(sense_key == 0x1))
{
status = 1; status = 1;
} }
} else } else {
{
printk(KERN_WARNING "cciss: cmd %p " printk(KERN_WARNING "cciss: cmd %p "
"has SCSI Status 0x%x\n", "has SCSI Status 0x%x\n",
cmd, cmd->err_info->ScsiStatus); cmd, cmd->err_info->ScsiStatus);
...@@ -2284,48 +2334,46 @@ static inline void complete_command( ctlr_info_t *h, CommandList_struct *cmd, ...@@ -2284,48 +2334,46 @@ static inline void complete_command( ctlr_info_t *h, CommandList_struct *cmd,
case CMD_CONNECTION_LOST: case CMD_CONNECTION_LOST:
printk(KERN_WARNING "cciss: cmd %p had " printk(KERN_WARNING "cciss: cmd %p had "
"connection lost\n", cmd); "connection lost\n", cmd);
status=0; status = 0;
break; break;
case CMD_ABORTED: case CMD_ABORTED:
printk(KERN_WARNING "cciss: cmd %p was " printk(KERN_WARNING "cciss: cmd %p was "
"aborted\n", cmd); "aborted\n", cmd);
status=0; status = 0;
break; break;
case CMD_ABORT_FAILED: case CMD_ABORT_FAILED:
printk(KERN_WARNING "cciss: cmd %p reports " printk(KERN_WARNING "cciss: cmd %p reports "
"abort failed\n", cmd); "abort failed\n", cmd);
status=0; status = 0;
break; break;
case CMD_UNSOLICITED_ABORT: case CMD_UNSOLICITED_ABORT:
printk(KERN_WARNING "cciss%d: unsolicited " printk(KERN_WARNING "cciss%d: unsolicited "
"abort %p\n", h->ctlr, cmd); "abort %p\n", h->ctlr, cmd);
if (cmd->retry_count < MAX_CMD_RETRIES) { if (cmd->retry_count < MAX_CMD_RETRIES) {
retry_cmd=1; retry_cmd = 1;
printk(KERN_WARNING printk(KERN_WARNING
"cciss%d: retrying %p\n", "cciss%d: retrying %p\n", h->ctlr, cmd);
h->ctlr, cmd);
cmd->retry_count++; cmd->retry_count++;
} else } else
printk(KERN_WARNING printk(KERN_WARNING
"cciss%d: %p retried too " "cciss%d: %p retried too "
"many times\n", h->ctlr, cmd); "many times\n", h->ctlr, cmd);
status=0; status = 0;
break; break;
case CMD_TIMEOUT: case CMD_TIMEOUT:
printk(KERN_WARNING "cciss: cmd %p timedout\n", printk(KERN_WARNING "cciss: cmd %p timedout\n", cmd);
cmd); status = 0;
status=0;
break; break;
default: default:
printk(KERN_WARNING "cciss: cmd %p returned " printk(KERN_WARNING "cciss: cmd %p returned "
"unknown status %x\n", cmd, "unknown status %x\n", cmd,
cmd->err_info->CommandStatus); cmd->err_info->CommandStatus);
status=0; status = 0;
} }
} }
/* We need to return this command */ /* We need to return this command */
if(retry_cmd) { if (retry_cmd) {
resend_cciss_cmd(h,cmd); resend_cciss_cmd(h, cmd);
return; return;
} }
...@@ -2340,7 +2388,7 @@ static inline void complete_command( ctlr_info_t *h, CommandList_struct *cmd, ...@@ -2340,7 +2388,7 @@ static inline void complete_command( ctlr_info_t *h, CommandList_struct *cmd,
*/ */
static void do_cciss_request(request_queue_t *q) static void do_cciss_request(request_queue_t *q)
{ {
ctlr_info_t *h= q->queuedata; ctlr_info_t *h = q->queuedata;
CommandList_struct *c; CommandList_struct *c;
int start_blk, seg; int start_blk, seg;
struct request *creq; struct request *creq;
...@@ -2355,14 +2403,14 @@ static void do_cciss_request(request_queue_t *q) ...@@ -2355,14 +2403,14 @@ static void do_cciss_request(request_queue_t *q)
if (blk_queue_plugged(q)) if (blk_queue_plugged(q))
goto startio; goto startio;
queue: queue:
creq = elv_next_request(q); creq = elv_next_request(q);
if (!creq) if (!creq)
goto startio; goto startio;
BUG_ON(creq->nr_phys_segments > MAXSGENTRIES); BUG_ON(creq->nr_phys_segments > MAXSGENTRIES);
if (( c = cmd_alloc(h, 1)) == NULL) if ((c = cmd_alloc(h, 1)) == NULL)
goto full; goto full;
blkdev_dequeue_request(creq); blkdev_dequeue_request(creq);
...@@ -2380,19 +2428,20 @@ queue: ...@@ -2380,19 +2428,20 @@ queue:
/* The first 2 bits are reserved for controller error reporting. */ /* The first 2 bits are reserved for controller error reporting. */
c->Header.Tag.lower = (c->cmdindex << 3); c->Header.Tag.lower = (c->cmdindex << 3);
c->Header.Tag.lower |= 0x04; /* flag for direct lookup. */ c->Header.Tag.lower |= 0x04; /* flag for direct lookup. */
c->Header.LUN.LogDev.VolId= drv->LunID; c->Header.LUN.LogDev.VolId = drv->LunID;
c->Header.LUN.LogDev.Mode = 1; c->Header.LUN.LogDev.Mode = 1;
c->Request.CDBLen = 10; // 12 byte commands not in FW yet; c->Request.CDBLen = 10; // 12 byte commands not in FW yet;
c->Request.Type.Type = TYPE_CMD; // It is a command. c->Request.Type.Type = TYPE_CMD; // It is a command.
c->Request.Type.Attribute = ATTR_SIMPLE; c->Request.Type.Attribute = ATTR_SIMPLE;
c->Request.Type.Direction = c->Request.Type.Direction =
(rq_data_dir(creq) == READ) ? XFER_READ: XFER_WRITE; (rq_data_dir(creq) == READ) ? XFER_READ : XFER_WRITE;
c->Request.Timeout = 0; // Don't time out c->Request.Timeout = 0; // Don't time out
c->Request.CDB[0] = (rq_data_dir(creq) == READ) ? CCISS_READ : CCISS_WRITE; c->Request.CDB[0] =
(rq_data_dir(creq) == READ) ? CCISS_READ : CCISS_WRITE;
start_blk = creq->sector; start_blk = creq->sector;
#ifdef CCISS_DEBUG #ifdef CCISS_DEBUG
printk(KERN_DEBUG "ciss: sector =%d nr_sectors=%d\n",(int) creq->sector, printk(KERN_DEBUG "ciss: sector =%d nr_sectors=%d\n", (int)creq->sector,
(int) creq->nr_sectors); (int)creq->nr_sectors);
#endif /* CCISS_DEBUG */ #endif /* CCISS_DEBUG */
seg = blk_rq_map_sg(q, creq, tmp_sg); seg = blk_rq_map_sg(q, creq, tmp_sg);
...@@ -2403,46 +2452,46 @@ queue: ...@@ -2403,46 +2452,46 @@ queue:
else else
dir = PCI_DMA_TODEVICE; dir = PCI_DMA_TODEVICE;
for (i=0; i<seg; i++) for (i = 0; i < seg; i++) {
{
c->SG[i].Len = tmp_sg[i].length; c->SG[i].Len = tmp_sg[i].length;
temp64.val = (__u64) pci_map_page(h->pdev, tmp_sg[i].page, temp64.val = (__u64) pci_map_page(h->pdev, tmp_sg[i].page,
tmp_sg[i].offset, tmp_sg[i].length, tmp_sg[i].offset,
dir); tmp_sg[i].length, dir);
c->SG[i].Addr.lower = temp64.val32.lower; c->SG[i].Addr.lower = temp64.val32.lower;
c->SG[i].Addr.upper = temp64.val32.upper; c->SG[i].Addr.upper = temp64.val32.upper;
c->SG[i].Ext = 0; // we are not chaining c->SG[i].Ext = 0; // we are not chaining
} }
/* track how many SG entries we are using */ /* track how many SG entries we are using */
if( seg > h->maxSG) if (seg > h->maxSG)
h->maxSG = seg; h->maxSG = seg;
#ifdef CCISS_DEBUG #ifdef CCISS_DEBUG
printk(KERN_DEBUG "cciss: Submitting %d sectors in %d segments\n", creq->nr_sectors, seg); printk(KERN_DEBUG "cciss: Submitting %d sectors in %d segments\n",
creq->nr_sectors, seg);
#endif /* CCISS_DEBUG */ #endif /* CCISS_DEBUG */
c->Header.SGList = c->Header.SGTotal = seg; c->Header.SGList = c->Header.SGTotal = seg;
c->Request.CDB[1]= 0; c->Request.CDB[1] = 0;
c->Request.CDB[2]= (start_blk >> 24) & 0xff; //MSB c->Request.CDB[2] = (start_blk >> 24) & 0xff; //MSB
c->Request.CDB[3]= (start_blk >> 16) & 0xff; c->Request.CDB[3] = (start_blk >> 16) & 0xff;
c->Request.CDB[4]= (start_blk >> 8) & 0xff; c->Request.CDB[4] = (start_blk >> 8) & 0xff;
c->Request.CDB[5]= start_blk & 0xff; c->Request.CDB[5] = start_blk & 0xff;
c->Request.CDB[6]= 0; // (sect >> 24) & 0xff; MSB c->Request.CDB[6] = 0; // (sect >> 24) & 0xff; MSB
c->Request.CDB[7]= (creq->nr_sectors >> 8) & 0xff; c->Request.CDB[7] = (creq->nr_sectors >> 8) & 0xff;
c->Request.CDB[8]= creq->nr_sectors & 0xff; c->Request.CDB[8] = creq->nr_sectors & 0xff;
c->Request.CDB[9] = c->Request.CDB[11] = c->Request.CDB[12] = 0; c->Request.CDB[9] = c->Request.CDB[11] = c->Request.CDB[12] = 0;
spin_lock_irq(q->queue_lock); spin_lock_irq(q->queue_lock);
addQ(&(h->reqQ),c); addQ(&(h->reqQ), c);
h->Qdepth++; h->Qdepth++;
if(h->Qdepth > h->maxQsinceinit) if (h->Qdepth > h->maxQsinceinit)
h->maxQsinceinit = h->Qdepth; h->maxQsinceinit = h->Qdepth;
goto queue; goto queue;
full: full:
blk_stop_queue(q); blk_stop_queue(q);
startio: startio:
/* We will already have the driver lock here so not need /* We will already have the driver lock here so not need
* to lock it. * to lock it.
*/ */
...@@ -2472,7 +2521,7 @@ static inline unsigned long get_next_completion(ctlr_info_t *h) ...@@ -2472,7 +2521,7 @@ static inline unsigned long get_next_completion(ctlr_info_t *h)
static inline int interrupt_pending(ctlr_info_t *h) static inline int interrupt_pending(ctlr_info_t *h)
{ {
#ifdef CONFIG_CISS_SCSI_TAPE #ifdef CONFIG_CISS_SCSI_TAPE
return ( h->access.intr_pending(h) return (h->access.intr_pending(h)
|| (h->scsi_rejects.ncompletions > 0)); || (h->scsi_rejects.ncompletions > 0));
#else #else
return h->access.intr_pending(h); return h->access.intr_pending(h);
...@@ -2508,12 +2557,14 @@ static irqreturn_t do_cciss_intr(int irq, void *dev_id, struct pt_regs *regs) ...@@ -2508,12 +2557,14 @@ static irqreturn_t do_cciss_intr(int irq, void *dev_id, struct pt_regs *regs)
*/ */
spin_lock_irqsave(CCISS_LOCK(h->ctlr), flags); spin_lock_irqsave(CCISS_LOCK(h->ctlr), flags);
while (interrupt_pending(h)) { while (interrupt_pending(h)) {
while((a = get_next_completion(h)) != FIFO_EMPTY) { while ((a = get_next_completion(h)) != FIFO_EMPTY) {
a1 = a; a1 = a;
if ((a & 0x04)) { if ((a & 0x04)) {
a2 = (a >> 3); a2 = (a >> 3);
if (a2 >= NR_CMDS) { if (a2 >= NR_CMDS) {
printk(KERN_WARNING "cciss: controller cciss%d failed, stopping.\n", h->ctlr); printk(KERN_WARNING
"cciss: controller cciss%d failed, stopping.\n",
h->ctlr);
fail_all_cmds(h->ctlr); fail_all_cmds(h->ctlr);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -2524,10 +2575,12 @@ static irqreturn_t do_cciss_intr(int irq, void *dev_id, struct pt_regs *regs) ...@@ -2524,10 +2575,12 @@ static irqreturn_t do_cciss_intr(int irq, void *dev_id, struct pt_regs *regs)
} else { } else {
a &= ~3; a &= ~3;
if ((c = h->cmpQ) == NULL) { if ((c = h->cmpQ) == NULL) {
printk(KERN_WARNING "cciss: Completion of %08x ignored\n", a1); printk(KERN_WARNING
"cciss: Completion of %08x ignored\n",
a1);
continue; continue;
} }
while(c->busaddr != a) { while (c->busaddr != a) {
c = c->next; c = c->next;
if (c == h->cmpQ) if (c == h->cmpQ)
break; break;
...@@ -2565,23 +2618,22 @@ static irqreturn_t do_cciss_intr(int irq, void *dev_id, struct pt_regs *regs) ...@@ -2565,23 +2618,22 @@ static irqreturn_t do_cciss_intr(int irq, void *dev_id, struct pt_regs *regs)
* them up. We will also keep track of the next queue to run so * them up. We will also keep track of the next queue to run so
* that every queue gets a chance to be started first. * that every queue gets a chance to be started first.
*/ */
for (j=0; j < h->highest_lun + 1; j++){ for (j = 0; j < h->highest_lun + 1; j++) {
int curr_queue = (start_queue + j) % (h->highest_lun + 1); int curr_queue = (start_queue + j) % (h->highest_lun + 1);
/* make sure the disk has been added and the drive is real /* make sure the disk has been added and the drive is real
* because this can be called from the middle of init_one. * because this can be called from the middle of init_one.
*/ */
if(!(h->drv[curr_queue].queue) || if (!(h->drv[curr_queue].queue) || !(h->drv[curr_queue].heads))
!(h->drv[curr_queue].heads))
continue; continue;
blk_start_queue(h->gendisk[curr_queue]->queue); blk_start_queue(h->gendisk[curr_queue]->queue);
/* 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, NR_CMDS)) == 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);
goto cleanup; goto cleanup;
} else { } else {
h->next_to_run = curr_queue; h->next_to_run = curr_queue;
...@@ -2592,30 +2644,31 @@ static irqreturn_t do_cciss_intr(int irq, void *dev_id, struct pt_regs *regs) ...@@ -2592,30 +2644,31 @@ static irqreturn_t do_cciss_intr(int irq, void *dev_id, struct pt_regs *regs)
} }
} }
cleanup: cleanup:
spin_unlock_irqrestore(CCISS_LOCK(h->ctlr), flags); spin_unlock_irqrestore(CCISS_LOCK(h->ctlr), flags);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
/* /*
* We cannot read the structure directly, for portability we must use * We cannot read the structure directly, for portability we must use
* the io functions. * the io functions.
* This is for debug only. * This is for debug only.
*/ */
#ifdef CCISS_DEBUG #ifdef CCISS_DEBUG
static void print_cfg_table( CfgTable_struct *tb) static void print_cfg_table(CfgTable_struct *tb)
{ {
int i; int i;
char temp_name[17]; char temp_name[17];
printk("Controller Configuration information\n"); printk("Controller Configuration information\n");
printk("------------------------------------\n"); printk("------------------------------------\n");
for(i=0;i<4;i++) for (i = 0; i < 4; i++)
temp_name[i] = readb(&(tb->Signature[i])); temp_name[i] = readb(&(tb->Signature[i]));
temp_name[4]='\0'; temp_name[4] = '\0';
printk(" Signature = %s\n", temp_name); printk(" Signature = %s\n", temp_name);
printk(" Spec Number = %d\n", readl(&(tb->SpecValence))); printk(" Spec Number = %d\n", readl(&(tb->SpecValence)));
printk(" Transport methods supported = 0x%x\n", printk(" Transport methods supported = 0x%x\n",
readl(&(tb-> TransportSupport))); readl(&(tb->TransportSupport)));
printk(" Transport methods active = 0x%x\n", printk(" Transport methods active = 0x%x\n",
readl(&(tb->TransportActive))); readl(&(tb->TransportActive)));
printk(" Requested transport Method = 0x%x\n", printk(" Requested transport Method = 0x%x\n",
...@@ -2626,26 +2679,23 @@ static void print_cfg_table( CfgTable_struct *tb) ...@@ -2626,26 +2679,23 @@ static void print_cfg_table( CfgTable_struct *tb)
readl(&(tb->HostWrite.CoalIntCount))); readl(&(tb->HostWrite.CoalIntCount)));
printk(" Max outstanding commands = 0x%d\n", printk(" Max outstanding commands = 0x%d\n",
readl(&(tb->CmdsOutMax))); readl(&(tb->CmdsOutMax)));
printk(" Bus Types = 0x%x\n", readl(&(tb-> BusTypes))); printk(" Bus Types = 0x%x\n", readl(&(tb->BusTypes)));
for(i=0;i<16;i++) for (i = 0; i < 16; i++)
temp_name[i] = readb(&(tb->ServerName[i])); temp_name[i] = readb(&(tb->ServerName[i]));
temp_name[16] = '\0'; temp_name[16] = '\0';
printk(" Server Name = %s\n", temp_name); printk(" Server Name = %s\n", temp_name);
printk(" Heartbeat Counter = 0x%x\n\n\n", printk(" Heartbeat Counter = 0x%x\n\n\n", readl(&(tb->HeartBeat)));
readl(&(tb->HeartBeat)));
} }
#endif /* CCISS_DEBUG */ #endif /* CCISS_DEBUG */
static int find_PCI_BAR_index(struct pci_dev *pdev, static int find_PCI_BAR_index(struct pci_dev *pdev, unsigned long pci_bar_addr)
unsigned long pci_bar_addr)
{ {
int i, offset, mem_type, bar_type; int i, offset, mem_type, bar_type;
if (pci_bar_addr == PCI_BASE_ADDRESS_0) /* looking for BAR zero? */ if (pci_bar_addr == PCI_BASE_ADDRESS_0) /* looking for BAR zero? */
return 0; return 0;
offset = 0; offset = 0;
for (i=0; i<DEVICE_COUNT_RESOURCE; i++) { for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
bar_type = pci_resource_flags(pdev, i) & bar_type = pci_resource_flags(pdev, i) & PCI_BASE_ADDRESS_SPACE;
PCI_BASE_ADDRESS_SPACE;
if (bar_type == PCI_BASE_ADDRESS_SPACE_IO) if (bar_type == PCI_BASE_ADDRESS_SPACE_IO)
offset += 4; offset += 4;
else { else {
...@@ -2660,13 +2710,14 @@ static int find_PCI_BAR_index(struct pci_dev *pdev, ...@@ -2660,13 +2710,14 @@ static int find_PCI_BAR_index(struct pci_dev *pdev,
offset += 8; offset += 8;
break; break;
default: /* reserved in PCI 2.2 */ default: /* reserved in PCI 2.2 */
printk(KERN_WARNING "Base address is invalid\n"); printk(KERN_WARNING
"Base address is invalid\n");
return -1; return -1;
break; break;
} }
} }
if (offset == pci_bar_addr - PCI_BASE_ADDRESS_0) if (offset == pci_bar_addr - PCI_BASE_ADDRESS_0)
return i+1; return i + 1;
} }
return -1; return -1;
} }
...@@ -2675,18 +2726,19 @@ static int find_PCI_BAR_index(struct pci_dev *pdev, ...@@ -2675,18 +2726,19 @@ static int find_PCI_BAR_index(struct pci_dev *pdev,
* controllers that are capable. If not, we use IO-APIC mode. * controllers that are capable. If not, we use IO-APIC mode.
*/ */
static void __devinit cciss_interrupt_mode(ctlr_info_t *c, struct pci_dev *pdev, __u32 board_id) static void __devinit cciss_interrupt_mode(ctlr_info_t *c,
struct pci_dev *pdev, __u32 board_id)
{ {
#ifdef CONFIG_PCI_MSI #ifdef CONFIG_PCI_MSI
int err; int err;
struct msix_entry cciss_msix_entries[4] = {{0,0}, {0,1}, struct msix_entry cciss_msix_entries[4] = { {0, 0}, {0, 1},
{0,2}, {0,3}}; {0, 2}, {0, 3}
};
/* Some boards advertise MSI but don't really support it */ /* Some boards advertise MSI but don't really support it */
if ((board_id == 0x40700E11) || if ((board_id == 0x40700E11) ||
(board_id == 0x40800E11) || (board_id == 0x40800E11) ||
(board_id == 0x40820E11) || (board_id == 0x40820E11) || (board_id == 0x40830E11))
(board_id == 0x40830E11))
goto default_int_mode; goto default_int_mode;
if (pci_find_capability(pdev, PCI_CAP_ID_MSIX)) { if (pci_find_capability(pdev, PCI_CAP_ID_MSIX)) {
...@@ -2718,7 +2770,7 @@ static void __devinit cciss_interrupt_mode(ctlr_info_t *c, struct pci_dev *pdev, ...@@ -2718,7 +2770,7 @@ static void __devinit cciss_interrupt_mode(ctlr_info_t *c, struct pci_dev *pdev,
return; return;
} }
} }
default_int_mode: default_int_mode:
#endif /* CONFIG_PCI_MSI */ #endif /* CONFIG_PCI_MSI */
/* if we get here we're going to use the default interrupt mode */ /* if we get here we're going to use the default interrupt mode */
c->intr[SIMPLE_MODE_INT] = pdev->irq; c->intr[SIMPLE_MODE_INT] = pdev->irq;
...@@ -2736,16 +2788,15 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev) ...@@ -2736,16 +2788,15 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
/* check to see if controller has been disabled */ /* check to see if controller has been disabled */
/* BEFORE trying to enable it */ /* BEFORE trying to enable it */
(void) pci_read_config_word(pdev, PCI_COMMAND,&command); (void)pci_read_config_word(pdev, PCI_COMMAND, &command);
if(!(command & 0x02)) if (!(command & 0x02)) {
{ printk(KERN_WARNING
printk(KERN_WARNING "cciss: controller appears to be disabled\n"); "cciss: controller appears to be disabled\n");
return -ENODEV; return -ENODEV;
} }
err = pci_enable_device(pdev); err = pci_enable_device(pdev);
if (err) if (err) {
{
printk(KERN_ERR "cciss: Unable to Enable PCI device\n"); printk(KERN_ERR "cciss: Unable to Enable PCI device\n");
return err; return err;
} }
...@@ -2786,7 +2837,7 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev) ...@@ -2786,7 +2837,7 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
/* Wait for the board to become ready. (PCI hotplug needs this.) /* Wait for the board to become ready. (PCI hotplug needs this.)
* We poll for up to 120 secs, once per 100ms. */ * We poll for up to 120 secs, once per 100ms. */
for (i=0; i < 1200; i++) { for (i = 0; i < 1200; i++) {
scratchpad = readl(c->vaddr + SA5_SCRATCHPAD_OFFSET); scratchpad = readl(c->vaddr + SA5_SCRATCHPAD_OFFSET);
if (scratchpad == CCISS_FIRMWARE_READY) if (scratchpad == CCISS_FIRMWARE_READY)
break; break;
...@@ -2805,8 +2856,7 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev) ...@@ -2805,8 +2856,7 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
#ifdef CCISS_DEBUG #ifdef CCISS_DEBUG
printk("cfg base address = %x\n", cfg_base_addr); printk("cfg base address = %x\n", cfg_base_addr);
#endif /* CCISS_DEBUG */ #endif /* CCISS_DEBUG */
cfg_base_addr_index = cfg_base_addr_index = find_PCI_BAR_index(pdev, cfg_base_addr);
find_PCI_BAR_index(pdev, cfg_base_addr);
#ifdef CCISS_DEBUG #ifdef CCISS_DEBUG
printk("cfg base address index = %x\n", cfg_base_addr_index); printk("cfg base address index = %x\n", cfg_base_addr_index);
#endif /* CCISS_DEBUG */ #endif /* CCISS_DEBUG */
...@@ -2821,15 +2871,15 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev) ...@@ -2821,15 +2871,15 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
printk("cfg offset = %x\n", cfg_offset); printk("cfg offset = %x\n", cfg_offset);
#endif /* CCISS_DEBUG */ #endif /* CCISS_DEBUG */
c->cfgtable = remap_pci_mem(pci_resource_start(pdev, c->cfgtable = remap_pci_mem(pci_resource_start(pdev,
cfg_base_addr_index) + cfg_offset, cfg_base_addr_index) +
sizeof(CfgTable_struct)); cfg_offset, sizeof(CfgTable_struct));
c->board_id = board_id; c->board_id = board_id;
#ifdef CCISS_DEBUG #ifdef CCISS_DEBUG
print_cfg_table(c->cfgtable); print_cfg_table(c->cfgtable);
#endif /* CCISS_DEBUG */ #endif /* CCISS_DEBUG */
for(i=0; i<ARRAY_SIZE(products); i++) { for (i = 0; i < ARRAY_SIZE(products); i++) {
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);
...@@ -2843,24 +2893,22 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev) ...@@ -2843,24 +2893,22 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
err = -ENODEV; err = -ENODEV;
goto err_out_free_res; goto err_out_free_res;
} }
if ( (readb(&c->cfgtable->Signature[0]) != 'C') || if ((readb(&c->cfgtable->Signature[0]) != 'C') ||
(readb(&c->cfgtable->Signature[1]) != 'I') || (readb(&c->cfgtable->Signature[1]) != 'I') ||
(readb(&c->cfgtable->Signature[2]) != 'S') || (readb(&c->cfgtable->Signature[2]) != 'S') ||
(readb(&c->cfgtable->Signature[3]) != 'S') ) (readb(&c->cfgtable->Signature[3]) != 'S')) {
{
printk("Does not appear to be a valid CISS config table\n"); printk("Does not appear to be a valid CISS config table\n");
err = -ENODEV; err = -ENODEV;
goto err_out_free_res; goto err_out_free_res;
} }
#ifdef CONFIG_X86 #ifdef CONFIG_X86
{ {
/* Need to enable prefetch in the SCSI core for 6400 in x86 */ /* Need to enable prefetch in the SCSI core for 6400 in x86 */
__u32 prefetch; __u32 prefetch;
prefetch = readl(&(c->cfgtable->SCSI_Prefetch)); prefetch = readl(&(c->cfgtable->SCSI_Prefetch));
prefetch |= 0x100; prefetch |= 0x100;
writel(prefetch, &(c->cfgtable->SCSI_Prefetch)); writel(prefetch, &(c->cfgtable->SCSI_Prefetch));
} }
#endif #endif
#ifdef CCISS_DEBUG #ifdef CCISS_DEBUG
...@@ -2868,14 +2916,13 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev) ...@@ -2868,14 +2916,13 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
#endif /* CCISS_DEBUG */ #endif /* CCISS_DEBUG */
c->max_commands = readl(&(c->cfgtable->CmdsOutMax)); c->max_commands = readl(&(c->cfgtable->CmdsOutMax));
/* Update the field, and then ring the doorbell */ /* Update the field, and then ring the doorbell */
writel( CFGTBL_Trans_Simple, writel(CFGTBL_Trans_Simple, &(c->cfgtable->HostWrite.TransportRequest));
&(c->cfgtable->HostWrite.TransportRequest)); writel(CFGTBL_ChangeReq, c->vaddr + SA5_DOORBELL);
writel( CFGTBL_ChangeReq, c->vaddr + SA5_DOORBELL);
/* under certain very rare conditions, this can take awhile. /* under certain very rare conditions, this can take awhile.
* (e.g.: hot replace a failed 144GB drive in a RAID 5 set right * (e.g.: hot replace a failed 144GB drive in a RAID 5 set right
* as we enter this code.) */ * as we enter this code.) */
for(i=0;i<MAX_CONFIG_WAIT;i++) { for (i = 0; i < MAX_CONFIG_WAIT; i++) {
if (!(readl(c->vaddr + SA5_DOORBELL) & CFGTBL_ChangeReq)) if (!(readl(c->vaddr + SA5_DOORBELL) & CFGTBL_ChangeReq))
break; break;
/* delay and try again */ /* delay and try again */
...@@ -2884,14 +2931,14 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev) ...@@ -2884,14 +2931,14 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
} }
#ifdef CCISS_DEBUG #ifdef CCISS_DEBUG
printk(KERN_DEBUG "I counter got to %d %x\n", i, readl(c->vaddr + SA5_DOORBELL)); printk(KERN_DEBUG "I counter got to %d %x\n", i,
readl(c->vaddr + SA5_DOORBELL));
#endif /* CCISS_DEBUG */ #endif /* CCISS_DEBUG */
#ifdef CCISS_DEBUG #ifdef CCISS_DEBUG
print_cfg_table(c->cfgtable); print_cfg_table(c->cfgtable);
#endif /* CCISS_DEBUG */ #endif /* CCISS_DEBUG */
if (!(readl(&(c->cfgtable->TransportActive)) & CFGTBL_Trans_Simple)) if (!(readl(&(c->cfgtable->TransportActive)) & CFGTBL_Trans_Simple)) {
{
printk(KERN_WARNING "cciss: unable to get board into" printk(KERN_WARNING "cciss: unable to get board into"
" simple mode\n"); " simple mode\n");
err = -ENODEV; err = -ENODEV;
...@@ -2899,10 +2946,10 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev) ...@@ -2899,10 +2946,10 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
} }
return 0; return 0;
err_out_free_res: err_out_free_res:
pci_release_regions(pdev); pci_release_regions(pdev);
err_out_disable_pdev: err_out_disable_pdev:
pci_disable_device(pdev); pci_disable_device(pdev);
return err; return err;
} }
...@@ -2923,21 +2970,18 @@ static void cciss_getgeometry(int cntl_num) ...@@ -2923,21 +2970,18 @@ static void cciss_getgeometry(int cntl_num)
int total_size; int total_size;
ld_buff = kzalloc(sizeof(ReportLunData_struct), GFP_KERNEL); ld_buff = kzalloc(sizeof(ReportLunData_struct), GFP_KERNEL);
if (ld_buff == NULL) if (ld_buff == NULL) {
{
printk(KERN_ERR "cciss: out of memory\n"); printk(KERN_ERR "cciss: out of memory\n");
return; return;
} }
size_buff = kmalloc(sizeof( ReadCapdata_struct), GFP_KERNEL); size_buff = kmalloc(sizeof(ReadCapdata_struct), GFP_KERNEL);
if (size_buff == NULL) if (size_buff == NULL) {
{
printk(KERN_ERR "cciss: out of memory\n"); printk(KERN_ERR "cciss: out of memory\n");
kfree(ld_buff); kfree(ld_buff);
return; return;
} }
inq_buff = kmalloc(sizeof( InquiryData_struct), GFP_KERNEL); inq_buff = kmalloc(sizeof(InquiryData_struct), GFP_KERNEL);
if (inq_buff == NULL) if (inq_buff == NULL) {
{
printk(KERN_ERR "cciss: out of memory\n"); printk(KERN_ERR "cciss: out of memory\n");
kfree(ld_buff); kfree(ld_buff);
kfree(size_buff); kfree(size_buff);
...@@ -2945,56 +2989,59 @@ static void cciss_getgeometry(int cntl_num) ...@@ -2945,56 +2989,59 @@ static void cciss_getgeometry(int cntl_num)
} }
/* Get the firmware version */ /* Get the firmware version */
return_code = sendcmd(CISS_INQUIRY, cntl_num, inq_buff, return_code = sendcmd(CISS_INQUIRY, cntl_num, inq_buff,
sizeof(InquiryData_struct), 0, 0 ,0, NULL, TYPE_CMD); sizeof(InquiryData_struct), 0, 0, 0, NULL,
if (return_code == IO_OK) TYPE_CMD);
{ if (return_code == IO_OK) {
hba[cntl_num]->firm_ver[0] = inq_buff->data_byte[32]; hba[cntl_num]->firm_ver[0] = inq_buff->data_byte[32];
hba[cntl_num]->firm_ver[1] = inq_buff->data_byte[33]; hba[cntl_num]->firm_ver[1] = inq_buff->data_byte[33];
hba[cntl_num]->firm_ver[2] = inq_buff->data_byte[34]; hba[cntl_num]->firm_ver[2] = inq_buff->data_byte[34];
hba[cntl_num]->firm_ver[3] = inq_buff->data_byte[35]; hba[cntl_num]->firm_ver[3] = inq_buff->data_byte[35];
} else /* send command failed */ } else { /* send command failed */
{
printk(KERN_WARNING "cciss: unable to determine firmware" printk(KERN_WARNING "cciss: unable to determine firmware"
" version of controller\n"); " version of controller\n");
} }
/* Get the number of logical volumes */ /* Get the number of logical volumes */
return_code = sendcmd(CISS_REPORT_LOG, cntl_num, ld_buff, return_code = sendcmd(CISS_REPORT_LOG, cntl_num, ld_buff,
sizeof(ReportLunData_struct), 0, 0, 0, NULL, TYPE_CMD); sizeof(ReportLunData_struct), 0, 0, 0, NULL,
TYPE_CMD);
if( return_code == IO_OK) if (return_code == IO_OK) {
{
#ifdef CCISS_DEBUG #ifdef CCISS_DEBUG
printk("LUN Data\n--------------------------\n"); printk("LUN Data\n--------------------------\n");
#endif /* CCISS_DEBUG */ #endif /* CCISS_DEBUG */
listlength |= (0xff & (unsigned int)(ld_buff->LUNListLength[0])) << 24; listlength |=
listlength |= (0xff & (unsigned int)(ld_buff->LUNListLength[1])) << 16; (0xff & (unsigned int)(ld_buff->LUNListLength[0])) << 24;
listlength |= (0xff & (unsigned int)(ld_buff->LUNListLength[2])) << 8; listlength |=
(0xff & (unsigned int)(ld_buff->LUNListLength[1])) << 16;
listlength |=
(0xff & (unsigned int)(ld_buff->LUNListLength[2])) << 8;
listlength |= 0xff & (unsigned int)(ld_buff->LUNListLength[3]); listlength |= 0xff & (unsigned int)(ld_buff->LUNListLength[3]);
} else /* reading number of logical volumes failed */ } else { /* reading number of logical volumes failed */
{
printk(KERN_WARNING "cciss: report logical volume" printk(KERN_WARNING "cciss: report logical volume"
" command failed\n"); " command failed\n");
listlength = 0; listlength = 0;
} }
hba[cntl_num]->num_luns = listlength / 8; // 8 bytes pre entry hba[cntl_num]->num_luns = listlength / 8; // 8 bytes pre entry
if (hba[cntl_num]->num_luns > CISS_MAX_LUN) if (hba[cntl_num]->num_luns > CISS_MAX_LUN) {
{ printk(KERN_ERR
printk(KERN_ERR "ciss: only %d number of logical volumes supported\n", "ciss: only %d number of logical volumes supported\n",
CISS_MAX_LUN); CISS_MAX_LUN);
hba[cntl_num]->num_luns = CISS_MAX_LUN; hba[cntl_num]->num_luns = CISS_MAX_LUN;
} }
#ifdef CCISS_DEBUG #ifdef CCISS_DEBUG
printk(KERN_DEBUG "Length = %x %x %x %x = %d\n", ld_buff->LUNListLength[0], printk(KERN_DEBUG "Length = %x %x %x %x = %d\n",
ld_buff->LUNListLength[1], ld_buff->LUNListLength[2], ld_buff->LUNListLength[0], ld_buff->LUNListLength[1],
ld_buff->LUNListLength[3], hba[cntl_num]->num_luns); ld_buff->LUNListLength[2], ld_buff->LUNListLength[3],
hba[cntl_num]->num_luns);
#endif /* CCISS_DEBUG */ #endif /* CCISS_DEBUG */
hba[cntl_num]->highest_lun = hba[cntl_num]->num_luns-1; hba[cntl_num]->highest_lun = hba[cntl_num]->num_luns - 1;
// for(i=0; i< hba[cntl_num]->num_luns; i++) // for(i=0; i< hba[cntl_num]->num_luns; i++)
for(i=0; i < CISS_MAX_LUN; i++) for (i = 0; i < CISS_MAX_LUN; i++) {
{ if (i < hba[cntl_num]->num_luns) {
if (i < hba[cntl_num]->num_luns){
lunid = (0xff & (unsigned int)(ld_buff->LUN[i][3])) lunid = (0xff & (unsigned int)(ld_buff->LUN[i][3]))
<< 24; << 24;
lunid |= (0xff & (unsigned int)(ld_buff->LUN[i][2])) lunid |= (0xff & (unsigned int)(ld_buff->LUN[i][2]))
...@@ -3005,7 +3052,6 @@ static void cciss_getgeometry(int cntl_num) ...@@ -3005,7 +3052,6 @@ static void cciss_getgeometry(int cntl_num)
hba[cntl_num]->drv[i].LunID = lunid; hba[cntl_num]->drv[i].LunID = lunid;
#ifdef CCISS_DEBUG #ifdef CCISS_DEBUG
printk(KERN_DEBUG "LUN[%d]: %x %x %x %x = %x\n", i, printk(KERN_DEBUG "LUN[%d]: %x %x %x %x = %x\n", i,
ld_buff->LUN[i][0], ld_buff->LUN[i][1], ld_buff->LUN[i][0], ld_buff->LUN[i][1],
...@@ -3015,7 +3061,8 @@ static void cciss_getgeometry(int cntl_num) ...@@ -3015,7 +3061,8 @@ static void cciss_getgeometry(int cntl_num)
cciss_read_capacity(cntl_num, i, size_buff, 0, cciss_read_capacity(cntl_num, i, size_buff, 0,
&total_size, &block_size); &total_size, &block_size);
cciss_geometry_inquiry(cntl_num, i, 0, total_size, cciss_geometry_inquiry(cntl_num, i, 0, total_size,
block_size, inq_buff, &hba[cntl_num]->drv[i]); block_size, inq_buff,
&hba[cntl_num]->drv[i]);
} else { } else {
/* initialize raid_level to indicate a free space */ /* initialize raid_level to indicate a free space */
hba[cntl_num]->drv[i].raid_level = -1; hba[cntl_num]->drv[i].raid_level = -1;
...@@ -3038,7 +3085,7 @@ static int alloc_cciss_hba(void) ...@@ -3038,7 +3085,7 @@ static int alloc_cciss_hba(void)
goto out; goto out;
} }
for(i=0; i< MAX_CTLR; i++) { for (i = 0; i < MAX_CTLR; i++) {
if (!hba[i]) { if (!hba[i]) {
ctlr_info_t *p; ctlr_info_t *p;
p = kzalloc(sizeof(ctlr_info_t), GFP_KERNEL); p = kzalloc(sizeof(ctlr_info_t), GFP_KERNEL);
...@@ -3053,9 +3100,9 @@ static int alloc_cciss_hba(void) ...@@ -3053,9 +3100,9 @@ static int alloc_cciss_hba(void)
printk(KERN_WARNING "cciss: This driver supports a maximum" printk(KERN_WARNING "cciss: This driver supports a maximum"
" of %d controllers.\n", MAX_CTLR); " of %d controllers.\n", MAX_CTLR);
goto out; goto out;
Enomem: Enomem:
printk(KERN_ERR "cciss: out of memory.\n"); printk(KERN_ERR "cciss: out of memory.\n");
out: out:
while (n--) while (n--)
put_disk(disk[n]); put_disk(disk[n]);
return -1; return -1;
...@@ -3087,7 +3134,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, ...@@ -3087,7 +3134,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
int dac; int dac;
i = alloc_cciss_hba(); i = alloc_cciss_hba();
if(i < 0) if (i < 0)
return -1; return -1;
hba[i]->busy_initializing = 1; hba[i]->busy_initializing = 1;
...@@ -3117,20 +3164,19 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, ...@@ -3117,20 +3164,19 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
if (i < MAX_CTLR_ORIG) if (i < MAX_CTLR_ORIG)
hba[i]->major = COMPAQ_CISS_MAJOR + i; hba[i]->major = COMPAQ_CISS_MAJOR + i;
rc = register_blkdev(hba[i]->major, hba[i]->devname); rc = register_blkdev(hba[i]->major, hba[i]->devname);
if(rc == -EBUSY || rc == -EINVAL) { if (rc == -EBUSY || rc == -EINVAL) {
printk(KERN_ERR printk(KERN_ERR
"cciss: Unable to get major number %d for %s " "cciss: Unable to get major number %d for %s "
"on hba %d\n", hba[i]->major, hba[i]->devname, i); "on hba %d\n", hba[i]->major, hba[i]->devname, i);
goto clean1; goto clean1;
} } else {
else {
if (i >= MAX_CTLR_ORIG) if (i >= MAX_CTLR_ORIG)
hba[i]->major = rc; hba[i]->major = rc;
} }
/* make sure the board interrupts are off */ /* make sure the board interrupts are off */
hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_OFF); hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_OFF);
if( request_irq(hba[i]->intr[SIMPLE_MODE_INT], do_cciss_intr, if (request_irq(hba[i]->intr[SIMPLE_MODE_INT], do_cciss_intr,
SA_INTERRUPT | SA_SHIRQ, hba[i]->devname, hba[i])) { SA_INTERRUPT | SA_SHIRQ, hba[i]->devname, hba[i])) {
printk(KERN_ERR "cciss: Unable to get irq %d for %s\n", printk(KERN_ERR "cciss: Unable to get irq %d for %s\n",
hba[i]->intr[SIMPLE_MODE_INT], hba[i]->devname); hba[i]->intr[SIMPLE_MODE_INT], hba[i]->devname);
...@@ -3141,17 +3187,21 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, ...@@ -3141,17 +3187,21 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
hba[i]->devname, pdev->device, pci_name(pdev), hba[i]->devname, pdev->device, pci_name(pdev),
hba[i]->intr[SIMPLE_MODE_INT], dac ? "" : " not"); hba[i]->intr[SIMPLE_MODE_INT], dac ? "" : " not");
hba[i]->cmd_pool_bits = kmalloc(((NR_CMDS+BITS_PER_LONG-1)/BITS_PER_LONG)*sizeof(unsigned long), GFP_KERNEL); hba[i]->cmd_pool_bits =
hba[i]->cmd_pool = (CommandList_struct *)pci_alloc_consistent( kmalloc(((NR_CMDS + BITS_PER_LONG -
hba[i]->pdev, NR_CMDS * sizeof(CommandList_struct), 1) / BITS_PER_LONG) * sizeof(unsigned long), GFP_KERNEL);
hba[i]->cmd_pool = (CommandList_struct *)
pci_alloc_consistent(hba[i]->pdev,
NR_CMDS * sizeof(CommandList_struct),
&(hba[i]->cmd_pool_dhandle)); &(hba[i]->cmd_pool_dhandle));
hba[i]->errinfo_pool = (ErrorInfo_struct *)pci_alloc_consistent( hba[i]->errinfo_pool = (ErrorInfo_struct *)
hba[i]->pdev, NR_CMDS * sizeof( ErrorInfo_struct), pci_alloc_consistent(hba[i]->pdev,
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)
|| (hba[i]->errinfo_pool == NULL)) { || (hba[i]->errinfo_pool == NULL)) {
printk( KERN_ERR "cciss: out of memory"); printk(KERN_ERR "cciss: out of memory");
goto clean4; goto clean4;
} }
#ifdef CONFIG_CISS_SCSI_TAPE #ifdef CONFIG_CISS_SCSI_TAPE
...@@ -3159,7 +3209,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, ...@@ -3159,7 +3209,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
kmalloc(sizeof(hba[i]->scsi_rejects.complete[0]) * kmalloc(sizeof(hba[i]->scsi_rejects.complete[0]) *
(NR_CMDS + 5), GFP_KERNEL); (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;
} }
#endif #endif
...@@ -3170,10 +3220,12 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, ...@@ -3170,10 +3220,12 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
pci_set_drvdata(pdev, hba[i]); pci_set_drvdata(pdev, hba[i]);
/* 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, ((NR_CMDS+BITS_PER_LONG-1)/BITS_PER_LONG)*sizeof(unsigned long)); memset(hba[i]->cmd_pool_bits, 0,
((NR_CMDS + BITS_PER_LONG -
1) / BITS_PER_LONG) * sizeof(unsigned long));
#ifdef CCISS_DEBUG #ifdef CCISS_DEBUG
printk(KERN_DEBUG "Scanning for drives on controller cciss%d\n",i); printk(KERN_DEBUG "Scanning for drives on controller cciss%d\n", i);
#endif /* CCISS_DEBUG */ #endif /* CCISS_DEBUG */
cciss_getgeometry(i); cciss_getgeometry(i);
...@@ -3186,7 +3238,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, ...@@ -3186,7 +3238,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
cciss_procinit(i); cciss_procinit(i);
hba[i]->busy_initializing = 0; hba[i]->busy_initializing = 0;
for(j=0; j < NWD; j++) { /* mfm */ for (j = 0; j < NWD; j++) { /* mfm */
drive_info_struct *drv = &(hba[i]->drv[j]); drive_info_struct *drv = &(hba[i]->drv[j]);
struct gendisk *disk = hba[i]->gendisk[j]; struct gendisk *disk = hba[i]->gendisk[j];
...@@ -3223,7 +3275,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, ...@@ -3223,7 +3275,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
disk->driverfs_dev = &pdev->dev; disk->driverfs_dev = &pdev->dev;
/* we must register the controller even if no disks exist */ /* we must register the controller even if no disks exist */
/* this is for the online array utilities */ /* this is for the online array utilities */
if(!drv->heads && j) if (!drv->heads && j)
continue; continue;
blk_queue_hardsect_size(q, drv->block_size); blk_queue_hardsect_size(q, drv->block_size);
set_capacity(disk, drv->nr_blocks); set_capacity(disk, drv->nr_blocks);
...@@ -3232,45 +3284,43 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, ...@@ -3232,45 +3284,43 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
return 1; return 1;
clean4: clean4:
#ifdef CONFIG_CISS_SCSI_TAPE #ifdef CONFIG_CISS_SCSI_TAPE
kfree(hba[i]->scsi_rejects.complete); kfree(hba[i]->scsi_rejects.complete);
#endif #endif
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), 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), 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]);
clean2: clean2:
unregister_blkdev(hba[i]->major, hba[i]->devname); unregister_blkdev(hba[i]->major, hba[i]->devname);
clean1: clean1:
hba[i]->busy_initializing = 0; hba[i]->busy_initializing = 0;
free_hba(i); free_hba(i);
return -1; return -1;
} }
static void __devexit cciss_remove_one (struct pci_dev *pdev) static void __devexit cciss_remove_one(struct pci_dev *pdev)
{ {
ctlr_info_t *tmp_ptr; ctlr_info_t *tmp_ptr;
int i, j; int i, j;
char flush_buf[4]; char flush_buf[4];
int return_code; int return_code;
if (pci_get_drvdata(pdev) == NULL) if (pci_get_drvdata(pdev) == NULL) {
{ printk(KERN_ERR "cciss: Unable to remove device \n");
printk( KERN_ERR "cciss: Unable to remove device \n");
return; return;
} }
tmp_ptr = pci_get_drvdata(pdev); tmp_ptr = pci_get_drvdata(pdev);
i = tmp_ptr->ctlr; i = tmp_ptr->ctlr;
if (hba[i] == NULL) if (hba[i] == NULL) {
{
printk(KERN_ERR "cciss: device appears to " printk(KERN_ERR "cciss: device appears to "
"already be removed \n"); "already be removed \n");
return; return;
...@@ -3281,8 +3331,7 @@ static void __devexit cciss_remove_one (struct pci_dev *pdev) ...@@ -3281,8 +3331,7 @@ static void __devexit cciss_remove_one (struct pci_dev *pdev)
memset(flush_buf, 0, 4); memset(flush_buf, 0, 4);
return_code = sendcmd(CCISS_CACHE_FLUSH, i, flush_buf, 4, 0, 0, 0, NULL, return_code = sendcmd(CCISS_CACHE_FLUSH, i, flush_buf, 4, 0, 0, 0, NULL,
TYPE_CMD); TYPE_CMD);
if(return_code != IO_OK) if (return_code != IO_OK) {
{
printk(KERN_WARNING "Error Flushing cache on controller %d\n", printk(KERN_WARNING "Error Flushing cache on controller %d\n",
i); i);
} }
...@@ -3315,7 +3364,7 @@ static void __devexit cciss_remove_one (struct pci_dev *pdev) ...@@ -3315,7 +3364,7 @@ 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, 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, 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
...@@ -3352,10 +3401,8 @@ static void __exit cciss_cleanup(void) ...@@ -3352,10 +3401,8 @@ static void __exit cciss_cleanup(void)
pci_unregister_driver(&cciss_pci_driver); pci_unregister_driver(&cciss_pci_driver);
/* double check that all controller entrys have been removed */ /* double check that all controller entrys have been removed */
for (i=0; i< MAX_CTLR; i++) for (i = 0; i < MAX_CTLR; i++) {
{ if (hba[i] != NULL) {
if (hba[i] != NULL)
{
printk(KERN_WARNING "cciss: had to remove" printk(KERN_WARNING "cciss: had to remove"
" controller %d\n", i); " controller %d\n", i);
cciss_remove_one(hba[i]->pdev); cciss_remove_one(hba[i]->pdev);
...@@ -3379,14 +3426,14 @@ static void fail_all_cmds(unsigned long ctlr) ...@@ -3379,14 +3426,14 @@ static void fail_all_cmds(unsigned long ctlr)
pci_disable_device(h->pdev); /* Make sure it is really dead. */ pci_disable_device(h->pdev); /* Make sure it is really dead. */
/* move everything off the request queue onto the completed queue */ /* move everything off the request queue onto the completed queue */
while( (c = h->reqQ) != NULL ) { while ((c = h->reqQ) != NULL) {
removeQ(&(h->reqQ), c); removeQ(&(h->reqQ), c);
h->Qdepth--; h->Qdepth--;
addQ (&(h->cmpQ), c); addQ(&(h->cmpQ), c);
} }
/* Now, fail everything on the completed queue with a HW error */ /* Now, fail everything on the completed queue with a HW error */
while( (c = h->cmpQ) != NULL ) { while ((c = h->cmpQ) != NULL) {
removeQ(&h->cmpQ, c); removeQ(&h->cmpQ, c);
c->err_info->CommandStatus = CMD_HARDWARE_ERR; c->err_info->CommandStatus = CMD_HARDWARE_ERR;
if (c->cmd_type == CMD_RWREQ) { if (c->cmd_type == CMD_RWREQ) {
......
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