Minor fix for GPU reset SM and more FFDC

CQ:SW421244 Change-Id: I4cd011c252074703f4be2ebdc2e5f495ce7ae66b Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/56519 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Martha Broyles <mbroyles@us.ibm.com> Reviewed-by: Christopher J. Cain <cjcain@us.ibm.com> Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
open-power · Apr 2, 2018 · d16e7d0 · d16e7d0
1 parent b57b1a9
commit d16e7d0
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/occ_405/gpu/gpu.c b/src/occ_405/gpu/gpu.c
@@ -992,15 +992,16 @@ bool gpu_reset_sm()
                     // Stop trying if reached max resets
                     if(L_consec_reset_failure_count > MAX_CONSECUTIVE_GPU_RESETS)
                     {
-                        INTR_TRAC_ERR("gpu_reset_sm: Max Resets reached failed at state 0x%02X",
-                                      L_reset_state);
+                        INTR_TRAC_ERR("gpu_reset_sm: Max Resets reached! state[0x%02X] rc[0x%08X] addr[0x%08X] ffdc[0x%08X%08X]",
+                                      L_reset_state, G_gpu_op_req_args.error.rc, G_gpu_op_req_args.error.addr,
+                                      (uint32_t) (G_gpu_op_req_args.error.ffdc >> 32), (uint32_t) G_gpu_op_req_args.error.ffdc);
 
                         /*
                          * @errortype
                          * @moduleid    GPU_MID_GPU_RESET_SM
                          * @reasoncode  GPU_FAILURE
                          * @userdata1   GPU reset state
-                         * @userdata2   0
+                         * @userdata2   GPE failure RC
                          * @userdata4   ERC_GPU_RESET_FAILURE
                          * @devdesc     Failure resetting GPU interface
                          */
@@ -1011,7 +1012,7 @@ bool gpu_reset_sm()
                                                NULL,
                                                DEFAULT_TRACE_SIZE,
                                                L_reset_state,
-                                               0);
+                                               G_gpu_op_req_args.error.rc);
                         commitErrl(&err);
 
                         disable_all_gpus();
@@ -1023,7 +1024,7 @@ bool gpu_reset_sm()
                     {
                         L_consec_reset_failure_count++;
                         L_state_retry_count = 0;
-                        L_reset_state = GPU_RESET_STATE_NEW;
+                        L_reset_state = GPU_RESET_STATE_INIT_BUS;
                     }
                 }  // else reset attempt failed
             }  // else GPE supports GPU