Commit 4cb29d18 authored by David S. Miller's avatar David S. Miller
Browse files

[SPARC64]: Kill arch/sparc64/prom/memory.c 



No longer used.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 13edad7a

arch/sparc64/prom/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,5 +6,5 @@ 
EXTRA_AFLAGS := -ansi

EXTRA_CFLAGS := -Werror



lib-y   := bootstr.o devops.o init.o memory.o misc.o \

lib-y   := bootstr.o devops.o init.o misc.o \

	   tree.o console.o printf.o p1275.o cif.o

arch/sparc64/prom/init.c

+0 −3
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ int prom_chosen_node; 
 * failure.  It gets passed the pointer to the PROM vector.

 */



extern void prom_meminit(void);

extern void prom_cif_init(void *, void *);



void __init prom_init(void *cif_handler, void *cif_stack)
@@ -90,8 +89,6 @@ void __init prom_init(void *cif_handler, void *cif_stack) 


	printk ("PROMLIB: Sun IEEE Boot Prom %s\n", buffer + bufadjust);



	prom_meminit();



	/* Initialization successful. */

	return;

arch/sparc64/prom/memory.c

deleted100644 → 0
+0 −152
Original line number Diff line number Diff line 
/* $Id: memory.c,v 1.5 1999/08/31 06:55:04 davem Exp $

 * memory.c: Prom routine for acquiring various bits of information

 *           about RAM on the machine, both virtual and physical.

 *

 * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)

 * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)

 */



#include <linux/kernel.h>

#include <linux/init.h>



#include <asm/openprom.h>

#include <asm/oplib.h>



/* This routine, for consistency, returns the ram parameters in the

 * V0 prom memory descriptor format.  I choose this format because I

 * think it was the easiest to work with.  I feel the religious

 * arguments now... ;)  Also, I return the linked lists sorted to

 * prevent paging_init() upset stomach as I have not yet written

 * the pepto-bismol kernel module yet.

 */



struct linux_prom64_registers prom_reg_memlist[64];

struct linux_prom64_registers prom_reg_tmp[64];



struct linux_mlist_p1275 prom_phys_total[64];

struct linux_mlist_p1275 prom_prom_taken[64];

struct linux_mlist_p1275 prom_phys_avail[64];



struct linux_mlist_p1275 *prom_ptot_ptr = prom_phys_total;

struct linux_mlist_p1275 *prom_ptak_ptr = prom_prom_taken;

struct linux_mlist_p1275 *prom_pavl_ptr = prom_phys_avail;



struct linux_mem_p1275 prom_memlist;





/* Internal Prom library routine to sort a linux_mlist_p1275 memory

 * list.  Used below in initialization.

 */

static void __init

prom_sortmemlist(struct linux_mlist_p1275 *thislist)

{

	int swapi = 0;

	int i, mitr;

	unsigned long tmpaddr, tmpsize;

	unsigned long lowest;



	for(i=0; thislist[i].theres_more; i++) {

		lowest = thislist[i].start_adr;

		for(mitr = i+1; thislist[mitr-1].theres_more; mitr++)

			if(thislist[mitr].start_adr < lowest) {

				lowest = thislist[mitr].start_adr;

				swapi = mitr;

			}

		if(lowest == thislist[i].start_adr) continue;

		tmpaddr = thislist[swapi].start_adr;

		tmpsize = thislist[swapi].num_bytes;

		for(mitr = swapi; mitr > i; mitr--) {

			thislist[mitr].start_adr = thislist[mitr-1].start_adr;

			thislist[mitr].num_bytes = thislist[mitr-1].num_bytes;

		}

		thislist[i].start_adr = tmpaddr;

		thislist[i].num_bytes = tmpsize;

	}

}



/* Initialize the memory lists based upon the prom version. */

void __init prom_meminit(void)

{

	int node = 0;

	unsigned int iter, num_regs;



	node = prom_finddevice("/memory");

	num_regs = prom_getproperty(node, "available",

				    (char *) prom_reg_memlist,

				    sizeof(prom_reg_memlist));

	num_regs = (num_regs/sizeof(struct linux_prom64_registers));

	for(iter=0; iter<num_regs; iter++) {

		prom_phys_avail[iter].start_adr =

			prom_reg_memlist[iter].phys_addr;

		prom_phys_avail[iter].num_bytes =

			prom_reg_memlist[iter].reg_size;

		prom_phys_avail[iter].theres_more =

			&prom_phys_avail[iter+1];

	}

	prom_phys_avail[iter-1].theres_more = NULL;



	num_regs = prom_getproperty(node, "reg",

				    (char *) prom_reg_memlist,

				    sizeof(prom_reg_memlist));

	num_regs = (num_regs/sizeof(struct linux_prom64_registers));

	for(iter=0; iter<num_regs; iter++) {

		prom_phys_total[iter].start_adr =

			prom_reg_memlist[iter].phys_addr;

		prom_phys_total[iter].num_bytes =

			prom_reg_memlist[iter].reg_size;

		prom_phys_total[iter].theres_more =

			&prom_phys_total[iter+1];

	}

	prom_phys_total[iter-1].theres_more = NULL;



	node = prom_finddevice("/virtual-memory");

	num_regs = prom_getproperty(node, "available",

				    (char *) prom_reg_memlist,

				    sizeof(prom_reg_memlist));

	num_regs = (num_regs/sizeof(struct linux_prom64_registers));



	/* Convert available virtual areas to taken virtual

	 * areas.  First sort, then convert.

	 */

	for(iter=0; iter<num_regs; iter++) {

		prom_prom_taken[iter].start_adr =

			prom_reg_memlist[iter].phys_addr;

		prom_prom_taken[iter].num_bytes =

			prom_reg_memlist[iter].reg_size;

		prom_prom_taken[iter].theres_more =

			&prom_prom_taken[iter+1];

	}

	prom_prom_taken[iter-1].theres_more = NULL;



	prom_sortmemlist(prom_prom_taken);



	/* Finally, convert. */

	for(iter=0; iter<num_regs; iter++) {

		prom_prom_taken[iter].start_adr =

			prom_prom_taken[iter].start_adr +

			prom_prom_taken[iter].num_bytes;

		prom_prom_taken[iter].num_bytes =

			prom_prom_taken[iter+1].start_adr -

			prom_prom_taken[iter].start_adr;

	}

	prom_prom_taken[iter-1].num_bytes =

		-1UL - prom_prom_taken[iter-1].start_adr;



	/* Sort the other two lists. */

	prom_sortmemlist(prom_phys_total);

	prom_sortmemlist(prom_phys_avail);



	/* Link all the lists into the top-level descriptor. */

	prom_memlist.p1275_totphys=&prom_ptot_ptr;

	prom_memlist.p1275_prommap=&prom_ptak_ptr;

	prom_memlist.p1275_available=&prom_pavl_ptr;

}



/* This returns a pointer to our libraries internal p1275 format

 * memory descriptor.

 */

struct linux_mem_p1275 *

prom_meminfo(void)

{

	return &prom_memlist;

}

include/asm-sparc64/oplib.h

+0 −14
Original line number Diff line number Diff line
@@ -95,20 +95,6 @@ extern int prom_devclose(int device_handle); 
extern void prom_seek(int device_handle, unsigned int seek_hival,

		      unsigned int seek_lowval);



/* Machine memory configuration routine. */



/* This function returns a V0 format memory descriptor table, it has three

 * entries.  One for the total amount of physical ram on the machine, one

 * for the amount of physical ram available, and one describing the virtual

 * areas which are allocated by the prom.  So, in a sense the physical

 * available is a calculation of the total physical minus the physical mapped

 * by the prom with virtual mappings.

 *

 * These lists are returned pre-sorted, this should make your life easier

 * since the prom itself is way too lazy to do such nice things.

 */

extern struct linux_mem_p1275 *prom_meminfo(void);



/* Miscellaneous routines, don't really fit in any category per se. */



/* Reboot the machine with the command line passed. */