Skip to content

Commit

Permalink
P9 Cumulus InitCompiler supports - Part 2
Browse files Browse the repository at this point in the history 
  Rename Nimbus only initfiles to p9n.xxx.initfile
  Update scan_procedures.mk, generate_wrapper.pl to support new names.
  Update initfiles.mk to take in p9c chip type

Change-Id: I6aeb04999c6c140f6347ce24f1ce47bffb8990f4
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40782
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40783
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
@ibmthi @dcrowell77
ibmthi authored and dcrowell77 committed May 25, 2017
1 parent c5c7957 commit 53ec245
Show file tree
Hide file tree
Showing 23 changed files with 91 additions and 91 deletions.
0 ...rt/chips/p9/initfiles/p9.mc.scan.initfile → ...t/chips/p9/initfiles/p9n.mc.scan.initfile
View file
File renamed without changes.
0 ...t/chips/p9/initfiles/p9.mca.scom.initfile → .../chips/p9/initfiles/p9n.mca.scom.initfile
View file
File renamed without changes.
0 ...hips/p9/initfiles/p9.mcbist.scom.initfile → ...ips/p9/initfiles/p9n.mcbist.scom.initfile
View file
File renamed without changes.
0 ...t/chips/p9/initfiles/p9.mcs.scom.initfile → .../chips/p9/initfiles/p9n.mcs.scom.initfile
View file
File renamed without changes.
10 changes: 5 additions & 5 deletions ...procedures/hwp/initfiles/p9_ddrphy_scom.C → ...rocedures/hwp/initfiles/p9n_ddrphy_scom.C
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9_ddrphy_scom.C $ */
/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9n_ddrphy_scom.C $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016,2017 */
/* Contributors Listed Below - COPYRIGHT 2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand All @@ -22,7 +22,7 @@
/* permissions and limitations under the License. */
/* */
/* IBM_PROLOG_END_TAG */
#include "p9_ddrphy_scom.H"
#include "p9n_ddrphy_scom.H"
#include <stdint.h>
#include <stddef.h>
#include <fapi2.H>
Expand All @@ -46,8 +46,8 @@ constexpr uint64_t literal_0x4040 = 0x4040;
constexpr uint64_t literal_0xE058 = 0xE058;
constexpr uint64_t literal_0x0202 = 0x0202;

fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0,
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT1)
fapi2::ReturnCode p9n_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0,
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT1)
{
{
fapi2::ATTR_EC_Type l_chip_ec;
Expand Down
14 changes: 7 additions & 7 deletions ...procedures/hwp/initfiles/p9_ddrphy_scom.H → ...rocedures/hwp/initfiles/p9n_ddrphy_scom.H
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9_ddrphy_scom.H $ */
/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9n_ddrphy_scom.H $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016,2017 */
/* Contributors Listed Below - COPYRIGHT 2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand All @@ -22,23 +22,23 @@
/* permissions and limitations under the License. */
/* */
/* IBM_PROLOG_END_TAG */
#ifndef _INIT_P9_DDRPHY_SCOM_PROCEDURE_H_
#define _INIT_P9_DDRPHY_SCOM_PROCEDURE_H_
#ifndef _INIT_P9N_DDRPHY_SCOM_PROCEDURE_H_
#define _INIT_P9N_DDRPHY_SCOM_PROCEDURE_H_


#include <stddef.h>
#include <stdint.h>
#include <fapi2.H>


typedef fapi2::ReturnCode (*p9_ddrphy_scom_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_MCA>&,
typedef fapi2::ReturnCode (*p9n_ddrphy_scom_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_MCA>&,
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&);

extern "C"
{

fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0,
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT1);
fapi2::ReturnCode p9n_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0,
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT1);

}

Expand Down
6 changes: 3 additions & 3 deletions ...rocedures/hwp/initfiles/p9_ddrphy_scom.mk → ...ocedures/hwp/initfiles/p9n_ddrphy_scom.mk
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# IBM_PROLOG_BEGIN_TAG
# This is an automatically generated prolog.
#
# $Source: src/import/chips/p9/procedures/hwp/initfiles/p9_ddrphy_scom.mk $
# $Source: src/import/chips/p9/procedures/hwp/initfiles/p9n_ddrphy_scom.mk $
#
# OpenPOWER HostBoot Project
#
# Contributors Listed Below - COPYRIGHT 2016
# Contributors Listed Below - COPYRIGHT 2017
# [+] International Business Machines Corp.
#
#
Expand All @@ -22,6 +22,6 @@
# permissions and limitations under the License.
#
# IBM_PROLOG_END_TAG
PROCEDURE=p9_ddrphy_scom
PROCEDURE=p9n_ddrphy_scom
lib$(PROCEDURE)_COMMONFLAGS+=-fno-var-tracking-assignments
$(call BUILD_PROCEDURE)
8 changes: 4 additions & 4 deletions .../p9/procedures/hwp/initfiles/p9_mc_scan.C → ...p9/procedures/hwp/initfiles/p9n_mc_scan.C
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9_mc_scan.C $ */
/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9n_mc_scan.C $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016,2017 */
/* Contributors Listed Below - COPYRIGHT 2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand All @@ -22,7 +22,7 @@
/* permissions and limitations under the License. */
/* */
/* IBM_PROLOG_END_TAG */
#include "p9_mc_scan.H"
#include "p9n_mc_scan.H"
#include <stdint.h>
#include <stddef.h>
#include <fapi2.H>
Expand All @@ -34,7 +34,7 @@ constexpr uint64_t literal_8 = 8;
constexpr uint64_t literal_0b1 = 0b1;
constexpr uint64_t literal_1 = 1;

fapi2::ReturnCode p9_mc_scan(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT0)
fapi2::ReturnCode p9n_mc_scan(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT0)
{
{
fapi2::ATTR_EC_Type l_chip_ec;
Expand Down
14 changes: 7 additions & 7 deletions .../p9/procedures/hwp/initfiles/p9_mc_scan.H → ...p9/procedures/hwp/initfiles/p9n_mc_scan.H
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9_mc_scan.H $ */
/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9n_mc_scan.H $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016 */
/* Contributors Listed Below - COPYRIGHT 2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand All @@ -22,8 +22,8 @@
/* permissions and limitations under the License. */
/* */
/* IBM_PROLOG_END_TAG */
#ifndef _INIT_P9_MC_SCAN_PROCEDURE_H_
#define _INIT_P9_MC_SCAN_PROCEDURE_H_
#ifndef _INIT_P9N_MC_SCAN_PROCEDURE_H_
#define _INIT_P9N_MC_SCAN_PROCEDURE_H_


#include <stddef.h>
Expand All @@ -32,15 +32,15 @@

#ifdef IFCOMPILER_PLAT
#define INITFILE_PROCEDURE \
p9_mc_scan(TGT0);
p9n_mc_scan(TGT0);
#endif

typedef fapi2::ReturnCode (*p9_mc_scan_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&);
typedef fapi2::ReturnCode (*p9n_mc_scan_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&);

extern "C"
{

fapi2::ReturnCode p9_mc_scan(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT0);
fapi2::ReturnCode p9n_mc_scan(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT0);

}

Expand Down
10 changes: 5 additions & 5 deletions ...p9/procedures/hwp/initfiles/p9_mc_scan.mk → ...9/procedures/hwp/initfiles/p9n_mc_scan.mk
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# IBM_PROLOG_BEGIN_TAG
# This is an automatically generated prolog.
#
# $Source: src/import/chips/p9/procedures/hwp/initfiles/p9_mc_scan.mk $
# $Source: src/import/chips/p9/procedures/hwp/initfiles/p9n_mc_scan.mk $
#
# OpenPOWER HostBoot Project
#
# Contributors Listed Below - COPYRIGHT 2016
# Contributors Listed Below - COPYRIGHT 2017
# [+] International Business Machines Corp.
#
#
Expand All @@ -22,15 +22,15 @@
# permissions and limitations under the License.
#
# IBM_PROLOG_END_TAG
PROCEDURE=p9_mc_scan
PROCEDURE=p9n_mc_scan
lib$(PROCEDURE)_COMMONFLAGS+=-DFAPI_SUPPORT_SPY_AS_STRING=1
$(call BUILD_PROCEDURE)

PROCEDURE=p9_mc_scan_ifCompiler
PROCEDURE=p9n_mc_scan_ifCompiler
lib$(PROCEDURE)_COMMONFLAGS+=-DFAPI_SUPPORT_SPY_AS_STRING=1
lib$(PROCEDURE)_COMMONFLAGS+=-DIFCOMPILER_PLAT=1
FAPI=2_IFCOMPILER
OBJS+=p9_mc_scan.o
OBJS+=p9n_mc_scan.o
lib$(PROCEDURE)_LIBPATH=$(LIBPATH)/ifCompiler
lib$(PROCEDURE)_COMMONFLAGS+=-fno-var-tracking-assignments
$(call BUILD_PROCEDURE)
12 changes: 6 additions & 6 deletions ...p9/procedures/hwp/initfiles/p9_mca_scom.C → ...9/procedures/hwp/initfiles/p9n_mca_scom.C
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9_mca_scom.C $ */
/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9n_mca_scom.C $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016,2017 */
/* Contributors Listed Below - COPYRIGHT 2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand All @@ -22,7 +22,7 @@
/* permissions and limitations under the License. */
/* */
/* IBM_PROLOG_END_TAG */
#include "p9_mca_scom.H"
#include "p9n_mca_scom.H"
#include <stdint.h>
#include <stddef.h>
#include <fapi2.H>
Expand Down Expand Up @@ -91,9 +91,9 @@ constexpr uint64_t literal_1084 = 1084;
constexpr uint64_t literal_1143 = 1143;
constexpr uint64_t literal_1385 = 1385;

fapi2::ReturnCode p9_mca_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0,
const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_MCS>& TGT2,
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT3, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT4)
fapi2::ReturnCode p9n_mca_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0,
const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_MCS>& TGT2,
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT3, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT4)
{
{
fapi2::ATTR_EC_Type l_chip_ec;
Expand Down
16 changes: 8 additions & 8 deletions ...p9/procedures/hwp/initfiles/p9_mca_scom.H → ...9/procedures/hwp/initfiles/p9n_mca_scom.H
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9_mca_scom.H $ */
/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9n_mca_scom.H $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016,2017 */
/* Contributors Listed Below - COPYRIGHT 2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand All @@ -22,25 +22,25 @@
/* permissions and limitations under the License. */
/* */
/* IBM_PROLOG_END_TAG */
#ifndef _INIT_P9_MCA_SCOM_PROCEDURE_H_
#define _INIT_P9_MCA_SCOM_PROCEDURE_H_
#ifndef _INIT_P9N_MCA_SCOM_PROCEDURE_H_
#define _INIT_P9N_MCA_SCOM_PROCEDURE_H_


#include <stddef.h>
#include <stdint.h>
#include <fapi2.H>


typedef fapi2::ReturnCode (*p9_mca_scom_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_MCA>&,
typedef fapi2::ReturnCode (*p9n_mca_scom_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_MCA>&,
const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>&, const fapi2::Target<fapi2::TARGET_TYPE_MCS>&,
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>&, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&);

extern "C"
{

fapi2::ReturnCode p9_mca_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0,
const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_MCS>& TGT2,
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT3, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT4);
fapi2::ReturnCode p9n_mca_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0,
const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_MCS>& TGT2,
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT3, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT4);

}

Expand Down
6 changes: 3 additions & 3 deletions ...9/procedures/hwp/initfiles/p9_mcs_scom.mk → .../procedures/hwp/initfiles/p9n_mca_scom.mk
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# IBM_PROLOG_BEGIN_TAG
# This is an automatically generated prolog.
#
# $Source: src/import/chips/p9/procedures/hwp/initfiles/p9_mcs_scom.mk $
# $Source: src/import/chips/p9/procedures/hwp/initfiles/p9n_mca_scom.mk $
#
# OpenPOWER HostBoot Project
#
# Contributors Listed Below - COPYRIGHT 2016
# Contributors Listed Below - COPYRIGHT 2017
# [+] International Business Machines Corp.
#
#
Expand All @@ -22,6 +22,6 @@
# permissions and limitations under the License.
#
# IBM_PROLOG_END_TAG
PROCEDURE=p9_mcs_scom
PROCEDURE=p9n_mca_scom
lib$(PROCEDURE)_COMMONFLAGS+=-fno-var-tracking-assignments
$(call BUILD_PROCEDURE)
8 changes: 4 additions & 4 deletions ...procedures/hwp/initfiles/p9_mcbist_scom.C → ...rocedures/hwp/initfiles/p9n_mcbist_scom.C
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9_mcbist_scom.C $ */
/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9n_mcbist_scom.C $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016 */
/* Contributors Listed Below - COPYRIGHT 2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand All @@ -22,7 +22,7 @@
/* permissions and limitations under the License. */
/* */
/* IBM_PROLOG_END_TAG */
#include "p9_mcbist_scom.H"
#include "p9n_mcbist_scom.H"
#include <stdint.h>
#include <stddef.h>
#include <fapi2.H>
Expand All @@ -41,7 +41,7 @@ constexpr uint64_t literal_0b00001000000000000000 = 0b00001000000000000000;
constexpr uint64_t literal_0b100 = 0b100;
constexpr uint64_t literal_0b0100 = 0b0100;

fapi2::ReturnCode p9_mcbist_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>& TGT0)
fapi2::ReturnCode p9n_mcbist_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>& TGT0)
{
{
fapi2::buffer<uint64_t> l_scom_buffer;
Expand Down
12 changes: 6 additions & 6 deletions ...procedures/hwp/initfiles/p9_mcbist_scom.H → ...rocedures/hwp/initfiles/p9n_mcbist_scom.H
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9_mcbist_scom.H $ */
/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9n_mcbist_scom.H $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016 */
/* Contributors Listed Below - COPYRIGHT 2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand All @@ -22,21 +22,21 @@
/* permissions and limitations under the License. */
/* */
/* IBM_PROLOG_END_TAG */
#ifndef _INIT_P9_MCBIST_SCOM_PROCEDURE_H_
#define _INIT_P9_MCBIST_SCOM_PROCEDURE_H_
#ifndef _INIT_P9N_MCBIST_SCOM_PROCEDURE_H_
#define _INIT_P9N_MCBIST_SCOM_PROCEDURE_H_


#include <stddef.h>
#include <stdint.h>
#include <fapi2.H>


typedef fapi2::ReturnCode (*p9_mcbist_scom_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>&);
typedef fapi2::ReturnCode (*p9n_mcbist_scom_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>&);

extern "C"
{

fapi2::ReturnCode p9_mcbist_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>& TGT0);
fapi2::ReturnCode p9n_mcbist_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>& TGT0);

}

Expand Down

0 comments on commit 53ec245

Please sign in to comment.