Revert "video: driver: move NOC registers programming from Firmware to Software"

This reverts commit 862bae6da81b6777e1a2739fb1a72879fe448f92.

Change-Id: Ida18c4ba7cc352240f5cc8596d9ac8caa45e6e04

driver/variant/iris33/src/msm_vidc_iris33.c

@@ -118,18 +118,6 @@ typedef enum
  */
 #define VCODEC_SS_IDLE_STATUSn           (VCODEC_BASE_OFFS_IRIS33 + 0x70)
 
-/*
- * --------------------------------------------------------------------------
- * MODULE: VCODEC_NOC
- * --------------------------------------------------------------------------
- */
-#define NOC_BASE_OFFS   0x00010000
-#define NOC_ERL_ERRORLOGGER_MAIN_ERRORLOGGER_MAINCTL_LOW   (NOC_BASE_OFFS + 0xA008)
-#define NOC_ERL_ERRORLOGGER_MAIN_ERRORLOGGER_ERRCLR_LOW   (NOC_BASE_OFFS + 0xA018)
-#define NOC_ERL_ERRORLOGGER_MAIN_ERRORLOGGER_ERRLOG2_LOW   (NOC_BASE_OFFS + 0xA030)
-#define NOC_ERL_ERRORLOGGER_MAIN_ERRORLOGGER_ERRLOG3_LOW   (NOC_BASE_OFFS + 0xA038)
-#define NOC_SIDEBANDMANAGER_MAIN_SIDEBANDMANAGER_FAULTINEN0_LOW (NOC_BASE_OFFS + 0x7040)
-
 static int __interrupt_init_iris33(struct msm_vidc_core *vidc_core)
 {
 	struct msm_vidc_core *core = vidc_core;
@@ -760,38 +748,18 @@ static int __power_on_iris33(struct msm_vidc_core *core)
 
 	__set_registers(core);
 
-	/* Programm NOC error registers before releasing xo reset */
-	rc = __write_register(core,
-			NOC_ERL_ERRORLOGGER_MAIN_ERRORLOGGER_MAINCTL_LOW, 0x3);
-	if (rc) {
-		d_vpr_e(
-			"%s: failed to set NOC_ERL_MAIN_ERRORLOGGER_MAINCTL_LOW\n",
-			__func__);
-		goto fail_program_noc_regs;
-	}
-	rc = __write_register(core,
-			NOC_SIDEBANDMANAGER_MAIN_SIDEBANDMANAGER_FAULTINEN0_LOW, 0x1);
-	if (rc) {
-		d_vpr_e(
-			"%s: failed to set NOC_SIDEBANDMANAGER_FAULTINEN0_LOW\n",
-			__func__);
-		goto fail_program_noc_regs;
-	}
-
 	/* release reset control for other consumers */
 	rc = call_res_op(core, reset_control_release, core, "video_xo_reset");
 	if (rc) {
 		d_vpr_e("%s: failed to release video_xo_reset reset\n", __func__);
 		goto fail_deassert_xo_reset;
 	}
-
 	__interrupt_init_iris33(core);
 	core->intr_status = 0;
 	enable_irq(core->resource->irq);
 
 	return rc;
 
-fail_program_noc_regs:
 fail_deassert_xo_reset:
 fail_assert_xo_reset:
 fail_power_on_substate:
@@ -802,7 +770,6 @@ fail_power_on_controller:
 	call_res_op(core, set_bw, core, 0, 0);
 fail_vote_buses:
 	msm_vidc_change_core_sub_state(core, CORE_SUBSTATE_POWER_ENABLE, 0, __func__);
-
 	return rc;
 }
 
@@ -908,10 +875,9 @@ static int __watchdog_iris33(struct msm_vidc_core *vidc_core, u32 intr_status)
 	return rc;
 }
 
-static int __noc_error_info_iris33(struct msm_vidc_core *core)
+static int __noc_error_info_iris33(struct msm_vidc_core *vidc_core)
 {
-	u32 value, count = 0;
-	int rc = 0;
+	struct msm_vidc_core *core = vidc_core;
 
 	if (!core) {
 		d_vpr_e("%s: invalid params\n", __func__);
@@ -954,62 +920,7 @@ static int __noc_error_info_iris33(struct msm_vidc_core *core)
 	d_vpr_e("VCODEC_NOC_ERL_MAIN_ERRLOG3_HIGH:     %#x\n", val);
 	*/
 
-	if (is_iris33_hw_power_collapsed(core)) {
-		d_vpr_e("%s: video hardware already power collapsed\n", __func__);
-		return rc;
-	}
-
-	/*
-	 * Acquire video_xo_reset to ensure EVA module is
-	 * not doing assert or de-assert on video_xo_reset
-	 * while reading noc registers
-	 */
-	d_vpr_e("%s: read NOC ERR LOG registers\n", __func__);
-	do {
-		rc = call_res_op(core, reset_control_acquire, core, "video_xo_reset");
-		if (!rc) {
-			break;
-		} else {
-			d_vpr_e(
-				"%s: failed to acquire video_xo_reset control, count %d\n",
-				__func__, count);
-			count++;
-			usleep_range(1000, 1000);
-		}
-	} while (count < 100);
-
-	if (count >= 100) {
-		d_vpr_e("%s: timeout acquiring video_xo_reset\n", __func__);
-		goto fail_assert_xo_reset;
-	}
-
-	rc = __read_register(core,
-			NOC_ERL_ERRORLOGGER_MAIN_ERRORLOGGER_ERRLOG2_LOW, &value);
-	if (!rc)
-		d_vpr_e("%s: NOC_ERL_ERRORLOGGER_MAIN_ERRORLOGGER_ERRLOG2_LOW:  %#x\n",
-			__func__, value);
-
-	rc = __read_register(core,
-			NOC_ERL_ERRORLOGGER_MAIN_ERRORLOGGER_ERRLOG3_LOW, &value);
-	if (!rc)
-		d_vpr_e("%s: NOC_ERL_ERRORLOGGER_MAIN_ERRORLOGGER_ERRLOG3_LOW:  %#x\n",
-			__func__, value);
-
-	rc = __write_register(core,
-			NOC_ERL_ERRORLOGGER_MAIN_ERRORLOGGER_ERRCLR_LOW, 0x1);
-	if (rc)
-		d_vpr_e("%s: error clearing NOC reg\n", __func__);
-
-	/* release reset control for other consumers */
-	rc = call_res_op(core, reset_control_release, core, "video_xo_reset");
-	if (rc) {
-		d_vpr_e("%s: failed to release video_xo_reset reset\n", __func__);
-		goto fail_deassert_xo_reset;
-	}
-
-fail_deassert_xo_reset:
-fail_assert_xo_reset:
-	return rc;
+	return 0;
 }
 
 static int __clear_interrupt_iris33(struct msm_vidc_core *vidc_core)

driver/vidc/src/msm_vidc_driver.c

@@ -4570,6 +4570,9 @@ int msm_vidc_smmu_fault_handler(struct iommu_domain *domain,
 	msm_vidc_change_core_sub_state(core, 0, CORE_SUBSTATE_PAGE_FAULT, __func__);
 	core_unlock(core, __func__);
 
+	/* print noc error log registers */
+	venus_hfi_noc_error_info(core);
+
 	msm_vidc_print_core_info(core);
 	/*
 	 * Return -ENOSYS to elicit the default behaviour of smmu driver.

driver/vidc/src/venus_hfi_response.c

@@ -472,17 +472,17 @@ int handle_system_error(struct msm_vidc_core *core,
 
 	d_vpr_e("%s: system error received\n", __func__);
 	print_sfr_message(core);
+	venus_hfi_noc_error_info(core);
 
 	if (pkt) {
 		/* enable force bugon for requested type */
-		if (pkt->type == HFI_SYS_ERROR_FATAL) {
+		if (pkt->type == HFI_SYS_ERROR_FATAL)
 			bug_on = !!(msm_vidc_enable_bugon & MSM_VIDC_BUG_ON_FATAL);
-		} else if (pkt->type == HFI_SYS_ERROR_NOC) {
+		else if (pkt->type == HFI_SYS_ERROR_NOC)
 			bug_on = !!(msm_vidc_enable_bugon & MSM_VIDC_BUG_ON_NOC);
-			venus_hfi_noc_error_info(core);
-		} else if (pkt->type == HFI_SYS_ERROR_WD_TIMEOUT) {
+		else if (pkt->type == HFI_SYS_ERROR_WD_TIMEOUT)
 			bug_on = !!(msm_vidc_enable_bugon & MSM_VIDC_BUG_ON_WD_TIMEOUT);
-		}
+
 		if (bug_on) {
 			d_vpr_e("%s: force bugon for type %#x\n", __func__, pkt->type);
 			MSM_VIDC_FATAL(true);