util/intelp2m: add Meteor Lake support
Enables parsing Meteor Lake inteltool output into gpio.h pad macros. Change-Id: Iaebd51d587507e68c6f263b92dc61cb6c0411bf8 Signed-off-by: Filip Lewiński <filip.lewinski@3mdeb.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/81916 Reviewed-by: Maxim <max.senia.poliak@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Michał Kopeć <michal.kopec@3mdeb.com>
This commit is contained in:
parent
c42e28f077
commit
7898594b7c
@ -31,6 +31,7 @@ const (
|
|||||||
TigerType uint8 = 4
|
TigerType uint8 = 4
|
||||||
AlderType uint8 = 5
|
AlderType uint8 = 5
|
||||||
JasperType uint8 = 6
|
JasperType uint8 = 6
|
||||||
|
MeteorType uint8 = 7
|
||||||
)
|
)
|
||||||
|
|
||||||
var key uint8 = SunriseType
|
var key uint8 = SunriseType
|
||||||
@ -43,6 +44,7 @@ var platform = map[string]uint8{
|
|||||||
"tgl": TigerType,
|
"tgl": TigerType,
|
||||||
"adl": AlderType,
|
"adl": AlderType,
|
||||||
"jsl": JasperType,
|
"jsl": JasperType,
|
||||||
|
"mtl": MeteorType,
|
||||||
}
|
}
|
||||||
func PlatformSet(name string) int {
|
func PlatformSet(name string) int {
|
||||||
if platformType, valid := platform[name]; valid {
|
if platformType, valid := platform[name]; valid {
|
||||||
@ -75,6 +77,9 @@ func IsPlatformTigerLake() bool {
|
|||||||
func IsPlatformAlderLakeH() bool {
|
func IsPlatformAlderLakeH() bool {
|
||||||
return IsPlatform(AlderType)
|
return IsPlatform(AlderType)
|
||||||
}
|
}
|
||||||
|
func IsPlatformMeteorLake() bool {
|
||||||
|
return IsPlatform(MeteorType)
|
||||||
|
}
|
||||||
|
|
||||||
var InputRegDumpFile *os.File = nil
|
var InputRegDumpFile *os.File = nil
|
||||||
var OutputGenFile *os.File = nil
|
var OutputGenFile *os.File = nil
|
||||||
|
@ -72,7 +72,8 @@ func main() {
|
|||||||
"\tcnl - CannonLake-LP or Whiskeylake/Coffeelake/Cometlake-U SoC\n"+
|
"\tcnl - CannonLake-LP or Whiskeylake/Coffeelake/Cometlake-U SoC\n"+
|
||||||
"\ttgl - TigerLake-H SoC\n"+
|
"\ttgl - TigerLake-H SoC\n"+
|
||||||
"\tadl - AlderLake PCH\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"+
|
fieldstyle := flag.String("fld", "none", "set fields macros style:\n"+
|
||||||
"\tcb - use coreboot style for bit fields macros\n"+
|
"\tcb - use coreboot style for bit fields macros\n"+
|
||||||
|
@ -14,6 +14,7 @@ import (
|
|||||||
"review.coreboot.org/coreboot.git/util/intelp2m/platforms/tgl"
|
"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/adl"
|
||||||
"review.coreboot.org/coreboot.git/util/intelp2m/platforms/jsl"
|
"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"
|
"review.coreboot.org/coreboot.git/util/intelp2m/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -154,6 +155,7 @@ func (parser *ParserData) PlatformSpecificInterfaceSet() {
|
|||||||
config.TigerType : tgl.PlatformSpecific{},
|
config.TigerType : tgl.PlatformSpecific{},
|
||||||
config.AlderType : adl.PlatformSpecific{},
|
config.AlderType : adl.PlatformSpecific{},
|
||||||
config.JasperType : jsl.PlatformSpecific{},
|
config.JasperType : jsl.PlatformSpecific{},
|
||||||
|
config.MeteorType : mtl.PlatformSpecific{},
|
||||||
}
|
}
|
||||||
parser.platform = platform[config.PlatformGet()]
|
parser.platform = platform[config.PlatformGet()]
|
||||||
}
|
}
|
||||||
|
117
util/intelp2m/platforms/mtl/macro.go
Normal file
117
util/intelp2m/platforms/mtl/macro.go
Normal file
@ -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()
|
||||||
|
}
|
23
util/intelp2m/platforms/mtl/template.go
Normal file
23
util/intelp2m/platforms/mtl/template.go
Normal file
@ -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
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user