[Copybara Auto Merge] Merge branch 'gs201-release' into 'android13-gs-pixel-5.10'

  gxp: Remove stale TODO comments
  Bug: 232447048
  gxp: heuristically guess the user buffer perm
  Bug: 232529892
  gxp: rearrange logs for BLK/VD suspend/resume
  Bug: 209083969
  gxp: check AUR_OFF while sending power requests
  Bug: 231694821
  gxp: rename NUM_CORES to MAX_NUM_CORES
  Bug: 229961485
  gxp: fix one more typo of "semphore"
  Bug: 232447048 (repeat)
  gxp: fix size check for telemetry mmap
  Bug: 232447048 (repeat)
  gxp: check VD wakelock for GXP_TRIGGER_DEBUG_DUMP
  Bug: 231692562
  gxp: Handle debug dump cases with invalid segment header
  Bug: 218344866
  gxp: Add header file version into debug dump struct
  Bug: 202417979
  gxp: Fix "semphore" typo
  Bug: 232447048 (repeat)
  gxp: Use DMA direction argument to determine read/write buffer map
  Bug: 201243473
  gxp: Update mailbox command codes and remove unused ones
  Bug: 231328277
  gxp: assert client->semaphore held without rw
  Bug: 231692448
  gxp: Add unittests for the TPU related ioctl
  Bug: 227545695
  gxp: refine power state transition interface
  Bug: 231584263
  gxp: Add check that virtual device is not NULL
  Bug: 231271959
  gxp: remove unused block wakelock functions
  Bug: 232447048 (repeat)
  gxp: Check memory-per-core arg to GXP_ALLOCATE_VIRTUAL_DEVICE
  Bug: 231272386
  gxp: Log changes to thermal limit on BLK frequency
  Bug: 177217526
  gxp: don't warn if all power votes are revoked
  Bug: 232447048 (repeat)
  gxp: Do not request firmware until first open()
  Bug: 228377252
  gxp: Add the ability to re-request firmware images
  Bug: 228377252 (repeat)
  gxp: Prepare fw images and buffers on probe
  Bug: 228377252 (repeat)
  gxp: Add IOCTL for triggering debug dump
  Bug: 185262089
  gxp: Update coredump debugfs node
  Bug: 185262089 (repeat)
  gxp: check valid dma direction
  Bug: 232447048 (repeat)
  gxp: fix probe cleanup sequences
  Bug: 228920163
  gxp: Check DMA direction before create mapping
  Bug: 229578163
  gxp: Use kvmalloc to allocate pages for mapping
  Bug: 230312441
  gxp: add uaccess.h header for access_ok
  Bug: 201243473 (repeat)
  gxp: Refactor mappings to be owned by VDs
  Bug: 184572070
  Bug: 220225771
  Bug: 230291950
  gxp: Add access_ok check to buffer map operation
  Bug: 201243473 (repeat)
  gxp: Add lock assertion for cmd_queue and resp_queue manipulation
  Bug: 229919339
  gxp: use realtime kthread for response handling
  Bug: 229687028
  gxp: Register IRQ handler after initializing the mailbox
  Bug: 229912601
  gxp: Update comment when scheduling power requests
  Bug: 232447048 (repeat)
  gxp: remove config GXP_CLOUDRIPPER
  Bug: 229696441
  gxp: add timeout to response ioctl
  Bug: 229443637
  gxp: fix broken Makefile for out-of-tree build
  Bug: 232447048 (repeat)
  gxp: fix GXP_NUM_CORES setting
  Bug: 232447048 (repeat)
  gxp: add NOWARN flag when pinning user pages
  Bug: 229578166
  gxp: create amalthea configurations
  Bug: 227528380
  gxp: add Kconfig for future gen
  Bug: 227528380 (repeat)
  gxp: check fw_app by IS_ERR_OR_NULL
  Bug: 229433210
  gxp: Add log for out of memory when pinning pages
  Bug: 232447048 (repeat)
  gxp: validate virtual core list on buffer map
  Bug: 229172687
  gxp: initialize specs ioctl output buf
  Bug: 229470814
  gxp: Update flow for kernel-initiated debug dumps
  Bug: 185262089 (repeat)
  gxp: Always return an error on gxp_vd_allocate failure
  Bug: 229329108
  gxp: refuse vd wakelock acquriing if not allocated
  Bug: 229249566
  gxp: add -Idrivers/gxp/include to ccflags
  Bug: 205970684
  gxp: check null pointer in eventfd unregistration
  Bug: 229198626
  gxp: Add support for dynamic callstack reconstruction in debug dump
  Bug: 203441187
  gxp: Add ability to map/unmap user buffers to kernel space
  Bug: 203441187 (repeat)
  gxp: move acpm_dvfs to include/
  Bug: 228938583
  gxp: not set doorbell mask twice if it's not GEM5
  Bug: 232447048 (repeat)
  gxp: add iommu domain pool
  Bug: 209083969 (repeat)
  gxp: Add flush_workqueue when pm destroy
  Bug: 232447048 (repeat)
  gxp: add include/ to inclusion path
  Bug: 205970684 (repeat)

GitOrigin-RevId: ef68c0f9b9145e7ffbee141fa192335bf877e82d
Change-Id: Ide21a9ab84d480c018ae065868d8ee619df83bf0

1 files changed, 5 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 3b7a340..70342d2 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ gxp-objs +=	\
 		gxp-debug-dump.o \
 		gxp-debugfs.o \
 		gxp-dmabuf.o \
+		gxp-domain-pool.o \
 		gxp-doorbell.o \
 		gxp-eventfd.o \
 		gxp-firmware.o \
@@ -48,11 +49,7 @@ endif
 #     - IP_ZEBU
 # 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
+GXP_CHIP ?= AMALTHEA
 
 # Setup which version of the gxp-dma interface is used.
 # For gem5, need to adopt dma interface without aux domain.
@@ -62,9 +59,10 @@ else
 	gxp-objs += gxp-dma-iommu.o
 endif
 
-ccflags-y += -DCONFIG_GXP_$(GXP_PLATFORM)
+ccflags-y += -DCONFIG_GXP_$(GXP_PLATFORM) -DCONFIG_$(GXP_CHIP)=1 \
+	     -I$(M)/include -I$(srctree)/drivers/gxp/include
 
-KBUILD_OPTIONS += CONFIG_GXP=m
+KBUILD_OPTIONS += CONFIG_GXP=m GXP_CHIP=AMALTHEA
 
 ifdef CONFIG_GXP_TEST
 subdir-ccflags-y        += -Wall -Werror -I$(srctree)/drivers/gxp/include