forked from grate-driver/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'tag-chrome-platform-for-v5.18' of git://git.kernel.org/pub…
…/scm/linux/kernel/git/chrome-platform/linux
Pull chrome platform updates from Benson Leung:
"cros_ec_typec:
- Check for EC device - Fix a crash when using the cros_ec_typec
driver on older hardware not capable of typec commands
- Make try power role optional
- Mux configuration reorganization series from Prashant
cros_ec_debugfs:
- Fix use after free. Thanks Tzung-bi
sensorhub:
- cros_ec_sensorhub fixup - Split trace include file
misc:
- Add new mailing list for chrome-platform development:
chrome-platform@lists.linux.dev
Now with patchwork!"
* tag 'tag-chrome-platform-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux:
platform/chrome: cros_ec_debugfs: detach log reader wq from devm
platform: chrome: Split trace include file
platform/chrome: cros_ec_typec: Update mux flags during partner removal
platform/chrome: cros_ec_typec: Configure muxes at start of port update
platform/chrome: cros_ec_typec: Get mux state inside configure_mux
platform/chrome: cros_ec_typec: Move mux flag checks
platform/chrome: cros_ec_typec: Check for EC device
platform/chrome: cros_ec_typec: Make try power role optional
MAINTAINERS: platform-chrome: Add new chrome-platform@lists.linux.dev list- Loading branch information
Showing
7 changed files
with
186 additions
and
152 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| /* SPDX-License-Identifier: GPL-2.0 */ | ||
| /* | ||
| * Trace events for the ChromeOS Sensorhub kernel module | ||
| * | ||
| * Copyright 2021 Google LLC. | ||
| */ | ||
|
|
||
| #undef TRACE_SYSTEM | ||
| #define TRACE_SYSTEM cros_ec | ||
|
|
||
| #if !defined(_CROS_EC_SENSORHUB_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ) | ||
| #define _CROS_EC_SENSORHUB_TRACE_H_ | ||
|
|
||
| #include <linux/types.h> | ||
| #include <linux/platform_data/cros_ec_sensorhub.h> | ||
|
|
||
| #include <linux/tracepoint.h> | ||
|
|
||
| TRACE_EVENT(cros_ec_sensorhub_timestamp, | ||
| TP_PROTO(u32 ec_sample_timestamp, u32 ec_fifo_timestamp, s64 fifo_timestamp, | ||
| s64 current_timestamp, s64 current_time), | ||
| TP_ARGS(ec_sample_timestamp, ec_fifo_timestamp, fifo_timestamp, current_timestamp, | ||
| current_time), | ||
| TP_STRUCT__entry( | ||
| __field(u32, ec_sample_timestamp) | ||
| __field(u32, ec_fifo_timestamp) | ||
| __field(s64, fifo_timestamp) | ||
| __field(s64, current_timestamp) | ||
| __field(s64, current_time) | ||
| __field(s64, delta) | ||
| ), | ||
| TP_fast_assign( | ||
| __entry->ec_sample_timestamp = ec_sample_timestamp; | ||
| __entry->ec_fifo_timestamp = ec_fifo_timestamp; | ||
| __entry->fifo_timestamp = fifo_timestamp; | ||
| __entry->current_timestamp = current_timestamp; | ||
| __entry->current_time = current_time; | ||
| __entry->delta = current_timestamp - current_time; | ||
| ), | ||
| TP_printk("ec_ts: %9u, ec_fifo_ts: %9u, fifo_ts: %12lld, curr_ts: %12lld, curr_time: %12lld, delta %12lld", | ||
| __entry->ec_sample_timestamp, | ||
| __entry->ec_fifo_timestamp, | ||
| __entry->fifo_timestamp, | ||
| __entry->current_timestamp, | ||
| __entry->current_time, | ||
| __entry->delta | ||
| ) | ||
| ); | ||
|
|
||
| TRACE_EVENT(cros_ec_sensorhub_data, | ||
| TP_PROTO(u32 ec_sensor_num, u32 ec_fifo_timestamp, s64 fifo_timestamp, | ||
| s64 current_timestamp, s64 current_time), | ||
| TP_ARGS(ec_sensor_num, ec_fifo_timestamp, fifo_timestamp, current_timestamp, current_time), | ||
| TP_STRUCT__entry( | ||
| __field(u32, ec_sensor_num) | ||
| __field(u32, ec_fifo_timestamp) | ||
| __field(s64, fifo_timestamp) | ||
| __field(s64, current_timestamp) | ||
| __field(s64, current_time) | ||
| __field(s64, delta) | ||
| ), | ||
| TP_fast_assign( | ||
| __entry->ec_sensor_num = ec_sensor_num; | ||
| __entry->ec_fifo_timestamp = ec_fifo_timestamp; | ||
| __entry->fifo_timestamp = fifo_timestamp; | ||
| __entry->current_timestamp = current_timestamp; | ||
| __entry->current_time = current_time; | ||
| __entry->delta = current_timestamp - current_time; | ||
| ), | ||
| TP_printk("ec_num: %4u, ec_fifo_ts: %9u, fifo_ts: %12lld, curr_ts: %12lld, curr_time: %12lld, delta %12lld", | ||
| __entry->ec_sensor_num, | ||
| __entry->ec_fifo_timestamp, | ||
| __entry->fifo_timestamp, | ||
| __entry->current_timestamp, | ||
| __entry->current_time, | ||
| __entry->delta | ||
| ) | ||
| ); | ||
|
|
||
| TRACE_EVENT(cros_ec_sensorhub_filter, | ||
| TP_PROTO(struct cros_ec_sensors_ts_filter_state *state, s64 dx, s64 dy), | ||
| TP_ARGS(state, dx, dy), | ||
| TP_STRUCT__entry( | ||
| __field(s64, dx) | ||
| __field(s64, dy) | ||
| __field(s64, median_m) | ||
| __field(s64, median_error) | ||
| __field(s64, history_len) | ||
| __field(s64, x) | ||
| __field(s64, y) | ||
| ), | ||
| TP_fast_assign( | ||
| __entry->dx = dx; | ||
| __entry->dy = dy; | ||
| __entry->median_m = state->median_m; | ||
| __entry->median_error = state->median_error; | ||
| __entry->history_len = state->history_len; | ||
| __entry->x = state->x_offset; | ||
| __entry->y = state->y_offset; | ||
| ), | ||
| TP_printk("dx: %12lld. dy: %12lld median_m: %12lld median_error: %12lld len: %lld x: %12lld y: %12lld", | ||
| __entry->dx, | ||
| __entry->dy, | ||
| __entry->median_m, | ||
| __entry->median_error, | ||
| __entry->history_len, | ||
| __entry->x, | ||
| __entry->y | ||
| ) | ||
| ); | ||
|
|
||
|
|
||
| #endif /* _CROS_EC_SENSORHUB_TRACE_H_ */ | ||
|
|
||
| /* this part must be outside header guard */ | ||
|
|
||
| #undef TRACE_INCLUDE_PATH | ||
| #define TRACE_INCLUDE_PATH . | ||
|
|
||
| #undef TRACE_INCLUDE_FILE | ||
| #define TRACE_INCLUDE_FILE cros_ec_sensorhub_trace | ||
|
|
||
| #include <trace/define_trace.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.