ppc64: Use the merged lmb routines
The only real change here is that lmb_enforce_memory_limit now takes the memory_limit as a parameter instead of as a global variable. Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Paul Mackerras
parent
9f04b9e327
commit
a432403a89
4 changed files with 4 additions and 383 deletions
|
|
@ -12,7 +12,7 @@ obj-y := setup.o entry.o irq.o idle.o dma.o \
|
|||
align.o semaphore.o bitops.o pacaData.o \
|
||||
udbg.o binfmt_elf32.o sys_ppc32.o ioctl32.o \
|
||||
ptrace32.o signal32.o rtc.o init_task.o \
|
||||
lmb.o cputable.o cpu_setup_power4.o \
|
||||
cputable.o cpu_setup_power4.o \
|
||||
iommu.o sysfs.o vdso.o pmc.o firmware.o prom.o
|
||||
obj-y += vdso32/ vdso64/
|
||||
|
||||
|
|
|
|||
|
|
@ -1,299 +0,0 @@
|
|||
/*
|
||||
* Procedures for interfacing to Open Firmware.
|
||||
*
|
||||
* Peter Bergner, IBM Corp. June 2001.
|
||||
* Copyright (C) 2001 Peter Bergner.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version
|
||||
* 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/bitops.h>
|
||||
#include <asm/types.h>
|
||||
#include <asm/page.h>
|
||||
#include <asm/prom.h>
|
||||
#include <asm/lmb.h>
|
||||
#include <asm/abs_addr.h>
|
||||
|
||||
struct lmb lmb;
|
||||
|
||||
#undef DEBUG
|
||||
|
||||
void lmb_dump_all(void)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
unsigned long i;
|
||||
|
||||
udbg_printf("lmb_dump_all:\n");
|
||||
udbg_printf(" memory.cnt = 0x%lx\n",
|
||||
lmb.memory.cnt);
|
||||
udbg_printf(" memory.size = 0x%lx\n",
|
||||
lmb.memory.size);
|
||||
for (i=0; i < lmb.memory.cnt ;i++) {
|
||||
udbg_printf(" memory.region[0x%x].base = 0x%lx\n",
|
||||
i, lmb.memory.region[i].base);
|
||||
udbg_printf(" .size = 0x%lx\n",
|
||||
lmb.memory.region[i].size);
|
||||
}
|
||||
|
||||
udbg_printf("\n reserved.cnt = 0x%lx\n",
|
||||
lmb.reserved.cnt);
|
||||
udbg_printf(" reserved.size = 0x%lx\n",
|
||||
lmb.reserved.size);
|
||||
for (i=0; i < lmb.reserved.cnt ;i++) {
|
||||
udbg_printf(" reserved.region[0x%x].base = 0x%lx\n",
|
||||
i, lmb.reserved.region[i].base);
|
||||
udbg_printf(" .size = 0x%lx\n",
|
||||
lmb.reserved.region[i].size);
|
||||
}
|
||||
#endif /* DEBUG */
|
||||
}
|
||||
|
||||
static unsigned long __init
|
||||
lmb_addrs_overlap(unsigned long base1, unsigned long size1,
|
||||
unsigned long base2, unsigned long size2)
|
||||
{
|
||||
return ((base1 < (base2+size2)) && (base2 < (base1+size1)));
|
||||
}
|
||||
|
||||
static long __init
|
||||
lmb_addrs_adjacent(unsigned long base1, unsigned long size1,
|
||||
unsigned long base2, unsigned long size2)
|
||||
{
|
||||
if (base2 == base1 + size1)
|
||||
return 1;
|
||||
else if (base1 == base2 + size2)
|
||||
return -1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static long __init
|
||||
lmb_regions_adjacent(struct lmb_region *rgn, unsigned long r1, unsigned long r2)
|
||||
{
|
||||
unsigned long base1 = rgn->region[r1].base;
|
||||
unsigned long size1 = rgn->region[r1].size;
|
||||
unsigned long base2 = rgn->region[r2].base;
|
||||
unsigned long size2 = rgn->region[r2].size;
|
||||
|
||||
return lmb_addrs_adjacent(base1, size1, base2, size2);
|
||||
}
|
||||
|
||||
/* Assumption: base addr of region 1 < base addr of region 2 */
|
||||
static void __init
|
||||
lmb_coalesce_regions(struct lmb_region *rgn, unsigned long r1, unsigned long r2)
|
||||
{
|
||||
unsigned long i;
|
||||
|
||||
rgn->region[r1].size += rgn->region[r2].size;
|
||||
for (i=r2; i < rgn->cnt-1; i++) {
|
||||
rgn->region[i].base = rgn->region[i+1].base;
|
||||
rgn->region[i].size = rgn->region[i+1].size;
|
||||
}
|
||||
rgn->cnt--;
|
||||
}
|
||||
|
||||
/* This routine called with relocation disabled. */
|
||||
void __init
|
||||
lmb_init(void)
|
||||
{
|
||||
/* Create a dummy zero size LMB which will get coalesced away later.
|
||||
* This simplifies the lmb_add() code below...
|
||||
*/
|
||||
lmb.memory.region[0].base = 0;
|
||||
lmb.memory.region[0].size = 0;
|
||||
lmb.memory.cnt = 1;
|
||||
|
||||
/* Ditto. */
|
||||
lmb.reserved.region[0].base = 0;
|
||||
lmb.reserved.region[0].size = 0;
|
||||
lmb.reserved.cnt = 1;
|
||||
}
|
||||
|
||||
/* This routine called with relocation disabled. */
|
||||
void __init
|
||||
lmb_analyze(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
lmb.memory.size = 0;
|
||||
|
||||
for (i = 0; i < lmb.memory.cnt; i++)
|
||||
lmb.memory.size += lmb.memory.region[i].size;
|
||||
}
|
||||
|
||||
/* This routine called with relocation disabled. */
|
||||
static long __init
|
||||
lmb_add_region(struct lmb_region *rgn, unsigned long base, unsigned long size)
|
||||
{
|
||||
unsigned long i, coalesced = 0;
|
||||
long adjacent;
|
||||
|
||||
/* First try and coalesce this LMB with another. */
|
||||
for (i=0; i < rgn->cnt; i++) {
|
||||
unsigned long rgnbase = rgn->region[i].base;
|
||||
unsigned long rgnsize = rgn->region[i].size;
|
||||
|
||||
adjacent = lmb_addrs_adjacent(base,size,rgnbase,rgnsize);
|
||||
if ( adjacent > 0 ) {
|
||||
rgn->region[i].base -= size;
|
||||
rgn->region[i].size += size;
|
||||
coalesced++;
|
||||
break;
|
||||
}
|
||||
else if ( adjacent < 0 ) {
|
||||
rgn->region[i].size += size;
|
||||
coalesced++;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if ((i < rgn->cnt-1) && lmb_regions_adjacent(rgn, i, i+1) ) {
|
||||
lmb_coalesce_regions(rgn, i, i+1);
|
||||
coalesced++;
|
||||
}
|
||||
|
||||
if ( coalesced ) {
|
||||
return coalesced;
|
||||
} else if ( rgn->cnt >= MAX_LMB_REGIONS ) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Couldn't coalesce the LMB, so add it to the sorted table. */
|
||||
for (i=rgn->cnt-1; i >= 0; i--) {
|
||||
if (base < rgn->region[i].base) {
|
||||
rgn->region[i+1].base = rgn->region[i].base;
|
||||
rgn->region[i+1].size = rgn->region[i].size;
|
||||
} else {
|
||||
rgn->region[i+1].base = base;
|
||||
rgn->region[i+1].size = size;
|
||||
break;
|
||||
}
|
||||
}
|
||||
rgn->cnt++;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* This routine called with relocation disabled. */
|
||||
long __init
|
||||
lmb_add(unsigned long base, unsigned long size)
|
||||
{
|
||||
struct lmb_region *_rgn = &(lmb.memory);
|
||||
|
||||
/* On pSeries LPAR systems, the first LMB is our RMO region. */
|
||||
if ( base == 0 )
|
||||
lmb.rmo_size = size;
|
||||
|
||||
return lmb_add_region(_rgn, base, size);
|
||||
|
||||
}
|
||||
|
||||
long __init
|
||||
lmb_reserve(unsigned long base, unsigned long size)
|
||||
{
|
||||
struct lmb_region *_rgn = &(lmb.reserved);
|
||||
|
||||
return lmb_add_region(_rgn, base, size);
|
||||
}
|
||||
|
||||
long __init
|
||||
lmb_overlaps_region(struct lmb_region *rgn, unsigned long base, unsigned long size)
|
||||
{
|
||||
unsigned long i;
|
||||
|
||||
for (i=0; i < rgn->cnt; i++) {
|
||||
unsigned long rgnbase = rgn->region[i].base;
|
||||
unsigned long rgnsize = rgn->region[i].size;
|
||||
if ( lmb_addrs_overlap(base,size,rgnbase,rgnsize) ) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return (i < rgn->cnt) ? i : -1;
|
||||
}
|
||||
|
||||
unsigned long __init
|
||||
lmb_alloc(unsigned long size, unsigned long align)
|
||||
{
|
||||
return lmb_alloc_base(size, align, LMB_ALLOC_ANYWHERE);
|
||||
}
|
||||
|
||||
unsigned long __init
|
||||
lmb_alloc_base(unsigned long size, unsigned long align, unsigned long max_addr)
|
||||
{
|
||||
long i, j;
|
||||
unsigned long base = 0;
|
||||
|
||||
for (i=lmb.memory.cnt-1; i >= 0; i--) {
|
||||
unsigned long lmbbase = lmb.memory.region[i].base;
|
||||
unsigned long lmbsize = lmb.memory.region[i].size;
|
||||
|
||||
if ( max_addr == LMB_ALLOC_ANYWHERE )
|
||||
base = _ALIGN_DOWN(lmbbase+lmbsize-size, align);
|
||||
else if ( lmbbase < max_addr )
|
||||
base = _ALIGN_DOWN(min(lmbbase+lmbsize,max_addr)-size, align);
|
||||
else
|
||||
continue;
|
||||
|
||||
while ( (lmbbase <= base) &&
|
||||
((j = lmb_overlaps_region(&lmb.reserved,base,size)) >= 0) ) {
|
||||
base = _ALIGN_DOWN(lmb.reserved.region[j].base-size, align);
|
||||
}
|
||||
|
||||
if ( (base != 0) && (lmbbase <= base) )
|
||||
break;
|
||||
}
|
||||
|
||||
if ( i < 0 )
|
||||
return 0;
|
||||
|
||||
lmb_add_region(&lmb.reserved, base, size);
|
||||
|
||||
return base;
|
||||
}
|
||||
|
||||
/* You must call lmb_analyze() before this. */
|
||||
unsigned long __init
|
||||
lmb_phys_mem_size(void)
|
||||
{
|
||||
return lmb.memory.size;
|
||||
}
|
||||
|
||||
unsigned long __init
|
||||
lmb_end_of_DRAM(void)
|
||||
{
|
||||
int idx = lmb.memory.cnt - 1;
|
||||
|
||||
return (lmb.memory.region[idx].base + lmb.memory.region[idx].size);
|
||||
}
|
||||
|
||||
/*
|
||||
* Truncate the lmb list to memory_limit if it's set
|
||||
* You must call lmb_analyze() after this.
|
||||
*/
|
||||
void __init lmb_enforce_memory_limit(void)
|
||||
{
|
||||
extern unsigned long memory_limit;
|
||||
unsigned long i, limit;
|
||||
|
||||
if (! memory_limit)
|
||||
return;
|
||||
|
||||
limit = memory_limit;
|
||||
for (i = 0; i < lmb.memory.cnt; i++) {
|
||||
if (limit > lmb.memory.region[i].size) {
|
||||
limit -= lmb.memory.region[i].size;
|
||||
continue;
|
||||
}
|
||||
|
||||
lmb.memory.region[i].size = limit;
|
||||
lmb.memory.cnt = i + 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -78,6 +78,7 @@ typedef int interpret_func(struct device_node *, unsigned long *,
|
|||
extern struct rtas_t rtas;
|
||||
extern struct lmb lmb;
|
||||
extern unsigned long klimit;
|
||||
extern unsigned long memory_limit;
|
||||
|
||||
static int __initdata dt_root_addr_cells;
|
||||
static int __initdata dt_root_size_cells;
|
||||
|
|
@ -1063,7 +1064,7 @@ static int __init early_init_dt_scan_chosen(unsigned long node,
|
|||
{
|
||||
u32 *prop;
|
||||
u64 *prop64;
|
||||
extern unsigned long memory_limit, tce_alloc_start, tce_alloc_end;
|
||||
extern unsigned long tce_alloc_start, tce_alloc_end;
|
||||
|
||||
DBG("search \"chosen\", depth: %d, uname: %s\n", depth, uname);
|
||||
|
||||
|
|
@ -1237,7 +1238,7 @@ void __init early_init_devtree(void *params)
|
|||
lmb_init();
|
||||
scan_flat_dt(early_init_dt_scan_root, NULL);
|
||||
scan_flat_dt(early_init_dt_scan_memory, NULL);
|
||||
lmb_enforce_memory_limit();
|
||||
lmb_enforce_memory_limit(memory_limit);
|
||||
lmb_analyze();
|
||||
systemcfg->physicalMemorySize = lmb_phys_mem_size();
|
||||
lmb_reserve(0, __pa(klimit));
|
||||
|
|
|
|||
|
|
@ -1,81 +0,0 @@
|
|||
#ifndef _PPC64_LMB_H
|
||||
#define _PPC64_LMB_H
|
||||
|
||||
/*
|
||||
* Definitions for talking to the Open Firmware PROM on
|
||||
* Power Macintosh computers.
|
||||
*
|
||||
* Copyright (C) 2001 Peter Bergner, IBM Corp.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version
|
||||
* 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#include <linux/init.h>
|
||||
#include <asm/prom.h>
|
||||
|
||||
#define MAX_LMB_REGIONS 128
|
||||
|
||||
#define LMB_ALLOC_ANYWHERE 0
|
||||
|
||||
struct lmb_property {
|
||||
unsigned long base;
|
||||
unsigned long size;
|
||||
};
|
||||
|
||||
struct lmb_region {
|
||||
unsigned long cnt;
|
||||
unsigned long size;
|
||||
struct lmb_property region[MAX_LMB_REGIONS+1];
|
||||
};
|
||||
|
||||
struct lmb {
|
||||
unsigned long debug;
|
||||
unsigned long rmo_size;
|
||||
struct lmb_region memory;
|
||||
struct lmb_region reserved;
|
||||
};
|
||||
|
||||
extern struct lmb lmb;
|
||||
|
||||
extern void __init lmb_init(void);
|
||||
extern void __init lmb_analyze(void);
|
||||
extern long __init lmb_add(unsigned long, unsigned long);
|
||||
extern long __init lmb_reserve(unsigned long, unsigned long);
|
||||
extern unsigned long __init lmb_alloc(unsigned long, unsigned long);
|
||||
extern unsigned long __init lmb_alloc_base(unsigned long, unsigned long,
|
||||
unsigned long);
|
||||
extern unsigned long __init lmb_phys_mem_size(void);
|
||||
extern unsigned long __init lmb_end_of_DRAM(void);
|
||||
extern unsigned long __init lmb_abs_to_phys(unsigned long);
|
||||
extern void __init lmb_enforce_memory_limit(void);
|
||||
|
||||
extern void lmb_dump_all(void);
|
||||
|
||||
extern unsigned long io_hole_start;
|
||||
|
||||
static inline unsigned long
|
||||
lmb_size_bytes(struct lmb_region *type, unsigned long region_nr)
|
||||
{
|
||||
return type->region[region_nr].size;
|
||||
}
|
||||
static inline unsigned long
|
||||
lmb_size_pages(struct lmb_region *type, unsigned long region_nr)
|
||||
{
|
||||
return lmb_size_bytes(type, region_nr) >> PAGE_SHIFT;
|
||||
}
|
||||
static inline unsigned long
|
||||
lmb_start_pfn(struct lmb_region *type, unsigned long region_nr)
|
||||
{
|
||||
return type->region[region_nr].base >> PAGE_SHIFT;
|
||||
}
|
||||
static inline unsigned long
|
||||
lmb_end_pfn(struct lmb_region *type, unsigned long region_nr)
|
||||
{
|
||||
return lmb_start_pfn(type, region_nr) +
|
||||
lmb_size_pages(type, region_nr);
|
||||
}
|
||||
|
||||
#endif /* _PPC64_LMB_H */
|
||||
Loading…
Reference in a new issue