]> err.no Git - linux-2.6/blobdiff - arch/sparc/prom/memory.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[linux-2.6] / arch / sparc / prom / memory.c
index b0c0f9c4fc14bc36f4bd67090d2a576a2f5f5bd4..947f047dc95a67173d0072653052f92187b74325 100644 (file)
-/* $Id: memory.c,v 1.15 2000/01/29 01:09:12 anton Exp $
- * memory.c: Prom routine for acquiring various bits of information
+/* 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) 1995, 2008 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1997 Michael A. Griffith (grif@acm.org)
  */
 
 #include <linux/kernel.h>
+#include <linux/sort.h>
 #include <linux/init.h>
 
 #include <asm/openprom.h>
 #include <asm/sun4prom.h>
 #include <asm/oplib.h>
+#include <asm/page.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.
- */
+static int __init prom_meminit_v0(void)
+{
+       struct linux_mlist_v0 *p;
+       int index;
+
+       index = 0;
+       for (p = *(romvec->pv_v0mem.v0_available); p; p = p->theres_more) {
+               sp_banks[index].base_addr = (unsigned long) p->start_adr;
+               sp_banks[index].num_bytes = p->num_bytes;
+               index++;
+       }
 
-struct linux_prom_registers prom_reg_memlist[64];
-struct linux_prom_registers prom_reg_tmp[64];
+       return index;
+}
 
-struct linux_mlist_v0 prom_phys_total[64];
-struct linux_mlist_v0 prom_prom_taken[64];
-struct linux_mlist_v0 prom_phys_avail[64];
+static int __init prom_meminit_v2(void)
+{
+       struct linux_prom_registers reg[64];
+       int node, size, num_ents, i;
 
-struct linux_mlist_v0 *prom_ptot_ptr = prom_phys_total;
-struct linux_mlist_v0 *prom_ptak_ptr = prom_prom_taken;
-struct linux_mlist_v0 *prom_pavl_ptr = prom_phys_avail;
+       node = prom_searchsiblings(prom_getchild(prom_root_node), "memory");
+       size = prom_getproperty(node, "available", (char *) reg, sizeof(reg));
+       num_ents = size / sizeof(struct linux_prom_registers);
 
-struct linux_mem_v0 prom_memlist;
+       for (i = 0; i < num_ents; i++) {
+               sp_banks[i].base_addr = reg[i].phys_addr;
+               sp_banks[i].num_bytes = reg[i].reg_size;
+       }
 
+       return num_ents;
+}
 
-/* Internal Prom library routine to sort a linux_mlist_v0 memory
- * list.  Used below in initialization.
- */
-static void __init
-prom_sortmemlist(struct linux_mlist_v0 *thislist)
+static int __init prom_meminit_sun4(void)
 {
-       int swapi = 0;
-       int i, mitr, tmpsize;
-       char *tmpaddr;
-       char *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;
-       }
+#ifdef CONFIG_SUN4
+       sp_banks[0].base_addr = 0;
+       sp_banks[0].num_bytes = *(sun4_romvec->memoryavail);
+#endif
+       return 1;
+}
+
+static int sp_banks_cmp(const void *a, const void *b)
+{
+       const struct sparc_phys_banks *x = a, *y = b;
 
-       return;
+       if (x->base_addr > y->base_addr)
+               return 1;
+       if (x->base_addr < y->base_addr)
+               return -1;
+       return 0;
 }
 
 /* Initialize the memory lists based upon the prom version. */
 void __init prom_meminit(void)
 {
-       int node = 0;
-       unsigned int iter, num_regs;
-       struct linux_mlist_v0 *mptr;  /* ptr for traversal */
+       int i, num_ents = 0;
 
-       switch(prom_vers) {
+       switch (prom_vers) {
        case PROM_V0:
-               /* Nice, kind of easier to do in this case. */
-               /* First, the total physical descriptors. */
-               for(mptr = (*(romvec->pv_v0mem.v0_totphys)), iter=0;
-                   mptr; mptr=mptr->theres_more, iter++) {
-                       prom_phys_total[iter].start_adr = mptr->start_adr;
-                       prom_phys_total[iter].num_bytes = mptr->num_bytes;
-                       prom_phys_total[iter].theres_more = &prom_phys_total[iter+1];
-               }
-               prom_phys_total[iter-1].theres_more = NULL;
-               /* Second, the total prom taken descriptors. */
-               for(mptr = (*(romvec->pv_v0mem.v0_prommap)), iter=0;
-                   mptr; mptr=mptr->theres_more, iter++) {
-                       prom_prom_taken[iter].start_adr = mptr->start_adr;
-                       prom_prom_taken[iter].num_bytes = mptr->num_bytes;
-                       prom_prom_taken[iter].theres_more = &prom_prom_taken[iter+1];
-               }
-               prom_prom_taken[iter-1].theres_more = NULL;
-               /* Last, the available physical descriptors. */
-               for(mptr = (*(romvec->pv_v0mem.v0_available)), iter=0;
-                   mptr; mptr=mptr->theres_more, iter++) {
-                       prom_phys_avail[iter].start_adr = mptr->start_adr;
-                       prom_phys_avail[iter].num_bytes = mptr->num_bytes;
-                       prom_phys_avail[iter].theres_more = &prom_phys_avail[iter+1];
-               }
-               prom_phys_avail[iter-1].theres_more = NULL;
-               /* Sort all the lists. */
-               prom_sortmemlist(prom_phys_total);
-               prom_sortmemlist(prom_prom_taken);
-               prom_sortmemlist(prom_phys_avail);
+               num_ents = prom_meminit_v0();
                break;
+
        case PROM_V2:
        case PROM_V3:
-               /* Grrr, have to traverse the prom device tree ;( */
-               node = prom_getchild(prom_root_node);
-               node = prom_searchsiblings(node, "memory");
-               num_regs = prom_getproperty(node, "available",
-                                           (char *) prom_reg_memlist,
-                                           sizeof(prom_reg_memlist));
-               num_regs = (num_regs/sizeof(struct linux_prom_registers));
-               for(iter=0; iter<num_regs; iter++) {
-                       prom_phys_avail[iter].start_adr =
-                               (char *) prom_reg_memlist[iter].phys_addr;
-                       prom_phys_avail[iter].num_bytes =
-                               (unsigned long) 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_prom_registers));
-               for(iter=0; iter<num_regs; iter++) {
-                       prom_phys_total[iter].start_adr =
-                               (char *) prom_reg_memlist[iter].phys_addr;
-                       prom_phys_total[iter].num_bytes =
-                               (unsigned long) 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_getchild(prom_root_node);
-               node = prom_searchsiblings(node, "virtual-memory");
-               num_regs = prom_getproperty(node, "available",
-                                           (char *) prom_reg_memlist,
-                                           sizeof(prom_reg_memlist));
-               num_regs = (num_regs/sizeof(struct linux_prom_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 =
-                               (char *) prom_reg_memlist[iter].phys_addr;
-                       prom_prom_taken[iter].num_bytes =
-                               (unsigned long) 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 =
-                       0xffffffff - (unsigned long) prom_prom_taken[iter-1].start_adr;
-
-               /* Sort the other two lists. */
-               prom_sortmemlist(prom_phys_total);
-               prom_sortmemlist(prom_phys_avail);
+               num_ents = prom_meminit_v2();
                break;
 
        case PROM_SUN4:
-#ifdef CONFIG_SUN4     
-               /* how simple :) */
-               prom_phys_total[0].start_adr = NULL;
-               prom_phys_total[0].num_bytes = *(sun4_romvec->memorysize);
-               prom_phys_total[0].theres_more = NULL;
-               prom_prom_taken[0].start_adr = NULL; 
-               prom_prom_taken[0].num_bytes = 0x0;
-               prom_prom_taken[0].theres_more = NULL;
-               prom_phys_avail[0].start_adr = NULL;
-               prom_phys_avail[0].num_bytes = *(sun4_romvec->memoryavail);
-               prom_phys_avail[0].theres_more = NULL;
-#endif
+               num_ents = prom_meminit_sun4();
                break;
 
        default:
                break;
-       };
-
-       /* Link all the lists into the top-level descriptor. */
-       prom_memlist.v0_totphys=&prom_ptot_ptr;
-       prom_memlist.v0_prommap=&prom_ptak_ptr;
-       prom_memlist.v0_available=&prom_pavl_ptr;
+       }
+       sort(sp_banks, num_ents, sizeof(struct sparc_phys_banks),
+            sp_banks_cmp, NULL);
 
-       return;
-}
+       /* Sentinel.  */
+       sp_banks[num_ents].base_addr = 0xdeadbeef;
+       sp_banks[num_ents].num_bytes = 0;
 
-/* This returns a pointer to our libraries internal v0 format
- * memory descriptor.
- */
-struct linux_mem_v0 *
-prom_meminfo(void)
-{
-       return &prom_memlist;
+       for (i = 0; i < num_ents; i++)
+               sp_banks[i].num_bytes &= PAGE_MASK;
 }