coreboot-gerrit May 2019

coreboot-gerrit@coreboot.org

1 participants
1485 discussions

Change in ...libgfxinit[master]: gma config: Introduce Has_New_FDI_(Sink|Source)
by Nico Huber (Code Review) 06 May '19

06 May '19

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/c/libgfxinit/+/27051 ) Change subject: gma config: Introduce Has_New_FDI_(Sink|Source) ...................................................................... gma config: Introduce Has_New_FDI_(Sink|Source) Change-Id: Ib9a5951abf62ed01583ad028bc944c0135744457 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/libgfxinit/+/27051 Reviewed-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M common/hw-gfx-gma-config.ads.template M common/hw-gfx-gma-pch-fdi.adb M common/hw-gfx-gma-pch.ads M common/ironlake/hw-gfx-gma-connectors-fdi.adb 4 files changed, 6 insertions(+), 10 deletions(-) Approvals: Nico Huber: Verified Arthur Heymans: Looks good to me, approved diff --git a/common/hw-gfx-gma-config.ads.template b/common/hw-gfx-gma-config.ads.template index 398b340..c6af93a 100644 --- a/common/hw-gfx-gma-config.ads.template +++ b/common/hw-gfx-gma-config.ads.template @@ -87,6 +87,8 @@ Has_DPLL_SEL : constant Boolean := CPU in Ironlake .. Ivybridge; Has_FDI_BPC : constant Boolean := CPU in Ironlake .. Ivybridge; Has_FDI_Composite_Sel : constant Boolean := CPU = Ivybridge; + Has_New_FDI_Sink : constant Boolean := CPU >= Sandybridge; + Has_New_FDI_Source : constant Boolean := CPU >= Ivybridge; Has_Trans_DP_Ctl : constant Boolean := CPU in Sandybridge .. Ivybridge; Has_FDI_C : constant Boolean := CPU = Ivybridge; diff --git a/common/hw-gfx-gma-pch-fdi.adb b/common/hw-gfx-gma-pch-fdi.adb index 95bc19f..53756e2 100644 --- a/common/hw-gfx-gma-pch-fdi.adb +++ b/common/hw-gfx-gma-pch-fdi.adb @@ -30,7 +30,7 @@ FDI_RX_CTL_RAWCLK_TO_PCDCLK_SEL_RAWCLK : constant := 0 * 2 ** 4; FDI_RX_CTL_RAWCLK_TO_PCDCLK_SEL_PCDCLK : constant := 1 * 2 ** 4; - TP_SHIFT : constant := (if Config.CPU = Ironlake then 28 else 8); + TP_SHIFT : constant := (if Config.Has_New_FDI_Sink then 8 else 28); FDI_RX_CTL_TRAINING_PATTERN_MASK : constant := 3 * 2 ** TP_SHIFT; type TP_Array is array (Training_Pattern) of Word32; diff --git a/common/hw-gfx-gma-pch.ads b/common/hw-gfx-gma-pch.ads index 106d2e8..0acc852 100644 --- a/common/hw-gfx-gma-pch.ads +++ b/common/hw-gfx-gma-pch.ads @@ -23,16 +23,10 @@ -- common to all PCH outputs PCH_TRANSCODER_SELECT_SHIFT : constant := - (case Config.CPU is - when Ironlake => 30, - when Sandybridge | Ivybridge => 29, - when others => 0); + (if Config.Has_New_FDI_Sink then 29 else 30); PCH_TRANSCODER_SELECT_MASK : constant := - (case Config.CPU is - when Ironlake => 1 * 2 ** 30, - when Sandybridge | Ivybridge => 3 * 2 ** 29, - when others => 0); + (if Config.Has_New_FDI_Sink then 3 * 2 ** 29 else 1 * 2 ** 30); type PCH_TRANSCODER_SELECT_Array is array (FDI_Port_Type) of Word32; PCH_TRANSCODER_SELECT : constant PCH_TRANSCODER_SELECT_Array := diff --git a/common/ironlake/hw-gfx-gma-connectors-fdi.adb b/common/ironlake/hw-gfx-gma-connectors-fdi.adb index f38c135..4eec9c9 100644 --- a/common/ironlake/hw-gfx-gma-connectors-fdi.adb +++ b/common/ironlake/hw-gfx-gma-connectors-fdi.adb @@ -40,7 +40,7 @@ FDI_TX_CTL_AUTO_TRAIN_ENABLE : constant := 1 * 2 ** 10; FDI_TX_CTL_AUTO_TRAIN_DONE : constant := 1 * 2 ** 1; - TP_SHIFT : constant := (if Config.CPU <= Sandybridge then 28 else 8); + TP_SHIFT : constant := (if Config.Has_New_FDI_Source then 8 else 28); FDI_TX_CTL_TRAINING_PATTERN_MASK : constant := 3 * 2 ** TP_SHIFT; FDI_TX_CTL_TRAINING_PATTERN_1 : constant := 0 * 2 ** TP_SHIFT; FDI_TX_CTL_TRAINING_PATTERN_2 : constant := 1 * 2 ** TP_SHIFT; -- To view, visit https://review.coreboot.org/c/libgfxinit/+/27051 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: libgfxinit Gerrit-Branch: master Gerrit-Change-Id: Ib9a5951abf62ed01583ad028bc944c0135744457 Gerrit-Change-Number: 27051 Gerrit-PatchSet: 7 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-MessageType: merged

1 0

Change in ...libgfxinit[master]: gma config: Introduce Have_HDMI_Buf_Override
by Nico Huber (Code Review) 06 May '19

06 May '19

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/c/libgfxinit/+/27049 ) Change subject: gma config: Introduce Have_HDMI_Buf_Override ...................................................................... gma config: Introduce Have_HDMI_Buf_Override Change-Id: Id00ae200cc8d08ce245d57b2886a40f0fea10167 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/libgfxinit/+/27049 Reviewed-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M common/haswell/hw-gfx-gma-connectors-ddi-buffers.adb M common/haswell_shared/hw-gfx-gma-connectors-ddi.adb M common/hw-gfx-gma-config.ads.template 3 files changed, 3 insertions(+), 7 deletions(-) Approvals: Nico Huber: Verified Arthur Heymans: Looks good to me, approved diff --git a/common/haswell/hw-gfx-gma-connectors-ddi-buffers.adb b/common/haswell/hw-gfx-gma-connectors-ddi-buffers.adb index 57066b9..baceb10 100644 --- a/common/haswell/hw-gfx-gma-connectors-ddi-buffers.adb +++ b/common/haswell/hw-gfx-gma-connectors-ddi-buffers.adb @@ -120,11 +120,7 @@ procedure Translations (Trans : out Buf_Trans_Array; Port : Digital_Port) is HDMI_Trans : constant DDI_HDMI_Buf_Trans_Range := - (if (Config.CPU = Broadwell and - Config.DDI_HDMI_Buffer_Translation in Broadwell_HDMI_Range) - or - (Config.CPU /= Broadwell and - Config.DDI_HDMI_Buffer_Translation in Haswell_HDMI_Range) + (if Config.Have_HDMI_Buf_Override then Config.DDI_HDMI_Buffer_Translation else Config.Default_DDI_HDMI_Buffer_Translation); begin diff --git a/common/haswell_shared/hw-gfx-gma-connectors-ddi.adb b/common/haswell_shared/hw-gfx-gma-connectors-ddi.adb index 88f2b22..7f179ff 100644 --- a/common/haswell_shared/hw-gfx-gma-connectors-ddi.adb +++ b/common/haswell_shared/hw-gfx-gma-connectors-ddi.adb @@ -679,8 +679,7 @@ then declare HDMI_Level : constant DDI_Phy.HDMI_Buf_Trans_Range := - (if Config.DDI_HDMI_Buffer_Translation - in DDI_Phy.HDMI_Buf_Trans_Range + (if Config.Have_HDMI_Buf_Override then Config.DDI_HDMI_Buffer_Translation else Config.Default_DDI_HDMI_Buffer_Translation); begin diff --git a/common/hw-gfx-gma-config.ads.template b/common/hw-gfx-gma-config.ads.template index 150937d..398b340 100644 --- a/common/hw-gfx-gma-config.ads.template +++ b/common/hw-gfx-gma-config.ads.template @@ -35,6 +35,7 @@ ---------------------------------------------------------------------------- + Have_HDMI_Buf_Override : constant Boolean := DDI_HDMI_Buffer_Translation >= 0; Default_MMIO_Base_Set : constant Boolean := Default_MMIO_Base /= 0; Has_Internal_Display : constant Boolean := Internal_Display /= None; -- To view, visit https://review.coreboot.org/c/libgfxinit/+/27049 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: libgfxinit Gerrit-Branch: master Gerrit-Change-Id: Id00ae200cc8d08ce245d57b2886a40f0fea10167 Gerrit-Change-Number: 27049 Gerrit-PatchSet: 7 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-MessageType: merged

1 0

Change in ...libgfxinit[master]: gma config, port detection: Scatter Valid_Port initialization
by Nico Huber (Code Review) 06 May '19

06 May '19

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/c/libgfxinit/+/27047 ) Change subject: gma config, port detection: Scatter Valid_Port initialization ...................................................................... gma config, port detection: Scatter Valid_Port initialization We did overwrite most the default values for `Config.Valid_Port` anyway. So move the few remaining defaults where they are visible together with the other runtime settings. Change-Id: I17df08de0aa1ffb303646ea564c100bb702407f5 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/libgfxinit/+/27047 Reviewed-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M common/g45/hw-gfx-gma-port_detect.adb M common/haswell_shared/hw-gfx-gma-port_detect.adb M common/hw-gfx-gma-config.ads.template M common/hw-gfx-gma.adb M common/ironlake/hw-gfx-gma-port_detect.adb 5 files changed, 12 insertions(+), 55 deletions(-) Approvals: Nico Huber: Verified Arthur Heymans: Looks good to me, approved diff --git a/common/g45/hw-gfx-gma-port_detect.adb b/common/g45/hw-gfx-gma-port_detect.adb index c865079..479b626 100644 --- a/common/g45/hw-gfx-gma-port_detect.adb +++ b/common/g45/hw-gfx-gma-port_detect.adb @@ -73,6 +73,8 @@ DIGI_D => DP3); begin + Config.Valid_Port (Analog) := True; + Config.Valid_Port (Internal) := Config.Internal_Is_LVDS; for HDMI_Port in GMCH_HDMI_Port loop Registers.Is_Set_Mask (Register => GMCH_HDMI (HDMI_Port), diff --git a/common/haswell_shared/hw-gfx-gma-port_detect.adb b/common/haswell_shared/hw-gfx-gma-port_detect.adb index be83bd5..50c14cd 100644 --- a/common/haswell_shared/hw-gfx-gma-port_detect.adb +++ b/common/haswell_shared/hw-gfx-gma-port_detect.adb @@ -135,10 +135,8 @@ else DDI_Detected := True; end if; - Config.Valid_Port (To_HDMI_Port (Port)) := - Config.Valid_Port (To_HDMI_Port (Port)) and DDI_Detected; - Config.Valid_Port (To_DP_Port (Port)) := - Config.Valid_Port (To_DP_Port (Port)) and DDI_Detected; + Config.Valid_Port (To_HDMI_Port (Port)) := DDI_Detected; + Config.Valid_Port (To_DP_Port (Port)) := DDI_Detected; if DDI_Detected then Registers.Unset_And_Set_Mask diff --git a/common/hw-gfx-gma-config.ads.template b/common/hw-gfx-gma-config.ads.template index a922b05..150937d 100644 --- a/common/hw-gfx-gma-config.ads.template +++ b/common/hw-gfx-gma-config.ads.template @@ -14,7 +14,7 @@ private package HW.GFX.GMA.Config with - Initializes => (Valid_Port_GPU, Raw_Clock) + Initializes => (Valid_Port, Raw_Clock) is CPU : constant CPU_Type := <<CPU>>; @@ -38,6 +38,7 @@ Default_MMIO_Base_Set : constant Boolean := Default_MMIO_Base /= 0; Has_Internal_Display : constant Boolean := Internal_Display /= None; + Internal_Is_LVDS : constant Boolean := Internal_Display = LVDS; Internal_Is_EDP : constant Boolean := Internal_Display = DP; Have_DVI_I : constant Boolean := Analog_I2C_Port /= PCH_DAC; Has_Presence_Straps : constant Boolean := CPU /= Broxton; @@ -136,55 +137,9 @@ Max_Pipe : constant Pipe_Index := (if Has_Tertiary_Pipe then Tertiary else Secondary); - type Valid_Per_Port is array (Port_Type) of Boolean; - type Valid_Per_GPU is array (CPU_Type) of Valid_Per_Port; - Valid_Port_GPU : Valid_Per_GPU := - (G45 => - (Disabled => False, - Internal => Config.Internal_Display = LVDS, - HDMI3 => False, - others => True), - Ironlake => - (Disabled => False, - Internal => Config.Internal_Display = LVDS, - others => True), - Sandybridge => - (Disabled => False, - Internal => Config.Internal_Display = LVDS, - others => True), - Ivybridge => - (Disabled => False, - Internal => Config.Internal_Display /= None, - others => True), - Haswell => - (Disabled => False, - Internal => Config.Internal_Display = DP, - HDMI3 => CPU_Var = Normal, - DP3 => CPU_Var = Normal, - Analog => CPU_Var = Normal, - others => True), - Broadwell => - (Disabled => False, - Internal => Config.Internal_Display = DP, - HDMI3 => CPU_Var = Normal, - DP3 => CPU_Var = Normal, - Analog => CPU_Var = Normal, - others => True), - Broxton => - (Internal => Config.Internal_Display = DP, - DP1 => True, - DP2 => True, - HDMI1 => True, - HDMI2 => True, - others => False), - Skylake => - (Disabled => False, - Internal => Config.Internal_Display = DP, - Analog => False, - others => True)) + Valid_Port : array (Port_Type) of Boolean := (others => False) with Part_Of => GMA.Config_State; - Valid_Port : Valid_Per_Port renames Valid_Port_GPU (CPU); Last_Digital_Port : constant Digital_Port := (if Has_DDI_E then DIGI_E else DIGI_C); @@ -195,7 +150,7 @@ Is_FDI_Port : constant FDI_Per_Port := (case CPU is when Ironlake .. Ivybridge => FDI_Per_Port' - (Internal => Internal_Display = LVDS, + (Internal => Internal_Is_LVDS, others => True), when Haswell .. Broadwell => FDI_Per_Port' (Analog => Has_PCH_DAC, diff --git a/common/hw-gfx-gma.adb b/common/hw-gfx-gma.adb index a443132..b3d9362 100644 --- a/common/hw-gfx-gma.adb +++ b/common/hw-gfx-gma.adb @@ -44,7 +44,7 @@ HPD_Delay, Wait_For_HPD, Linear_FB_Base), Init_State => Initialized, - Config_State => (Config.Valid_Port_GPU, Config.Raw_Clock), + Config_State => (Config.Valid_Port, Config.Raw_Clock), Device_State => (Dev.PCI_State, Registers.Register_State, Registers.GTT_State)) is @@ -371,7 +371,7 @@ with Refined_Global => (In_Out => - (Config.Valid_Port_GPU, Dev.PCI_State, + (Config.Valid_Port, Dev.PCI_State, Registers.Register_State, Port_IO.State, Config.Raw_Clock), Input => diff --git a/common/ironlake/hw-gfx-gma-port_detect.adb b/common/ironlake/hw-gfx-gma-port_detect.adb index 900c505..5af2e84 100644 --- a/common/ironlake/hw-gfx-gma-port_detect.adb +++ b/common/ironlake/hw-gfx-gma-port_detect.adb @@ -69,6 +69,8 @@ PCH_HDMI_C => DP2, PCH_HDMI_D => DP3); begin + Config.Valid_Port (Analog) := True; + case Config.Internal_Display is when LVDS => -- PCH_LVDS -- To view, visit https://review.coreboot.org/c/libgfxinit/+/27047 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: libgfxinit Gerrit-Branch: master Gerrit-Change-Id: I17df08de0aa1ffb303646ea564c100bb702407f5 Gerrit-Change-Number: 27047 Gerrit-PatchSet: 6 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-MessageType: merged

1 0

Change in ...libgfxinit[master]: gma: Provide `Global` contracts for public procedures
by Nico Huber (Code Review) 06 May '19

06 May '19

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/c/libgfxinit/+/26866 ) Change subject: gma: Provide `Global` contracts for public procedures ...................................................................... gma: Provide `Global` contracts for public procedures We have to enforce a contract on Power_Up_VGA(), as it has no effect on older hardware generations. Change-Id: I13af0d90ff738e1eea5f8992718e00a6a09c4705 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/libgfxinit/+/26866 Reviewed-by: Arthur Heymans <arthur(a)aheymans.xyz> Tested-by: Nico Huber <nico.h(a)gmx.de> --- M common/hw-gfx-framebuffer_filler.adb M common/hw-gfx-framebuffer_filler.ads M common/hw-gfx-gma.adb M common/hw-gfx-gma.ads 4 files changed, 74 insertions(+), 12 deletions(-) Approvals: Nico Huber: Verified Arthur Heymans: Looks good to me, approved diff --git a/common/hw-gfx-framebuffer_filler.adb b/common/hw-gfx-framebuffer_filler.adb index 250d903..29c7da6 100644 --- a/common/hw-gfx-framebuffer_filler.adb +++ b/common/hw-gfx-framebuffer_filler.adb @@ -17,6 +17,8 @@ pragma Elaborate_All (HW.MMIO_Range); package body HW.GFX.Framebuffer_Filler +with + Refined_State => (State => FB.State, Base_Address => FB.Base_Address) is type FB_Index is new Natural range diff --git a/common/hw-gfx-framebuffer_filler.ads b/common/hw-gfx-framebuffer_filler.ads index 228d43a..7ad3b79 100644 --- a/common/hw-gfx-framebuffer_filler.ads +++ b/common/hw-gfx-framebuffer_filler.ads @@ -19,6 +19,9 @@ use type HW.Int32; package HW.GFX.Framebuffer_Filler +with + Abstract_State => ((State with External), Base_Address), + Initializes => Base_Address is procedure Fill (Linear_FB : Word64; Framebuffer : Framebuffer_Type) diff --git a/common/hw-gfx-gma.adb b/common/hw-gfx-gma.adb index f135a5e..a443132 100644 --- a/common/hw-gfx-gma.adb +++ b/common/hw-gfx-gma.adb @@ -18,8 +18,6 @@ with HW.PCI.Dev; pragma Elaborate_All (HW.PCI.Dev); -with HW.GFX.Framebuffer_Filler; - with HW.GFX.GMA.Config; with HW.GFX.GMA.Config_Helpers; with HW.GFX.GMA.Registers; @@ -527,7 +525,15 @@ ---------------------------------------------------------------------------- + pragma Warnings + (GNATprove, Off, """Registers.Register_State"" * is not modified*", + Reason => "Power_Up_VGA is only effective on certain generations."); procedure Power_Up_VGA + with + Refined_Global => + (Input => (Cur_Configs, Time.State), + In_Out => (Registers.Register_State), + Proof_In => (Initialized)) is Fake_Config : constant Pipe_Configs := (Primary => @@ -543,6 +549,14 @@ begin Power_And_Clocks.Power_Up (Cur_Configs, Fake_Config); end Power_Up_VGA; + pragma Warnings + (GNATprove, Off, "no check message justified*", Reason => "see below"); + pragma Annotate + (GNATprove, Intentional, "unused global", + "Power_Up_VGA is only effective on certain generations."); + pragma Warnings (GNATprove, On, "no check message justified*"); + pragma Warnings + (GNATprove, On, """Registers.Register_State"" * is not modified*"); ---------------------------------------------------------------------------- diff --git a/common/hw-gfx-gma.ads b/common/hw-gfx-gma.ads index 1f81ece..7f44a0f 100644 --- a/common/hw-gfx-gma.ads +++ b/common/hw-gfx-gma.ads @@ -16,6 +16,7 @@ with HW.Config; with HW.Time; with HW.Port_IO; +with HW.GFX.Framebuffer_Filler; package HW.GFX.GMA with @@ -107,44 +108,86 @@ Global => (Input => Init_State); pragma Warnings (GNATprove, On, "unused variable ""Write_Delay"""); - pragma Warnings (GNATprove, Off, "subprogram ""Power_Up_VGA"" has no effect", - Reason => "Effect depends on the platform compiled for"); procedure Power_Up_VGA with + Global => + (Input => (State, Time.State), + In_Out => (Device_State), + Proof_In => (Init_State)), Pre => Is_Initialized; - procedure Update_Outputs (Configs : Pipe_Configs); + ---------------------------------------------------------------------------- - procedure Update_Cursor (Pipe : Pipe_Index; Cursor : Cursor_Type); + procedure Update_Outputs (Configs : Pipe_Configs) + with + Global => + (Input => (Config_State, Time.State), + In_Out => (State, Device_State, Port_IO.State), + Proof_In => (Init_State)), + Pre => Is_Initialized; + + procedure Update_Cursor (Pipe : Pipe_Index; Cursor : Cursor_Type) + with + Global => + (In_Out => (State, Device_State), + Proof_In => (Init_State)), + Pre => Is_Initialized; + procedure Place_Cursor (Pipe : Pipe_Index; X : Cursor_Pos; - Y : Cursor_Pos); + Y : Cursor_Pos) + with + Global => + (In_Out => (State, Device_State), + Proof_In => (Init_State)), + Pre => Is_Initialized; + procedure Move_Cursor (Pipe : Pipe_Index; X : Cursor_Pos; - Y : Cursor_Pos); + Y : Cursor_Pos) + with + Global => + (In_Out => (State, Device_State), + Proof_In => (Init_State)), + Pre => Is_Initialized; - pragma Warnings (GNATprove, Off, "subprogram ""Dump_Configs"" has no effect", - Reason => "It's only used for debugging"); - procedure Dump_Configs (Configs : Pipe_Configs); + ---------------------------------------------------------------------------- procedure Write_GTT (GTT_Page : GTT_Range; Device_Address : GTT_Address_Type; - Valid : Boolean); + Valid : Boolean) + with + Global => (In_Out => Device_State, Proof_In => Init_State), + Pre => Is_Initialized; procedure Setup_Default_FB (FB : in Framebuffer_Type; Clear : in Boolean := True; Success : out Boolean) with + Global => + (In_Out => + (State, Device_State, + Framebuffer_Filler.State, Framebuffer_Filler.Base_Address), + Proof_In => (Init_State)), Pre => Is_Initialized and HW.Config.Dynamic_MMIO; procedure Map_Linear_FB (Linear_FB : out Word64; FB : in Framebuffer_Type) with + Global => + (In_Out => (State, Device_State), + Proof_In => (Init_State)), Pre => Is_Initialized and HW.Config.Dynamic_MMIO; + ---------------------------------------------------------------------------- + + pragma Warnings (GNATprove, Off, "subprogram ""Dump_Configs"" has no effect", + Reason => "It's only used for debugging"); + procedure Dump_Configs (Configs : Pipe_Configs); + private -- For the default framebuffer setup (see below) with 90 degree rotations, -- To view, visit https://review.coreboot.org/c/libgfxinit/+/26866 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: libgfxinit Gerrit-Branch: master Gerrit-Change-Id: I13af0d90ff738e1eea5f8992718e00a6a09c4705 Gerrit-Change-Number: 26866 Gerrit-PatchSet: 6 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-MessageType: merged

1 0

Change in ...libhwbase[master]: Makefile.proof: Add --no-inlining to SPARKFLAGS
by Nico Huber (Code Review) 06 May '19

06 May '19

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/c/libhwbase/+/26850 ) Change subject: Makefile.proof: Add --no-inlining to SPARKFLAGS ...................................................................... Makefile.proof: Add --no-inlining to SPARKFLAGS With `--no-inlining`, proof is about 10% faster for libgfxinit. Change-Id: Ia6055da326901c1c25b9d0c757767891284bc515 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/libhwbase/+/26850 Tested-by: Nico Huber <nico.h(a)gmx.de> Reviewed-by: Reto Buerki <reet(a)codelabs.ch> --- M Makefile.proof 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Nico Huber: Verified Reto Buerki: Looks good to me, approved diff --git a/Makefile.proof b/Makefile.proof index 6c16a40..729ecab 100644 --- a/Makefile.proof +++ b/Makefile.proof @@ -11,6 +11,7 @@ SPARKFLAGS += --mode=$(PROOF_MODE) SPARKFLAGS += --report=fail SPARKFLAGS += --warnings=error +SPARKFLAGS += --no-inlining SPARKFLAGS += --prover=z3 --steps=500 --timeout=1 # FIXME: timeout used because steps seems broken quote-list = $(subst $(space),$(comma),$(patsubst %,"%",$(1))) -- To view, visit https://review.coreboot.org/c/libhwbase/+/26850 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: libhwbase Gerrit-Branch: master Gerrit-Change-Id: Ia6055da326901c1c25b9d0c757767891284bc515 Gerrit-Change-Number: 26850 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Adrian-Ken Rueegsegger <ken(a)codelabs.ch> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Reto Buerki <reet(a)codelabs.ch> Gerrit-MessageType: merged

1 0

Change in ...libhwbase[master]: mutime: Move to common/
by Nico Huber (Code Review) 06 May '19

06 May '19

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/c/libhwbase/+/26839 ) Change subject: mutime: Move to common/ ...................................................................... mutime: Move to common/ It's valid SPARK now. Change-Id: I03bc3fa7d9bea79680888c13679cfd871e772000 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/libhwbase/+/26839 Tested-by: Nico Huber <nico.h(a)gmx.de> Reviewed-by: Reto Buerki <reet(a)codelabs.ch> --- M ada/Makefile.inc M common/Makefile.inc R common/mutime/hw-time-timer.adb 3 files changed, 4 insertions(+), 4 deletions(-) Approvals: Nico Huber: Verified Reto Buerki: Looks good to me, approved diff --git a/ada/Makefile.inc b/ada/Makefile.inc index 2dd0c5a..0074725 100644 --- a/ada/Makefile.inc +++ b/ada/Makefile.inc @@ -2,8 +2,4 @@ hw-$(CONFIG_HWBASE_DYNAMIC_MMIO) += dynamic_mmio/hw-mmio_range.adb hw-$(CONFIG_HWBASE_TIMER_CLOCK_GETTIME) += clock_gettime/hw-time-timer.adb -hw-$(CONFIG_HWBASE_TIMER_MUTIME) += $(muen-common-path)/musinfo/musinfo.ads -hw-$(CONFIG_HWBASE_TIMER_MUTIME) += $(muen-common-path)/muschedinfo/muschedinfo.ads -hw-$(CONFIG_HWBASE_TIMER_MUTIME) += mutime/hw-time-timer.adb - hw-$(CONFIG_HWBASE_POSIX_FILE) += posix/hw-file.adb diff --git a/common/Makefile.inc b/common/Makefile.inc index efdf21d..98b4fbb 100644 --- a/common/Makefile.inc +++ b/common/Makefile.inc @@ -19,6 +19,10 @@ hw-$(CONFIG_HWBASE_LINUX_PCIDEV) += linux/hw-pci-dev.adb hw-$(CONFIG_HWBASE_LINUX_PCIDEV) += hw-pci-dev.ads +hw-$(CONFIG_HWBASE_TIMER_MUTIME) += $(muen-common-path)/musinfo/musinfo.ads +hw-$(CONFIG_HWBASE_TIMER_MUTIME) += $(muen-common-path)/muschedinfo/muschedinfo.ads +hw-$(CONFIG_HWBASE_TIMER_MUTIME) += mutime/hw-time-timer.adb + hw-config-ads := $(subst //,/,$(call src-to-obj,,$(dir)/hw-config).ads) $(hw-config-ads): $(dir)/hw-config.ads.template $(cnf) printf " GENERATE $(patsubst /%,%,$(subst $(obj)/,,$@))\n" diff --git a/ada/mutime/hw-time-timer.adb b/common/mutime/hw-time-timer.adb similarity index 100% rename from ada/mutime/hw-time-timer.adb rename to common/mutime/hw-time-timer.adb -- To view, visit https://review.coreboot.org/c/libhwbase/+/26839 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: libhwbase Gerrit-Branch: master Gerrit-Change-Id: I03bc3fa7d9bea79680888c13679cfd871e772000 Gerrit-Change-Number: 26839 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Adrian-Ken Rueegsegger <ken(a)codelabs.ch> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Reto Buerki <reet(a)codelabs.ch> Gerrit-MessageType: merged

1 0

Change in ...libhwbase[master]: time: Revise state abstraction
by Nico Huber (Code Review) 06 May '19

06 May '19

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/c/libhwbase/+/26838 ) Change subject: time: Revise state abstraction ...................................................................... time: Revise state abstraction Make abstract state `State` of HW.Time.Timer, that's used to derive the Hz value for instance, External. This helps to fix flow issues in the mutime implementation and also matches real hardware better: The clock rate may be derived from the hardware state. HW.Time.Timer.Hz had to be made a volatile function, therefore. Change-Id: I35af2d0db1acbf9652ea00763aa288545746bb79 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/libhwbase/+/26838 Tested-by: Nico Huber <nico.h(a)gmx.de> Reviewed-by: Reto Buerki <reet(a)codelabs.ch> --- M ada/mutime/hw-time-timer.adb M common/hw-time-timer.ads M common/hw-time.adb 3 files changed, 20 insertions(+), 11 deletions(-) Approvals: Nico Huber: Verified Reto Buerki: Looks good to me, approved diff --git a/ada/mutime/hw-time-timer.adb b/ada/mutime/hw-time-timer.adb index 272289c..c683d6f 100644 --- a/ada/mutime/hw-time-timer.adb +++ b/ada/mutime/hw-time-timer.adb @@ -17,8 +17,8 @@ with Muschedinfo; package body HW.Time.Timer - with Refined_State => (Timer_State => null, - Abstract_Time => (Sinfo, Sched_Info)) + with Refined_State => (Timer_State => (Sinfo), + Abstract_Time => (Sched_Info)) is Sinfo_Base_Address : constant := 16#000e_0000_0000#; Sinfo_Page_Size : constant @@ -27,6 +27,8 @@ Sinfo : Musinfo.Subject_Info_Type with + Volatile, + Async_Writers, Address => System'To_Address (Sinfo_Base_Address); Sched_Info : Muschedinfo.Scheduling_Info_Type @@ -51,9 +53,11 @@ return T (TSC_Schedule_End); end Raw_Value_Max; - function Hz return T is + function Hz return T + is + Khz : constant T := T (Sinfo.TSC_Khz); begin - return T (Sinfo.TSC_Khz) * 1000; + return Khz * 1000; end Hz; end HW.Time.Timer; diff --git a/common/hw-time-timer.ads b/common/hw-time-timer.ads index cfe2e0b..90978df 100644 --- a/common/hw-time-timer.ads +++ b/common/hw-time-timer.ads @@ -14,11 +14,12 @@ private package HW.Time.Timer with - Abstract_State => ((Timer_State with Part_Of => HW.Time.State), + Abstract_State => ((Timer_State with + Part_Of => HW.Time.State, + External => Async_Writers), (Abstract_Time with Part_Of => HW.Time.State, - External => Async_Writers)), - Initializes => (Timer_State) + External => Async_Writers)) is -- Returns the highest point in time that has definitely passed. @@ -37,6 +38,7 @@ function Hz return T with + Volatile_Function, Global => (Input => Timer_State); end HW.Time.Timer; diff --git a/common/hw-time.adb b/common/hw-time.adb index 28db95d..b81d343 100644 --- a/common/hw-time.adb +++ b/common/hw-time.adb @@ -34,25 +34,28 @@ with Refined_Global => (Input => (Timer.Abstract_Time, Timer.Timer_State)) is + Hz : constant T := Timer.Hz; Current : constant T := Timer.Raw_Value_Max; begin - return Current + (T (US) * Timer.Hz + 999_999) / 1_000_000; + return Current + (T (US) * Hz + 999_999) / 1_000_000; end US_From_Now; function MS_From_Now (MS : Natural) return T with Refined_Global => (Input => (Timer.Abstract_Time, Timer.Timer_State)) is + Hz : constant T := Timer.Hz; Current : constant T := Timer.Raw_Value_Max; begin - return Current + (T (MS) * Timer.Hz + 999) / 1_000; + return Current + (T (MS) * Hz + 999) / 1_000; end MS_From_Now; function Now_US return Int64 with Refined_Global => (Input => (Timer.Abstract_Time, Timer.Timer_State)) is - MHz : constant T := Timer.Hz / 1_000_000; + Hz : constant T := Timer.Hz; + MHz : constant T := Hz / 1_000_000; Current : constant T := Timer.Raw_Value_Min; begin return Int64 (Current and (2 ** 63 - 1)) @@ -65,7 +68,7 @@ with Refined_Global => (Input => (Timer.Abstract_Time)) is - Current: T; + Current : T; begin loop Current := Timer.Raw_Value_Min; -- To view, visit https://review.coreboot.org/c/libhwbase/+/26838 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: libhwbase Gerrit-Branch: master Gerrit-Change-Id: I35af2d0db1acbf9652ea00763aa288545746bb79 Gerrit-Change-Number: 26838 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Adrian-Ken Rueegsegger <ken(a)codelabs.ch> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Reto Buerki <reet(a)codelabs.ch> Gerrit-MessageType: merged

1 0

Change in ...libhwbase[master]: Makefile.proof: Remove cvc4 from prover list
by Nico Huber (Code Review) 06 May '19

06 May '19

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/c/libhwbase/+/26837 ) Change subject: Makefile.proof: Remove cvc4 from prover list ...................................................................... Makefile.proof: Remove cvc4 from prover list Since we have z3, it was never of much use. Change-Id: Ib0458bfe53fd999c60f8d1b7cf8709e6195d0a42 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/libhwbase/+/26837 Tested-by: Nico Huber <nico.h(a)gmx.de> Reviewed-by: Reto Buerki <reet(a)codelabs.ch> --- M Makefile.proof 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Nico Huber: Verified Reto Buerki: Looks good to me, approved diff --git a/Makefile.proof b/Makefile.proof index 45523c3..6c16a40 100644 --- a/Makefile.proof +++ b/Makefile.proof @@ -11,7 +11,7 @@ SPARKFLAGS += --mode=$(PROOF_MODE) SPARKFLAGS += --report=fail SPARKFLAGS += --warnings=error -SPARKFLAGS += --prover=z3,cvc4 --steps=500 --timeout=1 # FIXME: timeout used because steps seems broken +SPARKFLAGS += --prover=z3 --steps=500 --timeout=1 # FIXME: timeout used because steps seems broken quote-list = $(subst $(space),$(comma),$(patsubst %,"%",$(1))) -- To view, visit https://review.coreboot.org/c/libhwbase/+/26837 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: libhwbase Gerrit-Branch: master Gerrit-Change-Id: Ib0458bfe53fd999c60f8d1b7cf8709e6195d0a42 Gerrit-Change-Number: 26837 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Adrian-Ken Rueegsegger <ken(a)codelabs.ch> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Reto Buerki <reet(a)codelabs.ch> Gerrit-MessageType: merged

1 0

Change in ...coreboot[master]: mb/google/sarien: Fine tune SD card D3 cold timing
by EricR Lai (Code Review) 06 May '19

06 May '19

EricR Lai has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32552 Change subject: mb/google/sarien: Fine tune SD card D3 cold timing ...................................................................... mb/google/sarien: Fine tune SD card D3 cold timing A13 and A15 need to set low before H12 reset. Change the program sequence for fit HW requirement. BUG=b:131876963 TEST=boot up and check SD card functional Signed-off-by: Eric Lai <ericr_lai(a)compal.corp-partner.google.com> Change-Id: I2f1752070f24833aaaab75dea8493caf2ed7f157 --- M src/mainboard/google/sarien/variants/sarien/gpio.c 1 file changed, 7 insertions(+), 4 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/52/32552/1 diff --git a/src/mainboard/google/sarien/variants/sarien/gpio.c b/src/mainboard/google/sarien/variants/sarien/gpio.c index 53a937f..76dd605 100644 --- a/src/mainboard/google/sarien/variants/sarien/gpio.c +++ b/src/mainboard/google/sarien/variants/sarien/gpio.c @@ -31,9 +31,9 @@ /* CLKOUT_LPC1 */ PAD_NC(GPP_A10, NONE), /* PME# */ PAD_NC(GPP_A11, NONE), /* BM_BUSY# */ PAD_NC(GPP_A12, NONE), -/* SUSWARN# */ PAD_CFG_GPO(GPP_A13, 0, DEEP), /* Card reader D3 cold */ + /* ESPI_RESET# */ -/* SUSACK# */ PAD_CFG_GPO(GPP_A15, 0, DEEP), /* Card reader D3 cold */ + /* SD_1P8_SEL */ PAD_NC(GPP_A16, NONE), /* SD_PWR_EN# */ PAD_NC(GPP_A17, NONE), /* ISH_GP0 */ PAD_NC(GPP_A18, NONE), @@ -224,9 +224,12 @@ /* Early pad configuration in bootblock */ static const struct pad_config early_gpio_table[] = { -/* M2_SKT2_CFG0 */ PAD_CFG_GPO(GPP_H12, 0, DEEP), /* D3 cold RST */ +/* SUSWARN# */ PAD_CFG_GPO(GPP_A13, 0, DEEP), /* Card reader D3 cold */ +/* SUSACK# */ PAD_CFG_GPO(GPP_A15, 0, DEEP), /* Card reader D3 cold */ + /* UART2_RXD */ PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1), /* SERVOTX_UART */ /* UART2_TXD */ PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1), /* SERVORX_UART */ +/* M2_SKT2_CFG0 */ PAD_CFG_GPO(GPP_H12, 0, DEEP), /* D3 cold RST */ /* I2C4_SDA */ PAD_CFG_NF(GPP_H8, NONE, DEEP, NF1), /* I2C_SDA_H1 */ /* I2C4_SCL */ PAD_CFG_NF(GPP_H9, NONE, DEEP, NF1), /* I2C_SCL_H1 */ /* DMIC_DATA1 */ PAD_CFG_GPI_APIC(GPP_D18, NONE, PLTRST, @@ -237,8 +240,8 @@ /* SATALED# */ PAD_CFG_GPI(GPP_E8, NONE, DEEP), /* RECOVERY# */ /* DDPD_HPD2 */ PAD_CFG_GPI(GPP_E15, NONE, DEEP), /* H1_FLASH_WP */ /* SSD RESET need to stay low first */ -/* M2_SKT2_CFG0 */ PAD_CFG_GPO(GPP_H12, 1, DEEP), /* D3 cold RST */ /* PWRBTN# */ PAD_CFG_NF(GPD3, UP_20K, DEEP, NF1), /* SIO_PWRBTN# */ +/* M2_SKT2_CFG0 */ PAD_CFG_GPO(GPP_H12, 1, DEEP), /* D3 cold RST */ }; const struct pad_config *variant_gpio_table(size_t *num) -- To view, visit https://review.coreboot.org/c/coreboot/+/32552 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I2f1752070f24833aaaab75dea8493caf2ed7f157 Gerrit-Change-Number: 32552 Gerrit-PatchSet: 1 Gerrit-Owner: EricR Lai <ericr_lai(a)compal.corp-partner.google.com> Gerrit-MessageType: newchange

4 15

Change in ...coreboot[master]: google/kukui: Raising the CPU frequency
by Tristan Hsieh (Code Review) 06 May '19

06 May '19

Tristan Hsieh has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32466 Change subject: google/kukui: Raising the CPU frequency ...................................................................... google/kukui: Raising the CPU frequency Run CPU at the highest freqency (1989MHz) to speed up the boot time. BUG=b:80501386 BRANCH=none Test=Boots correctly on Kukui Change-Id: I703ffcb99367f87e6792a72485f5634e0505e5ac Signed-off-by: Tristan Shieh <tristan.shieh(a)mediatek.com> --- M src/mainboard/google/kukui/romstage.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/66/32466/1 diff --git a/src/mainboard/google/kukui/romstage.c b/src/mainboard/google/kukui/romstage.c index 81ae9c5..baaca43 100644 --- a/src/mainboard/google/kukui/romstage.c +++ b/src/mainboard/google/kukui/romstage.c @@ -17,6 +17,7 @@ #include <soc/emi.h> #include <soc/mmu_operations.h> #include <soc/mt6358.h> +#include <soc/pll.h> #include <soc/rtc.h> #include "early_init.h" @@ -28,6 +29,7 @@ mainboard_early_init(); mt6358_init(); + mt_pll_raise_ca53_freq(1989 * MHz); rtc_boot(); mt_mem_init(get_sdram_config()); mtk_mmu_after_dram(); -- To view, visit https://review.coreboot.org/c/coreboot/+/32466 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I703ffcb99367f87e6792a72485f5634e0505e5ac Gerrit-Change-Number: 32466 Gerrit-PatchSet: 1 Gerrit-Owner: Tristan Hsieh <tristan.shieh(a)mediatek.com> Gerrit-MessageType: newchange

6 19

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit May 2019