patch-2.4.21 linux-2.4.21/drivers/block/cciss.c
Next file: linux-2.4.21/drivers/block/cciss.h
Previous file: linux-2.4.21/drivers/block/amiflop.c
Back to the patch index
Back to the overall index
- Lines: 2514
- Date:
2003-06-13 07:51:32.000000000 -0700
- Orig file:
linux-2.4.20/drivers/block/cciss.c
- Orig date:
2002-11-28 15:53:12.000000000 -0800
diff -urN linux-2.4.20/drivers/block/cciss.c linux-2.4.21/drivers/block/cciss.c
@@ -1,6 +1,6 @@
/*
- * Disk Array driver for Compaq SMART2 Controllers
- * Copyright 2000 Compaq Computer Corporation
+ * Disk Array driver for HP SA 5xxx and 6xxx Controllers
+ * Copyright 2000, 2002 Hewlett-Packard Development Company, L.P.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * Questions/Comments/Bugfixes to arrays@compaq.com
+ * Questions/Comments/Bugfixes to Cciss-discuss@lists.sourceforge.net
*
*/
@@ -44,12 +44,13 @@
#include <linux/genhd.h>
#define CCISS_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin))
-#define DRIVER_NAME "Compaq CISS Driver (v 2.4.5)"
-#define DRIVER_VERSION CCISS_DRIVER_VERSION(2,4,5)
+#define DRIVER_NAME "HP CISS Driver (v 2.4.42)"
+#define DRIVER_VERSION CCISS_DRIVER_VERSION(2,4,42)
/* Embedded module documentation macros - see modules.h */
-MODULE_AUTHOR("Charles M. White III - Compaq Computer Corporation");
-MODULE_DESCRIPTION("Driver for Compaq Smart Array Controller 5300");
+MODULE_AUTHOR("Charles M. White III - Hewlett-Packard Company");
+MODULE_DESCRIPTION("Driver for HP SA5xxx SA6xxx Controllers version 2.4.42");
+MODULE_SUPPORTED_DEVICE("HP SA5i SA5i+ SA532 SA5300 SA5312 SA641 SA642 SA6400");
MODULE_LICENSE("GPL");
#include "cciss_cmd.h"
@@ -66,6 +67,12 @@
0x0E11, 0x4082, 0, 0, 0},
{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSB,
0x0E11, 0x4083, 0, 0, 0},
+ { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,
+ 0x0E11, 0x409A, 0, 0, 0},
+ { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,
+ 0x0E11, 0x409B, 0, 0, 0},
+ { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,
+ 0x0E11, 0x409C, 0, 0, 0},
{0,}
};
MODULE_DEVICE_TABLE(pci, cciss_pci_device_id);
@@ -77,15 +84,21 @@
* access = Address of the struct of function pointers
*/
static struct board_type products[] = {
- { 0x40700E11, "Smart Array 5300", &SA5_access },
+ { 0x40700E11, "Smart Array 5300", &SA5_access},
{ 0x40800E11, "Smart Array 5i", &SA5B_access},
{ 0x40820E11, "Smart Array 532", &SA5B_access},
{ 0x40830E11, "Smart Array 5312", &SA5B_access},
+ { 0x409A0E11, "Smart Array 641", &SA5_access},
+ { 0x409B0E11, "Smart Array 642", &SA5_access},
+ { 0x409C0E11, "Smart Array 6400", &SA5_access},
};
/* How long to wait (in millesconds) for board to go into simple mode */
#define MAX_CONFIG_WAIT 1000
+/*define how many times we will try a command because of bus resets */
+#define MAX_CMD_RETRIES 3
+
#define READ_AHEAD 128
#define NR_CMDS 128 /* #commands that can be outstanding */
#define MAX_CTLR 8
@@ -104,6 +117,9 @@
static int revalidate_logvol(kdev_t dev, int maxusage);
static int frevalidate_logvol(kdev_t dev);
+static int deregister_disk(int ctlr, int logvol);
+static int register_new_disk(int cltr, int opened_vol, __u64 requested_lun);
+static int cciss_rescan_disk(int cltr, int logvol);
static void cciss_getgeometry(int cntl_num);
@@ -130,6 +146,11 @@
#include "cciss_scsi.c" /* For SCSI tape support */
+#define ENG_GIG 1048576000
+#define ENG_GIG_FACTOR (ENG_GIG/512)
+#define RAID_UNKNOWN 6
+static const char *raid_label[] = {"0","4","1(0+1)","5","5+1","ADG",
+ "UNKNOWN"};
/*
* Report information about this controller.
*/
@@ -137,53 +158,67 @@
static int cciss_proc_get_info(char *buffer, char **start, off_t offset,
int length, int *eof, void *data)
{
- off_t pos = 0;
- off_t len = 0;
- int size, i, ctlr;
- ctlr_info_t *h = (ctlr_info_t*)data;
- drive_info_struct *drv;
-
- ctlr = h->ctlr;
- size = sprintf(buffer, "%s: Compaq %s Controller\n"
- " Board ID: 0x%08lx\n"
- " Firmware Version: %c%c%c%c\n"
- " Memory Address: 0x%08lx\n"
- " IRQ: %d\n"
- " Logical drives: %d\n"
- " Current Q depth: %d\n"
- " Current # commands on controller %d\n"
- " Max Q depth since init: %d\n"
- " Max # commands on controller since init: %d\n"
- " Max SG entries since init: %d\n\n",
- h->devname,
- h->product_name,
- (unsigned long)h->board_id,
- h->firm_ver[0], h->firm_ver[1], h->firm_ver[2], h->firm_ver[3],
- (unsigned long)h->vaddr,
- (unsigned int)h->intr,
- h->num_luns,
- h->Qdepth, h->commands_outstanding,
- h->maxQsinceinit, h->max_outstanding, h->maxSG);
+ off_t pos = 0;
+ off_t len = 0;
+ int size, i, ctlr;
+ ctlr_info_t *h = (ctlr_info_t*)data;
+ drive_info_struct *drv;
+ unsigned long flags;
+ unsigned int vol_sz, vol_sz_frac;
- pos += size; len += size;
+ spin_lock_irqsave(&io_request_lock, flags);
+ if (h->busy_configuring) {
+ spin_unlock_irqrestore(&io_request_lock, flags);
+ return -EBUSY;
+ }
+ h->busy_configuring = 1;
+ spin_unlock_irqrestore(&io_request_lock, flags);
+
+ ctlr = h->ctlr;
+ size = sprintf(buffer, "%s: HP %s Controller\n"
+ "Board ID: 0x%08lx\n"
+ "Firmware Version: %c%c%c%c\n"
+ "IRQ: %d\n"
+ "Logical drives: %d\n"
+ "Current Q depth: %d\n"
+ "Current # commands on controller: %d\n"
+ "Max Q depth since init: %d\n"
+ "Max # commands on controller since init: %d\n"
+ "Max SG entries since init: %d\n\n",
+ h->devname,
+ h->product_name,
+ (unsigned long)h->board_id,
+ h->firm_ver[0], h->firm_ver[1], h->firm_ver[2], h->firm_ver[3],
+ (unsigned int)h->intr,
+ h->num_luns,
+ h->Qdepth, h->commands_outstanding,
+ h->maxQsinceinit, h->max_outstanding, h->maxSG);
+
+ pos += size; len += size;
cciss_proc_tape_report(ctlr, buffer, &pos, &len);
- for(i=0; i<h->num_luns; i++) {
- drv = &h->drv[i];
- size = sprintf(buffer+len, "cciss/c%dd%d: blksz=%d nr_blocks=%d\n",
- ctlr, i, drv->block_size, drv->nr_blocks);
- pos += size; len += size;
- }
-
- size = sprintf(buffer+len, "nr_allocs = %d\nnr_frees = %d\n",
- h->nr_allocs, h->nr_frees);
- pos += size; len += size;
-
- *eof = 1;
- *start = buffer+offset;
- len -= offset;
- if (len>length)
- len = length;
- return len;
+ for(i=0; i<=h->highest_lun; i++) {
+ drv = &h->drv[i];
+ if (drv->nr_blocks == 0)
+ continue;
+ vol_sz = drv->nr_blocks/ENG_GIG_FACTOR;
+ vol_sz_frac = (drv->nr_blocks%ENG_GIG_FACTOR)*100/ENG_GIG_FACTOR;
+
+ if (drv->raid_level > 5)
+ drv->raid_level = RAID_UNKNOWN;
+ size = sprintf(buffer+len, "cciss/c%dd%d:"
+ "\t%4d.%02dGB\tRAID %s\n",
+ ctlr, i, vol_sz,vol_sz_frac,
+ raid_label[drv->raid_level]);
+ pos += size, len += size;
+ }
+
+ *eof = 1;
+ *start = buffer+offset;
+ len -= offset;
+ if (len>length)
+ len = length;
+ h->busy_configuring = 0;
+ return len;
}
static int
@@ -197,16 +232,19 @@
int rc;
#endif
- if (count > sizeof(cmd)-1) return -EINVAL;
- if (copy_from_user(cmd, buffer, count)) return -EFAULT;
+ if (count > sizeof(cmd)-1)
+ return -EINVAL;
+ if (copy_from_user(cmd, buffer, count))
+ return -EFAULT;
cmd[count] = '\0';
- len = strlen(cmd); // safe???
+ len = strlen(cmd);
if (cmd[len-1] == '\n')
cmd[--len] = '\0';
# ifdef CONFIG_CISS_SCSI_TAPE
if (strcmp("engage scsi", cmd)==0) {
rc = cciss_engage_scsi(h->ctlr);
- if (rc != 0) return -rc;
+ if (rc != 0)
+ return -rc;
return count;
}
/* might be nice to have "disengage" too, but it's not
@@ -225,8 +263,10 @@
if (proc_cciss == NULL) {
proc_cciss = proc_mkdir("cciss", proc_root_driver);
- if (!proc_cciss)
+ if (!proc_cciss) {
+ printk("cciss: proc_mkdir failed\n");
return;
+ }
}
pde = create_proc_read_entry(hba[i]->devname,
@@ -250,11 +290,10 @@
u64bit temp64;
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, sizeof(CommandList_struct), &cmd_dma_handle);
- if(c==NULL)
+ if (c==NULL)
return NULL;
memset(c, 0, sizeof(CommandList_struct));
@@ -310,8 +349,7 @@
int i;
u64bit temp64;
- if( !got_from_pool)
- {
+ if (!got_from_pool) {
temp64.val32.lower = c->ErrDesc.Addr.lower;
temp64.val32.upper = c->ErrDesc.Addr.upper;
pci_free_consistent(h->pdev, sizeof(ErrorInfo_struct),
@@ -336,24 +374,22 @@
/* Loop through each real device */
hba[ctlr]->gendisk.nr_real = 0;
- for(i=0; i< NWD; i++)
- {
+ for(i=0; i< NWD; i++) {
drv = &(hba[ctlr]->drv[i]);
- if( !(drv->nr_blocks))
+ if (!(drv->nr_blocks))
continue;
hba[ctlr]->hd[i << NWD_SHIFT].nr_sects =
hba[ctlr]->sizes[i << NWD_SHIFT] = drv->nr_blocks;
/* for each partition */
- for(j=0; j<MAX_PART; j++)
- {
+ for(j=0; j<MAX_PART; j++) {
hba[ctlr]->blocksizes[(i<<NWD_SHIFT) + j] = 1024;
hba[ctlr]->hardsizes[ (i<<NWD_SHIFT) + j] =
drv->block_size;
}
- hba[ctlr]->gendisk.nr_real++;
}
+ hba[ctlr]->gendisk.nr_real = hba[ctlr]->highest_lun+1;
}
/*
* Open. Make sure the device is really there.
@@ -371,13 +407,23 @@
return -ENXIO;
/*
* Root is allowed to open raw volume zero even if its not configured
- * so array config can still work. I don't think I really like this,
+ * so array config can still work. Root is also allowed to open any
+ * volume that has a LUN ID, so it can issue IOCTL to reread the
+ * disk information. I don't think I really like this.
* but I'm already using way to many device nodes to claim another one
* for "raw controller".
*/
if (hba[ctlr]->sizes[MINOR(inode->i_rdev)] == 0) { /* not online? */
- if (MINOR(inode->i_rdev) != 0) /* not node 0? */
- return -ENXIO;
+ if (MINOR(inode->i_rdev) != 0) { /* not node 0? */
+ /* if not node 0 make sure it is a partition = 0 */
+ if (MINOR(inode->i_rdev) & 0x0f) {
+ return -ENXIO;
+ /* if it is, make sure we have a LUN ID */
+ } else if (hba[ctlr]->drv[MINOR(inode->i_rdev)
+ >> NWD_SHIFT].LunID == 0) {
+ return -ENXIO;
+ }
+ }
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
}
@@ -419,8 +465,8 @@
#endif /* CCISS_DEBUG */
switch(cmd) {
- case HDIO_GETGEO:
- {
+ case HDIO_GETGEO:
+ {
struct hd_geometry driver_geo;
if (hba[ctlr]->drv[dsk].cylinders) {
driver_geo.heads = hba[ctlr]->drv[dsk].heads;
@@ -437,8 +483,8 @@
if (copy_to_user((void *) arg, &driver_geo,
sizeof( struct hd_geometry)))
return -EFAULT;
- return(0);
- }
+ return 0;
+ }
case HDIO_GETGEO_BIG:
{
struct hd_big_geometry driver_geo;
@@ -457,18 +503,14 @@
if (copy_to_user((void *) arg, &driver_geo,
sizeof( struct hd_big_geometry)))
return -EFAULT;
- return(0);
- }
- case BLKGETSIZE:
- put_user(hba[ctlr]->hd[MINOR(inode->i_rdev)].nr_sects, (unsigned long *)arg);
- return 0;
- case BLKGETSIZE64:
- put_user((u64)hba[ctlr]->hd[MINOR(inode->i_rdev)].nr_sects << 9, (u64*)arg);
return 0;
+ }
case BLKRRPART:
- if(!capable(CAP_SYS_ADMIN))
+ if (!capable(CAP_SYS_ADMIN))
return -EPERM;
return revalidate_logvol(inode->i_rdev, 1);
+ case BLKGETSIZE:
+ case BLKGETSIZE64:
case BLKFLSBUF:
case BLKBSZSET:
case BLKBSZGET:
@@ -479,30 +521,32 @@
case BLKPG:
case BLKELVGET:
case BLKELVSET:
- return( blk_ioctl(inode->i_rdev, cmd, arg));
+ return blk_ioctl(inode->i_rdev, cmd, arg);
case CCISS_GETPCIINFO:
{
cciss_pci_info_struct pciinfo;
- if (!arg) return -EINVAL;
+ if (!arg)
+ return -EINVAL;
pciinfo.bus = hba[ctlr]->pdev->bus->number;
pciinfo.dev_fn = hba[ctlr]->pdev->devfn;
pciinfo.board_id = hba[ctlr]->board_id;
if (copy_to_user((void *) arg, &pciinfo, sizeof( cciss_pci_info_struct )))
return -EFAULT;
- return(0);
+ return 0;
}
case CCISS_GETINTINFO:
{
cciss_coalint_struct intinfo;
ctlr_info_t *c = hba[ctlr];
- if (!arg) return -EINVAL;
+ if (!arg)
+ return -EINVAL;
intinfo.delay = readl(&c->cfgtable->HostWrite.CoalIntDelay);
intinfo.count = readl(&c->cfgtable->HostWrite.CoalIntCount);
if (copy_to_user((void *) arg, &intinfo, sizeof( cciss_coalint_struct )))
return -EFAULT;
- return(0);
+ return 0;
}
case CCISS_SETINTINFO:
{
@@ -511,25 +555,21 @@
unsigned long flags;
int i;
- if (!arg) return -EINVAL;
- if (!capable(CAP_SYS_ADMIN)) return -EPERM;
+ if (!arg)
+ return -EINVAL;
+ if (!capable(CAP_SYS_ADMIN))
+ return -EPERM;
if (copy_from_user(&intinfo, (void *) arg, sizeof( cciss_coalint_struct)))
return -EFAULT;
- if ( (intinfo.delay == 0 ) && (intinfo.count == 0))
-
- {
-// printk("cciss_ioctl: delay and count cannot be 0\n");
- return( -EINVAL);
+ if ( (intinfo.delay == 0 ) && (intinfo.count == 0)) {
+ return -EINVAL;
}
+
spin_lock_irqsave(&io_request_lock, flags);
/* Can only safely update if no commands outstanding */
- if (c->commands_outstanding > 0 )
- {
-// printk("cciss_ioctl: cannot change coalasing "
-// "%d commands outstanding on controller\n",
-// c->commands_outstanding);
+ if (c->commands_outstanding > 0 ) {
spin_unlock_irqrestore(&io_request_lock, flags);
- return(-EINVAL);
+ return -EINVAL;
}
/* Update the field, and then ring the doorbell */
writel( intinfo.delay,
@@ -538,8 +578,7 @@
&(c->cfgtable->HostWrite.CoalIntCount));
writel( CFGTBL_ChangeReq, c->vaddr + SA5_DOORBELL);
- for(i=0;i<MAX_CONFIG_WAIT;i++)
- {
+ for(i=0;i<MAX_CONFIG_WAIT;i++) {
if (!(readl(c->vaddr + SA5_DOORBELL)
& CFGTBL_ChangeReq))
break;
@@ -548,8 +587,8 @@
}
spin_unlock_irqrestore(&io_request_lock, flags);
if (i >= MAX_CONFIG_WAIT)
- return( -EFAULT);
- return(0);
+ return -EFAULT;
+ return 0;
}
case CCISS_GETNODENAME:
{
@@ -557,12 +596,13 @@
ctlr_info_t *c = hba[ctlr];
int i;
- if (!arg) return -EINVAL;
+ if (!arg)
+ return -EINVAL;
for(i=0;i<16;i++)
NodeName[i] = readb(&c->cfgtable->ServerName[i]);
if (copy_to_user((void *) arg, NodeName, sizeof( NodeName_type)))
return -EFAULT;
- return(0);
+ return 0;
}
case CCISS_SETNODENAME:
{
@@ -571,8 +611,10 @@
unsigned long flags;
int i;
- if (!arg) return -EINVAL;
- if (!capable(CAP_SYS_ADMIN)) return -EPERM;
+ if (!arg)
+ return -EINVAL;
+ if (!capable(CAP_SYS_ADMIN))
+ return -EPERM;
if (copy_from_user(NodeName, (void *) arg, sizeof( NodeName_type)))
return -EFAULT;
@@ -585,8 +627,7 @@
writel( CFGTBL_ChangeReq, c->vaddr + SA5_DOORBELL);
- for(i=0;i<MAX_CONFIG_WAIT;i++)
- {
+ for(i=0;i<MAX_CONFIG_WAIT;i++) {
if (!(readl(c->vaddr + SA5_DOORBELL)
& CFGTBL_ChangeReq))
break;
@@ -595,8 +636,8 @@
}
spin_unlock_irqrestore(&io_request_lock, flags);
if (i >= MAX_CONFIG_WAIT)
- return( -EFAULT);
- return(0);
+ return -EFAULT;
+ return 0;
}
case CCISS_GETHEARTBEAT:
@@ -604,45 +645,68 @@
Heartbeat_type heartbeat;
ctlr_info_t *c = hba[ctlr];
- if (!arg) return -EINVAL;
+ if (!arg)
+ return -EINVAL;
heartbeat = readl(&c->cfgtable->HeartBeat);
if (copy_to_user((void *) arg, &heartbeat, sizeof( Heartbeat_type)))
return -EFAULT;
- return(0);
+ return 0;
}
case CCISS_GETBUSTYPES:
{
BusTypes_type BusTypes;
ctlr_info_t *c = hba[ctlr];
- if (!arg) return -EINVAL;
+ if (!arg)
+ return -EINVAL;
BusTypes = readl(&c->cfgtable->BusTypes);
if (copy_to_user((void *) arg, &BusTypes, sizeof( BusTypes_type) ))
return -EFAULT;
- return(0);
+ return 0;
}
case CCISS_GETFIRMVER:
{
FirmwareVer_type firmware;
- if (!arg) return -EINVAL;
+ if (!arg)
+ return -EINVAL;
memcpy(firmware, hba[ctlr]->firm_ver, 4);
if (copy_to_user((void *) arg, firmware, sizeof( FirmwareVer_type)))
return -EFAULT;
- return(0);
+ return 0;
}
case CCISS_GETDRIVVER:
{
DriverVer_type DriverVer = DRIVER_VERSION;
- if (!arg) return -EINVAL;
+ if (!arg)
+ return -EINVAL;
if (copy_to_user((void *) arg, &DriverVer, sizeof( DriverVer_type) ))
return -EFAULT;
- return(0);
+ return 0;
}
+ case CCISS_RESCANDISK:
+ {
+ return cciss_rescan_disk(ctlr, dsk);
+ }
+ case CCISS_DEREGDISK:
+ return deregister_disk(ctlr,dsk);
+
+ case CCISS_REGNEWD:
+ return register_new_disk(ctlr, dsk, 0);
+ case CCISS_REGNEWDISK:
+ {
+ __u64 new_logvol;
+ if (!arg)
+ return -EINVAL;
+ if (copy_from_user(&new_logvol, (void *) arg,
+ sizeof( __u64)))
+ return -EFAULT;
+ return register_new_disk(ctlr, dsk, new_logvol);
+ }
case CCISS_GETLUNINFO:
{
LogvolInfo_struct luninfo;
@@ -656,14 +720,14 @@
start = (dsk << NWD_SHIFT);
for(i=1; i <MAX_PART; i++) {
int minor = start+i;
- if(hba[ctlr]->sizes[minor] != 0)
+ if (hba[ctlr]->sizes[minor] != 0)
num_parts++;
}
luninfo.num_parts = num_parts;
if (copy_to_user((void *) arg, &luninfo,
sizeof( LogvolInfo_struct) ))
return -EFAULT;
- return(0);
+ return 0;
}
case CCISS_PASSTHRU:
{
@@ -675,28 +739,28 @@
unsigned long flags;
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, (void *) arg, sizeof( IOCTL_Command_struct) ))
return -EFAULT;
- if((iocommand.buf_size < 1) &&
- (iocommand.Request.Type.Direction != XFER_NONE))
- {
+ if ((iocommand.buf_size < 1) &&
+ (iocommand.Request.Type.Direction
+ != XFER_NONE)) {
return -EINVAL;
}
/* Check kmalloc limits */
- if(iocommand.buf_size > 128000)
+ if (iocommand.buf_size > 128000)
return -EINVAL;
- if(iocommand.buf_size > 0)
- {
+ if (iocommand.buf_size > 0) {
buff = kmalloc(iocommand.buf_size, GFP_KERNEL);
- if( buff == NULL)
- return -EFAULT;
+ if (buff == NULL)
+ return -ENOMEM;
}
- if (iocommand.Request.Type.Direction == XFER_WRITE)
- {
+ if (iocommand.Request.Type.Direction == XFER_WRITE) {
/* Copy the data into the buffer we created */
if (copy_from_user(buff, iocommand.buf, iocommand.buf_size))
{
@@ -704,40 +768,37 @@
return -EFAULT;
}
}
- if ((c = cmd_alloc(h , 0)) == NULL)
- {
+ if ((c = cmd_alloc(h , 0)) == NULL) {
kfree(buff);
return -ENOMEM;
}
- // Fill in the command type
+ /* Fill in the command type */
c->cmd_type = CMD_IOCTL_PEND;
- // Fill in Command Header
- c->Header.ReplyQueue = 0; // unused in simple mode
- if( iocommand.buf_size > 0) // buffer to fill
- {
+ /* Fill in Command Header */
+ c->Header.ReplyQueue = 0; /* unused in simple mode */
+ if (iocommand.buf_size > 0) { /* buffer to fill */
c->Header.SGList = 1;
c->Header.SGTotal= 1;
- } else // no buffers to fill
- {
+ } else { /* no buffers to fill */
c->Header.SGList = 0;
c->Header.SGTotal= 0;
}
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 */
- // Fill in Request block
+ /* Fill in Request block */
c->Request = iocommand.Request;
- // Fill in the scatter gather information
- if (iocommand.buf_size > 0 )
- {
+ /* Fill in the scatter gather information */
+ if (iocommand.buf_size > 0 ) {
temp64.val = pci_map_single( h->pdev, buff,
iocommand.buf_size,
PCI_DMA_BIDIRECTIONAL);
c->SG[0].Addr.lower = temp64.val32.lower;
c->SG[0].Addr.upper = temp64.val32.upper;
c->SG[0].Len = iocommand.buf_size;
- c->SG[0].Ext = 0; // we are not chaining
+ c->SG[0].Ext = 0; /* we are not chaining */
}
c->waiting = &wait;
@@ -758,18 +819,17 @@
/* Copy the error information out */
iocommand.error_info = *(c->err_info);
- if ( copy_to_user((void *) arg, &iocommand, sizeof( IOCTL_Command_struct) ) )
- {
+ if (copy_to_user((void *) arg, &iocommand,
+ sizeof( IOCTL_Command_struct) ) ) {
kfree(buff);
cmd_free(h, 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 */
- if (copy_to_user(iocommand.buf, buff, iocommand.buf_size))
- {
+ if (copy_to_user(iocommand.buf, buff,
+ iocommand.buf_size)) {
kfree(buff);
cmd_free(h, c, 0);
return -EFAULT;
@@ -777,9 +837,149 @@
}
kfree(buff);
cmd_free(h, c, 0);
- return(0);
+ return 0;
}
+ case CCISS_BIG_PASSTHRU:
+ {
+ BIG_IOCTL_Command_struct iocommand;
+ ctlr_info_t *h = hba[ctlr];
+ CommandList_struct *c;
+ char *buff[MAXSGENTRIES] = {NULL,};
+ int buff_size[MAXSGENTRIES] = {0,};
+ u64bit temp64;
+ unsigned long flags;
+ BYTE sg_used = 0;
+ int status = 0;
+ int i;
+ DECLARE_COMPLETION(wait);
+ if (!arg)
+ return -EINVAL;
+
+ if (!capable(CAP_SYS_RAWIO))
+ return -EPERM;
+
+ if (copy_from_user(&iocommand, (void *) arg, sizeof( BIG_IOCTL_Command_struct) ))
+ return -EFAULT;
+ if ((iocommand.buf_size < 1) &&
+ (iocommand.Request.Type.Direction != XFER_NONE)) {
+ return -EINVAL;
+ }
+ /* Check kmalloc limits using all SGs */
+ if (iocommand.malloc_size > MAX_KMALLOC_SIZE)
+ return -EINVAL;
+ if (iocommand.buf_size > iocommand.malloc_size * MAXSGENTRIES)
+ return -EINVAL;
+ if (iocommand.buf_size > 0) {
+ __u32 size_left_alloc = iocommand.buf_size;
+ BYTE *data_ptr = (BYTE *) iocommand.buf;
+ while (size_left_alloc > 0) {
+ buff_size[sg_used] = (size_left_alloc
+ > iocommand.malloc_size)
+ ? iocommand.malloc_size : size_left_alloc;
+ buff[sg_used] = kmalloc( buff_size[sg_used],
+ GFP_KERNEL);
+ if (buff[sg_used] == NULL) {
+ status = -ENOMEM;
+ goto cleanup1;
+ }
+ if (iocommand.Request.Type.Direction ==
+ XFER_WRITE)
+ /* Copy the data into the buffer created */
+ if (copy_from_user(buff[sg_used], data_ptr,
+ buff_size[sg_used])) {
+ status = -ENOMEM;
+ goto cleanup1;
+ }
+ size_left_alloc -= buff_size[sg_used];
+ data_ptr += buff_size[sg_used];
+ sg_used++;
+ }
+
+ }
+ if ((c = cmd_alloc(h , 0)) == NULL) {
+ status = -ENOMEM;
+ goto cleanup1;
+ }
+ /* Fill in the command type */
+ c->cmd_type = CMD_IOCTL_PEND;
+ /* Fill in Command Header */
+ c->Header.ReplyQueue = 0; /* unused in simple mode */
+
+ if (iocommand.buf_size > 0) { /* buffer to fill */
+ c->Header.SGList = sg_used;
+ c->Header.SGTotal= sg_used;
+ } else { /* no buffers to fill */
+ c->Header.SGList = 0;
+ c->Header.SGTotal= 0;
+ }
+ c->Header.LUN = iocommand.LUN_info;
+ c->Header.Tag.lower = c->busaddr; /* use the kernel address */
+ /* the cmd block for tag */
+
+ /* Fill in Request block */
+ c->Request = iocommand.Request;
+ /* Fill in the scatter gather information */
+ if (iocommand.buf_size > 0 ) {
+ int i;
+ for(i=0; i< sg_used; i++) {
+ temp64.val = pci_map_single( h->pdev, buff[i],
+ buff_size[i],
+ PCI_DMA_BIDIRECTIONAL);
+
+ c->SG[i].Addr.lower = temp64.val32.lower;
+ c->SG[i].Addr.upper = temp64.val32.upper;
+ c->SG[i].Len = buff_size[i];
+ c->SG[i].Ext = 0; /* we are not chaining */
+ }
+ }
+ c->waiting = &wait;
+ /* Put the request on the tail of the request queue */
+ spin_lock_irqsave(&io_request_lock, flags);
+ addQ(&h->reqQ, c);
+ h->Qdepth++;
+ start_io(h);
+ spin_unlock_irqrestore(&io_request_lock, flags);
+ wait_for_completion(&wait);
+ /* unlock the buffers from DMA */
+ for(i=0; i< sg_used; i++) {
+ temp64.val32.lower = c->SG[i].Addr.lower;
+ temp64.val32.upper = c->SG[i].Addr.upper;
+ pci_unmap_single( h->pdev, (dma_addr_t) temp64.val,
+ buff_size[i], PCI_DMA_BIDIRECTIONAL);
+ }
+ /* Copy the error information out */
+ iocommand.error_info = *(c->err_info);
+ if (copy_to_user((void *) arg, &iocommand,
+ sizeof( IOCTL_Command_struct) ) ) {
+ cmd_free(h, c, 0);
+ status = -EFAULT;
+ goto cleanup1;
+ }
+ if (iocommand.Request.Type.Direction == XFER_READ) {
+ /* Copy the data out of the buffer we created */
+ BYTE *ptr = (BYTE *) iocommand.buf;
+ for(i=0; i< sg_used; i++) {
+ if (copy_to_user(ptr, buff[i], buff_size[i])) {
+ cmd_free(h, c, 0);
+ status = -EFAULT;
+ goto cleanup1;
+
+ }
+ ptr += buff_size[i];
+ }
+ }
+ cmd_free(h, c, 0);
+ status = 0;
+
+
+cleanup1:
+ for(i=0; i< sg_used; i++) {
+ if (buff[i] != NULL)
+ kfree(buff[i]);
+ }
+ return status;
+ }
default:
return -EBADRQC;
}
@@ -837,6 +1037,642 @@
#endif /* CCISS_DEBUG */
return revalidate_logvol(dev, 0);
}
+static int deregister_disk(int ctlr, int logvol)
+{
+ unsigned long flags;
+ struct gendisk *gdev = &(hba[ctlr]->gendisk);
+ ctlr_info_t *h = hba[ctlr];
+ int start, max_p, i;
+
+ if (!capable(CAP_SYS_RAWIO))
+ return -EPERM;
+
+ spin_lock_irqsave(&io_request_lock, flags);
+ /* make sure logical volume is NOT is use */
+ if (h->drv[logvol].usage_count > 1 || h->busy_configuring) {
+ spin_unlock_irqrestore(&io_request_lock, flags);
+ return -EBUSY;
+ }
+ h->busy_configuring = 1;
+ spin_unlock_irqrestore(&io_request_lock, flags);
+
+ /* invalidate the devices and deregister the disk */
+ max_p = gdev->max_p;
+ start = logvol << gdev->minor_shift;
+ for (i=max_p-1; i>=0; i--) {
+ int minor = start+i;
+ /* printk("invalidating( %d %d)\n", ctlr, minor); */
+ invalidate_device(MKDEV(MAJOR_NR+ctlr, minor), 1);
+ /* so open will now fail */
+ h->sizes[minor] = 0;
+ /* so it will no longer appear in /proc/partitions */
+ gdev->part[minor].start_sect = 0;
+ gdev->part[minor].nr_sects = 0;
+ }
+ /* check to see if it was the last disk */
+ if (logvol == h->highest_lun) {
+ /* if so, find the new hightest lun */
+ int i, newhighest =-1;
+ for(i=0; i<h->highest_lun; i++) {
+ /* if the disk has size > 0, it is available */
+ if (h->sizes[i << gdev->minor_shift] != 0)
+ newhighest = i;
+ }
+ h->highest_lun = newhighest;
+
+ }
+ --h->num_luns;
+ gdev->nr_real = h->highest_lun+1;
+ /* zero out the disk size info */
+ h->drv[logvol].nr_blocks = 0;
+ h->drv[logvol].block_size = 0;
+ h->drv[logvol].cylinders = 0;
+ h->drv[logvol].LunID = 0;
+ h->busy_configuring = 0;
+ return 0;
+}
+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 )
+{
+ ctlr_info_t *h = hba[ctlr];
+ CommandList_struct *c;
+ u64bit buff_dma_handle;
+ unsigned long flags;
+ int return_status = IO_OK;
+ DECLARE_COMPLETION(wait);
+
+ if ((c = cmd_alloc(h , 0)) == NULL)
+ return -ENOMEM;
+ c->cmd_type = CMD_IOCTL_PEND;
+ /* Fill in Command Header */
+ c->Header.ReplyQueue = 0; /* unused in simple mode */
+ if (buff != NULL) { /* buffer to fill */
+ c->Header.SGList = 1;
+ c->Header.SGTotal= 1;
+ } else {
+ /* no buffers to fill */
+ c->Header.SGList = 0;
+ c->Header.SGTotal= 0;
+ }
+ c->Header.Tag.lower = c->busaddr; /* tag is phys addr of cmd */
+ /* Fill in Request block */
+ switch (cmd) {
+ case CISS_INQUIRY:
+ /* If the logical unit number is 0 then, this is going
+ to controller so It's a physical command
+ mode = 0 target = 0.
+ So we have nothing to write.
+ Otherwise
+ mode = 1 target = LUNID
+ */
+ if (use_unit_num != 0) {
+ c->Header.LUN.LogDev.VolId =
+ hba[ctlr]->drv[log_unit].LunID;
+ c->Header.LUN.LogDev.Mode = 1;
+ }
+ if (page_code != 0) {
+ c->Request.CDB[1] = 0x01;
+ c->Request.CDB[2] = page_code;
+ }
+ c->Request.CDBLen = 6;
+ c->Request.Type.Type = TYPE_CMD;
+ c->Request.Type.Attribute = ATTR_SIMPLE;
+ c->Request.Type.Direction = XFER_READ; /* Read */
+ c->Request.Timeout = 0; /* Don't time out */
+ c->Request.CDB[0] = CISS_INQUIRY;
+ c->Request.CDB[4] = size & 0xFF;
+ break;
+ case CISS_REPORT_LOG:
+ /* Talking to controller so It's a physical command
+ mode = 00 target = 0.
+ So we have nothing to write.
+ */
+ c->Request.CDBLen = 12;
+ c->Request.Type.Type = TYPE_CMD;
+ c->Request.Type.Attribute = ATTR_SIMPLE;
+ c->Request.Type.Direction = XFER_READ; /* Read */
+ c->Request.Timeout = 0; /* Don't time out */
+ c->Request.CDB[0] = CISS_REPORT_LOG;
+ c->Request.CDB[6] = (size >> 24) & 0xFF; /* MSB */
+ c->Request.CDB[7] = (size >> 16) & 0xFF;
+ c->Request.CDB[8] = (size >> 8) & 0xFF;
+ c->Request.CDB[9] = size & 0xFF;
+ break;
+ case CCISS_READ_CAPACITY:
+ c->Header.LUN.LogDev.VolId=
+ hba[ctlr]->drv[log_unit].LunID;
+ c->Header.LUN.LogDev.Mode = 1;
+ c->Request.CDBLen = 10;
+ c->Request.Type.Type = TYPE_CMD; /* It is a command. */
+ c->Request.Type.Attribute = ATTR_SIMPLE;
+ c->Request.Type.Direction = XFER_READ; /* Read */
+ c->Request.Timeout = 0; /* Don't time out */
+ c->Request.CDB[0] = CCISS_READ_CAPACITY;
+ break;
+ default:
+ printk(KERN_WARNING
+ "cciss: Unknown Command 0x%x sent attempted\n", cmd);
+ cmd_free(h, c, 1);
+ return IO_ERROR;
+ };
+
+ /* Fill in the scatter gather information */
+ if (size > 0) {
+ buff_dma_handle.val = (__u64) pci_map_single( h->pdev,
+ buff, size, PCI_DMA_BIDIRECTIONAL);
+ c->SG[0].Addr.lower = buff_dma_handle.val32.lower;
+ c->SG[0].Addr.upper = buff_dma_handle.val32.upper;
+ c->SG[0].Len = size;
+ c->SG[0].Ext = 0; /* we are not chaining */
+ }
+
+resend_cmd2:
+ c->waiting = &wait;
+ /* Put the request on the tail of the queue and send it */
+ spin_lock_irqsave(&io_request_lock, flags);
+ addQ(&h->reqQ, c);
+ h->Qdepth++;
+ start_io(h);
+ spin_unlock_irqrestore(&io_request_lock, flags);
+
+ wait_for_completion(&wait);
+
+
+ if (c->err_info->CommandStatus != 0) {
+ /* an error has occurred */
+ switch (c->err_info->CommandStatus) {
+ case CMD_TARGET_STATUS:
+ printk(KERN_WARNING "cciss: cmd %p has "
+ " completed with errors\n", c);
+ if (c->err_info->ScsiStatus) {
+ printk(KERN_WARNING "cciss: cmd %p "
+ "has SCSI Status = %x\n", c,
+ c->err_info->ScsiStatus);
+ }
+ break;
+ case CMD_DATA_UNDERRUN:
+ case CMD_DATA_OVERRUN:
+ /* expected for inquire and report lun commands */
+ break;
+ case CMD_INVALID:
+ printk(KERN_WARNING "cciss: cmd %p is "
+ "reported invalid\n", c);
+ return_status = IO_ERROR;
+ break;
+ case CMD_PROTOCOL_ERR:
+ printk(KERN_WARNING "cciss: cmd %p has "
+ "protocol error \n", c);
+ return_status = IO_ERROR;
+ break;
+ case CMD_HARDWARE_ERR:
+ printk(KERN_WARNING "cciss: cmd %p had "
+ " hardware error\n", c);
+ return_status = IO_ERROR;
+ break;
+ case CMD_CONNECTION_LOST:
+ printk(KERN_WARNING "cciss: cmd %p had "
+ "connection lost\n", c);
+ return_status = IO_ERROR;
+ break;
+ case CMD_ABORTED:
+ printk(KERN_WARNING "cciss: cmd %p was "
+ "aborted\n", c);
+ return_status = IO_ERROR;
+ break;
+ case CMD_ABORT_FAILED:
+ printk(KERN_WARNING "cciss: cmd %p reports "
+ "abort failed\n", c);
+ return_status = IO_ERROR;
+ break;
+ case CMD_UNSOLICITED_ABORT:
+ printk(KERN_WARNING "cciss: cmd %p aborted "
+ "do to an unsolicited abort\n", c);
+ if (c->retry_count < MAX_CMD_RETRIES)
+ {
+ printk(KERN_WARNING "retrying cmd\n");
+ c->retry_count++;
+ /* erase the old error */
+ /* information */
+ memset(c->err_info, 0,
+ sizeof(ErrorInfo_struct));
+ return_status = IO_OK;
+ INIT_COMPLETION(wait);
+ goto resend_cmd2;
+
+ }
+ return_status = IO_ERROR;
+ break;
+ default:
+ printk(KERN_WARNING "cciss: cmd %p returned "
+ "unknown status %x\n", c,
+ c->err_info->CommandStatus);
+ return_status = IO_ERROR;
+ }
+ }
+
+ /* unlock the buffers from DMA */
+ pci_unmap_single( h->pdev, (dma_addr_t) buff_dma_handle.val,
+ size, PCI_DMA_BIDIRECTIONAL);
+ cmd_free(h, c, 0);
+ return return_status;
+}
+static int register_new_disk(int ctlr, int opened_vol, __u64 requested_lun)
+{
+ struct gendisk *gdev = &(hba[ctlr]->gendisk);
+ ctlr_info_t *h = hba[ctlr];
+ int start, max_p, i;
+ int num_luns;
+ int logvol;
+ int new_lun_found = 0;
+ int new_lun_index = 0;
+ int free_index_found = 0;
+ int free_index = 0;
+ ReportLunData_struct *ld_buff;
+ ReadCapdata_struct *size_buff;
+ InquiryData_struct *inq_buff;
+ int return_code;
+ int listlength = 0;
+ __u32 lunid = 0;
+ unsigned int block_size;
+ unsigned int total_size;
+ unsigned long flags;
+ int req_lunid = (int) (requested_lun & (__u64) 0xffffffff);
+
+ if (!capable(CAP_SYS_RAWIO))
+ return -EPERM;
+ /* if we have no space in our disk array left to add anything */
+ spin_lock_irqsave(&io_request_lock, flags);
+ if (h->num_luns >= CISS_MAX_LUN) {
+ spin_unlock_irqrestore(&io_request_lock, flags);
+ return -EINVAL;
+ }
+ if (h->busy_configuring) {
+ spin_unlock_irqrestore(&io_request_lock, flags);
+ return -EBUSY;
+ }
+ h->busy_configuring = 1;
+ spin_unlock_irqrestore(&io_request_lock, flags);
+
+ ld_buff = kmalloc(sizeof(ReportLunData_struct), GFP_KERNEL);
+ if (ld_buff == NULL) {
+ printk(KERN_ERR "cciss: out of memory\n");
+ h->busy_configuring = 0;
+ return -ENOMEM;
+ }
+ memset(ld_buff, 0, sizeof(ReportLunData_struct));
+ size_buff = kmalloc(sizeof( ReadCapdata_struct), GFP_KERNEL);
+ if (size_buff == NULL) {
+ printk(KERN_ERR "cciss: out of memory\n");
+ kfree(ld_buff);
+ h->busy_configuring = 0;
+ return -ENOMEM;
+ }
+ inq_buff = kmalloc(sizeof( InquiryData_struct), GFP_KERNEL);
+ if (inq_buff == NULL) {
+ printk(KERN_ERR "cciss: out of memory\n");
+ kfree(ld_buff);
+ kfree(size_buff);
+ h->busy_configuring = 0;
+ return -ENOMEM;
+ }
+
+ return_code = sendcmd_withirq(CISS_REPORT_LOG, ctlr, ld_buff,
+ sizeof(ReportLunData_struct), 0, 0, 0 );
+
+ if (return_code == IO_OK) {
+ /* printk("LUN Data\n--------------------------\n"); */
+ listlength |= (0xff &
+ (unsigned int)(ld_buff->LUNListLength[0])) << 24;
+ 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]);
+ } else {
+ /* reading number of logical volumes failed */
+ printk(KERN_WARNING "cciss: report logical volume"
+ " command failed\n");
+ listlength = 0;
+ h->busy_configuring = 0;
+ return -1;
+ }
+ num_luns = listlength / 8; /* 8 bytes pre entry */
+ if (num_luns > CISS_MAX_LUN)
+ num_luns = CISS_MAX_LUN;
+
+#ifdef CCISS_DEBUG
+ printk(KERN_DEBUG "Length = %x %x %x %x = %d\n", ld_buff->LUNListLength[0],
+ ld_buff->LUNListLength[1], ld_buff->LUNListLength[2],
+ ld_buff->LUNListLength[3], num_luns);
+#endif
+ for(i=0; i< num_luns; i++) {
+ int j;
+ int lunID_found = 0;
+
+ lunid = (0xff & (unsigned int)(ld_buff->LUN[i][3])) << 24;
+ lunid |= (0xff & (unsigned int)(ld_buff->LUN[i][2])) << 16;
+ lunid |= (0xff & (unsigned int)(ld_buff->LUN[i][1])) << 8;
+ lunid |= 0xff & (unsigned int)(ld_buff->LUN[i][0]);
+
+ /* check to see if this is a new lun */
+ for(j=0; j <= h->highest_lun; j++) {
+#ifdef CCISS_DEBUG
+ printk("Checking %d %x against %x\n", j,h->drv[j].LunID,
+ lunid);
+#endif /* CCISS_DEBUG */
+ if (h->drv[j].LunID == lunid) {
+ lunID_found = 1;
+ break;
+ }
+
+ }
+ if (lunID_found == 1)
+ continue;
+ else { /* new lun found */
+
+#ifdef CCISS_DEBUG
+ printk("new lun found at %d\n", i);
+#endif /* CCISS_DEBUG */
+ if (req_lunid) /* we are looking for a specific lun */
+ {
+ if (lunid != req_lunid)
+ {
+#ifdef CCISS_DEBUG
+ printk("new lun %x is not %x\n",
+ lunid, req_lunid);
+#endif /* CCISS_DEBUG */
+ continue;
+ }
+ }
+ new_lun_index = i;
+ new_lun_found = 1;
+ break;
+ }
+ }
+ if (!new_lun_found) {
+ printk(KERN_DEBUG "cciss: New Logical Volume not found\n");
+ h->busy_configuring = 0;
+ return -1;
+ }
+ /* Now find the free index */
+ for(i=0; i <CISS_MAX_LUN; i++) {
+#ifdef CCISS_DEBUG
+ printk("Checking Index %d\n", i);
+#endif /* CCISS_DEBUG */
+ if (hba[ctlr]->drv[i].LunID == 0) {
+#ifdef CCISS_DEBUG
+ printk("free index found at %d\n", i);
+#endif /* CCISS_DEBUG */
+ free_index_found = 1;
+ free_index = i;
+ break;
+ }
+ }
+ if (!free_index_found) {
+ printk(KERN_WARNING "cciss: unable to find free slot for disk\n");
+ h->busy_configuring = 0;
+ return -1;
+ }
+
+ logvol = free_index;
+ hba[ctlr]->drv[logvol].LunID = lunid;
+ /* there could be gaps in lun numbers, track hightest */
+ if (hba[ctlr]->highest_lun < logvol)
+ hba[ctlr]->highest_lun = logvol;
+
+ memset(size_buff, 0, sizeof(ReadCapdata_struct));
+ return_code = sendcmd_withirq(CCISS_READ_CAPACITY, ctlr,
+ size_buff, sizeof(ReadCapdata_struct), 1,
+ logvol, 0 );
+ if (return_code == IO_OK) {
+ total_size = (0xff &
+ (unsigned int) size_buff->total_size[0]) << 24;
+ total_size |= (0xff &
+ (unsigned int) size_buff->total_size[1]) << 16;
+ total_size |= (0xff &
+ (unsigned int) size_buff->total_size[2]) << 8;
+ total_size |= (0xff &
+ (unsigned int) size_buff->total_size[3]);
+ total_size++; /* command returns highest block address */
+
+ block_size = (0xff &
+ (unsigned int) size_buff->block_size[0]) << 24;
+ block_size |= (0xff &
+ (unsigned int) size_buff->block_size[1]) << 16;
+ block_size |= (0xff &
+ (unsigned int) size_buff->block_size[2]) << 8;
+ block_size |= (0xff &
+ (unsigned int) size_buff->block_size[3]);
+ } else {
+ /* read capacity command failed */
+ printk(KERN_WARNING "cciss: read capacity failed\n");
+ total_size = 0;
+ block_size = BLOCK_SIZE;
+ }
+ printk(KERN_INFO " blocks= %d block_size= %d\n",
+ total_size, block_size);
+ /* Execute the command to read the disk geometry */
+ memset(inq_buff, 0, sizeof(InquiryData_struct));
+ return_code = sendcmd_withirq(CISS_INQUIRY, ctlr, inq_buff,
+ sizeof(InquiryData_struct), 1, logvol ,0xC1 );
+ if (return_code == IO_OK) {
+ if (inq_buff->data_byte[8] == 0xFF) {
+ printk(KERN_WARNING
+ "cciss: reading geometry failed, "
+ "volume does not support reading geometry\n");
+
+ hba[ctlr]->drv[logvol].block_size = block_size;
+ hba[ctlr]->drv[logvol].nr_blocks = total_size;
+ hba[ctlr]->drv[logvol].heads = 255;
+ hba[ctlr]->drv[logvol].sectors = 32; /* secs/trk */
+ hba[ctlr]->drv[logvol].cylinders = total_size / 255 /32;
+ hba[ctlr]->drv[logvol].raid_level = RAID_UNKNOWN;
+ } else {
+ hba[ctlr]->drv[logvol].block_size = block_size;
+ hba[ctlr]->drv[logvol].nr_blocks = total_size;
+ hba[ctlr]->drv[logvol].heads = inq_buff->data_byte[6];
+ hba[ctlr]->drv[logvol].sectors = inq_buff->data_byte[7];
+ hba[ctlr]->drv[logvol].cylinders =
+ (inq_buff->data_byte[4] & 0xff) << 8;
+ hba[ctlr]->drv[logvol].cylinders +=
+ inq_buff->data_byte[5];
+ hba[ctlr]->drv[logvol].raid_level =
+ inq_buff->data_byte[8];
+ }
+ } else {
+ /* Get geometry failed */
+ printk(KERN_WARNING "cciss: reading geometry failed, "
+ "continuing with default geometry\n");
+
+ hba[ctlr]->drv[logvol].block_size = block_size;
+ hba[ctlr]->drv[logvol].nr_blocks = total_size;
+ hba[ctlr]->drv[logvol].heads = 255;
+ hba[ctlr]->drv[logvol].sectors = 32; /* Sectors per track */
+ hba[ctlr]->drv[logvol].cylinders = total_size / 255 / 32;
+ }
+ if (hba[ctlr]->drv[logvol].raid_level > 5)
+ hba[ctlr]->drv[logvol].raid_level = RAID_UNKNOWN;
+ printk(KERN_INFO " heads= %d, sectors= %d, cylinders= %d RAID %s\n\n",
+ hba[ctlr]->drv[logvol].heads,
+ hba[ctlr]->drv[logvol].sectors,
+ hba[ctlr]->drv[logvol].cylinders,
+ raid_label[hba[ctlr]->drv[logvol].raid_level]);
+
+ /* special case for c?d0, which may be opened even when
+ it does not "exist". In that case, don't mess with usage count.
+ Also, /dev/c1d1 could be used to re-add c0d0 so we can't just
+ check whether logvol == 0, must check logvol != opened_vol */
+ if (logvol != opened_vol)
+ hba[ctlr]->drv[logvol].usage_count = 0;
+
+ max_p = gdev->max_p;
+ start = logvol<< gdev->minor_shift;
+ hba[ctlr]->hd[start].nr_sects = total_size;
+ hba[ctlr]->sizes[start] = total_size;
+
+ for(i=max_p-1; i>=0; i--) {
+ int minor = start+i;
+ invalidate_device(MKDEV(MAJOR_NR + ctlr, minor), 1);
+ gdev->part[minor].start_sect = 0;
+ gdev->part[minor].nr_sects = 0;
+
+ /* reset the blocksize so we can read the partition table */
+ blksize_size[MAJOR_NR+ctlr][minor] = block_size;
+ hba[ctlr]->hardsizes[minor] = block_size;
+ }
+
+ ++hba[ctlr]->num_luns;
+ gdev->nr_real = hba[ctlr]->highest_lun + 1;
+ /* setup partitions per disk */
+ grok_partitions(gdev, logvol, MAX_PART,
+ hba[ctlr]->drv[logvol].nr_blocks);
+ kfree(ld_buff);
+ kfree(size_buff);
+ kfree(inq_buff);
+ h->busy_configuring = 0;
+ return logvol;
+}
+
+static int cciss_rescan_disk(int ctlr, int logvol)
+{
+ struct gendisk *gdev = &(hba[ctlr]->gendisk);
+ int start, max_p, i;
+ ReadCapdata_struct *size_buff;
+ InquiryData_struct *inq_buff;
+ int return_code;
+ unsigned int block_size;
+ unsigned int total_size;
+
+ if (!capable(CAP_SYS_RAWIO))
+ return -EPERM;
+ if (hba[ctlr]->sizes[logvol << NWD_SHIFT] != 0) {
+ /* disk is possible on line, return just a warning */
+ return 1;
+ }
+ size_buff = kmalloc(sizeof( ReadCapdata_struct), GFP_KERNEL);
+ if (size_buff == NULL) {
+ printk(KERN_ERR "cciss: out of memory\n");
+ return -1;
+ }
+ inq_buff = kmalloc(sizeof( InquiryData_struct), GFP_KERNEL);
+ if (inq_buff == NULL) {
+ printk(KERN_ERR "cciss: out of memory\n");
+ kfree(size_buff);
+ return -1;
+ }
+ memset(size_buff, 0, sizeof(ReadCapdata_struct));
+ return_code = sendcmd_withirq(CCISS_READ_CAPACITY, ctlr, size_buff,
+ sizeof( ReadCapdata_struct), 1, logvol, 0 );
+ if (return_code == IO_OK) {
+ total_size = (0xff &
+ (unsigned int)(size_buff->total_size[0])) << 24;
+ total_size |= (0xff &
+ (unsigned int)(size_buff->total_size[1])) << 16;
+ total_size |= (0xff &
+ (unsigned int)(size_buff->total_size[2])) << 8;
+ total_size |= (0xff & (unsigned int)
+ (size_buff->total_size[3]));
+ total_size++; /* command returns highest block address */
+
+ block_size = (0xff &
+ (unsigned int)(size_buff->block_size[0])) << 24;
+ block_size |= (0xff &
+ (unsigned int)(size_buff->block_size[1])) << 16;
+ block_size |= (0xff &
+ (unsigned int)(size_buff->block_size[2])) << 8;
+ block_size |= (0xff &
+ (unsigned int)(size_buff->block_size[3]));
+ } else { /* read capacity command failed */
+ printk(KERN_WARNING "cciss: read capacity failed\n");
+ total_size = block_size = 0;
+ }
+ printk(KERN_INFO " blocks= %d block_size= %d\n",
+ total_size, block_size);
+ /* Execute the command to read the disk geometry */
+ memset(inq_buff, 0, sizeof(InquiryData_struct));
+ return_code = sendcmd_withirq(CISS_INQUIRY, ctlr, inq_buff,
+ sizeof(InquiryData_struct), 1, logvol ,0xC1 );
+ if (return_code == IO_OK) {
+ if (inq_buff->data_byte[8] == 0xFF) {
+ printk(KERN_WARNING "cciss: reading geometry failed, "
+ "volume does not support reading geometry\n");
+
+ hba[ctlr]->drv[logvol].nr_blocks = total_size;
+ hba[ctlr]->drv[logvol].heads = 255;
+ hba[ctlr]->drv[logvol].sectors = 32; /* Sectors/track */
+ hba[ctlr]->drv[logvol].cylinders = total_size / 255 /32;
+ } else {
+ hba[ctlr]->drv[logvol].nr_blocks = total_size;
+ hba[ctlr]->drv[logvol].heads = inq_buff->data_byte[6];
+ hba[ctlr]->drv[logvol].sectors = inq_buff->data_byte[7];
+ hba[ctlr]->drv[logvol].cylinders =
+ (inq_buff->data_byte[4] & 0xff) << 8;
+ hba[ctlr]->drv[logvol].cylinders +=
+ inq_buff->data_byte[5];
+ }
+ } else { /* Get geometry failed */
+ printk(KERN_WARNING "cciss: reading geometry failed, "
+ "continuing with default geometry\n");
+
+ hba[ctlr]->drv[logvol].nr_blocks = total_size;
+ hba[ctlr]->drv[logvol].heads = 255;
+ hba[ctlr]->drv[logvol].sectors = 32; /* Sectors / track */
+ hba[ctlr]->drv[logvol].cylinders = total_size / 255 /32;
+ }
+
+ printk(KERN_INFO " heads= %d, sectors= %d, cylinders= %d \n\n",
+ hba[ctlr]->drv[logvol].heads,
+ hba[ctlr]->drv[logvol].sectors,
+ hba[ctlr]->drv[logvol].cylinders);
+ max_p = gdev->max_p;
+ start = logvol<< gdev->minor_shift;
+ hba[ctlr]->hd[start].nr_sects = hba[ctlr]->sizes[start]= total_size;
+
+ for (i=max_p-1; i>=0; i--) {
+ int minor = start+i;
+ invalidate_device(MKDEV(MAJOR_NR + ctlr, minor), 1);
+ gdev->part[minor].start_sect = 0;
+ gdev->part[minor].nr_sects = 0;
+
+ /* reset the blocksize so we can read the partition table */
+ blksize_size[MAJOR_NR+ctlr][minor] = 1024;
+ hba[ctlr]->hardsizes[minor] = block_size;
+ }
+
+ /* setup partitions per disk */
+ grok_partitions(gdev, logvol, MAX_PART,
+ hba[ctlr]->drv[logvol].nr_blocks );
+
+ kfree(size_buff);
+ kfree(inq_buff);
+ return 0;
+}
/*
* Wait polling for a command to complete.
* The memory mapped FIFO is polled for the completion.
@@ -844,20 +1680,21 @@
*/
static unsigned long pollcomplete(int ctlr)
{
- unsigned long done;
- int i;
+ unsigned long done;
+ int i;
- /* Wait (up to 2 seconds) for a command to complete */
+ /* Wait (up to 20 seconds) for a command to complete */
- for (i = 200000; i > 0; i--) {
- done = hba[ctlr]->access.command_completed(hba[ctlr]);
- if (done == FIFO_EMPTY) {
- udelay(10); /* a short fixed delay */
- } else
- return (done);
- }
- /* Invalid address to tell caller we ran out of time */
- return 1;
+ for (i = 20 * HZ; i > 0; i--) {
+ done = hba[ctlr]->access.command_completed(hba[ctlr]);
+ if (done == FIFO_EMPTY) {
+ set_current_state(TASK_UNINTERRUPTIBLE);
+ schedule_timeout(1);
+ } else
+ return done;
+ }
+ /* Invalid address to tell caller we ran out of time */
+ return 1;
}
/*
* Send a command to the controller, and wait for it to complete.
@@ -880,28 +1717,26 @@
unsigned long complete;
ctlr_info_t *info_p= hba[ctlr];
u64bit buff_dma_handle;
+ int status = IO_OK;
c = cmd_alloc(info_p, 1);
- if (c == NULL)
- {
+ if (c == NULL) {
printk(KERN_WARNING "cciss: unable to get memory");
- return(IO_ERROR);
+ return IO_ERROR;
}
- // Fill in Command Header
- c->Header.ReplyQueue = 0; // unused in simple mode
- if( buff != NULL) // buffer to fill
- {
+ /* Fill in Command Header */
+ c->Header.ReplyQueue = 0; /* unused in simple mode */
+ if (buff != NULL) { /* buffer to fill */
c->Header.SGList = 1;
c->Header.SGTotal= 1;
- } else // no buffers to fill
- {
+ } else { /* no buffers to fill */
c->Header.SGList = 0;
c->Header.SGTotal= 0;
}
- c->Header.Tag.lower = c->busaddr; // use the kernel address the cmd block for tag
- // Fill in Request block
- switch(cmd)
- {
+ c->Header.Tag.lower = c->busaddr; /* use the kernel address */
+ /* the cmd block for tag */
+ /* Fill in Request block */
+ switch (cmd) {
case CISS_INQUIRY:
/* If the logical unit number is 0 then, this is going
to controller so It's a physical command
@@ -912,29 +1747,27 @@
otherwise, if use_unit_num == 2,
mode = 0(periph dev addr) target = scsi3addr
*/
- if(use_unit_num == 1)
- {
+ if (use_unit_num == 1) {
c->Header.LUN.LogDev.VolId=
hba[ctlr]->drv[log_unit].LunID;
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);
- c->Header.LUN.LogDev.Mode = 0; // phys dev addr
+ c->Header.LUN.LogDev.Mode = 0;
+ /* phys dev addr */
}
/* 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[2] = page_code;
}
c->Request.CDBLen = 6;
- 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.Direction = XFER_READ; // Read
- c->Request.Timeout = 0; // Don't time out
+ c->Request.Type.Direction = XFER_READ; /* Read */
+ c->Request.Timeout = 0; /* Don't time out */
c->Request.CDB[0] = CISS_INQUIRY;
c->Request.CDB[4] = size & 0xFF;
break;
@@ -945,12 +1778,12 @@
So we have nothing to write.
*/
c->Request.CDBLen = 12;
- 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.Direction = XFER_READ; // Read
- c->Request.Timeout = 0; // Don't time out
+ c->Request.Type.Direction = XFER_READ; /* Read */
+ c->Request.Timeout = 0; /* Don't time out */
c->Request.CDB[0] = cmd;
- c->Request.CDB[6] = (size >> 24) & 0xFF; //MSB
+ c->Request.CDB[6] = (size >> 24) & 0xFF; /* MSB */
c->Request.CDB[7] = (size >> 16) & 0xFF;
c->Request.CDB[8] = (size >> 8) & 0xFF;
c->Request.CDB[9] = size & 0xFF;
@@ -961,38 +1794,38 @@
hba[ctlr]->drv[log_unit].LunID;
c->Header.LUN.LogDev.Mode = 1;
c->Request.CDBLen = 10;
- 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.Direction = XFER_READ; // Read
- c->Request.Timeout = 0; // Don't time out
+ c->Request.Type.Direction = XFER_READ; /* Read */
+ c->Request.Timeout = 0; /* Don't time out */
c->Request.CDB[0] = CCISS_READ_CAPACITY;
break;
case CCISS_CACHE_FLUSH:
c->Request.CDBLen = 12;
- 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.Direction = XFER_WRITE; // No data
- c->Request.Timeout = 0; // Don't time out
- c->Request.CDB[0] = BMIC_WRITE; // BMIC Passthru
+ c->Request.Type.Direction = XFER_WRITE; /* No data */
+ c->Request.Timeout = 0; /* Don't time out */
+ c->Request.CDB[0] = BMIC_WRITE; /* BMIC Passthru */
c->Request.CDB[6] = BMIC_CACHE_FLUSH;
break;
default:
printk(KERN_WARNING
- "cciss: Unknown Command 0x%c sent attempted\n",
+ "cciss: Unknown Command 0x%x sent attempted\n",
cmd);
cmd_free(info_p, c, 1);
- return(IO_ERROR);
+ return IO_ERROR;
};
- // Fill in the scatter gather information
- if (size > 0 )
- {
+ /* Fill in the scatter gather information */
+ if (size > 0) {
buff_dma_handle.val = (__u64) pci_map_single( info_p->pdev,
buff, size, PCI_DMA_BIDIRECTIONAL);
c->SG[0].Addr.lower = buff_dma_handle.val32.lower;
c->SG[0].Addr.upper = buff_dma_handle.val32.upper;
c->SG[0].Len = size;
- c->SG[0].Ext = 0; // we are not chaining
+ c->SG[0].Ext = 0; /* we are not chaining */
}
+resend_cmd1:
/*
* Disable interrupt
*/
@@ -1003,11 +1836,9 @@
/* Make sure there is room in the command FIFO */
/* Actually it should be completely empty at this time. */
- for (i = 200000; i > 0; i--)
- {
+ for (i = 200000; i > 0; i--) {
/* if fifo isn't full go */
- if (!(info_p->access.fifo_full(info_p)))
- {
+ if (!(info_p->access.fifo_full(info_p))) {
break;
}
@@ -1025,13 +1856,9 @@
printk(KERN_DEBUG "cciss: command completed\n");
#endif /* CCISS_DEBUG */
- /* unlock the data buffer from DMA */
- pci_unmap_single(info_p->pdev, (dma_addr_t) buff_dma_handle.val,
- size, PCI_DMA_BIDIRECTIONAL);
if (complete != 1) {
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
ignore it
*/
@@ -1042,41 +1869,64 @@
CMD_DATA_OVERRUN) ||
(c->err_info->CommandStatus ==
CMD_DATA_UNDERRUN)
- ))
- {
+ )) {
complete = c->busaddr;
- } else
- {
- printk(KERN_WARNING "ciss ciss%d: sendcmd"
+ } else {
+ if (c->err_info->CommandStatus ==
+ CMD_UNSOLICITED_ABORT) {
+ printk(KERN_WARNING "cciss: "
+ "cmd %p aborted do "
+ "to an unsolicited abort \n", c);
+ if (c->retry_count < MAX_CMD_RETRIES) {
+ printk(KERN_WARNING
+ "retrying cmd\n");
+ c->retry_count++;
+ /* erase the old error */
+ /* information */
+ memset(c->err_info, 0,
+ sizeof(ErrorInfo_struct));
+ goto resend_cmd1;
+ } else {
+ printk(KERN_WARNING
+ "retried to many times\n");
+ status = IO_ERROR;
+ goto cleanup1;
+ }
+ }
+ printk(KERN_WARNING "cciss cciss%d: sendcmd"
" Error %x \n", ctlr,
c->err_info->CommandStatus);
- printk(KERN_WARNING "ciss ciss%d: sendcmd"
+ printk(KERN_WARNING "cciss cciss%d: sendcmd"
" offensive info\n"
" size %x\n num %x value %x\n", ctlr,
c->err_info->MoreErrInfo.Invalid_Cmd.offense_size,
c->err_info->MoreErrInfo.Invalid_Cmd.offense_num,
c->err_info->MoreErrInfo.Invalid_Cmd.offense_value);
- cmd_free(info_p,c, 1);
- return(IO_ERROR);
+ status = IO_ERROR;
+ goto cleanup1;
}
}
if (complete != c->busaddr) {
printk( KERN_WARNING "cciss cciss%d: SendCmd "
"Invalid command list address returned! (%lx)\n",
ctlr, complete);
- cmd_free(info_p, c, 1);
- return (IO_ERROR);
+ status = IO_ERROR;
+ goto cleanup1;
}
} else {
printk( KERN_WARNING
"cciss cciss%d: SendCmd Timeout out, "
"No command list address returned!\n",
ctlr);
- cmd_free(info_p, c, 1);
- return (IO_ERROR);
+ status = IO_ERROR;
}
+
+cleanup1:
+ /* unlock the data buffer from DMA */
+ pci_unmap_single(info_p->pdev, (dma_addr_t) buff_dma_handle.val,
+ size, PCI_DMA_BIDIRECTIONAL);
cmd_free(info_p, c, 1);
- return (IO_OK);
+ return status;
}
/*
* Map (physical) PCI mem into (virtual) kernel space
@@ -1127,11 +1977,9 @@
{
CommandList_struct *c;
- while(( c = h->reqQ) != NULL )
- {
+ while(( c = h->reqQ) != NULL ) {
/* 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");
return;
}
@@ -1151,8 +1999,7 @@
{
struct buffer_head *xbh;
- while(bh)
- {
+ while(bh) {
xbh = bh->b_reqnext;
bh->b_reqnext = NULL;
blk_finished_io(bh->b_size >> 9);
@@ -1160,39 +2007,44 @@
bh = xbh;
}
}
+/* This code assumes io_request_lock is already held */
+/* Zeros out the error record and then resends the command back */
+/* to the controller */
+static inline void resend_cciss_cmd( ctlr_info_t *h, CommandList_struct *c)
+{
+ /* erase the old error information */
+ memset(c->err_info, 0, sizeof(ErrorInfo_struct));
+
+ /* add it to software queue and then send it to the controller */
+ addQ(&(h->reqQ),c);
+ h->Qdepth++;
+ if (h->Qdepth > h->maxQsinceinit)
+ h->maxQsinceinit = h->Qdepth;
+
+ start_io(h);
+}
/* checks the status of the job and calls complete buffers to mark all
* buffers for the completed job.
*/
-static inline void complete_command( CommandList_struct *cmd, int timeout)
+static inline void complete_command( ctlr_info_t *h, CommandList_struct *cmd,
+ int timeout)
{
int status = 1;
+ int retry_cmd = 0;
int i, ddir;
u64bit temp64;
if (timeout)
status = 0;
- /* unmap the DMA mapping for all the scatter gather elements */
- if (cmd->Request.Type.Direction == XFER_READ)
- ddir = PCI_DMA_FROMDEVICE;
- else
- ddir = PCI_DMA_TODEVICE;
- for(i=0; i<cmd->Header.SGList; i++)
- {
- temp64.val32.lower = cmd->SG[i].Addr.lower;
- temp64.val32.upper = cmd->SG[i].Addr.upper;
- pci_unmap_page(hba[cmd->ctlr]->pdev,
- temp64.val, cmd->SG[i].Len, ddir);
- }
- if(cmd->err_info->CommandStatus != 0)
- { /* an error has occurred */
- switch(cmd->err_info->CommandStatus)
- {
+ if (cmd->err_info->CommandStatus != 0) {
+ /* an error has occurred */
+ switch (cmd->err_info->CommandStatus) {
unsigned char sense_key;
case CMD_TARGET_STATUS:
status = 0;
- if( cmd->err_info->ScsiStatus == 0x02) {
+ if (cmd->err_info->ScsiStatus == 0x02) {
printk(KERN_WARNING "cciss: cmd %p "
"has CHECK CONDITION,"
" sense key = 0x%x\n", cmd,
@@ -1200,10 +2052,9 @@
/* check the sense key */
sense_key = 0xf &
cmd->err_info->SenseInfo[2];
- /* no status or recovered error */
- if ((sense_key == 0x0) ||
- (sense_key == 0x1))
- status = 1;
+ /* recovered error */
+ if ( sense_key == 0x1)
+ status = 1;
} else {
printk(KERN_WARNING "cciss: cmd %p "
"has SCSI Status 0x%x\n",
@@ -1251,8 +2102,18 @@
status=0;
break;
case CMD_UNSOLICITED_ABORT:
- printk(KERN_WARNING "cciss: cmd %p aborted "
- "do to an unsolicited abort\n", cmd);
+ printk(KERN_WARNING "cciss: cmd %p aborted do "
+ "to an unsolicited abort \n",
+ cmd);
+ if (cmd->retry_count < MAX_CMD_RETRIES) {
+ retry_cmd=1;
+ printk(KERN_WARNING
+ "retrying cmd\n");
+ cmd->retry_count++;
+ } else {
+ printk(KERN_WARNING
+ "retried to many times\n");
+ }
status=0;
break;
case CMD_TIMEOUT:
@@ -1267,12 +2128,29 @@
status=0;
}
}
+ /* We need to return this command */
+ if (retry_cmd) {
+ resend_cciss_cmd(h,cmd);
+ return;
+ }
+ /* command did not need to be retried */
+ /* unmap the DMA mapping for all the scatter gather elements */
+ if (cmd->Request.Type.Direction == XFER_READ)
+ ddir = PCI_DMA_FROMDEVICE;
+ else
+ ddir = PCI_DMA_TODEVICE;
+ for(i=0; i<cmd->Header.SGList; i++) {
+ temp64.val32.lower = cmd->SG[i].Addr.lower;
+ temp64.val32.upper = cmd->SG[i].Addr.upper;
+ pci_unmap_page(hba[cmd->ctlr]->pdev,
+ temp64.val, cmd->SG[i].Len, ddir);
+ }
complete_buffers(cmd->rq->bh, status);
-
#ifdef CCISS_DEBUG
printk("Done with %p\n", cmd->rq);
#endif /* CCISS_DEBUG */
end_that_request_last(cmd->rq);
+ cmd_free(h,cmd,1);
}
@@ -1289,7 +2167,7 @@
static int cpq_back_merge_fn(request_queue_t *q, struct request *rq,
struct buffer_head *bh, int max_segments)
{
- if (blk_seg_merge_ok(rq->bhtail, bh))
+ if (blk_seg_merge_ok(rq->bhtail, bh))
return 1;
return cpq_new_segment(q, rq, max_segments);
}
@@ -1347,8 +2225,7 @@
if (creq->nr_segments > MAXSGENTRIES)
BUG();
- if (h->ctlr != MAJOR(creq->rq_dev)-MAJOR_NR )
- {
+ if (h->ctlr != MAJOR(creq->rq_dev)-MAJOR_NR ) {
printk(KERN_WARNING "doreq cmd for %d, %x at %p\n",
h->ctlr, creq->rq_dev, creq);
blkdev_dequeue_request(creq);
@@ -1370,34 +2247,33 @@
/* fill in the request */
log_unit = MINOR(creq->rq_dev) >> NWD_SHIFT;
- c->Header.ReplyQueue = 0; // unused in simple mode
- c->Header.Tag.lower = c->busaddr; // use the physical address the cmd block for tag
+ c->Header.ReplyQueue = 0; /* unused in simple mode */
+ c->Header.Tag.lower = c->busaddr; /* use the physical address */
+ /* the cmd block for tag */
c->Header.LUN.LogDev.VolId= hba[h->ctlr]->drv[log_unit].LunID;
c->Header.LUN.LogDev.Mode = 1;
- c->Request.CDBLen = 10; // 12 byte commands not in FW yet;
- c->Request.Type.Type = TYPE_CMD; // It is a command.
+ c->Request.CDBLen = 10; /* 12 byte commands not in FW yet. */
+ c->Request.Type.Type = TYPE_CMD; /* It is a command. */
c->Request.Type.Attribute = ATTR_SIMPLE;
c->Request.Type.Direction =
(creq->cmd == 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] = (creq->cmd == READ) ? CCISS_READ : CCISS_WRITE;
start_blk = hba[h->ctlr]->hd[MINOR(creq->rq_dev)].start_sect + creq->sector;
#ifdef CCISS_DEBUG
if (bh == NULL)
panic("cciss: bh== NULL?");
- printk(KERN_DEBUG "ciss: sector =%d nr_sectors=%d\n",(int) creq->sector,
+ printk(KERN_DEBUG "cciss: sector =%d nr_sectors=%d\n",(int) creq->sector,
(int) creq->nr_sectors);
#endif /* CCISS_DEBUG */
seg = 0;
lastdataend = ~0ULL;
- while(bh)
- {
+ while(bh) {
if (bh_phys(bh) == lastdataend)
- { // tack it on to the last segment
+ { /* tack it on to the last segment */
tmp_sg[seg-1].length +=bh->b_size;
lastdataend += bh->b_size;
- } else
- {
+ } else {
if (seg == MAXSGENTRIES)
BUG();
tmp_sg[seg].page = bh->b_page;
@@ -1420,10 +2296,10 @@
tmp_sg[i].offset, tmp_sg[i].length, ddir);
c->SG[i].Addr.lower = temp64.val32.lower;
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 */
- if( seg > h->maxSG)
+ if (seg > h->maxSG)
h->maxSG = seg;
#ifdef CCISS_DEBUG
@@ -1432,11 +2308,11 @@
c->Header.SGList = c->Header.SGTotal = seg;
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[4]= (start_blk >> 8) & 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[8]= creq->nr_sectors & 0xff;
c->Request.CDB[9] = c->Request.CDB[11] = c->Request.CDB[12] = 0;
@@ -1445,7 +2321,7 @@
addQ(&(h->reqQ),c);
h->Qdepth++;
- if(h->Qdepth > h->maxQsinceinit)
+ if (h->Qdepth > h->maxQsinceinit)
h->maxQsinceinit = h->Qdepth;
goto next;
@@ -1463,7 +2339,7 @@
/* Is this interrupt for us? */
- if ( h->access.intr_pending(h) == 0)
+ if (h->access.intr_pending(h) == 0)
return;
/*
@@ -1471,14 +2347,11 @@
* we had better do something about it.
*/
spin_lock_irqsave(&io_request_lock, flags);
- while( h->access.intr_pending(h))
- {
- while((a = h->access.command_completed(h)) != FIFO_EMPTY)
- {
+ while( h->access.intr_pending(h)) {
+ while((a = h->access.command_completed(h)) != FIFO_EMPTY) {
a1 = a;
a &= ~3;
- if ((c = h->cmpQ) == NULL)
- {
+ if ((c = h->cmpQ) == NULL) {
printk(KERN_WARNING "cciss: Completion of %08lx ignored\n", (unsigned long)a1);
continue;
}
@@ -1494,8 +2367,7 @@
if (c->busaddr == a) {
removeQ(&h->cmpQ, c);
if (c->cmd_type == CMD_RWREQ) {
- complete_command(c, 0);
- cmd_free(h, c, 1);
+ complete_command(h, c, 0);
} else if (c->cmd_type == CMD_IOCTL_PEND) {
complete(c->waiting);
}
@@ -1557,7 +2429,7 @@
static void release_io_mem(ctlr_info_t *c)
{
/* if IO mem was not protected do nothing */
- if( c->io_mem_addr == 0)
+ if (c->io_mem_addr == 0)
return;
release_region(c->io_mem_addr, c->io_mem_length);
c->io_mem_addr = 0;
@@ -1582,15 +2454,13 @@
for(i=0; i<6; i++)
addr[i] = pdev->resource[i].start;
- if (pci_enable_device(pdev))
- {
+ if (pci_enable_device(pdev)) {
printk(KERN_ERR "cciss: Unable to Enable PCI device\n");
- return( -1);
+ return -1;
}
- if (pci_set_dma_mask(pdev, CCISS_DMA_MASK ) != 0)
- {
+ if (pci_set_dma_mask(pdev, CCISS_DMA_MASK ) != 0) {
printk(KERN_ERR "cciss: Unable to set DMA mask\n");
- return(-1);
+ return -1;
}
(void) pci_read_config_word(pdev, PCI_COMMAND,&command);
@@ -1606,7 +2476,7 @@
/* check to see if controller has been disabled */
if (!(command & 0x02)) {
printk(KERN_WARNING "cciss: controller appears to be disabled\n");
- return(-1);
+ return -1;
}
/* search for our IO range so we can protect it */
for (i=0; i<6; i++) {
@@ -1700,8 +2570,7 @@
if ( (readb(&c->cfgtable->Signature[0]) != 'C') ||
(readb(&c->cfgtable->Signature[1]) != 'I') ||
(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");
return -1;
}
@@ -1714,8 +2583,7 @@
&(c->cfgtable->HostWrite.TransportRequest));
writel( CFGTBL_ChangeReq, c->vaddr + SA5_DOORBELL);
- for(i=0;i<MAX_CONFIG_WAIT;i++)
- {
+ for(i=0;i<MAX_CONFIG_WAIT;i++) {
if (!(readl(c->vaddr + SA5_DOORBELL) & CFGTBL_ChangeReq))
break;
/* delay and try again */
@@ -1729,8 +2597,7 @@
print_cfg_table(c->cfgtable);
#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"
" simple mode\n");
return -1;
@@ -1755,22 +2622,19 @@
int total_size;
ld_buff = kmalloc(sizeof(ReportLunData_struct), GFP_KERNEL);
- if (ld_buff == NULL)
- {
+ if (ld_buff == NULL) {
printk(KERN_ERR "cciss: out of memory\n");
return;
}
memset(ld_buff, 0, sizeof(ReportLunData_struct));
size_buff = kmalloc(sizeof( ReadCapdata_struct), GFP_KERNEL);
- if (size_buff == NULL)
- {
+ if (size_buff == NULL) {
printk(KERN_ERR "cciss: out of memory\n");
kfree(ld_buff);
return;
}
inq_buff = kmalloc(sizeof( InquiryData_struct), GFP_KERNEL);
- if (inq_buff == NULL)
- {
+ if (inq_buff == NULL) {
printk(KERN_ERR "cciss: out of memory\n");
kfree(ld_buff);
kfree(size_buff);
@@ -1779,14 +2643,12 @@
/* Get the firmware version */
return_code = sendcmd(CISS_INQUIRY, cntl_num, inq_buff,
sizeof(InquiryData_struct), 0, 0 ,0, NULL);
- if (return_code == IO_OK)
- {
+ if (return_code == IO_OK) {
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[2] = inq_buff->data_byte[34];
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"
" version of controller\n");
}
@@ -1794,8 +2656,7 @@
return_code = sendcmd(CISS_REPORT_LOG, cntl_num, ld_buff,
sizeof(ReportLunData_struct), 0, 0, 0, NULL);
- if( return_code == IO_OK)
- {
+ if (return_code == IO_OK) {
#ifdef CCISS_DEBUG
printk("LUN Data\n--------------------------\n");
#endif /* CCISS_DEBUG */
@@ -1804,16 +2665,14 @@
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]);
- } else /* reading number of logical volumes failed */
- {
+ } else { /* reading number of logical volumes failed */
printk(KERN_WARNING "cciss: report logical volume"
" command failed\n");
listlength = 0;
}
- hba[cntl_num]->num_luns = listlength / 8; // 8 bytes pre entry
- if (hba[cntl_num]->num_luns > CISS_MAX_LUN)
- {
- printk(KERN_ERR "ciss: only %d number of logical volumes supported\n",
+ hba[cntl_num]->num_luns = listlength / 8; /* 8 bytes pre entry */
+ if (hba[cntl_num]->num_luns > CISS_MAX_LUN) {
+ printk(KERN_ERR "cciss: only %d number of logical volumes supported\n",
CISS_MAX_LUN);
hba[cntl_num]->num_luns = CISS_MAX_LUN;
}
@@ -1822,8 +2681,9 @@
ld_buff->LUNListLength[1], ld_buff->LUNListLength[2],
ld_buff->LUNListLength[3], hba[cntl_num]->num_luns);
#endif /* CCISS_DEBUG */
- for(i=0; i< hba[cntl_num]->num_luns ; i++)
- {
+
+ hba[cntl_num]->highest_lun = hba[cntl_num]->num_luns-1;
+ for(i=0; i< hba[cntl_num]->num_luns; i++) {
lunid = (0xff & (unsigned int)(ld_buff->LUN[i][3])) << 24;
lunid |= (0xff & (unsigned int)(ld_buff->LUN[i][2])) << 16;
lunid |= (0xff & (unsigned int)(ld_buff->LUN[i][1])) << 8;
@@ -1839,8 +2699,7 @@
memset(size_buff, 0, sizeof(ReadCapdata_struct));
return_code = sendcmd(CCISS_READ_CAPACITY, cntl_num, size_buff,
sizeof( ReadCapdata_struct), 1, i, 0, NULL);
- if (return_code == IO_OK)
- {
+ if (return_code == IO_OK) {
total_size = (0xff &
(unsigned int)(size_buff->total_size[0])) << 24;
total_size |= (0xff &
@@ -1849,7 +2708,8 @@
(unsigned int)(size_buff->total_size[2])) << 8;
total_size |= (0xff & (unsigned int)
(size_buff->total_size[3]));
- total_size++; // command returns highest block address
+ total_size++; /* command returns highest */
+ /* block address */
block_size = (0xff &
(unsigned int)(size_buff->block_size[0])) << 24;
@@ -1859,8 +2719,7 @@
(unsigned int)(size_buff->block_size[2])) << 8;
block_size |= (0xff &
(unsigned int)(size_buff->block_size[3]));
- } else /* read capacity command failed */
- {
+ } else { /* read capacity command failed */
printk(KERN_WARNING "cciss: read capacity failed\n");
total_size = block_size = 0;
}
@@ -1871,18 +2730,18 @@
memset(inq_buff, 0, sizeof(InquiryData_struct));
return_code = sendcmd(CISS_INQUIRY, cntl_num, inq_buff,
sizeof(InquiryData_struct), 1, i, 0xC1, NULL );
- if (return_code == IO_OK)
- {
- if(inq_buff->data_byte[8] == 0xFF)
- {
+ if (return_code == IO_OK) {
+ if (inq_buff->data_byte[8] == 0xFF) {
printk(KERN_WARNING "cciss: reading geometry failed, volume does not support reading geometry\n");
hba[cntl_num]->drv[i].block_size = block_size;
hba[cntl_num]->drv[i].nr_blocks = total_size;
hba[cntl_num]->drv[i].heads = 255;
- hba[cntl_num]->drv[i].sectors = 32; // Sectors per track
- hba[cntl_num]->drv[i].cylinders = total_size / 255 / 32; } else
- {
+ hba[cntl_num]->drv[i].sectors = 32; /* Sectors */
+ /* per track */
+ hba[cntl_num]->drv[i].cylinders = total_size
+ / 255 / 32;
+ } else {
hba[cntl_num]->drv[i].block_size = block_size;
hba[cntl_num]->drv[i].nr_blocks = total_size;
@@ -1894,23 +2753,27 @@
(inq_buff->data_byte[4] & 0xff) << 8;
hba[cntl_num]->drv[i].cylinders +=
inq_buff->data_byte[5];
+ hba[cntl_num]->drv[i].raid_level =
+ inq_buff->data_byte[8];
}
}
- else /* Get geometry failed */
- {
+ else { /* Get geometry failed */
printk(KERN_WARNING "cciss: reading geometry failed, continuing with default geometry\n");
hba[cntl_num]->drv[i].block_size = block_size;
hba[cntl_num]->drv[i].nr_blocks = total_size;
hba[cntl_num]->drv[i].heads = 255;
- hba[cntl_num]->drv[i].sectors = 32; // Sectors per track
+ hba[cntl_num]->drv[i].sectors = 32; /* Sectors */
+ /* per track */
hba[cntl_num]->drv[i].cylinders = total_size / 255 / 32;
}
- printk(KERN_INFO " heads= %d, sectors= %d, cylinders= %d\n\n",
+ if (hba[cntl_num]->drv[i].raid_level > 5)
+ hba[cntl_num]->drv[i].raid_level = RAID_UNKNOWN;
+ printk(KERN_INFO " heads= %d, sectors= %d, cylinders= %d RAID %s\n\n",
hba[cntl_num]->drv[i].heads,
hba[cntl_num]->drv[i].sectors,
- hba[cntl_num]->drv[i].cylinders);
-
+ hba[cntl_num]->drv[i].cylinders,
+ raid_label[hba[cntl_num]->drv[i].raid_level]);
}
kfree(ld_buff);
kfree(size_buff);
@@ -1922,22 +2785,19 @@
static int alloc_cciss_hba(void)
{
int i;
- for(i=0; i< MAX_CTLR; i++)
- {
- if (hba[i] == NULL)
- {
+ for(i=0; i< MAX_CTLR; i++) {
+ if (hba[i] == NULL) {
hba[i] = kmalloc(sizeof(ctlr_info_t), GFP_KERNEL);
- if(hba[i]==NULL)
- {
+ if (hba[i]==NULL) {
printk(KERN_ERR "cciss: out of memory.\n");
- return (-1);
+ return -1;
}
- return (i);
+ return i;
}
}
printk(KERN_WARNING "cciss: This driver supports a maximum"
" of 8 controllers.\n");
- return(-1);
+ return -1;
}
static void free_hba(int i)
@@ -1963,13 +2823,12 @@
pdev->device, pdev->bus->number, PCI_SLOT(pdev->devfn),
PCI_FUNC(pdev->devfn));
i = alloc_cciss_hba();
- if( i < 0 )
- return (-1);
+ if (i < 0 )
+ return -1;
memset(hba[i], 0, sizeof(ctlr_info_t));
- if (cciss_pci_init(hba[i], pdev) != 0)
- {
+ if (cciss_pci_init(hba[i], pdev) != 0) {
free_hba(i);
- return (-1);
+ return -1;
}
sprintf(hba[i]->devname, "cciss%d", i);
hba[i]->ctlr = i;
@@ -1986,26 +2845,25 @@
return -ENODEV;
}
- if( register_blkdev(MAJOR_NR+i, hba[i]->devname, &cciss_fops))
- {
+ if (register_blkdev(MAJOR_NR+i, hba[i]->devname, &cciss_fops)) {
printk(KERN_ERR "cciss: Unable to get major number "
"%d for %s\n", MAJOR_NR+i, hba[i]->devname);
release_io_mem(hba[i]);
free_hba(i);
- return(-1);
+ return -1;
}
/* make sure the board interrupts are off */
hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_OFF);
- if( request_irq(hba[i]->intr, do_cciss_intr,
+ if (request_irq(hba[i]->intr, do_cciss_intr,
SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM,
- hba[i]->devname, hba[i]))
- {
- printk(KERN_ERR "ciss: Unable to get irq %d for %s\n",
+ hba[i]->devname, hba[i])) {
+
+ printk(KERN_ERR "cciss: Unable to get irq %d for %s\n",
hba[i]->intr, hba[i]->devname);
unregister_blkdev( MAJOR_NR+i, hba[i]->devname);
release_io_mem(hba[i]);
free_hba(i);
- return(-1);
+ return -1;
}
hba[i]->cmd_pool_bits = (__u32*)kmalloc(
((NR_CMDS+31)/32)*sizeof(__u32), GFP_KERNEL);
@@ -2015,17 +2873,17 @@
hba[i]->errinfo_pool = (ErrorInfo_struct *)pci_alloc_consistent(
hba[i]->pdev, NR_CMDS * sizeof( ErrorInfo_struct),
&(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]->errinfo_pool == NULL))
- {
- if(hba[i]->cmd_pool_bits)
+ || (hba[i]->errinfo_pool == NULL)) {
+
+ if (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,
NR_CMDS * sizeof(CommandList_struct),
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,
NR_CMDS * sizeof( ErrorInfo_struct),
hba[i]->errinfo_pool,
@@ -2035,7 +2893,7 @@
release_io_mem(hba[i]);
free_hba(i);
printk( KERN_ERR "cciss: out of memory");
- return(-1);
+ return -1;
}
/* Initialize the pdev driver private data.
@@ -2082,7 +2940,8 @@
hba[i]->gendisk.max_p = MAX_PART;
hba[i]->gendisk.part = hba[i]->hd;
hba[i]->gendisk.sizes = hba[i]->sizes;
- hba[i]->gendisk.nr_real = hba[i]->num_luns;
+ hba[i]->gendisk.nr_real = hba[i]->highest_lun+1;
+ hba[i]->gendisk.fops = &cciss_fops;
/* Get on the disk list */
add_gendisk(&(hba[i]->gendisk));
@@ -2096,7 +2955,7 @@
cciss_register_scsi(i, 1); /* hook ourself into SCSI subsystem */
- return(1);
+ return 1;
}
static void __devexit cciss_remove_one (struct pci_dev *pdev)
@@ -2106,15 +2965,13 @@
char flush_buf[4];
int return_code;
- if (pci_get_drvdata(pdev) == NULL)
- {
+ if (pci_get_drvdata(pdev) == NULL) {
printk( KERN_ERR "cciss: Unable to remove device \n");
return;
}
tmp_ptr = pci_get_drvdata(pdev);
i = tmp_ptr->ctlr;
- if (hba[i] == NULL)
- {
+ if (hba[i] == NULL) {
printk(KERN_ERR "cciss: device appears to "
"already be removed \n");
return;
@@ -2175,7 +3032,7 @@
static int __init init_cciss_module(void)
{
- return ( cciss_init());
+ return cciss_init();
}
static void __exit cleanup_cciss_module(void)
@@ -2184,10 +3041,8 @@
pci_unregister_driver(&cciss_pci_driver);
/* double check that all controller entrys have been removed */
- for (i=0; i< MAX_CTLR; i++)
- {
- if (hba[i] != NULL)
- {
+ for (i=0; i< MAX_CTLR; i++) {
+ if (hba[i] != NULL) {
printk(KERN_WARNING "cciss: had to remove"
" controller %d\n", i);
cciss_remove_one(hba[i]->pdev);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)