patch-2.3.23 linux/arch/arm/mm/mm-rpc.c

• Lines: 123
• Date: Wed Oct 20 16:29:08 1999
• Orig file: v2.3.22/linux/arch/arm/mm/mm-rpc.c
• Orig date: Tue Aug 31 17:29:12 1999

diff -u --recursive --new-file v2.3.22/linux/arch/arm/mm/mm-rpc.c linux/arch/arm/mm/mm-rpc.c
@@ -3,95 +3,48 @@
  *
  * Extra MM routines for RiscPC architecture
  *
- * Copyright (C) 1998 Russell King
+ * Copyright (C) 1998-1999 Russell King
  */
-#include <linux/sched.h>
-#include <linux/slab.h>
 #include <linux/init.h>
 
-#include <asm/pgtable.h>
+#include <asm/hardware.h>
+#include <asm/page.h>
+#include <asm/proc/domain.h>
 #include <asm/setup.h>
-#include <asm/io.h>
-#include <asm/proc/mm-init.h>
-#include <asm/arch/mm-init.h>
 
-#define NR_DRAM_BANKS	4
-#define NR_VRAM_BANKS	1
+#include "map.h"
 
-#define NR_BANKS	(NR_DRAM_BANKS + NR_VRAM_BANKS)
+#define SIZE(x) (sizeof(x) / sizeof(x[0]))
 
-#define FIRST_BANK	0
-#define FIRST_DRAM_BANK	0
-#define FIRST_VRAM_BANK	NR_DRAM_BANKS
-
-#define BANK_SHIFT	26
-#define FIRST_DRAM_ADDR	0x10000000
-
-#define PHYS_TO_BANK(x)	(((x) >> BANK_SHIFT) & (NR_DRAM_BANKS - 1))
-#define BANK_TO_PHYS(x)	((FIRST_DRAM_ADDR) + \
-			    (((x) - FIRST_DRAM_BANK) << BANK_SHIFT))
-
-struct ram_bank {
-	unsigned int virt_addr;		/* virtual address of the *end* of this bank + 1 */
-	  signed int phys_offset;	/* offset to physical address of this bank */
+struct mem_desc mem_desc[] __initdata = {
+	{ 0xc0000000, 0xc0000000 },
+	{ 0xc4000000, 0xc4000000 },
+	{ 0xc8000000, 0xc8000000 },
+	{ 0xcc000000, 0xcc000000 }
 };
 
-static struct ram_bank rambank[NR_BANKS];
-
-/*
- * Return the physical (0x10000000 -> 0x20000000) address of
- * the virtual (0xc0000000 -> 0xd0000000) address
- */
-unsigned long __virt_to_phys(unsigned long vpage)
-{
-	unsigned int bank = FIRST_BANK;
-
-	while (vpage >= rambank[bank].virt_addr && bank < NR_BANKS)
-		bank ++;
-
-	return vpage - rambank[bank].phys_offset;
-}
-
-/*
- * Return the virtual (0xc0000000 -> 0xd0000000) address of
- * the physical (0x10000000 -> 0x20000000) address
- */
-unsigned long __phys_to_virt(unsigned long phys)
-{
-	unsigned int bank;
-
-	if (phys > FIRST_DRAM_ADDR)
-		bank = PHYS_TO_BANK(phys);
-	else
-		bank = FIRST_VRAM_BANK;
-
-	return phys + rambank[bank].phys_offset;
-}
+unsigned int __initdata mem_desc_size = SIZE(mem_desc);
 
 void __init
 init_dram_banks(struct param_struct *params)
 {
 	unsigned int bank;
-	unsigned int bytes = 0;
 
-	for (bank = FIRST_DRAM_BANK; bank < NR_DRAM_BANKS; bank++) {
-		rambank[bank].phys_offset = PAGE_OFFSET + bytes
-						- BANK_TO_PHYS(bank);
+	for (bank = 0; bank < mem_desc_size; bank++)
+		mem_desc[bank].virt_end += PAGE_SIZE *
+				  params->u1.s.pages_in_bank[bank];
 
-		bytes += params->u1.s.pages_in_bank[bank - FIRST_DRAM_BANK] * PAGE_SIZE;
-
-		rambank[bank].virt_addr   = PAGE_OFFSET + bytes;
-	}
-
-	rambank[FIRST_VRAM_BANK].phys_offset = 0xd6000000;
-	rambank[FIRST_VRAM_BANK].virt_addr   = 0xd8000000;
+	params->u1.s.nr_pages = mem_desc[3].virt_end - PAGE_OFFSET;
+	params->u1.s.nr_pages /= PAGE_SIZE;
 }
 
-#define MAPPING \
-	{ SCREEN2_BASE,	SCREEN_START,	2*1048576, DOMAIN_IO, 0, 1 },	/* VRAM		*/ \
-	{ IO_BASE,	IO_START,	IO_SIZE	 , DOMAIN_IO, 0, 1 },	/* IO space	*/ \
-	{ EASI_BASE,	EASI_START,	EASI_SIZE, DOMAIN_IO, 0, 1 }	/* EASI space	*/
-/*
- * Include common routine to set up page tables
- */
-#include "mm-armv.c"
+struct map_desc io_desc[] __initdata = {
+	/* VRAM		*/
+	{ SCREEN2_BASE,	SCREEN_START,	2*1048576, DOMAIN_IO, 0, 1, 0, 0 },
+	/* IO space	*/
+	{ IO_BASE,	IO_START,	IO_SIZE	 , DOMAIN_IO, 0, 1, 0, 0 },
+	/* EASI space	*/
+	{ EASI_BASE,	EASI_START,	EASI_SIZE, DOMAIN_IO, 0, 1, 0, 0 }
+};
+
+unsigned int __initdata io_desc_size = SIZE(io_desc);