vc/cavium/{bdk,include}: Clean up bdk_phys_to_ptr() calls

The bdk_phys_to_ptr() function converts a uint64_t address to a void *
pointer. Judging by the comments, the old implementation had a check
that would refuse to convert a null pointer, which required several
workarounds when trying to convert the address 0 to a pointer. This
isn't the case for coreboot though, which implements this function
as a simple (void *) cast, so we can remove the old workarounds.

Change-Id: I6537d1699e6726c1fb155d69a51e14da856232de
Signed-off-by: Jacob Garber <jgarber1@ualberta.ca>
Found-by: Coverity CID 1393962
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34590
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>

1 files changed, 2 insertions, 6 deletions

diff --git a/src/vendorcode/cavium/include/bdk/libbdk-dram/bdk-dram-test.h b/src/vendorcode/cavium/include/bdk/libbdk-dram/bdk-dram-test.h
index 60f07fa0c5..168ef03dcd 100644
--- a/src/vendorcode/cavium/include/bdk/libbdk-dram/bdk-dram-test.h
+++ b/src/vendorcode/cavium/include/bdk/libbdk-dram/bdk-dram-test.h
@@ -161,17 +161,13 @@ extern int  __bdk_dram_retry_failure2(int burst, uint64_t address1, uint64_t dat
 
 static inline void __bdk_dram_write64(uint64_t address, uint64_t data)
 {
-    /* The DRAM code doesn't use the normal bdk_phys_to_ptr() because of the
-       NULL check in it. This greatly slows down the memory tests */
-    volatile uint64_t *ptr = (void*)address;
+    volatile uint64_t *ptr = bdk_phys_to_ptr(address);
     *ptr = data;
 }
 
 static inline uint64_t __bdk_dram_read64(uint64_t address)
 {
-    /* The DRAM code doesn't use the normal bdk_phys_to_ptr() because of the
-       NULL check in it. This greatly slows down the memory tests */
-    volatile uint64_t *ptr = (void*)address;
+    volatile uint64_t *ptr = bdk_phys_to_ptr(address);
     return *ptr;
 }