On 2/27/24 4:00 PM, David E. Box wrote:
> Add missing 'version' field to struct meter_certificate. Also fix output
> string alignment.
>
> Fixes: aad129780bae ("platform/x86/intel/sdsi: Add support for reading the current meter state")
> Signed-off-by: David E. Box <david.e.box@xxxxxxxxxxxxxxx>
> ---
>
> V2 - Split of V1 patch 7
>
> tools/arch/x86/intel_sdsi/intel_sdsi.c | 29 +++++++++++++++++---------
> 1 file changed, 19 insertions(+), 10 deletions(-)
>
> diff --git a/tools/arch/x86/intel_sdsi/intel_sdsi.c b/tools/arch/x86/intel_sdsi/intel_sdsi.c
> index a02850a710ee..def1b9a01738 100644
> --- a/tools/arch/x86/intel_sdsi/intel_sdsi.c
> +++ b/tools/arch/x86/intel_sdsi/intel_sdsi.c
> @@ -153,11 +153,12 @@ struct bundle_encoding {
> };
>
> struct meter_certificate {
> - uint32_t block_signature;
> + uint32_t signature;
> + uint32_t version;
> + uint64_t ppin;
> uint32_t counter_unit;
> - uint64_t ppin;
> uint32_t bundle_length;
> - uint32_t reserved;
> + uint64_t reserved;
> uint32_t mmrc_encoding;
> uint32_t mmrc_counter;
> };
> @@ -336,6 +337,7 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s)
> uint32_t count = 0;
> FILE *cert_ptr;
> int ret, size;
> + char name[4];
Nit: IMO, instead of hardcoding, you can introduce a macro like FEATURE_LEN.
It is up to you.
>
> ret = sdsi_update_registers(s);
> if (ret)
> @@ -377,12 +379,19 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s)
> printf("\n");
> printf("Meter certificate for device %s\n", s->dev_name);
> printf("\n");
> - printf("Block Signature: 0x%x\n", mc->block_signature);
> - printf("Count Unit: %dms\n", mc->counter_unit);
> - printf("PPIN: 0x%lx\n", mc->ppin);
> - printf("Feature Bundle Length: %d\n", mc->bundle_length);
> - printf("MMRC encoding: %d\n", mc->mmrc_encoding);
> - printf("MMRC counter: %d\n", mc->mmrc_counter);
> +
> + get_feature(mc->signature, name);
> + printf("Signature: %.4s\n", name);
> +
> + printf("Version: %d\n", mc->version);
> + 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) {
> fprintf(stderr, "Invalid bundle length\n");
> return -1;
> @@ -396,7 +405,7 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s)
>
> bec = (void *)(mc) + sizeof(mc);
>
> - printf("Number of Feature Counters: %d\n", mc->bundle_length / 8);
> + printf("Number of Feature Counters: %d\n", mc->bundle_length / 8);
Try to use sizeof instead of hardcoded value.
> while (count++ < mc->bundle_length / 8) {
> char feature[5];
>
--
Sathyanarayanan Kuppuswamy
Linux Kernel Developer
