public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sun3_scsi: add ->show_info()

Browse source 
Based on Al's changes to atari_scsi.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Geert Uytterhoeven 2013-04-10 13:52:09 +02:00 • committed by Al Viro
parent e765acb467
commit 9dcc26cf67
3 changed files with 80 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

183
drivers/scsi/sun3_NCR5380.c
View file

@ -661,122 +661,95 @@ static void __init NCR5380_print_options (struct Scsi_Host *instance)
* Inputs : instance, pointer to this instance. * Inputs : instance, pointer to this instance.
*/ */
static void NCR5380_print_status (struct Scsi_Host *instance) static void lprint_Scsi_Cmnd(Scsi_Cmnd *cmd)
{ {
char *pr_bfr; int i, s;
char *start; unsigned char *command;
int len; printk("scsi%d: destination target %d, lun %d\n",
H_NO(cmd), cmd->device->id, cmd->device->lun);
NCR_PRINT(NDEBUG_ANY); printk(KERN_CONT " command = ");
NCR_PRINT_PHASE(NDEBUG_ANY); command = cmd->cmnd;
printk(KERN_CONT "%2d (0x%02x)", command[0], command[0]);
pr_bfr = (char *) __get_free_page(GFP_ATOMIC); for (i = 1, s = COMMAND_SIZE(command[0]); i < s; ++i)
if (!pr_bfr) { printk(KERN_CONT " %02x", command[i]);
printk("NCR5380_print_status: no memory for print buffer\n"); printk("\n");
return;
}
len = NCR5380_proc_info(instance, pr_bfr, &start, 0, PAGE_SIZE, 0);
pr_bfr[len] = 0;
printk("\n%s\n", pr_bfr);
free_page((unsigned long) pr_bfr);
} }
static void NCR5380_print_status(struct Scsi_Host *instance)
/******************************************/
/*
* /proc/scsi/[dtc pas16 t128 generic]/[0-ASC_NUM_BOARD_SUPPORTED]
*
* *buffer: I/O buffer
* **start: if inout == FALSE pointer into buffer where user read should start
* offset: current offset
* length: length of buffer
* hostno: Scsi_Host host_no
* inout: TRUE - user is writing; FALSE - user is reading
*
* Return the number of bytes read from or written
*/
#undef SPRINTF
#define SPRINTF(fmt,args...) \
do { if (pos + strlen(fmt) + 20 /* slop */ < buffer + length) \
pos += sprintf(pos, fmt , ## args); } while(0)
static
char *lprint_Scsi_Cmnd(struct scsi_cmnd *cmd, char *pos, char *buffer,
int length);
static int NCR5380_proc_info(struct Scsi_Host *instance, char *buffer,
char **start, off_t offset, int length, int inout)
{ {
char *pos = buffer; struct NCR5380_hostdata *hostdata;
struct NCR5380_hostdata *hostdata; Scsi_Cmnd *ptr;
struct scsi_cmnd *ptr; unsigned long flags;
unsigned long flags;
off_t begin = 0;
#define check_offset() \
do { \
if (pos - buffer < offset - begin) { \
begin += pos - buffer; \
pos = buffer; \
} \
} while (0)
hostdata = (struct NCR5380_hostdata *)instance->hostdata; NCR_PRINT(NDEBUG_ANY);
NCR_PRINT_PHASE(NDEBUG_ANY);
if (inout) { /* Has data been written to the file ? */ hostdata = (struct NCR5380_hostdata *)instance->hostdata;
return(-ENOSYS); /* Currently this is a no-op */
}
SPRINTF("NCR5380 core release=%d.\n", NCR5380_PUBLIC_RELEASE);
check_offset();
local_irq_save(flags);
SPRINTF("NCR5380: coroutine is%s running.\n", main_running ? "" : "n't");
check_offset();
if (!hostdata->connected)
SPRINTF("scsi%d: no currently connected command\n", HOSTNO);
else
pos = lprint_Scsi_Cmnd ((struct scsi_cmnd *) hostdata->connected,
pos, buffer, length);
SPRINTF("scsi%d: issue_queue\n", HOSTNO);
check_offset();
for (ptr = (struct scsi_cmnd *) hostdata->issue_queue; ptr; ptr = NEXT(ptr))
{
pos = lprint_Scsi_Cmnd (ptr, pos, buffer, length);
check_offset();
}
SPRINTF("scsi%d: disconnected_queue\n", HOSTNO); printk("\nNCR5380 core release=%d.\n", NCR5380_PUBLIC_RELEASE);
check_offset(); local_irq_save(flags);
for (ptr = (struct scsi_cmnd *) hostdata->disconnected_queue; ptr; printk("NCR5380: coroutine is%s running.\n",
ptr = NEXT(ptr)) { main_running ? "" : "n't");
pos = lprint_Scsi_Cmnd (ptr, pos, buffer, length); if (!hostdata->connected)
check_offset(); printk("scsi%d: no currently connected command\n", HOSTNO);
} else
lprint_Scsi_Cmnd((Scsi_Cmnd *) hostdata->connected);
printk("scsi%d: issue_queue\n", HOSTNO);
for (ptr = (Scsi_Cmnd *)hostdata->issue_queue; ptr; ptr = NEXT(ptr))
lprint_Scsi_Cmnd(ptr);
local_irq_restore(flags); printk("scsi%d: disconnected_queue\n", HOSTNO);
*start = buffer + (offset - begin); for (ptr = (Scsi_Cmnd *) hostdata->disconnected_queue; ptr;
if (pos - buffer < offset - begin) ptr = NEXT(ptr))
lprint_Scsi_Cmnd(ptr);
local_irq_restore(flags);
printk("\n");
}
static void show_Scsi_Cmnd(Scsi_Cmnd *cmd, struct seq_file *m)
{
int i, s;
unsigned char *command;
seq_printf(m, "scsi%d: destination target %d, lun %d\n",
H_NO(cmd), cmd->device->id, cmd->device->lun);
seq_printf(m, " command = ");
command = cmd->cmnd;
seq_printf(m, "%2d (0x%02x)", command[0], command[0]);
for (i = 1, s = COMMAND_SIZE(command[0]); i < s; ++i)
seq_printf(m, " %02x", command[i]);
seq_printf(m, "\n");
}
static int NCR5380_show_info(struct seq_file *m, struct Scsi_Host *instance)
{
struct NCR5380_hostdata *hostdata;
Scsi_Cmnd *ptr;
unsigned long flags;
hostdata = (struct NCR5380_hostdata *)instance->hostdata;
seq_printf(m, "NCR5380 core release=%d.\n", NCR5380_PUBLIC_RELEASE);
local_irq_save(flags);
seq_printf(m, "NCR5380: coroutine is%s running.\n",
main_running ? "" : "n't");
if (!hostdata->connected)
seq_printf(m, "scsi%d: no currently connected command\n", HOSTNO);
else
show_Scsi_Cmnd((Scsi_Cmnd *) hostdata->connected, m);
seq_printf(m, "scsi%d: issue_queue\n", HOSTNO);
for (ptr = (Scsi_Cmnd *)hostdata->issue_queue; ptr; ptr = NEXT(ptr))
show_Scsi_Cmnd(ptr, m);
seq_printf(m, "scsi%d: disconnected_queue\n", HOSTNO);
for (ptr = (Scsi_Cmnd *) hostdata->disconnected_queue; ptr;
ptr = NEXT(ptr))
show_Scsi_Cmnd(ptr, m);
local_irq_restore(flags);
return 0; return 0;
else if (pos - buffer - (offset - begin) < length)
return pos - buffer - (offset - begin);
return length;
} }
static char *lprint_Scsi_Cmnd(struct scsi_cmnd *cmd, char *pos, char *buffer,
int length)
{
int i, s;
unsigned char *command;
SPRINTF("scsi%d: destination target %d, lun %d\n",
H_NO(cmd), cmd->device->id, cmd->device->lun);
SPRINTF(" command = ");
command = cmd->cmnd;
SPRINTF("%2d (0x%02x)", command[0], command[0]);
for (i = 1, s = COMMAND_SIZE(command[0]); i < s; ++i)
SPRINTF(" %02x", command[i]);
SPRINTF("\n");
return pos;
}
/* /*
* Function : void NCR5380_init (struct Scsi_Host *instance) * Function : void NCR5380_init (struct Scsi_Host *instance)
* *

1
drivers/scsi/sun3_scsi.c
View file

@ -626,6 +626,7 @@ static int sun3scsi_dma_finish(int write_flag)
#include "sun3_NCR5380.c" #include "sun3_NCR5380.c"
static struct scsi_host_template driver_template = { static struct scsi_host_template driver_template = {
.show_info = sun3scsi_show_info,
.name = SUN3_SCSI_NAME, .name = SUN3_SCSI_NAME,
.detect = sun3scsi_detect, .detect = sun3scsi_detect,
.release = sun3scsi_release, .release = sun3scsi_release,

2
drivers/scsi/sun3_scsi.h
View file

@ -100,7 +100,7 @@ static int sun3scsi_release (struct Scsi_Host *);
#define NCR5380_queue_command sun3scsi_queue_command #define NCR5380_queue_command sun3scsi_queue_command
#define NCR5380_bus_reset sun3scsi_bus_reset #define NCR5380_bus_reset sun3scsi_bus_reset
#define NCR5380_abort sun3scsi_abort #define NCR5380_abort sun3scsi_abort
#define NCR5380_proc_info sun3scsi_proc_info #define NCR5380_show_info sun3scsi_show_info
#define NCR5380_dma_xfer_len(i, cmd, phase) \ #define NCR5380_dma_xfer_len(i, cmd, phase) \
sun3scsi_dma_xfer_len(cmd->SCp.this_residual,cmd,((phase) & SR_IO) ? 0 : 1) sun3scsi_dma_xfer_len(cmd->SCp.this_residual,cmd,((phase) & SR_IO) ? 0 : 1)