Merge by Hand

Conflicts in dec_esp.c (Thanks Bacchus), scsi_transport_iscsi.c and
scsi_transport_fc.h

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 13 insertions, 8 deletions

diff --git a/drivers/scsi/dec_esp.c b/drivers/scsi/dec_esp.c
index 4f39890b44ac..256d6baf8df3 100644
--- a/drivers/scsi/dec_esp.c
+++ b/drivers/scsi/dec_esp.c
@@ -18,7 +18,7 @@
  * 20001005     - Initialization fixes for 2.4.0-test9
  *                        Florian Lohoff <flo@rfc822.org>
  *
- *      Copyright (C) 2002, 2003  Maciej W. Rozycki
+ *      Copyright (C) 2002, 2003, 2005  Maciej W. Rozycki
  */
 
 #include <linux/kernel.h>
@@ -41,6 +41,7 @@
 #include <asm/dec/ioasic_addrs.h>
 #include <asm/dec/ioasic_ints.h>
 #include <asm/dec/machtype.h>
+#include <asm/dec/system.h>
 #include <asm/dec/tc.h>
 
 #define DEC_SCSI_SREG 0
@@ -183,7 +184,8 @@ static int dec_esp_detect(Scsi_Host_Template * tpnt)
                 esp->dregs = 0;
 
                 /* ESP register base */
-                esp->eregs = (struct ESP_regs *) (system_base + IOASIC_SCSI);
+                esp->eregs = (void *)CKSEG1ADDR(dec_kn_slot_base +
+                                                IOASIC_SCSI);
 
                 /* Set the command buffer */
                 esp->esp_command = (volatile unsigned char *) cmd_buffer;
@@ -231,7 +233,8 @@ static int dec_esp_detect(Scsi_Host_Template * tpnt)
                         esp->slot = CPHYSADDR(mem_start);
 
                         esp->dregs = 0;
-                        esp->eregs = (struct ESP_regs *) (mem_start + DEC_SCSI_SREG);
+                        esp->eregs = (void *)CKSEG1ADDR(mem_start +
+                                                        DEC_SCSI_SREG);
                         esp->do_pio_cmds = 1;
 
                         /* Set the command buffer */
@@ -513,14 +516,15 @@ static void dma_advance_sg(struct scsi_cmnd * sp)
 static void pmaz_dma_drain(struct NCR_ESP *esp)
 {
         memcpy(phys_to_virt(esp_virt_buffer),
-                (void *)KSEG1ADDR(esp->slot + DEC_SCSI_SRAM + ESP_TGT_DMA_SIZE),
-                scsi_current_length);
+               (void *)CKSEG1ADDR(esp->slot + DEC_SCSI_SRAM +
+                                  ESP_TGT_DMA_SIZE),
+               scsi_current_length);
 }
 
 static void pmaz_dma_init_read(struct NCR_ESP *esp, u32 vaddress, int length)
 {
         volatile u32 *dmareg =
-                (volatile u32 *)KSEG1ADDR(esp->slot + DEC_SCSI_DMAREG);
+                (volatile u32 *)CKSEG1ADDR(esp->slot + DEC_SCSI_DMAREG);
 
         if (length > ESP_TGT_DMA_SIZE)
                 length = ESP_TGT_DMA_SIZE;
@@ -536,9 +540,10 @@ static void pmaz_dma_init_read(struct NCR_ESP *esp, u32 vaddress, int length)
 static void pmaz_dma_init_write(struct NCR_ESP *esp, u32 vaddress, int length)
 {
         volatile u32 *dmareg =
-                (volatile u32 *)KSEG1ADDR(esp->slot + DEC_SCSI_DMAREG);
+                (volatile u32 *)CKSEG1ADDR(esp->slot + DEC_SCSI_DMAREG);
 
-        memcpy((void *)KSEG1ADDR(esp->slot + DEC_SCSI_SRAM + ESP_TGT_DMA_SIZE),
+        memcpy((void *)CKSEG1ADDR(esp->slot + DEC_SCSI_SRAM +
+                                  ESP_TGT_DMA_SIZE),
                phys_to_virt(vaddress), length);
 
         wmb();