nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 09:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

kmd: re-enable the panic_callback

Browse Source 
- introduced a panic_flag in the tegra_rtcpu_trace.
- set panic_flag to 1 when kmd receives panic hsp
  message from RCE.
- the trace buffer readout thread calls rtcpu_trace_snapshot
  to dump out the snapshot section when panic_flag is set to 1.

Bug 5293085

Change-Id: Ief5d9431bfc944fc588f38a69f7758f829cf2e6e
Signed-off-by: yizhou <yizhou@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3368252
Reviewed-by: Evgeny Kornev <ekornev@nvidia.com>
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
Reviewed-by: Chinniah Poosapadi <cpoosapadi@nvidia.com>
Reviewed-by: Mohit Ingale <mohiti@nvidia.com>
Reviewed-by: Kalle Jokiniemi <kjokiniemi@nvidia.com>
This commit is contained in:
yizhou
2025-05-21 06:58:19 +00:00
committed by Jon Hunter
parent b42f5d8ada
commit 737925e58e
4 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/platform/tegra/rtcpu/hsp-mailbox-client.c
View File

@@ -243,8 +243,7 @@ static void camrtc_hsp_rx_full_notify(mbox_client *cl, void *data)
} else if (CAMRTC_HSP_MSG_ID(msg) == CAMRTC_HSP_PANIC) {
dev_err(&camhsp->dev, "%s: receive CAMRTC_HSP_PANIC message!\n", __func__);
if (camhsp->panic_callback != NULL) {
// disable panic_callback as the workaround for https://nvbugspro.nvidia.com/bug/5293085
//camhsp->panic_callback(camhsp->dev.parent);
camhsp->panic_callback(camhsp->dev.parent);
} else {
dev_warn(&camhsp->dev, "%s: No panic callback function is registered.\n", __func__);
}

3
drivers/platform/tegra/rtcpu/tegra-camera-rtcpu-base.c
View File

@@ -1316,7 +1316,8 @@ void rtcpu_trace_panic_callback(struct device *dev)
return;
}
rtcpu_trace_snapshot(tracer);
/* Call the accessor function to set panic flag */
tegra_rtcpu_trace_set_panic_flag(tracer);
}
EXPORT_SYMBOL(rtcpu_trace_panic_callback);

47
drivers/platform/tegra/rtcpu/tegra-rtcpu-trace.c
View File

@@ -120,6 +120,9 @@ struct tegra_rtcpu_trace {
struct cdev s_dev;
wait_queue_head_t wait_queue;
/* flag to indicate a panic occurred */
atomic_t panic_flag;
};
struct rtcpu_raw_trace_context {
@@ -1917,10 +1920,9 @@ static inline void rtcpu_trace_events(struct tegra_rtcpu_trace *tracer)
* @brief Processes RTCPU snapshot trace events from shared memory.
*
* This function reads and processes snapshot trace events recorded by the RTCPU
* into a dedicated circular buffer in shared memory. It is similar to
* rtcpu_trace_events but operates on the snapshot buffer.
* into a dedicated circular buffer in shared memory. Similar to rtcpu_trace_events
* it assumes the caller to lock the mutex.
*
* - Acquires the tracer mutex lock.
* - Reads the current snapshot write index (@ref snapshot_next_idx) from the
* shared memory header.
* - Compares it with the last processed index (@ref tracer->snapshot_last_idx)
@@ -1938,12 +1940,11 @@ static inline void rtcpu_trace_events(struct tegra_rtcpu_trace *tracer)
* - Increments the snapshot event counter (@ref tracer->n_snapshots).
* - Advances the index, handling wrap-around.
* - Updates the last processed snapshot index (@ref tracer->snapshot_last_idx).
* - Releases the tracer mutex lock.
*
* @param[in/out] tracer Pointer to the tegra_rtcpu_trace structure.
* Valid Range: Non-NULL pointer.
*/
void rtcpu_trace_snapshot(struct tegra_rtcpu_trace *tracer)
static inline void rtcpu_trace_snapshot(struct tegra_rtcpu_trace *tracer)
{
const struct camrtc_trace_memory_header *header = NULL;
u32 old_next = 0U;
@@ -1953,8 +1954,6 @@ void rtcpu_trace_snapshot(struct tegra_rtcpu_trace *tracer)
if (tracer == NULL)
return;
mutex_lock(&tracer->lock);
header = tracer->trace_memory;
old_next = tracer->snapshot_last_idx;
new_next = header->snapshot_next_idx;
@@ -1963,16 +1962,13 @@ void rtcpu_trace_snapshot(struct tegra_rtcpu_trace *tracer)
dev_warn_ratelimited(tracer->dev,
"trace entry %u outside range 0..%u\n",
new_next, tracer->snapshot_entries - 1);
mutex_unlock(&tracer->lock);
return;
}
new_next = array_index_nospec(new_next, tracer->snapshot_entries);
if (old_next == new_next) {
mutex_unlock(&tracer->lock);
if (old_next == new_next)
return;
}
rtcpu_trace_invalidate_entries(tracer,
tracer->dma_handle_snapshots,
@@ -1980,8 +1976,6 @@ void rtcpu_trace_snapshot(struct tegra_rtcpu_trace *tracer)
CAMRTC_TRACE_EVENT_SIZE,
tracer->snapshot_entries);
dev_err(tracer->dev, "%s: dump snapshot start at %u, end at %u\n",
__func__, old_next, new_next);
while (old_next != new_next) {
old_next = array_index_nospec(old_next, tracer->snapshot_entries);
event = &tracer->snapshot_events[old_next];
@@ -1993,9 +1987,7 @@ void rtcpu_trace_snapshot(struct tegra_rtcpu_trace *tracer)
}
tracer->snapshot_last_idx = new_next;
mutex_unlock(&tracer->lock);
}
EXPORT_SYMBOL(rtcpu_trace_snapshot);
/**
* @brief Flushes the RTCPU trace buffer
@@ -2006,6 +1998,8 @@ EXPORT_SYMBOL(rtcpu_trace_snapshot);
* - Invalidates the cache line for pointers using @ref dma_sync_single_for_cpu
* - Processes exceptions using @ref rtcpu_trace_exceptions
* - Processes events using @ref rtcpu_trace_events
* - If panic_flag was 1, atomically set it to 0 by calling @ref atomic_cmpxchg
* and take a snapshot by calling @ref rtcpu_trace_snapshot
* - Unlocks the mutex using @ref mutex_unlock
*
* @param[in] tracer Pointer to the tegra_rtcpu_trace structure.
@@ -2026,6 +2020,10 @@ void tegra_rtcpu_trace_flush(struct tegra_rtcpu_trace *tracer)
rtcpu_trace_exceptions(tracer);
rtcpu_trace_events(tracer);
if (atomic_cmpxchg(&tracer->panic_flag, 1, 0) == 1) {
rtcpu_trace_snapshot(tracer);
}
mutex_unlock(&tracer->lock);
}
EXPORT_SYMBOL(tegra_rtcpu_trace_flush);
@@ -2957,5 +2955,24 @@ void tegra_rtcpu_trace_destroy(struct tegra_rtcpu_trace *tracer)
}
EXPORT_SYMBOL(tegra_rtcpu_trace_destroy);
/**
* @brief Sets the panic_flag in the tracer structure to indicate a panic.
*
* This function does the following:
* - Checks if the tracer is NULL, returns if it is.
* - Set the panic_flag to 1 by calling @ref atomic_cmpxchg
*
* @param[in] tracer Pointer to the tegra_rtcpu_trace structure.
*/
void tegra_rtcpu_trace_set_panic_flag(struct tegra_rtcpu_trace *tracer)
{
if (tracer == NULL)
return;
/* Atomically set panic_flag to 1 if it is currently 0 */
atomic_cmpxchg(&tracer->panic_flag, 0, 1);
}
EXPORT_SYMBOL(tegra_rtcpu_trace_set_panic_flag);
MODULE_DESCRIPTION("NVIDIA Tegra RTCPU trace driver");
MODULE_LICENSE("GPL v2");

2
include/linux/tegra-rtcpu-trace.h
View File

@@ -17,7 +17,7 @@ struct tegra_rtcpu_trace *tegra_rtcpu_trace_create(
int tegra_rtcpu_trace_boot_sync(struct tegra_rtcpu_trace *tracer);
void tegra_rtcpu_trace_flush(struct tegra_rtcpu_trace *tracer);
void tegra_rtcpu_trace_destroy(struct tegra_rtcpu_trace *tracer);
void rtcpu_trace_snapshot(struct tegra_rtcpu_trace *tracer);
void rtcpu_trace_panic_callback(struct device *dev);
void tegra_rtcpu_trace_set_panic_flag(struct tegra_rtcpu_trace *tracer);
#endif