diff options
author | Aurora zuma automerger <aurora-zuma-automerger@google.com> | 2023-04-11 07:52:58 +0000 |
---|---|---|
committer | Copybara-Service <copybara-worker@google.com> | 2023-04-17 11:07:31 -0700 |
commit | d055791577688a8357ebecbff9abc74fe0426470 (patch) | |
tree | 41491e1f286eafacf1037b1ad03955d2fc68f79c /include | |
parent | 6bac35c4ca96b3ac798d00ac3c0c154e80752981 (diff) | |
download | zuma-d055791577688a8357ebecbff9abc74fe0426470.tar.gz |
gxp: [Copybara Auto Merge] Merge branch 'zuma' into 'android14-gs-pixel-5.15'
gxp: callisto add BCL support
Bug: 270997009
gxp: add gxp_pm_chip_init
Bug: 277302257
gxp: call PM powering ops
Bug: 277302257 (repeat)
gcip: Fix version check for best-fit IOVA allocate
GCIP_MAIN_REV_ID: dba9b3e554230a8bf037d949a4a60bfcf68b9c15
gcip: Disable best-fit algo on kernel > 5.15
Bug: 277649169
GCIP_MAIN_REV_ID: 59ee39cabcc120581efc4c594424e537594385aa
gxp: Handle missing scmversion
Bug: 277787303
gcip: check acquired lock is atomic
Bug: 275652066
GCIP_HEADERS_REV_ID: 814e10b2d2d80cb3c45c0d5ea190282fe9e1b835
gcip: check acquired lock is atomic
Bug: 275652066 (repeat)
gcip: Conditionally use alloc_iova_fast workaround
GCIP_MAIN_REV_ID: 7962e3b9000d59e530d9633ab37656f0d8ac693a
gxp: remove redundant PM ops and add comments
Bug: 277302257 (repeat)
gxp: clang-format set column limit to 100
gxp: update clang-format to Linux 6.2.10
gxp: Add unique identifier to crash reason
Bug: 249103167
gxp: Remove debugfs.{c,h}
Bug: 27266337
gxp: Move cmumux{1,2} debugfs to gxp-common-platform
Bug: 27266337 (repeat)
gxp: Move blk_powerstate and wakelock debugfs to gxp-pm
Bug: 272663376
gxp: Move mailbox debugfs to gxp-mailbox-manager
Bug: 272663376 (repeat)
gxp: Move coredump debugfs to gxp-debug-dump
Bug: 272663376 (repeat)
gxp: Move firmware_run debugfs to gxp-firmware
Bug: 272663376 (repeat)
gxp: Move log and log_eventfd debugfs to telemetry
Bug: 272663376 (repeat)
gxp: Remove unused lpm_test
Bug: 272663376 (repeat)
gxp: Move debugfs initialization earlier
Bug: 272663376 (repeat)
gxp: rename gxp PM ops
Bug: 277302257 (repeat)
gxp: add gxp_pm_chip_set_ops
Bug: 277302257 (repeat)
gxp: add format string for commit hash
Bug: 270589821
gxp: unittests: enable ftrace events to increase the code coverage
Bug: 273847390
gxp: put CREATE_TRACE_POINTS to a separate file
gxp: Enable core debug dump support for dogfood
Bug: 274956438
gxp: remove support for unsigned MCU FW
Bug: 277191960
gxp: modify GSA behavior in fallback GSA header
Bug: 277191960 (repeat)
gxp: refuse running MCU in TZ with no gsa_dev
gxp: fix error handling while running MCU by GSA
gxp: bump version to 1.14
gxp: support coherency on imported dma-bufs
Bug: 276866171
gxp: adopt updated acquire_lock interface of GCIP
Bug: 275652066 (repeat)
GitOrigin-RevId: 938e4b82a5fc20d56e28cd75b6aaddb39548ba28
Change-Id: If888871701ab5d2aab17b168e0cdf85498a336b9
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/gsa/gsa_dsp.h | 2 | ||||
-rw-r--r-- | include/trace/events/gxp.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/gsa/gsa_dsp.h b/include/linux/gsa/gsa_dsp.h index 288adaf..7a77875 100644 --- a/include/linux/gsa/gsa_dsp.h +++ b/include/linux/gsa/gsa_dsp.h @@ -65,6 +65,8 @@ enum gsa_dsp_cmd { */ static inline int gsa_send_dsp_cmd(struct device *gsa, enum gsa_dsp_cmd cmd) { + if (cmd == GSA_DSP_START) + return GSA_DSP_STATE_RUNNING; return GSA_DSP_STATE_INACTIVE; } diff --git a/include/trace/events/gxp.h b/include/trace/events/gxp.h index 1e4257b..53e7a9d 100644 --- a/include/trace/events/gxp.h +++ b/include/trace/events/gxp.h @@ -11,8 +11,11 @@ #if !defined(_TRACE_GXP_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_GXP_H +#include <linux/stringify.h> #include <linux/tracepoint.h> +#define GXP_TRACE_SYSTEM __stringify(TRACE_SYSTEM) + TRACE_EVENT(gxp_dma_map_sg_start, TP_PROTO(int nents), |