Author: nwhitehorn
Date: Sun Jul 20 00:08:50 2014
New Revision: 268898
URL: http://svnweb.freebsd.org/changeset/base/268898
Log:
Fix allocation of 128MB extended memory region, broken since some careless
modifications in December.
MFC after: 3 days
Modified:
head/sys/powerpc/ps3/platform_ps3.c
Modified: head/sys/powerpc/ps3/platform_ps3.c
==============================================================================
--- head/sys/powerpc/ps3/platform_ps3.c Sat Jul 19 23:57:36 2014
(r268897)
+++ head/sys/powerpc/ps3/platform_ps3.c Sun Jul 20 00:08:50 2014
(r268898)
@@ -110,14 +110,6 @@ ps3_probe(platform_t plat)
static int
ps3_attach(platform_t plat)
{
- uint64_t junk;
- int count;
- struct mem_region avail_regions[2];
-
- ps3_mem_regions(plat, NULL, NULL, avail_regions, &count);
-
- lv1_allocate_memory(avail_regions[1].mr_size, 24 /* 16 MB pages */,
- 0, 0x04 /* any address */, &avail_regions[1].mr_start, &junk);
pmap_mmu_install("mmu_ps3", BUS_PROBE_SPECIFIC);
cpu_idle_hook = ps3_cpu_idle;
@@ -152,6 +144,11 @@ ps3_mem_regions(platform_t plat, struct
/* Convert to maximum amount we can allocate in 16 MB pages */
avail_regions[1].mr_size -= avail_regions[0].mr_size;
avail_regions[1].mr_size -= avail_regions[1].mr_size % (16*1024*1024);
+
+ /* Allocate extended memory region */
+ lv1_allocate_memory(avail_regions[1].mr_size, 24 /* 16 MB pages */,
+ 0, 0x04 /* any address */, &avail_regions[1].mr_start, &junk);
+
*availsz = 2;
if (phys != NULL) {
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
