msm: vidc: Print noc error information after pagefault
When pagefault occurs and smmu driver does resume
terminate on the fault transaction then noc error
registers will be updated. Enable non fatal attribute
on venus context banks so that smmu driver will resume
terminate the fault transaction. Video driver does
nothing in pagefault handler for the first time and
smmu driver resume terminates the transaction and hence
noc error registers will be updated with error information.
Video driver will print the noc error information in the
pagefault handler for the second time.
CRs-Fixed: 2054180
Change-Id: I1b594ac3b7f2da1c3b47b06674ce8ac5c03f2c1d
Signed-off-by: Maheshwar Ajja <majja@codeaurora.org>
diff --git a/drivers/media/platform/msm/vidc/msm_vidc_common.c b/drivers/media/platform/msm/vidc/msm_vidc_common.c
index 1b8e438..b78d948 100644
--- a/drivers/media/platform/msm/vidc/msm_vidc_common.c
+++ b/drivers/media/platform/msm/vidc/msm_vidc_common.c
@@ -2028,6 +2028,7 @@
}
dprintk(VIDC_WARN, "SYS_ERROR received for core %pK\n", core);
+ msm_vidc_noc_error_info(core);
call_hfi_op(hdev, flush_debug_queue, hdev->hfi_device_data);
list_for_each_entry(inst, &core->instances, list) {
dprintk(VIDC_WARN,
@@ -5006,6 +5007,28 @@
return ret;
};
+int msm_vidc_noc_error_info(struct msm_vidc_core *core)
+{
+ struct hfi_device *hdev;
+
+ if (!core || !core->device) {
+ dprintk(VIDC_WARN, "%s: Invalid parameters: %pK\n",
+ __func__, core);
+ return -EINVAL;
+ }
+
+ if (!core->resources.non_fatal_pagefaults)
+ return 0;
+
+ if (!core->smmu_fault_handled)
+ return 0;
+
+ hdev = core->device;
+ call_hfi_op(hdev, noc_error_info, hdev->hfi_device_data);
+
+ return 0;
+}
+
int msm_vidc_trigger_ssr(struct msm_vidc_core *core,
enum hal_ssr_trigger_type type)
{
diff --git a/drivers/media/platform/msm/vidc/msm_vidc_internal.h b/drivers/media/platform/msm/vidc/msm_vidc_internal.h
index 57dfd52..67e96d4 100644
--- a/drivers/media/platform/msm/vidc/msm_vidc_internal.h
+++ b/drivers/media/platform/msm/vidc/msm_vidc_internal.h
@@ -395,6 +395,7 @@
void handle_cmd_response(enum hal_command_response cmd, void *data);
int msm_vidc_trigger_ssr(struct msm_vidc_core *core,
enum hal_ssr_trigger_type type);
+int msm_vidc_noc_error_info(struct msm_vidc_core *core);
int msm_vidc_check_session_supported(struct msm_vidc_inst *inst);
int msm_vidc_check_scaling_supported(struct msm_vidc_inst *inst);
void msm_vidc_queue_v4l2_event(struct msm_vidc_inst *inst, int event_type);
diff --git a/drivers/media/platform/msm/vidc/msm_vidc_platform.c b/drivers/media/platform/msm/vidc/msm_vidc_platform.c
index 8a701cb..027e76e 100644
--- a/drivers/media/platform/msm/vidc/msm_vidc_platform.c
+++ b/drivers/media/platform/msm/vidc/msm_vidc_platform.c
@@ -68,6 +68,10 @@
.value = 1,
},
{
+ .key = "qcom,domain-attr-non-fatal-faults",
+ .value = 1,
+ },
+ {
.key = "qcom,max-secure-instances",
.value = 5,
},
diff --git a/drivers/media/platform/msm/vidc/msm_vidc_res_parse.c b/drivers/media/platform/msm/vidc/msm_vidc_res_parse.c
index 039b457..46fb75f 100644
--- a/drivers/media/platform/msm/vidc/msm_vidc_res_parse.c
+++ b/drivers/media/platform/msm/vidc/msm_vidc_res_parse.c
@@ -785,6 +785,9 @@
"qcom,fw-unload-delay");
res->msm_vidc_hw_rsp_timeout = find_key_value(platform_data,
"qcom,hw-resp-timeout");
+ res->non_fatal_pagefaults = find_key_value(platform_data,
+ "qcom,domain-attr-non-fatal-faults");
+
return rc;
}
@@ -980,8 +983,13 @@
return -EINVAL;
}
- if (core->smmu_fault_handled)
+ if (core->smmu_fault_handled) {
+ if (core->resources.non_fatal_pagefaults) {
+ msm_vidc_noc_error_info(core);
+ MSM_VIDC_ERROR(true);
+ }
return -ENOSYS;
+ }
dprintk(VIDC_ERR, "%s - faulting address: %lx\n", __func__, iova);
@@ -1061,6 +1069,21 @@
goto err_setup_cb;
}
+ if (core->resources.non_fatal_pagefaults) {
+ int data = 1;
+
+ dprintk(VIDC_DBG, "set non-fatal-faults attribute on %s\n",
+ dev_name(dev));
+ rc = iommu_domain_set_attr(cb->mapping->domain,
+ DOMAIN_ATTR_NON_FATAL_FAULTS, &data);
+ if (rc) {
+ dprintk(VIDC_WARN,
+ "%s: set non fatal attribute failed: %s %d\n",
+ __func__, dev_name(dev), rc);
+ /* ignore the error */
+ }
+ }
+
iommu_set_fault_handler(cb->mapping->domain,
msm_vidc_smmu_fault_handler, (void *)core);
diff --git a/drivers/media/platform/msm/vidc/msm_vidc_resources.h b/drivers/media/platform/msm/vidc/msm_vidc_resources.h
index 8888980..31d5a42 100644
--- a/drivers/media/platform/msm/vidc/msm_vidc_resources.h
+++ b/drivers/media/platform/msm/vidc/msm_vidc_resources.h
@@ -189,6 +189,7 @@
int msm_vidc_hw_rsp_timeout;
int msm_vidc_firmware_unload_delay;
uint32_t msm_vidc_pwr_collapse_delay;
+ bool non_fatal_pagefaults;
struct msm_vidc_codec_data *codec_data;
int codec_data_count;
};
diff --git a/drivers/media/platform/msm/vidc/venus_hfi.c b/drivers/media/platform/msm/vidc/venus_hfi.c
index 8064f4c..69fc2e0 100644
--- a/drivers/media/platform/msm/vidc/venus_hfi.c
+++ b/drivers/media/platform/msm/vidc/venus_hfi.c
@@ -102,6 +102,7 @@
static int __set_subcaches(struct venus_hfi_device *device);
static int __release_subcaches(struct venus_hfi_device *device);
static int __disable_subcaches(struct venus_hfi_device *device);
+static int venus_hfi_noc_error_info(void *dev);
/**
* Utility function to enforce some of our assumptions. Spam calls to this
@@ -4271,6 +4272,64 @@
return rc;
}
+static int venus_hfi_noc_error_info(void *dev)
+{
+ struct venus_hfi_device *device;
+ u32 val = 0;
+
+ if (!dev) {
+ dprintk(VIDC_ERR, "%s: null device\n", __func__);
+ return -EINVAL;
+ }
+ device = dev;
+
+ mutex_lock(&device->lock);
+ dprintk(VIDC_ERR, "%s: non error information\n", __func__);
+
+ val = __read_register(device, 0x0C500);
+ dprintk(VIDC_ERR, "NOC_ERR_SWID_LOW(0x00AA0C500): %#x\n", val);
+
+ val = __read_register(device, 0x0C504);
+ dprintk(VIDC_ERR, "NOC_ERR_SWID_HIGH(0x00AA0C504): %#x\n", val);
+
+ val = __read_register(device, 0x0C508);
+ dprintk(VIDC_ERR, "NOC_ERR_MAINCTL_LOW(0x00AA0C508): %#x\n", val);
+
+ val = __read_register(device, 0x0C510);
+ dprintk(VIDC_ERR, "NOC_ERR_ERRVLD_LOW(0x00AA0C510): %#x\n", val);
+
+ val = __read_register(device, 0x0C518);
+ dprintk(VIDC_ERR, "NOC_ERR_ERRCLR_LOW(0x00AA0C518): %#x\n", val);
+
+ val = __read_register(device, 0x0C520);
+ dprintk(VIDC_ERR, "NOC_ERR_ERRLOG0_LOW(0x00AA0C520): %#x\n", val);
+
+ val = __read_register(device, 0x0C524);
+ dprintk(VIDC_ERR, "NOC_ERR_ERRLOG0_HIGH(0x00AA0C524): %#x\n", val);
+
+ val = __read_register(device, 0x0C528);
+ dprintk(VIDC_ERR, "NOC_ERR_ERRLOG1_LOW(0x00AA0C528): %#x\n", val);
+
+ val = __read_register(device, 0x0C52C);
+ dprintk(VIDC_ERR, "NOC_ERR_ERRLOG1_HIGH(0x00AA0C52C): %#x\n", val);
+
+ val = __read_register(device, 0x0C530);
+ dprintk(VIDC_ERR, "NOC_ERR_ERRLOG2_LOW(0x00AA0C530): %#x\n", val);
+
+ val = __read_register(device, 0x0C534);
+ dprintk(VIDC_ERR, "NOC_ERR_ERRLOG2_HIGH(0x00AA0C534): %#x\n", val);
+
+ val = __read_register(device, 0x0C538);
+ dprintk(VIDC_ERR, "NOC_ERR_ERRLOG3_LOW(0x00AA0C538): %#x\n", val);
+
+ val = __read_register(device, 0x0C53C);
+ dprintk(VIDC_ERR, "NOC_ERR_ERRLOG3_HIGH(0x00AA0C53C): %#x\n", val);
+
+ mutex_unlock(&device->lock);
+
+ return 0;
+}
+
static int __initialize_packetization(struct venus_hfi_device *device)
{
int rc = 0;
@@ -4442,6 +4501,7 @@
hdev->get_core_capabilities = venus_hfi_get_core_capabilities;
hdev->suspend = venus_hfi_suspend;
hdev->flush_debug_queue = venus_hfi_flush_debug_queue;
+ hdev->noc_error_info = venus_hfi_noc_error_info;
hdev->get_default_properties = venus_hfi_get_default_properties;
}
diff --git a/drivers/media/platform/msm/vidc/vidc_hfi_api.h b/drivers/media/platform/msm/vidc/vidc_hfi_api.h
index e854b43..6852587 100644
--- a/drivers/media/platform/msm/vidc/vidc_hfi_api.h
+++ b/drivers/media/platform/msm/vidc/vidc_hfi_api.h
@@ -1411,6 +1411,7 @@
int (*get_core_capabilities)(void *dev);
int (*suspend)(void *dev);
int (*flush_debug_queue)(void *dev);
+ int (*noc_error_info)(void *dev);
enum hal_default_properties (*get_default_properties)(void *dev);
};