commit 2128219e3562015d8961f95a992e8ad719da5c2c
author Braden Kell <bradenkell@google.com> Fri Sep 25 22:17:05 2020 +0000
committer Braden Kell <bradenkell@google.com> Fri Jun 04 15:58:51 2021 +0000
tree 5fb0e484f1d7b24e07d24c822dcbac4e2cb21fc7
parent 9d29f1f49e81f78c71b2ee0ca452daab08d0880c

Always print command response

Change-Id: I4e49386cd7d524f73fb51e6011944011aabe7acd

src/devices/block/drivers/aml-sdmmc/aml-sdmmc.cc

diff --git a/src/devices/block/drivers/aml-sdmmc/aml-sdmmc.cc b/src/devices/block/drivers/aml-sdmmc/aml-sdmmc.cc
index ed892da..7b37caa 100644
--- a/src/devices/block/drivers/aml-sdmmc/aml-sdmmc.cc
+++ b/src/devices/block/drivers/aml-sdmmc/aml-sdmmc.cc
@@ -106,6 +106,8 @@
   auto on_bus_error =
       fit::defer([&]() { AmlSdmmcStart::Get().ReadFrom(&mmio_).set_desc_busy(0).WriteTo(&mmio_); });
 
+  req->response[0] = AmlSdmmcCmdResp::Get().ReadFrom(&mmio_).reg_value();
+
   if (rxd_err) {
     if (req->probe_tuning_cmd) {
       AML_SDMMC_TRACE("RX Data CRC Error cmd%d, status=0x%x, RXD_ERR:%d", req->cmd_idx,
@@ -924,12 +926,11 @@
     pending_txn_ = true;
   }
 
-// zxlogf(INFO, "%s: cmd%d arg 0x%08x", __func__, req->cmd_idx, req->arg);  
-// Wait for the bus to become idle before issuing the next request. This could be necessary if the
+  // Janky way to determine if this is SDIO or eMMC
+  const bool is_test_sdio = max_freq_ == 50'000'000;
+
+  // Wait for the bus to become idle before issuing the next request. This could be necessary if the
   // card is driving CMD low after a voltage switch.
-  if (max_freq_ == 50'000'000) {  // Janky way to determine if this is SDIO or eMMC
-  zxlogf(INFO, "%s: cmd%d arg 0x%08x", __func__, req->cmd_idx, req->arg);  
-  }
   WaitForBus();
 
   zx_status_t status = ZX_OK;
@@ -986,6 +987,11 @@
   pending_txn_ = false;
   txn_finished_.Signal();
 
+  if (is_test_sdio) {
+    zxlogf(INFO, "%s: cmd%d arg 0x%08x resp 0x%08x", __func__, req->cmd_idx, req->arg,
+           req->response[0]);
+  }
+
   return res;
 }