diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2005-10-14 21:44:26 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-10-28 15:46:05 -0400 |
commit | af13cbebb27aaa9cae0bd18cf2608a3d4dd5fa94 (patch) | |
tree | 4a7f6054cec60d12ec63f3039c64577121390503 | |
parent | 73711b352f1f1e1e9eedd772e232b7c1bd12a305 (diff) |
[SCSI] dec_esp: Use the right address space macro
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r-- | drivers/scsi/dec_esp.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/scsi/dec_esp.c b/drivers/scsi/dec_esp.c index 90e2faf94a09..2d7bde693d96 100644 --- a/drivers/scsi/dec_esp.c +++ b/drivers/scsi/dec_esp.c | |||
@@ -516,14 +516,15 @@ static void dma_advance_sg(struct scsi_cmnd * sp) | |||
516 | static void pmaz_dma_drain(struct NCR_ESP *esp) | 516 | static void pmaz_dma_drain(struct NCR_ESP *esp) |
517 | { | 517 | { |
518 | memcpy(phys_to_virt(esp_virt_buffer), | 518 | memcpy(phys_to_virt(esp_virt_buffer), |
519 | (void *)KSEG1ADDR(esp->slot + DEC_SCSI_SRAM + ESP_TGT_DMA_SIZE), | 519 | (void *)CKSEG1ADDR(esp->slot + DEC_SCSI_SRAM + |
520 | scsi_current_length); | 520 | ESP_TGT_DMA_SIZE), |
521 | scsi_current_length); | ||
521 | } | 522 | } |
522 | 523 | ||
523 | static void pmaz_dma_init_read(struct NCR_ESP *esp, u32 vaddress, int length) | 524 | static void pmaz_dma_init_read(struct NCR_ESP *esp, u32 vaddress, int length) |
524 | { | 525 | { |
525 | volatile u32 *dmareg = | 526 | volatile u32 *dmareg = |
526 | (volatile u32 *)KSEG1ADDR(esp->slot + DEC_SCSI_DMAREG); | 527 | (volatile u32 *)CKSEG1ADDR(esp->slot + DEC_SCSI_DMAREG); |
527 | 528 | ||
528 | if (length > ESP_TGT_DMA_SIZE) | 529 | if (length > ESP_TGT_DMA_SIZE) |
529 | length = ESP_TGT_DMA_SIZE; | 530 | length = ESP_TGT_DMA_SIZE; |
@@ -539,9 +540,10 @@ static void pmaz_dma_init_read(struct NCR_ESP *esp, u32 vaddress, int length) | |||
539 | static void pmaz_dma_init_write(struct NCR_ESP *esp, u32 vaddress, int length) | 540 | static void pmaz_dma_init_write(struct NCR_ESP *esp, u32 vaddress, int length) |
540 | { | 541 | { |
541 | volatile u32 *dmareg = | 542 | volatile u32 *dmareg = |
542 | (volatile u32 *)KSEG1ADDR(esp->slot + DEC_SCSI_DMAREG); | 543 | (volatile u32 *)CKSEG1ADDR(esp->slot + DEC_SCSI_DMAREG); |
543 | 544 | ||
544 | memcpy((void *)KSEG1ADDR(esp->slot + DEC_SCSI_SRAM + ESP_TGT_DMA_SIZE), | 545 | memcpy((void *)CKSEG1ADDR(esp->slot + DEC_SCSI_SRAM + |
546 | ESP_TGT_DMA_SIZE), | ||
545 | phys_to_virt(vaddress), length); | 547 | phys_to_virt(vaddress), length); |
546 | 548 | ||
547 | wmb(); | 549 | wmb(); |