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

Commit 907accbf authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm64: defconfig: Enable the mem-buf driver on Lahaina QGKI"

parents f51d43dc a8663ed4

arch/arm64/configs/vendor/lahaina_QGKI.config

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ CONFIG_MEMORY_HOTPLUG_MOVABLE_NODE=y 
CONFIG_MEMORY_HOTREMOVE=y

CONFIG_QCOM_MEM_OFFLINE=y

CONFIG_OVERRIDE_MEMORY_LIMIT=y

CONFIG_QCOM_MEM_BUF=y

CONFIG_VM_EVENT_COUNT_CLEAN_PAGE_RECLAIM=y

CONFIG_BALANCE_ANON_FILE_RECLAIM=y

CONFIG_CMA_DIRECT_UTILIZATION=y

drivers/soc/qcom/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -57,6 +57,16 @@ config OVERRIDE_MEMORY_LIMIT 
	  hot-plugging.

	  If unsure, say N



config QCOM_MEM_BUF

	bool "Qualcomm Technologies, Inc. Memory Buffer Sharing Driver"

	depends on HH_MSGQ && HH_RM_DRV && ION_MSM_HEAPS && QCOM_SECURE_BUFFER

	help

	  Add support for lending memory from one virtual machine to another.

	  This driver communicates with the hypervisor, as well as other

	  virtual machines, to request and lend memory from and to VMs

	  respectively.

	  If unsure, say N



config QCOM_GENI_SE

	tristate "QCOM GENI Serial Engine Driver"

	depends on ARCH_QCOM || COMPILE_TEST

drivers/soc/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ obj-$(CONFIG_QCOM_LLCC) += llcc-slice.o 
obj-$(CONFIG_QCOM_LAHAINA_LLCC) += llcc-lahaina.o

obj-$(CONFIG_QCOM_MINIDUMP) += msm_minidump.o minidump_log.o

obj-$(CONFIG_QCOM_MEM_OFFLINE) += mem-offline.o

obj-$(CONFIG_QCOM_MEM_BUF) += mem-buf.o

obj-$(CONFIG_QCOM_MEMORY_DUMP_V2) += memory_dump_v2.o

obj-$(CONFIG_QCOM_DCC_V2) += dcc_v2.o

obj-$(CONFIG_MSM_JTAGV8) += jtagv8.o jtagv8-etm.o

drivers/soc/qcom/mem-buf.c

0 → 100644
+1637 −0

File added.

Preview size limit exceeded, changes collapsed.

include/linux/mem-buf.h

0 → 100644
+69 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 *  Copyright (c) 2020, The Linux Foundation. All rights reserved.

 */



#ifndef _MEM_BUF_H

#define _MEM_BUF_H



#include <uapi/linux/mem-buf.h>



/**

 * struct mem_buf_allocation_data - Data structure that contains information

 * about a memory buffer allocation request.

 * @size: The size (in bytes) of the memory to be requested from a remote VM

 * @nr_acl_entries: The number of ACL entries in @acl_list

 * @acl_list: A list of VMID and permission pairs that describe what VMIDs will

 * have access to the memory, and with what permissions

 * @src_mem_type: The type of memory that the remote VM should allocate

 * (e.g. ION memory)

 * @src_data: A pointer to memory type specific data that the remote VM may need

 * when performing an allocation (e.g. ION memory allocations require a heap ID)

 * @dst_mem_type: The type of memory that the native VM wants (e.g. ION memory)

 * @dst_data: A pointer to memory type specific data that the native VM may

 * need when adding the memory from the remote VM (e.g. ION memory requires a

 * heap ID to add the memory to).

 */

struct mem_buf_allocation_data {

	size_t size;

	unsigned int nr_acl_entries;

	struct acl_entry *acl_list;

	enum mem_buf_mem_type src_mem_type;

	void *src_data;

	enum mem_buf_mem_type dst_mem_type;

	void *dst_data;

};



#if IS_ENABLED(CONFIG_QCOM_MEM_BUF)



void *mem_buf_alloc(struct mem_buf_allocation_data *alloc_data);



int mem_buf_get_fd(void *membuf_desc);



void mem_buf_put(void *membuf_desc);



void *mem_buf_get(int fd);



#else



static inline void *mem_buf_alloc(struct mem_buf_allocation_data *alloc_data)

{

	return ERR_PTR(-ENODEV);

}



static inline int mem_buf_get_fd(void *membuf_desc)

{

	return -ENODEV;

}



static inline void mem_buf_put(void *membuf_desc)

{

}



static inline void *mem_buf_get(int fd)

{

	return ERR_PTR(-ENODEV);

}



#endif /* CONFIG_QCOM_MEM_BUF */

#endif /* _MEM_BUF_H */