commit dc31bf0ccd4efcab1ac18e57911bd55fba94d875
author Stephen Crane <cranes@google.com> Tue Sep 07 12:36:44 2021 -0700
committer Stephen Crane <cranes@google.com> Mon Sep 20 22:26:27 2021 -0700
tree 3183908d719c061e870fb163ff1b3caf7cadcdc5
parent 88d8b4634ee5ab1477b2bcc568f8b291d97e2cc2

Add additional logging of rpmb send failures

Adds logging to distinguish mac failures and print additional
information when an rpmb send command fails.

Test: build.py
Bug: 198638362
Change-Id: I8d52bc23931ff9866d72ff8a2fc0976490a68748

rpmb.c

diff --git a/rpmb.c b/rpmb.c
index 4ac47c6..7ac56f9 100644
--- a/rpmb.c
+++ b/rpmb.c
@@ -393,17 +393,24 @@
         cmd[i].req_resp = rpmb_u16(RPMB_REQ_DATA_WRITE);
     }
     ret = rpmb_mac(state->key, cmd, count, &cmd[count - 1].key_mac);
-    if (ret < 0)
+    if (ret < 0) {
+        fprintf(stderr, "rpmb command mac failed\n");
         return ret;
+    }
 
     ret = rpmb_send(state->mmc_handle, cmd, sizeof(cmd[0]) * count, &rescmd,
                     sizeof(rescmd), &res, sizeof(res), sync);
-    if (ret < 0)
+    if (ret < 0) {
+        fprintf(stderr, "rpmb send failed: %d, result: %hu\n", ret,
+                rpmb_get_u16(res.result));
         goto err_sent;
+    }
 
     ret = rpmb_mac(state->key, &res, 1, &mac);
-    if (ret < 0)
+    if (ret < 0) {
+        fprintf(stderr, "rpmb response mac failed\n");
         goto err_sent;
+    }
 
     rpmb_dprintf(
             "rpmb: write data, addr %d, count %d, write_counter %d, response\n",
@@ -422,6 +429,8 @@
             fprintf(stderr, "rpmb write counter failure\n");
             abort(); /* see comment in err_sent */
         }
+        fprintf(stderr, "rpmb_check_response_failed: %d, result: %hu\n", ret,
+                rpmb_get_u16(res.result));
         goto err_sent;
     }
 
@@ -478,6 +487,8 @@
      * 2.2. The same block number and counter has not already been sent.
      * We are back to a normal state.
      */
+    fprintf(stderr, "rpmb: write failed for write counter %u\n",
+            state->write_counter);
     state->first_write_complete = false;
     return ret;
 }