securemsm-kernel: exposing smcinvoke headers

We are exposing headers present in "include/linux" for the rest of the kernel DLKM's.
Aallow other kernel teams to access these headers.

Change-Id: I19c5591d885c7042ba3acd312ce9cb2bddc995c9
CRS-Fixed: 3338788
This commit is contained in:
Spencer Willett
2022-11-04 10:46:09 -07:00
committed by Gerrit - the friendly Code Review server
parent 8456ddc256
commit 9cd99dbb79
6 changed files with 14 additions and 9 deletions

View File

@@ -1,13 +1,13 @@
headers_src = [ headers_src = [
"linux/smc*ke.h", "include/linux/smc*ke.h",
"linux/smc*_object.h", "include/linux/smc*_object.h",
"linux/IClientE*v.h", "include/linux/IClientE*v.h",
] ]
smcinvoke_headers_out = [ smcinvoke_headers_out = [
"linux/smcinvoke.h", "include/linux/smcinvoke.h",
"linux/smcinvoke_object.h", "include/linux/smcinvoke_object.h",
"linux/IClientEnv.h", "include/linux/IClientEnv.h",
] ]
smcinvoke_kernel_headers_verbose = "--verbose " smcinvoke_kernel_headers_verbose = "--verbose "
@@ -25,7 +25,7 @@ genrule {
smcinvoke_kernel_headers_verbose + smcinvoke_kernel_headers_verbose +
"--header_arch arm64 " + "--header_arch arm64 " +
"--gen_dir $(genDir) " + "--gen_dir $(genDir) " +
"--smcinvoke_headers_to_expose $(locations linux/smc*ke.h) $(locations linux/smc*_object.h) $(locations linux/IClientE*v.h) " + "--smcinvoke_headers_to_expose $(locations include/linux/smc*ke.h) $(locations include/linux/smc*_object.h) $(locations include/linux/IClientE*v.h) " +
"--unifdef $(location unifdef) " + "--unifdef $(location unifdef) " +
"--headers_install $(location headers_install.sh)", "--headers_install $(location headers_install.sh)",
out: smcinvoke_headers_out, out: smcinvoke_headers_out,
@@ -34,7 +34,7 @@ genrule {
cc_library_headers { cc_library_headers {
name: "smcinvoke_kernel_headers", name: "smcinvoke_kernel_headers",
export_include_dirs: ["."], export_include_dirs: ["."] + ["include"],
generated_headers: ["qti_generate_smcinvoke_kernel_headers"], generated_headers: ["qti_generate_smcinvoke_kernel_headers"],
export_generated_headers: ["qti_generate_smcinvoke_kernel_headers"], export_generated_headers: ["qti_generate_smcinvoke_kernel_headers"],
vendor: true, vendor: true,

View File

@@ -16,6 +16,8 @@ DLKM_DIR := $(TOP)/device/qcom/common/dlkm
SEC_KERNEL_DIR := $(TOP)/vendor/qcom/opensource/securemsm-kernel SEC_KERNEL_DIR := $(TOP)/vendor/qcom/opensource/securemsm-kernel
LOCAL_EXPORT_KO_INCLUDE_DIRS := $(LOCAL_PATH)/include/
SSG_SRC_FILES := \ SSG_SRC_FILES := \
$(wildcard $(LOCAL_PATH)/*) \ $(wildcard $(LOCAL_PATH)/*) \
$(wildcard $(LOCAL_PATH)/*/*) \ $(wildcard $(LOCAL_PATH)/*/*) \

3
Kbuild
View File

@@ -1,5 +1,6 @@
LINUXINCLUDE += -I$(SSG_MODULE_ROOT)/ \ LINUXINCLUDE += -I$(SSG_MODULE_ROOT)/ \
-I$(SSG_MODULE_ROOT)/linux/ -I$(SSG_MODULE_ROOT)/linux/ \
-I$(SSG_MODULE_ROOT)/include/linux/
ifneq ($(CONFIG_ARCH_QTI_VM), y) ifneq ($(CONFIG_ARCH_QTI_VM), y)
LINUXINCLUDE += -include $(SSG_MODULE_ROOT)/config/sec-kernel_defconfig.h LINUXINCLUDE += -include $(SSG_MODULE_ROOT)/config/sec-kernel_defconfig.h

View File

@@ -12,6 +12,8 @@
#define IClientEnv_OP_notifyDomainChange 4 #define IClientEnv_OP_notifyDomainChange 4
#define IClientEnv_OP_registerWithCredentials 5 #define IClientEnv_OP_registerWithCredentials 5
#include "smcinvoke_object.h"
static inline int32_t static inline int32_t
IClientEnv_release(struct Object self) IClientEnv_release(struct Object self)
{ {