Skip to content

L
linux
Commit 12150797 authored by Ondrej Zary's avatar Ondrej Zary Committed by Martin K. Petersen
Browse files
Options

ncr5380: Use runtime register mapping 

Convert compile-time C400_ register mapping to runtime mapping.
This removes the weird negative register offsets and allows adding
additional mappings.

While at it, convert read/write loops into insb/outsb.
Signed-off-by: default avatarOndrej Zary <linux@rainbow-software.org>
Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f0394621
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 64 deletions
drivers/scsi/NCR5380.h
View file @ 12150797
...@@ -163,8 +163,7 @@ ...@@ -163,8 +163,7 @@
/* Write any value to this register to start an ini mode DMA receive */ /* Write any value to this register to start an ini mode DMA receive */
#define START_DMA_INITIATOR_RECEIVE_REG 7 /* wo */ #define START_DMA_INITIATOR_RECEIVE_REG 7 /* wo */
#define C400_CONTROL_STATUS_REG NCR53C400_register_offset-8 /* rw */ /* NCR 53C400(A) Control Status Register bits: */
#define CSR_RESET 0x80 /* wo Resets 53c400 */ #define CSR_RESET 0x80 /* wo Resets 53c400 */
#define CSR_53C80_REG 0x80 /* ro 5380 registers busy */ #define CSR_53C80_REG 0x80 /* ro 5380 registers busy */
#define CSR_TRANS_DIR 0x40 /* rw Data transfer direction */ #define CSR_TRANS_DIR 0x40 /* rw Data transfer direction */
...@@ -181,16 +180,6 @@ ...@@ -181,16 +180,6 @@
#define CSR_BASE CSR_53C80_INTR #define CSR_BASE CSR_53C80_INTR
#endif #endif
/* Number of 128-byte blocks to be transferred */
#define C400_BLOCK_COUNTER_REG NCR53C400_register_offset-7 /* rw */
/* Resume transfer after disconnect */
#define C400_RESUME_TRANSFER_REG NCR53C400_register_offset-6 /* wo */
/* Access to host buffer stack */
#define C400_HOST_BUFFER NCR53C400_register_offset-4 /* rw */
/* Note : PHASE_* macros are based on the values of the STATUS register */ /* Note : PHASE_* macros are based on the values of the STATUS register */
#define PHASE_MASK (SR_MSG | SR_CD | SR_IO) #define PHASE_MASK (SR_MSG | SR_CD | SR_IO)
......
drivers/scsi/g_NCR5380.c
View file @ 12150797
...@@ -253,6 +253,7 @@ static int __init generic_NCR5380_detect(struct scsi_host_template *tpnt) ...@@ -253,6 +253,7 @@ static int __init generic_NCR5380_detect(struct scsi_host_template *tpnt)
}; };
int flags; int flags;
struct Scsi_Host *instance; struct Scsi_Host *instance;
struct NCR5380_hostdata *hostdata;
#ifdef SCSI_G_NCR5380_MEM #ifdef SCSI_G_NCR5380_MEM
unsigned long base; unsigned long base;
void __iomem *iomem; void __iomem *iomem;
...@@ -394,6 +395,7 @@ static int __init generic_NCR5380_detect(struct scsi_host_template *tpnt) ...@@ -394,6 +395,7 @@ static int __init generic_NCR5380_detect(struct scsi_host_template *tpnt)
instance = scsi_register(tpnt, sizeof(struct NCR5380_hostdata)); instance = scsi_register(tpnt, sizeof(struct NCR5380_hostdata));
if (instance == NULL) if (instance == NULL)
goto out_release; goto out_release;
hostdata = shost_priv(instance);
#ifndef SCSI_G_NCR5380_MEM #ifndef SCSI_G_NCR5380_MEM
instance->io_port = overrides[current_override].NCR5380_map_name; instance->io_port = overrides[current_override].NCR5380_map_name;
...@@ -403,18 +405,27 @@ static int __init generic_NCR5380_detect(struct scsi_host_template *tpnt) ...@@ -403,18 +405,27 @@ static int __init generic_NCR5380_detect(struct scsi_host_template *tpnt)
* On NCR53C400 boards, NCR5380 registers are mapped 8 past * On NCR53C400 boards, NCR5380 registers are mapped 8 past
* the base address. * the base address.
*/ */
if (overrides[current_override].board == BOARD_NCR53C400) if (overrides[current_override].board == BOARD_NCR53C400) {
instance->io_port += 8; instance->io_port += 8;
hostdata->c400_ctl_status = 0;
hostdata->c400_blk_cnt = 1;
hostdata->c400_host_buf = 4;
}
#else #else
instance->base = overrides[current_override].NCR5380_map_name; instance->base = overrides[current_override].NCR5380_map_name;
((struct NCR5380_hostdata *)instance->hostdata)->iomem = iomem; hostdata->iomem = iomem;
if (overrides[current_override].board == BOARD_NCR53C400) {
hostdata->c400_ctl_status = 0x100;
hostdata->c400_blk_cnt = 0x101;
hostdata->c400_host_buf = 0x104;
}
#endif #endif
if (NCR5380_init(instance, flags)) if (NCR5380_init(instance, flags))
goto out_unregister; goto out_unregister;
if (overrides[current_override].board == BOARD_NCR53C400) if (overrides[current_override].board == BOARD_NCR53C400)
NCR5380_write(C400_CONTROL_STATUS_REG, CSR_BASE); NCR5380_write(hostdata->c400_ctl_status, CSR_BASE);
NCR5380_maybe_reset_bus(instance); NCR5380_maybe_reset_bus(instance);
...@@ -522,31 +533,25 @@ generic_NCR5380_biosparam(struct scsi_device *sdev, struct block_device *bdev, ...@@ -522,31 +533,25 @@ generic_NCR5380_biosparam(struct scsi_device *sdev, struct block_device *bdev,
static inline int NCR5380_pread(struct Scsi_Host *instance, unsigned char *dst, int len) static inline int NCR5380_pread(struct Scsi_Host *instance, unsigned char *dst, int len)
{ {
#ifdef SCSI_G_NCR5380_MEM
struct NCR5380_hostdata *hostdata = shost_priv(instance); struct NCR5380_hostdata *hostdata = shost_priv(instance);
#endif
int blocks = len / 128; int blocks = len / 128;
int start = 0; int start = 0;
int bl;
NCR5380_write(C400_CONTROL_STATUS_REG, CSR_BASE | CSR_TRANS_DIR); NCR5380_write(hostdata->c400_ctl_status, CSR_BASE | CSR_TRANS_DIR);
NCR5380_write(C400_BLOCK_COUNTER_REG, blocks); NCR5380_write(hostdata->c400_blk_cnt, blocks);
while (1) { while (1) {
if ((bl = NCR5380_read(C400_BLOCK_COUNTER_REG)) == 0) { if (NCR5380_read(hostdata->c400_blk_cnt) == 0)
break; break;
} if (NCR5380_read(hostdata->c400_ctl_status) & CSR_GATED_53C80_IRQ) {
if (NCR5380_read(C400_CONTROL_STATUS_REG) & CSR_GATED_53C80_IRQ) {
printk(KERN_ERR "53C400r: Got 53C80_IRQ start=%d, blocks=%d\n", start, blocks); printk(KERN_ERR "53C400r: Got 53C80_IRQ start=%d, blocks=%d\n", start, blocks);
return -1; return -1;
} }
while (NCR5380_read(C400_CONTROL_STATUS_REG) & CSR_HOST_BUF_NOT_RDY); while (NCR5380_read(hostdata->c400_ctl_status) & CSR_HOST_BUF_NOT_RDY)
; /* FIXME - no timeout */
#ifndef SCSI_G_NCR5380_MEM #ifndef SCSI_G_NCR5380_MEM
{ insb(instance->io_port + hostdata->c400_host_buf,
int i; dst + start, 128);
for (i = 0; i < 128; i++)
dst[start + i] = NCR5380_read(C400_HOST_BUFFER);
}
#else #else
/* implies SCSI_G_NCR5380_MEM */ /* implies SCSI_G_NCR5380_MEM */
memcpy_fromio(dst + start, memcpy_fromio(dst + start,
...@@ -557,17 +562,12 @@ static inline int NCR5380_pread(struct Scsi_Host *instance, unsigned char *dst, ...@@ -557,17 +562,12 @@ static inline int NCR5380_pread(struct Scsi_Host *instance, unsigned char *dst,
} }
if (blocks) { if (blocks) {
while (NCR5380_read(C400_CONTROL_STATUS_REG) & CSR_HOST_BUF_NOT_RDY) while (NCR5380_read(hostdata->c400_ctl_status) & CSR_HOST_BUF_NOT_RDY)
{ ; /* FIXME - no timeout */
// FIXME - no timeout
}
#ifndef SCSI_G_NCR5380_MEM #ifndef SCSI_G_NCR5380_MEM
{ insb(instance->io_port + hostdata->c400_host_buf,
int i; dst + start, 128);
for (i = 0; i < 128; i++)
dst[start + i] = NCR5380_read(C400_HOST_BUFFER);
}
#else #else
/* implies SCSI_G_NCR5380_MEM */ /* implies SCSI_G_NCR5380_MEM */
memcpy_fromio(dst + start, memcpy_fromio(dst + start,
...@@ -577,7 +577,7 @@ static inline int NCR5380_pread(struct Scsi_Host *instance, unsigned char *dst, ...@@ -577,7 +577,7 @@ static inline int NCR5380_pread(struct Scsi_Host *instance, unsigned char *dst,
blocks--; blocks--;
} }
if (!(NCR5380_read(C400_CONTROL_STATUS_REG) & CSR_GATED_53C80_IRQ)) if (!(NCR5380_read(hostdata->c400_ctl_status) & CSR_GATED_53C80_IRQ))
printk("53C400r: no 53C80 gated irq after transfer"); printk("53C400r: no 53C80 gated irq after transfer");
#if 0 #if 0
...@@ -585,7 +585,7 @@ static inline int NCR5380_pread(struct Scsi_Host *instance, unsigned char *dst, ...@@ -585,7 +585,7 @@ static inline int NCR5380_pread(struct Scsi_Host *instance, unsigned char *dst,
* DON'T DO THIS - THEY NEVER ARRIVE! * DON'T DO THIS - THEY NEVER ARRIVE!
*/ */
printk("53C400r: Waiting for 53C80 registers\n"); printk("53C400r: Waiting for 53C80 registers\n");
while (NCR5380_read(C400_CONTROL_STATUS_REG) & CSR_53C80_REG) while (NCR5380_read(hostdata->c400_ctl_status) & CSR_53C80_REG)
; ;
#endif #endif
if (!(NCR5380_read(BUS_AND_STATUS_REG) & BASR_END_DMA_TRANSFER)) if (!(NCR5380_read(BUS_AND_STATUS_REG) & BASR_END_DMA_TRANSFER))
...@@ -606,32 +606,26 @@ static inline int NCR5380_pread(struct Scsi_Host *instance, unsigned char *dst, ...@@ -606,32 +606,26 @@ static inline int NCR5380_pread(struct Scsi_Host *instance, unsigned char *dst,
static inline int NCR5380_pwrite(struct Scsi_Host *instance, unsigned char *src, int len) static inline int NCR5380_pwrite(struct Scsi_Host *instance, unsigned char *src, int len)
{ {
#ifdef SCSI_G_NCR5380_MEM
struct NCR5380_hostdata *hostdata = shost_priv(instance); struct NCR5380_hostdata *hostdata = shost_priv(instance);
#endif
int blocks = len / 128; int blocks = len / 128;
int start = 0; int start = 0;
int bl;
int i; int i;
NCR5380_write(C400_CONTROL_STATUS_REG, CSR_BASE); NCR5380_write(hostdata->c400_ctl_status, CSR_BASE);
NCR5380_write(C400_BLOCK_COUNTER_REG, blocks); NCR5380_write(hostdata->c400_blk_cnt, blocks);
while (1) { while (1) {
if (NCR5380_read(C400_CONTROL_STATUS_REG) & CSR_GATED_53C80_IRQ) { if (NCR5380_read(hostdata->c400_ctl_status) & CSR_GATED_53C80_IRQ) {
printk(KERN_ERR "53C400w: Got 53C80_IRQ start=%d, blocks=%d\n", start, blocks); printk(KERN_ERR "53C400w: Got 53C80_IRQ start=%d, blocks=%d\n", start, blocks);
return -1; return -1;
} }
if ((bl = NCR5380_read(C400_BLOCK_COUNTER_REG)) == 0) { if (NCR5380_read(hostdata->c400_blk_cnt) == 0)
break; break;
} while (NCR5380_read(hostdata->c400_ctl_status) & CSR_HOST_BUF_NOT_RDY)
while (NCR5380_read(C400_CONTROL_STATUS_REG) & CSR_HOST_BUF_NOT_RDY)
; // FIXME - timeout ; // FIXME - timeout
#ifndef SCSI_G_NCR5380_MEM #ifndef SCSI_G_NCR5380_MEM
{ outsb(instance->io_port + hostdata->c400_host_buf,
for (i = 0; i < 128; i++) src + start, 128);
NCR5380_write(C400_HOST_BUFFER, src[start + i]);
}
#else #else
/* implies SCSI_G_NCR5380_MEM */ /* implies SCSI_G_NCR5380_MEM */
memcpy_toio(hostdata->iomem + NCR53C400_host_buffer, memcpy_toio(hostdata->iomem + NCR53C400_host_buffer,
...@@ -641,14 +635,12 @@ static inline int NCR5380_pwrite(struct Scsi_Host *instance, unsigned char *src, ...@@ -641,14 +635,12 @@ static inline int NCR5380_pwrite(struct Scsi_Host *instance, unsigned char *src,
blocks--; blocks--;
} }
if (blocks) { if (blocks) {
while (NCR5380_read(C400_CONTROL_STATUS_REG) & CSR_HOST_BUF_NOT_RDY) while (NCR5380_read(hostdata->c400_ctl_status) & CSR_HOST_BUF_NOT_RDY)
; // FIXME - no timeout ; // FIXME - no timeout
#ifndef SCSI_G_NCR5380_MEM #ifndef SCSI_G_NCR5380_MEM
{ outsb(instance->io_port + hostdata->c400_host_buf,
for (i = 0; i < 128; i++) src + start, 128);
NCR5380_write(C400_HOST_BUFFER, src[start + i]);
}
#else #else
/* implies SCSI_G_NCR5380_MEM */ /* implies SCSI_G_NCR5380_MEM */
memcpy_toio(hostdata->iomem + NCR53C400_host_buffer, memcpy_toio(hostdata->iomem + NCR53C400_host_buffer,
...@@ -660,7 +652,7 @@ static inline int NCR5380_pwrite(struct Scsi_Host *instance, unsigned char *src, ...@@ -660,7 +652,7 @@ static inline int NCR5380_pwrite(struct Scsi_Host *instance, unsigned char *src,
#if 0 #if 0
printk("53C400w: waiting for registers to be available\n"); printk("53C400w: waiting for registers to be available\n");
THEY NEVER DO ! while (NCR5380_read(C400_CONTROL_STATUS_REG) & CSR_53C80_REG); THEY NEVER DO ! while (NCR5380_read(hostdata->c400_ctl_status) & CSR_53C80_REG);
printk("53C400w: Got em\n"); printk("53C400w: Got em\n");
#endif #endif
...@@ -668,7 +660,7 @@ static inline int NCR5380_pwrite(struct Scsi_Host *instance, unsigned char *src, ...@@ -668,7 +660,7 @@ static inline int NCR5380_pwrite(struct Scsi_Host *instance, unsigned char *src,
/* All documentation says to check for this. Maybe my hardware is too /* All documentation says to check for this. Maybe my hardware is too
* fast. Waiting for it seems to work fine! KLL * fast. Waiting for it seems to work fine! KLL
*/ */
while (!(i = NCR5380_read(C400_CONTROL_STATUS_REG) & CSR_GATED_53C80_IRQ)) while (!(i = NCR5380_read(hostdata->c400_ctl_status) & CSR_GATED_53C80_IRQ))
; // FIXME - no timeout ; // FIXME - no timeout
/* /*
......
drivers/scsi/g_NCR5380.h
View file @ 12150797
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#define NCR5380_map_type int #define NCR5380_map_type int
#define NCR5380_map_name port #define NCR5380_map_name port
#define NCR53C400_register_offset 0
#ifdef CONFIG_SCSI_GENERIC_NCR53C400 #ifdef CONFIG_SCSI_GENERIC_NCR53C400
#define NCR5380_region_size 16 #define NCR5380_region_size 16
...@@ -42,7 +41,10 @@ ...@@ -42,7 +41,10 @@
#define NCR5380_write(reg, value) \ #define NCR5380_write(reg, value) \
outb(value, instance->io_port + (reg)) outb(value, instance->io_port + (reg))
#define NCR5380_implementation_fields /* none */ #define NCR5380_implementation_fields \
int c400_ctl_status; \
int c400_blk_cnt; \
int c400_host_buf;
#else #else
/* therefore SCSI_G_NCR5380_MEM */ /* therefore SCSI_G_NCR5380_MEM */
...@@ -50,7 +52,6 @@ ...@@ -50,7 +52,6 @@
#define NCR5380_map_type unsigned long #define NCR5380_map_type unsigned long
#define NCR5380_map_name base #define NCR5380_map_name base
#define NCR53C400_register_offset 0x108
#define NCR53C400_mem_base 0x3880 #define NCR53C400_mem_base 0x3880
#define NCR53C400_host_buffer 0x3900 #define NCR53C400_host_buffer 0x3900
#define NCR5380_region_size 0x3a00 #define NCR5380_region_size 0x3a00
...@@ -63,7 +64,10 @@ ...@@ -63,7 +64,10 @@
NCR53C400_mem_base + (reg)) NCR53C400_mem_base + (reg))
#define NCR5380_implementation_fields \ #define NCR5380_implementation_fields \
void __iomem *iomem; void __iomem *iomem; \
int c400_ctl_status; \
int c400_blk_cnt; \
int c400_host_buf;
#endif #endif
......
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