[tee][optee] Clean up some TODOs in driver
Clean up some old logging and TODOs in the driver.
Test: Compiles.
Change-Id: I41c6f90445f9e6d2e6703bc30f53081b023d2398
diff --git a/zircon/system/dev/tee/optee/optee-client.cpp b/zircon/system/dev/tee/optee/optee-client.cpp
index 003eb15..e1bf503 100644
--- a/zircon/system/dev/tee/optee/optee-client.cpp
+++ b/zircon/system/dev/tee/optee/optee-client.cpp
@@ -563,13 +563,6 @@
auto sh_mem_addr = reinterpret_cast<uintptr_t>(&allocated_shared_memory_.back());
*out_mem_id = static_cast<uint64_t>(sh_mem_addr);
- // TODO(godtamit): Remove when all RPC is done
- zxlogf(INFO,
- "optee: allocated shared memory at physical addr 0x%" PRIuPTR
- " with id 0x%" PRIu64 "\n",
- *out_phys_addr,
- *out_mem_id);
-
return status;
}
@@ -581,12 +574,7 @@
}
// Destructor of SharedMemory will automatically free block back into pool
- //
- // TODO(godtamit): Remove mem_to_free and logging when all of RPC is implemented
- __UNUSED auto mem_to_free = allocated_shared_memory_.erase(mem_iter);
- zxlogf(INFO,
- "optee: successfully freed shared memory at phys 0x%" PRIuPTR "\n",
- mem_to_free->paddr());
+ allocated_shared_memory_.erase(mem_iter);
return ZX_OK;
}
@@ -703,8 +691,6 @@
status = HandleRpcFreeMemory(args.free_memory, &out_result->free_memory);
break;
case kRpcFunctionIdDeliverIrq:
- // TODO(godtamit): Remove when all of RPC is implemented
- zxlogf(INFO, "optee: delivering IRQ\n");
// Foreign interrupt detected while in the secure world
// Zircon handles this so just mark the RPC as handled
status = ZX_OK;
diff --git a/zircon/system/dev/tee/optee/optee-controller.cpp b/zircon/system/dev/tee/optee/optee-controller.cpp
index 90da423..924783d 100644
--- a/zircon/system/dev/tee/optee/optee-controller.cpp
+++ b/zircon/system/dev/tee/optee/optee-controller.cpp
@@ -366,31 +366,13 @@
zxlogf(ERROR, "optee: hit thread limit, need to fix this\n");
break;
} else if (optee::IsReturnRpc(result.response.status)) {
- // TODO(godtamit): Remove this when all of RPC is implemented
- zxlogf(INFO,
- "optee: rpc call: %" PRIx32 " arg1: %" PRIx32
- " arg2: %" PRIx32 " arg3: %" PRIx32 "\n",
- result.response.status,
- result.response.arg1,
- result.response.arg2,
- result.response.arg3);
- status = rpc_handler(result.rpc_args, &func_call.rpc_result);
-
- // TODO(godtamit): Re-evaluate whether ZX_DEBUG_ASSERT is necessary once all supported
- // RPC commands are implemented
- //
- // Crash if we run into unsupported functionality
- // Otherwise, if status != ZX_OK, we can still call the TEE with the response and let it
- // clean up on its end.
- ZX_DEBUG_ASSERT(status != ZX_ERR_NOT_SUPPORTED);
+ rpc_handler(result.rpc_args, &func_call.rpc_result);
} else {
return_value = result.response.status;
break;
}
}
- // TODO(godtamit): Remove after all of RPC is implemented
- zxlogf(INFO, "optee: CallWithMessage returning %i\n", return_value);
return return_value;
}
} // namespace optee
