Merge zizzer:/bk/linux into zower.eecs.umich.edu:/z/hsul/work/bk/linux

--HG--
extra : convert_revision : b4e2fc55ec9cd0caa7cdf02de8a61c66e8b35c67

1 files changed, 14 insertions, 0 deletions

diff --git a/kern/linux/linux_system.cc b/kern/linux/linux_system.cc
index d863ffd0a..12c1f5c32 100644
--- a/kern/linux/linux_system.cc
+++ b/kern/linux/linux_system.cc
@@ -300,6 +300,20 @@ LinuxSystem::LinuxSystem(const string _name, const uint64_t _init_param,
             strcpy(osflags, boot_osflags.c_str());
     }
 
+    if (consoleSymtab->findAddress("xxm_rpb", addr)) {
+        Addr paddr = vtophys(physmem, addr);
+        char *hwprb = (char *)physmem->dma_addr(paddr, sizeof(uint64_t));
+
+        if (hwprb) {
+            *(uint64_t*)(hwprb+0x50) = 34;      // Tsunami
+            *(uint64_t*)(hwprb+0x58) = (1<<10);
+        }
+        else
+            panic("could not translate hwprb addr to set system type/variation\n");
+
+    } else
+        panic("could not find hwprb to set system type/variation\n");
+
     if (kernelSymtab->findAddress("panic", addr))
         kernelPanicEvent->schedule(addr);
     else