From 6b8b5cd3fd404afa693358125c1659a74f21b7e3 Mon Sep 17 00:00:00 2001 From: Greg Still Date: Tue, 18 Aug 2015 22:55:42 -0500 Subject: Support TARGET_TYPE_SYSTEM PPE attributes - Add support for SYSTEM types - Fix attribute "setting" bug for scalar attributes only; array attributes untested - Add nest_attributes.xml - Reduce extra whitespace per Gerrit comments (more) - Added debug switch to ppeParseAtteibuteInfo.pl - Add system attributes to merged .fixed section (base_ppe_header.S, proc_sbe_fixed.H, topfiles.mk) - Fixed FAPI2 regression setup based on newest SEEPROM and PIBMEM (SBE) linker layout. This implicates the Makefile (eg new "seeprom" rule). - Fix rebase issues with new commits. Added necessary dependent files and missing attribute enablement - Rebased with the merged "Fix compile" commit which moves the definition and setting of the global variables associated with attributes to target.C Change-Id: Iadbe080dec1558079ca6fe9c8fa711b098ba1e0b Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/20078 Tested-by: Jenkins Server Reviewed-by: Gregory S. Still --- hwpf/plat/include/plat_target_parms.H | 21 ++++++++++++--------- hwpf/plat/include/target_types.H | 3 ++- 2 files changed, 14 insertions(+), 10 deletions(-) (limited to 'hwpf') diff --git a/hwpf/plat/include/plat_target_parms.H b/hwpf/plat/include/plat_target_parms.H index d495241a..ab78a3c5 100644 --- a/hwpf/plat/include/plat_target_parms.H +++ b/hwpf/plat/include/plat_target_parms.H @@ -38,34 +38,37 @@ CONST_UINT32_T(CHIP_TARGET_COUNT , 1); // Pervasive Targets (note; these include the MCS targets as well) CONST_UINT32_T(PERV_TARGET_OFFSET, CHIP_TARGET_OFFSET + CHIP_TARGET_COUNT); -CONST_UINT32_T(PERV_CHIPLET_OFFSET, 0x1); +CONST_UINT32_T(PERV_CHIPLET_OFFSET, 0x1); CONST_UINT32_T(PERV_TARGET_COUNT, 15); // Cache Targets CONST_UINT32_T(EQ_TARGET_OFFSET, PERV_TARGET_OFFSET + PERV_TARGET_COUNT); -CONST_UINT32_T(EQ_CHIPLET_OFFSET, 0x10); -CONST_UINT32_T(EQ_TARGET_COUNT, 6); +CONST_UINT32_T(EQ_CHIPLET_OFFSET, 0x10); +CONST_UINT32_T(EQ_TARGET_COUNT, 6); // Core Targets -CONST_UINT32_T(CORE_TARGET_OFFSET, EQ_TARGET_OFFSET + EQ_TARGET_COUNT); +CONST_UINT32_T(CORE_TARGET_OFFSET, EQ_TARGET_OFFSET + EQ_TARGET_COUNT); CONST_UINT32_T(CORE_CHIPLET_OFFSET, 0x20); CONST_UINT32_T(CORE_TARGET_COUNT, 24); // MCS Targets (note: these are phyically Pervastive targets) CONST_UINT32_T(MCS_TARGET_OFFSET, CORE_TARGET_OFFSET + CORE_TARGET_COUNT); -CONST_UINT32_T(MCS_CHIPLET_OFFSET, 0x7); +CONST_UINT32_T(MCS_CHIPLET_OFFSET, 0x7); CONST_UINT32_T(MCS_TARGET_COUNT, 2); -CONST_UINT32_T(EX_TARGET_OFFSET, MCS_TARGET_OFFSET + MCS_TARGET_COUNT); -CONST_UINT32_T(EX_CHIPLET_OFFSET, 0x10); +CONST_UINT32_T(EX_TARGET_OFFSET, MCS_TARGET_OFFSET + MCS_TARGET_COUNT); +CONST_UINT32_T(EX_CHIPLET_OFFSET, 0x10); CONST_UINT32_T(EX_TARGET_COUNT, 12); +CONST_UINT32_T(SYSTEM_TARGET_OFFSET, EX_TARGET_OFFSET + EX_TARGET_COUNT); +CONST_UINT32_T(SYSTEM_TARGET_COUNT, 1); + CONST_UINT32_T(TARGET_COUNT, CHIP_TARGET_COUNT + PERV_TARGET_COUNT + EQ_TARGET_COUNT + CORE_TARGET_COUNT + MCS_TARGET_COUNT + - EX_TARGET_COUNT); - + EX_TARGET_COUNT + + SYSTEM_TARGET_COUNT); #endif // __FAPI2_PPE_TARGET_PARMS__ diff --git a/hwpf/plat/include/target_types.H b/hwpf/plat/include/target_types.H index 352e4732..56470cd0 100644 --- a/hwpf/plat/include/target_types.H +++ b/hwpf/plat/include/target_types.H @@ -54,7 +54,8 @@ namespace fapi2 TARGET_TYPE_EQ = 0x08, ///< EQ type TARGET_TYPE_MCS = 0x10, ///< MCS type TARGET_TYPE_PERV = 0x20, ///< Pervasive type - TARGET_TYPE_MCAST = 0x80, ///< Multicast type + TARGET_TYPE_MCAST = 0x40, ///< Multicast type + TARGET_TYPE_SYSTEM = 0x80, ///< System type TARGET_TYPE_ALL = 0xFF, ///< Any/All types -- cgit v1.2.1