[ARM] rpc: update Acorn SCSI drivers to modern ecard interfaces
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King
committed by
Russell King
Russell King
parent
13d5fadf45
commit
8b801ead3d
+44
-30
@@ -23,15 +23,18 @@
|
||||
|
||||
#define OAKSCSI_PUBLIC_RELEASE 1
|
||||
|
||||
#define NCR5380_read(reg) oakscsi_read(_instance, reg)
|
||||
#define NCR5380_write(reg, value) oakscsi_write(_instance, reg, value)
|
||||
#define priv(host) ((struct NCR5380_hostdata *)(host)->hostdata)
|
||||
#define NCR5380_local_declare() void __iomem *_base
|
||||
#define NCR5380_setup(host) _base = priv(host)->base
|
||||
|
||||
#define NCR5380_read(reg) readb(_base + ((reg) << 2))
|
||||
#define NCR5380_write(reg, value) writeb(value, _base + ((reg) << 2))
|
||||
#define NCR5380_intr oakscsi_intr
|
||||
#define NCR5380_queue_command oakscsi_queue_command
|
||||
#define NCR5380_proc_info oakscsi_proc_info
|
||||
|
||||
#define NCR5380_implementation_fields int port, ctrl
|
||||
#define NCR5380_local_declare() struct Scsi_Host *_instance
|
||||
#define NCR5380_setup(instance) _instance = instance
|
||||
#define NCR5380_implementation_fields \
|
||||
void __iomem *base
|
||||
|
||||
#define BOARD_NORMAL 0
|
||||
#define BOARD_NCR53C400 1
|
||||
@@ -39,60 +42,62 @@
|
||||
#include "../NCR5380.h"
|
||||
|
||||
#undef START_DMA_INITIATOR_RECEIVE_REG
|
||||
#define START_DMA_INITIATOR_RECEIVE_REG (7 + 128)
|
||||
#define START_DMA_INITIATOR_RECEIVE_REG (128 + 7)
|
||||
|
||||
const char * oakscsi_info (struct Scsi_Host *spnt)
|
||||
{
|
||||
return "";
|
||||
}
|
||||
|
||||
#define STAT(p) inw(p + 144)
|
||||
extern void inswb(int from, void *to, int len);
|
||||
#define STAT ((128 + 16) << 2)
|
||||
#define DATA ((128 + 8) << 2)
|
||||
|
||||
static inline int NCR5380_pwrite(struct Scsi_Host *instance, unsigned char *addr,
|
||||
int len)
|
||||
{
|
||||
int iobase = instance->io_port;
|
||||
void __iomem *base = priv(instance)->base;
|
||||
|
||||
printk("writing %p len %d\n",addr, len);
|
||||
if(!len) return -1;
|
||||
|
||||
while(1)
|
||||
{
|
||||
int status;
|
||||
while(((status = STAT(iobase)) & 0x100)==0);
|
||||
while (((status = readw(base + STAT)) & 0x100)==0);
|
||||
}
|
||||
}
|
||||
|
||||
static inline int NCR5380_pread(struct Scsi_Host *instance, unsigned char *addr,
|
||||
int len)
|
||||
{
|
||||
int iobase = instance->io_port;
|
||||
void __iomem *base = priv(instance)->base;
|
||||
printk("reading %p len %d\n", addr, len);
|
||||
while(len > 0)
|
||||
{
|
||||
int status, timeout;
|
||||
unsigned int status, timeout;
|
||||
unsigned long b;
|
||||
|
||||
timeout = 0x01FFFFFF;
|
||||
|
||||
while(((status = STAT(iobase)) & 0x100)==0)
|
||||
while (((status = readw(base + STAT)) & 0x100)==0)
|
||||
{
|
||||
timeout--;
|
||||
if(status & 0x200 || !timeout)
|
||||
{
|
||||
printk("status = %08X\n",status);
|
||||
printk("status = %08X\n", status);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
if(len >= 128)
|
||||
{
|
||||
inswb(iobase + 136, addr, 128);
|
||||
readsw(base + DATA, addr, 128);
|
||||
addr += 128;
|
||||
len -= 128;
|
||||
}
|
||||
else
|
||||
{
|
||||
b = (unsigned long) inw(iobase + 136);
|
||||
b = (unsigned long) readw(base + DATA);
|
||||
*addr ++ = b;
|
||||
len -= 1;
|
||||
if(len)
|
||||
@@ -103,10 +108,8 @@ printk("reading %p len %d\n", addr, len);
|
||||
return 0;
|
||||
}
|
||||
|
||||
#define oakscsi_read(instance,reg) (inb((instance)->io_port + (reg)))
|
||||
#define oakscsi_write(instance,reg,val) (outb((val), (instance)->io_port + (reg)))
|
||||
|
||||
#undef STAT
|
||||
#undef DATA
|
||||
|
||||
#include "../NCR5380.c"
|
||||
|
||||
@@ -132,18 +135,26 @@ oakscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
|
||||
struct Scsi_Host *host;
|
||||
int ret = -ENOMEM;
|
||||
|
||||
host = scsi_host_alloc(&oakscsi_template, sizeof(struct NCR5380_hostdata));
|
||||
if (!host)
|
||||
ret = ecard_request_resources(ec);
|
||||
if (ret)
|
||||
goto out;
|
||||
|
||||
host->io_port = ecard_address(ec, ECARD_MEMC, 0);
|
||||
host = scsi_host_alloc(&oakscsi_template, sizeof(struct NCR5380_hostdata));
|
||||
if (!host) {
|
||||
ret = -ENOMEM;
|
||||
goto release;
|
||||
}
|
||||
|
||||
priv(host)->base = ioremap(ecard_resource_start(ec, ECARD_RES_MEMC),
|
||||
ecard_resource_len(ec, ECARD_RES_MEMC));
|
||||
if (!priv(host)->base) {
|
||||
ret = -ENOMEM;
|
||||
goto unreg;
|
||||
}
|
||||
|
||||
host->irq = IRQ_NONE;
|
||||
host->n_io_port = 255;
|
||||
|
||||
ret = -EBUSY;
|
||||
if (!request_region (host->io_port, host->n_io_port, "Oak SCSI"))
|
||||
goto unreg;
|
||||
|
||||
NCR5380_init(host, 0);
|
||||
|
||||
printk("scsi%d: at port 0x%08lx irqs disabled",
|
||||
@@ -156,15 +167,17 @@ oakscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
|
||||
|
||||
ret = scsi_add_host(host, &ec->dev);
|
||||
if (ret)
|
||||
goto out_release;
|
||||
goto out_unmap;
|
||||
|
||||
scsi_scan_host(host);
|
||||
goto out;
|
||||
|
||||
out_release:
|
||||
release_region(host->io_port, host->n_io_port);
|
||||
out_unmap:
|
||||
iounmap(priv(host)->base);
|
||||
unreg:
|
||||
scsi_host_put(host);
|
||||
release:
|
||||
ecard_release_resources(ec);
|
||||
out:
|
||||
return ret;
|
||||
}
|
||||
@@ -177,8 +190,9 @@ static void __devexit oakscsi_remove(struct expansion_card *ec)
|
||||
scsi_remove_host(host);
|
||||
|
||||
NCR5380_exit(host);
|
||||
release_region(host->io_port, host->n_io_port);
|
||||
iounmap(priv(host)->base);
|
||||
scsi_host_put(host);
|
||||
ecard_release_resources(ec);
|
||||
}
|
||||
|
||||
static const struct ecard_id oakscsi_cids[] = {
|
||||
|
||||
Reference in New Issue
Block a user