Skip to content

Commit

Permalink
TOR magic header commit: Primer for commit 35372
Browse files Browse the repository at this point in the history
To prevent a co-req situation between the HW image and the SBE
image in connection with the merging of the TOR magic header
commit 35372, the following code updates have been made:
- Updated the TOR header file to define the data and structures
  needed on the ppe side in plat_ring_traverse.C to make
  SBE putRing code backward HW image compatible.

Change-Id: I14cae65911938c4ae8e853ea9149f10e0d2fe9b8
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/45046
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/45050
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
  • Loading branch information
cmolsen authored and dcrowell77 committed Aug 30, 2017
1 parent 05fe43f commit e5eae5a
Showing 1 changed file with 31 additions and 0 deletions.
31 changes: 31 additions & 0 deletions src/import/chips/p9/utils/imageProcs/p9_tor.H
Expand Up @@ -38,6 +38,37 @@ extern const char* ringVariantName[];

#define TOR_VERSION 2

//
// TOR Magic values for top-level TOR image and TOR sub-images
//
enum TorMagicNum
{
TOR_MAGIC = (uint32_t)0x544F52 , // "TOR"
TOR_MAGIC_HW = (uint32_t)0x544F5248, // "TORH"
TOR_MAGIC_SBE = (uint32_t)0x544F5242, // "TORB"
TOR_MAGIC_SGPE = (uint32_t)0x544F5247, // "TORG"
TOR_MAGIC_CME = (uint32_t)0x544F524D, // "TORM"
TOR_MAGIC_OVRD = (uint32_t)0x544F5252, // "TORR"
TOR_MAGIC_OVLY = (uint32_t)0x544F524C, // "TORL"
TOR_MAGIC_CEN = (uint32_t)0x544F524E, // "TORN"
};

typedef uint8_t ChipType_t;

//
// TOR header field (appears in top of every HW, SBE, CEN, OVRD, etc ring section)
//
typedef struct
{
uint32_t magic;
uint8_t version;
ChipType_t chipType; // Value from ChipType enum
uint8_t ddLevel; // =0xff if MAGIC_HW, >0 all other MAGICs
uint8_t numDdLevels; // >0 if MAGIC_HW, =1 all other MAGICs
uint32_t size; // Size of the TOR ringSection.
} TorHeader_t;


typedef struct
{
uint32_t TorNumDdLevels;
Expand Down

0 comments on commit e5eae5a

Please sign in to comment.