Commit d0cdedf2 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] cciss: improve /proc presentation

From: mikem@beardog.cca.cpqcorp.net

This patch changes the way we fill out the /proc files we create.  It now has
human readable volume sizes, RAID levels, etc.  Also removes some fields that
were orginally for debug purposes.  This is in the 2.4 tree.
parent cdad8570
...@@ -156,6 +156,11 @@ static struct block_device_operations cciss_fops = { ...@@ -156,6 +156,11 @@ static struct block_device_operations cciss_fops = {
/* /*
* Report information about this controller. * Report information about this controller.
*/ */
#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"};
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
static struct proc_dir_entry *proc_cciss; static struct proc_dir_entry *proc_cciss;
...@@ -168,49 +173,80 @@ static int cciss_proc_get_info(char *buffer, char **start, off_t offset, ...@@ -168,49 +173,80 @@ static int cciss_proc_get_info(char *buffer, char **start, off_t offset,
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 int vol_sz, vol_sz_frac;
ctlr = h->ctlr; ctlr = h->ctlr;
size = sprintf(buffer, "%s: Compaq %s Controller\n"
" Board ID: 0x%08lx\n" /* prevent displaying bogus info during configuration
" Firmware Version: %c%c%c%c\n" * or deconfiguration of a logical volume
" Memory Address: 0x%08lx\n" */
" IRQ: %d\n" spin_lock_irqsave(CCISS_LOCK(ctlr), flags);
" Logical drives: %d\n" if (h->busy_configuring) {
" Highest Logical Volume ID: %d\n" spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);
" Current Q depth: %d\n" return -EBUSY;
" Max Q depth since init: %d\n" }
" Max # commands on controller since init: %d\n" h->busy_configuring = 1;
" Max SG entries since init: %d\n\n", spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);
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->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], h->firm_ver[3],
(unsigned long)h->vaddr,
(unsigned int)h->intr, (unsigned int)h->intr,
h->num_luns, h->num_luns,
h->highest_lun, h->Qdepth, h->commands_outstanding,
h->Qdepth, 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++) {
sector_t tmp;
drv = &h->drv[i]; drv = &h->drv[i];
if (drv->block_size == 0) if (drv->block_size == 0)
continue; continue;
size = sprintf(buffer+len, "cciss/c%dd%d: blksz=%d nr_blocks=%llu\n", vol_sz = drv->nr_blocks;
ctlr, i, drv->block_size, (unsigned long long)drv->nr_blocks); sector_div(vol_sz, ENG_GIG_FACTOR);
pos += size; len += size;
}
size = sprintf(buffer+len, "nr_allocs = %d\nnr_frees = %d\n", /*
h->nr_allocs, h->nr_frees); * Awkwardly do this:
* vol_sz_frac =
* (drv->nr_blocks%ENG_GIG_FACTOR)*100/ENG_GIG_FACTOR;
*/
tmp = drv->nr_blocks;
vol_sz_frac = sector_div(tmp, ENG_GIG_FACTOR);
/* Now, vol_sz_frac = (drv->nr_blocks%ENG_GIG_FACTOR) */
vol_sz_frac *= 100;
sector_div(vol_sz_frac, 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; 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;
return len; return len;
} }
...@@ -2158,10 +2194,10 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev) ...@@ -2158,10 +2194,10 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
for(i=0; i<DEVICE_COUNT_RESOURCE; i++) for(i=0; i<DEVICE_COUNT_RESOURCE; i++)
{ {
/* is this an IO range */ /* is this an IO range */
if( pdev_resource_flags(pdev, i) & 0x01 ) { if( pci_resource_flags(pdev, i) & 0x01 ) {
c->io_mem_addr = pdev_resource_start(pdev, i); c->io_mem_addr = pci_resource_start(pdev, i);
c->io_mem_length = pdev_resource_end(pdev, i) - c->io_mem_length = pci_resource_end(pdev, i) -
pdev_resource_start(pdev, i) +1; pci_resource_start(pdev, i) +1;
#ifdef CCISS_DEBUG #ifdef CCISS_DEBUG
printk("IO value found base_addr[%d] %lx %lx\n", i, printk("IO value found base_addr[%d] %lx %lx\n", i,
c->io_mem_addr, c->io_mem_length); c->io_mem_addr, c->io_mem_length);
......
...@@ -32,6 +32,7 @@ typedef struct _drive_info_struct ...@@ -32,6 +32,7 @@ typedef struct _drive_info_struct
int heads; int heads;
int sectors; int sectors;
int cylinders; int cylinders;
int raid_level;
} drive_info_struct; } drive_info_struct;
struct ctlr_info struct ctlr_info
...@@ -78,6 +79,7 @@ struct ctlr_info ...@@ -78,6 +79,7 @@ struct ctlr_info
unsigned long *cmd_pool_bits; unsigned long *cmd_pool_bits;
int nr_allocs; int nr_allocs;
int nr_frees; int nr_frees;
int busy_configuring;
// Disk structures we need to pass back // Disk structures we need to pass back
struct gendisk *gendisk[NWD]; struct gendisk *gendisk[NWD];
......
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