Merge 47907f98a113e8e4446acd6f7a4850b9cfa98a32 on remote branch

Change-Id: I178e213c9500a7eccef8de70d3f5f599eb87189e

ubwcp/Android.bp

@@ -1,9 +1,11 @@
 headers_src = [
     "include/uapi/*.h",
+    "include/kernel/*.h",
 ]
 
 ubwcp_headers_out = [
     "ubwcp_ioctl.h",
+    "ubwcp.h",
 ]
 
 ubwcp_kernel_headers_verbose = "--verbose "
@@ -21,7 +23,7 @@ genrule {
           ubwcp_kernel_headers_verbose +
          "--header_arch arm64 " +
          "--gen_dir $(genDir) " +
-         "--ubwcp_include_uapi $(locations include/uapi/*.h) " +
+         "--ubwcp_include $(locations include/uapi/*.h) $(locations include/kernel/*.h) " +
          "--unifdef $(location unifdef) " +
          "--headers_install $(location headers_install.sh)",
     out: ubwcp_headers_out,

ubwcp/Android.mk

@@ -5,6 +5,8 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 # For incremental compilation
 LOCAL_SRC_FILES   := $(wildcard $(LOCAL_PATH)/*)
-LOCAL_MODULE      := ubwcpx.ko
+LOCAL_EXPORT_KO_INCLUDE_DIRS    := $(LOCAL_PATH)/include/uapi
+LOCAL_EXPORT_KO_INCLUDE_DIRS    += $(LOCAL_PATH)/include/kernel
+LOCAL_MODULE      := ubwcp.ko
 LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
 include $(DLKM_DIR)/Build_external_kernelmodule.mk

ubwcp/BUILD.bazel

@@ -0,0 +1,4 @@
+load(":define_modules.bzl", "define_modules")
+
+define_modules("pineapple", "consolidate")
+define_modules("pineapple", "gki")

ubwcp/Kbuild

@@ -1,4 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ubwcpx-objs := ubwcp.o ubwcp_hw.o
-obj-m += ubwcpx.o
+ubwcp-objs := ubwcp_main.o ubwcp_hw.o
+obj-m += ubwcp.o

ubwcp/define_modules.bzl

@@ -0,0 +1,31 @@
+load("//build/kernel/kleaf:kernel.bzl", "ddk_module")
+load("//build/bazel_common_rules/dist:dist.bzl", "copy_to_dist_dir")
+
+
+def define_modules(target, variant):
+    tv = "{}_{}".format(target, variant)
+
+    ddk_module(
+        name = "{}_ubwcp".format(tv),
+        out = "ubwcp.ko",
+        srcs = [
+            "ubwcp_main.c",
+            "ubwcp_hw.c",
+            "ubwcp_hw.h",
+        ],
+        hdrs=["include/uapi/ubwcp_ioctl.h", "include/kernel/ubwcp.h"],
+        deps = ["//msm-kernel:all_headers"],
+        includes = ["include", "include/kernel"],
+        kernel_build = "//msm-kernel:{}".format(tv),
+        visibility = ["//visibility:public"]
+    )
+
+    copy_to_dist_dir(
+        name = "{}_ubwcp_dist".format(tv),
+        data = [":{}_ubwcp".format(tv)],
+        dist_dir = "out/target/product/{}/dlkm/lib/modules/".format(target),
+        flat = True,
+        wipe_dist_dir = False,
+        allow_duplicate_filenames = False,
+        mode_overrides = {"**/*": "644"},
+    )

ubwcp/ubwcp.h → ubwcp/include/kernel/ubwcp.h

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef __UBWCP_H_
@@ -9,7 +9,7 @@
 #include <linux/types.h>
 #include <linux/dma-buf.h>
 
-#include "include/uapi/ubwcp_ioctl.h"
+#include "../uapi/ubwcp_ioctl.h"
 
 
 typedef int (*configure_mmap)(struct dma_buf *dmabuf, bool linear, phys_addr_t ula_pa_addr,
@@ -62,4 +62,75 @@ int ubwcp_get_buf_attrs(struct dma_buf *dmabuf, struct ubwcp_buffer_attrs *attr)
  */
 int ubwcp_set_perm_range_translation(struct dma_buf *dmabuf, bool enable);
 
+enum ubwcp_error {
+	UBWCP_ENCODE_ERROR = 0,
+	UBWCP_DECODE_ERROR,
+	UBWCP_RANGE_TRANSLATION_ERROR,
+	UBWCP_SMMU_FAULT,
+	UBWCP_UNKNOWN_ERROR,
+};
+
+enum iommu_cb_id {
+	UBWCP_DESC_CB_ID = 0,
+	UBWCP_BUF_CB_ID,
+	UBWCP_UNKNOWN_CB_ID,
+};
+
+struct ubwcp_enc_err_info {
+	struct dma_buf *dmabuf;
+	phys_addr_t ula_pa;
+};
+
+struct ubwcp_dec_err_info {
+	struct dma_buf *dmabuf;
+	phys_addr_t ula_pa;
+};
+
+struct ubwcp_translation_err_info {
+	struct dma_buf *dmabuf;
+	phys_addr_t ula_pa;
+	bool read;
+};
+
+struct ubwcp_smmu_fault_err_info {
+	struct dma_buf *dmabuf;
+	unsigned long iova;
+	enum iommu_cb_id iommu_dev_id;
+	int iommu_fault_flags;
+};
+
+struct unwcp_err_info {
+	enum ubwcp_error err_code;
+	union {
+		struct ubwcp_enc_err_info enc_err;
+		struct ubwcp_dec_err_info dec_err;
+		struct ubwcp_translation_err_info translation_err;
+		struct ubwcp_smmu_fault_err_info smmu_err;
+	};
+};
+
+typedef void (*ubwcp_error_handler_t)(struct unwcp_err_info *err, void *data);
+
+/*
+ * Register an error handler
+ *
+ * @param client_id : not currently supported (pass in -1)
+ * @param handler   : the error handler function which will be called when an
+ *		      error occurs
+ * @param data      : data pointer provided with the error handler function
+ *
+ * @return int : 0 on success, otherwise error code
+ */
+int ubwcp_register_error_handler(u32 client_id, ubwcp_error_handler_t handler,
+				void *data);
+
+/*
+ * Unregister an error handler
+ *
+ * @param client_id : client id of handler to unregister (pass in -1)
+ *
+ * @return int : 0 on success, otherwise error code
+ */
+int ubwcp_unregister_error_handler(u32 client_id);
+
 #endif /* __UBWCP_H_ */

ubwcp/ubwcp_kernel_headers.py

@@ -20,7 +20,7 @@ import re
 import subprocess
 import sys
 
-def run_headers_install(verbose, gen_dir, headers_install, unifdef, prefix, h):
+def run_uapi_headers_install(verbose, gen_dir, headers_install, unifdef, prefix, h):
     if not h.startswith(prefix):
         print('error: expected prefix [%s] on header [%s]' % (prefix, h))
         return False
@@ -32,22 +32,49 @@ def run_headers_install(verbose, gen_dir, headers_install, unifdef, prefix, h):
     cmd = ["sh", headers_install, h, out_h]
 
     if verbose:
-        print('run_headers_install: cmd is %s' % cmd)
+        print('run_uapi_headers_install: cmd is %s' % cmd)
 
     result = subprocess.call(cmd, env=env)
 
     if result != 0:
-        print('error: run_headers_install: cmd %s failed %d' % (cmd, result))
+        print('error: run_uapi_headers_install: cmd %s failed %d' % (cmd, result))
         return False
     return True
 
-def gen_ubwcp_headers(verbose, gen_dir, headers_install, unifdef, ubwcp_include_uapi):
+def run_kernel_headers_install(verbose, gen_dir, headers_install, unifdef, prefix, h):
+    if not h.startswith(prefix):
+        print('error: expected prefix [%s] on header [%s]' % (prefix, h))
+        return False
+
+    out_h = os.path.join(gen_dir, h[len(prefix):])
+    (out_h_dirname, out_h_basename) = os.path.split(out_h)
+    env = os.environ.copy()
+    cmd = ["cp", h, out_h]
+
+    if verbose:
+        print('run_kernel_headers_install: cmd is %s' % cmd)
+
+    result = subprocess.call(cmd, env=env)
+
+    if result != 0:
+        print('error: run_kernel_headers_install: cmd %s failed %d' % (cmd, result))
+        return False
+    return True
+
+def gen_ubwcp_headers(verbose, gen_dir, headers_install, unifdef, ubwcp_include):
     error_count = 0
-    for h in ubwcp_include_uapi:
-        ubwcp_uapi_include_prefix = os.path.join(h.split('/include/uapi')[0], 'include', 'uapi') + os.sep
-        if not run_headers_install(
+    for h in ubwcp_include:
+        if 'include/uapi' in h:
+            ubwcp_include_prefix = os.path.join(h.split('/include/uapi')[0], 'include', 'uapi') + os.sep
+            if not run_uapi_headers_install(
                 verbose, gen_dir, headers_install, unifdef,
-                ubwcp_uapi_include_prefix, h): error_count += 1
+                ubwcp_include_prefix, h): error_count += 1
+        elif 'include/kernel' in h:
+            ubwcp_include_prefix = os.path.join(h.split('/include/kernel')[0], 'include', 'kernel') + os.sep
+            if not run_kernel_headers_install(
+                verbose, gen_dir, headers_install, unifdef,
+                ubwcp_include_prefix, h): error_count += 1
+
     return error_count
 
 def main():
@@ -67,8 +94,8 @@ def main():
             '--gen_dir', required=True,
             help='Where to place the generated files.')
     parser.add_argument(
-            '--ubwcp_include_uapi', required=True, nargs='*',
-            help='The list of techpack/*/include/uapi header files.')
+            '--ubwcp_include', required=True, nargs='*',
+            help='The list of header files.')
     parser.add_argument(
             '--headers_install', required=True,
             help='The headers_install tool to process input headers.')
@@ -82,12 +109,12 @@ def main():
     if args.verbose:
         print('header_arch [%s]' % args.header_arch)
         print('gen_dir [%s]' % args.gen_dir)
-        print('ubwcp_include_uapi [%s]' % args.ubwcp_include_uapi)
+        print('ubwcp_include [%s]' % args.ubwcp_include)
         print('headers_install [%s]' % args.headers_install)
         print('unifdef [%s]' % args.unifdef)
 
     return gen_ubwcp_headers(args.verbose, args.gen_dir,
-            args.headers_install, args.unifdef, args.ubwcp_include_uapi)
+            args.headers_install, args.unifdef, args.ubwcp_include)
 
 if __name__ == '__main__':
     sys.exit(main())

ubwcp/ubwcp.c → ubwcp/ubwcp_main.c

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/module.h>
@@ -24,10 +24,12 @@
 #include <linux/delay.h>
 #include <linux/ubwcp_dma_heap.h>
 #include <linux/debugfs.h>
+#include <linux/clk.h>
+#include <linux/iommu.h>
 
 MODULE_IMPORT_NS(DMA_BUF);
 
-#include "ubwcp.h"
+#include "include/kernel/ubwcp.h"
 #include "ubwcp_hw.h"
 #include "include/uapi/ubwcp_ioctl.h"
 
@@ -113,6 +115,9 @@ struct ubwcp_driver {
 	void __iomem *base; //ubwcp base address
 	struct regulator *vdd;
 
+	struct clk **clocks;
+	int num_clocks;
+
 	/* interrupts */
 	int irq_range_ck_rd;
 	int irq_range_ck_wr;
@@ -144,10 +149,13 @@ struct ubwcp_driver {
 	struct ubwcp_image_format_info format_info[INFO_FORMAT_LIST_SIZE];
 
 	struct mutex desc_lock;        /* allocate/free descriptors */
-	struct mutex buf_table_lock;   /* add/remove dma_buf into list of managed bufffers */
+	spinlock_t buf_table_lock;     /* add/remove dma_buf into list of managed bufffers */
+	struct mutex mem_hotplug_lock; /* memory hotplug lock */
 	struct mutex ula_lock;         /* allocate/free ula */
 	struct mutex ubwcp_flush_lock; /* ubwcp flush */
 	struct mutex hw_range_ck_lock; /* range ck */
+	struct list_head err_handler_list; /* error handler list */
+	spinlock_t err_handler_list_lock;  /* err_handler_list lock */
 };
 
 struct ubwcp_buf {
@@ -220,6 +228,67 @@ static void ubwcp_buf_desc_list_init(struct ubwcp_driver *ubwcp)
 	}
 }
 
+static int ubwcp_init_clocks(struct ubwcp_driver *ubwcp, struct device *dev)
+{
+	const char *cname;
+	struct property *prop;
+	int i;
+
+	ubwcp->num_clocks =
+		of_property_count_strings(dev->of_node, "clock-names");
+
+	if (ubwcp->num_clocks < 1) {
+		ubwcp->num_clocks = 0;
+		return 0;
+	}
+
+	ubwcp->clocks = devm_kzalloc(dev,
+		sizeof(*ubwcp->clocks) * ubwcp->num_clocks, GFP_KERNEL);
+	if (!ubwcp->clocks)
+		return -ENOMEM;
+
+	i = 0;
+	of_property_for_each_string(dev->of_node, "clock-names",
+				prop, cname) {
+		struct clk *c = devm_clk_get(dev, cname);
+
+		if (IS_ERR(c)) {
+			ERR("Couldn't get clock: %s\n", cname);
+			return PTR_ERR(c);
+		}
+
+		ubwcp->clocks[i] = c;
+
+		++i;
+	}
+	return 0;
+}
+
+static int ubwcp_enable_clocks(struct ubwcp_driver *ubwcp)
+{
+	int i, ret = 0;
+
+	for (i = 0; i < ubwcp->num_clocks; ++i) {
+		ret = clk_prepare_enable(ubwcp->clocks[i]);
+		if (ret) {
+			ERR("Couldn't enable clock #%d\n", i);
+			while (i--)
+				clk_disable_unprepare(ubwcp->clocks[i]);
+			break;
+		}
+	}
+
+	return ret;
+}
+
+static void ubwcp_disable_clocks(struct ubwcp_driver *ubwcp)
+{
+	int i;
+
+	for (i = ubwcp->num_clocks; i; --i)
+		clk_disable_unprepare(ubwcp->clocks[i - 1]);
+}
+
 /* UBWCP Power control */
 static int ubwcp_power(struct ubwcp_driver *ubwcp, bool enable)
 {
@@ -243,6 +312,16 @@ static int ubwcp_power(struct ubwcp_driver *ubwcp, bool enable)
 		} else {
 			DBG("regulator_enable() success");
 		}
+
+		if (!ret) {
+			ret = ubwcp_enable_clocks(ubwcp);
+			if (ret) {
+				ERR("enable clocks failed: %d", ret);
+				regulator_disable(ubwcp->vdd);
+			} else {
+				DBG("enable clocks success");
+			}
+		}
 	} else {
 		ret = regulator_disable(ubwcp->vdd);
 		if (ret < 0) {
@@ -251,7 +330,13 @@ static int ubwcp_power(struct ubwcp_driver *ubwcp, bool enable)
 		} else {
 			DBG("regulator_disable() success");
 		}
+
+		if (!ret) {
+			ubwcp_disable_clocks(ubwcp);
+			DBG("disable clocks success");
+		}
 	}
+
 	return ret;
 }
 
@@ -297,17 +382,18 @@ static struct ubwcp_buf *dma_buf_to_ubwcp_buf(struct dma_buf *dmabuf)
 {
 	struct ubwcp_buf *buf = NULL;
 	struct ubwcp_driver *ubwcp = ubwcp_get_driver();
+	unsigned long flags;
 
 	if (!dmabuf || !ubwcp)
 		return NULL;
 
-	mutex_lock(&ubwcp->buf_table_lock);
+	spin_lock_irqsave(&ubwcp->buf_table_lock, flags);
 	/* look up ubwcp_buf corresponding to this dma_buf */
 	hash_for_each_possible(ubwcp->buf_table, buf, hnode, (u64)dmabuf) {
 		if (buf->dma_buf == dmabuf)
 			break;
 	}
-	mutex_unlock(&ubwcp->buf_table_lock);
+	spin_unlock_irqrestore(&ubwcp->buf_table_lock, flags);
 
 	return buf;
 }
@@ -351,6 +437,8 @@ static int ubwcp_init_buffer(struct dma_buf *dmabuf)
 	int nid;
 	struct ubwcp_buf *buf;
 	struct ubwcp_driver *ubwcp = ubwcp_get_driver();
+	unsigned long flags;
+	bool table_empty;
 
 	FENTRY();
 
@@ -377,9 +465,11 @@ static int ubwcp_init_buffer(struct dma_buf *dmabuf)
 	buf->dma_buf = dmabuf;
 	buf->ubwcp   = ubwcp;
 
-	mutex_lock(&ubwcp->buf_table_lock);
-	if (hash_empty(ubwcp->buf_table)) {
-
+	mutex_lock(&ubwcp->mem_hotplug_lock);
+	spin_lock_irqsave(&ubwcp->buf_table_lock, flags);
+	table_empty = hash_empty(ubwcp->buf_table);
+	spin_unlock_irqrestore(&ubwcp->buf_table_lock, flags);
+	if (table_empty) {
 		ret = ubwcp_power(ubwcp, true);
 		if (ret)
 			goto err_power_on;
@@ -400,14 +490,16 @@ static int ubwcp_init_buffer(struct dma_buf *dmabuf)
 				page_to_virt(pfn_to_page(PFN_DOWN(ubwcp->ula_pool_base))));
 		}
 	}
+	spin_lock_irqsave(&ubwcp->buf_table_lock, flags);
 	hash_add(ubwcp->buf_table, &buf->hnode, (u64)buf->dma_buf);
-	mutex_unlock(&ubwcp->buf_table_lock);
+	spin_unlock_irqrestore(&ubwcp->buf_table_lock, flags);
+	mutex_unlock(&ubwcp->mem_hotplug_lock);
 	return ret;
 
 err_add_memory:
 	ubwcp_power(ubwcp, false);
 err_power_on:
-	mutex_unlock(&ubwcp->buf_table_lock);
+	mutex_unlock(&ubwcp->mem_hotplug_lock);
 	kfree(buf);
 	if (!ret)
 		ret = -1;
@@ -1856,6 +1948,8 @@ static int ubwcp_free_buffer(struct dma_buf *dmabuf)
 	int ret = 0;
 	struct ubwcp_buf *buf;
 	struct ubwcp_driver *ubwcp;
+	bool table_empty;
+	unsigned long flags;
 
 	FENTRY();
 
@@ -1890,12 +1984,16 @@ static int ubwcp_free_buffer(struct dma_buf *dmabuf)
 	if (buf->buf_attr_set)
 		reset_buf_attrs(buf);
 
-	mutex_lock(&ubwcp->buf_table_lock);
+	mutex_lock(&ubwcp->mem_hotplug_lock);
+	spin_lock_irqsave(&ubwcp->buf_table_lock, flags);
 	hash_del(&buf->hnode);
+	table_empty = hash_empty(ubwcp->buf_table);
+	spin_unlock_irqrestore(&ubwcp->buf_table_lock, flags);
+
 	kfree(buf);
 
 	/* If this is the last buffer being freed, power off ubwcp */
-	if (hash_empty(ubwcp->buf_table)) {
+	if (table_empty) {
 		DBG("last buffer: ~~~~~~~~~~~");
 		/* TBD: If everything is working fine, ubwcp_flush() should not
 		 * be needed here. Each buffer free logic should be taking
@@ -1915,11 +2013,11 @@ static int ubwcp_free_buffer(struct dma_buf *dmabuf)
 		}
 		DBG("Don't Call power OFF ...");
 	}
-	mutex_unlock(&ubwcp->buf_table_lock);
+	mutex_unlock(&ubwcp->mem_hotplug_lock);
 	return ret;
 
 err_remove_mem:
-	mutex_unlock(&ubwcp->buf_table_lock);
+	mutex_unlock(&ubwcp->mem_hotplug_lock);
 	if (!ret)
 		ret = -1;
 	DBG("returning error: %d", ret);
@@ -2061,14 +2159,183 @@ static void ubwcp_cdev_deinit(struct ubwcp_driver *ubwcp)
 	unregister_chrdev_region(ubwcp->devt, UBWCP_NUM_DEVICES);
 }
 
+struct handler_node {
+	struct list_head list;
+	u32 client_id;
+	ubwcp_error_handler_t handler;
+	void *data;
+};
+
+int ubwcp_register_error_handler(u32 client_id, ubwcp_error_handler_t handler,
+				void *data)
+{
+	struct handler_node *node;
+	unsigned long flags;
+	struct ubwcp_driver *ubwcp = ubwcp_get_driver();
+
+	if (!ubwcp)
+		return -EINVAL;
+
+	if (client_id != -1)
+		return -EINVAL;
+
+	if (!handler)
+		return -EINVAL;
+
+	node = kzalloc(sizeof(*node), GFP_KERNEL);
+	if (!node)
+		return -ENOMEM;
+
+	node->client_id = client_id;
+	node->handler = handler;
+	node->data = data;
+
+	spin_lock_irqsave(&ubwcp->err_handler_list_lock, flags);
+	list_add_tail(&node->list, &ubwcp->err_handler_list);
+	spin_unlock_irqrestore(&ubwcp->err_handler_list_lock, flags);
+
+	return 0;
+}
+EXPORT_SYMBOL(ubwcp_register_error_handler);
+
+static void ubwcp_notify_error_handlers(struct unwcp_err_info *err)
+{
+	struct handler_node *node;
+	unsigned long flags;
+	struct ubwcp_driver *ubwcp = ubwcp_get_driver();
+
+	if (!ubwcp)
+		return;
+
+	spin_lock_irqsave(&ubwcp->err_handler_list_lock, flags);
+	list_for_each_entry(node, &ubwcp->err_handler_list, list)
+		node->handler(err, node->data);
+
+	spin_unlock_irqrestore(&ubwcp->err_handler_list_lock, flags);
+}
+
+int ubwcp_unregister_error_handler(u32 client_id)
+{
+	int ret = -EINVAL;
+	struct handler_node *node;
+	unsigned long flags;
+	struct ubwcp_driver *ubwcp = ubwcp_get_driver();
+
+	if (!ubwcp)
+		return -EINVAL;
+
+	spin_lock_irqsave(&ubwcp->err_handler_list_lock, flags);
+	list_for_each_entry(node, &ubwcp->err_handler_list, list)
+		if (node->client_id == client_id) {
+			list_del(&node->list);
+			kfree(node);
+			ret = 0;
+			break;
+		}
+	spin_unlock_irqrestore(&ubwcp->err_handler_list_lock, flags);
+
+	return ret;
+}
+EXPORT_SYMBOL(ubwcp_unregister_error_handler);
+
+/* get ubwcp_buf corresponding to the ULA PA*/
+static struct dma_buf *get_dma_buf_from_ulapa(phys_addr_t addr)
+{
+	struct ubwcp_buf *buf = NULL;
+	struct dma_buf *ret_buf = NULL;
+	struct ubwcp_driver *ubwcp = ubwcp_get_driver();
+	unsigned long flags;
+	u32 i;
+
+	if (!ubwcp)
+		return NULL;
+
+	spin_lock_irqsave(&ubwcp->buf_table_lock, flags);
+	hash_for_each(ubwcp->buf_table, i, buf, hnode) {
+		if (buf->ula_pa <= addr && addr < buf->ula_pa + buf->ula_size) {
+			ret_buf = buf->dma_buf;
+			break;
+		}
+	}
+	spin_unlock_irqrestore(&ubwcp->buf_table_lock, flags);
+
+	return ret_buf;
+}
+
+/* get ubwcp_buf corresponding to the IOVA*/
+static struct dma_buf *get_dma_buf_from_iova(unsigned long addr)
+{
+	struct ubwcp_buf *buf = NULL;
+	struct dma_buf *ret_buf = NULL;
+	struct ubwcp_driver *ubwcp = ubwcp_get_driver();
+	unsigned long flags;
+	u32 i;
+
+	if (!ubwcp)
+		return NULL;
+
+	spin_lock_irqsave(&ubwcp->buf_table_lock, flags);
+	hash_for_each(ubwcp->buf_table, i, buf, hnode) {
+		unsigned long iova_base = sg_dma_address(buf->sgt->sgl);
+		unsigned int iova_size = sg_dma_len(buf->sgt->sgl);
+
+		if (iova_base <= addr && addr < iova_base + iova_size) {
+			ret_buf = buf->dma_buf;
+			break;
+		}
+	}
+	spin_unlock_irqrestore(&ubwcp->buf_table_lock, flags);
+
+	return ret_buf;
+}
 
 #define ERR_PRINT_COUNT_MAX 21
 /* TBD: use proper rate limit for debug prints */
+
+int ubwcp_iommu_fault_handler(struct iommu_domain *domain, struct device *dev,
+		unsigned long iova, int flags, void *data)
+{
+	int ret = 0;
+	struct unwcp_err_info err;
+	struct ubwcp_driver *ubwcp = ubwcp_get_driver();
+	struct device *cb_dev = (struct device *)data;
+
+	if (!ubwcp) {
+		ret = -EINVAL;
+		goto err;
+	}
+
+	error_print_count++;
+	if (error_print_count < ERR_PRINT_COUNT_MAX) {
+		err.err_code = UBWCP_SMMU_FAULT;
+
+		if (cb_dev == ubwcp->dev_desc_cb)
+			err.smmu_err.iommu_dev_id = UBWCP_DESC_CB_ID;
+		else if (cb_dev == ubwcp->dev_buf_cb)
+			err.smmu_err.iommu_dev_id = UBWCP_BUF_CB_ID;
+		else
+			err.smmu_err.iommu_dev_id = UBWCP_UNKNOWN_CB_ID;
+
+		ERR("smmu fault error: iommu_dev_id:%d iova 0x%llx flags:0x%x",
+				err.smmu_err.iommu_dev_id, iova, flags);
+		err.smmu_err.dmabuf = get_dma_buf_from_iova(iova);
+		err.smmu_err.iova = iova;
+		err.smmu_err.iommu_fault_flags = flags;
+		ubwcp_notify_error_handlers(&err);
+	}
+
+err:
+	return ret;
+}
+
+
 irqreturn_t ubwcp_irq_handler(int irq, void *ptr)
 {
 	struct ubwcp_driver *ubwcp;
 	void __iomem *base;
 	u64 src;
+	phys_addr_t addr;
+	struct unwcp_err_info err;
 
 	error_print_count++;
 
@@ -2078,25 +2345,47 @@ irqreturn_t ubwcp_irq_handler(int irq, void *ptr)
 	if (irq == ubwcp->irq_range_ck_rd) {
 		if (error_print_count < ERR_PRINT_COUNT_MAX) {
 			src = ubwcp_hw_interrupt_src_address(base, 0);
-			ERR("check range read error: src: 0x%llx", src << 6);
+			addr = src << 6;
+			ERR("check range read error: src: 0x%llx", addr);
+			err.err_code = UBWCP_RANGE_TRANSLATION_ERROR;
+			err.translation_err.dmabuf = get_dma_buf_from_ulapa(addr);
+			err.translation_err.ula_pa = addr;
+			err.translation_err.read = true;
+			ubwcp_notify_error_handlers(&err);
 		}
 		ubwcp_hw_interrupt_clear(ubwcp->base, 0);
 	} else if (irq == ubwcp->irq_range_ck_wr) {
 		if (error_print_count < ERR_PRINT_COUNT_MAX) {
 			src = ubwcp_hw_interrupt_src_address(base, 1);
-			ERR("check range write error: src: 0x%llx", src << 6);
+			addr = src << 6;
+			ERR("check range write error: src: 0x%llx", addr);
+			err.err_code = UBWCP_RANGE_TRANSLATION_ERROR;
+			err.translation_err.dmabuf = get_dma_buf_from_ulapa(addr);
+			err.translation_err.ula_pa = addr;
+			err.translation_err.read = false;
+			ubwcp_notify_error_handlers(&err);
 		}
 		ubwcp_hw_interrupt_clear(ubwcp->base, 1);
 	} else if (irq == ubwcp->irq_encode) {
 		if (error_print_count < ERR_PRINT_COUNT_MAX) {
 			src = ubwcp_hw_interrupt_src_address(base, 3);
-			ERR("encode error: src: 0x%llx", src << 6);
+			addr = src << 6;
+			ERR("encode error: src: 0x%llx", addr);
+			err.err_code = UBWCP_ENCODE_ERROR;
+			err.enc_err.dmabuf = get_dma_buf_from_ulapa(addr);
+			err.enc_err.ula_pa = addr;
+			ubwcp_notify_error_handlers(&err);
 		}
 		ubwcp_hw_interrupt_clear(ubwcp->base, 3); //TBD: encode is bit-3 instead of bit-2
 	} else if (irq == ubwcp->irq_decode) {
 		if (error_print_count < ERR_PRINT_COUNT_MAX) {
 			src = ubwcp_hw_interrupt_src_address(base, 2);
-			ERR("decode error: src: 0x%llx", src << 6);
+			addr = src << 6;
+			ERR("decode error: src: 0x%llx", addr);
+			err.err_code = UBWCP_DECODE_ERROR;
+			err.dec_err.dmabuf = get_dma_buf_from_ulapa(addr);
+			err.dec_err.ula_pa = addr;
+			ubwcp_notify_error_handlers(&err);
 		}
 		ubwcp_hw_interrupt_clear(ubwcp->base, 2); //TBD: decode is bit-2 instead of bit-3
 	} else {
@@ -2219,6 +2508,16 @@ static int qcom_ubwcp_probe(struct platform_device *pdev)
 	/*TBD: remove later. reducing size for quick testing...*/
 	ubwcp->ula_pool_size = 0x20000000; //500MB instead of 8GB
 
+	INIT_LIST_HEAD(&ubwcp->err_handler_list);
+
+	mutex_init(&ubwcp->desc_lock);
+	spin_lock_init(&ubwcp->buf_table_lock);
+	mutex_init(&ubwcp->mem_hotplug_lock);
+	mutex_init(&ubwcp->ula_lock);
+	mutex_init(&ubwcp->ubwcp_flush_lock);
+	mutex_init(&ubwcp->hw_range_ck_lock);
+	spin_lock_init(&ubwcp->err_handler_list_lock);
+
 	if (ubwcp_interrupt_register(pdev, ubwcp))
 		return -1;
 
@@ -2230,12 +2529,11 @@ static int qcom_ubwcp_probe(struct platform_device *pdev)
 		return -1;
 	}
 
-	mutex_init(&ubwcp->desc_lock);
-	mutex_init(&ubwcp->buf_table_lock);
-	mutex_init(&ubwcp->ula_lock);
-	mutex_init(&ubwcp->ubwcp_flush_lock);
-	mutex_init(&ubwcp->hw_range_ck_lock);
-
+	ret = ubwcp_init_clocks(ubwcp, ubwcp_dev);
+	if (ret) {
+		ERR("failed to initialize ubwcp clocks err: %d", ret);
+		return ret;
+	}
 
 	if (ubwcp_power(ubwcp, true))
 		return -1;
@@ -2325,6 +2623,7 @@ err_pool_create:
 static int ubwcp_probe_cb_buf(struct platform_device *pdev)
 {
 	struct ubwcp_driver *ubwcp;
+	struct iommu_domain *domain = NULL;
 
 	FENTRY();
 
@@ -2336,6 +2635,11 @@ static int ubwcp_probe_cb_buf(struct platform_device *pdev)
 
 	/* save the buffer cb device */
 	ubwcp->dev_buf_cb = &pdev->dev;
+
+	domain = iommu_get_domain_for_dev(ubwcp->dev_buf_cb);
+	if (domain)
+		iommu_set_fault_handler(domain, ubwcp_iommu_fault_handler, ubwcp->dev_buf_cb);
+
 	return 0;
 }
 
@@ -2344,6 +2648,7 @@ static int ubwcp_probe_cb_desc(struct platform_device *pdev)
 {
 	int ret = 0;
 	struct ubwcp_driver *ubwcp;
+	struct iommu_domain *domain = NULL;
 
 	FENTRY();
 
@@ -2390,6 +2695,10 @@ static int ubwcp_probe_cb_desc(struct platform_device *pdev)
 		goto err;
 	}
 
+	domain = iommu_get_domain_for_dev(ubwcp->dev_desc_cb);
+	if (domain)
+		iommu_set_fault_handler(domain, ubwcp_iommu_fault_handler, ubwcp->dev_desc_cb);
+
 	return ret;
 
 err:

ubwcp_kernel_product_board.mk

@@ -1,2 +1,2 @@
-PRODUCT_PACKAGES += ubwcpx.ko
+PRODUCT_PACKAGES += ubwcp.ko
 

ubwcp_kernel_vendor_board.mk

@@ -1,2 +1,2 @@
-BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/ubwcpx.ko
+BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/ubwcp.ko