coreboot-gerrit December 2022

coreboot-gerrit@coreboot.org

1 participants
6828 discussions

[S] Change in coreboot[master]: arm64: mmu: Spot check security state for TTB mapping
by Elyes Haouas (Code Review) 03 Dec '22

03 Dec '22

Attention is currently required from: Julius Werner. Elyes Haouas has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/28017 ) Change subject: arm64: mmu: Spot check security state for TTB mapping ...................................................................... Patch Set 2: (1 comment) File src/arch/arm64/armv8/mmu.c: https://review.coreboot.org/c/coreboot/+/28017/comment/4d48a54f_0a09f033 PS2, Line 324: assert_correct_ttb_mapping(_ettb - 1); that gives me using gcc-12.2: CC romstage/arch/arm64/armv8/mmu.o src/arch/arm64/armv8/mmu.c: In function 'mmu_enable': src/arch/arm64/armv8/mmu.c:296:9: error: array subscript -1 is outside array bounds of 'u8[]' {aka 'unsigned char[]'} [-Werror=array-bounds] 296 | assert_correct_ttb_mapping(_ettb - 1); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from src/arch/arm64/armv8/mmu.c:6: src/include/symbols.h:14:19: note: at offset -1 into object '_ettb' of size [0, 9223372036854775807] 14 | extern u8 _e##name[]; \ | ^~ src/include/symbols.h:70:1: note: in expansion of macro 'DECLARE_REGION' 70 | DECLARE_REGION(ttb) | ^~~~~~~~~~~~~~ cc1: all warnings being treated as errors make: *** [Makefile:392 : build/romstage/arch/arm64/armv8/mmu.o] Erreur 1 -- To view, visit https://review.coreboot.org/c/coreboot/+/28017 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I70cda4f76f201b03d69a9ece063a3830b15ac04b Gerrit-Change-Number: 28017 Gerrit-PatchSet: 2 Gerrit-Owner: Julius Werner <jwerner(a)chromium.org> Gerrit-Reviewer: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Reviewer: Patrick Georgi <patrick(a)coreboot.org> Gerrit-Reviewer: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Elyes Haouas <ehaouas(a)noos.fr> Gerrit-Attention: Julius Werner <jwerner(a)chromium.org> Gerrit-Comment-Date: Sun, 04 Dec 2022 06:46:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in coreboot[master]: [For test]: Ignore RWX segment warning
by Elyes Haouas (Code Review) 03 Dec '22

03 Dec '22

Elyes Haouas has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/70252 ) Change subject: [For test]: Ignore RWX segment warning ...................................................................... Abandoned -- To view, visit https://review.coreboot.org/c/coreboot/+/70252 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I593eea3bcac8e9e46883b73b25a31e20b4c27c51 Gerrit-Change-Number: 70252 Gerrit-PatchSet: 3 Gerrit-Owner: Elyes Haouas <ehaouas(a)noos.fr> Gerrit-Reviewer: Jakub Czapiga <jacz(a)semihalf.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: abandon

1 0

[L] Change in coreboot[master]: intelp2m: Update cli options
by Maxim Polyakov (Code Review) 03 Dec '22

03 Dec '22

Maxim Polyakov has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/70310 ) Change subject: intelp2m: Update cli options ...................................................................... intelp2m: Update cli options Use the new options format: basic functions: -file <path> path to the inteltool log file -out <path> path to the generated file -platform <type> set the PCH platform type <sunrise> enter ? to show datails generation of long composite macros with bit field definitions: -fields <type> generate a long macro consisting of bitfield macros enter ? to show datails control flags: -exclude exclude fields that should be ignored to gen macro -unchecked disable automatic checking of macro fields before gen generate additional information: -i add function to the comments -ii add DW0/DW1 register value to the comments -iii add ignored bitfields to the comments -iiii add target PAD_CFG() macro to the comments Use the following bash command: $ complete `-C `pwd`/intelp2m ./intelp2m to allow automatic completion of arguments Change-Id: I08ff379b99b018b1099aa5d70fea47026bc84045 Signed-off-by: Maxim Polyakov <max.senia.poliak(a)gmail.com> --- A util/intelp2m/cli/completion.go A util/intelp2m/cli/options.go M util/intelp2m/config/p2m/config.go M util/intelp2m/main.go 4 files changed, 198 insertions(+), 68 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/70310/1 diff --git a/util/intelp2m/cli/completion.go b/util/intelp2m/cli/completion.go new file mode 100644 index 0000000..b322a87 --- /dev/null +++ b/util/intelp2m/cli/completion.go @@ -0,0 +1,22 @@ +package cli + +import ( + "flag" + "fmt" + "os" + "strings" +) + +func UseComplete() bool { + if _, ok := os.LookupEnv("COMP_LINE"); ok { + argument := os.Args[2] + argument = strings.TrimLeft(argument, "-") + flag.VisitAll(func(f *flag.Flag) { + if argument == "" || strings.HasPrefix(f.Name, argument) { + fmt.Println("-" + f.Name) + } + }) + return true + } + return false +} diff --git a/util/intelp2m/cli/options.go b/util/intelp2m/cli/options.go new file mode 100644 index 0000000..9da4632 --- /dev/null +++ b/util/intelp2m/cli/options.go @@ -0,0 +1,127 @@ +package cli + +import ( + "flag" + "fmt" + "os" + "path/filepath" + + "review.coreboot.org/coreboot.git/util/intelp2m/config/p2m" +) + +var Version = "" + +const usagePlatform string = `usage: -platform <type> + type: adl | apl | cnl | lbg | snr | ? + adl - AlderLake PCH + apl - Apollo Lake SoC + cnl - CannonLake-LP or Whiskeylake/Coffeelake/Cometlake-U SoC + lbg - Lewisburg PCH with Xeon SP + snr - Sunrise PCH or Skylake/Kaby Lake SoC + ? - show details +` + +const usageFields string = `usage: -fields <type> + type: cb | fsp | raw | ? + cb - coreboot style + fsp - Intel FSP style + raw - raw register value (don't convert, print as is) + ? - show details +` + +func Usage() { + fmt.Printf(` +%s converts inteltool.log register dump to coreboot macros +version %s + +usage: options... <arguments> + +basic functions: + -file <path> path to the inteltool log file <inteltool.log> by default + -out <path> path to the generated file. <generate/gpio.h> by default + -platform <type> set the PCH platform type. <sunrise> by default + enter ? to show datails + +generation of long composite macros with bit field definitions: + -fields <type> generate a long macro consisting of bitfield macros and set its type + enter ? to show datails + +control flags: + -exclude exclude fields that should be ignored to generate a gpio macro + -unchecked disable automatic checking of macro fields before generating + +generate additional information: + -i add function to the comments + -ii add DW0/DW1 register value to the comments + -iii add ignored bitfields to the comments + -iiii add target PAD_CFG() macro to the comments +`, filepath.Base(os.Args[0]), Version) +} + +func ParseOptions(version string) { + config := p2m.SettingsGet() + Version = version + + flag.Usage = Usage + flag.StringVar(&config.InputPath, "file", "inteltool.log", "") + flag.StringVar(&config.OutputPath, "out", "generate/gpio.h", "") + flag.BoolVar(&config.IgnoredFields, "exclude", false, "") + unchecked := flag.Bool("unchecked", false, "") + flag.Func( + "platform", + usagePlatform, + func(value string) error { + if value == "?" { + fmt.Printf("%s", usagePlatform) + os.Exit(0) + } + + if err := config.SetPlatformType(value); err != nil { + fmt.Printf("error: %v\n%s", err, usagePlatform) + os.Exit(0) + } + return nil + }, + ) + + flag.Func( + "fields", + usageFields, + func(value string) error { + if value == "?" { + fmt.Printf("%s", usageFields) + os.Exit(0) + } + + if err := config.SetFieldType(value); err != nil { + fmt.Printf("error: %v\n%s", err, usageFields) + os.Exit(0) + } + return nil + }, + ) + + levels := map[int]*bool{ + 1: flag.Bool("i", false, ""), + 2: flag.Bool("ii", false, ""), + 3: flag.Bool("iii", false, ""), + 4: flag.Bool("iiii", false, ""), + } + + if UseComplete() { + os.Exit(0) + } + + flag.Parse() + + for level, selected := range levels { + if *selected { + config.GenLevel = level + break + } + } + config.AutoCheck = !(*unchecked) + config.Version = version + + p2m.SettingsUpdate(config) +} diff --git a/util/intelp2m/config/p2m/config.go b/util/intelp2m/config/p2m/config.go index 43f8226..9449d22 100644 --- a/util/intelp2m/config/p2m/config.go +++ b/util/intelp2m/config/p2m/config.go @@ -42,6 +42,8 @@ Version string Platform PlatformType Field FieldType + InputPath string + OutputPath string InputFile *os.File OutputFile *os.File IgnoredFields bool @@ -52,7 +54,7 @@ var p2mConfig = Settings{ Version: "unknown", Platform: Sunrise, - Field: CbFlds, + Field: NoFlds, IgnoredFields: false, AutoCheck: true, GenLevel: 0, diff --git a/util/intelp2m/main.go b/util/intelp2m/main.go index 0b0c9d5..aa856bd 100644 --- a/util/intelp2m/main.go +++ b/util/intelp2m/main.go @@ -1,11 +1,11 @@ package main import ( - "flag" "fmt" "os" "path/filepath" + "review.coreboot.org/coreboot.git/util/intelp2m/cli" "review.coreboot.org/coreboot.git/util/intelp2m/config/p2m" "review.coreboot.org/coreboot.git/util/intelp2m/parser" ) @@ -36,86 +36,29 @@ // main func main() { - // Command line arguments - inputFilePath := flag.String("file", "inteltool.log", - "the path to the inteltool log file\n") + cli.ParseOptions(Version) - outputFilePath := flag.String("o", - "generate/gpio.h", - "the path to the generated file with GPIO configuration\n") - - ignored := flag.Bool("ign", false, - "exclude fields that should be ignored from advanced macros\n") - - unchecking := flag.Bool("n", false, - "Generate macros without checking.\n"+ - "\tIn this case, some fields of the configuration registers\n"+ - "\tDW0 will be ignored.\n") - - levels := []*bool{ - flag.Bool("i", false, "Show pads function in the comments"), - flag.Bool("ii", false, "Show DW0/DW1 value in the comments"), - flag.Bool("iii", false, "Show ignored bit fields in the comments"), - flag.Bool("iiii", false, "Show target PAD_CFG() macro in the comments"), - } - - platform := flag.String("p", "snr", "set platform:\n"+ - "\tsnr - Sunrise PCH or Skylake/Kaby Lake SoC\n"+ - "\tlbg - Lewisburg PCH with Xeon SP\n"+ - "\tapl - Apollo Lake SoC\n"+ - "\tcnl - CannonLake-LP or Whiskeylake/Coffeelake/Cometlake-U SoC\n"+ - "\tadl - AlderLake PCH\n") - - field := flag.String("fld", "none", "set fields macros style:\n"+ - "\tcb - use coreboot style for bit fields macros\n"+ - "\tfsp - use fsp style\n"+ - "\traw - do not convert, print as is\n") - - flag.Parse() - printVersion() - - // settings config := p2m.SettingsGet() - config.Version = Version - config.IgnoredFields = *ignored - config.AutoCheck = !(*unchecking) - for level, set := range levels { - if *set { - config.GenLevel = level + 1 - fmt.Printf("Info level: Use level %d!\n", level+1) - break - } - } - if err := config.SetPlatformType(*platform); err != nil { - fmt.Printf("Error: %v\n", err) - os.Exit(1) - } - - if err := config.SetFieldType(*field); err != nil { - fmt.Printf("Error: %v\n", err) - os.Exit(1) - } - - if file, err := os.Open(*inputFilePath); err != nil { - fmt.Printf("input file error: %v", err) + if file, err := os.Open(config.InputPath); err != nil { + fmt.Printf("input file error: %v\n", err) os.Exit(1) } else { config.InputFile = file + defer file.Close() } - defer config.InputFile.Close() - if err := os.MkdirAll(filepath.Dir(*outputFilePath), os.ModePerm); err != nil { - fmt.Printf("failed to create output directory: %v", err) + if err := os.MkdirAll(filepath.Dir(config.OutputPath), os.ModePerm); err != nil { + fmt.Printf("failed to create output directory: %v\n", err) os.Exit(1) } - if file, err := os.Create(*outputFilePath); err != nil { - fmt.Printf("failed to create output file: %v", err) + if file, err := os.Create(config.OutputPath); err != nil { + fmt.Printf("failed to create output file: %v\n", err) os.Exit(1) } else { config.OutputFile = file + defer file.Close() } - defer config.OutputFile.Close() p2m.SettingsUpdate(config) -- To view, visit https://review.coreboot.org/c/coreboot/+/70310 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I08ff379b99b018b1099aa5d70fea47026bc84045 Gerrit-Change-Number: 70310 Gerrit-PatchSet: 1 Gerrit-Owner: Maxim Polyakov <max.senia.poliak(a)gmail.com> Gerrit-MessageType: newchange

1 0

[XL] Change in coreboot[master]: intelp2m: Rework register package
by Maxim Polyakov (Code Review) 03 Dec '22

03 Dec '22

Maxim Polyakov has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/70309 ) Change subject: intelp2m: Rework register package ...................................................................... intelp2m: Rework register package Split all methods between DW0 and DW1 to avoid the mistake of using any DW0 method with DW1 receiver and make the code safer. Also make some code style fixes. Change-Id: Id64e2a5e29f1d561597004ac83d32e3c80c16ebd Signed-off-by: Maxim Polyakov <max.senia.poliak(a)gmail.com> --- M util/intelp2m/fields/cb/cb.go M util/intelp2m/fields/fsp/fsp.go M util/intelp2m/fields/raw/raw.go M util/intelp2m/fields/test/suite.go M util/intelp2m/parser/template.go M util/intelp2m/parser/template_test.go M util/intelp2m/platforms/adl/macro.go M util/intelp2m/platforms/apl/macro.go M util/intelp2m/platforms/cnl/macro.go M util/intelp2m/platforms/common/macro.go D util/intelp2m/platforms/common/register.go A util/intelp2m/platforms/common/register/bits/bits.go A util/intelp2m/platforms/common/register/dw0.go A util/intelp2m/platforms/common/register/dw1.go A util/intelp2m/platforms/common/register/register.go M util/intelp2m/platforms/lbg/macro.go M util/intelp2m/platforms/snr/macro.go 17 files changed, 661 insertions(+), 609 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/09/70309/1 diff --git a/util/intelp2m/fields/cb/cb.go b/util/intelp2m/fields/cb/cb.go index 0c8988eb..031c83a 100644 --- a/util/intelp2m/fields/cb/cb.go +++ b/util/intelp2m/fields/cb/cb.go @@ -50,7 +50,7 @@ // DecodeDW0 - decode value of DW0 register func (FieldMacros) DecodeDW0() { macro := common.GetMacro() - dw0 := macro.Register(common.PAD_CFG_DW0) + dw0 := macro.GetRegisterDW0() generate( &field{ prefix: "PAD_FUNC", @@ -133,7 +133,7 @@ // DecodeDW1 - decode value of DW1 register func (FieldMacros) DecodeDW1() { macro := common.GetMacro() - dw1 := macro.Register(common.PAD_CFG_DW1) + dw1 := macro.GetRegisterDW1() generate( &field{ name: "PAD_CFG1_TOL_1V8", diff --git a/util/intelp2m/fields/fsp/fsp.go b/util/intelp2m/fields/fsp/fsp.go index b6224cd..db6b4ad 100644 --- a/util/intelp2m/fields/fsp/fsp.go +++ b/util/intelp2m/fields/fsp/fsp.go @@ -2,16 +2,16 @@ import "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common" -type FieldMacros struct {} +type FieldMacros struct{} // field - data structure for creating a new bitfield macro object // configmap : map to select the current configuration // value : the key value in the configmap // override : overrides the function to generate the current bitfield macro type field struct { - configmap map[uint8]string - value uint8 - override func(configuration map[uint8]string, value uint8) + configmap map[uint32]string + value uint32 + override func(configuration map[uint32]string, value uint32) } // generate - wrapper for generating bitfield macros string @@ -37,16 +37,18 @@ // DecodeDW0 - decode value of DW0 register func (FieldMacros) DecodeDW0() { macro := common.GetMacro() - dw0 := macro.Register(common.PAD_CFG_DW0) + dw0 := macro.GetRegisterDW0() - ownershipStatus := func() uint8 { - if macro.IsOwnershipDriver() { return 1 } + ownershipStatus := func() uint32 { + if macro.IsOwnershipDriver() { + return 1 + } return 0 } generate( - &field { - configmap : map[uint8]string{ + &field{ + configmap: map[uint32]string{ 0: "GpioPadModeGpio", 1: "GpioPadModeNative1", 2: "GpioPadModeNative2", @@ -54,79 +56,79 @@ 4: "GpioPadModeNative4", 5: "GpioPadModeNative5", }, - value : dw0.GetPadMode(), + value: dw0.GetPadMode(), }, - &field { - configmap : map[uint8]string { + &field{ + configmap: map[uint32]string{ 0: "GpioHostOwnAcpi", 1: "GpioHostOwnGpio", }, - value : ownershipStatus(), + value: ownershipStatus(), }, - &field { - configmap : map[uint8]string { - 0: "GpioDirInOut", - 1: "GpioDirIn", - 2: "GpioDirOut", - 3: "GpioDirNone", - 1 << 4 | 0: "GpioDirInInvOut", - 1 << 4 | 1: "GpioDirInInv", + &field{ + configmap: map[uint32]string{ + 0: "GpioDirInOut", + 1: "GpioDirIn", + 2: "GpioDirOut", + 3: "GpioDirNone", + (1 << 4): "GpioDirInInvOut", + (1 << 4) | 1: "GpioDirInInv", }, - value : dw0.GetRxInvert() << 4 | dw0.GetGPIORxTxDisableStatus(), + value: dw0.GetRxInvert()<<4 | dw0.GetGPIORxTxDisableStatus(), }, - &field { - configmap : map[uint8]string { + &field{ + configmap: map[uint32]string{ 0: "GpioOutLow", 1: "GpioOutHigh", }, - value : dw0.GetGPIOTXState(), + value: dw0.GetGPIOTXState(), }, - &field { - configmap : map[uint8]string { + &field{ + configmap: map[uint32]string{ 1 << 0: "GpioIntNmi", 1 << 1: "GpioIntSmi", 1 << 2: "GpioIntSci", 1 << 3: "GpioIntApic", }, - override : func(configmap map[uint8]string, value uint8) { - mask := dw0.GetGPIOInputRouteIOxAPIC() << 3 | - dw0.GetGPIOInputRouteSCI() << 2 | - dw0.GetGPIOInputRouteSMI() << 1 | - dw0.GetGPIOInputRouteNMI() + override: func(configmap map[uint32]string, value uint32) { + mask := dw0.GetGPIOInputRouteIOxAPIC()<<3 | + dw0.GetGPIOInputRouteSCI()<<2 | + dw0.GetGPIOInputRouteSMI()<<1 | + dw0.GetGPIOInputRouteNMI() if mask == 0 { macro.Add("GpioIntDis | ") return } for bit, fieldmacro := range configmap { - if mask & bit != 0 { + if mask&bit != 0 { macro.Add(fieldmacro).Add(" | ") } } }, }, - &field { - configmap : map[uint8]string { + &field{ + configmap: map[uint32]string{ 0: "GpioIntLevel", 1: "GpioIntEdge", 2: "GpioIntLvlEdgDis", 3: "GpioIntBothEdge", }, - value : dw0.GetRXLevelEdgeConfiguration(), + value: dw0.GetRXLevelEdgeConfiguration(), }, - &field { - configmap : map[uint8]string { - 0: "GpioResetPwrGood", // TODO: Has multiple values (to GPP and GPD) + &field{ + configmap: map[uint32]string{ + 0: "GpioResetPwrGood", // TODO: Has multiple values (to GPP and GPD) 1: "GpioHostDeepReset", 2: "GpioPlatformReset", 3: "GpioResumeReset", }, - value : dw0.GetResetConfig(), + value: dw0.GetResetConfig(), }, ) } @@ -134,18 +136,18 @@ // DecodeDW1 - decode value of DW1 register func (FieldMacros) DecodeDW1() { macro := common.GetMacro() - dw1 := macro.Register(common.PAD_CFG_DW1) + dw1 := macro.GetRegisterDW1() generate( - &field { - override : func(configmap map[uint8]string, value uint8) { + &field{ + override: func(configmap map[uint32]string, value uint32) { if dw1.GetPadTol() != 0 { macro.Add("GpioTolerance1v8 | ") } }, }, - &field { - configmap : map[uint8]string { + &field{ + configmap: map[uint32]string{ 0x0: "GpioTermNone", 0x2: "GpioTermWpd5K", 0x4: "GpioTermWpd20K", @@ -156,7 +158,7 @@ 0xd: "GpioTermWpu1K2K", 0xf: "GpioTermNative", }, - value : dw1.GetTermination(), + value: dw1.GetTermination(), }, ) } diff --git a/util/intelp2m/fields/raw/raw.go b/util/intelp2m/fields/raw/raw.go index fbac5b5..4efccd5 100644 --- a/util/intelp2m/fields/raw/raw.go +++ b/util/intelp2m/fields/raw/raw.go @@ -1,22 +1,21 @@ package raw import ( - "fmt" "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common" ) -type FieldMacros struct {} +type FieldMacros struct{} func (FieldMacros) DecodeDW0() { macro := common.GetMacro() - // Do not decode, print as is. - macro.Add(fmt.Sprintf("0x%0.8x", macro.Register(common.PAD_CFG_DW0).ValueGet())) + dw0 := macro.GetRegisterDW0() + macro.Add(dw0.String()) } func (FieldMacros) DecodeDW1() { macro := common.GetMacro() - // Do not decode, print as is. - macro.Add(fmt.Sprintf("0x%0.8x", macro.Register(common.PAD_CFG_DW1).ValueGet())) + dw1 := macro.GetRegisterDW1() + macro.Add(dw1.String()) } // GenerateString - generates the entire string of bitfield macros. diff --git a/util/intelp2m/fields/test/suite.go b/util/intelp2m/fields/test/suite.go index a61062e..3041de2 100644 --- a/util/intelp2m/fields/test/suite.go +++ b/util/intelp2m/fields/test/suite.go @@ -29,13 +29,13 @@ t.Run(label, func(t *testing.T) { platform := snr.PlatformSpecific{} macro := common.GetInstanceMacro(platform, decoderIf) - dw0 := macro.Register(common.PAD_CFG_DW0) - dw1 := macro.Register(common.PAD_CFG_DW1) + dw0 := macro.GetRegisterDW0() + dw1 := macro.GetRegisterDW1() for _, tc := range suite { macro.Clear() macro.PadIdSet("").SetPadOwnership(tc.Ownership) - dw0.ValueSet(tc.DW0) - dw1.ValueSet(tc.DW1) + dw0.Value = tc.DW0 + dw1.Value = tc.DW1 macro.Fields.GenerateString() if err := tc.Check(macro.Get()); err != nil { t.Errorf("Test failed: %v", err) diff --git a/util/intelp2m/parser/template.go b/util/intelp2m/parser/template.go index e7efa73..49b938f 100644 --- a/util/intelp2m/parser/template.go +++ b/util/intelp2m/parser/template.go @@ -6,7 +6,7 @@ "unicode" ) -const INTSEL_MASK uint32 = 0xffffff00 +const IntSelMask uint32 = 0xffffff00 type template func(string, *string, *string, *uint32, *uint32) int @@ -57,7 +57,7 @@ *function += "/" + fields[i] } // clear RO Interrupt Select (INTSEL) - *dw1 &= INTSEL_MASK + *dw1 &= IntSelMask } return 0 } diff --git a/util/intelp2m/parser/template_test.go b/util/intelp2m/parser/template_test.go index 95f8ebf..9abdd72 100644 --- a/util/intelp2m/parser/template_test.go +++ b/util/intelp2m/parser/template_test.go @@ -30,9 +30,9 @@ } else if dw0 != ref_dw0 { t.Errorf("dw0 from '%s':\nExpects: '0x%08x'\nActually: '0x%08x'\n\n", line, ref_dw0, dw0) - } else if dw1 != (ref_dw1 & parser.INTSEL_MASK) { + } else if dw1 != (ref_dw1 & parser.IntSelMask) { t.Errorf("dw1 from '%s':\nExpects: '0x%08x'\nActually: '0x%08x'\n\n", - line, (ref_dw1 & parser.INTSEL_MASK), dw1) + line, (ref_dw1 & parser.IntSelMask), dw1) } }) } diff --git a/util/intelp2m/platforms/adl/macro.go b/util/intelp2m/platforms/adl/macro.go index 2c4b5d8..7c4f435 100644 --- a/util/intelp2m/platforms/adl/macro.go +++ b/util/intelp2m/platforms/adl/macro.go @@ -7,6 +7,7 @@ "review.coreboot.org/coreboot.git/util/intelp2m/fields" "review.coreboot.org/coreboot.git/util/intelp2m/platforms/cnl" "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common" + "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common/register/bi…" "review.coreboot.org/coreboot.git/util/intelp2m/platforms/snr" ) @@ -15,12 +16,6 @@ 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() @@ -43,22 +38,22 @@ 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, + dw0 := macro.GetRegisterDW0() + remapping := map[uint32]uint32{ + 0: (bits.RstCfgRSMRST << bits.DW0PadRstCfg), + 1: (bits.RstCfgDEEP << bits.DW0PadRstCfg), + 2: (bits.RstCfgPLTRST << bits.DW0PadRstCfg), + 3: (bits.RstCfgPWROK << bits.DW0PadRstCfg), } resetsrc, valid := remapping[dw0.GetResetConfig()] if valid { // dw0.SetResetConfig(resetsrc) - ResetConfigFieldVal := (dw0.ValueGet() & 0x3fffffff) | remapping[dw0.GetResetConfig()] - dw0.ValueSet(ResetConfigFieldVal) + ResetConfigFieldVal := (dw0.Value & 0x3fffffff) | remapping[dw0.GetResetConfig()] + dw0.Value = ResetConfigFieldVal } else { fmt.Println("Invalid Pad Reset Config [ 0x", resetsrc, " ] for ", macro.PadIdGet()) } - dw0.CntrMaskFieldsClear(common.PadRstCfgMask) + dw0.CntrMaskFieldsClear(0b11 << bits.DW0PadRstCfg) } // Adds The Pad Termination (TERM) parameter from PAD_CFG_DW1 to the macro @@ -88,11 +83,11 @@ } // GenMacro - generate pad macro -// dw0 : DW0 config register value -// dw1 : DW1 config register value +// dw0Val : DW0 config register value +// dw1Val : DW1 config register value // return: string of macro // error -func (PlatformSpecific) GenMacro(id string, dw0 uint32, dw1 uint32, ownership uint8) string { +func (PlatformSpecific) GenMacro(id string, dw0Val uint32, dw1Val uint32, ownership uint8) string { macro := common.GetInstanceMacro( PlatformSpecific{ InheritanceMacro: cnl.PlatformSpecific{ @@ -102,10 +97,17 @@ fields.InterfaceGet(), ) macro.Clear() - macro.Register(PAD_CFG_DW0).CntrMaskFieldsClear(common.AllFields) - macro.Register(PAD_CFG_DW1).CntrMaskFieldsClear(common.AllFields) + dw0 := macro.GetRegisterDW0() + dw0.CntrMaskFieldsClear(bits.All32) + + dw1 := macro.GetRegisterDW1() + dw1.CntrMaskFieldsClear(bits.All32) + + dw0.Value = dw0Val + dw1.Value = dw1Val + + dw0.ReadOnly = PAD_CFG_DW0_RO_FIELDS + dw1.ReadOnly = PAD_CFG_DW1_RO_FIELDS 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/apl/macro.go b/util/intelp2m/platforms/apl/macro.go index 6ed1eec..7b2ce63 100644 --- a/util/intelp2m/platforms/apl/macro.go +++ b/util/intelp2m/platforms/apl/macro.go @@ -7,6 +7,7 @@ "review.coreboot.org/coreboot.git/util/intelp2m/config/p2m" "review.coreboot.org/coreboot.git/util/intelp2m/fields" "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common" + "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common/register/bi…" ) const ( @@ -15,12 +16,6 @@ ) const ( - PAD_CFG_DW0 = common.PAD_CFG_DW0 - PAD_CFG_DW1 = common.PAD_CFG_DW1 - MAX_DW_NUM = common.MAX_DW_NUM -) - -const ( PULL_NONE = 0x0 // 0 000: none PULL_DN_5K = 0x2 // 0 010: 5k wpd (Only available on SMBus GPIOs) PULL_DN_20K = 0x4 // 0 100: 20k wpd @@ -42,8 +37,8 @@ // return: macro func (PlatformSpecific) Pull() { macro := common.GetMacro() - dw1 := macro.Register(PAD_CFG_DW1) - var pull = map[uint8]string{ + dw1 := macro.GetRegisterDW1() + var pull = map[uint32]string{ PULL_NONE: "NONE", PULL_DN_5K: "DN_5K", PULL_DN_20K: "DN_20K", @@ -53,10 +48,9 @@ PULL_UP_667: "UP_667", PULL_NATIVE: "NATIVE", } - terminationFieldValue := dw1.GetTermination() - str, valid := pull[terminationFieldValue] - if !valid { - str = strconv.Itoa(int(terminationFieldValue)) + str, exist := pull[dw1.GetTermination()] + if !exist { + str = strconv.Itoa(int(dw1.GetTermination())) fmt.Println("Error", macro.PadIdGet(), " invalid TERM value = ", str) } macro.Separator().Add(str) @@ -65,8 +59,8 @@ // Generate macro to cause peripheral IRQ when configured in GPIO input mode func ioApicRoute() bool { macro := common.GetMacro() - dw0 := macro.Register(PAD_CFG_DW0) - dw1 := macro.Register(PAD_CFG_DW1) + dw0 := macro.GetRegisterDW0() + dw1 := macro.GetRegisterDW1() if dw0.GetGPIOInputRouteIOxAPIC() == 0 { return false } @@ -86,7 +80,7 @@ // Generate macro to cause NMI when configured in GPIO input mode func nmiRoute() bool { macro := common.GetMacro() - if macro.Register(PAD_CFG_DW0).GetGPIOInputRouteNMI() == 0 { + if macro.GetRegisterDW0().GetGPIOInputRouteNMI() == 0 { return false } // e.g. PAD_CFG_GPI_NMI(GPIO_24, UP_20K, DEEP, LEVEL, INVERT), @@ -97,8 +91,8 @@ // Generate macro to cause SCI when configured in GPIO input mode func sciRoute() bool { macro := common.GetMacro() - dw0 := macro.Register(PAD_CFG_DW0) - dw1 := macro.Register(PAD_CFG_DW0) + dw0 := macro.GetRegisterDW0() + dw1 := macro.GetRegisterDW1() if dw0.GetGPIOInputRouteSCI() == 0 { return false } @@ -120,8 +114,8 @@ // Generate macro to cause SMI when configured in GPIO input mode func smiRoute() bool { macro := common.GetMacro() - dw0 := macro.Register(PAD_CFG_DW0) - dw1 := macro.Register(PAD_CFG_DW1) + dw0 := macro.GetRegisterDW0() + dw1 := macro.GetRegisterDW1() if dw0.GetGPIOInputRouteSMI() == 0 { return false } @@ -159,7 +153,7 @@ switch config, argc := p2m.SettingsGet(), len(ids); argc { case 0: - dw1 := macro.Register(PAD_CFG_DW1) + dw1 := macro.GetRegisterDW1() isIOStandbyStateUsed := dw1.GetIOStandbyState() != 0 isIOStandbyTerminationUsed := dw1.GetIOStandbyTermination() != 0 if isIOStandbyStateUsed && !isIOStandbyTerminationUsed { @@ -189,15 +183,15 @@ default: // Clear the control mask so that the check fails and "Advanced" macro is // generated - macro.Register(PAD_CFG_DW0).CntrMaskFieldsClear(common.AllFields) + macro.GetRegisterDW0().CntrMaskFieldsClear(bits.All32) } } // Adds PAD_CFG_GPO macro with arguments func (PlatformSpecific) GpoMacroAdd() { macro := common.GetMacro() - dw0 := macro.Register(PAD_CFG_DW0) - dw1 := macro.Register(PAD_CFG_DW1) + dw0 := macro.GetRegisterDW0() + dw1 := macro.GetRegisterDW1() term := dw1.GetTermination() macro.Set("PAD_CFG") @@ -219,22 +213,22 @@ } macro.Add("),") - if dw0.GetRXLevelEdgeConfiguration() != common.TRIG_OFF { + if dw0.GetRXLevelEdgeConfiguration() != bits.TrigOFF { // ignore if trig = OFF is not set - dw0.CntrMaskFieldsClear(common.RxLevelEdgeConfigurationMask) + dw0.CntrMaskFieldsClear(bits.DW0[bits.DW0RxLevelEdgeConfiguration]) } } // Adds PAD_CFG_NF macro with arguments func (PlatformSpecific) NativeFunctionMacroAdd() { macro := common.GetMacro() - dw1 := macro.Register(PAD_CFG_DW1) + dw1 := macro.GetRegisterDW1() isIOStandbyStateUsed := dw1.GetIOStandbyState() != 0 isIOStandbyTerminationUsed := dw1.GetIOStandbyTermination() != 0 macro.Set("PAD_CFG_NF") if !isIOStandbyTerminationUsed && isIOStandbyStateUsed { - if dw1.GetIOStandbyState() == common.StandbyIgnore { + if dw1.GetIOStandbyState() == bits.IOStateStandbyIgnore { // PAD_CFG_NF_IOSTANDBY_IGNORE(PMU_SLP_S0_B, NONE, DEEP, NF1), macro.Add("_IOSTANDBY_IGNORE(").Id().Pull().Rstsrc().Padfn() } else { @@ -250,27 +244,26 @@ } macro.Add("),") - if dw0 := macro.Register(PAD_CFG_DW0); dw0.GetGPIORxTxDisableStatus() != 0 { + if dw0 := macro.GetRegisterDW0(); dw0.GetGPIORxTxDisableStatus() != 0 { // Since the bufbis parameter will be ignored for NF, we should clear // the corresponding bits in the control mask. - dw0.CntrMaskFieldsClear(common.RxTxBufDisableMask) + dw0.CntrMaskFieldsClear(bits.DW0[bits.DW0RxTxBufDisable]) } } // Adds PAD_NC macro func (PlatformSpecific) NoConnMacroAdd() { macro := common.GetMacro() - dw1 := macro.Register(PAD_CFG_DW1) - if dw1.GetIOStandbyState() == common.TxDRxE { - dw0 := macro.Register(PAD_CFG_DW0) + dw0, dw1 := macro.GetRegisterDW0(), macro.GetRegisterDW1() + if dw1.GetIOStandbyState() == bits.IOStateTxDRxE { // See comments in sunrise/macro.go : NoConnMacroAdd() - if dw0.GetRXLevelEdgeConfiguration() != common.TRIG_OFF { - dw0.CntrMaskFieldsClear(common.RxLevelEdgeConfigurationMask) + if dw0.GetRXLevelEdgeConfiguration() != bits.TrigOFF { + dw0.CntrMaskFieldsClear(bits.DW0[bits.DW0RxLevelEdgeConfiguration]) } if dw0.GetResetConfig() != 1 { // 1 = RST_DEEP - dw0.CntrMaskFieldsClear(common.PadRstCfgMask) + dw0.CntrMaskFieldsClear(bits.DW0[bits.DW0PadRstCfg]) } // PAD_NC(OSC_CLK_OUT_1, DN_20K) @@ -287,17 +280,24 @@ } // GenMacro - generate pad macro -// dw0 : DW0 config register value -// dw1 : DW1 config register value +// dw0Val : DW0 config register value +// dw1Val : DW1 config register value // return: string of macro // error -func (PlatformSpecific) GenMacro(id string, dw0 uint32, dw1 uint32, ownership uint8) string { +func (PlatformSpecific) GenMacro(id string, dw0Val uint32, dw1Val uint32, ownership uint8) string { macro := common.GetInstanceMacro(PlatformSpecific{}, fields.InterfaceGet()) - // use platform-specific interface in Macro struct + macro.Clear() + dw0 := macro.GetRegisterDW0() + dw0.CntrMaskFieldsClear(bits.All32) + + dw1 := macro.GetRegisterDW1() + dw1.CntrMaskFieldsClear(bits.All32) + + dw0.Value = dw0Val + dw1.Value = dw1Val + + dw0.ReadOnly = PAD_CFG_DW0_RO_FIELDS + dw1.ReadOnly = PAD_CFG_DW1_RO_FIELDS macro.PadIdSet(id).SetPadOwnership(ownership) - macro.Register(PAD_CFG_DW0).CntrMaskFieldsClear(common.AllFields) - macro.Register(PAD_CFG_DW0).CntrMaskFieldsClear(common.AllFields) - 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/cnl/macro.go b/util/intelp2m/platforms/cnl/macro.go index 08574de..0d2ba46 100644 --- a/util/intelp2m/platforms/cnl/macro.go +++ b/util/intelp2m/platforms/cnl/macro.go @@ -7,6 +7,7 @@ "review.coreboot.org/coreboot.git/util/intelp2m/config/p2m" "review.coreboot.org/coreboot.git/util/intelp2m/fields" "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common" + "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common/register/bi…" "review.coreboot.org/coreboot.git/util/intelp2m/platforms/snr" ) @@ -15,12 +16,6 @@ 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 { GpoMacroAdd() NativeFunctionMacroAdd() @@ -44,29 +39,30 @@ 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, + dw0 := macro.GetRegisterDW0() + var remapping = map[uint32]uint32{ + 0: bits.RstCfgRSMRST << bits.DW0PadRstCfg, + 1: bits.RstCfgDEEP << bits.DW0PadRstCfg, + 2: bits.RstCfgPLTRST << bits.DW0PadRstCfg, } resetsrc, valid := remapping[dw0.GetResetConfig()] if valid { // dw0.SetResetConfig(resetsrc) - ResetConfigFieldVal := (dw0.ValueGet() & 0x3fffffff) | remapping[dw0.GetResetConfig()] - dw0.ValueSet(ResetConfigFieldVal) + ResetConfigFieldVal := (dw0.Value & 0x3fffffff) | remapping[dw0.GetResetConfig()] + dw0.Value = ResetConfigFieldVal } else { fmt.Println("Invalid Pad Reset Config [ 0x", resetsrc, " ] for ", macro.PadIdGet()) } - dw0.CntrMaskFieldsClear(common.PadRstCfgMask) + mask := bits.DW0[bits.DW0PadRstCfg] + dw0.CntrMaskFieldsClear(mask) } // Adds The Pad Termination (TERM) parameter from PAD_CFG_DW1 to the macro // as a new argument func (PlatformSpecific) Pull() { macro := common.GetMacro() - dw1 := macro.Register(PAD_CFG_DW1) - var pull = map[uint8]string{ + dw1 := macro.GetRegisterDW1() + var pull = map[uint32]string{ 0x0: "NONE", 0x2: "DN_5K", 0x4: "DN_20K", @@ -91,7 +87,7 @@ // Generate macro to cause peripheral IRQ when configured in GPIO input mode func ioApicRoute() bool { macro := common.GetMacro() - dw0 := macro.Register(PAD_CFG_DW0) + dw0 := macro.GetRegisterDW0() if dw0.GetGPIOInputRouteIOxAPIC() == 0 { return false } @@ -105,7 +101,7 @@ // Generate macro to cause NMI when configured in GPIO input mode func nmiRoute() bool { macro := common.GetMacro() - if macro.Register(PAD_CFG_DW0).GetGPIOInputRouteNMI() == 0 { + if macro.GetRegisterDW0().GetGPIOInputRouteNMI() == 0 { return false } // PAD_CFG_GPI_NMI(GPIO_24, UP_20K, DEEP, LEVEL, INVERT), @@ -116,8 +112,7 @@ // Generate macro to cause SCI when configured in GPIO input mode func sciRoute() bool { macro := common.GetMacro() - dw0 := macro.Register(PAD_CFG_DW0) - if dw0.GetGPIOInputRouteSCI() == 0 { + if macro.GetRegisterDW0().GetGPIOInputRouteSCI() == 0 { return false } // PAD_CFG_GPI_SCI(pad, pull, rst, trig, inv) @@ -128,8 +123,8 @@ // Generate macro to cause SMI when configured in GPIO input mode func smiRoute() bool { macro := common.GetMacro() - dw0 := macro.Register(PAD_CFG_DW0) - if dw0.GetGPIOInputRouteSMI() == 0 { + + if macro.GetRegisterDW0().GetGPIOInputRouteSMI() == 0 { return false } // PAD_CFG_GPI_SMI(pad, pull, rst, trig, inv) @@ -175,7 +170,7 @@ default: // Clear the control mask so that the check fails and "Advanced" macro is // generated - macro.Register(PAD_CFG_DW0).CntrMaskFieldsClear(common.AllFields) + macro.GetRegisterDW0().CntrMaskFieldsClear(bits.All32) } } @@ -195,18 +190,29 @@ } // GenMacro - generate pad macro -// dw0 : DW0 config register value -// dw1 : DW1 config register value +// dw0Val : DW0 config register value +// dw1Val : 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: snr.PlatformSpecific{}}, - fields.InterfaceGet()) +func (PlatformSpecific) GenMacro(id string, dw0Val uint32, dw1Val uint32, ownership uint8) string { + macro := common.GetInstanceMacro( + PlatformSpecific{ + InheritanceMacro: snr.PlatformSpecific{}, + }, + fields.InterfaceGet(), + ) macro.Clear() - macro.Register(PAD_CFG_DW0).CntrMaskFieldsClear(common.AllFields) - macro.Register(PAD_CFG_DW0).CntrMaskFieldsClear(common.AllFields) + dw0 := macro.GetRegisterDW0() + dw0.CntrMaskFieldsClear(bits.All32) + + dw1 := macro.GetRegisterDW1() + dw1.CntrMaskFieldsClear(bits.All32) + + dw0.Value = dw0Val + dw1.Value = dw1Val + + dw0.ReadOnly = PAD_CFG_DW0_RO_FIELDS + dw1.ReadOnly = PAD_CFG_DW1_RO_FIELDS 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/common/macro.go b/util/intelp2m/platforms/common/macro.go index 02cbed9..0acede3 100644 --- a/util/intelp2m/platforms/common/macro.go +++ b/util/intelp2m/platforms/common/macro.go @@ -1,10 +1,13 @@ package common import ( + "fmt" "strconv" "sync" "review.coreboot.org/coreboot.git/util/intelp2m/config/p2m" + "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common/register" + "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common/register/bi…" ) type Fields interface { @@ -18,41 +21,6 @@ PAD_OWN_DRIVER = 1 ) -const ( - TxLASTRxE = 0x0 - Tx0RxDCRx0 = 0x1 - Tx0RxDCRx1 = 0x2 - Tx1RxDCRx0 = 0x3 - Tx1RxDCRx1 = 0x4 - Tx0RxE = 0x5 - Tx1RxE = 0x6 - HIZCRx0 = 0x7 - HIZCRx1 = 0x8 - TxDRxE = 0x9 - StandbyIgnore = 0xf -) - -const ( - IOSTERM_SAME = 0x0 - IOSTERM_DISPUPD = 0x1 - IOSTERM_ENPD = 0x2 - IOSTERM_ENPU = 0x3 -) - -const ( - TRIG_LEVEL = 0 - TRIG_EDGE_SINGLE = 1 - TRIG_OFF = 2 - TRIG_EDGE_BOTH = 3 -) - -const ( - RST_PWROK = 0 - RST_DEEP = 1 - RST_PLTRST = 2 - RST_RSMRST = 3 -) - // PlatformSpecific - platform-specific interface type PlatformSpecific interface { RemmapRstSrc() @@ -70,7 +38,8 @@ // Reg : structure of configuration register values and their masks type Macro struct { Platform PlatformSpecific - Reg [MAX_DW_NUM]Register + DW0 register.DW0 + DW1 register.DW1 padID string str string ownership uint8 @@ -110,10 +79,12 @@ return macro.ownership == PAD_OWN_DRIVER } -// returns <Register> data configuration structure -// number : register number -func (macro *Macro) Register(number uint8) *Register { - return &macro.Reg[number] +func (macro *Macro) GetRegisterDW0() *register.DW0 { + return &macro.DW0 +} + +func (macro *Macro) GetRegisterDW1() *register.DW1 { + return &macro.DW1 } // add a string to macro @@ -158,14 +129,18 @@ // Adds the PADRSTCFG parameter from DW0 to the macro as a new argument // return: Macro func (macro *Macro) Rstsrc() *Macro { - dw0 := macro.Register(PAD_CFG_DW0) - var resetsrc = map[uint8]string{ - 0: "PWROK", - 1: "DEEP", - 2: "PLTRST", - 3: "RSMRST", + dw0 := macro.GetRegisterDW0() + resetsrc := map[uint32]string{ + 0b00: "PWROK", + 0b01: "DEEP", + 0b10: "PLTRST", + 0b11: "RSMRST", } - return macro.Separator().Add(resetsrc[dw0.GetResetConfig()]) + source, exist := resetsrc[dw0.GetResetConfig()] + if !exist { + source = "ERROR" + } + return macro.Separator().Add(source) } // Adds The Pad Termination (TERM) parameter from DW1 to the macro as a new argument @@ -178,44 +153,51 @@ // Adds Pad GPO value to macro string as a new argument // return: Macro func (macro *Macro) Val() *Macro { - dw0 := macro.Register(PAD_CFG_DW0) + dw0 := macro.GetRegisterDW0() return macro.Separator().Add(strconv.Itoa(int(dw0.GetGPIOTXState()))) } // Adds Pad GPO value to macro string as a new argument // return: Macro func (macro *Macro) Trig() *Macro { - dw0 := macro.Register(PAD_CFG_DW0) - var trig = map[uint8]string{ - 0x0: "LEVEL", - 0x1: "EDGE_SINGLE", - 0x2: "OFF", - 0x3: "EDGE_BOTH", + dw0 := macro.GetRegisterDW0() + trig := map[uint32]string{ + 0b00: "LEVEL", + 0b01: "EDGE_SINGLE", + 0b10: "OFF", + 0b11: "EDGE_BOTH", } - return macro.Separator().Add(trig[dw0.GetRXLevelEdgeConfiguration()]) + level, exist := trig[dw0.GetRXLevelEdgeConfiguration()] + if !exist { + level = "ERROR" + } + return macro.Separator().Add(level) } // Adds Pad Polarity Inversion Stage (RXINV) to macro string as a new argument // return: Macro func (macro *Macro) Invert() *Macro { - macro.Separator() - if macro.Register(PAD_CFG_DW0).GetRxInvert() != 0 { - return macro.Add("INVERT") + if macro.GetRegisterDW0().GetRxInvert() != 0 { + return macro.Separator().Add("INVERT") } - return macro.Add("NONE") + return macro.Separator().Add("NONE") } // Adds input/output buffer state // return: Macro func (macro *Macro) Bufdis() *Macro { - var buffDisStat = map[uint8]string{ - 0x0: "NO_DISABLE", // both buffers are enabled - 0x1: "TX_DISABLE", // output buffer is disabled - 0x2: "RX_DISABLE", // input buffer is disabled - 0x3: "TX_RX_DISABLE", // both buffers are disabled + dw0 := macro.GetRegisterDW0() + states := map[uint32]string{ + 0b00: "NO_DISABLE", // both buffers are enabled + 0b01: "TX_DISABLE", // output buffer is disabled + 0b10: "RX_DISABLE", // input buffer is disabled + 0b11: "TX_RX_DISABLE", // both buffers are disabled } - state := macro.Register(PAD_CFG_DW0).GetGPIORxTxDisableStatus() - return macro.Separator().Add(buffDisStat[state]) + state, exist := states[dw0.GetGPIORxTxDisableStatus()] + if !exist { + state = "ERROR" + } + return macro.Separator().Add(state) } // Adds macro to set the host software ownership @@ -230,10 +212,9 @@ //Adds pad native function (PMODE) as a new argument //return: Macro func (macro *Macro) Padfn() *Macro { - dw0 := macro.Register(PAD_CFG_DW0) - nfnum := int(dw0.GetPadMode()) - if nfnum != 0 { - return macro.Separator().Add("NF" + strconv.Itoa(nfnum)) + dw0 := macro.GetRegisterDW0() + if number := dw0.GetPadMode(); number != 0 { + return macro.Separator().Add(fmt.Sprintf("NF%d", number)) } // GPIO used only for PAD_FUNC(x) macro return macro.Add("GPIO") @@ -242,44 +223,49 @@ // Add a line to the macro that defines IO Standby State // return: macro func (macro *Macro) IOSstate() *Macro { - var stateMacro = map[uint8]string{ - TxLASTRxE: "TxLASTRxE", - Tx0RxDCRx0: "Tx0RxDCRx0", - Tx0RxDCRx1: "Tx0RxDCRx1", - Tx1RxDCRx0: "Tx1RxDCRx0", - Tx1RxDCRx1: "Tx1RxDCRx1", - Tx0RxE: "Tx0RxE", - Tx1RxE: "Tx1RxE", - HIZCRx0: "HIZCRx0", - HIZCRx1: "HIZCRx1", - TxDRxE: "TxDRxE", - StandbyIgnore: "IGNORE", + states := map[uint32]string{ + bits.IOStateTxLASTRxE: "TxLASTRxE", + bits.IOStateTx0RxDCRx0: "Tx0RxDCRx0", + bits.IOStateTx0RxDCRx1: "Tx0RxDCRx1", + bits.IOStateTx1RxDCRx0: "Tx1RxDCRx0", + bits.IOStateTx1RxDCRx1: "Tx1RxDCRx1", + bits.IOStateTx0RxE: "Tx0RxE", + bits.IOStateTx1RxE: "Tx1RxE", + bits.IOStateHIZCRx0: "HIZCRx0", + bits.IOStateHIZCRx1: "HIZCRx1", + bits.IOStateTxDRxE: "TxDRxE", + bits.IOStateStandbyIgnore: "IGNORE", } - dw1 := macro.Register(PAD_CFG_DW1) - str, valid := stateMacro[dw1.GetIOStandbyState()] - if !valid { + dw1 := macro.GetRegisterDW1() + state, exist := states[dw1.GetIOStandbyState()] + if !exist { // ignore setting for incorrect value - str = "IGNORE" + state = "ERROR" } - return macro.Separator().Add(str) + return macro.Separator().Add(state) } // Add a line to the macro that defines IO Standby Termination // return: macro func (macro *Macro) IOTerm() *Macro { - var ioTermMacro = map[uint8]string{ - IOSTERM_SAME: "SAME", - IOSTERM_DISPUPD: "DISPUPD", - IOSTERM_ENPD: "ENPD", - IOSTERM_ENPU: "ENPU", + dw1 := macro.GetRegisterDW1() + terminations := map[uint32]string{ + bits.IOTermSAME: "SAME", + bits.IOTermDISPUPD: "DISPUPD", + bits.IOTermENPD: "ENPD", + bits.IOTermENPU: "ENPU", } - dw1 := macro.Register(PAD_CFG_DW1) - return macro.Separator().Add(ioTermMacro[dw1.GetIOStandbyTermination()]) + termination, exist := terminations[dw1.GetIOStandbyTermination()] + if !exist { + termination = "ERROR" + } + return macro.Separator().Add(termination) } // Check created macro func (macro *Macro) check() *Macro { - if !macro.Register(PAD_CFG_DW0).MaskCheck() { + dw0 := macro.GetRegisterDW0() + if !dw0.MaskCheck() { return macro.GenerateFields() } return macro @@ -293,35 +279,42 @@ return macro } -// DecodeIgnored - Add info about ignored field mask -// reg : PAD_CFG_DW0 or PAD_CFG_DW1 register -func (macro *Macro) DecodeIgnored(reg uint8) *Macro { - var decode = map[uint8]func(){ - PAD_CFG_DW0: macro.Fields.DecodeDW0, - PAD_CFG_DW1: macro.Fields.DecodeDW1, - } - decodefn, valid := decode[reg] - if !valid || p2m.SettingsGet().Field == p2m.FspFlds { +func (macro *Macro) DecodeIgnoredFieldsDW0() *Macro { + if p2m.SettingsGet().Field == p2m.FspFlds { return macro } - dw := macro.Register(reg) - ignored := dw.IgnoredFieldsGet() - if ignored != 0 { - temp := dw.ValueGet() - dw.ValueSet(ignored) - regnum := strconv.Itoa(int(reg)) - macro.Add("/* DW" + regnum + ": ") - decodefn() + dw0 := macro.GetRegisterDW0() + if ignored := dw0.IgnoredFieldsGet(); ignored != 0 { + saved := dw0.Value + dw0.Value = ignored + macro.Add("/* DW0: ") + macro.Fields.DecodeDW0() macro.Add(" - IGNORED */\n\t") - dw.ValueSet(temp) + dw0.Value = saved + } + return macro +} + +func (macro *Macro) DecodeIgnoredFieldsDW1() *Macro { + if p2m.SettingsGet().Field == p2m.FspFlds { + return macro + } + dw1 := macro.GetRegisterDW1() + if ignored := dw1.IgnoredFieldsGet(); ignored != 0 { + saved := dw1.Value + dw1.Value = ignored + macro.Add("/* DW0: ") + macro.DecodeDW1() + macro.Add(" - IGNORED */\n\t") + dw1.Value = saved } return macro } // GenerateFields - generate bitfield macros func (macro *Macro) GenerateFields() *Macro { - dw0 := macro.Register(PAD_CFG_DW0) - dw1 := macro.Register(PAD_CFG_DW1) + dw0 := macro.GetRegisterDW0() + dw1 := macro.GetRegisterDW1() // Get mask of ignored bit fields. dw0Ignored := dw0.IgnoredFieldsGet() @@ -336,7 +329,8 @@ reference := macro.Get() macro.Clear() /* DW0 : PAD_TRIG(OFF) | PAD_BUF(RX_DISABLE) | 1 - IGNORED */ - macro.DecodeIgnored(PAD_CFG_DW0).DecodeIgnored(PAD_CFG_DW1) + macro.DecodeIgnoredFieldsDW0() + macro.DecodeIgnoredFieldsDW1() if config.GenLevel >= 4 { /* PAD_CFG_NF(GPP_B23, 20K_PD, PLTRST, NF2), */ macro.Add("/* ").Add(reference).Add(" */\n\t") @@ -345,11 +339,11 @@ if config.IgnoredFields { // Consider bit fields that should be ignored when regenerating // advansed macros - var tempVal uint32 = dw0.ValueGet() & ^dw0Ignored - dw0.ValueSet(tempVal) + tempVal := dw0.Value & ^dw0Ignored + dw0.Value = tempVal - tempVal = dw1.ValueGet() & ^dw1Ignored - dw1.ValueSet(tempVal) + tempVal = dw1.Value & ^dw1Ignored + dw1.Value = tempVal } macro.Fields.GenerateString() @@ -358,7 +352,7 @@ // Generate macro for bi-directional GPIO port func (macro *Macro) Bidirection() { - dw1 := macro.Register(PAD_CFG_DW1) + dw1 := macro.GetRegisterDW1() ios := dw1.GetIOStandbyState() != 0 || dw1.GetIOStandbyTermination() != 0 macro.Set("PAD_CFG_GPIO_BIDIRECT") if ios { @@ -373,19 +367,15 @@ macro.Own().Add("),") } -const ( - rxDisable uint8 = 0x2 - txDisable uint8 = 0x1 -) - // Gets base string of current macro // return: string of macro func (macro *Macro) Generate() string { - dw0 := macro.Register(PAD_CFG_DW0) + const rxDisable uint32 = 0x2 + const txDisable uint32 = 0x1 macro.Platform.RemmapRstSrc() macro.Set("PAD_CFG") - if dw0.GetPadMode() == 0 { + if dw0 := macro.GetRegisterDW0(); dw0.GetPadMode() == 0 { // GPIO switch dw0.GetGPIORxTxDisableStatus() { case txDisable: @@ -414,7 +404,9 @@ if !config.AutoCheck { body := macro.Get() if config.GenLevel >= 3 { - macro.Clear().DecodeIgnored(PAD_CFG_DW0).DecodeIgnored(PAD_CFG_DW1) + macro.Clear() + macro.DecodeIgnoredFieldsDW0() + macro.DecodeIgnoredFieldsDW1() comment := macro.Get() if config.GenLevel >= 4 { macro.Clear().Add("/* ") diff --git a/util/intelp2m/platforms/common/register.go b/util/intelp2m/platforms/common/register.go deleted file mode 100644 index 2aa51b9..0000000 --- a/util/intelp2m/platforms/common/register.go +++ /dev/null @@ -1,262 +0,0 @@ -package common - -// Bit field constants for PAD_CFG_DW0 register -const ( - AllFields uint32 = 0xffffffff - - PadRstCfgShift uint8 = 30 - PadRstCfgMask uint32 = 0x3 << PadRstCfgShift - - RxPadStateSelectShift uint8 = 29 - RxPadStateSelectMask uint32 = 0x1 << RxPadStateSelectShift - - RxRawOverrideTo1Shift uint8 = 28 - RxRawOverrideTo1Mask uint32 = 0x1 << RxRawOverrideTo1Shift - - RxLevelEdgeConfigurationShift uint8 = 25 - RxLevelEdgeConfigurationMask uint32 = 0x3 << RxLevelEdgeConfigurationShift - - RxInvertShift uint8 = 23 - RxInvertMask uint32 = 0x1 << RxInvertShift - - RxTxEnableConfigShift uint8 = 21 - RxTxEnableConfigMask uint32 = 0x3 << RxTxEnableConfigShift - - InputRouteIOxApicShift uint8 = 20 - InputRouteIOxApicMask uint32 = 0x1 << InputRouteIOxApicShift - - InputRouteSCIShift uint8 = 19 - InputRouteSCIMask uint32 = 0x1 << InputRouteSCIShift - - InputRouteSMIShift uint8 = 18 - InputRouteSMIMask uint32 = 0x1 << InputRouteSMIShift - - InputRouteNMIShift uint8 = 17 - InputRouteNMIMask uint32 = 0x1 << InputRouteNMIShift - - PadModeShift uint8 = 10 - PadModeMask uint32 = 0x7 << PadModeShift - - RxTxBufDisableShift uint8 = 8 - RxTxBufDisableMask uint32 = 0x3 << RxTxBufDisableShift - - RxStateShift uint8 = 1 - RxStateMask uint32 = 0x1 << RxStateShift - - TxStateMask uint32 = 0x1 -) - -// config DW registers -const ( - PAD_CFG_DW0 = 0 - PAD_CFG_DW1 = 1 - MAX_DW_NUM = 2 -) - -// Register - configuration data structure based on DW0/1 dw value -// value : register value -// mask : bit fileds mask -// roFileds : read only fields mask -type Register struct { - value uint32 - mask uint32 - roFileds uint32 -} - -func (reg *Register) ValueSet(value uint32) *Register { - reg.value = value - return reg -} - -func (reg *Register) ValueGet() uint32 { - return reg.value -} - -func (reg *Register) ReadOnlyFieldsSet(fileldMask uint32) *Register { - reg.roFileds = fileldMask - return reg -} - -func (reg *Register) ReadOnlyFieldsGet() uint32 { - return reg.roFileds -} - -// Check the mask of the new macro -// Returns true if the macro is generated correctly -func (reg *Register) MaskCheck() bool { - mask := ^(reg.mask | reg.roFileds) - return reg.value&mask == 0 -} - -// getResetConfig - get Reset Configuration from PADRSTCFG field in PAD_CFG_DW0_GPx register -func (reg *Register) getFieldVal(mask uint32, shift uint8) uint8 { - reg.mask |= mask - return uint8((reg.value & mask) >> shift) -} - -// CntrMaskFieldsClear - clear filed in control mask -// fieldMask - mask of the field to be cleared -func (reg *Register) CntrMaskFieldsClear(fieldMask uint32) { - reg.mask &= ^fieldMask; -} - -// IgnoredFieldsGet - return mask of unchecked (ignored) fields. -// These bit fields were not read when the macro was -// generated. -// return -// mask of ignored bit field -func (reg *Register) IgnoredFieldsGet() uint32 { - mask := reg.mask | reg.roFileds - return reg.value & ^mask -} - -// getResetConfig - returns type reset source for corresponding pad -// PADRSTCFG field in PAD_CFG_DW0 register -func (reg *Register) GetResetConfig() uint8 { - return reg.getFieldVal(PadRstCfgMask, PadRstCfgShift) -} - -// getRXPadStateSelect - returns RX Pad State (RXINV) -// 0 = Raw RX pad state directly from RX buffer -// 1 = Internal RX pad state -func (reg *Register) GetRXPadStateSelect() uint8 { - return reg.getFieldVal(RxPadStateSelectMask, RxPadStateSelectShift) -} - -// getRXRawOverrideStatus - returns 1 if the selected pad state is being -// overridden to '1' (RXRAW1 field) -func (reg *Register) GetRXRawOverrideStatus() uint8 { - return reg.getFieldVal(RxRawOverrideTo1Mask, RxRawOverrideTo1Shift) -} - -// getRXLevelEdgeConfiguration - returns RX Level/Edge Configuration (RXEVCFG) -// 0h = Level, 1h = Edge, 2h = Drive '0', 3h = Reserved (implement as setting 0h) -func (reg *Register) GetRXLevelEdgeConfiguration() uint8 { - return reg.getFieldVal(RxLevelEdgeConfigurationMask, RxLevelEdgeConfigurationShift) -} - -// GetRxInvert - returns RX Invert state (RXINV) -// 1 - Inversion, 0 - No inversion -func (reg *Register) GetRxInvert() uint8 { - return reg.getFieldVal(RxInvertMask, RxInvertShift) -} - -// getRxTxEnableConfig - returns RX/TX Enable Config (RXTXENCFG) -// 0 = Function defined in Pad Mode controls TX and RX Enables -// 1 = Function controls TX Enable and RX Disabled with RX drive 0 internally -// 2 = Function controls TX Enable and RX Disabled with RX drive 1 internally -// 3 = Function controls TX Enabled and RX is always enabled -func (reg *Register) GetRxTxEnableConfig() uint8 { - return reg.getFieldVal(RxTxEnableConfigMask, RxTxEnableConfigShift) -} - -// getGPIOInputRouteIOxAPIC - returns 1 if the pad can be routed to cause -// peripheral IRQ when configured in GPIO input mode. -func (reg *Register) GetGPIOInputRouteIOxAPIC() uint8 { - return reg.getFieldVal(InputRouteIOxApicMask, InputRouteIOxApicShift) -} - -// getGPIOInputRouteSCI - returns 1 if the pad can be routed to cause SCI when -// configured in GPIO input mode. -func (reg *Register) GetGPIOInputRouteSCI() uint8 { - return reg.getFieldVal(InputRouteSCIMask, InputRouteSCIShift) -} - -// getGPIOInputRouteSMI - returns 1 if the pad can be routed to cause SMI when -// configured in GPIO input mode -func (reg *Register) GetGPIOInputRouteSMI() uint8 { - return reg.getFieldVal(InputRouteSMIMask, InputRouteSMIShift) -} - -// getGPIOInputRouteNMI - returns 1 if the pad can be routed to cause NMI when -// configured in GPIO input mode -func (reg *Register) GetGPIOInputRouteNMI() uint8 { - return reg.getFieldVal(InputRouteNMIMask, InputRouteNMIShift) -} - -// getPadMode - reutrns pad mode or one of the native functions -// 0h = GPIO control the Pad. -// 1h = native function 1, if applicable, controls the Pad -// 2h = native function 2, if applicable, controls the Pad -// 3h = native function 3, if applicable, controls the Pad -// 4h = enable GPIO blink/PWM capability if applicable -func (reg *Register) GetPadMode() uint8 { - return reg.getFieldVal(PadModeMask, PadModeShift) -} - -// getGPIORxTxDisableStatus - returns GPIO RX/TX buffer state (GPIORXDIS | GPIOTXDIS) -// 0 - both are enabled, 1 - TX Disable, 2 - RX Disable, 3 - both are disabled -func (reg *Register) GetGPIORxTxDisableStatus() uint8 { - return reg.getFieldVal(RxTxBufDisableMask, RxTxBufDisableShift) -} - -// getGPIORXState - returns GPIO RX State (GPIORXSTATE) -func (reg *Register) GetGPIORXState() uint8 { - return reg.getFieldVal(RxStateMask, RxStateShift) -} - -// getGPIOTXState - returns GPIO TX State (GPIOTXSTATE) -func (reg *Register) GetGPIOTXState() uint8 { - return reg.getFieldVal(TxStateMask, 0) -} - -// Bit field constants for PAD_CFG_DW1 register -const ( - PadTolShift uint8 = 25 - PadTolMask uint32 = 0x1 << PadTolShift - - IOStandbyStateShift uint8 = 14 - IOStandbyStateMask uint32 = 0xF << IOStandbyStateShift - - TermShift uint8 = 10 - TermMask uint32 = 0xF << TermShift - - IOStandbyTerminationShift uint8 = 8 - IOStandbyTerminationMask uint32 = 0x3 << IOStandbyTerminationShift - - InterruptSelectMask uint32 = 0xFF -) - -// GetPadTol -func (reg *Register) GetPadTol() uint8 { - return reg.getFieldVal(PadTolMask, PadTolShift) -} - -// getIOStandbyState - return IO Standby State (IOSSTATE) -// 0 = Tx enabled driving last value driven, Rx enabled -// 1 = Tx enabled driving 0, Rx disabled and Rx driving 0 back to its controller internally -// 2 = Tx enabled driving 0, Rx disabled and Rx driving 1 back to its controller internally -// 3 = Tx enabled driving 1, Rx disabled and Rx driving 0 back to its controller internally -// 4 = Tx enabled driving 1, Rx disabled and Rx driving 1 back to its controller internally -// 5 = Tx enabled driving 0, Rx enabled -// 6 = Tx enabled driving 1, Rx enabled -// 7 = Hi-Z, Rx driving 0 back to its controller internally -// 8 = Hi-Z, Rx driving 1 back to its controller internally -// 9 = Tx disabled, Rx enabled -// 15 = IO-Standby is ignored for this pin (same as functional mode) -// Others reserved -func (reg *Register) GetIOStandbyState() uint8 { - return reg.getFieldVal(IOStandbyStateMask, IOStandbyStateShift) -} - -// getIOStandbyTermination - return IO Standby Termination (IOSTERM) -// 0 = Same as functional mode (no change) -// 1 = Disable Pull-up and Pull-down (no on-die termination) -// 2 = Enable Pull-down -// 3 = Enable Pull-up -func (reg *Register) GetIOStandbyTermination() uint8 { - return reg.getFieldVal(IOStandbyTerminationMask, IOStandbyTerminationShift) -} - -// getTermination - returns the pad termination state defines the different weak -// pull-up and pull-down settings that are supported by the buffer -// 0000 = none; 0010 = 5k PD; 0100 = 20k PD; 1010 = 5k PU; 1100 = 20k PU; -// 1111 = Native controller selected -func (reg *Register) GetTermination() uint8 { - return reg.getFieldVal(TermMask, TermShift) -} - -// getInterruptSelect - returns Interrupt Line number from the GPIO controller -func (reg *Register) GetInterruptSelect() uint8 { - return reg.getFieldVal(InterruptSelectMask, 0) -} diff --git a/util/intelp2m/platforms/common/register/bits/bits.go b/util/intelp2m/platforms/common/register/bits/bits.go new file mode 100644 index 0000000..a156e20 --- /dev/null +++ b/util/intelp2m/platforms/common/register/bits/bits.go @@ -0,0 +1,92 @@ +package bits + +type Offset uint8 + +const All32 uint32 = 0b11111111111111111111111111111111 + +const ( + DW0PadRstCfg Offset = 30 + DW0RxPadStateSelect Offset = 29 + DW0RxRawOverrideTo1 Offset = 28 + DW0RxLevelEdgeConfiguration Offset = 25 + DW0RxInvert Offset = 23 + DW0RxTxEnableConfig Offset = 21 + DW0InputRouteIOxApic Offset = 20 + DW0InputRouteSCI Offset = 19 + DW0InputRouteSMI Offset = 18 + DW0InputRouteNMI Offset = 17 + DW0PadMode Offset = 10 + DW0RxTxBufDisable Offset = 8 + DW0RxState Offset = 1 + DW0TxState Offset = 0 +) + +const ( + RstCfgPWROK = 0b00 + RstCfgDEEP = 0b01 + RstCfgPLTRST = 0b10 + RstCfgRSMRST = 0b11 +) + +const ( + TrigLEVEL = 0b00 + TrigEDGE_SINGLE = 0b01 + TrigOFF = 0b10 + TrigEDGE_BOTH = 0b11 +) + +type Fields map[Offset]uint32 + +var DW0 = Fields{ + DW0PadRstCfg: 0b11 << DW0PadRstCfg, + DW0RxPadStateSelect: 0b1 << DW0RxPadStateSelect, + DW0RxRawOverrideTo1: 0b1 << DW0RxRawOverrideTo1, + DW0RxLevelEdgeConfiguration: 0b11 << DW0RxLevelEdgeConfiguration, + DW0RxInvert: 0b1 << DW0RxInvert, + DW0RxTxEnableConfig: 0b11 << DW0RxTxEnableConfig, + DW0InputRouteIOxApic: 0b1 << DW0InputRouteIOxApic, + DW0InputRouteSCI: 0b1 << DW0InputRouteSCI, + DW0InputRouteSMI: 0b1 << DW0InputRouteSMI, + DW0InputRouteNMI: 0b1 << DW0InputRouteNMI, + DW0PadMode: 0b111 << DW0PadMode, + DW0RxTxBufDisable: 0b11 << DW0RxTxBufDisable, + DW0RxState: 0b1 << DW0RxState, + DW0TxState: 0b1 << DW0TxState, +} + +const ( + DW1PadTol Offset = 25 + DW1IOStandbyState Offset = 14 + DW1Term Offset = 10 + DW1IOStandbyTermination Offset = 8 + DW1InterruptSelect Offset = 0 +) + +const ( + IOStateTxLASTRxE = 0b0000 + IOStateTx0RxDCRx0 = 0b0001 + IOStateTx0RxDCRx1 = 0b0010 + IOStateTx1RxDCRx0 = 0b0011 + IOStateTx1RxDCRx1 = 0b0100 + IOStateTx0RxE = 0b0101 + IOStateTx1RxE = 0b0110 + IOStateHIZCRx0 = 0b0111 + IOStateHIZCRx1 = 0b1000 + IOStateTxDRxE = 0b1001 + IOStateStandbyIgnore = 0b1111 +) + +const ( + IOTermSAME = 0b00 + IOTermDISPUPD = 0b01 + IOTermENPD = 0b10 + IOTermENPU = 0b11 +) + +var DW1 = Fields{ + DW1PadTol: 0b1 << DW1PadTol, + DW1IOStandbyState: 0b1111 << DW1IOStandbyState, + DW1Term: 0b1111 << DW1Term, + DW1IOStandbyTermination: 0b11 << DW1IOStandbyTermination, + DW1InterruptSelect: 0b11111111 << DW1InterruptSelect, +} diff --git a/util/intelp2m/platforms/common/register/dw0.go b/util/intelp2m/platforms/common/register/dw0.go new file mode 100644 index 0000000..4c264c3 --- /dev/null +++ b/util/intelp2m/platforms/common/register/dw0.go @@ -0,0 +1,101 @@ +package register + +import "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common/register/bi…" + +type DW0 struct { + Register +} + +func (dw0 DW0) GetBitfield() bits.Fields { + return bits.DW0 +} + +// getResetConfig - returns type reset source for corresponding pad +// PADRSTCFG field in PAD_CFG_DW0 register +func (dw0 *DW0) GetResetConfig() uint32 { + return dw0.GetFieldVal(bits.DW0, bits.DW0PadRstCfg) +} + +// getRXPadStateSelect - returns RX Pad State (RXINV) +// 0 = Raw RX pad state directly from RX buffer +// 1 = Internal RX pad state +func (dw0 *DW0) GetRXPadStateSelect() uint32 { + return dw0.GetFieldVal(bits.DW0, bits.DW0RxPadStateSelect) +} + +// getRXRawOverrideStatus - returns 1 if the selected pad state is being +// overridden to '1' (RXRAW1 field) +func (dw0 *DW0) GetRXRawOverrideStatus() uint32 { + return dw0.GetFieldVal(bits.DW0, bits.DW0RxRawOverrideTo1) +} + +// getRXLevelEdgeConfiguration - returns RX Level/Edge Configuration (RXEVCFG) +// 0h = Level, 1h = Edge, 2h = Drive '0', 3h = Reserved (implement as setting 0h) +func (dw0 *DW0) GetRXLevelEdgeConfiguration() uint32 { + return dw0.GetFieldVal(bits.DW0, bits.DW0RxLevelEdgeConfiguration) +} + +// GetRxInvert - returns RX Invert state (RXINV) +// 1 - Inversion, 0 - No inversion +func (dw0 *DW0) GetRxInvert() uint32 { + return dw0.GetFieldVal(bits.DW0, bits.DW0RxInvert) +} + +// getRxTxEnableConfig - returns RX/TX Enable Config (RXTXENCFG) +// 0 = Function defined in Pad Mode controls TX and RX Enables +// 1 = Function controls TX Enable and RX Disabled with RX drive 0 internally +// 2 = Function controls TX Enable and RX Disabled with RX drive 1 internally +// 3 = Function controls TX Enabled and RX is always enabled +func (dw0 *DW0) GetRxTxEnableConfig() uint32 { + return dw0.GetFieldVal(bits.DW0, bits.DW0RxTxEnableConfig) +} + +// getGPIOInputRouteIOxAPIC - returns 1 if the pad can be routed to cause +// peripheral IRQ when configured in GPIO input mode. +func (dw0 *DW0) GetGPIOInputRouteIOxAPIC() uint32 { + return dw0.GetFieldVal(bits.DW0, bits.DW0InputRouteIOxApic) +} + +// getGPIOInputRouteSCI - returns 1 if the pad can be routed to cause SCI when +// configured in GPIO input mode. +func (dw0 *DW0) GetGPIOInputRouteSCI() uint32 { + return dw0.GetFieldVal(bits.DW0, bits.DW0InputRouteSCI) +} + +// getGPIOInputRouteSMI - returns 1 if the pad can be routed to cause SMI when +// configured in GPIO input mode +func (dw0 *DW0) GetGPIOInputRouteSMI() uint32 { + return dw0.GetFieldVal(bits.DW0, bits.DW0InputRouteSMI) +} + +// getGPIOInputRouteNMI - returns 1 if the pad can be routed to cause NMI when +// configured in GPIO input mode +func (dw0 *DW0) GetGPIOInputRouteNMI() uint32 { + return dw0.GetFieldVal(bits.DW0, bits.DW0InputRouteNMI) +} + +// getPadMode - reutrns pad mode or one of the native functions +// 0h = GPIO control the Pad. +// 1h = native function 1, if applicable, controls the Pad +// 2h = native function 2, if applicable, controls the Pad +// 3h = native function 3, if applicable, controls the Pad +// 4h = enable GPIO blink/PWM capability if applicable +func (dw0 *DW0) GetPadMode() uint32 { + return dw0.GetFieldVal(bits.DW0, bits.DW0PadMode) +} + +// getGPIORxTxDisableStatus - returns GPIO RX/TX buffer state (GPIORXDIS | GPIOTXDIS) +// 0 - both are enabled, 1 - TX Disable, 2 - RX Disable, 3 - both are disabled +func (dw0 *DW0) GetGPIORxTxDisableStatus() uint32 { + return dw0.GetFieldVal(bits.DW0, bits.DW0RxTxBufDisable) +} + +// getGPIORXState - returns GPIO RX State (GPIORXSTATE) +func (dw0 *DW0) GetGPIORXState() uint32 { + return dw0.GetFieldVal(bits.DW0, bits.DW0RxState) +} + +// getGPIOTXState - returns GPIO TX State (GPIOTXSTATE) +func (dw0 *DW0) GetGPIOTXState() uint32 { + return dw0.GetFieldVal(bits.DW0, 0) +} diff --git a/util/intelp2m/platforms/common/register/dw1.go b/util/intelp2m/platforms/common/register/dw1.go new file mode 100644 index 0000000..d59adef --- /dev/null +++ b/util/intelp2m/platforms/common/register/dw1.go @@ -0,0 +1,51 @@ +package register + +import "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common/register/bi…" + +type DW1 struct { + Register +} + +// GetPadTol +func (dw1 *DW1) GetPadTol() uint32 { + return dw1.GetFieldVal(bits.DW1, bits.DW1PadTol) +} + +// GetIOStandbyState() return IO Standby State (IOSSTATE) +// 0 = Tx enabled driving last value driven, Rx enabled +// 1 = Tx enabled driving 0, Rx disabled and Rx driving 0 back to its controller internally +// 2 = Tx enabled driving 0, Rx disabled and Rx driving 1 back to its controller internally +// 3 = Tx enabled driving 1, Rx disabled and Rx driving 0 back to its controller internally +// 4 = Tx enabled driving 1, Rx disabled and Rx driving 1 back to its controller internally +// 5 = Tx enabled driving 0, Rx enabled +// 6 = Tx enabled driving 1, Rx enabled +// 7 = Hi-Z, Rx driving 0 back to its controller internally +// 8 = Hi-Z, Rx driving 1 back to its controller internally +// 9 = Tx disabled, Rx enabled +// 15 = IO-Standby is ignored for this pin (same as functional mode) +// Others reserved +func (dw1 *DW1) GetIOStandbyState() uint32 { + return dw1.GetFieldVal(bits.DW1, bits.DW1IOStandbyState) +} + +// GetIOStandbyTermination() return IO Standby Termination (IOSTERM) +// 0 = Same as functional mode (no change) +// 1 = Disable Pull-up and Pull-down (no on-die termination) +// 2 = Enable Pull-down +// 3 = Enable Pull-up +func (dw1 *DW1) GetIOStandbyTermination() uint32 { + return dw1.GetFieldVal(bits.DW1, bits.DW1IOStandbyTermination) +} + +// GetTermination() returns the pad termination state defines the different weak +// pull-up and pull-down settings that are supported by the buffer +// 0000 = none; 0010 = 5k PD; 0100 = 20k PD; 1010 = 5k PU; 1100 = 20k PU; +// 1111 = Native controller selected +func (dw1 *DW1) GetTermination() uint32 { + return dw1.GetFieldVal(bits.DW1, bits.DW1Term) +} + +// GetInterruptSelect() returns Interrupt Line number from the GPIO controller +func (dw1 *DW1) GetInterruptSelect() uint32 { + return dw1.GetFieldVal(bits.DW1, bits.DW1InterruptSelect) +} diff --git a/util/intelp2m/platforms/common/register/register.go b/util/intelp2m/platforms/common/register/register.go new file mode 100644 index 0000000..76fd9d1 --- /dev/null +++ b/util/intelp2m/platforms/common/register/register.go @@ -0,0 +1,46 @@ +package register + +import ( + "fmt" + + "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common/register/bi…" +) + +type Register struct { + Value uint32 + Mask uint32 + ReadOnly uint32 +} + +// Check the mask of the new macro +// Returns true if the macro is generated correctly +func (r Register) MaskCheck() bool { + mask := ^(r.Mask | r.ReadOnly) + return (r.Value & mask) == 0 +} + +// GetFieldVal() gets the value of the register bit field +func (r *Register) GetFieldVal(bitfields bits.Fields, offset bits.Offset) uint32 { + mask := bitfields[offset] + r.Mask |= mask + return (r.Value & mask) >> offset +} + +// CntrMaskFieldsClear() clear filed in control mask +// fieldMask - mask of the field to be cleared +func (r *Register) CntrMaskFieldsClear(fieldMask uint32) { + r.Mask &= ^fieldMask +} + +// IgnoredFieldsGet() returns mask of unchecked (ignored) fields. +// These bit fields were not read when the macro was generated. +// return +// mask of ignored bit field +func (r Register) IgnoredFieldsGet() uint32 { + mask := r.Mask | r.ReadOnly + return r.Value & ^mask +} + +func (r Register) String() string { + return fmt.Sprintf("0x%0.8x", r.Value) +} diff --git a/util/intelp2m/platforms/lbg/macro.go b/util/intelp2m/platforms/lbg/macro.go index bb08e28..63b7d2b 100644 --- a/util/intelp2m/platforms/lbg/macro.go +++ b/util/intelp2m/platforms/lbg/macro.go @@ -5,6 +5,7 @@ "review.coreboot.org/coreboot.git/util/intelp2m/fields" "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common" + "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common/register/bi…" "review.coreboot.org/coreboot.git/util/intelp2m/platforms/snr" ) @@ -13,12 +14,6 @@ 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() @@ -35,21 +30,22 @@ // RemmapRstSrc - remmap Pad Reset Source Config func (PlatformSpecific) RemmapRstSrc() { macro := common.GetMacro() - 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, + dw0 := macro.GetRegisterDW0() + remapping := map[uint32]uint32{ + 0: (bits.RstCfgRSMRST << bits.DW0PadRstCfg), + 1: (bits.RstCfgDEEP << bits.DW0PadRstCfg), + 2: (bits.RstCfgPLTRST << bits.DW0PadRstCfg), } resetsrc, valid := remapping[dw0.GetResetConfig()] if valid { // dw0.SetResetConfig(resetsrc) - ResetConfigFieldVal := (dw0.ValueGet() & 0x3fffffff) | remapping[dw0.GetResetConfig()] - dw0.ValueSet(ResetConfigFieldVal) + ResetConfigFieldVal := (dw0.Value & 0x3fffffff) | remapping[dw0.GetResetConfig()] + dw0.Value = ResetConfigFieldVal } else { fmt.Println("Invalid Pad Reset Config [ 0x", resetsrc, " ] for ", macro.PadIdGet()) } - dw0.CntrMaskFieldsClear(common.PadRstCfgMask) + mask := bits.DW0[bits.DW0PadRstCfg] + dw0.CntrMaskFieldsClear(mask) } // Adds The Pad Termination (TERM) parameter from PAD_CFG_DW1 to the macro @@ -79,20 +75,27 @@ } // GenMacro - generate pad macro -// dw0 : DW0 config register value -// dw1 : DW1 config register value +// dw0val : DW0 config register value +// dw1val : DW1 config register value // return: string of macro // error -func (platform PlatformSpecific) GenMacro(id string, dw0 uint32, dw1 uint32, ownership uint8) string { +func (platform PlatformSpecific) GenMacro(id string, dw0Val uint32, dw1Val uint32, ownership uint8) string { // The GPIO controller architecture in Lewisburg and Sunrise are very similar, // so we will inherit some platform-dependent functions from Sunrise. macro := common.GetInstanceMacro(PlatformSpecific{InheritanceMacro: snr.PlatformSpecific{}}, fields.InterfaceGet()) macro.Clear() - macro.Register(PAD_CFG_DW0).CntrMaskFieldsClear(common.AllFields) - macro.Register(PAD_CFG_DW0).CntrMaskFieldsClear(common.AllFields) + dw0 := macro.GetRegisterDW0() + dw0.CntrMaskFieldsClear(bits.All32) + + dw1 := macro.GetRegisterDW1() + dw1.CntrMaskFieldsClear(bits.All32) + + dw0.Value = dw0Val + dw1.Value = dw1Val + + dw0.ReadOnly = PAD_CFG_DW0_RO_FIELDS + dw1.ReadOnly = PAD_CFG_DW1_RO_FIELDS 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/snr/macro.go b/util/intelp2m/platforms/snr/macro.go index 5ead7e9..f1d05e7 100644 --- a/util/intelp2m/platforms/snr/macro.go +++ b/util/intelp2m/platforms/snr/macro.go @@ -7,6 +7,7 @@ "review.coreboot.org/coreboot.git/util/intelp2m/config/p2m" "review.coreboot.org/coreboot.git/util/intelp2m/fields" "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common" + "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common/register/bi…" ) const ( @@ -14,12 +15,6 @@ 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 PlatformSpecific struct{} // RemmapRstSrc - remmap Pad Reset Source Config @@ -32,29 +27,30 @@ 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, + dw0 := macro.GetRegisterDW0() + remapping := map[uint32]uint32{ + 0: bits.RstCfgRSMRST << bits.DW0PadRstCfg, + 1: bits.RstCfgDEEP << bits.DW0PadRstCfg, + 2: bits.RstCfgPLTRST << bits.DW0PadRstCfg, } resetsrc, valid := remapping[dw0.GetResetConfig()] if valid { // dw0.SetResetConfig(resetsrc) - ResetConfigFieldVal := (dw0.ValueGet() & 0x3fffffff) | remapping[dw0.GetResetConfig()] - dw0.ValueSet(ResetConfigFieldVal) + ResetConfigFieldVal := (dw0.Value & 0x3fffffff) | remapping[dw0.GetResetConfig()] + dw0.Value = ResetConfigFieldVal } else { fmt.Println("Invalid Pad Reset Config [ 0x", resetsrc, " ] for ", macro.PadIdGet()) } - dw0.CntrMaskFieldsClear(common.PadRstCfgMask) + mask := bits.DW0[bits.DW0PadRstCfg] + dw0.CntrMaskFieldsClear(mask) } // Adds The Pad Termination (TERM) parameter from PAD_CFG_DW1 to the macro // as a new argument func (PlatformSpecific) Pull() { macro := common.GetMacro() - dw1 := macro.Register(PAD_CFG_DW1) - var pull = map[uint8]string{ + dw1 := macro.GetRegisterDW1() + var pull = map[uint32]string{ 0x0: "NONE", 0x2: "DN_5K", 0x4: "DN_20K", @@ -79,13 +75,13 @@ // Generate macro to cause peripheral IRQ when configured in GPIO input mode func ioApicRoute() bool { macro := common.GetMacro() - dw0 := macro.Register(PAD_CFG_DW0) + dw0 := macro.GetRegisterDW0() if dw0.GetGPIOInputRouteIOxAPIC() == 0 { return false } macro.Add("_APIC") - if dw0.GetRXLevelEdgeConfiguration() == common.TRIG_LEVEL { + if dw0.GetRXLevelEdgeConfiguration() == bits.TrigLEVEL { if dw0.GetRxInvert() != 0 { // PAD_CFG_GPI_APIC_LOW(pad, pull, rst) macro.Add("_LOW") @@ -105,7 +101,7 @@ // Generate macro to cause NMI when configured in GPIO input mode func nmiRoute() bool { macro := common.GetMacro() - if macro.Register(PAD_CFG_DW0).GetGPIOInputRouteNMI() == 0 { + if macro.GetRegisterDW0().GetGPIOInputRouteNMI() == 0 { return false } // PAD_CFG_GPI_NMI(GPIO_24, UP_20K, DEEP, LEVEL, INVERT), @@ -116,7 +112,7 @@ // Generate macro to cause SCI when configured in GPIO input mode func sciRoute() bool { macro := common.GetMacro() - dw0 := macro.Register(PAD_CFG_DW0) + dw0 := macro.GetRegisterDW0() if dw0.GetGPIOInputRouteSCI() == 0 { return false } @@ -128,7 +124,7 @@ // Generate macro to cause SMI when configured in GPIO input mode func smiRoute() bool { macro := common.GetMacro() - dw0 := macro.Register(PAD_CFG_DW0) + dw0 := macro.GetRegisterDW0() if dw0.GetGPIOInputRouteSMI() == 0 { return false } @@ -175,23 +171,24 @@ default: // Clear the control mask so that the check fails and "Advanced" macro is // generated - macro.Register(PAD_CFG_DW0).CntrMaskFieldsClear(common.AllFields) + macro.GetRegisterDW0().CntrMaskFieldsClear(bits.All32) } } // Adds PAD_CFG_GPO macro with arguments func (PlatformSpecific) GpoMacroAdd() { macro := common.GetMacro() - dw0 := macro.Register(PAD_CFG_DW0) - term := macro.Register(PAD_CFG_DW1).GetTermination() + dw0 := macro.GetRegisterDW0() + term := macro.GetRegisterDW1().GetTermination() // #define PAD_CFG_GPO(pad, val, rst) \ // _PAD_CFG_STRUCT(pad, \ // PAD_FUNC(GPIO) | PAD_RESET(rst) | \ // PAD_TRIG(OFF) | PAD_BUF(RX_DISABLE) | !!val, \ // PAD_PULL(NONE) | PAD_IOSSTATE(TxLASTRxE)) - if dw0.GetRXLevelEdgeConfiguration() != common.TRIG_OFF { - dw0.CntrMaskFieldsClear(common.RxLevelEdgeConfigurationMask) + if dw0.GetRXLevelEdgeConfiguration() != bits.TrigOFF { + mask := bits.DW0[bits.DW0RxLevelEdgeConfiguration] + dw0.CntrMaskFieldsClear(mask) } macro.Set("PAD_CFG") if macro.IsOwnershipDriver() { @@ -215,7 +212,7 @@ macro := common.GetMacro() // e.g. PAD_CFG_NF(GPP_D23, NONE, DEEP, NF1) macro.Set("PAD_CFG_NF") - if macro.Register(PAD_CFG_DW1).GetPadTol() != 0 { + if macro.GetRegisterDW1().GetPadTol() != 0 { macro.Add("_1V8") } macro.Add("(").Id().Pull().Rstsrc().Padfn().Add("),") @@ -228,32 +225,41 @@ // _PAD_CFG_STRUCT(pad, // PAD_FUNC(GPIO) | PAD_RESET(DEEP) | PAD_TRIG(OFF) | PAD_BUF(TX_RX_DISABLE), // PAD_PULL(pull) | PAD_IOSSTATE(TxDRxE)), - dw0 := macro.Register(PAD_CFG_DW0) + dw0 := macro.GetRegisterDW0() // Some fields of the configuration registers are hidden inside the macros, // we should check them to update the corresponding bits in the control mask. - if dw0.GetRXLevelEdgeConfiguration() != common.TRIG_OFF { - dw0.CntrMaskFieldsClear(common.RxLevelEdgeConfigurationMask) + if dw0.GetRXLevelEdgeConfiguration() != bits.TrigOFF { + mask := bits.DW0[bits.DW0RxLevelEdgeConfiguration] + dw0.CntrMaskFieldsClear(mask) } if dw0.GetResetConfig() != 1 { // 1 = RST_DEEP - dw0.CntrMaskFieldsClear(common.PadRstCfgMask) + mask := bits.DW0[bits.DW0PadRstCfg] + dw0.CntrMaskFieldsClear(mask) } macro.Set("PAD_NC").Add("(").Id().Pull().Add("),") } // GenMacro - generate pad macro -// dw0 : DW0 config register value -// dw1 : DW1 config register value +// dw0Val : DW0 config register value +// dw1Val : DW1 config register value // return: string of macro // error -func (PlatformSpecific) GenMacro(id string, dw0 uint32, dw1 uint32, ownership uint8) string { +func (PlatformSpecific) GenMacro(id string, dw0Val uint32, dw1Val uint32, ownership uint8) string { macro := common.GetInstanceMacro(PlatformSpecific{}, fields.InterfaceGet()) macro.Clear() - macro.Register(PAD_CFG_DW0).CntrMaskFieldsClear(common.AllFields) - macro.Register(PAD_CFG_DW0).CntrMaskFieldsClear(common.AllFields) + dw0 := macro.GetRegisterDW0() + dw0.CntrMaskFieldsClear(bits.All32) + + dw1 := macro.GetRegisterDW1() + dw1.CntrMaskFieldsClear(bits.All32) + + dw0.Value = dw0Val + dw1.Value = dw1Val + + dw0.ReadOnly = PAD_CFG_DW0_RO_FIELDS + dw1.ReadOnly = PAD_CFG_DW1_RO_FIELDS 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() } -- To view, visit https://review.coreboot.org/c/coreboot/+/70309 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Id64e2a5e29f1d561597004ac83d32e3c80c16ebd Gerrit-Change-Number: 70309 Gerrit-PatchSet: 1 Gerrit-Owner: Maxim Polyakov <max.senia.poliak(a)gmail.com> Gerrit-MessageType: newchange

1 0

[L] Change in coreboot[master]: intelp2m: Rework configuration package
by Maxim Polyakov (Code Review) 03 Dec '22

03 Dec '22

Maxim Polyakov has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/70308 ) Change subject: intelp2m: Rework configuration package ...................................................................... intelp2m: Rework configuration package - Reduce the number of methods for updating settings and redefine types to make the code cleaner and more readable. - Move the configuration to the p2m package to add settings from new utilities based on the intelp2m code. - Make some code style fixes. Change-Id: Ia1b19ae3122bcf6ec740ae4683d62f31570670b1 Signed-off-by: Maxim Polyakov <max.senia.poliak(a)gmail.com> --- D util/intelp2m/config/config.go A util/intelp2m/config/p2m/config.go M util/intelp2m/fields/cb/cb.go M util/intelp2m/fields/fields.go M util/intelp2m/main.go M util/intelp2m/parser/parser.go M util/intelp2m/parser/parser_test.go M util/intelp2m/platforms/apl/macro.go M util/intelp2m/platforms/cnl/macro.go M util/intelp2m/platforms/common/macro.go M util/intelp2m/platforms/snr/macro.go M util/intelp2m/platforms/test/suite.go 12 files changed, 315 insertions(+), 328 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/70308/1 diff --git a/util/intelp2m/config/config.go b/util/intelp2m/config/config.go deleted file mode 100644 index 0444ddf..0000000 --- a/util/intelp2m/config/config.go +++ /dev/null @@ -1,117 +0,0 @@ -package config - -import "os" - -const ( - SunriseType uint8 = 0 - LewisburgType uint8 = 1 - ApolloType uint8 = 2 - CannonType uint8 = 3 - AlderType uint8 = 4 -) - -var key uint8 = SunriseType - -var platform = map[string]uint8{ - "snr": SunriseType, - "lbg": LewisburgType, - "apl": ApolloType, - "cnl": CannonType, - "adl": AlderType} - -func PlatformSet(name string) int { - if platformType, valid := platform[name]; valid { - key = platformType - return 0 - } - return -1 -} -func PlatformGet() uint8 { - return key -} -func IsPlatform(platformType uint8) bool { - return platformType == key -} -func IsPlatformApollo() bool { - return IsPlatform(ApolloType) -} -func IsPlatformSunrise() bool { - return IsPlatform(SunriseType) -} -func IsPlatformLewisburg() bool { - return IsPlatform(LewisburgType) -} -func IsPlatformCannonLake() bool { - return IsPlatform(CannonType) -} -func IsPlatformAlderLakeH() bool { - return IsPlatform(AlderType) -} - -var InputRegDumpFile *os.File = nil -var OutputGenFile *os.File = nil - -var ignoredFieldsFormat bool = false - -func IgnoredFieldsFlagSet(flag bool) { - ignoredFieldsFormat = flag -} -func AreFieldsIgnored() bool { - return ignoredFieldsFormat -} - -var nonCheckingFlag bool = false - -func NonCheckingFlagSet(flag bool) { - nonCheckingFlag = flag -} -func IsNonCheckingFlagUsed() bool { - return nonCheckingFlag -} - -var infolevel int = 0 - -func InfoLevelSet(lvl int) { - infolevel = lvl -} -func InfoLevelGet() int { - return infolevel -} - -var fldstyle uint8 = CbFlds - -const ( - NoFlds uint8 = 0 - CbFlds uint8 = 1 // coreboot style - FspFlds uint8 = 2 // FSP/edk2 style - RawFlds uint8 = 3 // raw DW0/1 values -) - -var fldstylemap = map[string]uint8{ - "none": NoFlds, - "cb": CbFlds, - "fsp": FspFlds, - "raw": RawFlds} - -func FldStyleSet(name string) int { - if style, valid := fldstylemap[name]; valid { - fldstyle = style - return 0 - } - return -1 -} -func FldStyleGet() uint8 { - return fldstyle -} -func IsFieldsMacroUsed() bool { - return FldStyleGet() != NoFlds -} -func IsCbStyleMacro() bool { - return FldStyleGet() == CbFlds -} -func IsFspStyleMacro() bool { - return FldStyleGet() == FspFlds -} -func IsRawFields() bool { - return FldStyleGet() == RawFlds -} diff --git a/util/intelp2m/config/p2m/config.go b/util/intelp2m/config/p2m/config.go new file mode 100644 index 0000000..43f8226 --- /dev/null +++ b/util/intelp2m/config/p2m/config.go @@ -0,0 +1,83 @@ +package p2m + +import ( + "fmt" + "os" +) + +type PlatformType int +type FieldType int + +const ( + Sunrise PlatformType = iota + Lewisburg + Apollo + Cannon + Alder +) + +const ( + NoFlds FieldType = iota + CbFlds // coreboot style + FspFlds // FSP/edk2 style + RawFlds // raw DW0/1 values +) + +var platforms = map[string]PlatformType{ + "snr": Sunrise, + "lbg": Lewisburg, + "apl": Apollo, + "cnl": Cannon, + "adl": Alder, +} + +var fields = map[string]FieldType{ + "none": NoFlds, + "cb": CbFlds, + "fsp": FspFlds, + "raw": RawFlds, +} + +type Settings struct { + Version string + Platform PlatformType + Field FieldType + InputFile *os.File + OutputFile *os.File + IgnoredFields bool + AutoCheck bool + GenLevel int +} + +var p2mConfig = Settings{ + Version: "unknown", + Platform: Sunrise, + Field: CbFlds, + IgnoredFields: false, + AutoCheck: true, + GenLevel: 0, +} + +func SettingsUpdate(settings Settings) { + p2mConfig = settings +} + +func SettingsGet() Settings { + return p2mConfig +} + +func (s *Settings) SetPlatformType(format string) error { + if _, exist := platforms[format]; !exist { + return fmt.Errorf("unknown platform type %s", format) + } + s.Platform = platforms[format] + return nil +} + +func (s *Settings) SetFieldType(format string) error { + if _, exist := fields[format]; !exist { + return fmt.Errorf("unknown field type %s", format) + } + s.Field = fields[format] + return nil +} diff --git a/util/intelp2m/fields/cb/cb.go b/util/intelp2m/fields/cb/cb.go index a70b2a6..0c8988eb 100644 --- a/util/intelp2m/fields/cb/cb.go +++ b/util/intelp2m/fields/cb/cb.go @@ -1,11 +1,11 @@ package cb import ( - "review.coreboot.org/coreboot.git/util/intelp2m/config" + "review.coreboot.org/coreboot.git/util/intelp2m/config/p2m" "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common" ) -type FieldMacros struct {} +type FieldMacros struct{} // field - data structure for creating a new bitfield macro object // PAD_FUNC(NF3) @@ -42,7 +42,9 @@ } } } - if allhidden { macro.Add("0") } + if allhidden { + macro.Add("0") + } } // DecodeDW0 - decode value of DW0 register @@ -50,80 +52,80 @@ macro := common.GetMacro() dw0 := macro.Register(common.PAD_CFG_DW0) generate( - &field { - prefix : "PAD_FUNC", + &field{ + prefix: "PAD_FUNC", // TODO: Find another way to hide PAD_FUNC(GPIO) in the comment with // ignored fields - unhide : config.InfoLevelGet() < 3 || dw0.GetPadMode() != 0, - configurator : func() { macro.Padfn() }, + unhide: p2m.SettingsGet().GenLevel < 3 || dw0.GetPadMode() != 0, + configurator: func() { macro.Padfn() }, }, - &field { - prefix : "PAD_RESET", - unhide : dw0.GetResetConfig() != 0, - configurator : func() { macro.Rstsrc() }, + &field{ + prefix: "PAD_RESET", + unhide: dw0.GetResetConfig() != 0, + configurator: func() { macro.Rstsrc() }, }, - &field { - prefix : "PAD_TRIG", - unhide : dw0.GetRXLevelEdgeConfiguration() != 0, - configurator : func() { macro.Trig() }, + &field{ + prefix: "PAD_TRIG", + unhide: dw0.GetRXLevelEdgeConfiguration() != 0, + configurator: func() { macro.Trig() }, }, - &field { - prefix : "PAD_IRQ_ROUTE", - name : "IOAPIC", - unhide : dw0.GetGPIOInputRouteIOxAPIC() != 0, + &field{ + prefix: "PAD_IRQ_ROUTE", + name: "IOAPIC", + unhide: dw0.GetGPIOInputRouteIOxAPIC() != 0, }, - &field { - prefix : "PAD_IRQ_ROUTE", - name : "SCI", - unhide : dw0.GetGPIOInputRouteSCI() != 0, + &field{ + prefix: "PAD_IRQ_ROUTE", + name: "SCI", + unhide: dw0.GetGPIOInputRouteSCI() != 0, }, - &field { - prefix : "PAD_IRQ_ROUTE", - name : "SMI", - unhide : dw0.GetGPIOInputRouteSMI() != 0, + &field{ + prefix: "PAD_IRQ_ROUTE", + name: "SMI", + unhide: dw0.GetGPIOInputRouteSMI() != 0, }, - &field { - prefix : "PAD_IRQ_ROUTE", - name : "NMI", - unhide : dw0.GetGPIOInputRouteNMI() != 0, + &field{ + prefix: "PAD_IRQ_ROUTE", + name: "NMI", + unhide: dw0.GetGPIOInputRouteNMI() != 0, }, - &field { - prefix : "PAD_RX_POL", - unhide : dw0.GetRxInvert() != 0, - configurator : func() { macro.Invert() }, + &field{ + prefix: "PAD_RX_POL", + unhide: dw0.GetRxInvert() != 0, + configurator: func() { macro.Invert() }, }, - &field { - prefix : "PAD_BUF", - unhide : dw0.GetGPIORxTxDisableStatus() != 0, - configurator : func() { macro.Bufdis() }, + &field{ + prefix: "PAD_BUF", + unhide: dw0.GetGPIORxTxDisableStatus() != 0, + configurator: func() { macro.Bufdis() }, }, - &field { - name : "(1 << 29)", - unhide : dw0.GetRXPadStateSelect() != 0, + &field{ + name: "(1 << 29)", + unhide: dw0.GetRXPadStateSelect() != 0, }, - &field { - name : "(1 << 28)", - unhide : dw0.GetRXRawOverrideStatus() != 0, + &field{ + name: "(1 << 28)", + unhide: dw0.GetRXRawOverrideStatus() != 0, }, - &field { - name : "(1 << 1)", - unhide : dw0.GetGPIORXState() != 0, + &field{ + name: "(1 << 1)", + unhide: dw0.GetGPIORXState() != 0, }, - &field { - name : "1", - unhide : dw0.GetGPIOTXState() != 0, + &field{ + name: "1", + unhide: dw0.GetGPIOTXState() != 0, }, ) } @@ -133,33 +135,33 @@ macro := common.GetMacro() dw1 := macro.Register(common.PAD_CFG_DW1) generate( - &field { - name : "PAD_CFG1_TOL_1V8", - unhide : dw1.GetPadTol() != 0, + &field{ + name: "PAD_CFG1_TOL_1V8", + unhide: dw1.GetPadTol() != 0, }, - &field { - prefix : "PAD_PULL", - unhide : dw1.GetTermination() != 0, - configurator : func() { macro.Pull() }, + &field{ + prefix: "PAD_PULL", + unhide: dw1.GetTermination() != 0, + configurator: func() { macro.Pull() }, }, - &field { - prefix : "PAD_IOSSTATE", - unhide : dw1.GetIOStandbyState() != 0, - configurator : func() { macro.IOSstate() }, + &field{ + prefix: "PAD_IOSSTATE", + unhide: dw1.GetIOStandbyState() != 0, + configurator: func() { macro.IOSstate() }, }, - &field { - prefix : "PAD_IOSTERM", - unhide : dw1.GetIOStandbyTermination() != 0, - configurator : func() { macro.IOTerm() }, + &field{ + prefix: "PAD_IOSTERM", + unhide: dw1.GetIOStandbyTermination() != 0, + configurator: func() { macro.IOTerm() }, }, - &field { - prefix : "PAD_CFG_OWN_GPIO", - unhide : macro.IsOwnershipDriver(), - configurator : func() { macro.Own() }, + &field{ + prefix: "PAD_CFG_OWN_GPIO", + unhide: macro.IsOwnershipDriver(), + configurator: func() { macro.Own() }, }, ) } diff --git a/util/intelp2m/fields/fields.go b/util/intelp2m/fields/fields.go index 4f14c81..bcb6221 100644 --- a/util/intelp2m/fields/fields.go +++ b/util/intelp2m/fields/fields.go @@ -1,21 +1,21 @@ package fields import ( - "review.coreboot.org/coreboot.git/util/intelp2m/config" - "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common" - "review.coreboot.org/coreboot.git/util/intelp2m/fields/fsp" + "review.coreboot.org/coreboot.git/util/intelp2m/config/p2m" "review.coreboot.org/coreboot.git/util/intelp2m/fields/cb" + "review.coreboot.org/coreboot.git/util/intelp2m/fields/fsp" "review.coreboot.org/coreboot.git/util/intelp2m/fields/raw" + "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common" ) // InterfaceSet - set the interface for decoding configuration // registers DW0 and DW1. func InterfaceGet() common.Fields { - var fldstylemap = map[uint8]common.Fields{ - config.NoFlds : cb.FieldMacros{}, // analyze fields using cb macros - config.CbFlds : cb.FieldMacros{}, - config.FspFlds : fsp.FieldMacros{}, - config.RawFlds : raw.FieldMacros{}, + var fldstylemap = map[p2m.FieldType]common.Fields{ + p2m.NoFlds: cb.FieldMacros{}, // analyze fields using cb macros + p2m.CbFlds: cb.FieldMacros{}, + p2m.FspFlds: fsp.FieldMacros{}, + p2m.RawFlds: raw.FieldMacros{}, } - return fldstylemap[config.FldStyleGet()] + return fldstylemap[p2m.SettingsGet().Field] } diff --git a/util/intelp2m/main.go b/util/intelp2m/main.go index e1a51c8..0b0c9d5 100644 --- a/util/intelp2m/main.go +++ b/util/intelp2m/main.go @@ -4,22 +4,23 @@ "flag" "fmt" "os" + "path/filepath" - "review.coreboot.org/coreboot.git/util/intelp2m/config" + "review.coreboot.org/coreboot.git/util/intelp2m/config/p2m" "review.coreboot.org/coreboot.git/util/intelp2m/parser" ) type Printer struct{} func (Printer) Linef(lvl int, format string, args ...interface{}) { - if config.InfoLevelGet() >= lvl { - fmt.Fprintf(config.OutputGenFile, format, args...) + if config := p2m.SettingsGet(); config.GenLevel >= lvl { + fmt.Fprintf(config.OutputFile, format, args...) } } func (Printer) Line(lvl int, str string) { - if config.InfoLevelGet() >= lvl { - fmt.Fprint(config.OutputGenFile, str) + if config := p2m.SettingsGet(); config.GenLevel >= lvl { + fmt.Fprint(config.OutputFile, str) } } @@ -36,25 +37,22 @@ // main func main() { // Command line arguments - inputFileName := flag.String("file", - "inteltool.log", + inputFilePath := flag.String("file", "inteltool.log", "the path to the inteltool log file\n") - outputFileName := flag.String("o", + outputFilePath := flag.String("o", "generate/gpio.h", "the path to the generated file with GPIO configuration\n") - ignFlag := flag.Bool("ign", - false, + ignored := flag.Bool("ign", false, "exclude fields that should be ignored from advanced macros\n") - nonCheckFlag := flag.Bool("n", - false, + unchecking := flag.Bool("n", false, "Generate macros without checking.\n"+ "\tIn this case, some fields of the configuration registers\n"+ "\tDW0 will be ignored.\n") - infoLevels := []*bool{ + levels := []*bool{ flag.Bool("i", false, "Show pads function in the comments"), flag.Bool("ii", false, "Show DW0/DW1 value in the comments"), flag.Bool("iii", false, "Show ignored bit fields in the comments"), @@ -68,63 +66,58 @@ "\tcnl - CannonLake-LP or Whiskeylake/Coffeelake/Cometlake-U SoC\n"+ "\tadl - AlderLake PCH\n") - fieldstyle := flag.String("fld", "none", "set fields macros style:\n"+ + field := flag.String("fld", "none", "set fields macros style:\n"+ "\tcb - use coreboot style for bit fields macros\n"+ "\tfsp - use fsp style\n"+ "\traw - do not convert, print as is\n") - printVersion() flag.Parse() + printVersion() - config.IgnoredFieldsFlagSet(*ignFlag) - config.NonCheckingFlagSet(*nonCheckFlag) - - for level, flag := range infoLevels { - if *flag { - config.InfoLevelSet(level + 1) + // settings + config := p2m.SettingsGet() + config.Version = Version + config.IgnoredFields = *ignored + config.AutoCheck = !(*unchecking) + for level, set := range levels { + if *set { + config.GenLevel = level + 1 fmt.Printf("Info level: Use level %d!\n", level+1) break } } - if valid := config.PlatformSet(*platform); valid != 0 { - fmt.Printf("Error: invalid platform -%s!\n", *platform) + if err := config.SetPlatformType(*platform); err != nil { + fmt.Printf("Error: %v\n", err) os.Exit(1) } - fmt.Println("Log file:", *inputFileName) - fmt.Println("Output generated file:", *outputFileName) - - inputRegDumpFile, err := os.Open(*inputFileName) - if err != nil { - fmt.Printf("Error: inteltool log file was not found!\n") + if err := config.SetFieldType(*field); err != nil { + fmt.Printf("Error: %v\n", err) os.Exit(1) } - if config.FldStyleSet(*fieldstyle) != 0 { - fmt.Printf("Error! Unknown bit fields style option -%s!\n", *fieldstyle) + if file, err := os.Open(*inputFilePath); err != nil { + fmt.Printf("input file error: %v", err) + os.Exit(1) + } else { + config.InputFile = file + } + defer config.InputFile.Close() + + if err := os.MkdirAll(filepath.Dir(*outputFilePath), os.ModePerm); err != nil { + fmt.Printf("failed to create output directory: %v", err) os.Exit(1) } - - // create dir for output files - err = os.MkdirAll("generate", os.ModePerm) - if err != nil { - fmt.Printf("Error! Can not create a directory for the generated files!\n") + if file, err := os.Create(*outputFilePath); err != nil { + fmt.Printf("failed to create output file: %v", err) os.Exit(1) + } else { + config.OutputFile = file } + defer config.OutputFile.Close() - // create empty gpio.h file - outputGenFile, err := os.Create(*outputFileName) - if err != nil { - fmt.Printf("Error: unable to generate GPIO config file!\n") - os.Exit(1) - } - - defer inputRegDumpFile.Close() - defer outputGenFile.Close() - - config.OutputGenFile = outputGenFile - config.InputRegDumpFile = inputRegDumpFile + p2m.SettingsUpdate(config) prs := parser.ParserData{} prs.Parse() @@ -142,15 +135,16 @@ /* Pad configuration was generated automatically using intelp2m %s */ static const struct pad_config gpio_table[] = {`, Version) - config.OutputGenFile.WriteString(header + "\n") + config.OutputFile.WriteString(header + "\n") // Add the pads map if err := generator.Run(); err != nil { fmt.Printf("Error: %v", err) os.Exit(1) } - config.OutputGenFile.WriteString(`}; + config.OutputFile.WriteString(`}; #endif /* CFG_GPIO_H */ `) + os.Exit(0) } diff --git a/util/intelp2m/parser/parser.go b/util/intelp2m/parser/parser.go index e411534..8b772b6 100644 --- a/util/intelp2m/parser/parser.go +++ b/util/intelp2m/parser/parser.go @@ -7,7 +7,7 @@ "strconv" "strings" - "review.coreboot.org/coreboot.git/util/intelp2m/config" + "review.coreboot.org/coreboot.git/util/intelp2m/config/p2m" "review.coreboot.org/coreboot.git/util/intelp2m/platforms/adl" "review.coreboot.org/coreboot.git/util/intelp2m/platforms/apl" "review.coreboot.org/coreboot.git/util/intelp2m/platforms/cnl" @@ -92,19 +92,19 @@ // PlatformSpecificInterfaceSet - specific interface for the platform selected // in the configuration func (parser *ParserData) PlatformSpecificInterfaceSet() { - var platform = map[uint8]PlatformSpecific{ - config.SunriseType: snr.PlatformSpecific{}, + platform := map[p2m.PlatformType]PlatformSpecific{ + p2m.Sunrise: snr.PlatformSpecific{}, // See platforms/lbg/macro.go - config.LewisburgType: lbg.PlatformSpecific{ + p2m.Lewisburg: lbg.PlatformSpecific{ InheritanceTemplate: snr.PlatformSpecific{}, }, - config.ApolloType: apl.PlatformSpecific{}, - config.CannonType: cnl.PlatformSpecific{ + p2m.Apollo: apl.PlatformSpecific{}, + p2m.Cannon: cnl.PlatformSpecific{ InheritanceTemplate: snr.PlatformSpecific{}, }, - config.AlderType: adl.PlatformSpecific{}, + p2m.Alder: adl.PlatformSpecific{}, } - parser.platform = platform[config.PlatformGet()] + parser.platform = platform[p2m.SettingsGet().Platform] } // Register - read specific platform registers (32 bits) @@ -148,8 +148,7 @@ // padConfigurationExtract - reads GPIO configuration registers and returns true if the // information from the inteltool log was successfully parsed. func (parser *ParserData) padConfigurationExtract() bool { - // Only for Sunrise or CannonLake, and only for inteltool.log file template - if config.IsPlatformApollo() { + if p2m.SettingsGet().Platform == p2m.Apollo { return false } return parser.padOwnershipExtract() @@ -167,7 +166,8 @@ // map of thepad ownership registers for the GPIO controller parser.ownership = make(map[string]uint32) - scanner := bufio.NewScanner(config.InputRegDumpFile) + file := p2m.SettingsGet().InputFile + scanner := bufio.NewScanner(file) for scanner.Scan() { parser.line = scanner.Text() isIncluded, _ := common.KeywordsCheck(parser.line, "GPIO Community", "GPIO Group") @@ -218,7 +218,7 @@ g.Linef(2, "\n\t/* %s - %s */\n\t/* DW0: 0x%0.8x, DW1: 0x%0.8x */\n", pad.id, pad.function, pad.dw0, pad.dw1) g.Linef(0, "\t%s", macro) - if config.InfoLevelGet() == 1 { + if p2m.SettingsGet().GenLevel == 1 { g.Linef(1, "\t/* %s */", pad.function) } g.Line(0, "\n") diff --git a/util/intelp2m/parser/parser_test.go b/util/intelp2m/parser/parser_test.go index 4f0e452..9e6f021 100644 --- a/util/intelp2m/parser/parser_test.go +++ b/util/intelp2m/parser/parser_test.go @@ -5,7 +5,7 @@ "os" "testing" - "review.coreboot.org/coreboot.git/util/intelp2m/config" + "review.coreboot.org/coreboot.git/util/intelp2m/config/p2m" "review.coreboot.org/coreboot.git/util/intelp2m/parser" ) @@ -16,19 +16,20 @@ } func (p *Printer) Linef(lvl int, format string, args ...interface{}) { - if config.InfoLevelGet() >= lvl { + if p2m.SettingsGet().GenLevel >= lvl { p.lines = append(p.lines, fmt.Sprintf(format, args...)) } } func (p *Printer) Line(lvl int, str string) { - if config.InfoLevelGet() >= lvl { + if p2m.SettingsGet().GenLevel >= lvl { p.lines = append(p.lines, str) } } func TestParser(t *testing.T) { t.Run("PARSER/PARSE-INTELTOOL-FILE", func(t *testing.T) { + var err error reference := []string{ "\n\t/* ------- GPIO Community 0 ------- */\n", "\n\t/* ------- GPIO Group GPP_A ------- */\n", @@ -62,18 +63,17 @@ "\tPAD_CFG_NF(GPP_I1, NONE, PLTRST, NF1),", "\t/* DDPC_HPD1 */", "\n", "\tPAD_CFG_NF(GPP_I2, NONE, PLTRST, NF1),", "\t/* DDPD_HPD2 */", "\n", } - - input, err := os.Open(testLogFilePath) - if err != nil { + config := p2m.SettingsGet() + if config.InputFile, err = os.Open(testLogFilePath); err != nil { t.Errorf("Something is wrong with the test file - %s!\n", testLogFilePath) os.Exit(1) } - defer input.Close() + defer config.InputFile.Close() - config.InputRegDumpFile = input - config.FldStyleSet("none") - config.NonCheckingFlagSet(true) - config.InfoLevelSet(1) + config.AutoCheck = false + config.Field = p2m.NoFlds + config.GenLevel = 1 + p2m.SettingsUpdate(config) prs := parser.ParserData{} prs.Parse() diff --git a/util/intelp2m/platforms/apl/macro.go b/util/intelp2m/platforms/apl/macro.go index 2098c57..6ed1eec 100644 --- a/util/intelp2m/platforms/apl/macro.go +++ b/util/intelp2m/platforms/apl/macro.go @@ -4,9 +4,9 @@ "fmt" "strconv" - "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common" - "review.coreboot.org/coreboot.git/util/intelp2m/config" + "review.coreboot.org/coreboot.git/util/intelp2m/config/p2m" "review.coreboot.org/coreboot.git/util/intelp2m/fields" + "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common" ) const ( @@ -21,18 +21,18 @@ ) const ( - PULL_NONE = 0x0 // 0 000: none - PULL_DN_5K = 0x2 // 0 010: 5k wpd (Only available on SMBus GPIOs) - PULL_DN_20K = 0x4 // 0 100: 20k wpd + PULL_NONE = 0x0 // 0 000: none + PULL_DN_5K = 0x2 // 0 010: 5k wpd (Only available on SMBus GPIOs) + PULL_DN_20K = 0x4 // 0 100: 20k wpd // PULL_NONE = 0x8 // 1 000: none - PULL_UP_1K = 0x9 // 1 001: 1k wpu (Only available on I2C GPIOs) - PULL_UP_2K = 0xb // 1 011: 2k wpu (Only available on I2C GPIOs) - PULL_UP_20K = 0xc // 1 100: 20k wpu - PULL_UP_667 = 0xd // 1 101: 1k & 2k wpu (Only available on I2C GPIOs) - PULL_NATIVE = 0xf // 1 111: (optional) Native controller selected by Pad Mode + PULL_UP_1K = 0x9 // 1 001: 1k wpu (Only available on I2C GPIOs) + PULL_UP_2K = 0xb // 1 011: 2k wpu (Only available on I2C GPIOs) + PULL_UP_20K = 0xc // 1 100: 20k wpu + PULL_UP_667 = 0xd // 1 101: 1k & 2k wpu (Only available on I2C GPIOs) + PULL_NATIVE = 0xf // 1 111: (optional) Native controller selected by Pad Mode ) -type PlatformSpecific struct {} +type PlatformSpecific struct{} // RemmapRstSrc - remmap Pad Reset Source Config // remmap is not required because it is the same as common. @@ -52,7 +52,6 @@ PULL_UP_20K: "UP_20K", PULL_UP_667: "UP_667", PULL_NATIVE: "NATIVE", - } terminationFieldValue := dw1.GetTermination() str, valid := pull[terminationFieldValue] @@ -107,7 +106,7 @@ // PAD_CFG_GPI_SCI_IOS(GPIO_141, NONE, DEEP, EDGE_SINGLE, INVERT, IGNORE, DISPUPD), macro.Add("_SCI_IOS") macro.Add("(").Id().Pull().Rstsrc().Trig().Invert().IOSstate().IOTerm() - } else if dw0.GetRXLevelEdgeConfiguration() & 0x1 != 0 { + } else if dw0.GetRXLevelEdgeConfiguration()&0x1 != 0 { // e.g. PAD_CFG_GPI_ACPI_SCI(GPP_G2, NONE, DEEP, YES), macro.Add("_ACPI_SCI").Add("(").Id().Pull().Rstsrc().Invert() } else { @@ -130,7 +129,7 @@ // PAD_CFG_GPI_SMI_IOS(GPIO_41, UP_20K, DEEP, EDGE_SINGLE, NONE, IGNORE, SAME), macro.Add("_SMI_IOS") macro.Add("(").Id().Pull().Rstsrc().Trig().Invert().IOSstate().IOTerm() - } else if dw0.GetRXLevelEdgeConfiguration() & 0x1 != 0 { + } else if dw0.GetRXLevelEdgeConfiguration()&0x1 != 0 { // e.g. PAD_CFG_GPI_ACPI_SMI(GPP_I3, NONE, DEEP, YES), macro.Add("_ACPI_SMI").Add("(").Id().Pull().Rstsrc().Invert() } else { @@ -143,10 +142,11 @@ // Generate macro for GPI port func (PlatformSpecific) GpiMacroAdd() { - macro := common.GetMacro() var ids []string + + macro := common.GetMacro() macro.Set("PAD_CFG_GPI") - for routeid, isRoute := range map[string]func() (bool) { + for routeid, isRoute := range map[string]func() bool{ "IOAPIC": ioApicRoute, "SCI": sciRoute, "SMI": smiRoute, @@ -157,7 +157,7 @@ } } - switch argc := len(ids); argc { + switch config, argc := p2m.SettingsGet(), len(ids); argc { case 0: dw1 := macro.Register(PAD_CFG_DW1) isIOStandbyStateUsed := dw1.GetIOStandbyState() != 0 @@ -176,14 +176,14 @@ } case 1: // GPI with IRQ route - if config.AreFieldsIgnored() { + if config.IgnoredFields { macro.SetPadOwnership(common.PAD_OWN_ACPI) } case 2: // PAD_CFG_GPI_DUAL_ROUTE(pad, pull, rst, trig, inv, route1, route2) macro.Set("PAD_CFG_GPI_DUAL_ROUTE(").Id().Pull().Rstsrc().Trig().Invert() macro.Add(", " + ids[0] + ", " + ids[1] + "),") - if config.AreFieldsIgnored() { + if config.IgnoredFields { macro.SetPadOwnership(common.PAD_OWN_ACPI) } default: @@ -193,12 +193,11 @@ } } - // Adds PAD_CFG_GPO macro with arguments func (PlatformSpecific) GpoMacroAdd() { macro := common.GetMacro() - dw0 := macro.Register(PAD_CFG_DW0) - dw1 := macro.Register(PAD_CFG_DW1) + dw0 := macro.Register(PAD_CFG_DW0) + dw1 := macro.Register(PAD_CFG_DW1) term := dw1.GetTermination() macro.Set("PAD_CFG") diff --git a/util/intelp2m/platforms/cnl/macro.go b/util/intelp2m/platforms/cnl/macro.go index 02c47eb..08574de 100644 --- a/util/intelp2m/platforms/cnl/macro.go +++ b/util/intelp2m/platforms/cnl/macro.go @@ -4,7 +4,7 @@ "fmt" "strings" - "review.coreboot.org/coreboot.git/util/intelp2m/config" + "review.coreboot.org/coreboot.git/util/intelp2m/config/p2m" "review.coreboot.org/coreboot.git/util/intelp2m/fields" "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common" "review.coreboot.org/coreboot.git/util/intelp2m/platforms/snr" @@ -153,13 +153,13 @@ } } - switch argc := len(ids); argc { + switch config, argc := p2m.SettingsGet(), len(ids); argc { case 0: // e.g. PAD_CFG_GPI_TRIG_OWN(pad, pull, rst, trig, own) macro.Add("_TRIG_OWN").Add("(").Id().Pull().Rstsrc().Trig().Own().Add("),") case 1: // GPI with IRQ route - if config.AreFieldsIgnored() { + if config.IgnoredFields { // Set Host Software Ownership to ACPI mode macro.SetPadOwnership(common.PAD_OWN_ACPI) } @@ -168,7 +168,7 @@ // PAD_CFG_GPI_DUAL_ROUTE(pad, pull, rst, trig, inv, route1, route2) macro.Set("PAD_CFG_GPI_DUAL_ROUTE(").Id().Pull().Rstsrc().Trig().Invert() macro.Add(", " + ids[0] + ", " + ids[1] + "),") - if config.AreFieldsIgnored() { + if config.IgnoredFields { // Set Host Software Ownership to ACPI mode macro.SetPadOwnership(common.PAD_OWN_ACPI) } diff --git a/util/intelp2m/platforms/common/macro.go b/util/intelp2m/platforms/common/macro.go index ddb612a..02cbed9 100644 --- a/util/intelp2m/platforms/common/macro.go +++ b/util/intelp2m/platforms/common/macro.go @@ -4,7 +4,7 @@ "strconv" "sync" - "review.coreboot.org/coreboot.git/util/intelp2m/config" + "review.coreboot.org/coreboot.git/util/intelp2m/config/p2m" ) type Fields interface { @@ -33,9 +33,9 @@ ) const ( - IOSTERM_SAME = 0x0 - IOSTERM_DISPUPD = 0x1 - IOSTERM_ENPD = 0x2 + IOSTERM_SAME = 0x0 + IOSTERM_DISPUPD = 0x1 + IOSTERM_ENPD = 0x2 IOSTERM_ENPU = 0x3 ) @@ -77,13 +77,13 @@ Fields } -var instanceMacro *Macro -var once sync.Once +var instanceMacro *Macro +var once sync.Once // GetInstance returns singleton func GetInstanceMacro(p PlatformSpecific, f Fields) *Macro { once.Do(func() { - instanceMacro = &Macro{ Platform : p, Fields : f } + instanceMacro = &Macro{Platform: p, Fields: f} }) return instanceMacro } @@ -159,7 +159,7 @@ // return: Macro func (macro *Macro) Rstsrc() *Macro { dw0 := macro.Register(PAD_CFG_DW0) - var resetsrc = map[uint8]string { + var resetsrc = map[uint8]string{ 0: "PWROK", 1: "DEEP", 2: "PLTRST", @@ -199,7 +199,7 @@ // return: Macro func (macro *Macro) Invert() *Macro { macro.Separator() - if macro.Register(PAD_CFG_DW0).GetRxInvert() !=0 { + if macro.Register(PAD_CFG_DW0).GetRxInvert() != 0 { return macro.Add("INVERT") } return macro.Add("NONE") @@ -287,22 +287,21 @@ // or - Set " | " if its needed func (macro *Macro) Or() *Macro { - - if str := macro.Get(); str[len(str) - 1] == ')' { - macro.Add(" | ") - } - return macro + if str := macro.Get(); str[len(str)-1] == ')' { + macro.Add(" | ") + } + return macro } // DecodeIgnored - Add info about ignored field mask // reg : PAD_CFG_DW0 or PAD_CFG_DW1 register func (macro *Macro) DecodeIgnored(reg uint8) *Macro { - var decode = map[uint8]func() { + var decode = map[uint8]func(){ PAD_CFG_DW0: macro.Fields.DecodeDW0, PAD_CFG_DW1: macro.Fields.DecodeDW1, } decodefn, valid := decode[reg] - if !valid || config.IsFspStyleMacro() { + if !valid || p2m.SettingsGet().Field == p2m.FspFlds { return macro } dw := macro.Register(reg) @@ -328,21 +327,22 @@ dw0Ignored := dw0.IgnoredFieldsGet() dw1Ignored := dw1.IgnoredFieldsGet() - if config.InfoLevelGet() != 4 { + config := p2m.SettingsGet() + if config.GenLevel != 4 { macro.Clear() } - if config.InfoLevelGet() >= 3 { + if config.GenLevel >= 3 { // Add string of reference macro as a comment reference := macro.Get() macro.Clear() /* DW0 : PAD_TRIG(OFF) | PAD_BUF(RX_DISABLE) | 1 - IGNORED */ macro.DecodeIgnored(PAD_CFG_DW0).DecodeIgnored(PAD_CFG_DW1) - if config.InfoLevelGet() >= 4 { + if config.GenLevel >= 4 { /* PAD_CFG_NF(GPP_B23, 20K_PD, PLTRST, NF2), */ macro.Add("/* ").Add(reference).Add(" */\n\t") } } - if config.AreFieldsIgnored() { + if config.IgnoredFields { // Consider bit fields that should be ignored when regenerating // advansed macros var tempVal uint32 = dw0.ValueGet() & ^dw0Ignored @@ -404,17 +404,19 @@ macro.Platform.NativeFunctionMacroAdd() } - if config.IsFieldsMacroUsed() { + config := p2m.SettingsGet() + + if config.Field != p2m.NoFlds { // Clear control mask to generate advanced macro only return macro.GenerateFields().Get() } - if config.IsNonCheckingFlagUsed() { + if !config.AutoCheck { body := macro.Get() - if config.InfoLevelGet() >= 3 { + if config.GenLevel >= 3 { macro.Clear().DecodeIgnored(PAD_CFG_DW0).DecodeIgnored(PAD_CFG_DW1) comment := macro.Get() - if config.InfoLevelGet() >= 4 { + if config.GenLevel >= 4 { macro.Clear().Add("/* ") macro.Fields.GenerateString() macro.Add(" */\n\t") diff --git a/util/intelp2m/platforms/snr/macro.go b/util/intelp2m/platforms/snr/macro.go index 5958b9f..5ead7e9 100644 --- a/util/intelp2m/platforms/snr/macro.go +++ b/util/intelp2m/platforms/snr/macro.go @@ -4,7 +4,7 @@ "fmt" "strings" - "review.coreboot.org/coreboot.git/util/intelp2m/config" + "review.coreboot.org/coreboot.git/util/intelp2m/config/p2m" "review.coreboot.org/coreboot.git/util/intelp2m/fields" "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common" ) @@ -153,13 +153,13 @@ } } - switch argc := len(ids); argc { + switch config, argc := p2m.SettingsGet(), len(ids); argc { case 0: // e.g. PAD_CFG_GPI_TRIG_OWN(pad, pull, rst, trig, own) macro.Add("_TRIG_OWN").Add("(").Id().Pull().Rstsrc().Trig().Own().Add("),") case 1: // GPI with IRQ route - if config.AreFieldsIgnored() { + if config.IgnoredFields { // Set Host Software Ownership to ACPI mode macro.SetPadOwnership(common.PAD_OWN_ACPI) } @@ -168,7 +168,7 @@ // PAD_CFG_GPI_DUAL_ROUTE(pad, pull, rst, trig, inv, route1, route2) macro.Set("PAD_CFG_GPI_DUAL_ROUTE(").Id().Pull().Rstsrc().Trig().Invert() macro.Add(", " + ids[0] + ", " + ids[1] + "),") - if config.AreFieldsIgnored() { + if config.IgnoredFields { // Set Host Software Ownership to ACPI mode macro.SetPadOwnership(common.PAD_OWN_ACPI) } diff --git a/util/intelp2m/platforms/test/suite.go b/util/intelp2m/platforms/test/suite.go index b161ca4..314315c 100644 --- a/util/intelp2m/platforms/test/suite.go +++ b/util/intelp2m/platforms/test/suite.go @@ -4,7 +4,7 @@ "fmt" "testing" - "review.coreboot.org/coreboot.git/util/intelp2m/config" + "review.coreboot.org/coreboot.git/util/intelp2m/config/p2m" ) type ( @@ -29,14 +29,22 @@ ) func (p Pad) toShortMacro(platform PlatformSpecificIf) string { - config.FldStyleSet("none") - config.NonCheckingFlagSet(true) + config := p2m.SettingsGet() + if err := config.SetFieldType("none"); err != nil { + panic(err) + } + config.AutoCheck = false + p2m.SettingsUpdate(config) return platform.GenMacro(p.ID, p.DW0, p.DW1, p.Ownership) } func (p Pad) toLongMacro(platform PlatformSpecificIf) string { - config.FldStyleSet("cb") - config.NonCheckingFlagSet(false) + config := p2m.SettingsGet() + if err := config.SetFieldType("cb"); err != nil { + panic(err) + } + config.AutoCheck = true + p2m.SettingsUpdate(config) return platform.GenMacro(p.ID, p.DW0, p.DW1, p.Ownership) } -- To view, visit https://review.coreboot.org/c/coreboot/+/70308 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ia1b19ae3122bcf6ec740ae4683d62f31570670b1 Gerrit-Change-Number: 70308 Gerrit-PatchSet: 1 Gerrit-Owner: Maxim Polyakov <max.senia.poliak(a)gmail.com> Gerrit-MessageType: newchange

1 0

[L] Change in coreboot[master]: intelp2m: Drop multi-template support
by Maxim Polyakov (Code Review) 03 Dec '22

03 Dec '22

Maxim Polyakov has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/70307 ) Change subject: intelp2m: Drop multi-template support ...................................................................... intelp2m: Drop multi-template support Exclude the template to parse gpio.h, since coreboot no longer has such files with raw DW register values. The new GPIO config should be generated using inteltool.log only. Change-Id: I07124cca487f11641c4e107134efb8cfc29c6731 Signed-off-by: Maxim Polyakov <max.senia.poliak(a)gmail.com> --- M util/intelp2m/config/config.go M util/intelp2m/main.go M util/intelp2m/parser/parser.go M util/intelp2m/parser/template.go M util/intelp2m/parser/template_test.go M util/intelp2m/platforms/adl/macro.go M util/intelp2m/platforms/cnl/macro.go M util/intelp2m/platforms/lbg/macro.go M util/intelp2m/platforms/snr/macro.go 9 files changed, 84 insertions(+), 173 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/70307/1 diff --git a/util/intelp2m/config/config.go b/util/intelp2m/config/config.go index 4d2a700..0444ddf 100644 --- a/util/intelp2m/config/config.go +++ b/util/intelp2m/config/config.go @@ -3,32 +3,11 @@ import "os" const ( - TempInteltool int = 0 - TempGpioh int = 1 - TempSpec int = 2 -) - -var template int = 0 - -func TemplateSet(temp int) bool { - if temp > TempSpec { - return false - } else { - template = temp - return true - } -} - -func TemplateGet() int { - return template -} - -const ( - SunriseType uint8 = 0 - LewisburgType uint8 = 1 - ApolloType uint8 = 2 - CannonType uint8 = 3 - AlderType uint8 = 4 + SunriseType uint8 = 0 + LewisburgType uint8 = 1 + ApolloType uint8 = 2 + CannonType uint8 = 3 + AlderType uint8 = 4 ) var key uint8 = SunriseType @@ -39,6 +18,7 @@ "apl": ApolloType, "cnl": CannonType, "adl": AlderType} + func PlatformSet(name string) int { if platformType, valid := platform[name]; valid { key = platformType @@ -72,6 +52,7 @@ var OutputGenFile *os.File = nil var ignoredFieldsFormat bool = false + func IgnoredFieldsFlagSet(flag bool) { ignoredFieldsFormat = flag } @@ -80,6 +61,7 @@ } var nonCheckingFlag bool = false + func NonCheckingFlagSet(flag bool) { nonCheckingFlag = flag } @@ -87,8 +69,8 @@ return nonCheckingFlag } - var infolevel int = 0 + func InfoLevelSet(lvl int) { infolevel = lvl } @@ -97,17 +79,20 @@ } var fldstyle uint8 = CbFlds + const ( - NoFlds uint8 = 0 - CbFlds uint8 = 1 // coreboot style - FspFlds uint8 = 2 // FSP/edk2 style - RawFlds uint8 = 3 // raw DW0/1 values + NoFlds uint8 = 0 + CbFlds uint8 = 1 // coreboot style + FspFlds uint8 = 2 // FSP/edk2 style + RawFlds uint8 = 3 // raw DW0/1 values ) + var fldstylemap = map[string]uint8{ - "none" : NoFlds, - "cb" : CbFlds, - "fsp" : FspFlds, - "raw" : RawFlds} + "none": NoFlds, + "cb": CbFlds, + "fsp": FspFlds, + "raw": RawFlds} + func FldStyleSet(name string) int { if style, valid := fldstylemap[name]; valid { fldstyle = style diff --git a/util/intelp2m/main.go b/util/intelp2m/main.go index a8c3c65..e1a51c8 100644 --- a/util/intelp2m/main.go +++ b/util/intelp2m/main.go @@ -61,11 +61,6 @@ flag.Bool("iiii", false, "Show target PAD_CFG() macro in the comments"), } - template := flag.Int("t", 0, "template type number\n"+ - "\t0 - inteltool.log (default)\n"+ - "\t1 - gpio.h\n"+ - "\t2 - your template\n\t") - platform := flag.String("p", "snr", "set platform:\n"+ "\tsnr - Sunrise PCH or Skylake/Kaby Lake SoC\n"+ "\tlbg - Lewisburg PCH with Xeon SP\n"+ @@ -92,11 +87,6 @@ } } - if !config.TemplateSet(*template) { - fmt.Printf("Error! Unknown template format of input file!\n") - os.Exit(1) - } - if valid := config.PlatformSet(*platform); valid != 0 { fmt.Printf("Error: invalid platform -%s!\n", *platform) os.Exit(1) diff --git a/util/intelp2m/parser/parser.go b/util/intelp2m/parser/parser.go index 63f24d1..e411534 100644 --- a/util/intelp2m/parser/parser.go +++ b/util/intelp2m/parser/parser.go @@ -57,12 +57,10 @@ // return the host software ownership form the parser struct func (parser *ParserData) hostOwnershipGet(id string) uint8 { var ownership uint8 = 0 - status, group := parser.platform.GroupNameExtract(id) - if config.TemplateGet() == config.TempInteltool && status { - numder, _ := strconv.Atoi(strings.TrimLeft(id, group)) - if (parser.ownership[group] & (1 << uint8(numder))) != 0 { - ownership = 1 - } + _, group := parser.platform.GroupNameExtract(id) + numder, _ := strconv.Atoi(strings.TrimLeft(id, group)) + if (parser.ownership[group] & (1 << uint8(numder))) != 0 { + ownership = 1 } return ownership } @@ -72,22 +70,17 @@ func (parser *ParserData) padInfoExtract() int { var function, id string var dw0, dw1 uint32 - var template = map[int]template{ - config.TempInteltool: UseInteltoolLogTemplate, - config.TempGpioh: useGpioHTemplate, - config.TempSpec: useYourTemplate, + if rc := UseTemplate(parser.line, &function, &id, &dw0, &dw1); rc != 0 { + return rc } - if template[config.TemplateGet()](parser.line, &function, &id, &dw0, &dw1) == 0 { - pad := padInfo{id: id, - function: function, - dw0: dw0, - dw1: dw1, - ownership: parser.hostOwnershipGet(id)} - parser.padmap = append(parser.padmap, pad) - return 0 - } - fmt.Printf("This template (%d) does not match!\n", config.TemplateGet()) - return -1 + pad := padInfo{id: id, + function: function, + dw0: dw0, + dw1: dw1, + ownership: parser.hostOwnershipGet(id)} + parser.padmap = append(parser.padmap, pad) + return 0 + } // communityGroupExtract @@ -129,8 +122,7 @@ offset uint32, value uint32, ) { - if strings.Contains(parser.line, nameTemplate) && - config.TemplateGet() == config.TempInteltool { + if strings.Contains(parser.line, nameTemplate) { if registerInfoTemplate(parser.line, &name, &offset, &value) == 0 { fmt.Printf("\n\t/* %s : 0x%x : 0x%x */\n", name, offset, value) return true, name, offset, value @@ -157,7 +149,7 @@ // information from the inteltool log was successfully parsed. func (parser *ParserData) padConfigurationExtract() bool { // Only for Sunrise or CannonLake, and only for inteltool.log file template - if config.TemplateGet() != config.TempInteltool || config.IsPlatformApollo() { + if config.IsPlatformApollo() { return false } return parser.padOwnershipExtract() diff --git a/util/intelp2m/parser/template.go b/util/intelp2m/parser/template.go index fc67e73..e7efa73 100644 --- a/util/intelp2m/parser/template.go +++ b/util/intelp2m/parser/template.go @@ -32,7 +32,7 @@ return c != '_' && c != '#' && !unicode.IsLetter(c) && !unicode.IsNumber(c) } -// useGpioHTemplate +// UseTemplate // line : string from file with pad config map // *function : the string that means the pad function // *id : pad id string @@ -40,9 +40,7 @@ // *dw1 : DW1 register value // return // error status -func UseInteltoolLogTemplate(line string, function *string, - id *string, dw0 *uint32, dw1 *uint32) int { - +func UseTemplate(line string, function *string, id *string, dw0 *uint32, dw1 *uint32) int { var val uint64 // 0x0520: 0x0000003c44000600 GPP_B12 SLP_S0# // 0x0438: 0xffffffffffffffff GPP_C7 RESERVED @@ -64,56 +62,6 @@ return 0 } -// useGpioHTemplate -// line : string from file with pad config map -// *function : the string that means the pad function -// *id : pad id string -// *dw0 : DW0 register value -// *dw1 : DW1 register value -// return -// error status -func useGpioHTemplate(line string, function *string, - id *string, dw0 *uint32, dw1 *uint32) int { - - // /* RCIN# */ _PAD_CFG_STRUCT(GPP_A0, 0x44000702, 0x00000000), - // _PAD_CFG_STRUCT(GPP_A0, 0x44000702, 0x00000000), /* RCIN# */ - // _PAD_CFG_STRUCT(GPP_A0, 0x44000702, 0x00000000) - fields := strings.FieldsFunc(line, tokenCheck) - for i, field := range fields { - if field == "_PAD_CFG_STRUCT" { - if len(fields) < 4 { - /* the number of definitions does not match the format */ - return -1 - } - - if !strings.Contains(fields[i+2], "0x") || !strings.Contains(fields[i+3], "0x") { - /* definitions inside the macro do not match the pattern */ - return -1 - } - *id = fields[i+1] - fmt.Sscanf(fields[i+2], "0x%x", dw0) - fmt.Sscanf(fields[i+3], "0x%x", dw1) - *function = extractPadFuncFromComment(line) - return 0 - } - } - return -1 -} - -// useYourTemplate -func useYourTemplate(line string, function *string, - id *string, dw0 *uint32, dw1 *uint32) int { - - // ADD YOUR TEMPLATE HERE - *function = "" - *id = "" - *dw0 = 0 - *dw1 = 0 - - fmt.Printf("ADD YOUR TEMPLATE!\n") - return -1 -} - // registerInfoTemplate // line : (in) string from file with pad config map // *name : (out) register name diff --git a/util/intelp2m/parser/template_test.go b/util/intelp2m/parser/template_test.go index 98ccb3f..95f8ebf 100644 --- a/util/intelp2m/parser/template_test.go +++ b/util/intelp2m/parser/template_test.go @@ -20,7 +20,7 @@ dw0, dw1 uint32 ) line := fmt.Sprintf("0x0520: 0x%08x%08x %s %s", ref_dw1, ref_dw0, ref_id, ref_fn) - _ = parser.UseInteltoolLogTemplate(line, &fn, &id, &dw0, &dw1) + _ = parser.UseTemplate(line, &fn, &id, &dw0, &dw1) if fn != ref_fn { t.Errorf("function from '%s':\nExpects: '%s'\nActually: '%s'\n\n", line, ref_fn, fn) diff --git a/util/intelp2m/platforms/adl/macro.go b/util/intelp2m/platforms/adl/macro.go index d7b1f58..2c4b5d8 100644 --- a/util/intelp2m/platforms/adl/macro.go +++ b/util/intelp2m/platforms/adl/macro.go @@ -1,14 +1,13 @@ package adl import ( - "strings" "fmt" + "strings" + "review.coreboot.org/coreboot.git/util/intelp2m/fields" + "review.coreboot.org/coreboot.git/util/intelp2m/platforms/cnl" "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 ( @@ -37,10 +36,6 @@ // 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 Alderlake GPD Group in the Community 2: // https://github.com/coreboot/coreboot/blob/master/src/soc/intel/alderlake/gp… @@ -51,9 +46,9 @@ dw0 := macro.Register(PAD_CFG_DW0) var remapping = map[uint8]uint32{ 0: common.RST_RSMRST << common.PadRstCfgShift, - 1: common.RST_DEEP << common.PadRstCfgShift, + 1: common.RST_DEEP << common.PadRstCfgShift, 2: common.RST_PLTRST << common.PadRstCfgShift, - 3: common.RST_PWROK << common.PadRstCfgShift, + 3: common.RST_PWROK << common.PadRstCfgShift, } resetsrc, valid := remapping[dw0.GetResetConfig()] if valid { @@ -61,7 +56,7 @@ ResetConfigFieldVal := (dw0.ValueGet() & 0x3fffffff) | remapping[dw0.GetResetConfig()] dw0.ValueSet(ResetConfigFieldVal) } else { - fmt.Println("Invalid Pad Reset Config [ 0x", resetsrc ," ] for ", macro.PadIdGet()) + fmt.Println("Invalid Pad Reset Config [ 0x", resetsrc, " ] for ", macro.PadIdGet()) } dw0.CntrMaskFieldsClear(common.PadRstCfgMask) } diff --git a/util/intelp2m/platforms/cnl/macro.go b/util/intelp2m/platforms/cnl/macro.go index 5526b8f..02c47eb 100644 --- a/util/intelp2m/platforms/cnl/macro.go +++ b/util/intelp2m/platforms/cnl/macro.go @@ -1,12 +1,12 @@ package cnl import ( - "strings" "fmt" + "strings" - "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/common" "review.coreboot.org/coreboot.git/util/intelp2m/platforms/snr" ) @@ -35,13 +35,9 @@ // 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(), "GPP_A") || - strings.Contains(macro.PadIdGet(), "GPP_B") || - strings.Contains(macro.PadIdGet(), "GPP_G") { + strings.Contains(macro.PadIdGet(), "GPP_B") || + strings.Contains(macro.PadIdGet(), "GPP_G") { // See reset map for the Cannonlake Groups the Community 0: // https://github.com/coreboot/coreboot/blob/master/src/soc/intel/cannonlake/g… // remmap is not required because it is the same as common. @@ -51,7 +47,7 @@ dw0 := macro.Register(PAD_CFG_DW0) var remapping = map[uint8]uint32{ 0: common.RST_RSMRST << common.PadRstCfgShift, - 1: common.RST_DEEP << common.PadRstCfgShift, + 1: common.RST_DEEP << common.PadRstCfgShift, 2: common.RST_PLTRST << common.PadRstCfgShift, } resetsrc, valid := remapping[dw0.GetResetConfig()] @@ -60,7 +56,7 @@ ResetConfigFieldVal := (dw0.ValueGet() & 0x3fffffff) | remapping[dw0.GetResetConfig()] dw0.ValueSet(ResetConfigFieldVal) } else { - fmt.Println("Invalid Pad Reset Config [ 0x", resetsrc ," ] for ", macro.PadIdGet()) + fmt.Println("Invalid Pad Reset Config [ 0x", resetsrc, " ] for ", macro.PadIdGet()) } dw0.CntrMaskFieldsClear(common.PadRstCfgMask) } @@ -85,9 +81,9 @@ if !valid { str = "INVALID" fmt.Println("Error", - macro.PadIdGet(), - " invalid TERM value = ", - int(dw1.GetTermination())) + macro.PadIdGet(), + " invalid TERM value = ", + int(dw1.GetTermination())) } macro.Separator().Add(str) } @@ -146,7 +142,7 @@ macro := common.GetMacro() var ids []string macro.Set("PAD_CFG_GPI") - for routeid, isRoute := range map[string]func() (bool) { + for routeid, isRoute := range map[string]func() bool{ "IOAPIC": ioApicRoute, "SCI": sciRoute, "SMI": smiRoute, @@ -204,7 +200,7 @@ // return: string of macro // error func (PlatformSpecific) GenMacro(id string, dw0 uint32, dw1 uint32, ownership uint8) string { - macro := common.GetInstanceMacro(PlatformSpecific{InheritanceMacro : snr.PlatformSpecific{}}, + macro := common.GetInstanceMacro(PlatformSpecific{InheritanceMacro: snr.PlatformSpecific{}}, fields.InterfaceGet()) macro.Clear() macro.Register(PAD_CFG_DW0).CntrMaskFieldsClear(common.AllFields) diff --git a/util/intelp2m/platforms/lbg/macro.go b/util/intelp2m/platforms/lbg/macro.go index db34f8e..bb08e28 100644 --- a/util/intelp2m/platforms/lbg/macro.go +++ b/util/intelp2m/platforms/lbg/macro.go @@ -3,9 +3,8 @@ 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/common" "review.coreboot.org/coreboot.git/util/intelp2m/platforms/snr" ) @@ -36,14 +35,10 @@ // 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, + 1: common.RST_DEEP << common.PadRstCfgShift, 2: common.RST_PLTRST << common.PadRstCfgShift, } resetsrc, valid := remapping[dw0.GetResetConfig()] @@ -52,7 +47,7 @@ ResetConfigFieldVal := (dw0.ValueGet() & 0x3fffffff) | remapping[dw0.GetResetConfig()] dw0.ValueSet(ResetConfigFieldVal) } else { - fmt.Println("Invalid Pad Reset Config [ 0x", resetsrc ," ] for ", macro.PadIdGet()) + fmt.Println("Invalid Pad Reset Config [ 0x", resetsrc, " ] for ", macro.PadIdGet()) } dw0.CntrMaskFieldsClear(common.PadRstCfgMask) } @@ -91,8 +86,8 @@ func (platform PlatformSpecific) GenMacro(id string, dw0 uint32, dw1 uint32, ownership uint8) string { // The GPIO controller architecture in Lewisburg and Sunrise are very similar, // so we will inherit some platform-dependent functions from Sunrise. - macro := common.GetInstanceMacro(PlatformSpecific{InheritanceMacro : snr.PlatformSpecific{}}, - fields.InterfaceGet()) + macro := common.GetInstanceMacro(PlatformSpecific{InheritanceMacro: snr.PlatformSpecific{}}, + fields.InterfaceGet()) macro.Clear() macro.Register(PAD_CFG_DW0).CntrMaskFieldsClear(common.AllFields) macro.Register(PAD_CFG_DW0).CntrMaskFieldsClear(common.AllFields) diff --git a/util/intelp2m/platforms/snr/macro.go b/util/intelp2m/platforms/snr/macro.go index 4e17010..5958b9f 100644 --- a/util/intelp2m/platforms/snr/macro.go +++ b/util/intelp2m/platforms/snr/macro.go @@ -1,12 +1,12 @@ package snr import ( - "strings" "fmt" + "strings" - "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/common" ) const ( @@ -20,15 +20,11 @@ MAX_DW_NUM = common.MAX_DW_NUM ) -type PlatformSpecific struct {} +type PlatformSpecific struct{} // 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 Sunrise GPD Group in the Community 2: // https://github.com/coreboot/coreboot/blob/master/src/soc/intel/skylake/gpio… @@ -39,7 +35,7 @@ dw0 := macro.Register(PAD_CFG_DW0) var remapping = map[uint8]uint32{ 0: common.RST_RSMRST << common.PadRstCfgShift, - 1: common.RST_DEEP << common.PadRstCfgShift, + 1: common.RST_DEEP << common.PadRstCfgShift, 2: common.RST_PLTRST << common.PadRstCfgShift, } resetsrc, valid := remapping[dw0.GetResetConfig()] @@ -48,7 +44,7 @@ ResetConfigFieldVal := (dw0.ValueGet() & 0x3fffffff) | remapping[dw0.GetResetConfig()] dw0.ValueSet(ResetConfigFieldVal) } else { - fmt.Println("Invalid Pad Reset Config [ 0x", resetsrc ," ] for ", macro.PadIdGet()) + fmt.Println("Invalid Pad Reset Config [ 0x", resetsrc, " ] for ", macro.PadIdGet()) } dw0.CntrMaskFieldsClear(common.PadRstCfgMask) } @@ -73,9 +69,9 @@ if !valid { str = "INVALID" fmt.Println("Error", - macro.PadIdGet(), - " invalid TERM value = ", - int(dw1.GetTermination())) + macro.PadIdGet(), + " invalid TERM value = ", + int(dw1.GetTermination())) } macro.Separator().Add(str) } @@ -146,7 +142,7 @@ macro := common.GetMacro() var ids []string macro.Set("PAD_CFG_GPI") - for routeid, isRoute := range map[string]func() (bool) { + for routeid, isRoute := range map[string]func() bool{ "IOAPIC": ioApicRoute, "SCI": sciRoute, "SMI": smiRoute, -- To view, visit https://review.coreboot.org/c/coreboot/+/70307 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I07124cca487f11641c4e107134efb8cfc29c6731 Gerrit-Change-Number: 70307 Gerrit-PatchSet: 1 Gerrit-Owner: Maxim Polyakov <max.senia.poliak(a)gmail.com> Gerrit-MessageType: newchange

1 0

[M] Change in coreboot[master]: util/intelp2m: Print the current project verion
by Maxim Polyakov (Code Review) 03 Dec '22

03 Dec '22

Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/67321 to look at the new patch set (#8). Change subject: util/intelp2m: Print the current project verion ...................................................................... util/intelp2m: Print the current project verion Print the current project version in the console and in the generated file with the pad configuration: version = major-minor; major = 1.0; minor = last commit in the intelp2m directory. Change-Id: Id2fd0757c003004af976309a44dbbfff0eb517a7 Signed-off-by: Maxim Polyakov <max.senia.poliak(a)gmail.com> --- M util/intelp2m/Makefile M util/intelp2m/main.go 2 files changed, 52 insertions(+), 20 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/21/67321/8 -- To view, visit https://review.coreboot.org/c/coreboot/+/67321 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Id2fd0757c003004af976309a44dbbfff0eb517a7 Gerrit-Change-Number: 67321 Gerrit-PatchSet: 8 Gerrit-Owner: Maxim Polyakov <max.senia.poliak(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: newpatchset

1 0

[S] Change in coreboot[master]: acpi/acpi.c: update ACPI table revisions
by Tim Wawrzynczak (Code Review) 03 Dec '22

03 Dec '22

Attention is currently required from: Lance Zhao, Jonathan Zhang, Angel Pons. Tim Wawrzynczak has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/70245 ) Change subject: acpi/acpi.c: update ACPI table revisions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/70245 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Iecc3a9892b0f8093013b2a426749e2ec5c00803b Gerrit-Change-Number: 70245 Gerrit-PatchSet: 1 Gerrit-Owner: Jonathan Zhang <jonzhang(a)fb.com> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Lance Zhao Gerrit-Reviewer: Tim Wawrzynczak <inforichland(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Lance Zhao Gerrit-Attention: Jonathan Zhang <jonzhang(a)fb.com> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Sat, 03 Dec 2022 20:19:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in coreboot[master]: mb/google/poppy: Add support for a variant finalize function
by Subrata Banik (Code Review) 03 Dec '22

03 Dec '22

Attention is currently required from: Tarun Tuli, Eran Mitrani, Kapil Porwal. Subrata Banik has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/70319 ) Change subject: mb/google/poppy: Add support for a variant finalize function ...................................................................... Patch Set 3: (1 comment) File src/mainboard/google/poppy/mainboard.c: https://review.coreboot.org/c/coreboot/+/70319/comment/d29a749c_31b4e542 PS3, Line 64: { nit: You can add something like this void __weak variant_final(void) { /* nop */ } -- To view, visit https://review.coreboot.org/c/coreboot/+/70319 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I00c091051e3499ca94b286d7fbe0a7a8bd38e635 Gerrit-Change-Number: 70319 Gerrit-PatchSet: 3 Gerrit-Owner: Tarun Tuli <taruntuli(a)google.com> Gerrit-Reviewer: Eran Mitrani <mitrani(a)google.com> Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Attention: Tarun Tuli <taruntuli(a)google.com> Gerrit-Attention: Eran Mitrani <mitrani(a)google.com> Gerrit-Attention: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Comment-Date: Sat, 03 Dec 2022 19:29:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in coreboot[master]: mb/google/poppy: Add support for a variant finalize function
by Subrata Banik (Code Review) 03 Dec '22

03 Dec '22

Attention is currently required from: Tarun Tuli, Eran Mitrani, Kapil Porwal. Subrata Banik has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/70319 ) Change subject: mb/google/poppy: Add support for a variant finalize function ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/70319 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I00c091051e3499ca94b286d7fbe0a7a8bd38e635 Gerrit-Change-Number: 70319 Gerrit-PatchSet: 3 Gerrit-Owner: Tarun Tuli <taruntuli(a)google.com> Gerrit-Reviewer: Eran Mitrani <mitrani(a)google.com> Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Attention: Tarun Tuli <taruntuli(a)google.com> Gerrit-Attention: Eran Mitrani <mitrani(a)google.com> Gerrit-Attention: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Comment-Date: Sat, 03 Dec 2022 19:28:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit December 2022