Received-SPF: pass (google.com: domain of linux-kernel+bounces-135734-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com>
Date: Mon, 8 Apr 2024 20:13:50 +0300 (EEST)
To: "David E. Box" <david.e.box@linux.intel.com>
cc: Hans de Goede <hdegoede@redhat.com>, platform-driver-x86@vger.kernel.org, 
    LKML <linux-kernel@vger.kernel.org>, 
    sathyanarayanan.kuppuswamy@linux.intel.com
Subject: Re: [PATCH V3 6/9] tools/arch/x86/intel_sdsi: Fix meter_show
 display
In-Reply-To: <20240405032507.2637311-7-david.e.box@linux.intel.com>
Message-ID: <567552c0-db6b-21db-aa89-2950f5a802ad@linux.intel.com>
References: <20240405032507.2637311-1-david.e.box@linux.intel.com> <20240405032507.2637311-7-david.e.box@linux.intel.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="8323328-1469216011-1712596430=:14302"

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.

--8323328-1469216011-1712596430=:14302
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: QUOTED-PRINTABLE

On Thu, 4 Apr 2024, David E. Box wrote:

> Fixes sdsi_meter_cert_show() to correctly decode and display the meter
> certificate output. Adds and displays a missing version field, displays t=
he
> ASCII name of the signature, and fixes the print alignment.
>=20
> Fixes: 7fdc03a7370f ("tools/arch/x86: intel_sdsi: Add support for reading=
 meter certificates")
> Signed-off-by: David E. Box <david.e.box@linux.intel.com>
> ---
> V3 - Change patch subject and changelog to clarify changes.
>    - Use new BUNDLE_COUNT #def
>=20
> V2 - Split of V1 patch 7
>=20
>  tools/arch/x86/intel_sdsi/intel_sdsi.c | 29 +++++++++++++++++---------
>  1 file changed, 19 insertions(+), 10 deletions(-)
>=20
> diff --git a/tools/arch/x86/intel_sdsi/intel_sdsi.c b/tools/arch/x86/inte=
l_sdsi/intel_sdsi.c
> index 7eaffcbff788..a0711177e1bb 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 {
>  };
> =20
>  struct meter_certificate {
> -=09uint32_t block_signature;
> +=09uint32_t signature;
> +=09uint32_t version;
> +=09uint64_t ppin;
>  =09uint32_t counter_unit;
> -=09uint64_t ppin;
>  =09uint32_t bundle_length;
> -=09uint32_t reserved;
> +=09uint64_t reserved;
>  =09uint32_t mmrc_encoding;
>  =09uint32_t mmrc_counter;
>  };
> @@ -338,6 +339,7 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s)
>  =09uint32_t count =3D 0;
>  =09FILE *cert_ptr;
>  =09int ret, size;
> +=09char name[4];
> =20
>  =09ret =3D sdsi_update_registers(s);
>  =09if (ret)
> @@ -379,12 +381,19 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s)
>  =09printf("\n");
>  =09printf("Meter certificate for device %s\n", s->dev_name);
>  =09printf("\n");
> -=09printf("Block Signature:       0x%x\n", mc->block_signature);
> -=09printf("Count Unit:            %dms\n", mc->counter_unit);
> -=09printf("PPIN:                  0x%lx\n", mc->ppin);
> -=09printf("Feature Bundle Length: %d\n", mc->bundle_length);
> -=09printf("MMRC encoding:         %d\n", mc->mmrc_encoding);
> -=09printf("MMRC counter:          %d\n", mc->mmrc_counter);
> +
> +=09get_feature(mc->signature, name);
> +=09printf("Signature:                    %.4s\n", name);
> +
> +=09printf("Version:                      %d\n", mc->version);
> +=09printf("Count Unit:                   %dms\n", mc->counter_unit);
> +=09printf("PPIN:                         0x%lx\n", mc->ppin);
> +=09printf("Feature Bundle Length:        %d\n", mc->bundle_length);
> +
> +=09get_feature(mc->mmrc_encoding, name);
> +=09printf("MMRC encoding:                %.4s\n", name);
> +
> +=09printf("MMRC counter:                 %d\n", mc->mmrc_counter);
>  =09if (mc->bundle_length % 8) {
>  =09=09fprintf(stderr, "Invalid bundle length\n");
>  =09=09return -1;
> @@ -398,7 +407,7 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s)
> =20
>  =09bec =3D (void *)(mc) + sizeof(mc);
> =20
> -=09printf("Number of Feature Counters:          %d\n", mc->bundle_length=
 / 8);
> +=09printf("Number of Feature Counters:   %ld\n", BUNDLE_COUNT(mc->bundle=
_length));
>  =09while (count++ < mc->bundle_length / 8) {
>  =09=09char feature[5];

Reviewed-by: Ilpo J=E4rvinen <ilpo.jarvinen@linux.intel.com>

--=20
 i.

--8323328-1469216011-1712596430=:14302--