tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: KVM: arm64: allow nvhe/trace.h for in-tree/DDK pKVM modules

Browse Source 
For both in-tree and DDK pKVM modules, it is now adviced to use
nvhe/trace.h instead of a simple trace.h. This is clearer.

Putting it in `nvhe/` also allows us to add pkvm_headers_aarch64 to
all_headers_allowlist_aarch64 directly, so that DDK pKVM modules don't
have to add pkvm_headers_aarch64 explicitly.

To keep backwards compatibility, this commit does not disallow using
`#include "trace.h"` directly. This will be removed in the follow up
CL.

To keep in-tree and DDK pKVM modules's -I flags in sync, add an IFTTT
block.

NO_IFTTT=This is the initial creation of the block.

Bug: 416603216
Bug: 357781595
Change-Id: Iac90750d4442539d12099eb09ba4cb2946956ef2
Signed-off-by: HONG Yifan <elsk@google.com>
This commit is contained in:
HONG Yifan
2025-05-21 18:26:32 +00:00
committed by Yifan Hong
parent 67160594b2
commit d3ea4f08e5
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
BUILD.bazel
View File

@@ -1632,6 +1632,22 @@ ddk_headers(
# Implementation details for DDK headers. The targets below cannot be directly
# depended on by DDK modules.
# Headers for building pKVM modules. They are for pKVM only so not added to
# all_headers_aarch64.
ddk_headers(
name = "pkvm_headers_aarch64",
hdrs = [
"arch/arm64/kvm/hyp/include/module/nvhe/define_events.h",
"arch/arm64/kvm/hyp/include/module/nvhe/trace.h",
],
includes = [
# LINT.IfChange(pkvm_includes)
"arch/arm64/kvm/hyp/include/module",
# LINT.ThenChange(/arch/arm64/kvm/hyp/nvhe/Makefile.module:includes)
],
visibility = ["//visibility:private"],
)
# Headers needed to include drivers/usb/host/xhci.h.
ddk_headers(
name = "xhci_headers",
@@ -1670,6 +1686,7 @@ ddk_headers(
":all_headers_allowlist_aarch64_globs",
":all_headers_allowlist_common_globs",
":all_headers_allowlist_exynos",
":pkvm_headers_aarch64",
":xhci_headers",
],
# The list of include directories where source files can #include headers

6
arch/arm64/kvm/hyp/nvhe/Makefile.module
View File

@@ -5,5 +5,11 @@ $(obj)/hyp.lds: arch/arm64/kvm/hyp/nvhe/module.lds.S FORCE
include $(srctree)/arch/arm64/kvm/hyp/nvhe/Makefile.nvhe
# Deprecated; subject to removal.
ccflags-y += -I$(srctree)/arch/arm64/kvm/hyp/include/module/nvhe
# LINT.IfChange(includes)
ccflags-y += -I$(srctree)/arch/arm64/kvm/hyp/include/module
# LINT.ThenChange(/BUILD.bazel:pkvm_includes)
ccflags-y += -DMODULE