Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0b880c4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu: Move report_iommu_fault() to iommu.c"

parents 309f15d8 2f4ae01d

arch/arm64/mm/dma-mapping.c

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/vmalloc.h>

#include <linux/swiotlb.h>

#include <linux/io.h>

#include <linux/pci.h>



#include <asm/cacheflush.h>

#include <asm/tlbflush.h>

drivers/gpu/msm/kgsl_gmu.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/msm-bus.h>

#include <linux/msm-bus-board.h>

#include <linux/pm_opp.h>

#include <linux/io.h>

#include <soc/qcom/cmd-db.h>



#include "kgsl_device.h"

drivers/iommu/dma-mapping-fast.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/dma-mapping.h>

#include <linux/dma-mapping-fast.h>

#include <linux/io-pgtable-fast.h>

#include <linux/pci.h>

#include <linux/vmalloc.h>

#include <asm/cacheflush.h>

#include <asm/dma-iommu.h>

drivers/iommu/iommu.c

+42 −1
Original line number Diff line number Diff line
@@ -1519,8 +1519,49 @@ void iommu_domain_window_disable(struct iommu_domain *domain, u32 wnd_nr) 
}

EXPORT_SYMBOL_GPL(iommu_domain_window_disable);



struct dentry *iommu_debugfs_top;

/**

 * report_iommu_fault() - report about an IOMMU fault to the IOMMU framework

 * @domain: the iommu domain where the fault has happened

 * @dev: the device where the fault has happened

 * @iova: the faulting address

 * @flags: mmu fault flags (e.g. IOMMU_FAULT_READ/IOMMU_FAULT_WRITE/...)

 *

 * This function should be called by the low-level IOMMU implementations

 * whenever IOMMU faults happen, to allow high-level users, that are

 * interested in such events, to know about them.

 *

 * This event may be useful for several possible use cases:

 * - mere logging of the event

 * - dynamic TLB/PTE loading

 * - if restarting of the faulting device is required

 *

 * Returns 0 on success and an appropriate error code otherwise (if dynamic

 * PTE/TLB loading will one day be supported, implementations will be able

 * to tell whether it succeeded or not according to this return value).

 *

 * Specifically, -ENOSYS is returned if a fault handler isn't installed

 * (though fault handlers can also return -ENOSYS, in case they want to

 * elicit the default behavior of the IOMMU drivers).

 */

int report_iommu_fault(struct iommu_domain *domain, struct device *dev,

		       unsigned long iova, int flags)

{

	int ret = -ENOSYS;



	/*

	 * if upper layers showed interest and installed a fault handler,

	 * invoke it.

	 */

	if (domain->handler)

		ret = domain->handler(domain, dev, iova, flags,

						domain->handler_token);



	trace_io_page_fault(dev, iova, flags);

	return ret;

}

EXPORT_SYMBOL_GPL(report_iommu_fault);



struct dentry *iommu_debugfs_top;

static int __init iommu_init(void)

{

	iommu_group_kset = kset_create_and_add("iommu_groups",

drivers/media/platform/msm/camera/cam_req_mgr/cam_mem_mgr.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/types.h>

#include <linux/mutex.h>

#include <linux/msm_ion.h>

#include <linux/slab.h>

#include <asm/cacheflush.h>



#include "cam_req_mgr_util.h"