diff options
| author | Neela Chithirala <chithiralan@google.com> | 2022-01-17 04:41:54 +0000 |
|---|---|---|
| committer | Neela Chithirala <chithiralan@google.com> | 2022-02-03 06:27:20 +0000 |
| commit | 3ccb2479717de3089dbbcb894ddd045b2ddc256c (patch) | |
| tree | a577f284ff42d11b1fcfb7c338a7f0b59b10672a /Makefile | |
| parent | e14069f1739b05c7a7f60ae73c8ce14b91ef12e0 (diff) | |
| download | gs201-3ccb2479717de3089dbbcb894ddd045b2ddc256c.tar.gz | |
Merge branch 'gs201-release' to android13-gs-pixel-5.10
* gs201-release:
gxp: Fix multicore VDs not shutting down clean
Bug: 215303765
gxp: Rework VD locking and remove mailbox locking
Bug: 189018271
gxp: initial commit for thermal driver
Bug: 177217526
gxp: Add wakelock interface and make debugfs wakelock aware
Bug: 215192870
gxp: Hook-up pm ops for driver suspend/resume
Bug: 204924965
gxp: Dynamically power BLK_AUR on and off
Bug: 204924965
gxp: support GXP_PLATFORM=GEM5
Bug: 204942713
gxp: Remove delay waiting for FW mailbox init
Bug: 207037428
gxp: Fix infrequent crash during mailbox release
gxp: Release FW file on firmware loading errors
gxp: return GXP_RESP_CANCELLED if timeout occurs
Bug: 207432733
gxp: Remove initial 10ms delay when disabling telemetry
gxp: Cast telemetry buffer IOVAs to u32s before use
gxp: check sscoredump by CONFIG_SUBSYSTEM_COREDUMP
gxp: Fix double-lock hang in gxp_telemetry_vma_close
gxp: Log driver git commit hash on probe
Bug: 206744969
gxp: Add ioctl for reading the TOP global counter
gxp: Implement eventfd signalling for telemetry
gxp: Notify running cores of telemetry state changes
gxp: Add notification interface
Signed-off-by: Neela Chithirala <chithiralan@google.com>
Change-Id: Ic7cd7b81ee643371c600ac208ae33d6344ed7f1b
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 26 |
1 files changed, 24 insertions, 2 deletions
@@ -15,15 +15,27 @@ gxp-objs += \ gxp-lpm.o \ gxp-mailbox.o \ gxp-mapping.o \ + gxp-mb-notification.o \ gxp-platform.o \ gxp-range-alloc.o \ gxp-pm.o \ gxp-telemetry.o \ - gxp-vd.o + gxp-thermal.o \ + gxp-vd.o \ + gxp-wakelock.o KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build M ?= $(shell pwd) +# Obtain the current git commit hash for logging on probe +GIT_PATH=$(shell cd $(KERNEL_SRC); readlink -e $(M)) +ifeq ($(shell git --git-dir=$(GIT_PATH)/.git rev-parse --is-inside-work-tree),true) + GIT_REPO_STATE=$(shell (git --git-dir=$(GIT_PATH)/.git --work-tree=$(GIT_PATH) status --porcelain | grep -q .) && echo -dirty) + ccflags-y += -DGIT_REPO_TAG=\"$(shell git --git-dir=$(GIT_PATH)/.git rev-parse --short HEAD)$(GIT_REPO_STATE)\" +else + ccflags-y += -DGIT_REPO_TAG=\"Not\ a\ git\ repository\" +endif + # If building via make directly, specify target platform by adding # "GXP_PLATFORM=<target>" # With one of the following values: @@ -33,6 +45,11 @@ M ?= $(shell pwd) # Defaults to building for CLOUDRIPPER if not otherwise specified. GXP_PLATFORM ?= CLOUDRIPPER +# Test against the build closet to production mode, choose CLOUDRIPPER. +ifdef CONFIG_GXP_TEST + GXP_PLATFORM = CLOUDRIPPER +endif + # Default to using the HW mailbox and SysMMU GXP_SW_MAILBOX ?= 0 GXP_HAS_SYSMMU ?= 1 @@ -48,7 +65,12 @@ endif # Setup which version of the gxp-dma interface is used. ifeq ($(GXP_HAS_SYSMMU),1) ccflags-y += -DCONFIG_GXP_HAS_SYSMMU - gxp-objs += gxp-dma-iommu.o + # For gem5, need to adopt dma interface without aux domain. + ifeq ($(GXP_PLATFORM), GEM5) + gxp-objs += gxp-dma-iommu-gem5.o + else + gxp-objs += gxp-dma-iommu.o + endif else gxp-objs += gxp-dma-rmem.o endif |