[Copybara Auto Merge] Merge branch 'zuma' into 'android13-gs-pixel-5.15'

  gxp: misc_register as the last step of probe
  Bug: 241718472
  gxp: use at lease one core for UCI command
  Bug: 232310140
  gxp: remove unneeded devm_kfree
  Bug: 241517691
  gxp: Cancel last worker when power req queue is full
  Bug: 240533763
  gxp: make sure shared buffer is clean
  Bug: 232310140 (repeat)
  gxp: Map slice of shared buffer to IOMMU domain instead of whole of it
  Bug: 240128962
  gxp: Allocate slice_index when allocating virtual device
  Bug: 240128962 (repeat)
  gxp: Add ID allocator for the slice index of shared buffer
  Bug: 240128962 (repeat)
  gxp: Add GXP_SHARED_SLICE_SIZE to define the slice size of shared buffer
  Bug: 240128962 (repeat)
  gxp: Introduce slice_index of the virtual device
  Bug: 240128962 (repeat)
  gxp: fix SysMMU is not enabled on FW run
  Bug: 239239708
  Revert "gxp: remove gxp-gs301 from OF matching table"
  gxp: add KCI_MAILBOX_ID
  gxp: unittests: Introduce gxp-debug-dump-test.c and enable debug dump test
  Bug: 241086197
  Bug: 234892966
  gxp: remove domain attach on VD creation
  Bug: 241057799
  gxp: Add `num_cores` in command ioctls for UCI
  Bug: 232310140, 237660465
  gxp: remove gxp-gs301 from OF matching table
  Bug: 240468742
  gxp: Disallow /d/gxp/firmware_run if VDs are running
  Bug: 240764261
  gxp: remove unneeded warnings from in PM
  gxp: Review feedback from 7/21 release
  Bug: 240315433
  gxp: callisto: implement UCI response ioctl handler
  Bug: 232310140 (repeat)
  gxp: callisto: implement UCI command ioctl handler
  Bug: 232310140 (repeat)
  gxp: work around thermal_cdev_update
  Bug: 235433985
  gxp: remove virt_core_list from gxp_dmabuf_map
  Bug: 240661491
  gxp: remove virt_core_list from gxp_mapping
  Bug: 240661491 (repeat)
  gxp: add gxp_vd_phys_core_list
  gxp: remove ZEBU_SYSMMU_WORKAROUND
  gxp: Replace (resp_queue, eventfd) params with (client, virt_core) of async ops
  gxp: remove virt_core_list from tpu_mbx_desc
  gxp: check VD is non-null in gxp_client_destroy
  gxp: remove core_domains from vd
  Bug: 240415495
  gxp: remove gxp_vd_phys_core_to_virt_core
  gxp: clean up gxp-dma.h descriptions
  Bug: 240415495 (repeat)
  gxp: dma_map_tpu_buffer accepts domain
  Bug: 240415495 (repeat)
  gxp: gxp_dma_alloc_coherent takes domain
  Bug: 240415495 (repeat)
  gxp: map_allocated_coherent_buffer takes domain
  Bug: 240415495 (repeat)
  gxp: dma_map_dmabuf accepts domain as the arg
  Bug: 240415495 (repeat)
  gxp: dma_map_sg accepts domain as arg
  Bug: 240415495 (repeat)
  gxp: dma_map_core_resources accepts domain
  Bug: 240415495 (repeat)
  gxp: dma_domain_attach_device accepts domain
  Bug: 240415495 (repeat)

GitOrigin-RevId: 922a7cbe08b4a4a31dbd73232184e2a0dec81d49
Change-Id: I3ec45bea4c7cbf971ab61a95c136ba0fcdc1d261

1 files changed, 4 insertions, 3 deletions

diff --git a/gxp-debug-dump.h b/gxp-debug-dump.h
index 1b1fda0..a3d2f34 100644
--- a/gxp-debug-dump.h
+++ b/gxp-debug-dump.h
@@ -2,8 +2,9 @@
 /*
  * GXP debug dump handler
  *
- * Copyright (C) 2020 Google LLC
+ * Copyright (C) 2020-2022 Google LLC
  */
+
 #ifndef __GXP_DEBUG_DUMP_H__
 #define __GXP_DEBUG_DUMP_H__
 
@@ -11,7 +12,7 @@
 #include <linux/types.h>
 #include <linux/workqueue.h>
 
-#if IS_ENABLED(CONFIG_SUBSYSTEM_COREDUMP)
+#if IS_ENABLED(CONFIG_GXP_TEST) || IS_ENABLED(CONFIG_SUBSYSTEM_COREDUMP)
 #include <linux/platform_data/sscoredump.h>
 #endif
 
@@ -192,7 +193,7 @@ struct gxp_debug_dump_manager {
 	 * time
 	 */
 	struct mutex debug_dump_lock;
-#if IS_ENABLED(CONFIG_SUBSYSTEM_COREDUMP)
+#if IS_ENABLED(CONFIG_GXP_TEST) || IS_ENABLED(CONFIG_SUBSYSTEM_COREDUMP)
 	struct sscd_segment segs[GXP_NUM_CORES][GXP_NUM_SEGMENTS_PER_CORE];
 #endif
 };