Test 102 Print Format and 32-bit Print in test 01

Signed-off-by: Ajayswar S <[email protected]> Change-Id: I9a7fe848b10068f6a30f8b198b2c4d309c96cb86
ajayswar-s · Oct 24, 2024 · 278a009 · 278a009
1 parent e55a6dc
commit 278a009
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/test_pool/pe/operating_system/test_os_c001.c b/test_pool/pe/operating_system/test_os_c001.c
@@ -262,7 +262,12 @@ payload(uint32_t num_pe)
       rd_data_array[i] = return_reg_value(reg_list[i].reg_name, reg_list[i].dependency);
       val_print(ACS_PRINT_INFO, "\n       Primary PE Index: %d, ", my_index);
       val_print(ACS_PRINT_INFO, reg_list[i].reg_desc, 0);
-      val_print(ACS_PRINT_INFO, " : 0x%016llx ", rd_data_array[i]);
+
+      if (reg_list[i].dependency == AA32)
+          val_print(ACS_PRINT_INFO, " : 0x%08llx ", rd_data_array[i]);
+      else
+          val_print(ACS_PRINT_INFO, " : 0x%016llx ", rd_data_array[i]);
+
       val_data_cache_ops_by_va((addr_t)(rd_data_array + i), CLEAN_AND_INVALIDATE);
   }
 
@@ -354,16 +359,28 @@ payload(uint32_t num_pe)
              if (!(pe_buffer->reg_status[reg_index])) {
                  val_print(ACS_PRINT_INFO, "\n        PE Index: %d, ", i);
                  val_print(ACS_PRINT_INFO, reg_list[reg_index].reg_desc, 0);
-                 val_print(ACS_PRINT_INFO, "  : 0x%016llx", pe_buffer->reg_data[reg_index]);
+                 if (reg_list[reg_index].dependency == AA32)
+                     val_print(ACS_PRINT_INFO, "  : 0x%08llx", pe_buffer->reg_data[reg_index]);
+                 else
+                     val_print(ACS_PRINT_INFO, "  : 0x%016llx", pe_buffer->reg_data[reg_index]);
              } else  {
                  val_print(ACS_PRINT_ERR, "\n        PE Index: %d, ", i);
                  val_print(ACS_PRINT_ERR, reg_list[reg_index].reg_desc, 0);
-                 val_print(ACS_PRINT_ERR, "   : 0x%016llx    FAIL\n",
+                 if (reg_list[reg_index].dependency == AA32) {
+                     val_print(ACS_PRINT_ERR, "   : 0x%08llx    FAIL\n",
+                                                        pe_buffer->reg_data[reg_index]);
+                     val_print(ACS_PRINT_ERR, "          Masked Primary PE Value : 0x%08llx \n",
+                                              rd_data_array[reg_index] & (~reg_list[i].reg_mask));
+                     val_print(ACS_PRINT_ERR, "          Masked Current PE Value : 0x%08llx ",
+                                         pe_buffer->reg_data[reg_index] & (~reg_list[i].reg_mask));
+                 } else {
+                     val_print(ACS_PRINT_ERR, "   : 0x%016llx    FAIL\n",
                                                         pe_buffer->reg_data[reg_index]);
-                 val_print(ACS_PRINT_ERR, "          Masked Primary PE Value : 0x%016llx \n",
+                     val_print(ACS_PRINT_ERR, "          Masked Primary PE Value : 0x%016llx \n",
                                               rd_data_array[reg_index] & (~reg_list[i].reg_mask));
-                 val_print(ACS_PRINT_ERR, "          Masked Current PE Value : 0x%016llx ",
+                     val_print(ACS_PRINT_ERR, "          Masked Current PE Value : 0x%016llx ",
                                          pe_buffer->reg_data[reg_index] & (~reg_list[i].reg_mask));
+                   }
                  reg_fail = reg_fail + 1;
              }
           }

diff --git a/val/bsa/src/bsa_acs_memory.c b/val/bsa/src/bsa_acs_memory.c
@@ -62,8 +62,8 @@ val_memory_get_addr(MEMORY_INFO_e mem_type, uint32_t instance, uint64_t *attr)
       return g_memory_info_table->info[i].phy_addr;
   }
 
-  val_print(ACS_PRINT_INFO, "Instance 0x%x not found ", instance);
-  val_print(ACS_PRINT_INFO, "for memory type 0x%x\n", mem_type);
+  val_print(ACS_PRINT_INFO, "\n       Instance 0x%x not found ", instance);
+  val_print(ACS_PRINT_INFO, "for memory type 0x%x", mem_type);
   return 0;
 }