Skip to content

L
linux
Commit d47d2299 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files
Options

[PATCH] cosmetic jazz_esp updates 

small changes from Linux/MIPS CVS and typedef removal from me
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 0d8d3a4f
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 24 deletions
drivers/scsi/jazz_esp.c
View file @ d47d2299
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
* jazz_esp is based on David S. Miller's ESP driver and cyber_esp * jazz_esp is based on David S. Miller's ESP driver and cyber_esp
*/ */
#include <linux/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/types.h> #include <linux/types.h>
...@@ -27,7 +28,7 @@ ...@@ -27,7 +28,7 @@
#include <asm/pgtable.h> #include <asm/pgtable.h>
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, struct scsi_cmnd *sp);
static void dma_dump_state(struct NCR_ESP *esp); static void dma_dump_state(struct NCR_ESP *esp);
static void dma_init_read(struct NCR_ESP *esp, __u32 vaddress, int length); static void dma_init_read(struct NCR_ESP *esp, __u32 vaddress, int length);
static void dma_init_write(struct NCR_ESP *esp, __u32 vaddress, int length); static void dma_init_write(struct NCR_ESP *esp, __u32 vaddress, int length);
...@@ -36,11 +37,11 @@ static void dma_ints_on(struct NCR_ESP *esp); ...@@ -36,11 +37,11 @@ static void dma_ints_on(struct NCR_ESP *esp);
static int dma_irq_p(struct NCR_ESP *esp); static int dma_irq_p(struct NCR_ESP *esp);
static int dma_ports_p(struct NCR_ESP *esp); static int dma_ports_p(struct NCR_ESP *esp);
static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write); static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write);
static void dma_mmu_get_scsi_one (struct NCR_ESP *esp, Scsi_Cmnd *sp); static void dma_mmu_get_scsi_one (struct NCR_ESP *esp, struct scsi_cmnd *sp);
static void dma_mmu_get_scsi_sgl (struct NCR_ESP *esp, Scsi_Cmnd *sp); static void dma_mmu_get_scsi_sgl (struct NCR_ESP *esp, struct scsi_cmnd *sp);
static void dma_mmu_release_scsi_one (struct NCR_ESP *esp, Scsi_Cmnd *sp); static void dma_mmu_release_scsi_one (struct NCR_ESP *esp, struct scsi_cmnd *sp);
static void dma_mmu_release_scsi_sgl (struct NCR_ESP *esp, Scsi_Cmnd *sp); static void dma_mmu_release_scsi_sgl (struct NCR_ESP *esp, struct scsi_cmnd *sp);
static void dma_advance_sg (Scsi_Cmnd *sp); static void dma_advance_sg (struct scsi_cmnd *sp);
static void dma_led_off(struct NCR_ESP *); static void dma_led_off(struct NCR_ESP *);
static void dma_led_on(struct NCR_ESP *); static void dma_led_on(struct NCR_ESP *);
...@@ -52,7 +53,7 @@ static volatile unsigned char cmd_buffer[16]; ...@@ -52,7 +53,7 @@ static volatile unsigned char cmd_buffer[16];
*/ */
/***************************************************************** Detection */ /***************************************************************** Detection */
int jazz_esp_detect(Scsi_Host_Template *tpnt) static int jazz_esp_detect(struct scsi_host_template *tpnt)
{ {
struct NCR_ESP *esp; struct NCR_ESP *esp;
struct ConfigDev *esp_dev; struct ConfigDev *esp_dev;
...@@ -115,7 +116,7 @@ int jazz_esp_detect(Scsi_Host_Template *tpnt) ...@@ -115,7 +116,7 @@ int jazz_esp_detect(Scsi_Host_Template *tpnt)
esp->esp_command = (volatile unsigned char *)cmd_buffer; esp->esp_command = (volatile unsigned char *)cmd_buffer;
/* get virtual dma address for command buffer */ /* get virtual dma address for command buffer */
esp->esp_command_dvma = vdma_alloc(PHYSADDR(cmd_buffer), sizeof (cmd_buffer)); esp->esp_command_dvma = vdma_alloc(CPHYSADDR(cmd_buffer), sizeof (cmd_buffer));
esp->irq = JAZZ_SCSI_IRQ; esp->irq = JAZZ_SCSI_IRQ;
request_irq(JAZZ_SCSI_IRQ, esp_intr, SA_INTERRUPT, "JAZZ SCSI", request_irq(JAZZ_SCSI_IRQ, esp_intr, SA_INTERRUPT, "JAZZ SCSI",
...@@ -157,7 +158,7 @@ static int dma_bytes_sent(struct NCR_ESP *esp, int fifo_count) ...@@ -157,7 +158,7 @@ static int dma_bytes_sent(struct NCR_ESP *esp, int fifo_count)
return fifo_count; return fifo_count;
} }
static int dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp) static int dma_can_transfer(struct NCR_ESP *esp, struct scsi_cmnd *sp)
{ {
/* /*
* maximum DMA size is 1MB * maximum DMA size is 1MB
...@@ -230,43 +231,43 @@ static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write) ...@@ -230,43 +231,43 @@ static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write)
} }
} }
static void dma_mmu_get_scsi_one (struct NCR_ESP *esp, Scsi_Cmnd *sp) static void dma_mmu_get_scsi_one (struct NCR_ESP *esp, struct scsi_cmnd *sp)
{ {
sp->SCp.have_data_in = vdma_alloc(PHYSADDR(sp->SCp.buffer), sp->SCp.this_residual); sp->SCp.have_data_in = vdma_alloc(CPHYSADDR(sp->SCp.buffer), sp->SCp.this_residual);
sp->SCp.ptr = (char *)((unsigned long)sp->SCp.have_data_in); sp->SCp.ptr = (char *)((unsigned long)sp->SCp.have_data_in);
} }
static void dma_mmu_get_scsi_sgl (struct NCR_ESP *esp, Scsi_Cmnd *sp) static void dma_mmu_get_scsi_sgl (struct NCR_ESP *esp, struct scsi_cmnd *sp)
{ {
int sz = sp->SCp.buffers_residual; int sz = sp->SCp.buffers_residual;
struct mmu_sglist *sg = (struct mmu_sglist *) sp->SCp.buffer; struct scatterlist *sg = (struct scatterlist *) sp->SCp.buffer;
while (sz >= 0) { while (sz >= 0) {
sg[sz].dvma_addr = vdma_alloc(PHYSADDR(sg[sz].addr), sg[sz].len); sg[sz].dma_address = vdma_alloc(CPHYSADDR(page_address(sg[sz].page) + sg[sz].offset), sg[sz].length);
sz--; sz--;
} }
sp->SCp.ptr=(char *)((unsigned long)sp->SCp.buffer->dvma_address); sp->SCp.ptr=(char *)(sp->SCp.buffer->dma_address);
} }
static void dma_mmu_release_scsi_one (struct NCR_ESP *esp, Scsi_Cmnd *sp) static void dma_mmu_release_scsi_one (struct NCR_ESP *esp, struct scsi_cmnd *sp)
{ {
vdma_free(sp->SCp.have_data_in); vdma_free(sp->SCp.have_data_in);
} }
static void dma_mmu_release_scsi_sgl (struct NCR_ESP *esp, Scsi_Cmnd *sp) static void dma_mmu_release_scsi_sgl (struct NCR_ESP *esp, struct scsi_cmnd *sp)
{ {
int sz = sp->use_sg - 1; int sz = sp->use_sg - 1;
struct mmu_sglist *sg = (struct mmu_sglist *)sp->buffer; struct scatterlist *sg = (struct scatterlist *)sp->buffer;
while(sz >= 0) { while(sz >= 0) {
vdma_free(sg[sz].dvma_addr); vdma_free(sg[sz].dma_address);
sz--; sz--;
} }
} }
static void dma_advance_sg (Scsi_Cmnd *sp) static void dma_advance_sg (struct scsi_cmnd *sp)
{ {
sp->SCp.ptr = (char *)((unsigned long)sp->SCp.buffer->dvma_address); sp->SCp.ptr = (char *)(sp->SCp.buffer->dma_address);
} }
#define JAZZ_HDC_LED 0xe000d100 /* FIXME, find correct address */ #define JAZZ_HDC_LED 0xe000d100 /* FIXME, find correct address */
...@@ -285,9 +286,9 @@ static void dma_led_on(struct NCR_ESP *esp) ...@@ -285,9 +286,9 @@ static void dma_led_on(struct NCR_ESP *esp)
#endif #endif
} }
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.proc_name = "jazz_esp", .proc_name = "jazz_esp",
.proc_info = &esp_proc_info, .proc_info = esp_proc_info,
.name = "ESP 100/100a/200", .name = "ESP 100/100a/200",
.detect = jazz_esp_detect, .detect = jazz_esp_detect,
.slave_alloc = esp_slave_alloc, .slave_alloc = esp_slave_alloc,
...@@ -303,4 +304,4 @@ static Scsi_Host_Template driver_template = { ...@@ -303,4 +304,4 @@ static Scsi_Host_Template driver_template = {
.cmd_per_lun = 1, .cmd_per_lun = 1,
.use_clustering = DISABLE_CLUSTERING, .use_clustering = DISABLE_CLUSTERING,
}; };
#include "scsi_module.c"
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