Changes to Inband SCOM MMIO ranges for Cumulus

- Add function to compress SCOM address - Old MCS target is now DMI - Add istep12 call to enable inband SCOMs - Set each DMI offset attribute in processMrw Change-Id: If5171f8da6c58404ac598047ca0177aead048771 RTC:147272 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/54574 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com> Reviewed-by: Prachi Gupta <pragupta@us.ibm.com> Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
open-power · Mar 8, 2018 · 4cf79f8 · 4cf79f8
1 parent c0fce11
commit 4cf79f8
Show file tree

Hide file tree

Showing 7 changed files with 326 additions and 120 deletions.
diff --git a/src/include/sys/mmio.h b/src/include/sys/mmio.h
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2010,2016                        */
+/* Contributors Listed Below - COPYRIGHT 2010,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -146,10 +146,10 @@ mutex_t * mmio_xscom_mutex();
  */
 static const uint64_t MMIO_IBSCOM_UE_DETECTED = 0x53434F4D4641494C;
 
-/** Constants used to define IBSCOM MMIO address range
+/** Constants used to define IBSCOM MMIO address ranges
 */
-static const uint64_t MMIO_IBSCOM_START = 0x0003E00000000000;
-static const uint64_t MMIO_IBSCOM_END = 0x0003F02000000000;
+static const uint64_t MMIO_IBSCOM_BASE = 0x6030220000000;
+static const uint64_t MMIO_IBSCOM_SIZE = 0x0000020000000;
 
 #ifdef __cplusplus
 }

diff --git a/src/include/usr/ibscom/ibscomreasoncodes.H b/src/include/usr/ibscom/ibscomreasoncodes.H
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
+/* Contributors Listed Below - COPYRIGHT 2012,2018                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -34,6 +36,7 @@ namespace IBSCOM
         IBSCOM_SANITY_CHECK          = 0x02,
         IBSCOM_GET_TARG_VIRT_ADDR    = 0x03,
         IBSCOM_DO_IBSCOM             = 0x04,
+        IBSCOM_GET_PARRENT_DMI       = 0x05,
     };
 
     enum ibscomReasonCode

diff --git a/src/kernel/machchk.C b/src/kernel/machchk.C
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2013,2014              */
+/* Contributors Listed Below - COPYRIGHT 2013,2018                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -24,6 +26,7 @@
 #include <kernel/console.H>
 #include <kernel/vmmmgr.H>
 #include <sys/mmio.h>
+#include <arch/memorymap.H>
 
 namespace Kernel
 {
@@ -83,12 +86,27 @@ bool handleLoadUE(task_t* t)
             uint64_t phys = VmmManager::findPhysicalAddress(vaddr);
 
             //Check if address is in IBSCOM MMIO Range.
-            if((phys >= MMIO_IBSCOM_START) &&
-               (phys <= MMIO_IBSCOM_END))
+            uint64_t ibAddrStart = 0;
+            for(uint32_t l_groupId=0; l_groupId<4; l_groupId++)
             {
-                ueMagicValue = MMIO_IBSCOM_UE_DETECTED;
+                for(uint32_t l_chipId=0; l_chipId<4; l_chipId++)
+                {
+                    ibAddrStart = computeMemoryMapOffset( MMIO_IBSCOM_BASE,
+                                                          l_groupId,
+                                                          l_chipId );
+                    if((phys >= ibAddrStart) &&
+                       (phys <= ibAddrStart + MMIO_IBSCOM_SIZE - 1))
+                    {
+                        ueMagicValue = MMIO_IBSCOM_UE_DETECTED;
+                        break;
+                    }
+                }
+                if(ueMagicValue == MMIO_IBSCOM_UE_DETECTED)
+                {
+                    break;
+                }
             }
-            else
+            if(ueMagicValue != MMIO_IBSCOM_UE_DETECTED)
             {
                 printk("MachineCheck::handleUE: Unrecognized address %lx\n",
                        phys);