Skip to content

L
linux
Commit 54b8f97b authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds
Browse files
Options

[PATCH] NCR53C9x ESP updates 

NCR53C9x ESP SCSI driver updates:
  - Port recent 2.5.x Sun/SPARC ESP SCSI driver changes to the NCR53C9x ESP
    SCSI drivers
  - Move NCR53C9x ESP host templates and host adapter-specific definitions from
    the host adapter-specific header files to the source files
  - Move common NCR53C9x ESP prototypes from the host adapter-specific header
    files to NCR53C9x.h

This affects the following SCSI host adapters:
  - M68k/PPC Amiga Blizzard 1230IV, 1260, and 2060
  - M68k/PPC Amiga BSC Oktagon
  - M68k/PPC Amiga Cyberstorm and Cyberstorm II
  - M68k/PPC Amiga Phase 5 Fastlane
  - MIPS DECstation NCR53C94
  - MIPS JAZZ Fas216
  - M68k Mac 53C9x
  - ia32 MCA 53C9x
  - M68k Sun-3x ESP
parent ec0d2ffe
Show whitespace changes
Inline Side-by-side
Showing with 435 additions and 709 deletions
drivers/scsi/NCR53C9x.c
View file @ 54b8f97b
...@@ -715,6 +715,9 @@ void esp_initialize(struct NCR_ESP *esp) ...@@ -715,6 +715,9 @@ void esp_initialize(struct NCR_ESP *esp)
esp->targets_present = 0; esp->targets_present = 0;
esp->resetting_bus = 0; esp->resetting_bus = 0;
esp->snip = 0; esp->snip = 0;
init_waitqueue_head(&esp->reset_queue);
esp->fas_premature_intr_workaround = 0; esp->fas_premature_intr_workaround = 0;
for(i = 0; i < 32; i++) for(i = 0; i < 32; i++)
esp->espcmdlog[i] = 0; esp->espcmdlog[i] = 0;
...@@ -1037,25 +1040,6 @@ static void esp_exec_cmd(struct NCR_ESP *esp) ...@@ -1037,25 +1040,6 @@ static void esp_exec_cmd(struct NCR_ESP *esp)
lun = SCptr->lun; lun = SCptr->lun;
target = SCptr->target; target = SCptr->target;
/*
* If esp_dev == NULL then we need to allocate a struct for our data
*/
if (!esp_dev) {
esp_dev = kmalloc(sizeof(struct esp_device), GFP_ATOMIC);
if (!esp_dev) {
/* We're SOL. Print a message and bail */
printk(KERN_WARNING "esp: no mem for esp_device %d/%d\n",
target, lun);
esp->current_SC = NULL;
SCptr->result = DID_ERROR << 16;
SCptr->done(SCptr);
return;
}
memset(esp_dev, 0, sizeof(struct esp_device));
SDptr->hostdata = esp_dev;
}
esp->snip = 0; esp->snip = 0;
esp->msgout_len = 0; esp->msgout_len = 0;
...@@ -1371,7 +1355,7 @@ static void esp_dump_state(struct NCR_ESP *esp, ...@@ -1371,7 +1355,7 @@ static void esp_dump_state(struct NCR_ESP *esp,
ESPLOG(("\n")); ESPLOG(("\n"));
} }
/* Abort a command. */ /* Abort a command. The host_lock is acquired by caller. */
int esp_abort(Scsi_Cmnd *SCptr) int esp_abort(Scsi_Cmnd *SCptr)
{ {
struct NCR_ESP *esp = (struct NCR_ESP *) SCptr->host->hostdata; struct NCR_ESP *esp = (struct NCR_ESP *) SCptr->host->hostdata;
...@@ -1392,7 +1376,7 @@ int esp_abort(Scsi_Cmnd *SCptr) ...@@ -1392,7 +1376,7 @@ int esp_abort(Scsi_Cmnd *SCptr)
esp->msgout_len = 1; esp->msgout_len = 1;
esp->msgout_ctr = 0; esp->msgout_ctr = 0;
esp_cmd(esp, eregs, ESP_CMD_SATN); esp_cmd(esp, eregs, ESP_CMD_SATN);
return SCSI_ABORT_PENDING; return SUCCESS;
} }
/* If it is still in the issue queue then we can safely /* If it is still in the issue queue then we can safely
...@@ -1417,7 +1401,7 @@ int esp_abort(Scsi_Cmnd *SCptr) ...@@ -1417,7 +1401,7 @@ int esp_abort(Scsi_Cmnd *SCptr)
this->done(this); this->done(this);
if(don) if(don)
esp->dma_ints_on(esp); esp->dma_ints_on(esp);
return SCSI_ABORT_SUCCESS; return SUCCESS;
} }
} }
} }
...@@ -1430,19 +1414,19 @@ int esp_abort(Scsi_Cmnd *SCptr) ...@@ -1430,19 +1414,19 @@ int esp_abort(Scsi_Cmnd *SCptr)
if(esp->current_SC) { if(esp->current_SC) {
if(don) if(don)
esp->dma_ints_on(esp); esp->dma_ints_on(esp);
return SCSI_ABORT_BUSY; return FAILED;
} }
/* It's disconnected, we have to reconnect to re-establish /* It's disconnected, we have to reconnect to re-establish
* the nexus and tell the device to abort. However, we really * the nexus and tell the device to abort. However, we really
* cannot 'reconnect' per se, therefore we tell the upper layer * cannot 'reconnect' per se. Don't try to be fancy, just
* the safest thing we can. This is, wait a bit, if nothing * indicate failure, which causes our caller to reset the whole
* happens, we are really hung so reset the bus. * bus.
*/ */
if(don) if(don)
esp->dma_ints_on(esp); esp->dma_ints_on(esp);
return SCSI_ABORT_SNOOZE; return FAILED;
} }
/* We've sent ESP_CMD_RS to the ESP, the interrupt had just /* We've sent ESP_CMD_RS to the ESP, the interrupt had just
...@@ -1476,6 +1460,7 @@ static int esp_finish_reset(struct NCR_ESP *esp, ...@@ -1476,6 +1460,7 @@ static int esp_finish_reset(struct NCR_ESP *esp,
/* SCSI bus reset is complete. */ /* SCSI bus reset is complete. */
esp->resetting_bus = 0; esp->resetting_bus = 0;
wake_up(&esp->reset_queue);
/* Ok, now it is safe to get commands going once more. */ /* Ok, now it is safe to get commands going once more. */
if(esp->issue_SC) if(esp->issue_SC)
...@@ -1496,13 +1481,22 @@ static int esp_do_resetbus(struct NCR_ESP *esp, ...@@ -1496,13 +1481,22 @@ static int esp_do_resetbus(struct NCR_ESP *esp,
/* Reset ESP chip, reset hanging bus, then kill active and /* Reset ESP chip, reset hanging bus, then kill active and
* disconnected commands for targets without soft reset. * disconnected commands for targets without soft reset.
*
* The host_lock is acquired by caller.
*/ */
int esp_reset(Scsi_Cmnd *SCptr, unsigned int how) int esp_reset(Scsi_Cmnd *SCptr)
{ {
struct NCR_ESP *esp = (struct NCR_ESP *) SCptr->host->hostdata; struct NCR_ESP *esp = (struct NCR_ESP *) SCptr->host->hostdata;
(void) esp_do_resetbus(esp, esp->eregs); (void) esp_do_resetbus(esp, esp->eregs);
return SCSI_RESET_PENDING;
spin_unlock_irq(esp->ehost->host_lock);
wait_event(esp->reset_queue, (esp->resetting_bus == 0));
spin_lock_irq(esp->ehost->host_lock);
return SUCCESS;
} }
/* Internal ESP done function. */ /* Internal ESP done function. */
......
drivers/scsi/NCR53C9x.h
View file @ 54b8f97b
...@@ -407,6 +407,7 @@ struct NCR_ESP { ...@@ -407,6 +407,7 @@ struct NCR_ESP {
* cannot be assosciated with any specific command. * cannot be assosciated with any specific command.
*/ */
unchar resetting_bus; unchar resetting_bus;
wait_queue_head_t reset_queue;
unchar do_pio_cmds; /* Do command transfer with pio */ unchar do_pio_cmds; /* Do command transfer with pio */
...@@ -657,4 +658,11 @@ extern void esp_deallocate(struct NCR_ESP *); ...@@ -657,4 +658,11 @@ extern void esp_deallocate(struct NCR_ESP *);
extern void esp_release(void); extern void esp_release(void);
extern void esp_initialize(struct NCR_ESP *); extern void esp_initialize(struct NCR_ESP *);
extern void esp_intr(int, void *, struct pt_regs *); extern void esp_intr(int, void *, struct pt_regs *);
extern const char *esp_info(struct Scsi_Host *);
extern int esp_queue(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
extern int esp_command(Scsi_Cmnd *);
extern int esp_abort(Scsi_Cmnd *);
extern int esp_reset(Scsi_Cmnd *);
extern int esp_proc_info(char *buffer, char **start, off_t offset, int length,
int hostno, int inout);
#endif /* !(NCR53C9X_H) */ #endif /* !(NCR53C9X_H) */
drivers/scsi/blz1230.c
View file @ 54b8f97b
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include "scsi.h" #include "scsi.h"
#include "hosts.h" #include "hosts.h"
#include "NCR53C9x.h" #include "NCR53C9x.h"
#include "blz1230.h"
#include <linux/zorro.h> #include <linux/zorro.h>
#include <asm/irq.h> #include <asm/irq.h>
...@@ -40,6 +39,42 @@ ...@@ -40,6 +39,42 @@
#define MKIV 1 #define MKIV 1
/* The controller registers can be found in the Z2 config area at these
* offsets:
*/
#define BLZ1230_ESP_ADDR 0x8000
#define BLZ1230_DMA_ADDR 0x10000
#define BLZ1230II_ESP_ADDR 0x10000
#define BLZ1230II_DMA_ADDR 0x10021
/* The Blizzard 1230 DMA interface
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Only two things can be programmed in the Blizzard DMA:
* 1) The data direction is controlled by the status of bit 31 (1 = write)
* 2) The source/dest address (word aligned, shifted one right) in bits 30-0
*
* Program DMA by first latching the highest byte of the address/direction
* (i.e. bits 31-24 of the long word constructed as described in steps 1+2
* above). Then write each byte of the address/direction (starting with the
* top byte, working down) to the DMA address register.
*
* Figure out interrupt status by reading the ESP status byte.
*/
struct blz1230_dma_registers {
volatile unsigned char dma_addr; /* DMA address [0x0000] */
unsigned char dmapad2[0x7fff];
volatile unsigned char dma_latch; /* DMA latch [0x8000] */
};
struct blz1230II_dma_registers {
volatile unsigned char dma_addr; /* DMA address [0x0000] */
unsigned char dmapad2[0xf];
volatile unsigned char dma_latch; /* DMA latch [0x0010] */
};
#define BLZ1230_DMA_WRITE 0x80000000
static int dma_bytes_sent(struct NCR_ESP *esp, int fifo_count); static int dma_bytes_sent(struct NCR_ESP *esp, int fifo_count);
static int dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp); static int dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp);
static void dma_dump_state(struct NCR_ESP *esp); static void dma_dump_state(struct NCR_ESP *esp);
...@@ -279,12 +314,6 @@ static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write) ...@@ -279,12 +314,6 @@ static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write)
#define HOSTS_C #define HOSTS_C
#include "blz1230.h"
static Scsi_Host_Template driver_template = SCSI_BLZ1230;
#include "scsi_module.c"
int blz1230_esp_release(struct Scsi_Host *instance) int blz1230_esp_release(struct Scsi_Host *instance)
{ {
#ifdef MODULE #ifdef MODULE
...@@ -297,4 +326,25 @@ int blz1230_esp_release(struct Scsi_Host *instance) ...@@ -297,4 +326,25 @@ int blz1230_esp_release(struct Scsi_Host *instance)
return 1; return 1;
} }
static Scsi_Host_Template driver_template = {
.proc_name = "esp-blz1230",
.proc_info = esp_proc_info,
.name = "Blizzard1230 SCSI IV",
.detect = blz1230_esp_detect,
.release = blz1230_esp_release,
.command = esp_command,
.queuecommand = esp_queue,
.eh_abort_handler = esp_abort,
.eh_bus_reset_handler = esp_reset,
.can_queue = 7,
.this_id = 7,
.sg_tablesize = SG_ALL,
.cmd_per_lun = 1,
.use_clustering = ENABLE_CLUSTERING
};
#include "scsi_module.c"
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
drivers/scsi/blz1230.h deleted 100644 → 0
View file @ ec0d2ffe
/* blz1230.h: Defines and structures for the Blizzard 1230 SCSI IV driver.
*
* Copyright (C) 1996 Jesper Skov (jskov@cygnus.co.uk)
*
* This file is based on cyber_esp.h (hence the occasional reference to
* CyberStorm).
*/
#include "NCR53C9x.h"
#ifndef BLZ1230_H
#define BLZ1230_H
/* The controller registers can be found in the Z2 config area at these
* offsets:
*/
#define BLZ1230_ESP_ADDR 0x8000
#define BLZ1230_DMA_ADDR 0x10000
#define BLZ1230II_ESP_ADDR 0x10000
#define BLZ1230II_DMA_ADDR 0x10021
/* The Blizzard 1230 DMA interface
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Only two things can be programmed in the Blizzard DMA:
* 1) The data direction is controlled by the status of bit 31 (1 = write)
* 2) The source/dest address (word aligned, shifted one right) in bits 30-0
*
* Program DMA by first latching the highest byte of the address/direction
* (i.e. bits 31-24 of the long word constructed as described in steps 1+2
* above). Then write each byte of the address/direction (starting with the
* top byte, working down) to the DMA address register.
*
* Figure out interrupt status by reading the ESP status byte.
*/
struct blz1230_dma_registers {
volatile unsigned char dma_addr; /* DMA address [0x0000] */
unsigned char dmapad2[0x7fff];
volatile unsigned char dma_latch; /* DMA latch [0x8000] */
};
struct blz1230II_dma_registers {
volatile unsigned char dma_addr; /* DMA address [0x0000] */
unsigned char dmapad2[0xf];
volatile unsigned char dma_latch; /* DMA latch [0x0010] */
};
#define BLZ1230_DMA_WRITE 0x80000000
extern int blz1230_esp_detect(struct SHT *);
extern int blz1230_esp_release(struct Scsi_Host *);
extern const char *esp_info(struct Scsi_Host *);
extern int esp_queue(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
extern int esp_command(Scsi_Cmnd *);
extern int esp_abort(Scsi_Cmnd *);
extern int esp_reset(Scsi_Cmnd *, unsigned int);
extern int esp_proc_info(char *buffer, char **start, off_t offset, int length,
int hostno, int inout);
#define SCSI_BLZ1230 { .proc_name = "esp-blz1230", \
.proc_info = esp_proc_info, \
.name = "Blizzard1230 SCSI IV", \
.detect = blz1230_esp_detect, \
.release = blz1230_esp_release, \
.command = esp_command, \
.queuecommand = esp_queue, \
.abort = esp_abort, \
.reset = esp_reset, \
.can_queue = 7, \
.this_id = 7, \
.sg_tablesize = SG_ALL, \
.cmd_per_lun = 1, \
.use_clustering = ENABLE_CLUSTERING }
#endif /* BLZ1230_H */
drivers/scsi/blz2060.c
View file @ 54b8f97b
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include "scsi.h" #include "scsi.h"
#include "hosts.h" #include "hosts.h"
#include "NCR53C9x.h" #include "NCR53C9x.h"
#include "blz2060.h"
#include <linux/zorro.h> #include <linux/zorro.h>
#include <asm/irq.h> #include <asm/irq.h>
...@@ -38,6 +37,38 @@ ...@@ -38,6 +37,38 @@
#include <asm/pgtable.h> #include <asm/pgtable.h>
/* The controller registers can be found in the Z2 config area at these
* offsets:
*/
#define BLZ2060_ESP_ADDR 0x1ff00
#define BLZ2060_DMA_ADDR 0x1ffe0
/* The Blizzard 2060 DMA interface
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Only two things can be programmed in the Blizzard DMA:
* 1) The data direction is controlled by the status of bit 31 (1 = write)
* 2) The source/dest address (word aligned, shifted one right) in bits 30-0
*
* Figure out interrupt status by reading the ESP status byte.
*/
struct blz2060_dma_registers {
volatile unsigned char dma_led_ctrl; /* DMA led control [0x000] */
unsigned char dmapad1[0x0f];
volatile unsigned char dma_addr0; /* DMA address (MSB) [0x010] */
unsigned char dmapad2[0x03];
volatile unsigned char dma_addr1; /* DMA address [0x014] */
unsigned char dmapad3[0x03];
volatile unsigned char dma_addr2; /* DMA address [0x018] */
unsigned char dmapad4[0x03];
volatile unsigned char dma_addr3; /* DMA address (LSB) [0x01c] */
};
#define BLZ2060_DMA_WRITE 0x80000000
/* DMA control bits */
#define BLZ2060_DMA_LED 0x02 /* HD led control 1 = off */
static int dma_bytes_sent(struct NCR_ESP *esp, int fifo_count); static int dma_bytes_sent(struct NCR_ESP *esp, int fifo_count);
static int dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp); static int dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp);
static void dma_dump_state(struct NCR_ESP *esp); static void dma_dump_state(struct NCR_ESP *esp);
...@@ -236,12 +267,6 @@ static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write) ...@@ -236,12 +267,6 @@ static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write)
#define HOSTS_C #define HOSTS_C
#include "blz2060.h"
static Scsi_Host_Template driver_template = SCSI_BLZ2060;
#include "scsi_module.c"
int blz2060_esp_release(struct Scsi_Host *instance) int blz2060_esp_release(struct Scsi_Host *instance)
{ {
#ifdef MODULE #ifdef MODULE
...@@ -255,4 +280,24 @@ int blz2060_esp_release(struct Scsi_Host *instance) ...@@ -255,4 +280,24 @@ int blz2060_esp_release(struct Scsi_Host *instance)
return 1; return 1;
} }
static Scsi_Host_Template driver_template = {
.proc_name = "esp-blz2060",
.proc_info = esp_proc_info,
.name = "Blizzard2060 SCSI",
.detect = blz2060_esp_detect,
.release = blz2060_esp_release,
.queuecommand = esp_queue,
.eh_abort_handler = esp_abort,
.eh_bus_reset_handler = esp_reset,
.can_queue = 7,
.this_id = 7,
.sg_tablesize = SG_ALL,
.cmd_per_lun = 1,
.use_clustering = ENABLE_CLUSTERING
};
#include "scsi_module.c"
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
drivers/scsi/blz2060.h deleted 100644 → 0
View file @ ec0d2ffe
/* blz2060.h: Defines and structures for the Blizzard 2060 SCSI driver.
*
* Copyright (C) 1996 Jesper Skov (jskov@cygnus.co.uk)
*
* This file is based on cyber_esp.h (hence the occasional reference to
* CyberStorm).
*/
#include "NCR53C9x.h"
#ifndef BLZ2060_H
#define BLZ2060_H
/* The controller registers can be found in the Z2 config area at these
* offsets:
*/
#define BLZ2060_ESP_ADDR 0x1ff00
#define BLZ2060_DMA_ADDR 0x1ffe0
/* The Blizzard 2060 DMA interface
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Only two things can be programmed in the Blizzard DMA:
* 1) The data direction is controlled by the status of bit 31 (1 = write)
* 2) The source/dest address (word aligned, shifted one right) in bits 30-0
*
* Figure out interrupt status by reading the ESP status byte.
*/
struct blz2060_dma_registers {
volatile unsigned char dma_led_ctrl; /* DMA led control [0x000] */
unsigned char dmapad1[0x0f];
volatile unsigned char dma_addr0; /* DMA address (MSB) [0x010] */
unsigned char dmapad2[0x03];
volatile unsigned char dma_addr1; /* DMA address [0x014] */
unsigned char dmapad3[0x03];
volatile unsigned char dma_addr2; /* DMA address [0x018] */
unsigned char dmapad4[0x03];
volatile unsigned char dma_addr3; /* DMA address (LSB) [0x01c] */
};
#define BLZ2060_DMA_WRITE 0x80000000
/* DMA control bits */
#define BLZ2060_DMA_LED 0x02 /* HD led control 1 = off */
extern int blz2060_esp_detect(struct SHT *);
extern int blz2060_esp_release(struct Scsi_Host *);
extern const char *esp_info(struct Scsi_Host *);
extern int esp_queue(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
extern int esp_command(Scsi_Cmnd *);
extern int esp_abort(Scsi_Cmnd *);
extern int esp_reset(Scsi_Cmnd *, unsigned int);
extern int esp_proc_info(char *buffer, char **start, off_t offset, int length,
int hostno, int inout);
#define SCSI_BLZ2060 { .proc_name = "esp-blz2060", \
.proc_info = esp_proc_info, \
.name = "Blizzard2060 SCSI", \
.detect = blz2060_esp_detect, \
.release = blz2060_esp_release, \
.queuecommand = esp_queue, \
.abort = esp_abort, \
.reset = esp_reset, \
.can_queue = 7, \
.this_id = 7, \
.sg_tablesize = SG_ALL, \
.cmd_per_lun = 1, \
.use_clustering = ENABLE_CLUSTERING }
#endif /* BLZ2060_H */
drivers/scsi/cyberstorm.c
View file @ 54b8f97b
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include "scsi.h" #include "scsi.h"
#include "hosts.h" #include "hosts.h"
#include "NCR53C9x.h" #include "NCR53C9x.h"
#include "cyberstorm.h"
#include <linux/zorro.h> #include <linux/zorro.h>
#include <asm/irq.h> #include <asm/irq.h>
...@@ -41,6 +40,43 @@ ...@@ -41,6 +40,43 @@
#include <asm/pgtable.h> #include <asm/pgtable.h>
/* The controller registers can be found in the Z2 config area at these
* offsets:
*/
#define CYBER_ESP_ADDR 0xf400
#define CYBER_DMA_ADDR 0xf800
/* The CyberStorm DMA interface */
struct cyber_dma_registers {
volatile unsigned char dma_addr0; /* DMA address (MSB) [0x000] */
unsigned char dmapad1[1];
volatile unsigned char dma_addr1; /* DMA address [0x002] */
unsigned char dmapad2[1];
volatile unsigned char dma_addr2; /* DMA address [0x004] */
unsigned char dmapad3[1];
volatile unsigned char dma_addr3; /* DMA address (LSB) [0x006] */
unsigned char dmapad4[0x3fb];
volatile unsigned char cond_reg; /* DMA cond (ro) [0x402] */
#define ctrl_reg cond_reg /* DMA control (wo) [0x402] */
};
/* DMA control bits */
#define CYBER_DMA_LED 0x80 /* HD led control 1 = on */
#define CYBER_DMA_WRITE 0x40 /* DMA direction. 1 = write */
#define CYBER_DMA_Z3 0x20 /* 16 (Z2) or 32 (CHIP/Z3) bit DMA transfer */
/* DMA status bits */
#define CYBER_DMA_HNDL_INTR 0x80 /* DMA IRQ pending? */
/* The bits below appears to be Phase5 Debug bits only; they were not
* described by Phase5 so using them may seem a bit stupid...
*/
#define CYBER_HOST_ID 0x02 /* If set, host ID should be 7, otherwise
* it should be 6.
*/
#define CYBER_SLOW_CABLE 0x08 /* If *not* set, assume SLOW_CABLE */
static int dma_bytes_sent(struct NCR_ESP *esp, int fifo_count); static int dma_bytes_sent(struct NCR_ESP *esp, int fifo_count);
static int dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp); static int dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp);
static void dma_dump_state(struct NCR_ESP *esp); static void dma_dump_state(struct NCR_ESP *esp);
...@@ -302,12 +338,6 @@ static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write) ...@@ -302,12 +338,6 @@ static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write)
#define HOSTS_C #define HOSTS_C
#include "cyberstorm.h"
static Scsi_Host_Template driver_template = SCSI_CYBERSTORM;
#include "scsi_module.c"
int cyber_esp_release(struct Scsi_Host *instance) int cyber_esp_release(struct Scsi_Host *instance)
{ {
#ifdef MODULE #ifdef MODULE
...@@ -321,4 +351,24 @@ int cyber_esp_release(struct Scsi_Host *instance) ...@@ -321,4 +351,24 @@ int cyber_esp_release(struct Scsi_Host *instance)
return 1; return 1;
} }
static Scsi_Host_Template driver_template = {
.proc_name = "esp-cyberstorm",
.proc_info = esp_proc_info,
.name = "CyberStorm SCSI",
.detect = cyber_esp_detect,
.release = cyber_esp_release,
.queuecommand = esp_queue,
.eh_abort_handler = esp_abort,
.eh_bus_reset_handler = esp_reset,
.can_queue = 7,
.this_id = 7,
.sg_tablesize = SG_ALL,
.cmd_per_lun = 1,
.use_clustering = ENABLE_CLUSTERING
};
#include "scsi_module.c"
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
drivers/scsi/cyberstorm.h deleted 100644 → 0
View file @ ec0d2ffe
/* cyberstorm.h: Defines and structures for the CyberStorm SCSI driver.
*
* Copyright (C) 1996 Jesper Skov (jskov@cygnus.co.uk)
*/
#include "NCR53C9x.h"
#ifndef CYBER_ESP_H
#define CYBER_ESP_H
/* The controller registers can be found in the Z2 config area at these
* offsets:
*/
#define CYBER_ESP_ADDR 0xf400
#define CYBER_DMA_ADDR 0xf800
/* The CyberStorm DMA interface */
struct cyber_dma_registers {
volatile unsigned char dma_addr0; /* DMA address (MSB) [0x000] */
unsigned char dmapad1[1];
volatile unsigned char dma_addr1; /* DMA address [0x002] */
unsigned char dmapad2[1];
volatile unsigned char dma_addr2; /* DMA address [0x004] */
unsigned char dmapad3[1];
volatile unsigned char dma_addr3; /* DMA address (LSB) [0x006] */
unsigned char dmapad4[0x3fb];
volatile unsigned char cond_reg; /* DMA cond (ro) [0x402] */
#define ctrl_reg cond_reg /* DMA control (wo) [0x402] */
};
/* DMA control bits */
#define CYBER_DMA_LED 0x80 /* HD led control 1 = on */
#define CYBER_DMA_WRITE 0x40 /* DMA direction. 1 = write */
#define CYBER_DMA_Z3 0x20 /* 16 (Z2) or 32 (CHIP/Z3) bit DMA transfer */
/* DMA status bits */
#define CYBER_DMA_HNDL_INTR 0x80 /* DMA IRQ pending? */
/* The bits below appears to be Phase5 Debug bits only; they were not
* described by Phase5 so using them may seem a bit stupid...
*/
#define CYBER_HOST_ID 0x02 /* If set, host ID should be 7, otherwise
* it should be 6.
*/
#define CYBER_SLOW_CABLE 0x08 /* If *not* set, assume SLOW_CABLE */
extern int cyber_esp_detect(struct SHT *);
extern int cyber_esp_release(struct Scsi_Host *);
extern const char *esp_info(struct Scsi_Host *);
extern int esp_queue(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
extern int esp_command(Scsi_Cmnd *);
extern int esp_abort(Scsi_Cmnd *);
extern int esp_reset(Scsi_Cmnd *, unsigned int);
extern int esp_proc_info(char *buffer, char **start, off_t offset, int length,
int hostno, int inout);
#define SCSI_CYBERSTORM { .proc_name = "esp-cyberstorm", \
.proc_info = esp_proc_info, \
.name = "CyberStorm SCSI", \
.detect = cyber_esp_detect, \
.release = cyber_esp_release, \
.queuecommand = esp_queue, \
.abort = esp_abort, \
.reset = esp_reset, \
.can_queue = 7, \
.this_id = 7, \
.sg_tablesize = SG_ALL, \
.cmd_per_lun = 1, \
.use_clustering = ENABLE_CLUSTERING }
#endif /* CYBER_ESP_H */
drivers/scsi/cyberstormII.c
View file @ 54b8f97b
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include "scsi.h" #include "scsi.h"
#include "hosts.h" #include "hosts.h"
#include "NCR53C9x.h" #include "NCR53C9x.h"
#include "cyberstormII.h"
#include <linux/zorro.h> #include <linux/zorro.h>
#include <asm/irq.h> #include <asm/irq.h>
...@@ -37,6 +36,30 @@ ...@@ -37,6 +36,30 @@
#include <asm/pgtable.h> #include <asm/pgtable.h>
/* The controller registers can be found in the Z2 config area at these
* offsets:
*/
#define CYBERII_ESP_ADDR 0x1ff03
#define CYBERII_DMA_ADDR 0x1ff43
/* The CyberStorm II DMA interface */
struct cyberII_dma_registers {
volatile unsigned char cond_reg; /* DMA cond (ro) [0x000] */
#define ctrl_reg cond_reg /* DMA control (wo) [0x000] */
unsigned char dmapad4[0x3f];
volatile unsigned char dma_addr0; /* DMA address (MSB) [0x040] */
unsigned char dmapad1[3];
volatile unsigned char dma_addr1; /* DMA address [0x044] */
unsigned char dmapad2[3];
volatile unsigned char dma_addr2; /* DMA address [0x048] */
unsigned char dmapad3[3];
volatile unsigned char dma_addr3; /* DMA address (LSB) [0x04c] */
};
/* DMA control bits */
#define CYBERII_DMA_LED 0x02 /* HD led control 1 = on */
static int dma_bytes_sent(struct NCR_ESP *esp, int fifo_count); static int dma_bytes_sent(struct NCR_ESP *esp, int fifo_count);
static int dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp); static int dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp);
static void dma_dump_state(struct NCR_ESP *esp); static void dma_dump_state(struct NCR_ESP *esp);
...@@ -252,13 +275,6 @@ static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write) ...@@ -252,13 +275,6 @@ static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write)
#define HOSTS_C #define HOSTS_C
#include "cyberstormII.h"
static Scsi_Host_Template driver_template = SCSI_CYBERSTORMII;
#include "scsi_module.c"
int cyberII_esp_release(struct Scsi_Host *instance) int cyberII_esp_release(struct Scsi_Host *instance)
{ {
#ifdef MODULE #ifdef MODULE
...@@ -272,4 +288,24 @@ int cyberII_esp_release(struct Scsi_Host *instance) ...@@ -272,4 +288,24 @@ int cyberII_esp_release(struct Scsi_Host *instance)
return 1; return 1;
} }
static Scsi_Host_Template driver_template = {
.proc_name = "esp-cyberstormII",
.proc_info = esp_proc_info,
.name = "CyberStorm Mk II SCSI",
.detect = cyberII_esp_detect,
.release = cyberII_esp_release,
.queuecommand = esp_queue,
.eh_abort_handler = esp_abort,
.eh_bus_reset_handler = esp_reset,
.can_queue = 7,
.this_id = 7,
.sg_tablesize = SG_ALL,
.cmd_per_lun = 1,
.use_clustering = ENABLE_CLUSTERING
};
#include "scsi_module.c"
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
drivers/scsi/cyberstormII.h deleted 100644 → 0
View file @ ec0d2ffe
/* cyberstormII.h: Defines and structures for the CyberStorm SCSI Mk II driver.
*
* Copyright (C) 1996 Jesper Skov (jskov@cygnus.co.uk)
*/
#include "NCR53C9x.h"
#ifndef CYBERII_ESP_H
#define CYBERII_ESP_H
/* The controller registers can be found in the Z2 config area at these
* offsets:
*/
#define CYBERII_ESP_ADDR 0x1ff03
#define CYBERII_DMA_ADDR 0x1ff43
/* The CyberStorm II DMA interface */
struct cyberII_dma_registers {
volatile unsigned char cond_reg; /* DMA cond (ro) [0x000] */
#define ctrl_reg cond_reg /* DMA control (wo) [0x000] */
unsigned char dmapad4[0x3f];
volatile unsigned char dma_addr0; /* DMA address (MSB) [0x040] */
unsigned char dmapad1[3];
volatile unsigned char dma_addr1; /* DMA address [0x044] */
unsigned char dmapad2[3];
volatile unsigned char dma_addr2; /* DMA address [0x048] */
unsigned char dmapad3[3];
volatile unsigned char dma_addr3; /* DMA address (LSB) [0x04c] */
};
/* DMA control bits */
#define CYBERII_DMA_LED 0x02 /* HD led control 1 = on */
extern int cyberII_esp_detect(struct SHT *);
extern int cyberII_esp_release(struct Scsi_Host *);
extern const char *esp_info(struct Scsi_Host *);
extern int esp_queue(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
extern int esp_command(Scsi_Cmnd *);
extern int esp_abort(Scsi_Cmnd *);
extern int esp_reset(Scsi_Cmnd *, unsigned int);
extern int esp_proc_info(char *buffer, char **start, off_t offset, int length,
int hostno, int inout);
#define SCSI_CYBERSTORMII { .proc_name = "esp-cyberstormII", \
.proc_info = esp_proc_info, \
.name = "CyberStorm Mk II SCSI", \
.detect = cyberII_esp_detect, \
.release = cyberII_esp_release, \
.queuecommand = esp_queue, \
.abort = esp_abort, \
.reset = esp_reset, \
.can_queue = 7, \
.this_id = 7, \
.sg_tablesize = SG_ALL, \
.cmd_per_lun = 1, \
.use_clustering = ENABLE_CLUSTERING }
#endif /* CYBERII_ESP_H */
drivers/scsi/dec_esp.c
View file @ 54b8f97b
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include "scsi.h" #include "scsi.h"
#include "hosts.h" #include "hosts.h"
#include "NCR53C9x.h" #include "NCR53C9x.h"
#include "dec_esp.h"
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/jazz.h> #include <asm/jazz.h>
...@@ -46,6 +45,11 @@ ...@@ -46,6 +45,11 @@
#include <asm/dec/ioasic_ints.h> #include <asm/dec/ioasic_ints.h>
#include <asm/dec/machtype.h> #include <asm/dec/machtype.h>
#define DEC_SCSI_SREG 0
#define DEC_SCSI_DMAREG 0x40000
#define DEC_SCSI_SRAM 0x80000
#define DEC_SCSI_DIAG 0xC0000
/* /*
* Once upon a time the pmaz code used to be working but * Once upon a time the pmaz code used to be working but
* it hasn't been maintained for quite some time. * it hasn't been maintained for quite some time.
...@@ -103,7 +107,25 @@ volatile unsigned long *scsi_sdr1; ...@@ -103,7 +107,25 @@ volatile unsigned long *scsi_sdr1;
static void scsi_dma_int(int, void *, struct pt_regs *); static void scsi_dma_int(int, void *, struct pt_regs *);
static Scsi_Host_Template driver_template = SCSI_DEC_ESP; int dec_esp_detect(Scsi_Host_Template * tpnt);
static Scsi_Host_Template driver_template = {
.proc_name = "esp",
.proc_info = &esp_proc_info,
.name = "NCR53C94",
.detect = dec_esp_detect,
.info = esp_info,
.command = esp_command,
.queuecommand = esp_queue,
.eh_abort_handler = esp_abort,
.eh_bus_reset_handler = esp_reset,
.can_queue = 7,
.this_id = 7,
.sg_tablesize = SG_ALL,
.cmd_per_lun = 1,
.use_clustering = DISABLE_CLUSTERING,
};
#include "scsi_module.c" #include "scsi_module.c"
......
drivers/scsi/dec_esp.h deleted 100644 → 0
View file @ ec0d2ffe
/* dec_esp.h: Defines and structures for the JAZZ SCSI driver.
*
* DECstation changes Copyright (C) 1998 Harald Koerfgen
* and David Airlie
*
* based on jazz_esp.h:
* Copyright (C) 1997 Thomas Bogendoerfer (tsbogend@alpha.franken.de)
*/
#ifndef DEC_ESP_H
#define DEC_ESP_H
#include "NCR53C9x.h"
#define DEC_SCSI_SREG 0
#define DEC_SCSI_DMAREG 0x40000
#define DEC_SCSI_SRAM 0x80000
#define DEC_SCSI_DIAG 0xC0000
extern int dec_esp_detect(struct SHT *);
extern const char *esp_info(struct Scsi_Host *);
extern int esp_queue(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
extern int esp_command(Scsi_Cmnd *);
extern int esp_abort(Scsi_Cmnd *);
extern int esp_reset(Scsi_Cmnd *, unsigned int);
extern int esp_proc_info(char *buffer, char **start, off_t offset, int length,
int hostno, int inout);
#define SCSI_DEC_ESP { \
.proc_name = "esp", \
.proc_info = &esp_proc_info, \
.name = "NCR53C94", \
.detect = dec_esp_detect, \
.info = esp_info, \
.command = esp_command, \
.queuecommand = esp_queue, \
.abort = esp_abort, \
.reset = esp_reset, \
.can_queue = 7, \
.this_id = 7, \
.sg_tablesize = SG_ALL, \
.cmd_per_lun = 1, \
.use_clustering = DISABLE_CLUSTERING, }
#endif /* DEC_ESP_H */
drivers/scsi/fastlane.c
View file @ 54b8f97b
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
#include "scsi.h" #include "scsi.h"
#include "hosts.h" #include "hosts.h"
#include "NCR53C9x.h" #include "NCR53C9x.h"
#include "fastlane.h"
#include <linux/zorro.h> #include <linux/zorro.h>
#include <asm/irq.h> #include <asm/irq.h>
...@@ -53,6 +52,36 @@ ...@@ -53,6 +52,36 @@
#define NODMAIRQ #define NODMAIRQ
#endif #endif
/* The controller registers can be found in the Z2 config area at these
* offsets:
*/
#define FASTLANE_ESP_ADDR 0x1000001
#define FASTLANE_DMA_ADDR 0x1000041
/* The Fastlane DMA interface */
struct fastlane_dma_registers {
volatile unsigned char cond_reg; /* DMA status (ro) [0x0000] */
#define ctrl_reg cond_reg /* DMA control (wo) [0x0000] */
unsigned char dmapad1[0x3f];
volatile unsigned char clear_strobe; /* DMA clear (wo) [0x0040] */
};
/* DMA status bits */
#define FASTLANE_DMA_MINT 0x80
#define FASTLANE_DMA_IACT 0x40
#define FASTLANE_DMA_CREQ 0x20
/* DMA control bits */
#define FASTLANE_DMA_FCODE 0xa0
#define FASTLANE_DMA_MASK 0xf3
#define FASTLANE_DMA_LED 0x10 /* HD led control 1 = on */
#define FASTLANE_DMA_WRITE 0x08 /* 1 = write */
#define FASTLANE_DMA_ENABLE 0x04 /* Enable DMA */
#define FASTLANE_DMA_EDI 0x02 /* Enable DMA IRQ ? */
#define FASTLANE_DMA_ESI 0x01 /* Enable SCSI IRQ */
static int dma_bytes_sent(struct NCR_ESP *esp, int fifo_count); static int dma_bytes_sent(struct NCR_ESP *esp, int fifo_count);
static int dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp); static int dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp);
static inline void dma_clear(struct NCR_ESP *esp); static inline void dma_clear(struct NCR_ESP *esp);
...@@ -356,11 +385,6 @@ static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write) ...@@ -356,11 +385,6 @@ static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write)
#define HOSTS_C #define HOSTS_C
#include "fastlane.h"
static Scsi_Host_Template driver_template = SCSI_FASTLANE;
#include "scsi_module.c"
int fastlane_esp_release(struct Scsi_Host *instance) int fastlane_esp_release(struct Scsi_Host *instance)
{ {
#ifdef MODULE #ifdef MODULE
...@@ -373,4 +397,23 @@ int fastlane_esp_release(struct Scsi_Host *instance) ...@@ -373,4 +397,23 @@ int fastlane_esp_release(struct Scsi_Host *instance)
return 1; return 1;
} }
static Scsi_Host_Template driver_template = {
.proc_name = "esp-fastlane",
.proc_info = esp_proc_info,
.name = "Fastlane SCSI",
.detect = fastlane_esp_detect,
.release = fastlane_esp_release,
.queuecommand = esp_queue,
.eh_abort_handler = esp_abort,
.eh_bus_reset_handler = esp_reset,
.can_queue = 7,
.this_id = 7,
.sg_tablesize = SG_ALL,
.cmd_per_lun = 1,
.use_clustering = ENABLE_CLUSTERING
};
#include "scsi_module.c"
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
drivers/scsi/fastlane.h deleted 100644 → 0
View file @ ec0d2ffe
/* fastlane.h: Defines and structures for the Fastlane SCSI driver.
*
* Copyright (C) 1996 Jesper Skov (jskov@cygnus.co.uk)
*/
#include "NCR53C9x.h"
#ifndef FASTLANE_H
#define FASTLANE_H
/* The controller registers can be found in the Z2 config area at these
* offsets:
*/
#define FASTLANE_ESP_ADDR 0x1000001
#define FASTLANE_DMA_ADDR 0x1000041
/* The Fastlane DMA interface */
struct fastlane_dma_registers {
volatile unsigned char cond_reg; /* DMA status (ro) [0x0000] */
#define ctrl_reg cond_reg /* DMA control (wo) [0x0000] */
unsigned char dmapad1[0x3f];
volatile unsigned char clear_strobe; /* DMA clear (wo) [0x0040] */
};
/* DMA status bits */
#define FASTLANE_DMA_MINT 0x80
#define FASTLANE_DMA_IACT 0x40
#define FASTLANE_DMA_CREQ 0x20
/* DMA control bits */
#define FASTLANE_DMA_FCODE 0xa0
#define FASTLANE_DMA_MASK 0xf3
#define FASTLANE_DMA_LED 0x10 /* HD led control 1 = on */
#define FASTLANE_DMA_WRITE 0x08 /* 1 = write */
#define FASTLANE_DMA_ENABLE 0x04 /* Enable DMA */
#define FASTLANE_DMA_EDI 0x02 /* Enable DMA IRQ ? */
#define FASTLANE_DMA_ESI 0x01 /* Enable SCSI IRQ */
extern int fastlane_esp_detect(struct SHT *);
extern int fastlane_esp_release(struct Scsi_Host *);
extern const char *esp_info(struct Scsi_Host *);
extern int esp_queue(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
extern int esp_command(Scsi_Cmnd *);
extern int esp_abort(Scsi_Cmnd *);
extern int esp_reset(Scsi_Cmnd *, unsigned int);
extern int esp_proc_info(char *buffer, char **start, off_t offset, int length,
int hostno, int inout);
#define SCSI_FASTLANE { .proc_name = "esp-fastlane", \
.proc_info = esp_proc_info, \
.name = "Fastlane SCSI", \
.detect = fastlane_esp_detect, \
.release = fastlane_esp_release, \
.queuecommand = esp_queue, \
.abort = esp_abort, \
.reset = esp_reset, \
.can_queue = 7, \
.this_id = 7, \
.sg_tablesize = SG_ALL, \
.cmd_per_lun = 1, \
.use_clustering = ENABLE_CLUSTERING }
#endif /* FASTLANE_H */
drivers/scsi/jazz_esp.c
View file @ 54b8f97b
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#include "scsi.h" #include "scsi.h"
#include "hosts.h" #include "hosts.h"
#include "NCR53C9x.h" #include "NCR53C9x.h"
#include "jazz_esp.h"
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/jazz.h> #include <asm/jazz.h>
...@@ -273,3 +272,21 @@ static void dma_led_on(struct NCR_ESP *esp) ...@@ -273,3 +272,21 @@ static void dma_led_on(struct NCR_ESP *esp)
*(unsigned char *)JAZZ_HDC_LED = 1; *(unsigned char *)JAZZ_HDC_LED = 1;
#endif #endif
} }
static Scsi_Host_Template driver_template = {
.proc_name = "esp",
.proc_info = &esp_proc_info,
.name = "ESP 100/100a/200",
.detect = jazz_esp_detect,
.info = esp_info,
.command = esp_command,
.queuecommand = esp_queue,
.eh_abort_handler = esp_abort,
.eh_bus_reset_handler = esp_reset,
.can_queue = 7,
.this_id = 7,
.sg_tablesize = SG_ALL,
.cmd_per_lun = 1,
.use_clustering = DISABLE_CLUSTERING,
};
drivers/scsi/jazz_esp.h deleted 100644 → 0
View file @ ec0d2ffe
/* jazz_esp.h: Defines and structures for the JAZZ SCSI driver.
*
* Copyright (C) 1997 Thomas Bogendoerfer (tsbogend@alpha.franken.de)
*/
#ifndef JAZZ_ESP_H
#define JAZZ_ESP_H
#define EREGS_PAD(n)
#include "NCR53C9x.h"
extern int jazz_esp_detect(struct SHT *);
extern const char *esp_info(struct Scsi_Host *);
extern int esp_queue(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
extern int esp_command(Scsi_Cmnd *);
extern int esp_abort(Scsi_Cmnd *);
extern int esp_reset(Scsi_Cmnd *, unsigned int);
extern int esp_proc_info(char *buffer, char **start, off_t offset, int length,
int hostno, int inout);
#define SCSI_JAZZ_ESP { \
.proc_name = "esp", \
.proc_info = &esp_proc_info, \
.name = "ESP 100/100a/200", \
.detect = jazz_esp_detect, \
.info = esp_info, \
.command = esp_command, \
.queuecommand = esp_queue, \
.abort = esp_abort, \
.reset = esp_reset, \
.can_queue = 7, \
.this_id = 7, \
.sg_tablesize = SG_ALL, \
.cmd_per_lun = 1, \
.use_clustering = DISABLE_CLUSTERING, }
#endif /* JAZZ_ESP_H */
drivers/scsi/mac_esp.c
View file @ 54b8f97b
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include "scsi.h" #include "scsi.h"
#include "hosts.h" #include "hosts.h"
#include "NCR53C9x.h" #include "NCR53C9x.h"
#include "mac_esp.h"
#include <asm/io.h> #include <asm/io.h>
...@@ -41,6 +40,8 @@ ...@@ -41,6 +40,8 @@
#include <asm/macintosh.h> #include <asm/macintosh.h>
/* #define DEBUG_MAC_ESP */
#define mac_turnon_irq(x) mac_enable_irq(x) #define mac_turnon_irq(x) mac_enable_irq(x)
#define mac_turnoff_irq(x) mac_disable_irq(x) #define mac_turnoff_irq(x) mac_disable_irq(x)
...@@ -710,7 +711,22 @@ static void dma_setup_quick(struct NCR_ESP * esp, __u32 addr, int count, int wri ...@@ -710,7 +711,22 @@ static void dma_setup_quick(struct NCR_ESP * esp, __u32 addr, int count, int wri
#endif #endif
} }
static Scsi_Host_Template driver_template = SCSI_MAC_ESP; static Scsi_Host_Template driver_template = {
.proc_name = "esp",
.name = "Mac 53C9x SCSI",
.detect = mac_esp_detect,
.info = esp_info,
/* .command = esp_command, */
.queuecommand = esp_queue,
.eh_abort_handler = esp_abort,
.eh_bus_reset_handler = esp_reset,
.can_queue = 7,
.this_id = 7,
.sg_tablesize = SG_ALL,
.cmd_per_lun = 1,
.use_clustering = DISABLE_CLUSTERING
};
#include "scsi_module.c" #include "scsi_module.c"
......
drivers/scsi/mac_esp.h deleted 100644 → 0
View file @ ec0d2ffe
/*
mac_esp.h
copyright 1997 David Weis, weisd3458@uni.edu
*/
#include "NCR53C9x.h"
#ifndef MAC_ESP_H
#define MAC_ESP_H
/* #define DEBUG_MAC_ESP */
extern int mac_esp_detect(struct SHT *);
extern const char *esp_info(struct Scsi_Host *);
extern int esp_queue(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
extern int esp_command(Scsi_Cmnd *);
extern int esp_abort(Scsi_Cmnd *);
extern int esp_reset(Scsi_Cmnd *, unsigned int);
#define SCSI_MAC_ESP { .proc_name = "esp", \
.name = "Mac 53C9x SCSI", \
.detect = mac_esp_detect, \
.release = NULL, \
.info = esp_info, \
/* command: esp_command, */ \
.queuecommand = esp_queue, \
.abort = esp_abort, \
.reset = esp_reset, \
.can_queue = 7, \
.this_id = 7, \
.sg_tablesize = SG_ALL, \
.cmd_per_lun = 1, \
.use_clustering = DISABLE_CLUSTERING }
#endif /* MAC_ESP_H */
drivers/scsi/mca_53c9x.c
View file @ 54b8f97b
...@@ -44,13 +44,37 @@ ...@@ -44,13 +44,37 @@
#include "scsi.h" #include "scsi.h"
#include "hosts.h" #include "hosts.h"
#include "NCR53C9x.h" #include "NCR53C9x.h"
#include "mca_53c9x.h"
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mca_dma.h> #include <asm/mca_dma.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
/*
* From ibmmca.c (IBM scsi controller card driver) -- used for turning PS2 disk
* activity LED on and off
*/
#define PS2_SYS_CTR 0x92
/* Ports the ncr's 53c94 can be put at; indexed by pos register value */
#define MCA_53C9X_IO_PORTS { \
0x0000, 0x0240, 0x0340, 0x0400, \
0x0420, 0x3240, 0x8240, 0xA240, \
}
/*
* Supposedly there were some cards put together with the 'c9x and 86c01. If
* they have different ID's from the ones on the 3500 series machines,
* you can add them here and hopefully things will work out.
*/
#define MCA_53C9X_IDS { \
0x7F4C, \
0x0000, \
}
static int dma_bytes_sent(struct NCR_ESP *, int); static int dma_bytes_sent(struct NCR_ESP *, int);
static int dma_can_transfer(struct NCR_ESP *, Scsi_Cmnd *); static int dma_can_transfer(struct NCR_ESP *, Scsi_Cmnd *);
static void dma_dump_state(struct NCR_ESP *); static void dma_dump_state(struct NCR_ESP *);
...@@ -419,7 +443,22 @@ static void dma_led_off(struct NCR_ESP *esp) ...@@ -419,7 +443,22 @@ static void dma_led_off(struct NCR_ESP *esp)
outb(inb(PS2_SYS_CTR) & 0x3f, PS2_SYS_CTR); outb(inb(PS2_SYS_CTR) & 0x3f, PS2_SYS_CTR);
} }
static Scsi_Host_Template driver_template = MCA_53C9X; static Scsi_Host_Template driver_template = {
.proc_name = "esp",
.name = "NCR 53c9x SCSI",
.detect = mca_esp_detect,
.release = mca_esp_release,
.queuecommand = esp_queue,
.eh_abort_handler = esp_abort,
.eh_bus_reset_handler = esp_reset,
.can_queue = 7,
.sg_tablesize = SG_ALL,
.cmd_per_lun = 1,
.unchecked_isa_dma = 1,
.use_clustering = DISABLE_CLUSTERING
};
#include "scsi_module.c" #include "scsi_module.c"
/* /*
......
drivers/scsi/mca_53c9x.h deleted 100644 → 0
View file @ ec0d2ffe
/* mca_53c94.h: Defines and structures for the SCSI adapter found on NCR 35xx
* (and maybe some other) Microchannel machines.
*
* Code taken mostly from Cyberstorm SCSI drivers
* Copyright (C) 1996 Jesper Skov (jskov@cygnus.co.uk)
*
* Hacked to work with the NCR MCA stuff by Tymm Twillman (tymm@computer.org)
* 1998
*/
#include "NCR53C9x.h"
#ifndef MCA_53C9X_H
#define MCA_53C9X_H
/*
* From ibmmca.c (IBM scsi controller card driver) -- used for turning PS2 disk
* activity LED on and off
*/
#define PS2_SYS_CTR 0x92
extern int mca_esp_detect(struct SHT *);
extern int mca_esp_release(struct Scsi_Host *);
extern const char *esp_info(struct Scsi_Host *);
extern int esp_queue(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
extern int esp_command(Scsi_Cmnd *);
extern int esp_abort(Scsi_Cmnd *);
extern int esp_reset(Scsi_Cmnd *, unsigned int);
extern int esp_proc_info(char *buffer, char **start, off_t offset, int length,
int hostno, int inout);
#define MCA_53C9X { .proc_name = "esp", \
.name = "NCR 53c9x SCSI", \
.detect = mca_esp_detect, \
.release = mca_esp_release, \
.queuecommand = esp_queue, \
.abort = esp_abort, \
.reset = esp_reset, \
.can_queue = 7, \
.sg_tablesize = SG_ALL, \
.cmd_per_lun = 1, \
.unchecked_isa_dma = 1, \
.use_clustering = DISABLE_CLUSTERING }
/* Ports the ncr's 53c94 can be put at; indexed by pos register value */
#define MCA_53C9X_IO_PORTS { \
0x0000, 0x0240, 0x0340, 0x0400, \
0x0420, 0x3240, 0x8240, 0xA240, \
}
/*
* Supposedly there were some cards put together with the 'c9x and 86c01. If
* they have different ID's from the ones on the 3500 series machines,
* you can add them here and hopefully things will work out.
*/
#define MCA_53C9X_IDS { \
0x7F4C, \
0x0000, \
}
#endif /* MCA_53C9X_H */
drivers/scsi/oktagon_esp.c
View file @ 54b8f97b
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include "scsi.h" #include "scsi.h"
#include "hosts.h" #include "hosts.h"
#include "NCR53C9x.h" #include "NCR53C9x.h"
#include "oktagon_esp.h"
#include <linux/zorro.h> #include <linux/zorro.h>
#include <asm/irq.h> #include <asm/irq.h>
...@@ -46,6 +45,13 @@ ...@@ -46,6 +45,13 @@
#include <linux/unistd.h> #include <linux/unistd.h>
/* The controller registers can be found in the Z2 config area at these
* offsets:
*/
#define OKTAGON_ESP_ADDR 0x03000
#define OKTAGON_DMA_ADDR 0x01000
static int dma_bytes_sent(struct NCR_ESP *esp, int fifo_count); static int dma_bytes_sent(struct NCR_ESP *esp, int fifo_count);
static int dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp); static int dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp);
static void dma_dump_state(struct NCR_ESP *esp); static void dma_dump_state(struct NCR_ESP *esp);
...@@ -571,12 +577,6 @@ void dma_advance_sg(Scsi_Cmnd *sp) ...@@ -571,12 +577,6 @@ void dma_advance_sg(Scsi_Cmnd *sp)
#define HOSTS_C #define HOSTS_C
#include "oktagon_esp.h"
static Scsi_Host_Template driver_template = SCSI_OKTAGON_ESP;
#include "scsi_module.c"
int oktagon_esp_release(struct Scsi_Host *instance) int oktagon_esp_release(struct Scsi_Host *instance)
{ {
#ifdef MODULE #ifdef MODULE
...@@ -589,4 +589,24 @@ int oktagon_esp_release(struct Scsi_Host *instance) ...@@ -589,4 +589,24 @@ int oktagon_esp_release(struct Scsi_Host *instance)
return 1; return 1;
} }
static Scsi_Host_Template driver_template = {
.proc_name = "esp-oktagon",
.proc_info = &esp_proc_info,
.name = "BSC Oktagon SCSI",
.detect = oktagon_esp_detect,
.release = oktagon_esp_release,
.queuecommand = esp_queue,
.eh_abort_handler = esp_abort,
.eh_bus_reset_handler = esp_reset,
.can_queue = 7,
.this_id = 7,
.sg_tablesize = SG_ALL,
.cmd_per_lun = 1,
.use_clustering = ENABLE_CLUSTERING
};
#include "scsi_module.c"
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
drivers/scsi/oktagon_esp.h deleted 100644 → 0
View file @ ec0d2ffe
/* oktagon_esp.h: Defines and structures for the CyberStorm SCSI Mk II driver.
*
* Copyright (C) 1996 Jesper Skov (jskov@cs.auc.dk)
*/
#include "NCR53C9x.h"
#ifndef OKTAGON_ESP_H
#define OKTAGON_ESP_H
/* The controller registers can be found in the Z2 config area at these
* offsets:
*/
#define OKTAGON_ESP_ADDR 0x03000
#define OKTAGON_DMA_ADDR 0x01000
/* The CyberStorm II DMA interface */
struct oktagon_dma_registers {
volatile unsigned char cond_reg; /* DMA cond (ro) [0x000] */
#define ctrl_reg cond_reg /* DMA control (wo) [0x000] */
unsigned char dmapad4[0x3f];
volatile unsigned char dma_addr0; /* DMA address (MSB) [0x040] */
unsigned char dmapad1[3];
volatile unsigned char dma_addr1; /* DMA address [0x044] */
unsigned char dmapad2[3];
volatile unsigned char dma_addr2; /* DMA address [0x048] */
unsigned char dmapad3[3];
volatile unsigned char dma_addr3; /* DMA address (LSB) [0x04c] */
};
extern int oktagon_esp_detect(struct SHT *);
extern int oktagon_esp_release(struct Scsi_Host *);
extern const char *esp_info(struct Scsi_Host *);
extern int esp_queue(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
extern int esp_command(Scsi_Cmnd *);
extern int esp_abort(Scsi_Cmnd *);
extern int esp_reset(Scsi_Cmnd *, unsigned int);
extern int esp_proc_info(char *buffer, char **start, off_t offset, int length,
int hostno, int inout);
#define SCSI_OKTAGON_ESP { \
.proc_name = "esp-oktagon", \
.proc_info = &esp_proc_info, \
.name = "BSC Oktagon SCSI", \
.detect = oktagon_esp_detect, \
.release = oktagon_esp_release, \
.queuecommand = esp_queue, \
.abort = esp_abort, \
.reset = esp_reset, \
.can_queue = 7, \
.this_id = 7, \
.sg_tablesize = SG_ALL, \
.cmd_per_lun = 1, \
.use_clustering = ENABLE_CLUSTERING }
#endif /* OKTAGON_ESP_H */
drivers/scsi/sun3x_esp.c
View file @ 54b8f97b
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#include "hosts.h" #include "hosts.h"
#include "NCR53C9x.h" #include "NCR53C9x.h"
#include "sun3x_esp.h"
#include <asm/sun3x.h> #include <asm/sun3x.h>
#include <asm/dvma.h> #include <asm/dvma.h>
#include <asm/irq.h> #include <asm/irq.h>
...@@ -374,7 +373,23 @@ static void dma_advance_sg (Scsi_Cmnd *sp) ...@@ -374,7 +373,23 @@ static void dma_advance_sg (Scsi_Cmnd *sp)
sp->SCp.ptr = (char *)((unsigned long)sp->SCp.buffer->dvma_address); sp->SCp.ptr = (char *)((unsigned long)sp->SCp.buffer->dvma_address);
} }
static Scsi_Host_Template driver_template = SCSI_SUN3X_ESP; static Scsi_Host_Template driver_template = {
.proc_name = "esp",
.proc_info = &esp_proc_info,
.name = "Sun ESP 100/100a/200",
.detect = sun3x_esp_detect,
.info = esp_info,
.command = esp_command,
.queuecommand = esp_queue,
.eh_abort_handler = esp_abort,
.eh_bus_reset_handler = esp_reset,
.can_queue = 7,
.this_id = 7,
.sg_tablesize = SG_ALL,
.cmd_per_lun = 1,
.use_clustering = DISABLE_CLUSTERING,
};
#include "scsi_module.c" #include "scsi_module.c"
......
drivers/scsi/sun3x_esp.h deleted 100644 → 0
View file @ ec0d2ffe
/* sun3x_esp.h: Defines and structures for the Sun3x ESP
*
* (C) 1995 Thomas Bogendoerfer (tsbogend@alpha.franken.de)
*/
#ifndef _SUN3X_ESP_H
#define _SUN3X_ESP_H
/* For dvma controller register definitions. */
#include <asm/dvma.h>
extern int sun3x_esp_detect(struct SHT *);
extern const char *esp_info(struct Scsi_Host *);
extern int esp_queue(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
extern int esp_command(Scsi_Cmnd *);
extern int esp_abort(Scsi_Cmnd *);
extern int esp_reset(Scsi_Cmnd *, unsigned int);
extern int esp_proc_info(char *buffer, char **start, off_t offset, int length,
int hostno, int inout);
#define DMA_PORTS_P (dregs->cond_reg & DMA_INT_ENAB)
#define SCSI_SUN3X_ESP { \
.proc_name = "esp", \
.proc_info = &esp_proc_info, \
.name = "Sun ESP 100/100a/200", \
.detect = sun3x_esp_detect, \
.info = esp_info, \
.command = esp_command, \
.queuecommand = esp_queue, \
.abort = esp_abort, \
.reset = esp_reset, \
.can_queue = 7, \
.this_id = 7, \
.sg_tablesize = SG_ALL, \
.cmd_per_lun = 1, \
.use_clustering = DISABLE_CLUSTERING, }
#endif /* !(_SUN3X_ESP_H) */
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