diff options
| author | Andre Marin <aamarin@us.ibm.com> | 2017-03-13 23:20:17 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-03-18 10:31:54 -0400 |
| commit | db18489a8cf55c2b3f01e98577ec2be5c3045aa6 (patch) | |
| tree | 9327208cbe1f01612d8a7ad4f842ebc754b268c6 /src/import/chips | |
| parent | 5475af82e4c545f9a262b5bbe544504ba41d5e75 (diff) | |
| download | talos-hostboot-db18489a8cf55c2b3f01e98577ec2be5c3045aa6.tar.gz talos-hostboot-db18489a8cf55c2b3f01e98577ec2be5c3045aa6.zip | |
Move scom API to share among controllers
Change-Id: I3b3d0bf72f5b52a49c6ea9d09ed91dfbf9613b1b
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/37882
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Brian R. Silver <bsilver@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38017
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+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>
Diffstat (limited to 'src/import/chips')
42 files changed, 52 insertions, 439 deletions
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rank.H b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rank.H index 9442c6639..4259adfa6 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rank.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rank.H @@ -40,7 +40,7 @@ #include <lib/mss_attribute_accessors.H> #include <p9_mc_scom_addresses.H> #include <p9_mc_scom_addresses_fld.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/num.H> #include <lib/utils/count_dimm.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/fw_mark_store.H b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/fw_mark_store.H index f44bbcf3d..c81c6827c 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/fw_mark_store.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/fw_mark_store.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -38,7 +38,7 @@ #include <fapi2.H> #include <lib/mcbist/address.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/ecc/ecc_traits.H> #include <lib/shared/mss_const.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/hw_mark_store.H b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/hw_mark_store.H index a83ac6f65..d94b39655 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/hw_mark_store.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/hw_mark_store.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -38,7 +38,7 @@ #include <fapi2.H> #include <lib/ecc/ecc_traits.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> namespace mss { diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_aue_trap.H b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_aue_trap.H index 2fff32c56..0a5c52d15 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_aue_trap.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_aue_trap.H @@ -38,7 +38,7 @@ #include <fapi2.H> #include <lib/mcbist/address.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/find.H> #include <lib/ecc/ecc_traits.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_mpe_trap.H b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_mpe_trap.H index ede8e6c61..efd24270a 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_mpe_trap.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_mpe_trap.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -38,7 +38,7 @@ #include <fapi2.H> #include <lib/mcbist/address.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/find.H> #include <lib/ecc/ecc_traits.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_nce_trap.H b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_nce_trap.H index 5fa672a2c..a3964bb81 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_nce_trap.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_nce_trap.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -38,7 +38,7 @@ #include <fapi2.H> #include <lib/mcbist/address.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/find.H> #include <lib/ecc/ecc_traits.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_rce_trap.H b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_rce_trap.H index 7122dfe28..baa19c11e 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_rce_trap.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_rce_trap.H @@ -38,7 +38,7 @@ #include <fapi2.H> #include <lib/mcbist/address.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/find.H> #include <lib/ecc/ecc_traits.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_ue_trap.H b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_ue_trap.H index 21833b63f..0f69460ad 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_ue_trap.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mainline_ue_trap.H @@ -38,7 +38,7 @@ #include <fapi2.H> #include <lib/mcbist/address.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/find.H> #include <lib/ecc/ecc_traits.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/maint_current_trap.H b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/maint_current_trap.H index 67d692921..3639454ae 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/maint_current_trap.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/maint_current_trap.H @@ -38,7 +38,7 @@ #include <fapi2.H> #include <lib/mcbist/address.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/find.H> #include <lib/ecc/ecc_traits.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mark_shadow_reg.H b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mark_shadow_reg.H index 02668d3c3..229df0098 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mark_shadow_reg.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mark_shadow_reg.H @@ -38,7 +38,7 @@ #include <fapi2.H> #include <lib/mcbist/address.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/ecc/ecc_traits.H> namespace mss diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mbs_error_vector_trap.H b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mbs_error_vector_trap.H index 732f334ad..7f9bc11ec 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mbs_error_vector_trap.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/mbs_error_vector_trap.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -37,7 +37,7 @@ #define _MSS_MBS_ERROR_VECTOR_TRAP_H_ #include <fapi2.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/find.H> #include <lib/ecc/ecc_traits.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/modal_symbol_count.H b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/modal_symbol_count.H index a91627a2b..ead000d53 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/modal_symbol_count.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/modal_symbol_count.H @@ -38,7 +38,7 @@ #include <fapi2.H> #include <lib/ecc/ecc_traits.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> namespace mss { diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/read_error_count_regs.H b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/read_error_count_regs.H index d36d09e57..049f27fb6 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/ecc/read_error_count_regs.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/ecc/read_error_count_regs.H @@ -38,7 +38,7 @@ #include <fapi2.H> #include <lib/mcbist/address.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/find.H> #include <lib/ecc/ecc_traits.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/fir/check.C b/src/import/chips/p9/procedures/hwp/memory/lib/fir/check.C index 91416c5ea..91b86b350 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/fir/check.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/fir/check.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -37,7 +37,7 @@ #include <p9_mc_scom_addresses.H> #include <p9_mc_scom_addresses_fld.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/fir/fir.H> #include <lib/fir/check.H> #include <lib/utils/assert_noexit.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/fir/fir.H b/src/import/chips/p9/procedures/hwp/memory/lib/fir/fir.H index b25ab105f..aece31060 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/fir/fir.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/fir/fir.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -39,7 +39,7 @@ #include <fapi2.H> #include <p9_mc_scom_addresses.H> #include <p9_mc_scom_addresses_fld.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> namespace mss { diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/fir/memdiags_fir.C b/src/import/chips/p9/procedures/hwp/memory/lib/fir/memdiags_fir.C index 1c970538e..c7d2fe3f3 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/fir/memdiags_fir.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/fir/memdiags_fir.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -37,7 +37,7 @@ #include <p9_mc_scom_addresses.H> #include <p9_mc_scom_addresses_fld.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/find.H> #include <lib/fir/fir.H> #include <lib/fir/memdiags_fir.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/fir/unmask.C b/src/import/chips/p9/procedures/hwp/memory/lib/fir/unmask.C index 7ba8663c1..2f5ee7188 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/fir/unmask.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/fir/unmask.C @@ -37,7 +37,7 @@ #include <p9_mc_scom_addresses.H> #include <p9_mc_scom_addresses_fld.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/fir/fir.H> #include <lib/fir/unmask.H> #include <lib/workarounds/mcbist_workarounds.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mc/mc.H b/src/import/chips/p9/procedures/hwp/memory/lib/mc/mc.H index 5ec586f8c..dde8e88c7 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/mc/mc.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/mc/mc.H @@ -42,7 +42,7 @@ #include <p9_mc_scom_addresses_fld.H> #include <lib/mss_attribute_accessors.H> #include <lib/dimm/kind.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> namespace mss { diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mc/perf_reg.C b/src/import/chips/p9/procedures/hwp/memory/lib/mc/perf_reg.C index 26bc13526..64d84462b 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/mc/perf_reg.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/mc/perf_reg.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -41,7 +41,7 @@ #include <lib/mss_attribute_accessors.H> #include <lib/mc/mc.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/dimm/kind.H> #include <lib/utils/find.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mc/port.C b/src/import/chips/p9/procedures/hwp/memory/lib/mc/port.C index 4f5b2ad6b..a38857963 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/mc/port.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/mc/port.C @@ -36,7 +36,7 @@ #include <fapi2.H> #include <lib/mc/port.H> #include <lib/shared/mss_const.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/ecc/ecc.H> namespace mss diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mc/port.H b/src/import/chips/p9/procedures/hwp/memory/lib/mc/port.H index f1a552b98..2b15f8e81 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/mc/port.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/mc/port.H @@ -43,7 +43,7 @@ #include <lib/mss_attribute_accessors.H> #include <lib/utils/conversions.H> #include <lib/shared/mss_const.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/dimm/rank.H> #include <generic/memory/lib/utils/c_str.H> #include <lib/mcbist/address.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.C b/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.C index db7da4d23..c27ac8cfb 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.C @@ -42,7 +42,7 @@ #include <lib/mc/mc.H> #include <lib/mc/xlate.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/find.H> #include <lib/dimm/kind.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.H b/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.H index eee9f974e..88019d483 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.H @@ -42,7 +42,7 @@ #include <p9_mc_scom_addresses_fld.H> #include <lib/shared/mss_const.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <generic/memory/lib/utils/c_str.H> #include <lib/dimm/kind.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/adr.H b/src/import/chips/p9/procedures/hwp/memory/lib/phy/adr.H index 843eacdf6..199b3f9de 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/adr.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/adr.H @@ -41,7 +41,7 @@ #include <p9_mc_scom_addresses_fld.H> #include <lib/shared/mss_const.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/mss_pair.H> namespace mss diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/adr32s.H b/src/import/chips/p9/procedures/hwp/memory/lib/phy/adr32s.H index d7b7d2c42..121ae0b38 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/adr32s.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/adr32s.H @@ -41,7 +41,7 @@ #include <p9_mc_scom_addresses_fld.H> #include <lib/mss_attribute_accessors.H> #include <lib/shared/mss_const.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/find.H> namespace mss diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.C b/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.C index a7bfb7ba0..b8c44c472 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.C @@ -35,7 +35,7 @@ #include <fapi2.H> #include <lib/phy/apb.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <generic/memory/lib/utils/c_str.H> #include <lib/utils/index.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.H b/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.H index 4252c09eb..a6b5a1e25 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -39,7 +39,7 @@ #include <fapi2.H> #include <p9_mc_scom_addresses.H> #include <p9_mc_scom_addresses_fld.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> namespace mss { diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C b/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C index 69ceaf8ed..6a9dbdee2 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C @@ -54,7 +54,7 @@ #include <lib/utils/bit_count.H> #include <lib/utils/find.H> #include <lib/utils/dump_regs.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/count_dimm.H> using fapi2::TARGET_TYPE_MCBIST; diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.C b/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.C index 9bebfa31e..6897a478e 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.C @@ -47,7 +47,7 @@ #include <lib/utils/bit_count.H> #include <lib/dimm/rank.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <generic/memory/lib/utils/pos.H> #include <generic/memory/lib/utils/c_str.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.H b/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.H index 6da7cfd9b..cf5f833f8 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.H @@ -41,7 +41,7 @@ #include <p9_mc_scom_addresses.H> #include <p9_mc_scom_addresses_fld.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/find.H> #include <lib/mss_attribute_accessors.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.C b/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.C index fa1803076..a6cd1600c 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.C @@ -35,7 +35,7 @@ #include <fapi2.H> #include <lib/phy/phy_cntrl.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <generic/memory/lib/utils/c_str.H> #include <lib/utils/index.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.H b/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.H index 9473020fa..cdf0acf01 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -41,7 +41,7 @@ #include <p9_mc_scom_addresses_fld.H> #include <lib/shared/mss_const.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> namespace mss { diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/seq.C b/src/import/chips/p9/procedures/hwp/memory/lib/phy/seq.C index d73a0e5e3..53702bb9a 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/seq.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/seq.C @@ -35,7 +35,7 @@ #include <fapi2.H> #include <lib/phy/seq.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <generic/memory/lib/utils/c_str.H> #include <lib/utils/bit_count.H> #include <lib/eff_config/timing.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/seq.H b/src/import/chips/p9/procedures/hwp/memory/lib/phy/seq.H index 989e672d9..ff813fc7f 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/seq.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/seq.H @@ -40,7 +40,7 @@ #include <p9_mc_scom_addresses.H> #include <p9_mc_scom_addresses_fld.H> #include <mss_attribute_accessors_manual.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> namespace mss { diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/write_cntrl.H b/src/import/chips/p9/procedures/hwp/memory/lib/phy/write_cntrl.H index e2566c111..09348a7ff 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/write_cntrl.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/write_cntrl.H @@ -38,7 +38,7 @@ #include <fapi2.H> #include <p9_mc_scom_addresses.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/utils/conversions.H> #include <lib/eff_config/timing.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/utils/poll.H b/src/import/chips/p9/procedures/hwp/memory/lib/utils/poll.H index b57a03fa9..ebcffa032 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/utils/poll.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/utils/poll.H @@ -38,7 +38,7 @@ #include <fapi2.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/shared/mss_const.H> #include <lib/utils/conversions.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/utils/scom.H b/src/import/chips/p9/procedures/hwp/memory/lib/utils/scom.H deleted file mode 100644 index 40ab76dc8..000000000 --- a/src/import/chips/p9/procedures/hwp/memory/lib/utils/scom.H +++ /dev/null @@ -1,387 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/import/chips/p9/procedures/hwp/memory/lib/utils/scom.H $ */ -/* */ -/* OpenPOWER HostBoot Project */ -/* */ -/* Contributors Listed Below - COPYRIGHT 2015,2017 */ -/* [+] 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. */ -/* 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 */ - -/// -/// @file scom.H -/// @brief Tools related to scom operations -/// -// *HWP HWP Owner: Brian Silver <bsilver@us.ibm.com> -// *HWP HWP Backup: Andre Marin <aamarin@us.ibm.com> -// *HWP Team: Memory -// *HWP Level: 2 -// *HWP Consumed by: HB:FSP - -#ifndef _MSS_SCOM_H_ -#define _MSS_SCOM_H_ - -#include <fapi2.H> -#include <generic/memory/lib/utils/c_str.H> - -// -// Wrapping scom operations: We wrap fapi2::get/putScom for two reasons. The -// first is so that we can hook in to the base scom operations in the lab. This -// is expected to be used for test tracking and data gathering. The other -// reason is to facilitate sharing code with Z in the event they don't leverage -// fapi2. This gives us a place to define a common "hw access" API allowing -// P and Z to implement the underlying firmware API using different mechanisms. -// - -namespace mss -{ - -/// @brief Reads a SCOM register from a chip. -/// @tparam K template parameter, passed in target. -/// @param[in] i_target HW target to operate on. -/// @param[in] i_address SCOM register address to read from. -/// @param[out] o_data Buffer that holds data read from HW target. -/// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code. -/// @note We wrap scom operations in the mss library so that we can hook -/// into them in the lab. For IPL firmware, this should compile out. -template< fapi2::TargetType K > -inline fapi2::ReturnCode getScom(const fapi2::Target<K>& i_target, - const uint64_t i_address, - fapi2::buffer<uint64_t>& o_data) -{ -#ifdef PSYSTEMS_MSS_LAB_ONLY - // Place holder for lab-hooks - return fapi2::getScom(i_target, i_address, o_data); -#else - return fapi2::getScom(i_target, i_address, o_data); -#endif -} - -/// @brief Writes a SCOM register on a chip. -/// @tparam K template parameter, passed in target. -/// @param[in] i_target HW target to operate on. -/// @param[in] i_address SCOM register address to write to. -/// @param[in] i_data Buffer that holds data to write into address. -/// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code. -/// @note We wrap scom operations in the mss library so that we can hook -/// into them in the lab. For IPL firmware, this should compile out. -template< fapi2::TargetType K > -inline fapi2::ReturnCode putScom(const fapi2::Target<K>& i_target, - const uint64_t i_address, - const fapi2::buffer<uint64_t> i_data) -{ -#ifdef PSYSTEMS_MSS_LAB_ONLY - // Place holder for lab-hooks - return fapi2::putScom(i_target, i_address, i_data); -#else - return fapi2::putScom(i_target, i_address, i_data); -#endif -} - -/// @brief Writes a SCOM register under mask on a chip -/// @tparam K template parameter, passed in target. -/// @param[in] i_target HW target to operate on. -/// @param[in] i_address SCOM register address to write to. -/// @param[in] i_data Buffer that holds data to write into address. -/// @param[in] i_mask Buffer that holds the mask value. -/// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code. -/// @note We wrap scom operations in the mss library so that we can hook -/// into them in the lab. For IPL firmware, this should compile out. -template< fapi2::TargetType K > -inline fapi2::ReturnCode putScomUnderMask(const fapi2::Target<K>& i_target, - const uint64_t i_address, - const fapi2::buffer<uint64_t> i_data, - const fapi2::buffer<uint64_t> i_mask) -{ -#ifdef PSYSTEMS_MSS_LAB_ONLY - // Place holder for lab-hooks - return fapi2::putScomUnderMask(i_target, i_address, i_data, i_mask); -#else - return fapi2::putScomUnderMask(i_target, i_address, i_data, i_mask); -#endif -} - -/// -/// @brief Blast one peice of data across a vector of addresses -/// @param[in] i_target the target for the scom -/// @param[in] i_addrs const std::vector<uint64_t>& addresses -/// @param[in] i_data const fapi2::buffer<uint64_t>& the data to blast -/// @return FAPI2_RC_SUCCESS iff ok -/// @note Author is originally from Boston (Pahk mah cah in Havahd Yahd) - -/// @note std::transform might have been tidier, but because of the ReturnCode -/// and the FAPI_TRY mechanism, this is the simplest. -/// -template< fapi2::TargetType T > -fapi2::ReturnCode scom_blastah( const fapi2::Target<T>& i_target, - const std::vector<uint64_t>& i_addrs, - const fapi2::buffer<uint64_t>& i_data ) -{ - size_t count(0); - - for (const auto& a : i_addrs) - { - FAPI_TRY( mss::putScom(i_target, a, i_data) ); - ++count; - } - - // Don't return current_err, if there are no registers in the vector we don't set it. - return fapi2::FAPI2_RC_SUCCESS; - -fapi_try_exit: - FAPI_ERR( "scom_blastah failed: %d of %d executed against %s", count, i_addrs.size(), mss::c_str(i_target)); - return fapi2::current_err; -} - -/// -/// @brief Blast one peice of data across a vector of targets -/// @param[in] i_targets the vector of targets for the scom -/// @param[in] i_addr the address -/// @param[in] i_data const fapi2::buffer<uint64_t>& the data to blast -/// @return FAPI2_RC_SUCCESS iff ok -/// -template< fapi2::TargetType T > -fapi2::ReturnCode scom_blastah( const std::vector<fapi2::Target<T> >& i_targets, - const uint64_t i_addr, - const fapi2::buffer<uint64_t>& i_data ) -{ - size_t count(0); - - for (const auto& t : i_targets) - { - FAPI_TRY( mss::putScom(t, i_addr, i_data) ); - ++count; - } - - // Don't return current_err, if there are no targets in the vector we don't set it. - return fapi2::FAPI2_RC_SUCCESS; - -fapi_try_exit: - FAPI_ERR( "scom_blastah failed: %d of %d written to 0x%llx", count, i_targets.size(), i_addr); - return fapi2::current_err; -} - -/// -/// @brief Blast one peice of data across a vector of targets -/// @param[in] i_targets the vector of targets for the scom -/// @param[in] i_addrs the vector of addresses -/// @param[in] i_data const fapi2::buffer<uint64_t>& the data to blast -/// @return FAPI2_RC_SUCCESS iff ok -/// -template< fapi2::TargetType T > -fapi2::ReturnCode scom_blastah( const std::vector<fapi2::Target<T> >& i_targets, - const std::vector<uint64_t>& i_addrs, - const fapi2::buffer<uint64_t>& i_data ) -{ - size_t count(0); - - for (const auto& t : i_targets) - { - FAPI_TRY( mss::scom_blastah(t, i_addrs, i_data) ); - ++count; - } - - // Don't return current_err, if there are no targets in the vector we don't set it. - return fapi2::FAPI2_RC_SUCCESS; - -fapi_try_exit: - FAPI_ERR( "scom_blastah failed: %d of %dx%d", count, i_targets.size(), i_addrs.size() ); - return fapi2::current_err; -} - -/// -/// @brief Blast parallel vectors of data and addresses to a single target -/// @param[in] i_target the target for the scom -/// @param[in] i_addrs const std::vector<uint64_t>& addresses -/// @param[in] i_data std:vector<fapi2::buffer<uint64_t>>& the data to blast -/// @return FAPI2_RC_SUCCESS iff ok -/// -template< fapi2::TargetType T > -fapi2::ReturnCode scom_blastah( const fapi2::Target<T>& i_targets, - const std::vector<uint64_t>& i_addrs, - const std::vector<fapi2::buffer<uint64_t>>& i_data ) -{ - size_t count(0); - - // Little sanity check - if (i_data.size() != i_addrs.size()) - { - FAPI_ERR("Passed bad vectors in to scom_blastah: %d and %d in size", i_data.size(), i_addrs.size() ); - return fapi2::FAPI2_RC_INVALID_PARAMETER; - } - - auto l_address = i_addrs.begin(); - auto l_data = i_data.begin(); - - for ( ; l_address != i_addrs.end(); ++l_address, ++l_data ) - { - FAPI_TRY( mss::putScom(i_targets, *l_address, *l_data) ); - ++count; - } - - // Don't return current_err, if there are no registers in the vector we don't set it. - return fapi2::FAPI2_RC_SUCCESS; - -fapi_try_exit: - FAPI_ERR( "parallel scom_blastah failed: %d of %d", count, i_addrs.size() ); - return fapi2::current_err; -} - -/// -/// @brief Blast parallel vectors of data and address pairs to a single target -/// @param[in] i_target the target for the scom -/// @param[in] i_addrs const std::vector<uint64_t>& of address pairs -/// @param[in] i_data std::vector< std::pair<uint64_t, uint64_t>> the data to blast -/// @return FAPI2_RC_SUCCESS iff ok -/// -template< fapi2::TargetType T > -fapi2::ReturnCode scom_blastah( const fapi2::Target<T>& i_targets, - const std::vector< std::pair< uint64_t, uint64_t> >& i_addrs, - const std::vector< std::pair<fapi2::buffer<uint64_t>, fapi2::buffer<uint64_t> > >& i_data ) -{ - size_t count(0); - - // Little sanity check - if (i_data.size() != i_addrs.size()) - { - FAPI_ERR("Passed bad vectors of pairs in to scom_blastah: %d and %d in size", i_data.size(), i_addrs.size() ); - return fapi2::FAPI2_RC_INVALID_PARAMETER; - } - - auto l_address = i_addrs.begin(); - auto l_data = i_data.begin(); - - for ( ; l_address != i_addrs.end(); ++l_address, ++l_data ) - { - FAPI_TRY( mss::putScom(i_targets, l_address->first, l_data->first) ); - FAPI_TRY( mss::putScom(i_targets, l_address->second, l_data->second) ); - ++count; - } - - // Don't return current_err, if there are no registers in the vector we don't set it. - return fapi2::FAPI2_RC_SUCCESS; - -fapi_try_exit: - FAPI_ERR( "parallel pairs scom_blastah failed: %d of %d", count, i_addrs.size() ); - return fapi2::current_err; -} - -/// -/// @brief Blast single data data to a vector of address pairs to a single target -/// @param[in] i_target the target for the scom -/// @param[in] i_addrs const std::vector< std::pair<uint64_t, uint64_t> >& of address pairs -/// @param[in] i_data uint64_t the data to blast -/// @return FAPI2_RC_SUCCESS iff ok -/// -template< fapi2::TargetType T > -fapi2::ReturnCode scom_blastah( const fapi2::Target<T>& i_targets, - const std::vector< std::pair< uint64_t, uint64_t> >& i_addr, - const fapi2::buffer<uint64_t>& i_data ) -{ - size_t count(0); - - for (auto a = i_addr.begin(); a != i_addr.end(); ++a) - { - FAPI_TRY( mss::putScom(i_targets, a->first, i_data) ); - FAPI_TRY( mss::putScom(i_targets, a->second, i_data) ); - ++count; - } - - // Don't return current_err, if there are no registers in the vector we don't set it. - return fapi2::FAPI2_RC_SUCCESS; - -fapi_try_exit: - FAPI_ERR( "pairs scom_blastah failed: %d of %d", count, i_addr.size() ); - return fapi2::current_err; -} - -/// -/// @brief Suck one peice of data from a vector of addresses -/// @tparam T the fapi2::TargetType of the target -/// @param[in] i_target the target for the scom -/// @param[in] i_addr the vector of addresses -/// @param[in] o_data std::vector<uint64_t> the resulting data -/// @return FAPI2_RC_SUCCESS iff ok -/// @note Author is originally from Boston (Pahk mah cah in Havahd Yahd) -/// -template< fapi2::TargetType T > -fapi2::ReturnCode scom_suckah( const fapi2::Target<T>& i_target, - const std::vector<uint64_t>& i_addr, - std::vector< fapi2::buffer<uint64_t> >& o_data ) -{ - size_t count(0); - fapi2::buffer<uint64_t> l_read; - - o_data.clear(); - - for (const auto& a : i_addr) - { - FAPI_TRY( mss::getScom(i_target, a, l_read) ); - o_data.push_back(l_read); - ++count; - } - - // Don't return current_err, if there are no registers in the vector we don't set it. - return fapi2::FAPI2_RC_SUCCESS; - -fapi_try_exit: - FAPI_ERR( "scom_suckah failed: %d of %d executed against %s", count, i_addr.size(), mss::c_str(i_target)); - return fapi2::current_err; -} - - -/// -/// @brief Suck one peice of data from a vector of address pairs -/// @tparam T the fapi2::TargetType of the target -/// @tparam B a begin iterator -/// @tparam E an end iterator -/// @param[in] i_target the target for the scom -/// @param[in] i_addr a vector of address pairs -/// @param[in] o_data std::vector< std::pair<uint64_t, uint64_t>> the resulting data -/// @return FAPI2_RC_SUCCESS iff ok -/// @note Author is originally from Boston (Pahk mah cah in Havahd Yahd) -/// -template< fapi2::TargetType T > -fapi2::ReturnCode scom_suckah( const fapi2::Target<T>& i_target, - const std::vector< std::pair< uint64_t, uint64_t> >& i_addr, - std::vector< std::pair<fapi2::buffer<uint64_t>, fapi2::buffer<uint64_t> > >& o_data ) -{ - size_t count(0); - std::pair< fapi2::buffer<uint64_t>, fapi2::buffer<uint64_t> > l_read; - - o_data.clear(); - - for (const auto& a : i_addr) - { - FAPI_TRY( mss::getScom(i_target, a.first, l_read.first) ); - FAPI_TRY( mss::getScom(i_target, a.second, l_read.second) ); - o_data.push_back( l_read ); - ++count; - } - - // Don't return current_err, if there are no registers in the vector we don't set it. - return fapi2::FAPI2_RC_SUCCESS; - -fapi_try_exit: - FAPI_ERR( "scom_suckah failed: %d of %d executed against %s", count, i_addr.size(), mss::c_str(i_target)); - return fapi2::current_err; -} - - -} -#endif diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/adr32s_workarounds.C b/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/adr32s_workarounds.C index 41f9ee04c..40aed1d1c 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/adr32s_workarounds.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/adr32s_workarounds.C @@ -40,7 +40,7 @@ #include <p9_mc_scom_addresses_fld.H> #include <lib/mss_attribute_accessors.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <generic/memory/lib/utils/pos.H> #include <lib/utils/conversions.H> #include <lib/fir/fir.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/dp16_workarounds.C b/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/dp16_workarounds.C index 94cf845b8..53d19a2ba 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/dp16_workarounds.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/dp16_workarounds.C @@ -39,7 +39,7 @@ #include <p9_mc_scom_addresses.H> #include <p9_mc_scom_addresses_fld.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <generic/memory/lib/utils/pos.H> #include <lib/workarounds/dp16_workarounds.H> #include <lib/phy/dp16.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/mcbist_workarounds.C b/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/mcbist_workarounds.C index f0433065d..02e6ee099 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/mcbist_workarounds.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/mcbist_workarounds.C @@ -40,7 +40,7 @@ #include <p9_mc_scom_addresses_fld.H> #include <lib/mss_attribute_accessors.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <generic/memory/lib/utils/pos.H> #include <lib/dimm/kind.H> #include <lib/workarounds/mcbist_workarounds.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/seq_workarounds.C b/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/seq_workarounds.C index 53c212f91..6c015198d 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/seq_workarounds.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/seq_workarounds.C @@ -38,7 +38,7 @@ #include <fapi2.H> #include <p9_mc_scom_addresses.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <lib/workarounds/seq_workarounds.H> namespace mss diff --git a/src/import/chips/p9/procedures/hwp/memory/mss.H b/src/import/chips/p9/procedures/hwp/memory/mss.H index 8c0c564d2..a163b61e8 100644 --- a/src/import/chips/p9/procedures/hwp/memory/mss.H +++ b/src/import/chips/p9/procedures/hwp/memory/mss.H @@ -37,7 +37,7 @@ #define _MSS_H_ #include <fapi2.H> -#include <lib/utils/scom.H> +#include <generic/memory/lib/utils/scom.H> #include <p9_mc_scom_addresses.H> #include <p9_mc_scom_addresses_fld.H> |
