diff options
-rw-r--r-- | util/intelp2m/config/config.go | 21 | ||||
-rw-r--r-- | util/intelp2m/main.go | 3 | ||||
-rw-r--r-- | util/intelp2m/parser/parser.go | 7 | ||||
-rw-r--r-- | util/intelp2m/platforms/ebg/macro.go | 108 | ||||
-rw-r--r-- | util/intelp2m/platforms/ebg/template.go | 27 |
5 files changed, 157 insertions, 9 deletions
diff --git a/util/intelp2m/config/config.go b/util/intelp2m/config/config.go index 051c5803b4..5578a05853 100644 --- a/util/intelp2m/config/config.go +++ b/util/intelp2m/config/config.go @@ -24,14 +24,15 @@ func TemplateGet() int { } const ( - SunriseType uint8 = 0 - LewisburgType uint8 = 1 - ApolloType uint8 = 2 - CannonType uint8 = 3 - TigerType uint8 = 4 - AlderType uint8 = 5 - JasperType uint8 = 6 - MeteorType uint8 = 7 + SunriseType uint8 = 0 + LewisburgType uint8 = 1 + ApolloType uint8 = 2 + CannonType uint8 = 3 + TigerType uint8 = 4 + AlderType uint8 = 5 + JasperType uint8 = 6 + MeteorType uint8 = 7 + EmmitsburgType uint8 = 8 ) var key uint8 = SunriseType @@ -45,6 +46,7 @@ var platform = map[string]uint8{ "adl": AlderType, "jsl": JasperType, "mtl": MeteorType, + "ebg": EmmitsburgType, } func PlatformSet(name string) int { if platformType, valid := platform[name]; valid { @@ -80,6 +82,9 @@ func IsPlatformAlderLakeH() bool { func IsPlatformMeteorLake() bool { return IsPlatform(MeteorType) } +func IsPlatformEmmitsburg() bool { + return IsPlatform(EmmitsburgType) +} var InputRegDumpFile *os.File = nil var OutputGenFile *os.File = nil diff --git a/util/intelp2m/main.go b/util/intelp2m/main.go index dc78778016..4f66a0acb9 100644 --- a/util/intelp2m/main.go +++ b/util/intelp2m/main.go @@ -73,7 +73,8 @@ func main() { "\ttgl - TigerLake-H SoC\n"+ "\tadl - AlderLake PCH\n"+ "\tjsl - Jasper Lake SoC\n"+ - "\tmtl - MeteorLake SoC\n") + "\tmtl - MeteorLake SoC\n"+ + "\tebg - Emmitsburg PCH with Xeon SP\n") fieldstyle := flag.String("fld", "none", "set fields macros style:\n"+ "\tcb - use coreboot style for bit fields macros\n"+ diff --git a/util/intelp2m/parser/parser.go b/util/intelp2m/parser/parser.go index b7b41412e5..fd3191d5b1 100644 --- a/util/intelp2m/parser/parser.go +++ b/util/intelp2m/parser/parser.go @@ -15,6 +15,7 @@ import ( "review.coreboot.org/coreboot.git/util/intelp2m/platforms/adl" "review.coreboot.org/coreboot.git/util/intelp2m/platforms/jsl" "review.coreboot.org/coreboot.git/util/intelp2m/platforms/mtl" + "review.coreboot.org/coreboot.git/util/intelp2m/platforms/ebg" "review.coreboot.org/coreboot.git/util/intelp2m/config" ) @@ -156,6 +157,12 @@ func (parser *ParserData) PlatformSpecificInterfaceSet() { config.AlderType : adl.PlatformSpecific{}, config.JasperType : jsl.PlatformSpecific{}, config.MeteorType : mtl.PlatformSpecific{}, + // See platforms/ebg/macro.go + config.EmmitsburgType : ebg.PlatformSpecific{ + InheritanceTemplate : cnl.PlatformSpecific{ + InheritanceTemplate : snr.PlatformSpecific{}, + }, + }, } parser.platform = platform[config.PlatformGet()] } diff --git a/util/intelp2m/platforms/ebg/macro.go b/util/intelp2m/platforms/ebg/macro.go new file mode 100644 index 0000000000..64d6f32409 --- /dev/null +++ b/util/intelp2m/platforms/ebg/macro.go @@ -0,0 +1,108 @@ +package ebg + +import ( + "fmt" + + "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common" + "review.coreboot.org/coreboot.git/util/intelp2m/config" + "review.coreboot.org/coreboot.git/util/intelp2m/fields" + "review.coreboot.org/coreboot.git/util/intelp2m/platforms/snr" + "review.coreboot.org/coreboot.git/util/intelp2m/platforms/cnl" +) + +const ( + PAD_CFG_DW0_RO_FIELDS = (0x1 << 27) | (0x1 << 24) | (0x3 << 21) | (0xf << 16) | 0xfc + PAD_CFG_DW1_RO_FIELDS = 0xfdffc3ff +) + +const ( + PAD_CFG_DW0 = common.PAD_CFG_DW0 + PAD_CFG_DW1 = common.PAD_CFG_DW1 + MAX_DW_NUM = common.MAX_DW_NUM +) + +type InheritanceMacro interface { + Pull() + GpiMacroAdd() + GpoMacroAdd() + NativeFunctionMacroAdd() + NoConnMacroAdd() +} + +type PlatformSpecific struct { + InheritanceMacro + InheritanceTemplate +} + +// RemmapRstSrc - remmap Pad Reset Source Config +func (PlatformSpecific) RemmapRstSrc() { + macro := common.GetMacro() + if config.TemplateGet() != config.TempInteltool { + // Use reset source remapping only if the input file is inteltool.log dump + return + } + dw0 := macro.Register(PAD_CFG_DW0) + var remapping = map[uint8]uint32{ + 0: common.RST_RSMRST << common.PadRstCfgShift, + 1: common.RST_DEEP << common.PadRstCfgShift, + 2: common.RST_PLTRST << common.PadRstCfgShift, + } + resetsrc, valid := remapping[dw0.GetResetConfig()] + if valid { + // dw0.SetResetConfig(resetsrc) + ResetConfigFieldVal := (dw0.ValueGet() & 0x3fffffff) | remapping[dw0.GetResetConfig()] + dw0.ValueSet(ResetConfigFieldVal) + } else { + fmt.Println("Invalid Pad Reset Config [ 0x", resetsrc ," ] for ", macro.PadIdGet()) + } + dw0.CntrMaskFieldsClear(common.PadRstCfgMask) +} + +// Adds The Pad Termination (TERM) parameter from PAD_CFG_DW1 to the macro +// as a new argument +func (platform PlatformSpecific) Pull() { + platform.InheritanceMacro.Pull() +} + +// Adds PAD_CFG_GPI macro with arguments +func (platform PlatformSpecific) GpiMacroAdd() { + platform.InheritanceMacro.GpiMacroAdd() +} + +// Adds PAD_CFG_GPO macro with arguments +func (platform PlatformSpecific) GpoMacroAdd() { + platform.InheritanceMacro.GpoMacroAdd() +} + +// Adds PAD_CFG_NF macro with arguments +func (platform PlatformSpecific) NativeFunctionMacroAdd() { + platform.InheritanceMacro.NativeFunctionMacroAdd() +} + +// Adds PAD_NC macro +func (platform PlatformSpecific) NoConnMacroAdd() { + platform.InheritanceMacro.NoConnMacroAdd() +} + +// GenMacro - generate pad macro +// dw0 : DW0 config register value +// dw1 : DW1 config register value +// return: string of macro +// error +func (platform PlatformSpecific) GenMacro(id string, dw0 uint32, dw1 uint32, ownership uint8) string { + macro := common.GetInstanceMacro( + PlatformSpecific{ + InheritanceMacro : cnl.PlatformSpecific{ + InheritanceMacro : snr.PlatformSpecific{}, + }, + }, + fields.InterfaceGet(), + ) + macro.Clear() + macro.Register(PAD_CFG_DW0).CntrMaskFieldsClear(common.AllFields) + macro.Register(PAD_CFG_DW1).CntrMaskFieldsClear(common.AllFields) + macro.PadIdSet(id).SetPadOwnership(ownership) + macro.Register(PAD_CFG_DW0).ValueSet(dw0).ReadOnlyFieldsSet(PAD_CFG_DW0_RO_FIELDS) + macro.Register(PAD_CFG_DW1).ValueSet(dw1).ReadOnlyFieldsSet(PAD_CFG_DW1_RO_FIELDS) + return macro.Generate() +} diff --git a/util/intelp2m/platforms/ebg/template.go b/util/intelp2m/platforms/ebg/template.go new file mode 100644 index 0000000000..0ec9bc31a8 --- /dev/null +++ b/util/intelp2m/platforms/ebg/template.go @@ -0,0 +1,27 @@ +package ebg + +import "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common" + +type InheritanceTemplate interface { + GroupNameExtract(line string) (bool, string) + KeywordCheck(line string) bool +} + +// GroupNameExtract - This function extracts the group ID, if it exists in a row +// line : string from the configuration file +// return +// bool : true if the string contains a group identifier +// string : group identifier +func (platform PlatformSpecific) GroupNameExtract(line string) (bool, string) { + return common.KeywordsCheck(line, + "GPPC_A", "GPPC_B", "GPPC_S", "GPPC_C", "GPP_D", "GPP_E", "GPPC_H", "GPP_J", + "GPP_I", "GPP_L", "GPP_M", "GPP_N") +} + +// KeywordCheck - This function is used to filter parsed lines of the configuration file and +// returns true if the keyword is contained in the line. +// line : string from the configuration file +func (platform PlatformSpecific) KeywordCheck(line string) bool { + isIncluded, _ := common.KeywordsCheck(line, "GPP_", "GPPC_") + return isIncluded +} |