Commit 09d70ded authored by David E. Box's avatar David E. Box Committed by Hans de Goede

tools/arch/x86/intel_sdsi: Fix meter_certificate decoding

Fix errors in the calculation of the start position of the counters and in
the display loop. While here, use a #define for the bundle count and size.

Fixes: 7fdc03a7 ("tools/arch/x86: intel_sdsi: Add support for reading meter certificates")
Signed-off-by: default avatarDavid E. Box <david.e.box@linux.intel.com>
Reviewed-by: default avatarKuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20240411025856.2782476-8-david.e.box@linux.intel.comSigned-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent 76f2bc17
...@@ -394,7 +394,7 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s) ...@@ -394,7 +394,7 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s)
printf("MMRC encoding: %.4s\n", name); printf("MMRC encoding: %.4s\n", name);
printf("MMRC counter: %d\n", mc->mmrc_counter); printf("MMRC counter: %d\n", mc->mmrc_counter);
if (mc->bundle_length % 8) { if (mc->bundle_length % METER_BUNDLE_SIZE) {
fprintf(stderr, "Invalid bundle length\n"); fprintf(stderr, "Invalid bundle length\n");
return -1; return -1;
} }
...@@ -405,15 +405,16 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s) ...@@ -405,15 +405,16 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s)
return -1; return -1;
} }
bec = (void *)(mc) + sizeof(mc); bec = (struct bundle_encoding_counter *)(mc + 1);
printf("Number of Feature Counters: %ld\n", BUNDLE_COUNT(mc->bundle_length)); printf("Number of Feature Counters: %ld\n", BUNDLE_COUNT(mc->bundle_length));
while (count++ < mc->bundle_length / 8) { while (count < BUNDLE_COUNT(mc->bundle_length)) {
char feature[5]; char feature[5];
feature[4] = '\0'; feature[4] = '\0';
get_feature(bec[count].encoding, feature); get_feature(bec[count].encoding, feature);
printf(" %s: %d\n", feature, bec[count].counter); printf(" %s: %d\n", feature, bec[count].counter);
++count;
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment