A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 12:58:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: camera: smmu: Disable SMMU stall on page fault" into camera-kernel.lnx.4.0

Browse source
This commit is contained in:
Camera Software Integration 2021-06-18 06:55:38 -07:00 • committed by Gerrit - the friendly Code Review server
commit 196f4e6b2f
1 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

26
drivers/cam_smmu/cam_smmu_api.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2014-2020, The Linux Foundation. All rights reserved.
* Copyright (c) 2014-2021, The Linux Foundation. All rights reserved.
*/
#include <linux/module.h>
@ -133,6 +133,7 @@ struct cam_context_bank_info {
bool is_fw_allocated;
bool is_secheap_allocated;
bool is_qdss_allocated;
bool stall_disable;
struct scratch_mapping scratch_map;
struct gen_pool *shared_mem_pool;
@ -3641,6 +3642,8 @@ static int cam_smmu_setup_cb(struct cam_context_bank_info *cb,
struct device *dev)
{
int rc = 0;
int32_t stall_disable = 1;
int32_t hupcf = 1;
if (!cb || !dev) {
CAM_ERR(CAM_SMMU, "Error: invalid input params");
@ -3708,6 +3711,24 @@ static int cam_smmu_setup_cb(struct cam_context_bank_info *cb,
cb->discard_iova_len);
cb->state = CAM_SMMU_ATTACH;
if (cb->stall_disable) {
if (iommu_domain_set_attr(cb->domain,
DOMAIN_ATTR_FAULT_MODEL_NO_STALL,
&stall_disable) < 0) {
CAM_ERR(CAM_SMMU,
"Error: failed to set cb stall disable for node: %s",
cb->name[0]);
}
if (iommu_domain_set_attr(cb->domain,
DOMAIN_ATTR_FAULT_MODEL_HUPCF,
&hupcf) < 0) {
CAM_ERR(CAM_SMMU,
"Error: failed to set attribute HUPCF for node: %s",
cb->name[0]);
}
}
} else {
CAM_ERR(CAM_SMMU, "Context bank does not have IO region");
rc = -ENODEV;
@ -4046,6 +4067,9 @@ static int cam_populate_smmu_context_banks(struct device *dev,
cb->num_shared_hdl = of_property_count_strings(dev->of_node,
"cam-smmu-label");
cb->stall_disable =
of_property_read_bool(dev->of_node, "stall-disable");
if (cb->num_shared_hdl >
CAM_SMMU_SHARED_HDL_MAX) {
CAM_ERR(CAM_CDM, "Invalid count of client names count=%d",