commit f421ba8713e0c9a5fe531aff8b6183299b4b2ecb
author Chris Gibson <cgibson@google.com> Mon Sep 12 13:49:35 2016 -0700
committer Chris Gibson <cgibson@google.com> Mon Sep 12 23:03:40 2016 +0000
tree d7707afd0066c6e9cfb99f197e14554589d7b49a
parent 13639123681e8cbdbcbf5ad77807a1a815e7a5a8

kernel/prism: fix LOS alarm initial state

The Marvell GPON kernel driver does not properly clear the LOS alarm
after the board first boots. The Marvell kernel code will set the LOS
alarm correctly if there is a real loss of signal alarm. So changing
the initial value seems to correct the problem.

Addresses https://b/31153124

Change-Id: If5ecad6fd7b410f2cca96e421c1359a3c9827662
(cherry picked from commit 78450a9b1c8cb540d4c784571fff5adcf97bd670)

arch/arm/plat-feroceon/mv_drivers_lsp/mv_pon/core/gpon/gponOnuAlrm.c

diff --git a/arch/arm/plat-feroceon/mv_drivers_lsp/mv_pon/core/gpon/gponOnuAlrm.c b/arch/arm/plat-feroceon/mv_drivers_lsp/mv_pon/core/gpon/gponOnuAlrm.c
index e20431d..887d63d 100755
--- a/arch/arm/plat-feroceon/mv_drivers_lsp/mv_pon/core/gpon/gponOnuAlrm.c
+++ b/arch/arm/plat-feroceon/mv_drivers_lsp/mv_pon/core/gpon/gponOnuAlrm.c
@@ -127,8 +127,10 @@
          ONU_GPON_ALARM_OFF,
          sizeof (S_OnuGponAlarmTbl));
 
-  /* set alarms on as default only for LOS, LOF, and LCDG */
-  onuGponApmTbl_s.onuGponAlarmTbl_s.onuGponAlarmTbl[ONU_GPON_ALARM_LOS]  = ONU_GPON_ALARM_ON;
+  /* Work around a bug where the Marvell code does not clear the LOS alarm
+   * correctly after the board boots. The code will correctly set LOS after boot
+   * if there is a legitimate LOS alarm. */
+  onuGponApmTbl_s.onuGponAlarmTbl_s.onuGponAlarmTbl[ONU_GPON_ALARM_LOS]  = ONU_GPON_ALARM_OFF;
   onuGponApmTbl_s.onuGponAlarmTbl_s.onuGponAlarmTbl[ONU_GPON_ALARM_LOF]  = ONU_GPON_ALARM_ON;
 }