diff options
Diffstat (limited to 'src/import/chips')
-rw-r--r-- | src/import/chips/p9/utils/imageProcs/p9_tor.C | 227 | ||||
-rw-r--r-- | src/import/chips/p9/utils/imageProcs/p9_tor.H | 4 |
2 files changed, 114 insertions, 117 deletions
diff --git a/src/import/chips/p9/utils/imageProcs/p9_tor.C b/src/import/chips/p9/utils/imageProcs/p9_tor.C index 4e9353de..8070d961 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_tor.C +++ b/src/import/chips/p9/utils/imageProcs/p9_tor.C @@ -39,6 +39,7 @@ // #include "p9_tor.H" #include "p9_xip_image.h" +#include <fapi2.H> namespace P9_TOR { @@ -209,12 +210,12 @@ int get_ring_from_sbe_image ( void* i_ringSectionPtr, // Image pointer break; default : - printf("Not valid selection\n"); + MY_INF("Not valid selection\n"); } if(dbgl > 1) { - printf(" No of CommonRing %d, No of InstanceRing %d, No of Variants %d \n", + MY_INF(" No of CommonRing %d, No of InstanceRing %d, No of Variants %d \n", l_cpltData.iv_num_common_rings, l_cpltData.iv_num_instance_rings, iv_num_variant); } @@ -227,7 +228,7 @@ int get_ring_from_sbe_image ( void* i_ringSectionPtr, // Image pointer { if(dbgl > 2) { - printf(" Ring name %s Cplt Common ring id %d Variant id %d", + MY_INF(" Ring name %s Cplt Common ring id %d Variant id %d", (ring_id_list_common + i)->ringNameImg, i, j); } @@ -258,14 +259,14 @@ int get_ring_from_sbe_image ( void* i_ringSectionPtr, // Image pointer { if (io_ringBlockSize < ringSize) { - printf("\tio_ringBlockSize is less than required size ...\n"); + MY_INF("\tio_ringBlockSize is less than required size ...\n"); io_ringBlockSize = ringSize; return 0; } if(dbgl > 1) { - printf(" ring container of %s is found in the SBE image container \n", + MY_INF(" ring container of %s is found in the SBE image container \n", o_ringName); } @@ -278,16 +279,16 @@ int get_ring_from_sbe_image ( void* i_ringSectionPtr, // Image pointer if(dbgl > 0) { - printf(" After get_ring_from_sbe_image Size %d \n", io_ringBlockSize); + MY_INF(" After get_ring_from_sbe_image Size %d \n", io_ringBlockSize); } // Debug details for each offset address in DD TOR, DD TOR, SBE TOP TOR, SBE common/instance TOR, ring size if(dbgl > 1) { - printf("Hexdetalis Chiplet offset 0x%08x local offset 0x%08x " \ + MY_INF("Hexdetalis Chiplet offset 0x%08x local offset 0x%08x " \ "ring offset 0x%08x start adr 0x%08x size 0x%08x size 0x%08x \n", var, temp, ring_offset, chiplet_offset, next_ring_offset, ringSize); - printf("Chiplet %d ChipletRing TOR offset %d %d %d Size %d %d \t\n", + MY_INF("Chiplet %d ChipletRing TOR offset %d %d %d Size %d %d \t\n", i, ring_offset, chiplet_offset, next_ring_offset, ringSize, temp); } @@ -297,17 +298,17 @@ int get_ring_from_sbe_image ( void* i_ringSectionPtr, // Image pointer for (uint32_t m = 0; m < ringSize / 4; m++) { - printf("compressed data %d --- %08x \t", m, htobe32(deltaRingRS4_4B[m])); + MY_INF("compressed data %d --- %08x \t", m, htobe32(deltaRingRS4_4B[m])); } - printf("\n"); + MY_INF("\n"); } return IMGBUILD_TGR_RING_FOUND; } else { - printf(" ring container of %s is not found in the SBE image container \n", + MY_INF(" ring container of %s is not found in the SBE image container \n", o_ringName); return IMGBUILD_TGR_RING_NOT_FOUND; } @@ -329,7 +330,7 @@ int get_ring_from_sbe_image ( void* i_ringSectionPtr, // Image pointer { if(dbgl > 2) { - printf(" Ring name %s Cplt instance ring id %d Variant id %d Instance id %d\n", + MY_INF(" Ring name %s Cplt instance ring id %d Variant id %d Instance id %d\n", (ring_id_list_instance + j)->ringNameImg, j, k, i); } @@ -364,14 +365,14 @@ int get_ring_from_sbe_image ( void* i_ringSectionPtr, // Image pointer { if (io_ringBlockSize < ringSize) { - printf("\tio_ringBlockSize is less than required size ...\n"); + MY_INF("\tio_ringBlockSize is less than required size ...\n"); io_ringBlockSize = ringSize; return 0; } if(dbgl > 0) { - printf(" ring container of %s is found in the SBE image container \n", + MY_INF(" ring container of %s is found in the SBE image container \n", o_ringName); } @@ -381,15 +382,15 @@ int get_ring_from_sbe_image ( void* i_ringSectionPtr, // Image pointer if(dbgl > 0) { - printf(" After get_ring_from_sbe_image Size %d \n", io_ringBlockSize); + MY_INF(" After get_ring_from_sbe_image Size %d \n", io_ringBlockSize); } // Debug details for each offset address in DD TOR, DD TOR, SBE TOP TOR, SBE common/instance TOR, ring size if(dbgl > 1) { - printf(" 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x \n", + MY_INF(" 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x \n", var, temp, ring_offset, chiplet_offset, next_ring_offset, ringSize); - printf("Chiplet %d ChipletRing TOR offset %d %d %d Size %d %d \t\n", + MY_INF("Chiplet %d ChipletRing TOR offset %d %d %d Size %d %d \t\n", i, ring_offset, chiplet_offset, next_ring_offset, ringSize, temp); } @@ -399,18 +400,18 @@ int get_ring_from_sbe_image ( void* i_ringSectionPtr, // Image pointer for (uint32_t m = 0; m < ringSize / 4; m++) { - printf("compressed data %d --- %08x \t", + MY_INF("compressed data %d --- %08x \t", m, htobe32(deltaRingRS4_4B[m])); } - printf("\n"); + MY_INF("\n"); } return IMGBUILD_TGR_RING_FOUND; } else { - printf(" ring container of %s is not found in the SBE image container \n", + MY_INF(" ring container of %s is not found in the SBE image container \n", o_ringName); return IMGBUILD_TGR_RING_NOT_FOUND; } @@ -420,7 +421,7 @@ int get_ring_from_sbe_image ( void* i_ringSectionPtr, // Image pointer } else { - printf(" SBE ring instance ID %d is invalid, Valid ID is from %d to %d \n", + MY_INF(" SBE ring instance ID %d is invalid, Valid ID is from %d to %d \n", io_instanceId, (ring_id_list_instance + 0)->instanceIdMin, (ring_id_list_instance + 0)->instanceIdMax); return IMGBUILD_INVALID_INSTANCEID; @@ -430,7 +431,7 @@ int get_ring_from_sbe_image ( void* i_ringSectionPtr, // Image pointer local++; } - //printf("\n"); + //MY_INF("\n"); } } @@ -480,7 +481,7 @@ int get_ring_from_sgpe_image ( void* { if(dbgl > 2) { - printf(" Ring name %s Cplt Common ring id %d Variant id %d", + MY_INF(" Ring name %s Cplt Common ring id %d Variant id %d", (ring_id_list_common + i)->ringNameImg, i, j); } @@ -510,14 +511,14 @@ int get_ring_from_sgpe_image ( void* { if (io_ringBlockSize < ringSize) { - printf("\tio_ringBlockSize is less than required size ...\n"); + MY_INF("\tio_ringBlockSize is less than required size ...\n"); io_ringBlockSize = ringSize; return 0; } if(dbgl > 0) { - printf(" ring container of %s is found in the SGPE image container && ring offset %d \n", + MY_INF(" ring container of %s is found in the SGPE image container && ring offset %d \n", o_ringName, chiplet_offset); } @@ -530,15 +531,15 @@ int get_ring_from_sgpe_image ( void* // Debug details for each offset address in DD TOR, DD TOR, SBE TOP TOR, SBE common/instance TOR, ring size if(dbgl > 0) { - printf(" After get_ring_from_sbe_image Size %d \n", io_ringBlockSize); + MY_INF(" After get_ring_from_sbe_image Size %d \n", io_ringBlockSize); } if(dbgl > 1) { - printf("Hexdetalis Chiplet offset 0x%08x local offset 0x%08x " \ + MY_INF("Hexdetalis Chiplet offset 0x%08x local offset 0x%08x " \ "ring offset 0x%08x start adr 0x%08x size 0x%08x size 0x%08x \n", var, temp, ring_offset, chiplet_offset, next_ring_offset, ringSize); - printf("Chiplet %d ChipletRing TOR offset %d %d %d Size %d %d \t\n", + MY_INF("Chiplet %d ChipletRing TOR offset %d %d %d Size %d %d \t\n", i, ring_offset, chiplet_offset, next_ring_offset, ringSize, temp); } @@ -548,17 +549,17 @@ int get_ring_from_sgpe_image ( void* for (uint32_t m = 0; m < ringSize / 4; m++) { - printf("compressed data %d --- %08x \t", m, htobe32(deltaRingRS4_4B[m])); + MY_INF("compressed data %d --- %08x \t", m, htobe32(deltaRingRS4_4B[m])); } - printf("\n"); + MY_INF("\n"); } return IMGBUILD_TGR_RING_FOUND; } else { - printf(" ring container of %s is not found in the SGPE image container \n", + MY_INF(" ring container of %s is not found in the SGPE image container \n", o_ringName); return IMGBUILD_TGR_RING_NOT_FOUND; } @@ -568,7 +569,7 @@ int get_ring_from_sgpe_image ( void* local++; } - //printf ("\n"); + //MY_INF ("\n"); } // Instance specific single ring extract loop @@ -583,7 +584,7 @@ int get_ring_from_sgpe_image ( void* { if(dbgl > 2) { - printf(" Ring name %s Cplt instance ring id %d Variant id %d", + MY_INF(" Ring name %s Cplt instance ring id %d Variant id %d", (ring_id_list_instance + j)->ringNameImg, j, k); } @@ -618,14 +619,14 @@ int get_ring_from_sgpe_image ( void* { if (io_ringBlockSize < ringSize) { - printf("\tio_ringBlockSize is less than required size ...\n"); + MY_INF("\tio_ringBlockSize is less than required size ...\n"); io_ringBlockSize = ringSize; return 0; } if(dbgl > 0) { - printf(" ring container of %s is found in the SGPE image container \n", + MY_INF(" ring container of %s is found in the SGPE image container \n", o_ringName); } @@ -636,15 +637,15 @@ int get_ring_from_sgpe_image ( void* if(dbgl > 0) { - printf(" After get_ring_from_sbe_image Size %d \n", io_ringBlockSize); + MY_INF(" After get_ring_from_sbe_image Size %d \n", io_ringBlockSize); } // Debug details for each offset address in DD TOR, DD TOR, SBE TOP TOR, SBE common/instance TOR, ring size if(dbgl > 1) { - printf(" 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x \n", + MY_INF(" 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x \n", var, temp, ring_offset, chiplet_offset, next_ring_offset, ringSize); - printf("Chiplet %d ChipletRing TOR offset %d %d %d Size %d %d \t\n", + MY_INF("Chiplet %d ChipletRing TOR offset %d %d %d Size %d %d \t\n", i, ring_offset, chiplet_offset, next_ring_offset, ringSize, temp); } @@ -654,17 +655,17 @@ int get_ring_from_sgpe_image ( void* for (uint32_t m = 0; m < ringSize / 4; m++) { - printf("compressed data %d --- %08x \t", m, htobe32(deltaRingRS4_4B[m])); + MY_INF("compressed data %d --- %08x \t", m, htobe32(deltaRingRS4_4B[m])); } - printf("\n"); + MY_INF("\n"); } return IMGBUILD_TGR_RING_FOUND; } else { - printf(" ring container of %s is not found in the SGPE image container \n", + MY_INF(" ring container of %s is not found in the SGPE image container \n", o_ringName); return IMGBUILD_TGR_RING_NOT_FOUND; } @@ -673,7 +674,7 @@ int get_ring_from_sgpe_image ( void* } else { - printf(" SGPE ring instance ID %d is invalid, Valid ID is from %d to %d \n", + MY_INF(" SGPE ring instance ID %d is invalid, Valid ID is from %d to %d \n", io_instanceId, (ring_id_list_instance + 0)->instanceIdMin, (ring_id_list_instance + 0)->instanceIdMax); return IMGBUILD_INVALID_INSTANCEID; @@ -722,7 +723,7 @@ int get_ring_from_cme_image ( void* uint8_t iv_num_variant = (uint8_t)sizeof(EC::RingVariants) / sizeof(uint16_t); ring_id_list_common = (GenRingIdList*) EC::RING_ID_LIST_COMMON; ring_id_list_instance = (GenRingIdList*) EC::RING_ID_LIST_INSTANCE; - //printf(" C %d I %d V %d \n",l_cpltData.iv_num_common_rings,l_cpltData.iv_num_instance_rings,iv_num_variant); + //MY_INF(" C %d I %d V %d \n",l_cpltData.iv_num_common_rings,l_cpltData.iv_num_instance_rings,iv_num_variant); uint32_t local = 0; for (uint8_t i = 0; i < EC::g_ecData.iv_num_common_rings ; i++) @@ -731,7 +732,7 @@ int get_ring_from_cme_image ( void* { if(dbgl > 2) { - printf(" Ring name %s Cplt Common ring id %d Variant id %d", + MY_INF(" Ring name %s Cplt Common ring id %d Variant id %d", (ring_id_list_common + i)->ringNameImg, i, j); } @@ -761,14 +762,14 @@ int get_ring_from_cme_image ( void* { if (io_ringBlockSize < ringSize) { - printf("\tio_ringBlockSize is less than required size ...\n"); + MY_INF("\tio_ringBlockSize is less than required size ...\n"); io_ringBlockSize = ringSize; return 0; } if(dbgl > 0) { - printf(" ring container of %s is found in the CME image container \n", + MY_INF(" ring container of %s is found in the CME image container \n", o_ringName); } @@ -781,15 +782,15 @@ int get_ring_from_cme_image ( void* // Debug details for each offset address in DD TOR, DD TOR, SBE TOP TOR, SBE common/instance TOR, ring size if(dbgl > 0) { - printf(" After get_ring_from_sbe_image Size %d \n", io_ringBlockSize); + MY_INF(" After get_ring_from_sbe_image Size %d \n", io_ringBlockSize); } if(dbgl > 1) { - printf("Hexdetalis Chiplet offset 0x%08x local offset 0x%08x " \ + MY_INF("Hexdetalis Chiplet offset 0x%08x local offset 0x%08x " \ "ring offset 0x%08x start adr 0x%08x size 0x%08x size 0x%08x \n", var, temp, ring_offset, chiplet_offset, next_ring_offset, ringSize); - printf("Chiplet %d ChipletRing TOR offset %d %d %d Size %d %d \t\n", + MY_INF("Chiplet %d ChipletRing TOR offset %d %d %d Size %d %d \t\n", i, ring_offset, chiplet_offset, next_ring_offset, ringSize, temp); } @@ -799,17 +800,17 @@ int get_ring_from_cme_image ( void* for (uint32_t m = 0; m < ringSize / 4; m++) { - printf("compressed data %d --- %08x \t", m, htobe32(deltaRingRS4_4B[m])); + MY_INF("compressed data %d --- %08x \t", m, htobe32(deltaRingRS4_4B[m])); } - printf("\n"); + MY_INF("\n"); } return IMGBUILD_TGR_RING_FOUND; } else { - printf(" ring container of %s is not found in the CME image container \n", + MY_INF(" ring container of %s is not found in the CME image container \n", o_ringName); return IMGBUILD_TGR_RING_NOT_FOUND; } @@ -836,7 +837,7 @@ int get_ring_from_cme_image ( void* { if(dbgl > 2) { - printf(" Ring name %s Cplt instance ring id %d Variant id %d", + MY_INF(" Ring name %s Cplt instance ring id %d Variant id %d", (ring_id_list_instance + j)->ringNameImg, j, k); } @@ -871,16 +872,16 @@ int get_ring_from_cme_image ( void* { if (io_ringBlockSize < ringSize) { - printf("\tio_ringBlockSize is less than required size ...\n"); + MY_INF("\tio_ringBlockSize is less than required size ...\n"); io_ringBlockSize = ringSize; return 0; } if(dbgl > 0) { - printf(" ring container of %s is found in the CME image container %d %d \n", + MY_INF(" ring container of %s is found in the CME image container %d %d \n", o_ringName, chiplet_offset, ringSize); - printf(" 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x \n", + MY_INF(" 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x \n", var, temp, ring_offset, chiplet_offset, next_ring_offset, ringSize); } @@ -892,14 +893,14 @@ int get_ring_from_cme_image ( void* // Debug details for each offset address in DD TOR, DD TOR, SBE TOP TOR, SBE common/instance TOR, ring size if(dbgl > 0) { - printf(" After get_ring_from_sbe_image Size %d \n", io_ringBlockSize); + MY_INF(" After get_ring_from_sbe_image Size %d \n", io_ringBlockSize); } if(dbgl > 1) { - printf(" 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x \n", + MY_INF(" 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x \n", var, temp, ring_offset, chiplet_offset, next_ring_offset, ringSize); - printf("Chiplet %d ChipletRing TOR offset %d %d %d Size %d %d \t\n", + MY_INF("Chiplet %d ChipletRing TOR offset %d %d %d Size %d %d \t\n", i, ring_offset, chiplet_offset, next_ring_offset, ringSize, temp); } @@ -909,17 +910,17 @@ int get_ring_from_cme_image ( void* for (uint32_t m = 0; m < ringSize / 4; m++) { - printf("compressed data %d --- %08x \t", m, htobe32(deltaRingRS4_4B[m])); + MY_INF("compressed data %d --- %08x \t", m, htobe32(deltaRingRS4_4B[m])); } - printf("\n"); + MY_INF("\n"); } return IMGBUILD_TGR_RING_FOUND; } else { - printf(" ring container of %s is not found in the CME image container \n", + MY_INF(" ring container of %s is not found in the CME image container \n", o_ringName); return IMGBUILD_TGR_RING_NOT_FOUND; } @@ -928,7 +929,7 @@ int get_ring_from_cme_image ( void* } else { - printf(" CME ring instance ID %d is invalid, Valid ID is from %d to %d \n", + MY_INF(" CME ring instance ID %d is invalid, Valid ID is from %d to %d \n", io_instanceId, (ring_id_list_instance + 0)->instanceIdMin, (ring_id_list_instance + 0)->instanceIdMax); return IMGBUILD_INVALID_INSTANCEID; @@ -969,7 +970,7 @@ int tor_get_ring( void* if(dbgl > 1) { - printf( "TOR_GET_RING(1): function call \n"); + MY_INF( "TOR_GET_RING(1): function call \n"); } uint32_t ddLevelOffset = 0; @@ -978,7 +979,7 @@ int tor_get_ring( void* if(dbgl > 1) { - printf( "TOR_GET_RING(2):DD Level info extracting from TOR \n"); + MY_INF( "TOR_GET_RING(2):DD Level info extracting from TOR \n"); } if (i_magic == P9_XIP_MAGIC_HW) @@ -988,7 +989,7 @@ int tor_get_ring( void* if(dbgl > 1) { - printf("TOR_GET_RING(3): No of DD levels in the TOR is %d \n", ddLevelCount); + MY_INF("TOR_GET_RING(3): No of DD levels in the TOR is %d \n", ddLevelCount); } for (uint8_t i = 0; i < ddLevelCount; i++) @@ -1000,7 +1001,7 @@ int tor_get_ring( void* if(dbgl > 1) { - printf( "TOR_GET_RING(4): DD level offset %d DD %d level Copy \n", + MY_INF( "TOR_GET_RING(4): DD level offset %d DD %d level Copy \n", ddLevelOffset, temp ); } @@ -1021,25 +1022,25 @@ int tor_get_ring( void* { if ( i_PpeType == CME) { - printf("Ambiguity on input PARMS for calling SEEPROM Ring copy API. \n "\ + MY_INF("Ambiguity on input PARMS for calling SEEPROM Ring copy API. \n "\ " CME rings not populated on SEEPROM image \n"); return IMGBUILD_TGR_IMAGE_DOES_NOT_SUPPORT_CME; } else if (i_PpeType == SGPE) { - printf("Ambiguity on input PARMS for calling SEEPROM Ring copy API. \n "\ + MY_INF("Ambiguity on input PARMS for calling SEEPROM Ring copy API. \n "\ "SGPE rings not populated on SEEPROM image \n"); return IMGBUILD_TGR_IMAGE_DOES_NOT_SUPPORT_SGPE; } else if (i_RingBlockType == DD_LEVEL_RINGS) { - printf("Ambiguity on input PARMS for calling SEEPROM Ring copy API. \n "\ + MY_INF("Ambiguity on input PARMS for calling SEEPROM Ring copy API. \n "\ " DD level ring copy are not supported \n"); return IMGBUILD_TGR_IMAGE_DOES_NOT_SUPPORT_DD_LEVEL; } else if (i_RingBlockType == PPE_LEVEL_RINGS ) { - printf("Ambiguity on input PARMS for calling SEEPROM Ring copy API. \n "\ + MY_INF("Ambiguity on input PARMS for calling SEEPROM Ring copy API. \n "\ " PPE level ring copy are not supported \n"); return IMGBUILD_TGR_IMAGE_DOES_NOT_SUPPORT_PPE_LEVEL; } @@ -1055,7 +1056,7 @@ int tor_get_ring( void* if (io_ringBlockSize < temp1) { - printf("\tio_ringBlockSize is less than required size ...\n"); + MY_INF("\tio_ringBlockSize is less than required size ...\n"); io_ringBlockSize = temp1; return 0; } @@ -1065,7 +1066,7 @@ int tor_get_ring( void* if(dbgl > 1) { - printf( " TOR_GET_RING(5): DD level offset %d DD %d size 0x%08x %d \n", + MY_INF( " TOR_GET_RING(5): DD level offset %d DD %d size 0x%08x %d \n", ddLevelOffset, temp, temp1, temp1); } @@ -1084,7 +1085,7 @@ int tor_get_ring( void* if(dbgl > 1) { - printf( "TOR_GET_RING(6): SBE PPE_LEVEL_RING COPY called ... \n"); + MY_INF( "TOR_GET_RING(6): SBE PPE_LEVEL_RING COPY called ... \n"); } l_ppe_offset = *((uint32_t*)i_ringSectionPtr + temp); @@ -1098,7 +1099,7 @@ int tor_get_ring( void* if(dbgl > 1) { - printf( "TOR_GET_RING(7): CME PPE_LEVEL_RING COPY called... \n"); + MY_INF( "TOR_GET_RING(7): CME PPE_LEVEL_RING COPY called... \n"); } l_ppe_offset = *((uint32_t*)i_ringSectionPtr + temp); @@ -1113,7 +1114,7 @@ int tor_get_ring( void* if(dbgl > 1) { - printf( "TOR_GET_RING(8): SPGE PPE_LEVEL_RING COPY called... \n"); + MY_INF( "TOR_GET_RING(8): SPGE PPE_LEVEL_RING COPY called... \n"); } l_ppe_offset = *((uint32_t*)i_ringSectionPtr + temp); @@ -1124,7 +1125,7 @@ int tor_get_ring( void* if (io_ringBlockSize < l_ppe_size) { - printf("\tio_ringBlockSize is less than required size ....\n"); + MY_INF("\tio_ringBlockSize is less than required size ....\n"); io_ringBlockSize = l_ppe_size; return 0; } @@ -1139,12 +1140,12 @@ int tor_get_ring( void* { if(dbgl > 1) { - printf( "TOR_GET_RING(9): CPLT_LEVEL_RING COPY called... \n"); + MY_INF( "TOR_GET_RING(9): CPLT_LEVEL_RING COPY called... \n"); } if(io_RingType == ALLRING) { - printf("Ambiguity on input PARMS. ALLRING RingType is invalid for CPLT level ring copy \n"); + MY_INF("Ambiguity on input PARMS. ALLRING RingType is invalid for CPLT level ring copy \n"); return IMGBUILD_TGR_AMBIGUOUS_API_PARMS; } @@ -1240,7 +1241,7 @@ int tor_get_ring( void* break; default : - printf("Not valid chiplet ID\n"); + MY_INF("Not valid chiplet ID\n"); } temp = (ddLevelOffset >> 2); @@ -1257,7 +1258,7 @@ int tor_get_ring( void* if(dbgl > 1) { - printf("SBE(1):Offset 0x%08x \n", l_cplt_offset); + MY_INF("SBE(1):Offset 0x%08x \n", l_cplt_offset); } l_cplt_offset = htobe32(l_cplt_offset); @@ -1269,7 +1270,7 @@ int tor_get_ring( void* if(dbgl > 1) { - printf("SBE(2):Offset 0x%08x 0x%08x 0x%08x 0x%08x\n", l_cplt_offset, + MY_INF("SBE(2):Offset 0x%08x 0x%08x 0x%08x 0x%08x\n", l_cplt_offset, l_ppe_offset, temp, ddLevelOffset); } @@ -1281,7 +1282,7 @@ int tor_get_ring( void* if(dbgl > 1) { - printf("SBE(3):COMMON Offset 0x%08x 0x%08x 0x%08x \n", l_cplt_offset, + MY_INF("SBE(3):COMMON Offset 0x%08x 0x%08x 0x%08x \n", l_cplt_offset, l_ppe_offset, temp); } } @@ -1293,7 +1294,7 @@ int tor_get_ring( void* if(dbgl > 1) { - printf("SBE(4):INSTANCE Offset 0x%08x 0x%08x 0x%08x \n", l_cplt_offset, + MY_INF("SBE(4):INSTANCE Offset 0x%08x 0x%08x 0x%08x \n", l_cplt_offset, l_ppe_offset, temp); } } @@ -1304,7 +1305,7 @@ int tor_get_ring( void* if(dbgl > 1) { - printf("SBE(5):Offset 0x%08x size 0x%08x \n", l_cplt_offset, l_ppe_offset); + MY_INF("SBE(5):Offset 0x%08x size 0x%08x \n", l_cplt_offset, l_ppe_offset); } l_cplt_size = *((uint32_t*)i_ringSectionPtr + l_word ); @@ -1330,7 +1331,7 @@ int tor_get_ring( void* if(dbgl > 1) { - printf("SBE(6): Ring pointer Offset 0x%08x size 0x%08x \n", l_cplt_offset, + MY_INF("SBE(6): Ring pointer Offset 0x%08x size 0x%08x \n", l_cplt_offset, l_cplt_size); } } @@ -1401,7 +1402,7 @@ int tor_get_ring( void* break; default : - printf("Not valid chiplet ID\n"); + MY_INF("Not valid chiplet ID\n"); } temp = (ddLevelOffset >> 2) + 2; @@ -1410,7 +1411,7 @@ int tor_get_ring( void* if(dbgl > 1) { - printf("CME(1):ppe type Offset 0x%08x \n", l_cplt_offset); + MY_INF("CME(1):ppe type Offset 0x%08x \n", l_cplt_offset); } l_cplt_offset = htobe32(l_cplt_offset); @@ -1422,7 +1423,7 @@ int tor_get_ring( void* if(dbgl > 1) { - printf("CME(2): Offsets 0x%08x 0x%08x 0x%08x \n", l_cplt_offset, l_ppe_offset, + MY_INF("CME(2): Offsets 0x%08x 0x%08x 0x%08x \n", l_cplt_offset, l_ppe_offset, temp); } @@ -1434,7 +1435,7 @@ int tor_get_ring( void* if(dbgl > 1) { - printf("CME(3):COMMON Offsets 0x%08x 0x%08x 0x%08x \n", l_cplt_offset, + MY_INF("CME(3):COMMON Offsets 0x%08x 0x%08x 0x%08x \n", l_cplt_offset, l_ppe_offset, temp); } } @@ -1446,7 +1447,7 @@ int tor_get_ring( void* if(dbgl > 1) { - printf("CME(4):INSTANCE Offset 0x%08x 0x%08x 0x%08x 0x%08x \n", l_cplt_offset, + MY_INF("CME(4):INSTANCE Offset 0x%08x 0x%08x 0x%08x 0x%08x \n", l_cplt_offset, l_ppe_offset, l_ppe_cplt_offset, temp); } } @@ -1457,7 +1458,7 @@ int tor_get_ring( void* if(dbgl > 1) { - printf("CME(5):Offset 0x%08x size 0x%08x \n", l_cplt_offset, l_ppe_offset); + MY_INF("CME(5):Offset 0x%08x size 0x%08x \n", l_cplt_offset, l_ppe_offset); } l_cplt_size = *((uint32_t*)i_ringSectionPtr + l_word ); @@ -1476,7 +1477,7 @@ int tor_get_ring( void* if(dbgl > 1) { - printf("CME(6): Ring pointer Offset 0x%08x size 0x%08x \n", l_cplt_offset, + MY_INF("CME(6): Ring pointer Offset 0x%08x size 0x%08x \n", l_cplt_offset, l_cplt_size); } } @@ -1489,7 +1490,7 @@ int tor_get_ring( void* if(dbgl > 1) { - printf("SGPE(1):Offset 0x%08x \n", l_cplt_offset); + MY_INF("SGPE(1):Offset 0x%08x \n", l_cplt_offset); } l_cplt_offset = htobe32(l_cplt_offset); @@ -1501,7 +1502,7 @@ int tor_get_ring( void* if(dbgl > 1) { - printf("SGPE(2):Offset 0x%08x 0x%08x 0x%08x \n", l_cplt_offset, l_ppe_offset, + MY_INF("SGPE(2):Offset 0x%08x 0x%08x 0x%08x \n", l_cplt_offset, l_ppe_offset, temp); } @@ -1513,7 +1514,7 @@ int tor_get_ring( void* if(dbgl > 1) { - printf("SGPE(3):COMMON Offset 0x%08x 0x%08x 0x%08x \n", l_cplt_offset, + MY_INF("SGPE(3):COMMON Offset 0x%08x 0x%08x 0x%08x \n", l_cplt_offset, l_ppe_offset, temp); } } @@ -1525,7 +1526,7 @@ int tor_get_ring( void* if(dbgl > 1) { - printf("SGPE(4):INSTANCE Offset 0x%08x 0x%08x 0x%08x \n", l_cplt_offset, + MY_INF("SGPE(4):INSTANCE Offset 0x%08x 0x%08x 0x%08x \n", l_cplt_offset, l_ppe_offset, temp); } } @@ -1549,14 +1550,14 @@ int tor_get_ring( void* if(dbgl > 1) { - printf("SGPE(5): Ring pointer Offset 0x%08x size 0x%08x \n", l_cplt_offset, + MY_INF("SGPE(5): Ring pointer Offset 0x%08x size 0x%08x \n", l_cplt_offset, l_cplt_size); } } if (io_ringBlockSize < l_cplt_size) { - printf("\tio_ringBlockSize is less than required size ...\n"); + MY_INF("\tio_ringBlockSize is less than required size ...\n"); io_ringBlockSize = l_cplt_size; return 0; } @@ -1587,20 +1588,20 @@ int tor_get_ring( void* if (rc == IMGBUILD_TGR_RING_NOT_FOUND) { - printf("\t After SBE single ring call, %s ring container is not found \n", + MY_INF("\t After SBE single ring call, %s ring container is not found \n", RING_PROPERTIES[i_ringId].iv_name); return rc; } else if ( rc == IMGBUILD_INVALID_INSTANCEID) { - printf("\t After SBE single ring call, Instance %d is invalid \n", + MY_INF("\t After SBE single ring call, Instance %d is invalid \n", io_instanceId ); return rc; } if(dbgl > 1) { - printf(" TOR_GET_RING(10): After get_ring_from_sbe_image Size %d \n", + MY_INF(" TOR_GET_RING(10): After get_ring_from_sbe_image Size %d \n", io_ringBlockSize ); } } @@ -1620,20 +1621,20 @@ int tor_get_ring( void* if (rc == IMGBUILD_TGR_RING_NOT_FOUND) { - printf("\t After CME single ring call, %s ring container is not found \n", + MY_INF("\t After CME single ring call, %s ring container is not found \n", RING_PROPERTIES[i_ringId].iv_name); return rc; } else if ( rc == IMGBUILD_INVALID_INSTANCEID) { - printf("\t After CME single ring call, Instance %d is invalid \n", + MY_INF("\t After CME single ring call, Instance %d is invalid \n", io_instanceId ); return rc; } if(dbgl > 1) { - printf(" TOR_GET_RING(11): After get_ring_from_sbe_image Size %d \n", + MY_INF(" TOR_GET_RING(11): After get_ring_from_sbe_image Size %d \n", io_ringBlockSize ); } } @@ -1653,20 +1654,20 @@ int tor_get_ring( void* if (rc == IMGBUILD_TGR_RING_NOT_FOUND) { - printf("\t After SGPE single ring call, %s ring container is not found \n", + MY_INF("\t After SGPE single ring call, %s ring container is not found \n", RING_PROPERTIES[i_ringId].iv_name); return rc; } else if ( rc == IMGBUILD_INVALID_INSTANCEID) { - printf("\t After SGPE single ring call, Instance %d is invalid \n", + MY_INF("\t After SGPE single ring call, Instance %d is invalid \n", io_instanceId ); return rc; } if(dbgl > 1) { - printf("TOR_GET_RING(12): After get_ring_from_sbe_image Size %d \n", + MY_INF("TOR_GET_RING(12): After get_ring_from_sbe_image Size %d \n", io_ringBlockSize ); } } @@ -1703,7 +1704,7 @@ int tor_get_single_ring ( void* if(dbgl > 1) { - printf(" TOR_GET_SINGLE_RING1: function call \n"); + MY_INF(" TOR_GET_SINGLE_RING1: function call \n"); } rc = tor_get_ring( @@ -1722,7 +1723,7 @@ int tor_get_single_ring ( void* if(dbgl > 1) { - printf(" TOR_GET_SINGLE_RING(2): after tor_get_ring function, Size %d \n", + MY_INF(" TOR_GET_SINGLE_RING(2): after tor_get_ring function, Size %d \n", io_ringBlockSize ); } @@ -1747,7 +1748,7 @@ int tor_get_block_of_rings ( void* i_ringSectionPt, if(dbgl > 1) { - printf(" TOR_GET_BLOCK_OF_RINGS(1): function call \n"); + MY_INF(" TOR_GET_BLOCK_OF_RINGS(1): function call \n"); } uint32_t rc = 0; @@ -1806,13 +1807,13 @@ int tor_get_block_of_rings ( void* i_ringSectionPt, } else { - printf("TOR_GET_BLOCK_OF_RINGS(2): Wrong input params. Please check passing params\n"); + MY_INF("TOR_GET_BLOCK_OF_RINGS(2): Wrong input params. Please check passing params\n"); return IMGBUILD_TGR_AMBIGUOUS_API_PARMS; } if(dbgl > 1) { - printf(" TOR_GET_SINGLE_RING(2): after tor_get_ring function, Size %d \n", + MY_INF(" TOR_GET_SINGLE_RING(2): after tor_get_ring function, Size %d \n", io_ringBlockSize ); } diff --git a/src/import/chips/p9/utils/imageProcs/p9_tor.H b/src/import/chips/p9/utils/imageProcs/p9_tor.H index 5c3bde16..efb83fb5 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_tor.H +++ b/src/import/chips/p9/utils/imageProcs/p9_tor.H @@ -83,10 +83,6 @@ typedef struct #define IMGBUILD_TGR_IMAGE_DOES_NOT_SUPPORT_DD_LEVEL 12 #define IMGBUILD_TGR_IMAGE_DOES_NOT_SUPPORT_PPE_LEVEL 13 -#define MY_INF(_fmt_, _args_...) printf(_fmt_, ##_args_) -#define MY_ERR(_fmt_, _args_...) printf(_fmt_, ##_args_) -#define MY_DBG(_fmt_, _args_...) printf(_fmt_, ##_args_) - extern const char* ringVariantName[]; extern const char* ppeTypeName[]; |