summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/vendorcode/cavium/bdk/libbdk-dram/bdk-dram-test-addrbus.c2
-rw-r--r--src/vendorcode/cavium/bdk/libbdk-dram/bdk-dram-test.c10
-rw-r--r--src/vendorcode/cavium/bdk/libbdk-hal/bdk-l2c.c2
-rw-r--r--src/vendorcode/cavium/bdk/libdram/libdram.c5
-rw-r--r--src/vendorcode/cavium/include/bdk/libbdk-dram/bdk-dram-test.h8
5 files changed, 8 insertions, 19 deletions
diff --git a/src/vendorcode/cavium/bdk/libbdk-dram/bdk-dram-test-addrbus.c b/src/vendorcode/cavium/bdk/libbdk-dram/bdk-dram-test-addrbus.c
index 834ade4c40..afa1ed28af 100644
--- a/src/vendorcode/cavium/bdk/libbdk-dram/bdk-dram-test-addrbus.c
+++ b/src/vendorcode/cavium/bdk/libbdk-dram/bdk-dram-test-addrbus.c
@@ -60,7 +60,7 @@ int __bdk_dram_test_mem_address_bus(uint64_t area, uint64_t max_address, int bur
/* Clear our work area. Checking for aliases later could get false
positives if it matched stale data */
- void *ptr = (area) ? bdk_phys_to_ptr(area) : NULL;
+ void *ptr = bdk_phys_to_ptr(area);
bdk_zero_memory(ptr, max_address - area);
__bdk_dram_flush_to_mem_range(area, max_address);
diff --git a/src/vendorcode/cavium/bdk/libbdk-dram/bdk-dram-test.c b/src/vendorcode/cavium/bdk/libbdk-dram/bdk-dram-test.c
index 5e6e4bcf11..9c78667116 100644
--- a/src/vendorcode/cavium/bdk/libbdk-dram/bdk-dram-test.c
+++ b/src/vendorcode/cavium/bdk/libbdk-dram/bdk-dram-test.c
@@ -101,9 +101,7 @@ static uint64_t dram_test_thread_size;
void __bdk_dram_flush_to_mem(uint64_t address)
{
BDK_MB;
- /* 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 */
- char *ptr = (void*)address;
+ char *ptr = bdk_phys_to_ptr(address);
BDK_CACHE_WBI_L2(ptr);
}
@@ -116,10 +114,8 @@ void __bdk_dram_flush_to_mem(uint64_t address)
*/
void __bdk_dram_flush_to_mem_range(uint64_t area, uint64_t max_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 */
- char *ptr = (void*)area;
- char *end = (void*)max_address;
+ char *ptr = bdk_phys_to_ptr(area);
+ char *end = bdk_phys_to_ptr(max_address);
BDK_MB;
while (ptr < end)
{
diff --git a/src/vendorcode/cavium/bdk/libbdk-hal/bdk-l2c.c b/src/vendorcode/cavium/bdk/libbdk-hal/bdk-l2c.c
index 6c163da2d4..aa7d6582a8 100644
--- a/src/vendorcode/cavium/bdk/libbdk-hal/bdk-l2c.c
+++ b/src/vendorcode/cavium/bdk/libbdk-hal/bdk-l2c.c
@@ -141,7 +141,7 @@ int bdk_l2c_unlock_mem_region(bdk_node_t node, uint64_t start, uint64_t len)
len += start & BDK_CACHE_LINE_MASK;
start &= ~BDK_CACHE_LINE_MASK;
len = (len + BDK_CACHE_LINE_MASK) & ~BDK_CACHE_LINE_MASK;
- void *ptr = (start) ? bdk_phys_to_ptr(start) : NULL;
+ void *ptr = bdk_phys_to_ptr(start);
while (len > 0)
{
diff --git a/src/vendorcode/cavium/bdk/libdram/libdram.c b/src/vendorcode/cavium/bdk/libdram/libdram.c
index 214aa05b24..740de8498f 100644
--- a/src/vendorcode/cavium/bdk/libdram/libdram.c
+++ b/src/vendorcode/cavium/bdk/libdram/libdram.c
@@ -79,10 +79,7 @@ static void bdk_dram_clear_mem(bdk_node_t node)
write to the cache line isn't good enough because partial LMC
writes may be enabled */
ddr_print("N%d: Rewriting DRAM: start 0 length 0x%llx\n", node, skip);
- volatile uint64_t *ptr = bdk_phys_to_ptr(bdk_numa_get_address(node, 8));
- /* The above pointer got address 8 to avoid NULL pointer checking
- in bdk_phys_to_ptr(). Correct it here */
- ptr--;
+ volatile uint64_t *ptr = bdk_phys_to_ptr(bdk_numa_get_address(node, 0));
uint64_t *end = bdk_phys_to_ptr(bdk_numa_get_address(node, skip));
while (ptr < end)
{
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;
}