summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Cain <cjcain@us.ibm.com>2019-05-08 12:25:47 -0500
committerChristopher J. Cain <cjcain@us.ibm.com>2019-05-08 13:06:48 -0500
commit326a900583f64d6a1ddd43fbabc393784b4ef42e (patch)
treed6e0222056a2af4985b9eda56bf09d1a12a341d4
parent9a6d21e73e443693633187d023d7a8692fba9888 (diff)
downloadtalos-occ-326a900583f64d6a1ddd43fbabc393784b4ef42e.tar.gz
talos-occ-326a900583f64d6a1ddd43fbabc393784b4ef42e.zip
Initialize mem type for Centaur
Change-Id: Ifd92e619a1bc780a725a5484345955164471a1f0 CQ: SW464895 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/77123 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Douglas R. Gilbert <dgilbert@us.ibm.com> Reviewed-by: Martha Broyles <mbroyles@us.ibm.com> Reviewed-by: Christopher J. Cain <cjcain@us.ibm.com>
-rwxr-xr-xsrc/occ_405/occbuildname.c2
-rw-r--r--src/occ_gpe1/gpe_centaur.c25
-rw-r--r--src/occ_gpe1/gpe_membuf_scom.c26
3 files changed, 33 insertions, 20 deletions
diff --git a/src/occ_405/occbuildname.c b/src/occ_405/occbuildname.c
index b3e3a04..0ff8f58 100755
--- a/src/occ_405/occbuildname.c
+++ b/src/occ_405/occbuildname.c
@@ -34,6 +34,6 @@ volatile const char G_occ_buildname[16] __attribute__((section(".buildname"))) =
#else
-volatile const char G_occ_buildname[16] __attribute__((section(".buildname"))) = /*<BuildName>*/ "op_occ_190426a\0" /*</BuildName>*/ ;
+volatile const char G_occ_buildname[16] __attribute__((section(".buildname"))) = /*<BuildName>*/ "op_occ_190508a\0" /*</BuildName>*/ ;
#endif
diff --git a/src/occ_gpe1/gpe_centaur.c b/src/occ_gpe1/gpe_centaur.c
index 6c17878..09f3dbd 100644
--- a/src/occ_gpe1/gpe_centaur.c
+++ b/src/occ_gpe1/gpe_centaur.c
@@ -1,19 +1,25 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
-/* $Source: chips/p9/procedures/lib/pm/centaur_thermal_access.c $ */
+/* $Source: src/occ_gpe1/gpe_centaur.c $ */
/* */
-/* IBM CONFIDENTIAL */
+/* OpenPOWER OnChipController Project */
/* */
-/* EKB Project */
-/* */
-/* COPYRIGHT 2017 */
+/* Contributors Listed Below - COPYRIGHT 2017,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
-/* The source code for this program is not published or otherwise */
-/* divested of its trade secrets, irrespective of what has been */
-/* deposited with the U.S. Copyright Office. */
+/* Licensed under the Apache License, Version 2.0 (the "License"); */
+/* you may not use this file except in compliance with the License. */
+/* You may obtain a copy of the License at */
+/* */
+/* http://www.apache.org/licenses/LICENSE-2.0 */
+/* */
+/* Unless required by applicable law or agreed to in writing, software */
+/* distributed under the License is distributed on an "AS IS" BASIS, */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or */
+/* implied. See the License for the specific language governing */
+/* permissions and limitations under the License. */
/* */
/* IBM_PROLOG_END_TAG */
/**
@@ -183,6 +189,7 @@ int gpe_centaur_configuration_create(MemBufConfiguration_t* o_config)
}
o_config->configRc = MEMBUF_NOT_CONFIGURED;
+ o_config->membuf_type = MEMTYPE_CENTAUR;
do
{
@@ -218,7 +225,7 @@ int gpe_centaur_configuration_create(MemBufConfiguration_t* o_config)
// Iterate through each MCS on the chip and check configuration.
// Note that the code uniformly treats SCOM failures of the MCFGPR
- // registers as an unconfigured Centaur. This works both for real
+ // registers as an unconfigured Centaur. This works both for real
// hardware, as well as for our VBU models where some of the "valid"
// MCS are not in the simulation models.
diff --git a/src/occ_gpe1/gpe_membuf_scom.c b/src/occ_gpe1/gpe_membuf_scom.c
index b27ab3f..0a047ea 100644
--- a/src/occ_gpe1/gpe_membuf_scom.c
+++ b/src/occ_gpe1/gpe_membuf_scom.c
@@ -1,19 +1,25 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
-/* $Source: chips/p9/procedures/lib/pm/membuf_scom.c $ */
+/* $Source: src/occ_gpe1/gpe_membuf_scom.c $ */
/* */
-/* IBM CONFIDENTIAL */
+/* OpenPOWER OnChipController Project */
/* */
-/* EKB Project */
-/* */
-/* COPYRIGHT 2017 */
+/* Contributors Listed Below - COPYRIGHT 2018,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
-/* The source code for this program is not published or otherwise */
-/* divested of its trade secrets, irrespective of what has been */
-/* deposited with the U.S. Copyright Office. */
+/* Licensed under the Apache License, Version 2.0 (the "License"); */
+/* you may not use this file except in compliance with the License. */
+/* You may obtain a copy of the License at */
+/* */
+/* http://www.apache.org/licenses/LICENSE-2.0 */
+/* */
+/* Unless required by applicable law or agreed to in writing, software */
+/* distributed under the License is distributed on an "AS IS" BASIS, */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or */
+/* implied. See the License for the specific language governing */
+/* permissions and limitations under the License. */
/* */
/* IBM_PROLOG_END_TAG */
#include <stdint.h>
@@ -57,7 +63,7 @@ int inband_access(MemBufConfiguration_t* i_config,
sync();
PPE_LVD(i_oci_addr, *io_data);
- PK_TRACE("inband read %08x%08x from %08x",
+ PK_TRACE_DBG("inband read %08x%08x from %08x",
(uint32_t)((*io_data)>>32),
(uint32_t)((*io_data)),
i_oci_addr);
@@ -82,7 +88,7 @@ int inband_access(MemBufConfiguration_t* i_config,
uint64_t data64 = *io_data; //This makes PPE_STVD generate better code
PPE_STVD(i_oci_addr, data64);
- PK_TRACE("inband write %08x%08x to %08x",
+ PK_TRACE_DBG("inband write %08x%08x to %08x",
(uint32_t)((*io_data)>>32),
(uint32_t)((*io_data)),
i_oci_addr);
OpenPOWER on IntegriCloud