diff options
| -rw-r--r-- | arch/mips64/sgi-ip27/ip27-memory.c | 22 | ||||
| -rw-r--r-- | include/asm-mips64/mmzone.h | 30 | ||||
| -rw-r--r-- | include/asm-mips64/pgtable.h | 4 |
3 files changed, 26 insertions, 30 deletions
diff --git a/arch/mips64/sgi-ip27/ip27-memory.c b/arch/mips64/sgi-ip27/ip27-memory.c index 6e547920b..d344d866f 100644 --- a/arch/mips64/sgi-ip27/ip27-memory.c +++ b/arch/mips64/sgi-ip27/ip27-memory.c @@ -269,7 +269,7 @@ prom_free_prom_memory (void) void __init paging_init(void) { cnodeid_t node; - unsigned int zones_size[MAX_NR_ZONES] = {0, 0, 0}; + unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0}; /* Initialize the entire pgd. */ pgd_init((unsigned long)swapper_pg_dir); @@ -281,16 +281,12 @@ void __init paging_init(void) pfn_t end_pfn = node_getmaxclick(node); zones_size[ZONE_DMA] = end_pfn + 1 - start_pfn; - PLAT_NODE_DATA(node)->physstart = (start_pfn << PAGE_SHIFT); - PLAT_NODE_DATA(node)->size = (zones_size[ZONE_DMA] << PAGE_SHIFT); free_area_init_node(node, NODE_DATA(node), zones_size, start_pfn << PAGE_SHIFT); - PLAT_NODE_DATA(node)->start_mapnr = - (NODE_DATA(node)->node_mem_map - mem_map); - if ((PLAT_NODE_DATA(node)->start_mapnr + - PLAT_NODE_DATA(node)->size) > pagenr) - pagenr = PLAT_NODE_DATA(node)->start_mapnr + - PLAT_NODE_DATA(node)->size; + if ((PLAT_NODE_DATA_STARTNR(node) + + PLAT_NODE_DATA_SIZE(node)) > pagenr) + pagenr = PLAT_NODE_DATA_STARTNR(node) + + PLAT_NODE_DATA_SIZE(node); } } @@ -322,7 +318,7 @@ void __init mem_init(void) * We need to manually do the other slots. */ pg = NODE_DATA(nid)->node_mem_map + slot_getsize(nid, 0); - pgnr = PLAT_NODE_DATA(nid)->start_mapnr + slot_getsize(nid, 0); + pgnr = PLAT_NODE_DATA_STARTNR(nid) + slot_getsize(nid, 0); numslots = node_getlastslot(nid); for (slot = 1; slot <= numslots; slot++) { pslot = NODE_DATA(nid)->node_mem_map + @@ -357,9 +353,9 @@ void __init mem_init(void) reservedpages = ram = 0; for (nid = 0; nid < numnodes; nid++) { - for (tmp = PLAT_NODE_DATA(nid)->start_mapnr; tmp < - ((PLAT_NODE_DATA(nid)->start_mapnr) + - (PLAT_NODE_DATA(nid)->size >> PAGE_SHIFT)); tmp++) { + for (tmp = PLAT_NODE_DATA_STARTNR(nid); tmp < + ((PLAT_NODE_DATA_STARTNR(nid)) + + (PLAT_NODE_DATA_SIZE(nid) >> PAGE_SHIFT)); tmp++) { /* Ignore holes */ if (PageSkip(mem_map+tmp)) continue; diff --git a/include/asm-mips64/mmzone.h b/include/asm-mips64/mmzone.h index 2d5d1a9b3..e49d0fc75 100644 --- a/include/asm-mips64/mmzone.h +++ b/include/asm-mips64/mmzone.h @@ -10,9 +10,6 @@ typedef struct plat_pglist_data { pg_data_t gendata; - unsigned long physstart; - unsigned long size; - unsigned long start_mapnr; } plat_pg_data_t; /* @@ -24,10 +21,10 @@ extern plat_pg_data_t *plat_node_data[]; #define PHYSADDR_TO_NID(pa) NASID_TO_COMPACT_NODEID(NASID_GET(pa)) #define PLAT_NODE_DATA(n) (plat_node_data[n]) -#define PLAT_NODE_DATA_STARTNR(n) (PLAT_NODE_DATA(n)->start_mapnr) +#define PLAT_NODE_DATA_STARTNR(n) (PLAT_NODE_DATA(n)->gendata.node_start_mapnr) +#define PLAT_NODE_DATA_SIZE(n) (PLAT_NODE_DATA(n)->gendata.node_size) #define PLAT_NODE_DATA_LOCALNR(p, n) \ - (((p) - PLAT_NODE_DATA(n)->physstart) >> PAGE_SHIFT) -#define PAGE_TO_PLAT_NODE(p) (plat_pg_data_t *)((p)->zone->zone_pgdat) + (((p) - PLAT_NODE_DATA(n)->gendata.node_start_paddr) >> PAGE_SHIFT) #ifdef CONFIG_DISCONTIGMEM @@ -37,8 +34,6 @@ extern plat_pg_data_t *plat_node_data[]; /* * Given a kernel address, find the home node of the underlying memory. - * For production kern_addr_valid, change to return "numnodes" instead - * of panicing. */ #define KVADDR_TO_NID(kaddr) \ ((NASID_TO_COMPACT_NODEID(NASID_GET(__pa(kaddr))) != -1) ? \ @@ -57,13 +52,6 @@ extern plat_pg_data_t *plat_node_data[]; #define NODE_MEM_MAP(nid) (NODE_DATA(nid)->node_mem_map) /* - * Given a mem_map_t, LOCAL_MAP_BASE finds the owning node for the - * physical page and returns the kaddr for the mem_map of that node. - */ -#define LOCAL_MAP_BASE(page) \ - NODE_MEM_MAP(KVADDR_TO_NID((unsigned long)(page))) - -/* * Given a kaddr, ADDR_TO_MAPBASE finds the owning node of the memory * and returns the the mem_map of that node. */ @@ -77,6 +65,18 @@ extern plat_pg_data_t *plat_node_data[]; */ #define LOCAL_BASE_ADDR(kaddr) ((unsigned long)(kaddr) & ~(NODE_MAX_MEM_SIZE-1)) +#define LOCAL_MAP_NR(kvaddr) \ + (((unsigned long)(kvaddr)-LOCAL_BASE_ADDR((kvaddr))) >> PAGE_SHIFT) + +#define MAP_NR(kaddr) (((unsigned long)(kaddr) > (unsigned long)high_memory)\ + ? (max_mapnr + 1) : (LOCAL_MAP_NR((kaddr)) + \ + (((unsigned long)ADDR_TO_MAPBASE((kaddr)) - PAGE_OFFSET) / \ + sizeof(mem_map_t)))) + +#define kern_addr_valid(addr) ((KVADDR_TO_NID((unsigned long)addr) > \ + -1) ? 0 : (test_bit(LOCAL_MAP_NR((addr)), \ + NODE_DATA(KVADDR_TO_NID((unsigned long)addr))->valid_addr_bitmap))) + #endif /* CONFIG_DISCONTIGMEM */ #endif /* _ASM_MMZONE_H_ */ diff --git a/include/asm-mips64/pgtable.h b/include/asm-mips64/pgtable.h index a136a3797..dfaff3f1e 100644 --- a/include/asm-mips64/pgtable.h +++ b/include/asm-mips64/pgtable.h @@ -411,8 +411,8 @@ extern inline pte_t pte_mkyoung(pte_t pte) #define PAGE_TO_PA(page) ((page - mem_map) << PAGE_SHIFT) #else #define PAGE_TO_PA(page) \ - ((((page)-(page)->zone->zone_pgdat->node_mem_map) << PAGE_SHIFT) \ - + ((PAGE_TO_PLAT_NODE(page))->physstart)) + ((((page)-(page)->zone->zone_mem_map) << PAGE_SHIFT) \ + + ((page)->zone->zone_start_paddr)) #endif #define mk_pte(page, pgprot) \ ({ \ |