Merge "arm64: defconfig: Enable CMA debug configs on Lahaina" (496291b5) · Commits · e / devices / android_kernel_fairphone_FP5

arch/arm64/configs/vendor/lahaina_debug.config

+2 −0

Original line number	Diff line number	Diff line
		CONFIG_IOMMU_TLBSYNC_DEBUG=y
		CONFIG_CMA_DEBUGFS=y
		CONFIG_CMA_DEBUG=y
		CONFIG_EDAC_KRYO_ARM64_PANIC_ON_CE=y
		CONFIG_IPC_LOGGING=y
		CONFIG_QMP_DEBUGFS_CLIENT=y

+0 −9

Original line number	Diff line number	Diff line
		@@ -519,15 +519,6 @@ config CMA_DEBUGFS
		help
		Turns on the DebugFS interface for CMA.

		config CMA_ALLOW_WRITE_DEBUGFS
		depends on CMA_DEBUGFS
		bool "Allow CMA debugfs write"
		help
		Say 'y' here to allow the CMA debugfs write.
		CMA debugfs write could be risky as it allows
		cma allocation, so it is not recommended to
		enable this option on any production device.

		config CMA_AREAS
		int "Maximum count of the CMA areas"
		depends on CMA

+0 −10

Original line number	Diff line number	Diff line
		@@ -74,7 +74,6 @@ static int cma_maxchunk_get(void data, u64 val)
		}
		DEFINE_SIMPLE_ATTRIBUTE(cma_maxchunk_fops, cma_maxchunk_get, NULL, "%llu\n");

		#ifdef CONFIG_CMA_ALLOW_WRITE_DEBUGFS
		static void cma_add_to_cma_mem_list(struct cma cma, struct cma_mem mem)
		{
		spin_lock(&cma->mem_head_lock);
		@@ -133,13 +132,8 @@ static int cma_free_write(void *data, u64 val)

		return cma_free_mem(cma, pages);
		}
		#else
		#define cma_free_write NULL
		#endif

		DEFINE_SIMPLE_ATTRIBUTE(cma_free_fops, NULL, cma_free_write, "%llu\n");

		#ifdef CONFIG_CMA_ALLOW_WRITE_DEBUGFS
		static int cma_alloc_mem(struct cma *cma, int count)
		{
		struct cma_mem *mem;
		@@ -170,10 +164,6 @@ static int cma_alloc_write(void *data, u64 val)

		return cma_alloc_mem(cma, pages);
		}
		#else
		#define cma_alloc_write NULL
		#endif

		DEFINE_SIMPLE_ATTRIBUTE(cma_alloc_fops, NULL, cma_alloc_write, "%llu\n");

		static void cma_debugfs_add_one(struct cma cma, struct dentry root_dentry)