coreboot-gerrit May 2019

coreboot-gerrit@coreboot.org

1 participants
1485 discussions

Change in ...coreboot[master]: sb/intel/bd82x6x: Fix flashconsole after lockdown
by Evgeny Zinoviev (Code Review) 07 May '19

07 May '19

Evgeny Zinoviev has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/25660 ) Change subject: sb/intel/bd82x6x: Fix flashconsole after lockdown ...................................................................... Patch Set 6: (2 comments) I addressed comments to PS4 and rebased the patch on master. https://review.coreboot.org/#/c/25660/4//COMMIT_MSG Commit Message: https://review.coreboot.org/#/c/25660/4//COMMIT_MSG@7 PS4, Line 7: if flashconsole is enabled > This makes the line too long, should be <= 65 chars (which is […] Done https://review.coreboot.org/#/c/25660/4/src/southbridge/intel/bd82x6x/lpc.c File src/southbridge/intel/bd82x6x/lpc.c: https://review.coreboot.org/#/c/25660/4/src/southbridge/intel/bd82x6x/lpc.c… PS4, Line 869: * ramstage, whitelist it here. */ > Sorry for nitpicking, please use one of the comment styles from [1]. […] Done -- To view, visit https://review.coreboot.org/c/coreboot/+/25660 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ib802d7ee32f1fb0a68a84b0280480dcaefa9831f Gerrit-Change-Number: 25660 Gerrit-PatchSet: 6 Gerrit-Owner: Dan Elkouby <streetwalkermc(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Dan Elkouby <streetwalkermc(a)gmail.com> Gerrit-Reviewer: Evgeny Zinoviev <me(a)ch1p.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Comment-Date: Tue, 07 May 2019 00:38:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: comment

1 0

Change in ...coreboot[master]: sb/intel/bd82x6x: Fix flashconsole after lockdown
by Evgeny Zinoviev (Code Review) 07 May '19

07 May '19

Evgeny Zinoviev has uploaded a new patch set (#6) to the change originally created by Dan Elkouby. ( https://review.coreboot.org/c/coreboot/+/25660 ) Change subject: sb/intel/bd82x6x: Fix flashconsole after lockdown ...................................................................... sb/intel/bd82x6x: Fix flashconsole after lockdown SMM final locks the SPI BAR, which causes flashconsole to hang. Re-init it like SMM does with CONFIG_SPI_FLASH_SMM. Change-Id: Ib802d7ee32f1fb0a68a84b0280480dcaefa9831f Signed-off-by: Dan Elkouby <streetwalkermc(a)gmail.com> Signed-off-by: Evgeny Zinoviev <me(a)ch1p.io> --- M src/southbridge/intel/bd82x6x/lpc.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/60/25660/6 -- To view, visit https://review.coreboot.org/c/coreboot/+/25660 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ib802d7ee32f1fb0a68a84b0280480dcaefa9831f Gerrit-Change-Number: 25660 Gerrit-PatchSet: 6 Gerrit-Owner: Dan Elkouby <streetwalkermc(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Dan Elkouby <streetwalkermc(a)gmail.com> Gerrit-Reviewer: Evgeny Zinoviev <me(a)ch1p.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Patrick Georgi <pgeorgi(a)google.com> Gerrit-MessageType: newpatchset

1 0

Change in ...coreboot[master]: sb/intel/bd82x6x: Fix flashconsole after lockdown
by build bot (Jenkins) (Code Review) 07 May '19

07 May '19

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/25660 ) Change subject: sb/intel/bd82x6x: Fix flashconsole after lockdown ...................................................................... Patch Set 5: (1 comment) https://review.coreboot.org/#/c/25660/5/src/southbridge/intel/bd82x6x/lpc.c File src/southbridge/intel/bd82x6x/lpc.c: https://review.coreboot.org/#/c/25660/5/src/southbridge/intel/bd82x6x/lpc.c… PS5, Line 914: If other code needs to use SPI during ramstage, line over 80 characters -- To view, visit https://review.coreboot.org/c/coreboot/+/25660 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ib802d7ee32f1fb0a68a84b0280480dcaefa9831f Gerrit-Change-Number: 25660 Gerrit-PatchSet: 5 Gerrit-Owner: Dan Elkouby <streetwalkermc(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Dan Elkouby <streetwalkermc(a)gmail.com> Gerrit-Reviewer: Evgeny Zinoviev <me(a)ch1p.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Comment-Date: Tue, 07 May 2019 00:35:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in ...coreboot[master]: sb/intel/bd82x6x: Fix flashconsole after lockdown
by Evgeny Zinoviev (Code Review) 07 May '19

07 May '19

Evgeny Zinoviev has uploaded a new patch set (#5) to the change originally created by Dan Elkouby. ( https://review.coreboot.org/c/coreboot/+/25660 ) Change subject: sb/intel/bd82x6x: Fix flashconsole after lockdown ...................................................................... sb/intel/bd82x6x: Fix flashconsole after lockdown SMM final locks the SPI BAR, which causes flashconsole to hang. Re-init it like SMM does with CONFIG_SPI_FLASH_SMM. Change-Id: Ib802d7ee32f1fb0a68a84b0280480dcaefa9831f Signed-off-by: Dan Elkouby <streetwalkermc(a)gmail.com> Signed-off-by: Evgeny Zinoviev <me(a)ch1p.io> --- M src/southbridge/intel/bd82x6x/lpc.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/60/25660/5 -- To view, visit https://review.coreboot.org/c/coreboot/+/25660 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ib802d7ee32f1fb0a68a84b0280480dcaefa9831f Gerrit-Change-Number: 25660 Gerrit-PatchSet: 5 Gerrit-Owner: Dan Elkouby <streetwalkermc(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Dan Elkouby <streetwalkermc(a)gmail.com> Gerrit-Reviewer: Evgeny Zinoviev <me(a)ch1p.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Patrick Georgi <pgeorgi(a)google.com> Gerrit-MessageType: newpatchset

1 0

Change in ...libgfxinit[master]: gfx_test: Use GMA.Read_GTT() instead of own GTT mapping
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/+/27058 ) Change subject: gfx_test: Use GMA.Read_GTT() instead of own GTT mapping ...................................................................... gfx_test: Use GMA.Read_GTT() instead of own GTT mapping Change-Id: Iabf26cebc91ccf62711a9a83a68b6ffd2182e3fe Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/libgfxinit/+/27058 Reviewed-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M gfxtest/hw-gfx-gma-gfx_test.adb 1 file changed, 7 insertions(+), 18 deletions(-) Approvals: Nico Huber: Verified Arthur Heymans: Looks good to me, approved diff --git a/gfxtest/hw-gfx-gma-gfx_test.adb b/gfxtest/hw-gfx-gma-gfx_test.adb index 6839dc3..736b93d 100644 --- a/gfxtest/hw-gfx-gma-gfx_test.adb +++ b/gfxtest/hw-gfx-gma-gfx_test.adb @@ -28,21 +28,17 @@ package Dev is new PCI.Dev (PCI.Address'(0, 2, 0)); - type GTT_PTE_Type is mod 2 ** (Config.GTT_PTE_Size * 8); - type GTT_Registers_Type is array (GTT_Range) of GTT_PTE_Type; - package GTT is new MMIO_Range - (Base_Addr => 0, - Element_T => GTT_PTE_Type, - Index_T => GTT_Range, - Array_T => GTT_Registers_Type); - - GTT_Backup : GTT_Registers_Type; + type GTT_Entry is record + Addr : GTT_Address_Type; + Valid : Boolean; + end record; + GTT_Backup : array (GTT_Range) of GTT_Entry; procedure Backup_GTT is begin for Idx in GTT_Range loop - GTT.Read (GTT_Backup (Idx), Idx); + Read_GTT (GTT_Backup (Idx).Addr, GTT_Backup (Idx).Valid, Idx); end loop; end Backup_GTT; @@ -50,7 +46,7 @@ is begin for Idx in GTT_Range loop - GTT.Write (Idx, GTT_Backup (Idx)); + Write_GTT (Idx, GTT_Backup (Idx).Addr, GTT_Backup (Idx).Valid); end loop; end Restore_GTT; @@ -574,13 +570,6 @@ return; end if; - Dev.Map (Res_Addr, PCI.Res0, Offset => Config.GTT_Offset); - if Res_Addr = 0 then - Debug.Put_Line ("Failed to map PCI resource0."); - return; - end if; - GTT.Set_Base_Address (Res_Addr); - Dev.Map (Res_Addr, PCI.Res2, WC => True); if Res_Addr = 0 then Debug.Put_Line ("Failed to map PCI resource2."); -- To view, visit https://review.coreboot.org/c/libgfxinit/+/27058 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: libgfxinit Gerrit-Branch: master Gerrit-Change-Id: Iabf26cebc91ccf62711a9a83a68b6ffd2182e3fe Gerrit-Change-Number: 27058 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 registers: Add Read_GTT() procedure
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/+/27057 ) Change subject: gma registers: Add Read_GTT() procedure ...................................................................... gma registers: Add Read_GTT() procedure Change-Id: I0f8091b8958d0c228430fad4b8343fc362a2dbb7 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/libgfxinit/+/27057 Reviewed-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M common/hw-gfx-gma-registers.adb M common/hw-gfx-gma-registers.ads M common/hw-gfx-gma.adb M common/hw-gfx-gma.ads 4 files changed, 54 insertions(+), 6 deletions(-) Approvals: Nico Huber: Verified Arthur Heymans: Looks good to me, approved diff --git a/common/hw-gfx-gma-registers.adb b/common/hw-gfx-gma-registers.adb index 9b14a3b..838afed 100644 --- a/common/hw-gfx-gma-registers.adb +++ b/common/hw-gfx-gma-registers.adb @@ -69,7 +69,7 @@ Index_T => GTT_Range, Array_T => GTT_Registers_64); - GTT_PTE_Valid : constant Word32 := 1; + GTT_PTE_Valid : constant := 1; ---------------------------------------------------------------------------- @@ -174,6 +174,33 @@ end if; end Write_GTT; + procedure Read_GTT + (Device_Address : out GTT_Address_Type; + Valid : out Boolean; + GTT_Page : in GTT_Range) + is + begin + if not Config.Has_64bit_GTT then + declare + PTE : GTT_PTE_32; + begin + GTT_32.Read (PTE, GTT_Page); + Valid := (PTE and GTT_PTE_Valid) /= 0; + Device_Address := GTT_Address_Type + (Shift_Left (Word64 (PTE and 16#07f0#), 32 - 4) or + Word64 (PTE and 16#ffff_f000#)); + end; + else + declare + PTE : GTT_PTE_64; + begin + GTT_64.Read (PTE, GTT_Page); + Valid := (PTE and GTT_PTE_Valid) /= 0; + Device_Address := GTT_Address_Type (PTE and 16#7f_ffff_f000#); + end; + end if; + end Read_GTT; + ---------------------------------------------------------------------------- package Rep is diff --git a/common/hw-gfx-gma-registers.ads b/common/hw-gfx-gma-registers.ads index 99efba9..3be2ec7 100644 --- a/common/hw-gfx-gma-registers.ads +++ b/common/hw-gfx-gma-registers.ads @@ -1720,17 +1720,21 @@ procedure Remove_Fence (First_Page, Last_Page : GTT_Range); - pragma Warnings (Off, "declaration of ""Write_GTT"" hides one at *"); procedure Write_GTT (GTT_Page : GTT_Range; Device_Address : GTT_Address_Type; Valid : Boolean) with Global => (In_Out => GTT_State), - Depends => (GTT_State =>+ (GTT_Page, Device_Address, Valid)), - Pre => True, - Post => True; - pragma Warnings (On, "declaration of ""Write_GTT"" hides one at *"); + Depends => (GTT_State =>+ (GTT_Page, Device_Address, Valid)); + + procedure Read_GTT + (Device_Address : out GTT_Address_Type; + Valid : out Boolean; + GTT_Page : in GTT_Range) + with + Global => (In_Out => GTT_State), + Depends => ((Device_Address, Valid, GTT_State) => (GTT_State, GTT_Page)); procedure Set_Register_Base (Base : Word64; GTT_Base : Word64 := 0) with diff --git a/common/hw-gfx-gma.adb b/common/hw-gfx-gma.adb index baa7e6c..abd19b1 100644 --- a/common/hw-gfx-gma.adb +++ b/common/hw-gfx-gma.adb @@ -601,6 +601,15 @@ Registers.Write_GTT (GTT_Page, Device_Address, Valid); end Write_GTT; + procedure Read_GTT + (Device_Address : out GTT_Address_Type; + Valid : out Boolean; + GTT_Page : in GTT_Range) + is + begin + Registers.Read_GTT (Device_Address, Valid, GTT_Page); + end Read_GTT; + procedure Setup_Default_GTT (FB : Framebuffer_Type; Phys_Base : Word32) with Pre => Is_Initialized and Valid_Phys_FB (FB, Phys_Base) diff --git a/common/hw-gfx-gma.ads b/common/hw-gfx-gma.ads index 7f44a0f..dcb3975 100644 --- a/common/hw-gfx-gma.ads +++ b/common/hw-gfx-gma.ads @@ -163,6 +163,14 @@ Global => (In_Out => Device_State, Proof_In => Init_State), Pre => Is_Initialized; + procedure Read_GTT + (Device_Address : out GTT_Address_Type; + Valid : out Boolean; + GTT_Page : in GTT_Range) + 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; -- To view, visit https://review.coreboot.org/c/libgfxinit/+/27057 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: libgfxinit Gerrit-Branch: master Gerrit-Change-Id: I0f8091b8958d0c228430fad4b8343fc362a2dbb7 Gerrit-Change-Number: 27057 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 registers: Separate 32- and 64-bit GTT access
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/+/27056 ) Change subject: gma registers: Separate 32- and 64-bit GTT access ...................................................................... gma registers: Separate 32- and 64-bit GTT access With Broadwell the GTT layout changed significantly. Before, we had a 2MiB GTT with 32-bit entries. Now, it's a 8MiB GTT with 64-bit entries. We used to abstract over that with configuration constants but that's infeasible if we want to support Haswell and Broadwell with a single binary (boards that support both processors exist). Therefore, declare both GTT variants and decide based on the CPU which one to use. Change-Id: Ib6f21b71c434a9cbdd5cdfa3697da2b2e86750f4 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/libgfxinit/+/27056 Reviewed-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M common/hw-gfx-gma-config.ads.template M common/hw-gfx-gma-registers.adb M common/hw-gfx-gma-registers.ads M common/hw-gfx-gma.adb 4 files changed, 48 insertions(+), 33 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 c6af93a..e34e89d 100644 --- a/common/hw-gfx-gma-config.ads.template +++ b/common/hw-gfx-gma-config.ads.template @@ -133,7 +133,7 @@ Has_Per_Pipe_SRD : constant Boolean := CPU >= Broadwell; ----- GTT: ------------- - Fold_39Bit_GTT_PTE : constant Boolean := CPU <= Haswell; + Has_64bit_GTT : constant Boolean := CPU >= Broadwell; ---------------------------------------------------------------------------- @@ -250,19 +250,7 @@ ---------------------------------------------------------------------------- - GTT_Offset : constant := (case CPU is - when G45 .. Haswell => 16#0020_0000#, - when Broadwell .. Skylake => 16#0080_0000#); - - GTT_Size : constant := (case CPU is - when G45 .. Haswell => 16#0020_0000#, - -- Limit Broadwell to 4MiB to have a stable - -- interface (i.e. same number of entries): - when Broadwell .. Skylake => 16#0040_0000#); - - GTT_PTE_Size : constant := (case CPU is - when G45 .. Haswell => 4, - when Broadwell .. Skylake => 8); + GTT_PTE_Size : constant := (if Has_64bit_GTT then 8 else 4); Fence_Base : constant := (case CPU is when G45 .. Ironlake => 16#0000_3000#, diff --git a/common/hw-gfx-gma-registers.adb b/common/hw-gfx-gma-registers.adb index d7e02d9..9b14a3b 100644 --- a/common/hw-gfx-gma-registers.adb +++ b/common/hw-gfx-gma-registers.adb @@ -26,9 +26,10 @@ package body HW.GFX.GMA.Registers with Refined_State => - (Address_State => (Regs.Base_Address, GTT.Base_Address), + (Address_State => + (Regs.Base_Address, GTT_32.Base_Address, GTT_64.Base_Address), Register_State => Regs.State, - GTT_State => GTT.State) + GTT_State => (GTT_32.State, GTT_64.State)) is pragma Disable_Atomic_Synchronization; @@ -46,16 +47,27 @@ ---------------------------------------------------------------------------- - type GTT_PTE_Type is mod 2 ** (Config.GTT_PTE_Size * 8); - type GTT_Registers_Type is array (GTT_Range) of GTT_PTE_Type + type GTT_PTE_32 is mod 2 ** 32; + type GTT_Registers_32 is array (GTT_Range) of GTT_PTE_32 with Volatile_Components, - Size => Config.GTT_Size * 8; - package GTT is new MMIO_Range - (Base_Addr => Config.Default_MMIO_Base + Config.GTT_Offset, - Element_T => GTT_PTE_Type, + Size => MMIO_GTT_32_Size * 8; + package GTT_32 is new MMIO_Range + (Base_Addr => Config.Default_MMIO_Base + MMIO_GTT_32_Offset, + Element_T => GTT_PTE_32, Index_T => GTT_Range, - Array_T => GTT_Registers_Type); + Array_T => GTT_Registers_32); + + type GTT_PTE_64 is mod 2 ** 64; + type GTT_Registers_64 is array (GTT_Range) of GTT_PTE_64 + with + Volatile_Components, + Size => MMIO_GTT_64_Size * 8; + package GTT_64 is new MMIO_Range + (Base_Addr => Config.Default_MMIO_Base + MMIO_GTT_64_Offset, + Element_T => GTT_PTE_64, + Index_T => GTT_Range, + Array_T => GTT_Registers_64); GTT_PTE_Valid : constant Word32 := 1; @@ -147,17 +159,17 @@ Valid : Boolean) is begin - if Config.Fold_39Bit_GTT_PTE then - GTT.Write + if not Config.Has_64bit_GTT then + GTT_32.Write (Index => GTT_Page, - Value => GTT_PTE_Type (Device_Address and 16#ffff_f000#) or - GTT_PTE_Type (Shift_Right (Word64 (Device_Address), 32 - 4) + Value => GTT_PTE_32 (Device_Address and 16#ffff_f000#) or + GTT_PTE_32 (Shift_Right (Word64 (Device_Address), 32 - 4) and 16#0000_07f0#) or Boolean'Pos (Valid)); else - GTT.Write + GTT_64.Write (Index => GTT_Page, - Value => GTT_PTE_Type (Device_Address and 16#7f_ffff_f000#) or + Value => GTT_PTE_64 (Device_Address and 16#7f_ffff_f000#) or Boolean'Pos (Valid)); end if; end Write_GTT; @@ -375,9 +387,11 @@ begin Regs.Set_Base_Address (Base); if GTT_Base = 0 then - GTT.Set_Base_Address (Base + Config.GTT_Offset); + GTT_32.Set_Base_Address (Base + MMIO_GTT_32_Offset); + GTT_64.Set_Base_Address (Base + MMIO_GTT_64_Offset); else - GTT.Set_Base_Address (GTT_Base); + GTT_32.Set_Base_Address (GTT_Base); + GTT_64.Set_Base_Address (GTT_Base); end if; end Set_Register_Base; diff --git a/common/hw-gfx-gma-registers.ads b/common/hw-gfx-gma-registers.ads index 1220d1a..99efba9 100644 --- a/common/hw-gfx-gma-registers.ads +++ b/common/hw-gfx-gma-registers.ads @@ -23,6 +23,15 @@ (GTT_State with External, Part_Of => GMA.Device_State)), Initializes => Address_State is + + MMIO_GTT_32_Size : constant := 16#20_0000#; + MMIO_GTT_32_Offset : constant := 16#20_0000#; + + -- Limit Broadwell+ to 4MiB to have a stable + -- interface (i.e. same number of entries): + MMIO_GTT_64_Size : constant := 16#40_0000#; + MMIO_GTT_64_Offset : constant := 16#80_0000#; + type Registers_Invalid_Index is (Invalid_Register, -- Allow a placeholder when access is not acceptable diff --git a/common/hw-gfx-gma.adb b/common/hw-gfx-gma.adb index b3d9362..baa7e6c 100644 --- a/common/hw-gfx-gma.adb +++ b/common/hw-gfx-gma.adb @@ -386,6 +386,10 @@ is use type HW.Word64; + function MMIO_GTT_Offset return Natural is + (if Config.Has_64bit_GTT + then Registers.MMIO_GTT_64_Offset + else Registers.MMIO_GTT_32_Offset); PCI_MMIO_Base, PCI_GTT_Base : Word64; Now : constant Time.T := Time.Now; @@ -447,8 +451,8 @@ Dev.Initialize (Success); if Success then - Dev.Map (PCI_MMIO_Base, PCI.Res0, Length => Config.GTT_Offset); - Dev.Map (PCI_GTT_Base, PCI.Res0, Offset => Config.GTT_Offset); + Dev.Map (PCI_MMIO_Base, PCI.Res0, Length => MMIO_GTT_Offset); + Dev.Map (PCI_GTT_Base, PCI.Res0, Offset => MMIO_GTT_Offset); if PCI_MMIO_Base /= 0 and PCI_GTT_Base /= 0 then Registers.Set_Register_Base (PCI_MMIO_Base, PCI_GTT_Base); else -- To view, visit https://review.coreboot.org/c/libgfxinit/+/27056 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: libgfxinit Gerrit-Branch: master Gerrit-Change-Id: Ib6f21b71c434a9cbdd5cdfa3697da2b2e86750f4 Gerrit-Change-Number: 27056 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 registers: Draw usage of Config.Fence_Count into the code
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/+/27055 ) Change subject: gma registers: Draw usage of Config.Fence_Count into the code ...................................................................... gma registers: Draw usage of Config.Fence_Count into the code In case `Config.Fence_Count` is not a constant, we can't use it to declare `Fence_Range`. Instead, limit the range throughout the code. Change-Id: I2ab37f4cd9e6b4d37353ae4fd11d7e5a686d166f Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/libgfxinit/+/27055 Reviewed-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M common/hw-gfx-gma-registers.adb 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Nico Huber: Verified Arthur Heymans: Looks good to me, approved diff --git a/common/hw-gfx-gma-registers.adb b/common/hw-gfx-gma-registers.adb index 94965d5..d7e02d9 100644 --- a/common/hw-gfx-gma-registers.adb +++ b/common/hw-gfx-gma-registers.adb @@ -61,7 +61,7 @@ ---------------------------------------------------------------------------- - subtype Fence_Range is Registers_Range range 0 .. Config.Fence_Count - 1; + subtype Fence_Range is Natural range 0 .. 31; FENCE_PAGE_SHIFT : constant := 12; FENCE_PAGE_MASK : constant := 16#ffff_f000#; @@ -69,14 +69,14 @@ FENCE_VALID : constant := 1 * 2 ** 0; function Fence_Lower_Idx (Fence : Fence_Range) return Registers_Range is - (Config.Fence_Base / Register_Width + 2 * Fence); + (Registers_Range (Config.Fence_Base / Register_Width + 2 * Fence)); function Fence_Upper_Idx (Fence : Fence_Range) return Registers_Range is (Fence_Lower_Idx (Fence) + 1); procedure Clear_Fences is begin - for Fence in Fence_Range loop + for Fence in Fence_Range range 0 .. Config.Fence_Count - 1 loop Regs.Write (Fence_Lower_Idx (Fence), 0); end loop; end Clear_Fences; @@ -101,7 +101,7 @@ pragma Debug (Debug.Put_Line (" tiles per row.")); Success := False; - for Fence in Fence_Range loop + for Fence in Fence_Range range 0 .. Config.Fence_Count - 1 loop Regs.Read (Reg32, Fence_Lower_Idx (Fence)); if (Reg32 and FENCE_VALID) = 0 then Regs.Write @@ -127,7 +127,7 @@ Shift_Left (Word32 (Last_Page), FENCE_PAGE_SHIFT); Fence_Upper, Fence_Lower : Word32; begin - for Fence in Fence_Range loop + for Fence in Fence_Range range 0 .. Config.Fence_Count - 1 loop Regs.Read (Fence_Lower, Fence_Lower_Idx (Fence)); Regs.Read (Fence_Upper, Fence_Upper_Idx (Fence)); if (Fence_Lower and FENCE_PAGE_MASK) = Page_Lower and -- To view, visit https://review.coreboot.org/c/libgfxinit/+/27055 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: libgfxinit Gerrit-Branch: master Gerrit-Change-Id: I2ab37f4cd9e6b4d37353ae4fd11d7e5a686d166f Gerrit-Change-Number: 27055 Gerrit-PatchSet: 8 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: Revise support for generated sources
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/+/27139 ) Change subject: Makefile: Revise support for generated sources ...................................................................... Makefile: Revise support for generated sources Handle generated source files more independently from normal source files. This allows mixing of generated specs with existing source bodies. As with the source file list, we filter the list of generated sources, `$(name)-gens`: All spec (.ads) files that have a respective body file (.adb), are moved into `$(name)-extra-gens`. This way, we can still add these files as dependencies to all pre-existing source files. Change-Id: I5479c436f39088ae9d0ebddf9a97446be0f191f3 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/libhwbase/+/27139 Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Reviewed-by: Patrick Georgi <pgeorgi(a)google.com> --- M Makefile M Makefile.proof 2 files changed, 16 insertions(+), 9 deletions(-) Approvals: Nico Huber: Verified Patrick Georgi: Looks good to me, approved Stefan Reinauer: Looks good to me, approved Angel Pons: Looks good to me, but someone else must approve diff --git a/Makefile b/Makefile index 09881e5..a25deb6 100644 --- a/Makefile +++ b/Makefile @@ -190,12 +190,16 @@ # *-srcs. Extract / filter all specification files that have a matching # body (.adb) file here (specifications without a body are valid sources # in Ada). -$(name)-extra-specs := \ +# $1 source list +filter_extra_specs = \ $(filter \ - $(addprefix %/,$(patsubst %.adb,%.ads,$(notdir $(filter %.adb,$($(name)-srcs))))), \ - $(filter %.ads,$($(name)-srcs) $($(name)-gens))) + $(addprefix %/,$(patsubst %.adb,%.ads, \ + $(notdir $(filter %.adb,$($(name)-srcs) $($(name)-gens))))), \ + $(filter %.ads,$(1))) +$(name)-extra-specs := $(call filter_extra_specs,$($(name)-srcs)) $(name)-srcs := $(filter-out $($(name)-extra-specs),$($(name)-srcs)) -$(name)-gens := $(filter-out $($(name)-extra-specs),$($(name)-gens)) +$(name)-extra-gens := $(call filter_extra_specs,$($(name)-gens)) +$(name)-gens := $(filter-out $($(name)-extra-gens),$($(name)-gens)) $(name)-objs := $(call src-to-obj,,$($(name)-srcs) $($(name)-gens)) $(name)-alis := $(call src-to-ali,,$($(name)-srcs) $($(name)-gens)) @@ -216,8 +220,8 @@ $(if $(wildcard $(1)),\ $(filter \ $(addprefix %/,$(shell sed -ne's/^D $[^\t]\+$.*$$/\1/p' $(1) 2>/dev/null)), \ - $($(name)-srcs) $($(name)-gens) $($(name)-extra-specs)), \ - $($(name)-gens)) + $($(name)-srcs) $($(name)-gens) $($(name)-extra-specs) $($(name)-extra-gens)), \ + $($(name)-gens) $($(name)-extra-gens)) # Adds dependency rules # $1 source file @@ -283,7 +287,7 @@ $(shell mkdir -p $(alldirs)) $(name)-install-srcs = $(sort \ - $($(name)-extra-specs) $(filter %.ads,$($(name)-srcs) $($(name)-gens)) \ + $($(name)-extra-specs) $($(name)-extra-gens) $(filter %.ads,$($(name)-srcs) $($(name)-gens)) \ $(foreach adb,$(filter %.adb,$($(name)-srcs)), \ $(shell grep -q '^U .*\<BN\>' $(call src-to-ali,,$(adb)) 2>/dev/null && echo $(adb)))) diff --git a/Makefile.proof b/Makefile.proof index 729ecab..593b41e 100644 --- a/Makefile.proof +++ b/Makefile.proof @@ -18,7 +18,8 @@ $(name)-exclude-srcs = \ $(filter-out \ - $(sort $(notdir $($(name)-proof) $($(name)-srcs) $($(name)-gens) $($(name)-extra-specs))), \ + $(sort $(notdir $($(name)-proof) \ + $($(name)-srcs) $($(name)-gens) $($(name)-extra-specs) $($(name)-extra-gens))), \ $(sort $(notdir \ $(wildcard $(addsuffix *.ad[sb],$($(name)-proof-dirs)))))) @@ -63,7 +64,9 @@ echo ' for Object_Dir use external ("obj", "build");' >>$@ echo 'end lib$(name);' >>$@ -$(obj)/gnatprove/gnatprove.out: $(gpr) $$($(name)-srcs) $$($(name)-gens) $(obj)/proofmode +$(obj)/gnatprove/gnatprove.out: $$($(name)-srcs) $$($(name)-gens) +$(obj)/gnatprove/gnatprove.out: $$($(name)-extra-specs) $$($(name)-extra-gens) +$(obj)/gnatprove/gnatprove.out: $(gpr) $(obj)/proofmode gnatprove -P$< $(SPARKFLAGS) -Xobj=$(abspath $(obj)) proof: -- To view, visit https://review.coreboot.org/c/libhwbase/+/27139 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: libhwbase Gerrit-Branch: master Gerrit-Change-Id: I5479c436f39088ae9d0ebddf9a97446be0f191f3 Gerrit-Change-Number: 27139 Gerrit-PatchSet: 4 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Adrian-Ken Rueegsegger <ken(a)codelabs.ch> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Reto Buerki <reet(a)codelabs.ch> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-MessageType: merged

1 0

Change in ...libhwbase[master]: direct pci, debug: Fix minor style issues
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/+/26840 ) Change subject: direct pci, debug: Fix minor style issues ...................................................................... direct pci, debug: Fix minor style issues Change-Id: I8adbf75babc233dff79e5c8921d1f24692a939ab Signed-off-by: Nico Huber <nico.huber(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/libhwbase/+/26840 Reviewed-by: Patrick Georgi <pgeorgi(a)google.com> Tested-by: Nico Huber <nico.h(a)gmx.de> --- M common/direct/hw-pci-dev.adb M debug/hw-debug.adb M debug/hw-debug.ads 3 files changed, 5 insertions(+), 5 deletions(-) Approvals: Nico Huber: Verified Patrick Georgi: Looks good to me, approved diff --git a/common/direct/hw-pci-dev.adb b/common/direct/hw-pci-dev.adb index 3d76521..8a1a56b 100644 --- a/common/direct/hw-pci-dev.adb +++ b/common/direct/hw-pci-dev.adb @@ -78,8 +78,8 @@ procedure Resource_Size (Length : out Natural; Res : Resource) is - use Type HW.Word16; - use Type HW.Word32; + use type HW.Word16; + use type HW.Word32; Cmd : Word16; Base, Backup : Word32; diff --git a/debug/hw-debug.adb b/debug/hw-debug.adb index 60968e1..2f1fed9 100644 --- a/debug/hw-debug.adb +++ b/debug/hw-debug.adb @@ -251,7 +251,7 @@ Debug_Sink.Put_Char (' '); for J in Natural range 8 .. Natural'Min (15, Left) loop - Put_Word (Word64(Buf (Line_Start + J)), 2, False); + Put_Word (Word64 (Buf (Line_Start + J)), 2, False); Debug_Sink.Put_Char (' '); end loop; New_Line; @@ -272,7 +272,7 @@ ---------------------------------------------------------------------------- - Procedure Register_Write_Wait + procedure Register_Write_Wait is begin if Register_Write_Delay_Nanoseconds > 0 then diff --git a/debug/hw-debug.ads b/debug/hw-debug.ads index adf61fb..e3d6b2b 100644 --- a/debug/hw-debug.ads +++ b/debug/hw-debug.ads @@ -37,7 +37,7 @@ procedure Put_Buffer (Name : String; Buf : in Buffer; Len : in Buffer_Range); procedure Set_Register_Write_Delay (Value : Word64); - Procedure Register_Write_Wait; + procedure Register_Write_Wait; end HW.Debug; -- vim: set ts=8 sts=3 sw=3 et: -- To view, visit https://review.coreboot.org/c/libhwbase/+/26840 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: libhwbase Gerrit-Branch: master Gerrit-Change-Id: I8adbf75babc233dff79e5c8921d1f24692a939ab Gerrit-Change-Number: 26840 Gerrit-PatchSet: 3 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-MessageType: merged

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit May 2019