diff options
| author | Whi copybara merger <whitechapel-automerger@google.com> | 2022-04-12 06:56:21 +0000 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2022-04-22 23:33:22 +0000 |
| commit | 2b5db85f5e6ded9d168bee4761c822f35472043a (patch) | |
| tree | 72a4c5f4b8bf17fd194bffa7bf1322d67195be60 | |
| parent | 262ab56ba3e4df3e23e549de20f319f00237a919 (diff) | |
| download | janeiro-2b5db85f5e6ded9d168bee4761c822f35472043a.tar.gz | |
[Copybara Auto Merge] Merge branch 'pro' into android13-gs-pixel-5.10
whi-pro 4/18 RC01
edgetpu: Change debug dump logs for prod FW builds.
edgetpu: mobile: Add handler for FW checkpoint dump reason.
Bug: 228917587
Bug: 228916950
Commit-Topic: janeiro_release_20220418_RC01-0d4280
GitOrigin-RevId: 971a77fe02750d59ae0c2b67d3dbb248fd48f8b1
Change-Id: I1f4dceb561bd2102d73c458f5ac57b1313fd381c
| -rw-r--r-- | drivers/edgetpu/edgetpu-debug-dump.c | 13 | ||||
| -rw-r--r-- | drivers/edgetpu/mobile-debug-dump.c | 1 |
2 files changed, 8 insertions, 6 deletions
diff --git a/drivers/edgetpu/edgetpu-debug-dump.c b/drivers/edgetpu/edgetpu-debug-dump.c index a017e7f..baf526a 100644 --- a/drivers/edgetpu/edgetpu-debug-dump.c +++ b/drivers/edgetpu/edgetpu-debug-dump.c @@ -70,13 +70,14 @@ int edgetpu_get_debug_dump(struct edgetpu_dev *etdev, u64 type) etdev_dbg(etdev, "Sent debug dump request, tpu addr: %llx", (u64)etdev->debug_dump_mem.tpu_addr); if (ret) { - if (init_fw_dump_buffer) - etdev_err(etdev, "failed to init dump buffer in FW"); - - if (ret == KCI_ERROR_UNIMPLEMENTED) + if (ret == KCI_ERROR_UNIMPLEMENTED) { etdev_dbg(etdev, "Debug dump KCI not implemented"); - else - etdev_err(etdev, "Debug dump KCI req failed: %d", ret); + } else { + if (init_fw_dump_buffer) + etdev_err(etdev, "failed to init dump buffer in FW"); + else + etdev_err(etdev, "Debug dump KCI req failed: %d", ret); + } } return ret; diff --git a/drivers/edgetpu/mobile-debug-dump.c b/drivers/edgetpu/mobile-debug-dump.c index 4ef02ac..b6b7c2a 100644 --- a/drivers/edgetpu/mobile-debug-dump.c +++ b/drivers/edgetpu/mobile-debug-dump.c @@ -518,6 +518,7 @@ int edgetpu_debug_dump_init(struct edgetpu_dev *etdev) return -ENOMEM; etdev->debug_dump_handlers[DUMP_REASON_REQ_BY_USER] = mobile_sscd_generate_coredump; etdev->debug_dump_handlers[DUMP_REASON_RECOVERABLE_FAULT] = mobile_sscd_generate_coredump; + etdev->debug_dump_handlers[DUMP_REASON_FW_CHECKPOINT] = mobile_sscd_generate_coredump; pdev->sscd_info.pdata = &sscd_pdata; pdev->sscd_info.dev = &sscd_dev; |