commit 3a0e2a08f5489f3bb5c6e9f97b903e6e10c31a6c
author Nico Huber <nico.huber@secunet.com> Wed Jul 19 14:41:46 2017 +0200
committer Nico Huber <nico.h@gmx.de> Wed Aug 30 15:14:08 2017 +0000
tree b8cb4de27f1fad5e9e49ef515c2f190213db0bba
parent 8540805c2900f3f7b40dfc2c520d66c96368e0f7

gma skl: Disable DDI clocks on reset path

After reset DPLL_CTRL2 is initialized to 0. Which means some clock
disable bits are not set and might cause some hassle later. Set them
and close the related TODO.

Change-Id: I1a470dff55e317e8119906b3e397f6f2314abcbd
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/20648
Tested-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>

common/haswell_shared/hw-gfx-gma-connectors-ddi.adb

diff --git a/common/haswell_shared/hw-gfx-gma-connectors-ddi.adb b/common/haswell_shared/hw-gfx-gma-connectors-ddi.adb
index 0fc4ad9..fa62a98 100644
--- a/common/haswell_shared/hw-gfx-gma-connectors-ddi.adb
+++ b/common/haswell_shared/hw-gfx-gma-connectors-ddi.adb
@@ -747,4 +747,18 @@
       end if;
    end Off;
 
+   ----------------------------------------------------------------------------
+
+   procedure Post_Reset_Off
+   is
+      Clocks_Off : Word32 := 0;
+   begin
+      if not Config.Has_Per_DDI_Clock_Sel and not Config.Has_DDI_PHYs then
+         for Port in Digital_Port loop
+            Clocks_Off := Clocks_Off or DPLL_CTRL2_DDIx_CLOCK_OFF (Port);
+         end loop;
+         Registers.Set_Mask (Registers.DPLL_CTRL2, Clocks_Off);
+      end if;
+   end Post_Reset_Off;
+
 end HW.GFX.GMA.Connectors.DDI;

common/haswell_shared/hw-gfx-gma-connectors-ddi.ads

diff --git a/common/haswell_shared/hw-gfx-gma-connectors-ddi.ads b/common/haswell_shared/hw-gfx-gma-connectors-ddi.ads
index 4ccd995..ec1fce2 100644
--- a/common/haswell_shared/hw-gfx-gma-connectors-ddi.ads
+++ b/common/haswell_shared/hw-gfx-gma-connectors-ddi.ads
@@ -28,6 +28,8 @@
 
    procedure Off (Port : Digital_Port);
 
+   procedure Post_Reset_Off;
+
 private
    type Buf_Trans_Range is range 0 .. 19;
    type Buf_Trans_Array is array (Buf_Trans_Range) of Word32;

common/haswell_shared/hw-gfx-gma-connectors.adb

diff --git a/common/haswell_shared/hw-gfx-gma-connectors.adb b/common/haswell_shared/hw-gfx-gma-connectors.adb
index f5e2e01..eb080e8 100644
--- a/common/haswell_shared/hw-gfx-gma-connectors.adb
+++ b/common/haswell_shared/hw-gfx-gma-connectors.adb
@@ -21,6 +21,12 @@
 
 package body HW.GFX.GMA.Connectors is
 
+   procedure Post_Reset_Off
+   is
+   begin
+      DDI.Post_Reset_Off;
+   end Post_Reset_Off;
+
    procedure Initialize
    is
    begin