Pass autodiscovery string size from acl_kernel_if_init to get_auto_discovery_string

Author: sophimao

include/acl_hal_mmd.h

@@ -94,7 +94,7 @@
 
 #define RESET_TIMEOUT (2 * 1000 * 1000 * 1000)
 
-// acl_pll
+//// acl_pll
 // Address map
 // For unit tests to work, these defines must match those in the unit test
 // header file

src/acl_kernel_if.cpp

@@ -114,12 +114,8 @@ static int check_version_id(acl_kernel_if *kern) {
 }
 
 // Loads auto-discovery config string. Returns 0 if was successful.
-static int get_auto_discovery_string(acl_kernel_if *kern, char *config_str) {
-  unsigned int version, rom_address;
-  char description_size_msb[KERNEL_ROM_SIZE_BYTES_READ + 1];
-  char description_size_lsb[KERNEL_ROM_SIZE_BYTES_READ + 1];
-  unsigned int size_location;
-  unsigned int size, rom_size;
+static int get_auto_discovery_string(acl_kernel_if *kern, char *config_str, size_t config_str_len) {
+  unsigned int version, rom_address, rom_size;
   size_t r;
   int result;
   acl_assert_locked();
@@ -129,39 +125,25 @@ static int get_auto_discovery_string(acl_kernel_if *kern, char *config_str) {
   version = 0;
   acl_kernel_if_read_32b(kern, OFFSET_KERNEL_VERSION_ID, &version);
   if (version == KERNEL_ROM_VERSION_ID) {
-    // Read autodiscovery size
-    size_location = OFFSET_KERNEL_ROM_LOCATION_MSB;
-    acl_kernel_rom_cra_read_32b(kern, size_location,
-                                (unsigned int *)description_size_msb);
-    description_size_msb[KERNEL_ROM_SIZE_BYTES_READ] = '\0';
-    size = (unsigned int)strtol(description_size_msb, NULL, 16);
-    size = size << 16;
-
-    size_location = OFFSET_KERNEL_ROM_LOCATION_LSB;
-    acl_kernel_rom_cra_read_32b(kern, size_location,
-                                (unsigned int *)description_size_lsb);
-    description_size_lsb[KERNEL_ROM_SIZE_BYTES_READ] = '\0';
-    size += (unsigned int)strtol(description_size_lsb, NULL, 16);
-
     // Find beginning address of ROM
-    rom_size = 1 << ((unsigned)log2(size + KERNEL_ROM_SIZE_BYTES) + 1);
+    rom_size = 1 << ((unsigned)log2((double)config_str_len + KERNEL_ROM_SIZE_BYTES) + 1);
     rom_address = OFFSET_KERNEL_MAX_ADDRESS - rom_size + 1;
     config_str[0] = '\0';
     result = acl_kernel_rom_cra_read_block(kern, rom_address, config_str,
-                                           (size_t)size);
+                                           (size_t)config_str_len);
 
     if (result < 0)
       return -1;
     // Pad autodiscovery with NULL
-    *(config_str + (unsigned int)size) = '\0';
+    *(config_str + (unsigned int)config_str_len) = '\0';
     // Read is verified above
     // Set rom_size and r equal to support old flow and big-endian shuffle
-    rom_size = size;
+    rom_size = (unsigned int)config_str_len;
     r = rom_size;
   } else if (version == KERNEL_VERSION_ID) {
-    rom_size = CONFIGURATION_ROM_BYTES;
+    rom_size = (unsigned int)config_str_len;
     r = kern->io.read(&kern->io, (dev_addr_t)OFFSET_CONFIGURATION_ROM,
-                      config_str, (size_t)CONFIGURATION_ROM_BYTES);
+                      config_str, config_str_len);
   } else {
     kern->io.printf("  HAL Kern: Version ID incorrect\n");
     return -1;
@@ -690,16 +672,16 @@ int acl_kernel_if_init(acl_kernel_if *kern, acl_bsp_io bsp_io,
                                     description_size_msb, description_size_lsb,
                                     size);
 
-    config_str_len = size + 1;
+    config_str_len = size;
   } else if (version == KERNEL_VERSION_ID) {
-    config_str_len = CONFIGURATION_ROM_BYTES + 1;
+    config_str_len = CONFIGURATION_ROM_BYTES;
   } else {
     kern->io.printf("  HAL Kern: Version ID incorrect\n");
     return -1;
   }
 
-  std::vector<char> config_str(config_str_len);
-  result |= get_auto_discovery_string(kern, config_str.data());
+  std::vector<char> config_str(config_str_len+1); // +1 for null byte padding
+  result |= get_auto_discovery_string(kern, config_str.data(), config_str_len);
   std::string config_string{config_str.data()};
 
   if (result != 0) {