diff options
| -rw-r--r-- | util/intelp2m/config/config.go | 5 | ||||
| -rw-r--r-- | util/intelp2m/main.go | 3 | ||||
| -rw-r--r-- | util/intelp2m/parser/parser.go | 2 | ||||
| -rw-r--r-- | util/intelp2m/platforms/mtl/macro.go | 117 | ||||
| -rw-r--r-- | util/intelp2m/platforms/mtl/template.go | 23 |
5 files changed, 149 insertions, 1 deletions
diff --git a/util/intelp2m/config/config.go b/util/intelp2m/config/config.go index 62242b916c..051c5803b4 100644 --- a/util/intelp2m/config/config.go +++ b/util/intelp2m/config/config.go @@ -31,6 +31,7 @@ const ( TigerType uint8 = 4 AlderType uint8 = 5 JasperType uint8 = 6 + MeteorType uint8 = 7 ) var key uint8 = SunriseType @@ -43,6 +44,7 @@ var platform = map[string]uint8{ "tgl": TigerType, "adl": AlderType, "jsl": JasperType, + "mtl": MeteorType, } func PlatformSet(name string) int { if platformType, valid := platform[name]; valid { @@ -75,6 +77,9 @@ func IsPlatformTigerLake() bool { func IsPlatformAlderLakeH() bool { return IsPlatform(AlderType) } +func IsPlatformMeteorLake() bool { + return IsPlatform(MeteorType) +} var InputRegDumpFile *os.File = nil var OutputGenFile *os.File = nil diff --git a/util/intelp2m/main.go b/util/intelp2m/main.go index 64db9fee5a..dc78778016 100644 --- a/util/intelp2m/main.go +++ b/util/intelp2m/main.go @@ -72,7 +72,8 @@ func main() { "\tcnl - CannonLake-LP or Whiskeylake/Coffeelake/Cometlake-U SoC\n"+ "\ttgl - TigerLake-H SoC\n"+ "\tadl - AlderLake PCH\n"+ - "\tjsl - Jasper Lake SoC\n") + "\tjsl - Jasper Lake SoC\n"+ + "\tmtl - MeteorLake SoC\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 a6fa315e0e..b7b41412e5 100644 --- a/util/intelp2m/parser/parser.go +++ b/util/intelp2m/parser/parser.go @@ -14,6 +14,7 @@ import ( "review.coreboot.org/coreboot.git/util/intelp2m/platforms/tgl" "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/config" ) @@ -154,6 +155,7 @@ func (parser *ParserData) PlatformSpecificInterfaceSet() { config.TigerType : tgl.PlatformSpecific{}, config.AlderType : adl.PlatformSpecific{}, config.JasperType : jsl.PlatformSpecific{}, + config.MeteorType : mtl.PlatformSpecific{}, } parser.platform = platform[config.PlatformGet()] } diff --git a/util/intelp2m/platforms/mtl/macro.go b/util/intelp2m/platforms/mtl/macro.go new file mode 100644 index 0000000000..512dd719e3 --- /dev/null +++ b/util/intelp2m/platforms/mtl/macro.go @@ -0,0 +1,117 @@ +package mtl + +import ( + "strings" + "fmt" + + "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common" + "review.coreboot.org/coreboot.git/util/intelp2m/platforms/snr" + "review.coreboot.org/coreboot.git/util/intelp2m/platforms/cnl" + "review.coreboot.org/coreboot.git/util/intelp2m/config" + "review.coreboot.org/coreboot.git/util/intelp2m/fields" +) + +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 +} + +// 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 + } + if strings.Contains(macro.PadIdGet(), "GPD") { + // See reset map for the MeteorLake GPD group at + // https://github.com/coreboot/coreboot/blob/master/src/soc/intel/meteorlake/gpio.c#L10 + // remmap is not required because it is the same as common. + 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, + 3: common.RST_PWROK << 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 (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/mtl/template.go b/util/intelp2m/platforms/mtl/template.go new file mode 100644 index 0000000000..76a65f3f18 --- /dev/null +++ b/util/intelp2m/platforms/mtl/template.go @@ -0,0 +1,23 @@ +package mtl + +import "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common" + +// 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 (PlatformSpecific) GroupNameExtract(line string) (bool, string) { + return common.KeywordsCheck(line, + "GPP_V", "GPP_C", "GPP_A", "GPP_E", "GPP_H", "GPP_F", "GPP_S", + "GPP_B", "GPP_D", "GPD", "VGPIO_USB", "VGPIO_PCIE") + +} + +// 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 (PlatformSpecific) KeywordCheck(line string) bool { + isIncluded, _ := common.KeywordsCheck(line, "GPP_", "GPD", "VGPIO") + return isIncluded +} |