Skip to content

L
linux
Commit cc0f78fc authored by Russell King's avatar Russell King
Browse files
Options

[ARM] Update Acorn SCSI drivers 

- Add scsi devclass support.
- Convert to use ioremap and friends.
- Fix oops which can occur when driver claims interrupt, and there's
  an interrupt pending - move to a two-level fas driver initialisation.
parent 299c2e86
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1043 additions and 824 deletions
drivers/acorn/scsi/acornscsi.c
View file @ cc0f78fc
...@@ -3110,6 +3110,7 @@ static struct ecard_driver acornscsi_driver = { ...@@ -3110,6 +3110,7 @@ static struct ecard_driver acornscsi_driver = {
.remove = __devexit_p(acornscsi_remove), .remove = __devexit_p(acornscsi_remove),
.id_table = acornscsi_cids, .id_table = acornscsi_cids,
.drv = { .drv = {
.devclass = &shost_devclass,
.name = "acornscsi", .name = "acornscsi",
}, },
}; };
......
drivers/acorn/scsi/arxescsi.c
View file @ cc0f78fc
...@@ -41,32 +41,17 @@ ...@@ -41,32 +41,17 @@
struct arxescsi_info { struct arxescsi_info {
FAS216_Info info; FAS216_Info info;
struct expansion_card *ec;
/* other info... */
unsigned int cstatus; /* card status register */
unsigned int dmaarea; /* Pseudo DMA area */
}; };
#define CSTATUS_IRQ (1 << 0) #define DMADATA_OFFSET (0x200)
#define CSTATUS_DRQ (1 << 0)
#ifndef CAN_QUEUE
#define CAN_QUEUE 1
#endif
#ifndef CMD_PER_LUN #define DMASTAT_OFFSET (0x600)
#define CMD_PER_LUN 1 #define DMASTAT_DRQ (1 << 0)
#endif
/* Hmm - this should go somewhere else */ #define CSTATUS_IRQ (1 << 0)
#define BUS_ADDR(x) ((((unsigned long)(x)) << 2) + IO_BASE)
/* #define VERSION "1.10 (23/01/2003 2.5.57)"
* Version
*/
#define VER_MAJOR 0
#define VER_MINOR 1
#define VER_PATCH 1
/* /*
* Function: int arxescsi_dma_setup(host, SCpnt, direction, min_type) * Function: int arxescsi_dma_setup(host, SCpnt, direction, min_type)
...@@ -87,44 +72,7 @@ arxescsi_dma_setup(struct Scsi_Host *host, Scsi_Pointer *SCp, ...@@ -87,44 +72,7 @@ arxescsi_dma_setup(struct Scsi_Host *host, Scsi_Pointer *SCp,
return fasdma_pseudo; return fasdma_pseudo;
} }
static void arxescsi_pseudo_dma_write(unsigned char *addr, unsigned char *base)
/* Faster transfer routines, written by SH to speed up the loops */
static inline unsigned char getb(unsigned int address, unsigned int reg)
{
unsigned char value;
__asm__ __volatile__(
"ldrb %0, [%1, %2, lsl #5]"
: "=r" (value)
: "r" (address), "r" (reg) );
return value;
}
static inline unsigned int getw(unsigned int address, unsigned int reg)
{
unsigned int value;
__asm__ __volatile__(
"ldr %0, [%1, %2, lsl #5]\n\t"
"mov %0, %0, lsl #16\n\t"
"mov %0, %0, lsr #16"
: "=r" (value)
: "r" (address), "r" (reg) );
return value;
}
static inline void putw(unsigned int address, unsigned int reg, unsigned long value)
{
__asm__ __volatile__(
"mov %0, %0, lsl #16\n\t"
"str %0, [%1, %2, lsl #5]"
:
: "r" (value), "r" (address), "r" (reg) );
}
void arxescsi_pseudo_dma_write(unsigned char *addr, unsigned int io)
{ {
__asm__ __volatile__( __asm__ __volatile__(
" stmdb sp!, {r0-r12}\n" " stmdb sp!, {r0-r12}\n"
...@@ -149,7 +97,7 @@ void arxescsi_pseudo_dma_write(unsigned char *addr, unsigned int io) ...@@ -149,7 +97,7 @@ void arxescsi_pseudo_dma_write(unsigned char *addr, unsigned int io)
" bne .loop_1\n" " bne .loop_1\n"
" ldmia sp!, {r0-r12}\n" " ldmia sp!, {r0-r12}\n"
: :
: "r" (addr), "r" (io) ); : "r" (addr), "r" (base));
} }
/* /*
...@@ -160,40 +108,41 @@ void arxescsi_pseudo_dma_write(unsigned char *addr, unsigned int io) ...@@ -160,40 +108,41 @@ void arxescsi_pseudo_dma_write(unsigned char *addr, unsigned int io)
* direction - DMA on to/off of card * direction - DMA on to/off of card
* transfer - minimum number of bytes we expect to transfer * transfer - minimum number of bytes we expect to transfer
*/ */
void arxescsi_dma_pseudo(struct Scsi_Host *host, Scsi_Pointer *SCp, static void
arxescsi_dma_pseudo(struct Scsi_Host *host, Scsi_Pointer *SCp,
fasdmadir_t direction, int transfer) fasdmadir_t direction, int transfer)
{ {
struct arxescsi_info *info = (struct arxescsi_info *)host->hostdata; struct arxescsi_info *info = (struct arxescsi_info *)host->hostdata;
unsigned int length, io, error=0; unsigned int length, error = 0;
unsigned char *base = info->info.scsi.io_base;
unsigned char *addr; unsigned char *addr;
length = SCp->this_residual; length = SCp->this_residual;
addr = SCp->ptr; addr = SCp->ptr;
io = __ioaddr(host->io_port);
if (direction == DMA_OUT) { if (direction == DMA_OUT) {
unsigned int word; unsigned int word;
while (length > 256) { while (length > 256) {
if (getb(io, 4) & STAT_INT) { if (readb(base + 0x80) & STAT_INT) {
error=1; error = 1;
break; break;
} }
arxescsi_pseudo_dma_write(addr, io); arxescsi_pseudo_dma_write(addr, base);
addr += 256; addr += 256;
length -= 256; length -= 256;
} }
if (!error) if (!error)
while (length > 0) { while (length > 0) {
if (getb(io, 4) & STAT_INT) if (readb(base + 0x80) & STAT_INT)
break; break;
if (!(getb(io, 48) & CSTATUS_IRQ)) if (!(readb(base + DMASTAT_OFFSET) & DMASTAT_DRQ))
continue; continue;
word = *addr | *(addr + 1) << 8; word = *addr | *(addr + 1) << 8;
putw(io, 16, word); writew(word, base + DMADATA_OFFSET);
if (length > 1) { if (length > 1) {
addr += 2; addr += 2;
length -= 2; length -= 2;
...@@ -206,15 +155,15 @@ void arxescsi_dma_pseudo(struct Scsi_Host *host, Scsi_Pointer *SCp, ...@@ -206,15 +155,15 @@ void arxescsi_dma_pseudo(struct Scsi_Host *host, Scsi_Pointer *SCp,
else { else {
if (transfer && (transfer & 255)) { if (transfer && (transfer & 255)) {
while (length >= 256) { while (length >= 256) {
if (getb(io, 4) & STAT_INT) { if (readb(base + 0x80) & STAT_INT) {
error=1; error = 1;
break; break;
} }
if (!(getb(io, 48) & CSTATUS_IRQ)) if (!(readb(base + DMASTAT_OFFSET) & DMASTAT_DRQ))
continue; continue;
insw(info->dmaarea, addr, 256 >> 1); readsw(base + DMADATA_OFFSET, addr, 256 >> 1);
addr += 256; addr += 256;
length -= 256; length -= 256;
} }
...@@ -224,13 +173,13 @@ void arxescsi_dma_pseudo(struct Scsi_Host *host, Scsi_Pointer *SCp, ...@@ -224,13 +173,13 @@ void arxescsi_dma_pseudo(struct Scsi_Host *host, Scsi_Pointer *SCp,
while (length > 0) { while (length > 0) {
unsigned long word; unsigned long word;
if (getb(io, 4) & STAT_INT) if (readb(base + 0x80) & STAT_INT)
break; break;
if (!(getb(io, 48) & CSTATUS_IRQ)) if (!(readb(base + DMASTAT_OFFSET) & DMASTAT_DRQ))
continue; continue;
word = getw(io, 16); word = readw(base + DMADATA_OFFSET);
*addr++ = word; *addr++ = word;
if (--length > 0) { if (--length > 0) {
*addr++ = word >> 8; *addr++ = word >> 8;
...@@ -259,15 +208,14 @@ static void arxescsi_dma_stop(struct Scsi_Host *host, Scsi_Pointer *SCp) ...@@ -259,15 +208,14 @@ static void arxescsi_dma_stop(struct Scsi_Host *host, Scsi_Pointer *SCp)
* Params : host - driver host structure to return info for. * Params : host - driver host structure to return info for.
* Returns : pointer to a static buffer containing null terminated string. * Returns : pointer to a static buffer containing null terminated string.
*/ */
const char *arxescsi_info(struct Scsi_Host *host) static const char *arxescsi_info(struct Scsi_Host *host)
{ {
struct arxescsi_info *info = (struct arxescsi_info *)host->hostdata; struct arxescsi_info *info = (struct arxescsi_info *)host->hostdata;
static char string[150], *p; static char string[150];
p = string; sprintf(string, "%s (%s) in slot %d v%s",
p += sprintf(p, "%s ", host->hostt->name); host->hostt->name, info->info.scsi.type, info->ec->slot_no,
p += fas216_info(&info->info, p); VERSION);
p += sprintf(p, "v%d.%d.%d", VER_MAJOR, VER_MINOR, VER_PATCH);
return string; return string;
} }
...@@ -286,8 +234,9 @@ const char *arxescsi_info(struct Scsi_Host *host) ...@@ -286,8 +234,9 @@ const char *arxescsi_info(struct Scsi_Host *host)
* inout - 0 for reading, 1 for writing. * inout - 0 for reading, 1 for writing.
* Returns : length of data written to buffer. * Returns : length of data written to buffer.
*/ */
int arxescsi_proc_info(char *buffer, char **start, off_t offset, static int
int length, int host_no, int inout) arxescsi_proc_info(char *buffer, char **start, off_t offset, int length,
int host_no, int inout)
{ {
int pos, begin; int pos, begin;
struct Scsi_Host *host; struct Scsi_Host *host;
...@@ -303,9 +252,7 @@ int arxescsi_proc_info(char *buffer, char **start, off_t offset, ...@@ -303,9 +252,7 @@ int arxescsi_proc_info(char *buffer, char **start, off_t offset,
return -EINVAL; return -EINVAL;
begin = 0; begin = 0;
pos = sprintf(buffer, pos = sprintf(buffer, "ARXE 16-bit SCSI driver v%s\n", VERSION);
"ARXE 16-bit SCSI driver version %d.%d.%d\n",
VER_MAJOR, VER_MINOR, VER_PATCH);
pos += fas216_print_host(&info->info, buffer + pos); pos += fas216_print_host(&info->info, buffer + pos);
pos += fas216_print_stats(&info->info, buffer + pos); pos += fas216_print_stats(&info->info, buffer + pos);
...@@ -343,7 +290,7 @@ static Scsi_Host_Template arxescsi_template = { ...@@ -343,7 +290,7 @@ static Scsi_Host_Template arxescsi_template = {
.can_queue = 0, .can_queue = 0,
.this_id = 7, .this_id = 7,
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,
.cmd_per_lun = CMD_PER_LUN, .cmd_per_lun = 1,
.use_clustering = DISABLE_CLUSTERING, .use_clustering = DISABLE_CLUSTERING,
.proc_name = "arxescsi", .proc_name = "arxescsi",
}; };
...@@ -353,20 +300,40 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id) ...@@ -353,20 +300,40 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
{ {
struct Scsi_Host *host; struct Scsi_Host *host;
struct arxescsi_info *info; struct arxescsi_info *info;
int ret = -ENOMEM; unsigned long resbase, reslen;
unsigned char *base;
int ret;
host = scsi_register(&arxescsi_template, sizeof(struct arxescsi_info)); resbase = ecard_resource_start(ec, ECARD_RES_MEMC);
if (!host) reslen = ecard_resource_len(ec, ECARD_RES_MEMC);
if (!request_mem_region(resbase, reslen, "arxescsi")) {
ret = -EBUSY;
goto out; goto out;
}
base = ioremap(resbase, reslen);
if (!base) {
ret = -ENOMEM;
goto out_region;
}
host = scsi_register(&arxescsi_template, sizeof(struct arxescsi_info));
if (!host) {
ret = -ENOMEM;
goto out_unmap;
}
host->io_port = ecard_address(ec, ECARD_MEMC, 0) + 0x0800; host->base = (unsigned long)base;
host->irq = NO_IRQ; host->irq = NO_IRQ;
host->dma_channel = NO_DMA; host->dma_channel = NO_DMA;
info = (struct arxescsi_info *)host->hostdata; info = (struct arxescsi_info *)host->hostdata;
info->info.scsi.io_port = host->io_port; info->ec = ec;
info->info.scsi.io_base = base + 0x2000;
info->info.scsi.irq = host->irq; info->info.scsi.irq = host->irq;
info->info.scsi.io_shift = 3; info->info.scsi.io_shift = 5;
info->info.ifcfg.clockrate = 24; /* MHz */ info->info.ifcfg.clockrate = 24; /* MHz */
info->info.ifcfg.select_timeout = 255; info->info.ifcfg.select_timeout = 255;
info->info.ifcfg.asyncperiod = 200; /* ns */ info->info.ifcfg.asyncperiod = 200; /* ns */
...@@ -374,39 +341,29 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id) ...@@ -374,39 +341,29 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
info->info.ifcfg.cntl3 = CNTL3_FASTSCSI | CNTL3_FASTCLK; info->info.ifcfg.cntl3 = CNTL3_FASTSCSI | CNTL3_FASTCLK;
info->info.ifcfg.disconnect_ok = 0; info->info.ifcfg.disconnect_ok = 0;
info->info.ifcfg.wide_max_size = 0; info->info.ifcfg.wide_max_size = 0;
info->info.ifcfg.capabilities = FASCAP_PSEUDODMA;
info->info.dma.setup = arxescsi_dma_setup; info->info.dma.setup = arxescsi_dma_setup;
info->info.dma.pseudo = arxescsi_dma_pseudo; info->info.dma.pseudo = arxescsi_dma_pseudo;
info->info.dma.stop = arxescsi_dma_stop; info->info.dma.stop = arxescsi_dma_stop;
info->dmaarea = host->io_port + 128;
info->cstatus = host->io_port + 384;
ec->irqaddr = (unsigned char *)BUS_ADDR(host->io_port); ec->irqaddr = base;
ec->irqmask = CSTATUS_IRQ; ec->irqmask = CSTATUS_IRQ;
if (!request_region(host->io_port, 120, "arxescsi-fas")) { ret = fas216_init(host);
ret = -EBUSY; if (ret)
goto out_free; goto out_unregister;
}
if (!request_region(host->io_port + 128, 384, "arxescsi-dma")) {
ret = -EBUSY;
goto out_release;
}
printk("scsi%d: Has no interrupts - using polling mode\n",
host->host_no);
fas216_init(host);
ret = scsi_add_host(host, &ec->dev); ret = fas216_add(host, &ec->dev);
if (ret == 0) if (ret == 0)
goto out; goto out;
release_region(host->io_port + 128, 384); fas216_release(host);
out_release: out_unregister:
release_region(host->io_port, 120);
out_free:
scsi_unregister(host); scsi_unregister(host);
out_unmap:
iounmap(base);
out_region:
release_mem_region(resbase, reslen);
out: out:
return ret; return ret;
} }
...@@ -414,13 +371,19 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id) ...@@ -414,13 +371,19 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
static void __devexit arxescsi_remove(struct expansion_card *ec) static void __devexit arxescsi_remove(struct expansion_card *ec)
{ {
struct Scsi_Host *host = ecard_get_drvdata(ec); struct Scsi_Host *host = ecard_get_drvdata(ec);
unsigned long resbase, reslen;
ecard_set_drvdata(ec, NULL); ecard_set_drvdata(ec, NULL);
scsi_remove_host(host); fas216_remove(host);
fas216_release(host);
iounmap((void *)host->base);
release_region(host->io_port + 128, 384); resbase = ecard_resource_start(ec, ECARD_RES_MEMC);
release_region(host->io_port, 120); reslen = ecard_resource_len(ec, ECARD_RES_MEMC);
release_mem_region(resbase, reslen);
fas216_release(host);
scsi_unregister(host); scsi_unregister(host);
} }
...@@ -434,6 +397,7 @@ static struct ecard_driver arxescsi_driver = { ...@@ -434,6 +397,7 @@ static struct ecard_driver arxescsi_driver = {
.remove = __devexit_p(arxescsi_remove), .remove = __devexit_p(arxescsi_remove),
.id_table = arxescsi_cids, .id_table = arxescsi_cids,
.drv = { .drv = {
.devclass = &shost_devclass,
.name = "arxescsi", .name = "arxescsi",
}, },
}; };
......
drivers/acorn/scsi/cumana_1.c
View file @ cc0f78fc
...@@ -334,6 +334,7 @@ static struct ecard_driver cumanascsi1_driver = { ...@@ -334,6 +334,7 @@ static struct ecard_driver cumanascsi1_driver = {
.remove = __devexit_p(cumanascsi1_remove), .remove = __devexit_p(cumanascsi1_remove),
.id_table = cumanascsi1_cids, .id_table = cumanascsi1_cids,
.drv = { .drv = {
.devclass = &shost_devclass,
.name = "cumanascsi1", .name = "cumanascsi1",
}, },
}; };
......
drivers/acorn/scsi/cumana_2.c
View file @ cc0f78fc
This diff is collapsed.
drivers/acorn/scsi/eesox.c
View file @ cc0f78fc
This diff is collapsed.
drivers/acorn/scsi/fas216.c
View file @ cc0f78fc
This diff is collapsed.
drivers/acorn/scsi/fas216.h
View file @ cc0f78fc
...@@ -22,18 +22,18 @@ ...@@ -22,18 +22,18 @@
/* FAS register definitions */ /* FAS register definitions */
/* transfer count low */ /* transfer count low */
#define REG_CTCL(x) ((x)->scsi.io_port) #define REG_CTCL (0)
#define REG_STCL(x) ((x)->scsi.io_port) #define REG_STCL (0)
/* transfer count medium */ /* transfer count medium */
#define REG_CTCM(x) ((x)->scsi.io_port + (1 << (x)->scsi.io_shift)) #define REG_CTCM (1)
#define REG_STCM(x) ((x)->scsi.io_port + (1 << (x)->scsi.io_shift)) #define REG_STCM (1)
/* fifo data */ /* fifo data */
#define REG_FF(x) ((x)->scsi.io_port + (2 << (x)->scsi.io_shift)) #define REG_FF (2)
/* command */ /* command */
#define REG_CMD(x) ((x)->scsi.io_port + (3 << (x)->scsi.io_shift)) #define REG_CMD (3)
#define CMD_NOP 0x00 #define CMD_NOP 0x00
#define CMD_FLUSHFIFO 0x01 #define CMD_FLUSHFIFO 0x01
#define CMD_RESETCHIP 0x02 #define CMD_RESETCHIP 0x02
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
#define CMD_WITHDMA 0x80 #define CMD_WITHDMA 0x80
/* status register (read) */ /* status register (read) */
#define REG_STAT(x) ((x)->scsi.io_port + (4 << (x)->scsi.io_shift)) #define REG_STAT (4)
#define STAT_IO (1 << 0) /* IO phase */ #define STAT_IO (1 << 0) /* IO phase */
#define STAT_CD (1 << 1) /* CD phase */ #define STAT_CD (1 << 1) /* CD phase */
#define STAT_MSG (1 << 2) /* MSG phase */ #define STAT_MSG (1 << 2) /* MSG phase */
...@@ -76,11 +76,11 @@ ...@@ -76,11 +76,11 @@
#define STAT_MESGIN (STAT_MSG|STAT_CD|STAT_IO) /* Message In */ #define STAT_MESGIN (STAT_MSG|STAT_CD|STAT_IO) /* Message In */
/* bus ID for select / reselect */ /* bus ID for select / reselect */
#define REG_SDID(x) ((x)->scsi.io_port + (4 << (x)->scsi.io_shift)) #define REG_SDID (4)
#define BUSID(target) ((target) & 7) #define BUSID(target) ((target) & 7)
/* Interrupt status register (read) */ /* Interrupt status register (read) */
#define REG_INST(x) ((x)->scsi.io_port + (5 << (x)->scsi.io_shift)) #define REG_INST (5)
#define INST_SELWOATN (1 << 0) /* Select w/o ATN */ #define INST_SELWOATN (1 << 0) /* Select w/o ATN */
#define INST_SELATN (1 << 1) /* Select w/ATN */ #define INST_SELATN (1 << 1) /* Select w/ATN */
#define INST_RESELECTED (1 << 2) /* Reselected */ #define INST_RESELECTED (1 << 2) /* Reselected */
...@@ -91,10 +91,10 @@ ...@@ -91,10 +91,10 @@
#define INST_BUSRESET (1 << 7) /* SCSI Bus reset */ #define INST_BUSRESET (1 << 7) /* SCSI Bus reset */
/* Timeout register (write) */ /* Timeout register (write) */
#define REG_STIM(x) ((x)->scsi.io_port + (5 << (x)->scsi.io_shift)) #define REG_STIM (5)
/* Sequence step register (read) */ /* Sequence step register (read) */
#define REG_IS(x) ((x)->scsi.io_port + (6 << (x)->scsi.io_shift)) #define REG_IS (6)
#define IS_BITS 0x07 #define IS_BITS 0x07
#define IS_SELARB 0x00 /* Select & Arb ok */ #define IS_SELARB 0x00 /* Select & Arb ok */
#define IS_MSGBYTESENT 0x01 /* One byte message sent*/ #define IS_MSGBYTESENT 0x01 /* One byte message sent*/
...@@ -104,18 +104,18 @@ ...@@ -104,18 +104,18 @@
#define IS_SOF 0x08 /* Sync off flag */ #define IS_SOF 0x08 /* Sync off flag */
/* Transfer period step (write) */ /* Transfer period step (write) */
#define REG_STP(x) ((x)->scsi.io_port + (6 << (x)->scsi.io_shift)) #define REG_STP (6)
/* Synchronous Offset (write) */ /* Synchronous Offset (write) */
#define REG_SOF(x) ((x)->scsi.io_port + (7 << (x)->scsi.io_shift)) #define REG_SOF (7)
/* Fifo state register (read) */ /* Fifo state register (read) */
#define REG_CFIS(x) ((x)->scsi.io_port + (7 << (x)->scsi.io_shift)) #define REG_CFIS (7)
#define CFIS_CF 0x1f /* Num bytes in FIFO */ #define CFIS_CF 0x1f /* Num bytes in FIFO */
#define CFIS_IS 0xe0 /* Step */ #define CFIS_IS 0xe0 /* Step */
/* config register 1 */ /* config register 1 */
#define REG_CNTL1(x) ((x)->scsi.io_port + (8 << (x)->scsi.io_shift)) #define REG_CNTL1 (8)
#define CNTL1_CID (7 << 0) /* Chip ID */ #define CNTL1_CID (7 << 0) /* Chip ID */
#define CNTL1_STE (1 << 3) /* Self test enable */ #define CNTL1_STE (1 << 3) /* Self test enable */
#define CNTL1_PERE (1 << 4) /* Parity enable reporting en. */ #define CNTL1_PERE (1 << 4) /* Parity enable reporting en. */
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
#define CNTL1_ETM (1 << 7) /* Extended Timing Mode */ #define CNTL1_ETM (1 << 7) /* Extended Timing Mode */
/* Clock conversion factor (read) */ /* Clock conversion factor (read) */
#define REG_CLKF(x) ((x)->scsi.io_port + (9 << (x)->scsi.io_shift)) #define REG_CLKF (9)
#define CLKF_F37MHZ 0x00 /* 35.01 - 40 MHz */ #define CLKF_F37MHZ 0x00 /* 35.01 - 40 MHz */
#define CLKF_F10MHZ 0x02 /* 10 MHz */ #define CLKF_F10MHZ 0x02 /* 10 MHz */
#define CLKF_F12MHZ 0x03 /* 10.01 - 15 MHz */ #define CLKF_F12MHZ 0x03 /* 10.01 - 15 MHz */
...@@ -134,13 +134,13 @@ ...@@ -134,13 +134,13 @@
#define CLKF_F32MHZ 0x07 /* 30.01 - 35 MHz */ #define CLKF_F32MHZ 0x07 /* 30.01 - 35 MHz */
/* Chip test register (write) */ /* Chip test register (write) */
#define REG0_FTM(x) ((x)->scsi.io_port + (10 << (x)->scsi.io_shift)) #define REG_FTM (10)
#define TEST_FTM 0x01 /* Force target mode */ #define TEST_FTM 0x01 /* Force target mode */
#define TEST_FIM 0x02 /* Force initiator mode */ #define TEST_FIM 0x02 /* Force initiator mode */
#define TEST_FHI 0x04 /* Force high impedance mode */ #define TEST_FHI 0x04 /* Force high impedance mode */
/* Configuration register 2 (read/write) */ /* Configuration register 2 (read/write) */
#define REG_CNTL2(x) ((x)->scsi.io_port + (11 << (x)->scsi.io_shift)) #define REG_CNTL2 (11)
#define CNTL2_PGDP (1 << 0) /* Pass Th/Generate Data Parity */ #define CNTL2_PGDP (1 << 0) /* Pass Th/Generate Data Parity */
#define CNTL2_PGRP (1 << 1) /* Pass Th/Generate Reg Parity */ #define CNTL2_PGRP (1 << 1) /* Pass Th/Generate Reg Parity */
#define CNTL2_ACDPE (1 << 2) /* Abort on Cmd/Data Parity Err */ #define CNTL2_ACDPE (1 << 2) /* Abort on Cmd/Data Parity Err */
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
#define CNTL2_DAE (1 << 7) /* Data Alignment Enable */ #define CNTL2_DAE (1 << 7) /* Data Alignment Enable */
/* Configuration register 3 (read/write) */ /* Configuration register 3 (read/write) */
#define REG_CNTL3(x) ((x)->scsi.io_port + (12 << (x)->scsi.io_shift)) #define REG_CNTL3 (12)
#define CNTL3_BS8 (1 << 0) /* Burst size 8 */ #define CNTL3_BS8 (1 << 0) /* Burst size 8 */
#define CNTL3_MDM (1 << 1) /* Modify DMA mode */ #define CNTL3_MDM (1 << 1) /* Modify DMA mode */
#define CNTL3_LBTM (1 << 2) /* Last Byte Transfer mode */ #define CNTL3_LBTM (1 << 2) /* Last Byte Transfer mode */
...@@ -162,14 +162,14 @@ ...@@ -162,14 +162,14 @@
#define CNTL3_ADIDCHK (1 << 7) /* Additional ID check */ #define CNTL3_ADIDCHK (1 << 7) /* Additional ID check */
/* High transfer count (read/write) */ /* High transfer count (read/write) */
#define REG_CTCH(x) ((x)->scsi.io_port + (14 << (x)->scsi.io_shift)) #define REG_CTCH (14)
#define REG_STCH(x) ((x)->scsi.io_port + (14 << (x)->scsi.io_shift)) #define REG_STCH (14)
/* ID reigster (read only) */ /* ID register (read only) */
#define REG1_ID(x) ((x)->scsi.io_port + (14 << (x)->scsi.io_shift)) #define REG_ID (14)
/* Data alignment */ /* Data alignment */
#define REG0_DAL(x) ((x)->scsi.io_port + (15 << (x)->scsi.io_shift)) #define REG_DAL (15)
typedef enum { typedef enum {
PHASE_IDLE, /* we're not planning on doing anything */ PHASE_IDLE, /* we're not planning on doing anything */
...@@ -212,6 +212,9 @@ typedef enum { ...@@ -212,6 +212,9 @@ typedef enum {
#define MAGIC 0x441296bdUL #define MAGIC 0x441296bdUL
#define NR_MSGS 8 #define NR_MSGS 8
#define FASCAP_DMA (1 << 0)
#define FASCAP_PSEUDODMA (1 << 1)
typedef struct { typedef struct {
unsigned long magic_start; unsigned long magic_start;
spinlock_t host_lock; spinlock_t host_lock;
...@@ -233,12 +236,13 @@ typedef struct { ...@@ -233,12 +236,13 @@ typedef struct {
/* driver information */ /* driver information */
struct { struct {
phase_t phase; /* current phase */
void *io_base; /* iomem base of FAS216 */
unsigned int io_port; /* base address of FAS216 */ unsigned int io_port; /* base address of FAS216 */
unsigned int io_shift; /* shift to adjust reg offsets by */ unsigned int io_shift; /* shift to adjust reg offsets by */
unsigned int irq; /* interrupt */
unsigned char cfg[4]; /* configuration registers */ unsigned char cfg[4]; /* configuration registers */
const char *type; /* chip type */ const char *type; /* chip type */
phase_t phase; /* current phase */ unsigned int irq; /* interrupt */
struct { struct {
unsigned char target; /* reconnected target */ unsigned char target; /* reconnected target */
...@@ -253,7 +257,6 @@ typedef struct { ...@@ -253,7 +257,6 @@ typedef struct {
unsigned int async_stp; /* Async transfer STP value */ unsigned int async_stp; /* Async transfer STP value */
unsigned char msgin_fifo; /* bytes in fifo at time of message in */ unsigned char msgin_fifo; /* bytes in fifo at time of message in */
unsigned char message[256]; /* last message received from device */ unsigned char message[256]; /* last message received from device */
unsigned int msglen; /* length of last message received */
unsigned char disconnectable:1; /* this command can be disconnected */ unsigned char disconnectable:1; /* this command can be disconnected */
unsigned char aborting:1; /* aborting command */ unsigned char aborting:1; /* aborting command */
...@@ -281,6 +284,7 @@ typedef struct { ...@@ -281,6 +284,7 @@ typedef struct {
unsigned char wide_max_size; /* Maximum wide transfer size */ unsigned char wide_max_size; /* Maximum wide transfer size */
unsigned char cntl3; /* Control Reg 3 */ unsigned char cntl3; /* Control Reg 3 */
unsigned int asyncperiod; /* Async transfer period (ns) */ unsigned int asyncperiod; /* Async transfer period (ns) */
unsigned int capabilities; /* driver capabilities */
unsigned int disconnect_ok:1; /* Disconnects allowed? */ unsigned int disconnect_ok:1; /* Disconnects allowed? */
} ifcfg; } ifcfg;
...@@ -319,26 +323,18 @@ typedef struct { ...@@ -319,26 +323,18 @@ typedef struct {
} FAS216_Info; } FAS216_Info;
/* Function: int fas216_init (struct Scsi_Host *instance) /* Function: int fas216_init (struct Scsi_Host *instance)
* Purpose : initialise FAS/NCR/AMD SCSI ic. * Purpose : initialise FAS/NCR/AMD SCSI structures.
* Params : instance - a driver-specific filled-out structure * Params : instance - a driver-specific filled-out structure
* Returns : 0 on success * Returns : 0 on success
*/ */
extern int fas216_init (struct Scsi_Host *instance); extern int fas216_init (struct Scsi_Host *instance);
/* Function: int fas216_abort (Scsi_Cmnd *SCpnt) /* Function: int fas216_add (struct Scsi_Host *instance, struct device *dev)
* Purpose : abort a command if something horrible happens. * Purpose : initialise FAS/NCR/AMD SCSI ic.
* Params : SCpnt - Command that is believed to be causing a problem. * Params : instance - a driver-specific filled-out structure
* Returns : one of SCSI_ABORT_ macros. * Returns : 0 on success
*/
extern int fas216_abort (Scsi_Cmnd *);
/* Function: int fas216_reset (Scsi_Cmnd *SCpnt, unsigned int reset_flags)
* Purpose : resets the adapter if something horrible happens.
* Params : SCpnt - Command that is believed to be causing a problem.
* reset_flags - flags indicating reset type that is believed to be required.
* Returns : one of SCSI_RESET_ macros, or'd with the SCSI_RESET_*_RESET macros.
*/ */
extern int fas216_reset (Scsi_Cmnd *, unsigned int); extern int fas216_add (struct Scsi_Host *instance, struct device *dev);
/* Function: int fas216_queue_command (Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *)) /* Function: int fas216_queue_command (Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *))
* Purpose : queue a command for adapter to process. * Purpose : queue a command for adapter to process.
...@@ -355,20 +351,21 @@ extern int fas216_queue_command (Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); ...@@ -355,20 +351,21 @@ extern int fas216_queue_command (Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
*/ */
extern int fas216_command (Scsi_Cmnd *); extern int fas216_command (Scsi_Cmnd *);
/* Function: void fas216_intr (struct Scsi_Host *instance) /* Function: void fas216_intr (FAS216_Info *info)
* Purpose : handle interrupts from the interface to progress a command * Purpose : handle interrupts from the interface to progress a command
* Params : instance - interface to service * Params : info - interface to service
*/ */
extern void fas216_intr (struct Scsi_Host *instance); extern void fas216_intr (FAS216_Info *info);
extern void fas216_remove (struct Scsi_Host *instance);
/* Function: int fas216_release (struct Scsi_Host *instance) /* Function: void fas216_release (struct Scsi_Host *instance)
* Purpose : release all resources and put everything to bed for FAS/NCR/AMD SCSI ic. * Purpose : release all resources and put everything to bed for FAS/NCR/AMD SCSI ic.
* Params : instance - a driver-specific filled-out structure * Params : instance - a driver-specific filled-out structure
* Returns : 0 on success * Returns : 0 on success
*/ */
extern int fas216_release (struct Scsi_Host *instance); extern void fas216_release (struct Scsi_Host *instance);
extern int fas216_info(FAS216_Info *info, char *buffer);
extern int fas216_print_host(FAS216_Info *info, char *buffer); extern int fas216_print_host(FAS216_Info *info, char *buffer);
extern int fas216_print_stats(FAS216_Info *info, char *buffer); extern int fas216_print_stats(FAS216_Info *info, char *buffer);
extern int fas216_print_device(FAS216_Info *info, Scsi_Device *scd, char *buffer); extern int fas216_print_device(FAS216_Info *info, Scsi_Device *scd, char *buffer);
......
drivers/acorn/scsi/oak.c
View file @ cc0f78fc
...@@ -192,6 +192,7 @@ static struct ecard_driver oakscsi_driver = { ...@@ -192,6 +192,7 @@ static struct ecard_driver oakscsi_driver = {
.remove = __devexit_p(oakscsi_remove), .remove = __devexit_p(oakscsi_remove),
.id_table = oakscsi_cids, .id_table = oakscsi_cids,
.drv = { .drv = {
.devclass = &shost_devclass,
.name = "oakscsi", .name = "oakscsi",
}, },
}; };
......
drivers/acorn/scsi/powertec.c
View file @ cc0f78fc
This diff is collapsed.
drivers/acorn/scsi/scsi.h
View file @ cc0f78fc
...@@ -55,8 +55,6 @@ static inline unsigned char get_next_SCp_byte(Scsi_Pointer *SCp) ...@@ -55,8 +55,6 @@ static inline unsigned char get_next_SCp_byte(Scsi_Pointer *SCp)
SCp->ptr += 1; SCp->ptr += 1;
SCp->this_residual -= 1; SCp->this_residual -= 1;
if (SCp->this_residual == 0)
next_SCp(SCp);
return c; return c;
} }
...@@ -66,8 +64,6 @@ static inline void put_next_SCp_byte(Scsi_Pointer *SCp, unsigned char c) ...@@ -66,8 +64,6 @@ static inline void put_next_SCp_byte(Scsi_Pointer *SCp, unsigned char c)
*SCp->ptr = c; *SCp->ptr = c;
SCp->ptr += 1; SCp->ptr += 1;
SCp->this_residual -= 1; SCp->this_residual -= 1;
if (SCp->this_residual == 0)
next_SCp(SCp);
} }
static inline void init_SCp(Scsi_Cmnd *SCpnt) static inline void init_SCp(Scsi_Cmnd *SCpnt)
...@@ -112,7 +108,7 @@ static inline void init_SCp(Scsi_Cmnd *SCpnt) ...@@ -112,7 +108,7 @@ static inline void init_SCp(Scsi_Cmnd *SCpnt)
* we aren't interested in the buffer pointer. * we aren't interested in the buffer pointer.
*/ */
if (SCpnt->SCp.this_residual == 0 && SCpnt->SCp.ptr) { if (SCpnt->SCp.this_residual == 0 && SCpnt->SCp.ptr) {
#ifdef BELT_AND_BRACES #if 0 //def BELT_AND_BRACES
printk(KERN_WARNING "scsi%d.%c: zero length buffer passed for " printk(KERN_WARNING "scsi%d.%c: zero length buffer passed for "
"command ", SCpnt->host->host_no, '0' + SCpnt->target); "command ", SCpnt->host->host_no, '0' + SCpnt->target);
print_command(SCpnt->cmnd); print_command(SCpnt->cmnd);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7