UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

tools/arch/x86/intel_sdsi: Fix meter_show display 

[ Upstream commit 76f2bc17428c890754d11aa6aea14b332ba130c5 ]

Fixes sdsi_meter_cert_show() to correctly decode and display the meter
certificate output. Adds and displays a missing version field, displays the
ASCII name of the signature, and fixes the print alignment.

Fixes: 7fdc03a737 ("tools/arch/x86: intel_sdsi: Add support for reading meter certificates")
Signed-off-by: David E. Box <david.e.box@linux.intel.com>
Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20240411025856.2782476-7-david.e.box@linux.intel.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
David E. Box 2024-04-10 19:58:53 -07:00 committed by Greg Kroah-Hartman
parent 42adfac5d2
commit 8af4923b04
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/arch/x86/intel_sdsi/intel_sdsi.c
View File

@ -153,11 +153,12 @@ struct bundle_encoding {
}; };
struct meter_certificate { struct meter_certificate {
uint32_t block_signature; uint32_t signature;
uint32_t counter_unit; uint32_t version;
uint64_t ppin; uint64_t ppin;
uint32_t counter_unit;
uint32_t bundle_length; uint32_t bundle_length;
uint32_t reserved; uint64_t reserved;
uint32_t mmrc_encoding; uint32_t mmrc_encoding;
uint32_t mmrc_counter; uint32_t mmrc_counter;
}; };
@ -338,6 +339,7 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s)
uint32_t count = 0; uint32_t count = 0;
FILE *cert_ptr; FILE *cert_ptr;
int ret, size; int ret, size;
char name[4];
ret = sdsi_update_registers(s); ret = sdsi_update_registers(s);
if (ret) if (ret)
@ -379,12 +381,19 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s)
printf("\n"); printf("\n");
printf("Meter certificate for device %s\n", s->dev_name); printf("Meter certificate for device %s\n", s->dev_name);
printf("\n"); printf("\n");
printf("Block Signature: 0x%x\n", mc->block_signature);
printf("Count Unit: %dms\n", mc->counter_unit); get_feature(mc->signature, name);
printf("PPIN: 0x%lx\n", mc->ppin); printf("Signature: %.4s\n", name);
printf("Feature Bundle Length: %d\n", mc->bundle_length);
printf("MMRC encoding: %d\n", mc->mmrc_encoding); printf("Version: %d\n", mc->version);
printf("MMRC counter: %d\n", mc->mmrc_counter); printf("Count Unit: %dms\n", mc->counter_unit);
printf("PPIN: 0x%lx\n", mc->ppin);
printf("Feature Bundle Length: %d\n", mc->bundle_length);
get_feature(mc->mmrc_encoding, name);
printf("MMRC encoding: %.4s\n", name);
printf("MMRC counter: %d\n", mc->mmrc_counter);
if (mc->bundle_length % 8) { if (mc->bundle_length % 8) {
fprintf(stderr, "Invalid bundle length\n"); fprintf(stderr, "Invalid bundle length\n");
return -1; return -1;
@ -398,7 +407,7 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s)
bec = (void *)(mc) + sizeof(mc); bec = (void *)(mc) + sizeof(mc);
printf("Number of Feature Counters: %d\n", mc->bundle_length / 8); printf("Number of Feature Counters: %ld\n", BUNDLE_COUNT(mc->bundle_length));
while (count++ < mc->bundle_length / 8) { while (count++ < mc->bundle_length / 8) {
char feature[5]; char feature[5];