CVSROOT: /home/cvs
Module name: linux
Changes by: macro@ftp.linux-mips.org 05/06/16 21:31:04
Modified files:
arch/mips/dec : ecc-berr.c reset.c
arch/mips/dec/prom: memory.c
drivers/mtd/devices: ms02-nv.c
drivers/net : declance.c
drivers/scsi : dec_esp.c
drivers/tc : tc.c zs.c
include/asm-mips/dec: kn01.h kn02.h kn02xa.h kn03.h prom.h
Log message:
Deal with the bloody KSEG vs CKSEG horror...
diff -urN linux/arch/mips/dec/ecc-berr.c linux/arch/mips/dec/ecc-berr.c
--- linux/arch/mips/dec/ecc-berr.c 2005/06/13 19:53:38 1.5
+++ linux/arch/mips/dec/ecc-berr.c 2005/06/16 20:30:54 1.6
@@ -144,7 +144,8 @@
} else if (!sngl) {
status = dbestr;
} else {
- volatile u32 *ptr = (void *)KSEG1ADDR(address);
+ volatile u32 *ptr =
+ (void *)CKSEG1ADDR(address);
*ptr = *ptr; /* Rewrite. */
iob();
diff -urN linux/arch/mips/dec/reset.c linux/arch/mips/dec/reset.c
--- linux/arch/mips/dec/reset.c 2004/01/03 16:57:01 1.9
+++ linux/arch/mips/dec/reset.c 2005/06/16 20:30:54 1.10
@@ -14,7 +14,7 @@
static inline void ATTRIB_NORET back_to_prom(void)
{
- noret_func_t func = (void *) KSEG1ADDR(0x1fc00000);
+ noret_func_t func = (void *)CKSEG1ADDR(0x1fc00000);
func();
}
diff -urN linux/arch/mips/dec/prom/memory.c linux/arch/mips/dec/prom/memory.c
--- linux/arch/mips/dec/prom/memory.c 2003/11/03 16:48:28 1.14
+++ linux/arch/mips/dec/prom/memory.c 2005/06/16 20:30:56 1.15
@@ -35,22 +35,22 @@
extern char genexcept_early;
/* Install exception handler */
- memcpy(&old_handler, (void *)(KSEG0 + 0x80), 0x80);
- memcpy((void *)(KSEG0 + 0x80), &genexcept_early, 0x80);
+ memcpy(&old_handler, (void *)(CKSEG0 + 0x80), 0x80);
+ memcpy((void *)(CKSEG0 + 0x80), &genexcept_early, 0x80);
/* read unmapped and uncached (KSEG1)
* DECstations have at least 4MB RAM
* Assume less than 480MB of RAM, as this is max for 5000/2xx
* FIXME this should be replaced by the first free page!
*/
- for (memory_page = (unsigned char *) KSEG1 + CHUNK_SIZE;
- (mem_err== 0) && (memory_page < ((unsigned char *)
KSEG1+0x1E000000));
+ for (memory_page = (unsigned char *)CKSEG1 + CHUNK_SIZE;
+ mem_err == 0 && memory_page < (unsigned char *)CKSEG1 + 0x1e00000;
memory_page += CHUNK_SIZE) {
dummy = *memory_page;
}
- memcpy((void *)(KSEG0 + 0x80), &old_handler, 0x80);
+ memcpy((void *)(CKSEG0 + 0x80), &old_handler, 0x80);
- add_memory_region(0, (unsigned long)memory_page - KSEG1 - CHUNK_SIZE,
+ add_memory_region(0, (unsigned long)memory_page - CKSEG1 - CHUNK_SIZE,
BOOT_MEM_RAM);
}
@@ -65,7 +65,7 @@
memmap *bm;
/* some free 64k */
- bm = (memmap *)KSEG0ADDR(0x28000);
+ bm = (memmap *)CKSEG0ADDR(0x28000);
bitmap_size = rex_getbitmap(bm);
diff -urN linux/drivers/mtd/devices/ms02-nv.c
linux/drivers/mtd/devices/ms02-nv.c
--- linux/drivers/mtd/devices/ms02-nv.c 2005/01/13 14:06:09 1.10
+++ linux/drivers/mtd/devices/ms02-nv.c 2005/06/16 20:30:58 1.11
@@ -99,8 +99,8 @@
* The firmware writes MS02NV_ID at MS02NV_MAGIC and also
* a diagnostic status at MS02NV_DIAG.
*/
- ms02nv_diagp = (ms02nv_uint *)(KSEG1ADDR(addr + MS02NV_DIAG));
- ms02nv_magicp = (ms02nv_uint *)(KSEG1ADDR(addr + MS02NV_MAGIC));
+ ms02nv_diagp = (ms02nv_uint *)(CKSEG1ADDR(addr + MS02NV_DIAG));
+ ms02nv_magicp = (ms02nv_uint *)(CKSEG1ADDR(addr + MS02NV_MAGIC));
err = get_dbe(ms02nv_magic, ms02nv_magicp);
if (err)
return 0;
diff -urN linux/drivers/net/declance.c linux/drivers/net/declance.c
--- linux/drivers/net/declance.c 2005/06/13 19:55:42 1.38
+++ linux/drivers/net/declance.c 2005/06/16 20:30:59 1.39
@@ -1069,7 +1069,7 @@
/*
* FIXME: ugly hack!
*/
- dev->mem_start = KSEG1ADDR(0x00020000);
+ dev->mem_start = CKSEG1ADDR(0x00020000);
dev->mem_end = dev->mem_start + 0x00020000;
dev->irq = dec_interrupt[DEC_IRQ_LANCE];
esar_base = system_base + IOASIC_ESAR;
diff -urN linux/drivers/scsi/dec_esp.c linux/drivers/scsi/dec_esp.c
--- linux/drivers/scsi/dec_esp.c 2005/06/13 19:55:44 1.28
+++ linux/drivers/scsi/dec_esp.c 2005/06/16 20:31:01 1.29
@@ -513,14 +513,15 @@
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 +537,10 @@
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();
diff -urN linux/drivers/tc/tc.c linux/drivers/tc/tc.c
--- linux/drivers/tc/tc.c 2003/08/11 11:52:53 1.16
+++ linux/drivers/tc/tc.c 2005/06/16 20:31:02 1.17
@@ -197,7 +197,7 @@
}
info = (tcinfo *) rex_gettcinfo();
- slot0addr = (unsigned long)KSEG1ADDR(rex_slot_address(0));
+ slot0addr = (unsigned long)CKSEG1ADDR(rex_slot_address(0));
switch (mips_machtype) {
case MACH_DS5000_200:
@@ -245,7 +245,6 @@
tc_bus[i].name, tc_bus[i].firmware);
}
#endif
- ioport_resource.end = KSEG2 - 1;
}
}
diff -urN linux/drivers/tc/zs.c linux/drivers/tc/zs.c
--- linux/drivers/tc/zs.c 2005/06/13 19:58:52 1.58
+++ linux/drivers/tc/zs.c 2005/06/16 20:31:02 1.59
@@ -1623,21 +1623,21 @@
#ifdef CONFIG_MACH_DECSTATION
case MACH_DS5000_2X0:
case MACH_DS5900:
- system_base = KSEG1ADDR(0x1f800000);
+ system_base = CKSEG1ADDR(0x1f800000);
n_chips = 2;
zs_parms = &ds_parms;
zs_parms->irq0 = dec_interrupt[DEC_IRQ_SCC0];
zs_parms->irq1 = dec_interrupt[DEC_IRQ_SCC1];
break;
case MACH_DS5000_1XX:
- system_base = KSEG1ADDR(0x1c000000);
+ system_base = CKSEG1ADDR(0x1c000000);
n_chips = 2;
zs_parms = &ds_parms;
zs_parms->irq0 = dec_interrupt[DEC_IRQ_SCC0];
zs_parms->irq1 = dec_interrupt[DEC_IRQ_SCC1];
break;
case MACH_DS5000_XX:
- system_base = KSEG1ADDR(0x1c000000);
+ system_base = CKSEG1ADDR(0x1c000000);
n_chips = 1;
zs_parms = &ds_parms;
zs_parms->irq0 = dec_interrupt[DEC_IRQ_SCC0];
diff -urN linux/include/asm-mips/dec/kn01.h linux/include/asm-mips/dec/kn01.h
--- linux/include/asm-mips/dec/kn01.h 2003/04/14 12:31:05 1.5
+++ linux/include/asm-mips/dec/kn01.h 2005/06/16 20:31:04 1.6
@@ -15,7 +15,7 @@
#include <asm/addrspace.h>
-#define KN01_SLOT_BASE KSEG1ADDR(0x10000000)
+#define KN01_SLOT_BASE CKSEG1ADDR(0x10000000)
#define KN01_SLOT_SIZE 0x01000000
/*
@@ -51,7 +51,7 @@
/*
* Frame buffer memory address.
*/
-#define KN01_VFB_MEM KSEG1ADDR(0x0fc00000)
+#define KN01_VFB_MEM CKSEG1ADDR(0x0fc00000)
/*
* CPU interrupt bits.
diff -urN linux/include/asm-mips/dec/kn02.h linux/include/asm-mips/dec/kn02.h
--- linux/include/asm-mips/dec/kn02.h 2003/04/14 12:31:05 1.6
+++ linux/include/asm-mips/dec/kn02.h 2005/06/16 20:31:04 1.7
@@ -22,7 +22,7 @@
#include <asm/dec/ecc.h>
-#define KN02_SLOT_BASE KSEG1ADDR(0x1fc00000)
+#define KN02_SLOT_BASE CKSEG1ADDR(0x1fc00000)
#define KN02_SLOT_SIZE 0x00080000
/*
diff -urN linux/include/asm-mips/dec/kn02xa.h
linux/include/asm-mips/dec/kn02xa.h
--- linux/include/asm-mips/dec/kn02xa.h 2003/04/14 12:31:05 1.7
+++ linux/include/asm-mips/dec/kn02xa.h 2005/06/16 20:31:04 1.8
@@ -20,7 +20,7 @@
#include <asm/addrspace.h>
#include <asm/dec/ioasic_addrs.h>
-#define KN02XA_SLOT_BASE KSEG1ADDR(0x1c000000)
+#define KN02XA_SLOT_BASE CKSEG1ADDR(0x1c000000)
/*
* Some port addresses...
@@ -32,16 +32,16 @@
/*
* Memory control ASIC registers.
*/
-#define KN02XA_MER KSEG1ADDR(0x0c400000) /* memory error register */
-#define KN02XA_MSR KSEG1ADDR(0x0c800000) /* memory size register */
+#define KN02XA_MER CKSEG1ADDR(0x0c400000) /* memory error register */
+#define KN02XA_MSR CKSEG1ADDR(0x0c800000) /* memory size register */
/*
* CPU control ASIC registers.
*/
-#define KN02XA_MEM_CONF KSEG1ADDR(0x0e000000) /* write timeout config
*/
-#define KN02XA_EAR KSEG1ADDR(0x0e000004) /* error address register */
-#define KN02XA_BOOT0 KSEG1ADDR(0x0e000008) /* boot 0 register */
-#define KN02XA_MEM_INTR KSEG1ADDR(0x0e00000c) /* write err IRQ stat &
ack */
+#define KN02XA_MEM_CONF CKSEG1ADDR(0x0e000000) /* write timeout config
*/
+#define KN02XA_EAR CKSEG1ADDR(0x0e000004) /* error address register */
+#define KN02XA_BOOT0 CKSEG1ADDR(0x0e000008) /* boot 0 register */
+#define KN02XA_MEM_INTR CKSEG1ADDR(0x0e00000c) /* write err IRQ stat &
ack */
/*
* Memory Error Register bits, common definitions.
diff -urN linux/include/asm-mips/dec/kn03.h linux/include/asm-mips/dec/kn03.h
--- linux/include/asm-mips/dec/kn03.h 2003/04/14 12:31:05 1.7
+++ linux/include/asm-mips/dec/kn03.h 2005/06/16 20:31:04 1.8
@@ -19,7 +19,7 @@
#include <asm/dec/ecc.h>
#include <asm/dec/ioasic_addrs.h>
-#define KN03_SLOT_BASE KSEG1ADDR(0x1f800000)
+#define KN03_SLOT_BASE CKSEG1ADDR(0x1f800000)
/*
* Some port addresses...
diff -urN linux/include/asm-mips/dec/prom.h linux/include/asm-mips/dec/prom.h
--- linux/include/asm-mips/dec/prom.h 2004/02/11 15:17:32 1.5
+++ linux/include/asm-mips/dec/prom.h 2005/06/16 20:31:04 1.6
@@ -24,7 +24,7 @@
* PMAX/3MAX PROM entry points for DS2100/3100's and DS5000/2xx's.
* Many of these will work for MIPSen as well!
*/
-#define VEC_RESET (u64 *)KSEG1ADDR(0x1fc00000)
+#define VEC_RESET (u64 *)CKSEG1ADDR(0x1fc00000)
/* Prom base address */
#define PMAX_PROM_ENTRY(x) (VEC_RESET + (x)) /* Prom jump table */
|