2024-04-11 03:00:30

by David E. Box

Subject: [PATCH V4 7/9] 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: 7fdc03a7370f ("tools/arch/x86: intel_sdsi: Add support for reading meter certificates")
Signed-off-by: David E. Box <[email protected]>
Reviewed-by: Kuppuswamy Sathyanarayanan <[email protected]>
---
V4 - Use suggested struct bundle_encoding_counter cast

V3 - Use macros for bundle size and count

V2 - Split of V1 patch 7

tools/arch/x86/intel_sdsi/intel_sdsi.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/arch/x86/intel_sdsi/intel_sdsi.c b/tools/arch/x86/intel_sdsi/intel_sdsi.c
index ae29214da102..ba2a6b6645ae 100644
--- a/tools/arch/x86/intel_sdsi/intel_sdsi.c
+++ b/tools/arch/x86/intel_sdsi/intel_sdsi.c
@@ -394,7 +394,7 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s)
printf("MMRC encoding: %.4s\n", name);

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");
return -1;
}
@@ -405,15 +405,16 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s)
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));
- while (count++ < mc->bundle_length / 8) {
+ while (count < BUNDLE_COUNT(mc->bundle_length)) {
char feature[5];

feature[4] = '\0';
get_feature(bec[count].encoding, feature);
printf(" %s: %d\n", feature, bec[count].counter);
+ ++count;
}

return 0;
--
2.34.1

2024-04-11 11:18:31

by Ilpo Järvinen

Subject: Re: [PATCH V4 7/9] tools/arch/x86/intel_sdsi: Fix meter_certificate decoding

On Wed, 10 Apr 2024, David E. Box wrote:

> 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: 7fdc03a7370f ("tools/arch/x86: intel_sdsi: Add support for reading meter certificates")
> Signed-off-by: David E. Box <[email protected]>
> Reviewed-by: Kuppuswamy Sathyanarayanan <[email protected]>
> ---
> V4 - Use suggested struct bundle_encoding_counter cast
>
> V3 - Use macros for bundle size and count
>
> V2 - Split of V1 patch 7
>
> tools/arch/x86/intel_sdsi/intel_sdsi.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/tools/arch/x86/intel_sdsi/intel_sdsi.c b/tools/arch/x86/intel_sdsi/intel_sdsi.c
> index ae29214da102..ba2a6b6645ae 100644
> --- a/tools/arch/x86/intel_sdsi/intel_sdsi.c
> +++ b/tools/arch/x86/intel_sdsi/intel_sdsi.c
> @@ -394,7 +394,7 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s)
> printf("MMRC encoding: %.4s\n", name);
>
> 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");
> return -1;
> }
> @@ -405,15 +405,16 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s)
> 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));
> - while (count++ < mc->bundle_length / 8) {
> + while (count < BUNDLE_COUNT(mc->bundle_length)) {
> char feature[5];
>
> feature[4] = '\0';
> get_feature(bec[count].encoding, feature);
> printf(" %s: %d\n", feature, bec[count].counter);
> + ++count;
> }
>
> return 0;
>

Reviewed-by: Ilpo J?rvinen <[email protected]>

--
i.