* [PATCH V3 0/9] Intel On Demand changes
@ 2024-04-05 3:24 David E. Box
2024-04-05 3:24 ` [PATCH V3 1/9] platform/x86/intel/sdsi: Set message size during writes David E. Box
` (8 more replies)
0 siblings, 9 replies; 17+ messages in thread
From: David E. Box @ 2024-04-05 3:24 UTC (permalink / raw
To: david.e.box, hdegoede, ilpo.jarvinen, platform-driver-x86,
linux-kernel, sathyanarayanan.kuppuswamy
Adds driver and tool support for a new "current" meter that allows reading
the most current, but not attested, value of the meter counters. Also adds
fixes for the intel_sdsi tool.
David E. Box (8):
platform/x86/intel/sdsi: Set message size during writes
platform/x86/intel/sdsi: Combine read and write mailbox flows
platform/x86/intel/sdsi: Add attribute to read the current meter state
tools/arch/x86/intel_sdsi: Fix maximum meter bundle length
tools/arch/x86/intel_sdsi: Fix meter_show display
tools/arch/x86/intel_sdsi: Fix meter_certificate decoding
platform/x86/intel/sdsi: Simplify ascii printing
tools: intel_sdsi: Add current meter support
Kuppuswamy Sathyanarayanan (1):
platform/x86/intel/sdsi: Add in-band BIOS lock support
drivers/platform/x86/intel/sdsi.c | 118 ++++++++++++++++---------
tools/arch/x86/intel_sdsi/intel_sdsi.c | 110 ++++++++++++++---------
2 files changed, 145 insertions(+), 83 deletions(-)
base-commit: 4cece764965020c22cff7665b18a012006359095
--
2.34.1
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH V3 1/9] platform/x86/intel/sdsi: Set message size during writes
2024-04-05 3:24 [PATCH V3 0/9] Intel On Demand changes David E. Box
@ 2024-04-05 3:24 ` David E. Box
2024-04-05 14:29 ` Kuppuswamy Sathyanarayanan
2024-04-05 3:25 ` [PATCH V3 2/9] platform/x86/intel/sdsi: Combine read and write mailbox flows David E. Box
` (7 subsequent siblings)
8 siblings, 1 reply; 17+ messages in thread
From: David E. Box @ 2024-04-05 3:24 UTC (permalink / raw
To: david.e.box, hdegoede, ilpo.jarvinen, platform-driver-x86,
linux-kernel, sathyanarayanan.kuppuswamy
New mailbox commands will support sending multi packet writes and updated
firmware now requires that the message size be written for all commands
along with the packet size. Since the driver doesn't perform writes larger
than the packet size, set the message size to the same value.
Signed-off-by: David E. Box <david.e.box@linux.intel.com>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---
V3 - no changes
V2 - no changes
drivers/platform/x86/intel/sdsi.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/platform/x86/intel/sdsi.c b/drivers/platform/x86/intel/sdsi.c
index 556e7c6dbb05..a70c071de6e2 100644
--- a/drivers/platform/x86/intel/sdsi.c
+++ b/drivers/platform/x86/intel/sdsi.c
@@ -252,6 +252,7 @@ static int sdsi_mbox_cmd_write(struct sdsi_priv *priv, struct sdsi_mbox_info *in
FIELD_PREP(CTRL_SOM, 1) |
FIELD_PREP(CTRL_RUN_BUSY, 1) |
FIELD_PREP(CTRL_READ_WRITE, 1) |
+ FIELD_PREP(CTRL_MSG_SIZE, info->size) |
FIELD_PREP(CTRL_PACKET_SIZE, info->size);
writeq(control, priv->control_addr);
--
2.34.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH V3 2/9] platform/x86/intel/sdsi: Combine read and write mailbox flows
2024-04-05 3:24 [PATCH V3 0/9] Intel On Demand changes David E. Box
2024-04-05 3:24 ` [PATCH V3 1/9] platform/x86/intel/sdsi: Set message size during writes David E. Box
@ 2024-04-05 3:25 ` David E. Box
2024-04-05 3:25 ` [PATCH V3 3/9] platform/x86/intel/sdsi: Add in-band BIOS lock support David E. Box
` (6 subsequent siblings)
8 siblings, 0 replies; 17+ messages in thread
From: David E. Box @ 2024-04-05 3:25 UTC (permalink / raw
To: david.e.box, hdegoede, ilpo.jarvinen, platform-driver-x86,
linux-kernel, sathyanarayanan.kuppuswamy
The current mailbox commands are either read-only or write-only and the
flow is different for each. New commands will need to send and receive
data. In preparation for these commands, create a common polling function
to handle sending data and receiving in the same transaction.
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>
---
V3 - no changes
V2 - In sdsi_cmd_read() remove unnecessary check for non-zero packet_size
in do loop since the loop is exited earlier when packet_size is
zero.
drivers/platform/x86/intel/sdsi.c | 79 +++++++++++++++++--------------
1 file changed, 44 insertions(+), 35 deletions(-)
diff --git a/drivers/platform/x86/intel/sdsi.c b/drivers/platform/x86/intel/sdsi.c
index a70c071de6e2..d80c2dc0ce71 100644
--- a/drivers/platform/x86/intel/sdsi.c
+++ b/drivers/platform/x86/intel/sdsi.c
@@ -15,6 +15,7 @@
#include <linux/iopoll.h>
#include <linux/kernel.h>
#include <linux/module.h>
+#include <linux/overflow.h>
#include <linux/pci.h>
#include <linux/slab.h>
#include <linux/sysfs.h>
@@ -156,8 +157,8 @@ static int sdsi_status_to_errno(u32 status)
}
}
-static int sdsi_mbox_cmd_read(struct sdsi_priv *priv, struct sdsi_mbox_info *info,
- size_t *data_size)
+static int sdsi_mbox_poll(struct sdsi_priv *priv, struct sdsi_mbox_info *info,
+ size_t *data_size)
{
struct device *dev = priv->dev;
u32 total, loop, eom, status, message_size;
@@ -166,18 +167,10 @@ static int sdsi_mbox_cmd_read(struct sdsi_priv *priv, struct sdsi_mbox_info *inf
lockdep_assert_held(&priv->mb_lock);
- /* Format and send the read command */
- control = FIELD_PREP(CTRL_EOM, 1) |
- FIELD_PREP(CTRL_SOM, 1) |
- FIELD_PREP(CTRL_RUN_BUSY, 1) |
- FIELD_PREP(CTRL_PACKET_SIZE, info->size);
- writeq(control, priv->control_addr);
-
/* For reads, data sizes that are larger than the mailbox size are read in packets. */
total = 0;
loop = 0;
do {
- void *buf = info->buffer + (SDSI_SIZE_MAILBOX * loop);
u32 packet_size;
/* Poll on ready bit */
@@ -195,6 +188,11 @@ static int sdsi_mbox_cmd_read(struct sdsi_priv *priv, struct sdsi_mbox_info *inf
if (ret)
break;
+ if (!packet_size) {
+ sdsi_complete_transaction(priv);
+ break;
+ }
+
/* Only the last packet can be less than the mailbox size. */
if (!eom && packet_size != SDSI_SIZE_MAILBOX) {
dev_err(dev, "Invalid packet size\n");
@@ -208,9 +206,13 @@ static int sdsi_mbox_cmd_read(struct sdsi_priv *priv, struct sdsi_mbox_info *inf
break;
}
- sdsi_memcpy64_fromio(buf, priv->mbox_addr, round_up(packet_size, SDSI_SIZE_CMD));
+ if (info->buffer) {
+ void *buf = info->buffer + array_size(SDSI_SIZE_MAILBOX, loop);
- total += packet_size;
+ sdsi_memcpy64_fromio(buf, priv->mbox_addr,
+ round_up(packet_size, SDSI_SIZE_CMD));
+ total += packet_size;
+ }
sdsi_complete_transaction(priv);
} while (!eom && ++loop < MBOX_MAX_PACKETS);
@@ -230,16 +232,33 @@ static int sdsi_mbox_cmd_read(struct sdsi_priv *priv, struct sdsi_mbox_info *inf
dev_warn(dev, "Read count %u differs from expected count %u\n",
total, message_size);
- *data_size = total;
+ if (data_size)
+ *data_size = total;
return 0;
}
-static int sdsi_mbox_cmd_write(struct sdsi_priv *priv, struct sdsi_mbox_info *info)
+static int sdsi_mbox_cmd_read(struct sdsi_priv *priv, struct sdsi_mbox_info *info,
+ size_t *data_size)
+{
+ u64 control;
+
+ lockdep_assert_held(&priv->mb_lock);
+
+ /* Format and send the read command */
+ control = FIELD_PREP(CTRL_EOM, 1) |
+ FIELD_PREP(CTRL_SOM, 1) |
+ FIELD_PREP(CTRL_RUN_BUSY, 1) |
+ FIELD_PREP(CTRL_PACKET_SIZE, info->size);
+ writeq(control, priv->control_addr);
+
+ return sdsi_mbox_poll(priv, info, data_size);
+}
+
+static int sdsi_mbox_cmd_write(struct sdsi_priv *priv, struct sdsi_mbox_info *info,
+ size_t *data_size)
{
u64 control;
- u32 status;
- int ret;
lockdep_assert_held(&priv->mb_lock);
@@ -256,20 +275,7 @@ static int sdsi_mbox_cmd_write(struct sdsi_priv *priv, struct sdsi_mbox_info *in
FIELD_PREP(CTRL_PACKET_SIZE, info->size);
writeq(control, priv->control_addr);
- /* Poll on ready bit */
- ret = readq_poll_timeout(priv->control_addr, control, control & CTRL_READY,
- MBOX_POLLING_PERIOD_US, MBOX_TIMEOUT_US);
-
- if (ret)
- goto release_mbox;
-
- status = FIELD_GET(CTRL_STATUS, control);
- ret = sdsi_status_to_errno(status);
-
-release_mbox:
- sdsi_complete_transaction(priv);
-
- return ret;
+ return sdsi_mbox_poll(priv, info, data_size);
}
static int sdsi_mbox_acquire(struct sdsi_priv *priv, struct sdsi_mbox_info *info)
@@ -313,7 +319,8 @@ static int sdsi_mbox_acquire(struct sdsi_priv *priv, struct sdsi_mbox_info *info
return ret;
}
-static int sdsi_mbox_write(struct sdsi_priv *priv, struct sdsi_mbox_info *info)
+static int sdsi_mbox_write(struct sdsi_priv *priv, struct sdsi_mbox_info *info,
+ size_t *data_size)
{
int ret;
@@ -323,7 +330,7 @@ static int sdsi_mbox_write(struct sdsi_priv *priv, struct sdsi_mbox_info *info)
if (ret)
return ret;
- return sdsi_mbox_cmd_write(priv, info);
+ return sdsi_mbox_cmd_write(priv, info, data_size);
}
static int sdsi_mbox_read(struct sdsi_priv *priv, struct sdsi_mbox_info *info, size_t *data_size)
@@ -342,7 +349,7 @@ static int sdsi_mbox_read(struct sdsi_priv *priv, struct sdsi_mbox_info *info, s
static ssize_t sdsi_provision(struct sdsi_priv *priv, char *buf, size_t count,
enum sdsi_command command)
{
- struct sdsi_mbox_info info;
+ struct sdsi_mbox_info info = {};
int ret;
if (count > (SDSI_SIZE_WRITE_MSG - SDSI_SIZE_CMD))
@@ -364,7 +371,9 @@ static ssize_t sdsi_provision(struct sdsi_priv *priv, char *buf, size_t count,
ret = mutex_lock_interruptible(&priv->mb_lock);
if (ret)
goto free_payload;
- ret = sdsi_mbox_write(priv, &info);
+
+ ret = sdsi_mbox_write(priv, &info, NULL);
+
mutex_unlock(&priv->mb_lock);
free_payload:
@@ -408,7 +417,7 @@ static ssize_t
certificate_read(u64 command, struct sdsi_priv *priv, char *buf, loff_t off,
size_t count)
{
- struct sdsi_mbox_info info;
+ struct sdsi_mbox_info info = {};
size_t size;
int ret;
--
2.34.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH V3 3/9] platform/x86/intel/sdsi: Add in-band BIOS lock support
2024-04-05 3:24 [PATCH V3 0/9] Intel On Demand changes David E. Box
2024-04-05 3:24 ` [PATCH V3 1/9] platform/x86/intel/sdsi: Set message size during writes David E. Box
2024-04-05 3:25 ` [PATCH V3 2/9] platform/x86/intel/sdsi: Combine read and write mailbox flows David E. Box
@ 2024-04-05 3:25 ` David E. Box
2024-04-05 3:25 ` [PATCH V3 4/9] platform/x86/intel/sdsi: Add attribute to read the current meter state David E. Box
` (5 subsequent siblings)
8 siblings, 0 replies; 17+ messages in thread
From: David E. Box @ 2024-04-05 3:25 UTC (permalink / raw
To: david.e.box, hdegoede, ilpo.jarvinen, platform-driver-x86,
linux-kernel, sathyanarayanan.kuppuswamy
From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
As per SDSi in-band interface specification, sec titled "BIOS lock for
in-band provisioning", when IB_LOCK bit is set in control qword, the
SDSI agent is only allowed to perform the read flow, but not allowed to
provision license blob or license key. So add check for it in
sdsi_provision().
Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Signed-off-by: David E. Box <david.e.box@linux.intel.com>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---
V3 - no changes
V2 - Move sdsi_ib_locked() check after overflow check
drivers/platform/x86/intel/sdsi.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/platform/x86/intel/sdsi.c b/drivers/platform/x86/intel/sdsi.c
index d80c2dc0ce71..bb3eaf5eb382 100644
--- a/drivers/platform/x86/intel/sdsi.c
+++ b/drivers/platform/x86/intel/sdsi.c
@@ -67,6 +67,7 @@
#define CTRL_OWNER GENMASK(5, 4)
#define CTRL_COMPLETE BIT(6)
#define CTRL_READY BIT(7)
+#define CTRL_INBAND_LOCK BIT(32)
#define CTRL_STATUS GENMASK(15, 8)
#define CTRL_PACKET_SIZE GENMASK(31, 16)
#define CTRL_MSG_SIZE GENMASK(63, 48)
@@ -346,6 +347,11 @@ static int sdsi_mbox_read(struct sdsi_priv *priv, struct sdsi_mbox_info *info, s
return sdsi_mbox_cmd_read(priv, info, data_size);
}
+static bool sdsi_ib_locked(struct sdsi_priv *priv)
+{
+ return !!FIELD_GET(CTRL_INBAND_LOCK, readq(priv->control_addr));
+}
+
static ssize_t sdsi_provision(struct sdsi_priv *priv, char *buf, size_t count,
enum sdsi_command command)
{
@@ -355,6 +361,10 @@ static ssize_t sdsi_provision(struct sdsi_priv *priv, char *buf, size_t count,
if (count > (SDSI_SIZE_WRITE_MSG - SDSI_SIZE_CMD))
return -EOVERFLOW;
+ /* Make sure In-band lock is not set */
+ if (sdsi_ib_locked(priv))
+ return -EPERM;
+
/* Qword aligned message + command qword */
info.size = round_up(count, SDSI_SIZE_CMD) + SDSI_SIZE_CMD;
--
2.34.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH V3 4/9] platform/x86/intel/sdsi: Add attribute to read the current meter state
2024-04-05 3:24 [PATCH V3 0/9] Intel On Demand changes David E. Box
` (2 preceding siblings ...)
2024-04-05 3:25 ` [PATCH V3 3/9] platform/x86/intel/sdsi: Add in-band BIOS lock support David E. Box
@ 2024-04-05 3:25 ` David E. Box
2024-04-05 3:25 ` [PATCH V3 5/9] tools/arch/x86/intel_sdsi: Fix maximum meter bundle length David E. Box
` (4 subsequent siblings)
8 siblings, 0 replies; 17+ messages in thread
From: David E. Box @ 2024-04-05 3:25 UTC (permalink / raw
To: david.e.box, hdegoede, ilpo.jarvinen, platform-driver-x86,
linux-kernel, sathyanarayanan.kuppuswamy
The meter_certificate file provides access to metering information that may
be attested but is only updated every 8 hours. Add new attribute,
meter_current, to allow reading an untested snapshot of the current values.
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>
---
V3 - no changes
V2 - make control_flags a parameter to be eventually passed to
sdsi_mbox_cmd_read(). This removes the need for a lock which had been
added to protect control_flags when it was a member of the private
struct.
drivers/platform/x86/intel/sdsi.c | 30 ++++++++++++++++++++++++------
1 file changed, 24 insertions(+), 6 deletions(-)
diff --git a/drivers/platform/x86/intel/sdsi.c b/drivers/platform/x86/intel/sdsi.c
index bb3eaf5eb382..277e4f4b20ac 100644
--- a/drivers/platform/x86/intel/sdsi.c
+++ b/drivers/platform/x86/intel/sdsi.c
@@ -68,6 +68,7 @@
#define CTRL_COMPLETE BIT(6)
#define CTRL_READY BIT(7)
#define CTRL_INBAND_LOCK BIT(32)
+#define CTRL_METER_ENABLE_DRAM BIT(33)
#define CTRL_STATUS GENMASK(15, 8)
#define CTRL_PACKET_SIZE GENMASK(31, 16)
#define CTRL_MSG_SIZE GENMASK(63, 48)
@@ -95,6 +96,7 @@ enum sdsi_command {
struct sdsi_mbox_info {
u64 *payload;
void *buffer;
+ u64 control_flags;
int size;
};
@@ -250,7 +252,8 @@ static int sdsi_mbox_cmd_read(struct sdsi_priv *priv, struct sdsi_mbox_info *inf
control = FIELD_PREP(CTRL_EOM, 1) |
FIELD_PREP(CTRL_SOM, 1) |
FIELD_PREP(CTRL_RUN_BUSY, 1) |
- FIELD_PREP(CTRL_PACKET_SIZE, info->size);
+ FIELD_PREP(CTRL_PACKET_SIZE, info->size) |
+ info->control_flags;
writeq(control, priv->control_addr);
return sdsi_mbox_poll(priv, info, data_size);
@@ -424,8 +427,8 @@ static ssize_t provision_cap_write(struct file *filp, struct kobject *kobj,
static BIN_ATTR_WO(provision_cap, SDSI_SIZE_WRITE_MSG);
static ssize_t
-certificate_read(u64 command, struct sdsi_priv *priv, char *buf, loff_t off,
- size_t count)
+certificate_read(u64 command, u64 control_flags, struct sdsi_priv *priv,
+ char *buf, loff_t off, size_t count)
{
struct sdsi_mbox_info info = {};
size_t size;
@@ -441,6 +444,7 @@ certificate_read(u64 command, struct sdsi_priv *priv, char *buf, loff_t off,
info.payload = &command;
info.size = sizeof(command);
+ info.control_flags = control_flags;
ret = mutex_lock_interruptible(&priv->mb_lock);
if (ret)
@@ -472,7 +476,7 @@ state_certificate_read(struct file *filp, struct kobject *kobj,
struct device *dev = kobj_to_dev(kobj);
struct sdsi_priv *priv = dev_get_drvdata(dev);
- return certificate_read(SDSI_CMD_READ_STATE, priv, buf, off, count);
+ return certificate_read(SDSI_CMD_READ_STATE, 0, priv, buf, off, count);
}
static BIN_ATTR_ADMIN_RO(state_certificate, SDSI_SIZE_READ_MSG);
@@ -484,10 +488,23 @@ meter_certificate_read(struct file *filp, struct kobject *kobj,
struct device *dev = kobj_to_dev(kobj);
struct sdsi_priv *priv = dev_get_drvdata(dev);
- return certificate_read(SDSI_CMD_READ_METER, priv, buf, off, count);
+ return certificate_read(SDSI_CMD_READ_METER, 0, priv, buf, off, count);
}
static BIN_ATTR_ADMIN_RO(meter_certificate, SDSI_SIZE_READ_MSG);
+static ssize_t
+meter_current_read(struct file *filp, struct kobject *kobj,
+ struct bin_attribute *attr, char *buf, loff_t off,
+ size_t count)
+{
+ struct device *dev = kobj_to_dev(kobj);
+ struct sdsi_priv *priv = dev_get_drvdata(dev);
+
+ return certificate_read(SDSI_CMD_READ_METER, CTRL_METER_ENABLE_DRAM,
+ priv, buf, off, count);
+}
+static BIN_ATTR_ADMIN_RO(meter_current, SDSI_SIZE_READ_MSG);
+
static ssize_t registers_read(struct file *filp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, loff_t off,
size_t count)
@@ -518,6 +535,7 @@ static struct bin_attribute *sdsi_bin_attrs[] = {
&bin_attr_registers,
&bin_attr_state_certificate,
&bin_attr_meter_certificate,
+ &bin_attr_meter_current,
&bin_attr_provision_akc,
&bin_attr_provision_cap,
NULL
@@ -537,7 +555,7 @@ sdsi_battr_is_visible(struct kobject *kobj, struct bin_attribute *attr, int n)
if (!(priv->features & SDSI_FEATURE_SDSI))
return 0;
- if (attr == &bin_attr_meter_certificate)
+ if (attr == &bin_attr_meter_certificate || attr == &bin_attr_meter_current)
return (priv->features & SDSI_FEATURE_METERING) ?
attr->attr.mode : 0;
--
2.34.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH V3 5/9] tools/arch/x86/intel_sdsi: Fix maximum meter bundle length
2024-04-05 3:24 [PATCH V3 0/9] Intel On Demand changes David E. Box
` (3 preceding siblings ...)
2024-04-05 3:25 ` [PATCH V3 4/9] platform/x86/intel/sdsi: Add attribute to read the current meter state David E. Box
@ 2024-04-05 3:25 ` David E. Box
2024-04-08 16:59 ` Ilpo Järvinen
2024-04-05 3:25 ` [PATCH V3 6/9] tools/arch/x86/intel_sdsi: Fix meter_show display David E. Box
` (3 subsequent siblings)
8 siblings, 1 reply; 17+ messages in thread
From: David E. Box @ 2024-04-05 3:25 UTC (permalink / raw
To: david.e.box, hdegoede, ilpo.jarvinen, platform-driver-x86,
linux-kernel, sathyanarayanan.kuppuswamy
The maximum number of bundles in the meter certificate was set to 8 which
is much less than the maximum. Instead, since the bundles appear at the end
of the file, set it based on the remaining file size from the bundle start
position.
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 - Add suggested macros for the number of bundles and bundle size.
V2 - Split of V1 patch 7
tools/arch/x86/intel_sdsi/intel_sdsi.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/tools/arch/x86/intel_sdsi/intel_sdsi.c b/tools/arch/x86/intel_sdsi/intel_sdsi.c
index 2cd92761f171..7eaffcbff788 100644
--- a/tools/arch/x86/intel_sdsi/intel_sdsi.c
+++ b/tools/arch/x86/intel_sdsi/intel_sdsi.c
@@ -43,7 +43,6 @@
#define METER_CERT_MAX_SIZE 4096
#define STATE_MAX_NUM_LICENSES 16
#define STATE_MAX_NUM_IN_BUNDLE (uint32_t)8
-#define METER_MAX_NUM_BUNDLES 8
#define __round_mask(x, y) ((__typeof__(x))((y) - 1))
#define round_up(x, y) ((((x) - 1) | __round_mask(x, y)) + 1)
@@ -167,6 +166,11 @@ struct bundle_encoding_counter {
uint32_t encoding;
uint32_t counter;
};
+#define METER_BUNDLE_SIZE sizeof(struct bundle_encoding_counter)
+#define BUNDLE_COUNT(length) ((length) / METER_BUNDLE_SIZE)
+#define METER_MAX_NUM_BUNDLES \
+ ((METER_CERT_MAX_SIZE - sizeof(struct meter_certificate)) / \
+ sizeof(struct bundle_encoding_counter))
struct sdsi_dev {
struct sdsi_regs regs;
@@ -386,9 +390,9 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s)
return -1;
}
- if (mc->bundle_length > METER_MAX_NUM_BUNDLES * 8) {
- fprintf(stderr, "More than %d bundles: %d\n",
- METER_MAX_NUM_BUNDLES, mc->bundle_length / 8);
+ if (mc->bundle_length > METER_MAX_NUM_BUNDLES * METER_BUNDLE_SIZE) {
+ fprintf(stderr, "More than %ld bundles: actual %ld\n",
+ METER_MAX_NUM_BUNDLES, BUNDLE_COUNT(mc->bundle_length));
return -1;
}
--
2.34.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH V3 6/9] tools/arch/x86/intel_sdsi: Fix meter_show display
2024-04-05 3:24 [PATCH V3 0/9] Intel On Demand changes David E. Box
` (4 preceding siblings ...)
2024-04-05 3:25 ` [PATCH V3 5/9] tools/arch/x86/intel_sdsi: Fix maximum meter bundle length David E. Box
@ 2024-04-05 3:25 ` David E. Box
2024-04-05 14:29 ` Kuppuswamy Sathyanarayanan
2024-04-08 17:13 ` Ilpo Järvinen
2024-04-05 3:25 ` [PATCH V3 7/9] tools/arch/x86/intel_sdsi: Fix meter_certificate decoding David E. Box
` (2 subsequent siblings)
8 siblings, 2 replies; 17+ messages in thread
From: David E. Box @ 2024-04-05 3:25 UTC (permalink / raw
To: david.e.box, hdegoede, ilpo.jarvinen, platform-driver-x86,
linux-kernel, sathyanarayanan.kuppuswamy
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: 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
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 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 {
};
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;
};
@@ -338,6 +339,7 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s)
uint32_t count = 0;
FILE *cert_ptr;
int ret, size;
+ char name[4];
ret = sdsi_update_registers(s);
if (ret)
@@ -379,12 +381,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;
@@ -398,7 +407,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: %ld\n", BUNDLE_COUNT(mc->bundle_length));
while (count++ < mc->bundle_length / 8) {
char feature[5];
--
2.34.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH V3 7/9] tools/arch/x86/intel_sdsi: Fix meter_certificate decoding
2024-04-05 3:24 [PATCH V3 0/9] Intel On Demand changes David E. Box
` (5 preceding siblings ...)
2024-04-05 3:25 ` [PATCH V3 6/9] tools/arch/x86/intel_sdsi: Fix meter_show display David E. Box
@ 2024-04-05 3:25 ` David E. Box
2024-04-08 17:10 ` Ilpo Järvinen
2024-04-05 3:25 ` [PATCH V3 8/9] platform/x86/intel/sdsi: Simplify ascii printing David E. Box
2024-04-05 3:25 ` [PATCH V3 9/9] tools: intel_sdsi: Add current meter support David E. Box
8 siblings, 1 reply; 17+ messages in thread
From: David E. Box @ 2024-04-05 3:25 UTC (permalink / raw
To: david.e.box, hdegoede, ilpo.jarvinen, platform-driver-x86,
linux-kernel, sathyanarayanan.kuppuswamy
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 <david.e.box@linux.intel.com>
Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
---
V3 - Use macros for bundle size and count
V2 - Split of V1 patch 7
tools/arch/x86/intel_sdsi/intel_sdsi.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tools/arch/x86/intel_sdsi/intel_sdsi.c b/tools/arch/x86/intel_sdsi/intel_sdsi.c
index a0711177e1bb..45bc69e6718e 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 = (void *)(mc) + sizeof(*mc);
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
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH V3 8/9] platform/x86/intel/sdsi: Simplify ascii printing
2024-04-05 3:24 [PATCH V3 0/9] Intel On Demand changes David E. Box
` (6 preceding siblings ...)
2024-04-05 3:25 ` [PATCH V3 7/9] tools/arch/x86/intel_sdsi: Fix meter_certificate decoding David E. Box
@ 2024-04-05 3:25 ` David E. Box
2024-04-08 17:22 ` Ilpo Järvinen
2024-04-05 3:25 ` [PATCH V3 9/9] tools: intel_sdsi: Add current meter support David E. Box
8 siblings, 1 reply; 17+ messages in thread
From: David E. Box @ 2024-04-05 3:25 UTC (permalink / raw
To: david.e.box, hdegoede, ilpo.jarvinen, platform-driver-x86,
linux-kernel, sathyanarayanan.kuppuswamy
Use printf width specifier to set the display length of encoded feature
names.
Signed-off-by: David E. Box <david.e.box@linux.intel.com>
Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
---
V3 - Add FEAT_LEN #def
V2 - Split of V1 patch 7
tools/arch/x86/intel_sdsi/intel_sdsi.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/tools/arch/x86/intel_sdsi/intel_sdsi.c b/tools/arch/x86/intel_sdsi/intel_sdsi.c
index 45bc69e6718e..0c9670ba1f15 100644
--- a/tools/arch/x86/intel_sdsi/intel_sdsi.c
+++ b/tools/arch/x86/intel_sdsi/intel_sdsi.c
@@ -43,6 +43,7 @@
#define METER_CERT_MAX_SIZE 4096
#define STATE_MAX_NUM_LICENSES 16
#define STATE_MAX_NUM_IN_BUNDLE (uint32_t)8
+#define FEAT_LEN 4
#define __round_mask(x, y) ((__typeof__(x))((y) - 1))
#define round_up(x, y) ((((x) - 1) | __round_mask(x, y)) + 1)
@@ -409,11 +410,10 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s)
printf("Number of Feature Counters: %ld\n", BUNDLE_COUNT(mc->bundle_length));
while (count < BUNDLE_COUNT(mc->bundle_length)) {
- char feature[5];
+ char feature[FEAT_LEN];
- feature[4] = '\0';
get_feature(bec[count].encoding, feature);
- printf(" %s: %d\n", feature, bec[count].counter);
+ printf(" %.4s: %d\n", feature, bec[count].counter);
++count;
}
@@ -494,7 +494,7 @@ static int sdsi_state_cert_show(struct sdsi_dev *s)
sizeof(*lki) + // size of the license key info
offset; // offset to this blob content
struct bundle_encoding *bundle = (void *)(lbc) + sizeof(*lbc);
- char feature[5];
+ char feature[FEAT_LEN];
uint32_t i;
printf(" Blob %d:\n", count - 1);
@@ -507,11 +507,9 @@ static int sdsi_state_cert_show(struct sdsi_dev *s)
printf(" Blob revision ID: %u\n", lbc->rev_id);
printf(" Number of Features: %u\n", lbc->num_bundles);
- feature[4] = '\0';
-
for (i = 0; i < min(lbc->num_bundles, STATE_MAX_NUM_IN_BUNDLE); i++) {
get_feature(bundle[i].encoding, feature);
- printf(" Feature %d: %s\n", i, feature);
+ printf(" Feature %d: %.4s\n", i, feature);
}
if (lbc->num_bundles > STATE_MAX_NUM_IN_BUNDLE)
--
2.34.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH V3 9/9] tools: intel_sdsi: Add current meter support
2024-04-05 3:24 [PATCH V3 0/9] Intel On Demand changes David E. Box
` (7 preceding siblings ...)
2024-04-05 3:25 ` [PATCH V3 8/9] platform/x86/intel/sdsi: Simplify ascii printing David E. Box
@ 2024-04-05 3:25 ` David E. Box
8 siblings, 0 replies; 17+ messages in thread
From: David E. Box @ 2024-04-05 3:25 UTC (permalink / raw
To: david.e.box, hdegoede, ilpo.jarvinen, platform-driver-x86,
linux-kernel, sathyanarayanan.kuppuswamy
Add support to read the 'meter_current' file. The display is the same as
the 'meter_certificate', but will show the current snapshot of the
counters.
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>
---
V3 - no changes
V2 - Set the name of the file to be opened once.
tools/arch/x86/intel_sdsi/intel_sdsi.c | 49 ++++++++++++++++----------
1 file changed, 30 insertions(+), 19 deletions(-)
diff --git a/tools/arch/x86/intel_sdsi/intel_sdsi.c b/tools/arch/x86/intel_sdsi/intel_sdsi.c
index 0c9670ba1f15..98d1ce9187ce 100644
--- a/tools/arch/x86/intel_sdsi/intel_sdsi.c
+++ b/tools/arch/x86/intel_sdsi/intel_sdsi.c
@@ -185,6 +185,7 @@ struct sdsi_dev {
enum command {
CMD_SOCKET_INFO,
CMD_METER_CERT,
+ CMD_METER_CURRENT_CERT,
CMD_STATE_CERT,
CMD_PROV_AKC,
CMD_PROV_CAP,
@@ -332,13 +333,14 @@ static void get_feature(uint32_t encoding, char *feature)
feature[0] = name[3];
}
-static int sdsi_meter_cert_show(struct sdsi_dev *s)
+static int sdsi_meter_cert_show(struct sdsi_dev *s, bool show_current)
{
char buf[METER_CERT_MAX_SIZE] = {0};
struct bundle_encoding_counter *bec;
struct meter_certificate *mc;
uint32_t count = 0;
FILE *cert_ptr;
+ char *cert_fname;
int ret, size;
char name[4];
@@ -348,7 +350,6 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s)
if (!s->regs.en_features.sdsi) {
fprintf(stderr, "SDSi feature is present but not enabled.\n");
- fprintf(stderr, " Unable to read meter certificate\n");
return -1;
}
@@ -363,15 +364,17 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s)
return ret;
}
- cert_ptr = fopen("meter_certificate", "r");
+ cert_fname = show_current ? "meter_current" : "meter_certificate";
+ cert_ptr = fopen(cert_fname, "r");
+
if (!cert_ptr) {
- perror("Could not open 'meter_certificate' file");
+ fprintf(stderr, "Could not open '%s' file: %s", cert_fname, strerror(errno));
return -1;
}
size = fread(buf, 1, sizeof(buf), cert_ptr);
if (!size) {
- fprintf(stderr, "Could not read 'meter_certificate' file\n");
+ fprintf(stderr, "Could not read '%s' file\n", cert_fname);
fclose(cert_ptr);
return -1;
}
@@ -738,7 +741,7 @@ static void sdsi_free_dev(struct sdsi_dev *s)
static void usage(char *prog)
{
- printf("Usage: %s [-l] [-d DEVNO [-i] [-s] [-m] [-a FILE] [-c FILE]]\n", prog);
+ printf("Usage: %s [-l] [-d DEVNO [-i] [-s] [-m | -C] [-a FILE] [-c FILE]\n", prog);
}
static void show_help(void)
@@ -747,8 +750,9 @@ static void show_help(void)
printf(" %-18s\t%s\n", "-l, --list", "list available On Demand devices");
printf(" %-18s\t%s\n", "-d, --devno DEVNO", "On Demand device number");
printf(" %-18s\t%s\n", "-i, --info", "show socket information");
- printf(" %-18s\t%s\n", "-s, --state", "show state certificate");
- printf(" %-18s\t%s\n", "-m, --meter", "show meter certificate");
+ printf(" %-18s\t%s\n", "-s, --state", "show state certificate data");
+ printf(" %-18s\t%s\n", "-m, --meter", "show meter certificate data");
+ printf(" %-18s\t%s\n", "-C, --meter_current", "show live unattested meter data");
printf(" %-18s\t%s\n", "-a, --akc FILE", "provision socket with AKC FILE");
printf(" %-18s\t%s\n", "-c, --cap FILE>", "provision socket with CAP FILE");
}
@@ -764,21 +768,22 @@ int main(int argc, char *argv[])
int option_index = 0;
static struct option long_options[] = {
- {"akc", required_argument, 0, 'a'},
- {"cap", required_argument, 0, 'c'},
- {"devno", required_argument, 0, 'd'},
- {"help", no_argument, 0, 'h'},
- {"info", no_argument, 0, 'i'},
- {"list", no_argument, 0, 'l'},
- {"meter", no_argument, 0, 'm'},
- {"state", no_argument, 0, 's'},
- {0, 0, 0, 0 }
+ {"akc", required_argument, 0, 'a'},
+ {"cap", required_argument, 0, 'c'},
+ {"devno", required_argument, 0, 'd'},
+ {"help", no_argument, 0, 'h'},
+ {"info", no_argument, 0, 'i'},
+ {"list", no_argument, 0, 'l'},
+ {"meter", no_argument, 0, 'm'},
+ {"meter_current", no_argument, 0, 'C'},
+ {"state", no_argument, 0, 's'},
+ {0, 0, 0, 0 }
};
progname = argv[0];
- while ((opt = getopt_long_only(argc, argv, "+a:c:d:hilms", long_options,
+ while ((opt = getopt_long_only(argc, argv, "+a:c:d:hilmCs", long_options,
&option_index)) != -1) {
switch (opt) {
case 'd':
@@ -794,6 +799,9 @@ int main(int argc, char *argv[])
case 'm':
command = CMD_METER_CERT;
break;
+ case 'C':
+ command = CMD_METER_CURRENT_CERT;
+ break;
case 's':
command = CMD_STATE_CERT;
break;
@@ -832,7 +840,10 @@ int main(int argc, char *argv[])
ret = sdsi_read_reg(s);
break;
case CMD_METER_CERT:
- ret = sdsi_meter_cert_show(s);
+ ret = sdsi_meter_cert_show(s, false);
+ break;
+ case CMD_METER_CURRENT_CERT:
+ ret = sdsi_meter_cert_show(s, true);
break;
case CMD_STATE_CERT:
ret = sdsi_state_cert_show(s);
--
2.34.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH V3 6/9] tools/arch/x86/intel_sdsi: Fix meter_show display
2024-04-05 3:25 ` [PATCH V3 6/9] tools/arch/x86/intel_sdsi: Fix meter_show display David E. Box
@ 2024-04-05 14:29 ` Kuppuswamy Sathyanarayanan
2024-04-08 17:13 ` Ilpo Järvinen
1 sibling, 0 replies; 17+ messages in thread
From: Kuppuswamy Sathyanarayanan @ 2024-04-05 14:29 UTC (permalink / raw
To: David E. Box, hdegoede, ilpo.jarvinen, platform-driver-x86,
linux-kernel
On 4/4/24 8:25 PM, 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 the
> ASCII name of the signature, and fixes the print alignment.
>
> 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>
> ---
Looks good to me.
Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
> V3 - Change patch subject and changelog to clarify changes.
> - Use new BUNDLE_COUNT #def
>
> 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 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 {
> };
>
> 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;
> };
> @@ -338,6 +339,7 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s)
> uint32_t count = 0;
> FILE *cert_ptr;
> int ret, size;
> + char name[4];
>
> ret = sdsi_update_registers(s);
> if (ret)
> @@ -379,12 +381,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;
> @@ -398,7 +407,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: %ld\n", BUNDLE_COUNT(mc->bundle_length));
> while (count++ < mc->bundle_length / 8) {
> char feature[5];
>
--
Sathyanarayanan Kuppuswamy
Linux Kernel Developer
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH V3 1/9] platform/x86/intel/sdsi: Set message size during writes
2024-04-05 3:24 ` [PATCH V3 1/9] platform/x86/intel/sdsi: Set message size during writes David E. Box
@ 2024-04-05 14:29 ` Kuppuswamy Sathyanarayanan
0 siblings, 0 replies; 17+ messages in thread
From: Kuppuswamy Sathyanarayanan @ 2024-04-05 14:29 UTC (permalink / raw
To: David E. Box, hdegoede, ilpo.jarvinen, platform-driver-x86,
linux-kernel
On 4/4/24 8:24 PM, David E. Box wrote:
> New mailbox commands will support sending multi packet writes and updated
> firmware now requires that the message size be written for all commands
> along with the packet size. Since the driver doesn't perform writes larger
> than the packet size, set the message size to the same value.
>
> Signed-off-by: David E. Box <david.e.box@linux.intel.com>
> Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
> ---
Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
>
> V3 - no changes
> V2 - no changes
>
> drivers/platform/x86/intel/sdsi.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/platform/x86/intel/sdsi.c b/drivers/platform/x86/intel/sdsi.c
> index 556e7c6dbb05..a70c071de6e2 100644
> --- a/drivers/platform/x86/intel/sdsi.c
> +++ b/drivers/platform/x86/intel/sdsi.c
> @@ -252,6 +252,7 @@ static int sdsi_mbox_cmd_write(struct sdsi_priv *priv, struct sdsi_mbox_info *in
> FIELD_PREP(CTRL_SOM, 1) |
> FIELD_PREP(CTRL_RUN_BUSY, 1) |
> FIELD_PREP(CTRL_READ_WRITE, 1) |
> + FIELD_PREP(CTRL_MSG_SIZE, info->size) |
> FIELD_PREP(CTRL_PACKET_SIZE, info->size);
> writeq(control, priv->control_addr);
>
--
Sathyanarayanan Kuppuswamy
Linux Kernel Developer
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH V3 5/9] tools/arch/x86/intel_sdsi: Fix maximum meter bundle length
2024-04-05 3:25 ` [PATCH V3 5/9] tools/arch/x86/intel_sdsi: Fix maximum meter bundle length David E. Box
@ 2024-04-08 16:59 ` Ilpo Järvinen
0 siblings, 0 replies; 17+ messages in thread
From: Ilpo Järvinen @ 2024-04-08 16:59 UTC (permalink / raw
To: David E. Box
Cc: Hans de Goede, platform-driver-x86, LKML,
sathyanarayanan.kuppuswamy
[-- Attachment #1: Type: text/plain, Size: 2256 bytes --]
On Thu, 4 Apr 2024, David E. Box wrote:
> The maximum number of bundles in the meter certificate was set to 8 which
> is much less than the maximum. Instead, since the bundles appear at the end
> of the file, set it based on the remaining file size from the bundle start
> position.
>
> 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 - Add suggested macros for the number of bundles and bundle size.
>
> V2 - Split of V1 patch 7
>
> tools/arch/x86/intel_sdsi/intel_sdsi.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/tools/arch/x86/intel_sdsi/intel_sdsi.c b/tools/arch/x86/intel_sdsi/intel_sdsi.c
> index 2cd92761f171..7eaffcbff788 100644
> --- a/tools/arch/x86/intel_sdsi/intel_sdsi.c
> +++ b/tools/arch/x86/intel_sdsi/intel_sdsi.c
> @@ -43,7 +43,6 @@
> #define METER_CERT_MAX_SIZE 4096
> #define STATE_MAX_NUM_LICENSES 16
> #define STATE_MAX_NUM_IN_BUNDLE (uint32_t)8
> -#define METER_MAX_NUM_BUNDLES 8
>
> #define __round_mask(x, y) ((__typeof__(x))((y) - 1))
> #define round_up(x, y) ((((x) - 1) | __round_mask(x, y)) + 1)
> @@ -167,6 +166,11 @@ struct bundle_encoding_counter {
> uint32_t encoding;
> uint32_t counter;
> };
> +#define METER_BUNDLE_SIZE sizeof(struct bundle_encoding_counter)
> +#define BUNDLE_COUNT(length) ((length) / METER_BUNDLE_SIZE)
> +#define METER_MAX_NUM_BUNDLES \
> + ((METER_CERT_MAX_SIZE - sizeof(struct meter_certificate)) / \
> + sizeof(struct bundle_encoding_counter))
>
> struct sdsi_dev {
> struct sdsi_regs regs;
> @@ -386,9 +390,9 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s)
> return -1;
> }
>
> - if (mc->bundle_length > METER_MAX_NUM_BUNDLES * 8) {
> - fprintf(stderr, "More than %d bundles: %d\n",
> - METER_MAX_NUM_BUNDLES, mc->bundle_length / 8);
> + if (mc->bundle_length > METER_MAX_NUM_BUNDLES * METER_BUNDLE_SIZE) {
> + fprintf(stderr, "More than %ld bundles: actual %ld\n",
> + METER_MAX_NUM_BUNDLES, BUNDLE_COUNT(mc->bundle_length));
> return -1;
> }
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
--
i.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH V3 7/9] tools/arch/x86/intel_sdsi: Fix meter_certificate decoding
2024-04-05 3:25 ` [PATCH V3 7/9] tools/arch/x86/intel_sdsi: Fix meter_certificate decoding David E. Box
@ 2024-04-08 17:10 ` Ilpo Järvinen
0 siblings, 0 replies; 17+ messages in thread
From: Ilpo Järvinen @ 2024-04-08 17:10 UTC (permalink / raw
To: David E. Box
Cc: Hans de Goede, platform-driver-x86, LKML,
sathyanarayanan.kuppuswamy
On Thu, 4 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 <david.e.box@linux.intel.com>
> Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
> ---
>
> V3 - Use macros for bundle size and count
>
> V2 - Split of V1 patch 7
>
> tools/arch/x86/intel_sdsi/intel_sdsi.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/tools/arch/x86/intel_sdsi/intel_sdsi.c b/tools/arch/x86/intel_sdsi/intel_sdsi.c
> index a0711177e1bb..45bc69e6718e 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 = (void *)(mc) + sizeof(*mc);
The first (mc) doesn't need parenthesis. But this could be rewritten to
avoid void * entirely:
bec = (struct bundle_encoding_counter *)(mc + 1);
--
i.
> 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;
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH V3 6/9] tools/arch/x86/intel_sdsi: Fix meter_show display
2024-04-05 3:25 ` [PATCH V3 6/9] tools/arch/x86/intel_sdsi: Fix meter_show display David E. Box
2024-04-05 14:29 ` Kuppuswamy Sathyanarayanan
@ 2024-04-08 17:13 ` Ilpo Järvinen
1 sibling, 0 replies; 17+ messages in thread
From: Ilpo Järvinen @ 2024-04-08 17:13 UTC (permalink / raw
To: David E. Box
Cc: Hans de Goede, platform-driver-x86, LKML,
sathyanarayanan.kuppuswamy
[-- Attachment #1: Type: text/plain, Size: 3173 bytes --]
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 the
> ASCII name of the signature, and fixes the print alignment.
>
> 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
>
> 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 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 {
> };
>
> 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;
> };
> @@ -338,6 +339,7 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s)
> uint32_t count = 0;
> FILE *cert_ptr;
> int ret, size;
> + char name[4];
>
> ret = sdsi_update_registers(s);
> if (ret)
> @@ -379,12 +381,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;
> @@ -398,7 +407,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: %ld\n", BUNDLE_COUNT(mc->bundle_length));
> while (count++ < mc->bundle_length / 8) {
> char feature[5];
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
--
i.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH V3 8/9] platform/x86/intel/sdsi: Simplify ascii printing
2024-04-05 3:25 ` [PATCH V3 8/9] platform/x86/intel/sdsi: Simplify ascii printing David E. Box
@ 2024-04-08 17:22 ` Ilpo Järvinen
2024-04-08 22:11 ` David E. Box
0 siblings, 1 reply; 17+ messages in thread
From: Ilpo Järvinen @ 2024-04-08 17:22 UTC (permalink / raw
To: David E. Box
Cc: Hans de Goede, platform-driver-x86, LKML,
sathyanarayanan.kuppuswamy
On Thu, 4 Apr 2024, David E. Box wrote:
> Use printf width specifier to set the display length of encoded feature
> names.
>
> Signed-off-by: David E. Box <david.e.box@linux.intel.com>
> Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
> ---
>
> V3 - Add FEAT_LEN #def
>
> V2 - Split of V1 patch 7
>
> tools/arch/x86/intel_sdsi/intel_sdsi.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/tools/arch/x86/intel_sdsi/intel_sdsi.c b/tools/arch/x86/intel_sdsi/intel_sdsi.c
> index 45bc69e6718e..0c9670ba1f15 100644
> --- a/tools/arch/x86/intel_sdsi/intel_sdsi.c
> +++ b/tools/arch/x86/intel_sdsi/intel_sdsi.c
> @@ -43,6 +43,7 @@
> #define METER_CERT_MAX_SIZE 4096
> #define STATE_MAX_NUM_LICENSES 16
> #define STATE_MAX_NUM_IN_BUNDLE (uint32_t)8
> +#define FEAT_LEN 4
>
> #define __round_mask(x, y) ((__typeof__(x))((y) - 1))
> #define round_up(x, y) ((((x) - 1) | __round_mask(x, y)) + 1)
> @@ -409,11 +410,10 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s)
>
> printf("Number of Feature Counters: %ld\n", BUNDLE_COUNT(mc->bundle_length));
> while (count < BUNDLE_COUNT(mc->bundle_length)) {
> - char feature[5];
> + char feature[FEAT_LEN];
>
> - feature[4] = '\0';
> get_feature(bec[count].encoding, feature);
> - printf(" %s: %d\n", feature, bec[count].counter);
> + printf(" %.4s: %d\n", feature, bec[count].counter);
> ++count;
> }
>
> @@ -494,7 +494,7 @@ static int sdsi_state_cert_show(struct sdsi_dev *s)
> sizeof(*lki) + // size of the license key info
> offset; // offset to this blob content
> struct bundle_encoding *bundle = (void *)(lbc) + sizeof(*lbc);
> - char feature[5];
> + char feature[FEAT_LEN];
> uint32_t i;
>
> printf(" Blob %d:\n", count - 1);
> @@ -507,11 +507,9 @@ static int sdsi_state_cert_show(struct sdsi_dev *s)
> printf(" Blob revision ID: %u\n", lbc->rev_id);
> printf(" Number of Features: %u\n", lbc->num_bundles);
>
> - feature[4] = '\0';
> -
> for (i = 0; i < min(lbc->num_bundles, STATE_MAX_NUM_IN_BUNDLE); i++) {
> get_feature(bundle[i].encoding, feature);
> - printf(" Feature %d: %s\n", i, feature);
> + printf(" Feature %d: %.4s\n", i, feature);
> }
>
> if (lbc->num_bundles > STATE_MAX_NUM_IN_BUNDLE)
>
Hi,
After staring this for a while, I cannot get rid of the feeling that the
removal of NUL termination is a step into wrong direction. But IMO,
instead of the caller side, the NUL termination could be added inside
get_feature().
--
i.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH V3 8/9] platform/x86/intel/sdsi: Simplify ascii printing
2024-04-08 17:22 ` Ilpo Järvinen
@ 2024-04-08 22:11 ` David E. Box
0 siblings, 0 replies; 17+ messages in thread
From: David E. Box @ 2024-04-08 22:11 UTC (permalink / raw
To: Ilpo Järvinen
Cc: Hans de Goede, platform-driver-x86, LKML,
sathyanarayanan.kuppuswamy
On Mon, 2024-04-08 at 20:22 +0300, Ilpo Järvinen wrote:
> On Thu, 4 Apr 2024, David E. Box wrote:
>
> > Use printf width specifier to set the display length of encoded feature
> > names.
> >
> > Signed-off-by: David E. Box <david.e.box@linux.intel.com>
> > Reviewed-by: Kuppuswamy Sathyanarayanan
> > <sathyanarayanan.kuppuswamy@linux.intel.com>
> > ---
> >
> > V3 - Add FEAT_LEN #def
> >
> > V2 - Split of V1 patch 7
> >
> > tools/arch/x86/intel_sdsi/intel_sdsi.c | 13 ++++++-------
> > 1 file changed, 6 insertions(+), 7 deletions(-)
> >
> > diff --git a/tools/arch/x86/intel_sdsi/intel_sdsi.c
> > b/tools/arch/x86/intel_sdsi/intel_sdsi.c
> > index 45bc69e6718e..0c9670ba1f15 100644
> > --- a/tools/arch/x86/intel_sdsi/intel_sdsi.c
> > +++ b/tools/arch/x86/intel_sdsi/intel_sdsi.c
> > @@ -43,6 +43,7 @@
> > #define METER_CERT_MAX_SIZE 4096
> > #define STATE_MAX_NUM_LICENSES 16
> > #define STATE_MAX_NUM_IN_BUNDLE (uint32_t)8
> > +#define FEAT_LEN 4
> >
> > #define __round_mask(x, y) ((__typeof__(x))((y) - 1))
> > #define round_up(x, y) ((((x) - 1) | __round_mask(x, y)) + 1)
> > @@ -409,11 +410,10 @@ static int sdsi_meter_cert_show(struct sdsi_dev *s)
> >
> > printf("Number of Feature Counters: %ld\n", BUNDLE_COUNT(mc-
> > >bundle_length));
> > while (count < BUNDLE_COUNT(mc->bundle_length)) {
> > - char feature[5];
> > + char feature[FEAT_LEN];
> >
> > - feature[4] = '\0';
> > get_feature(bec[count].encoding, feature);
> > - printf(" %s: %d\n", feature,
> > bec[count].counter);
> > + printf(" %.4s: %d\n", feature,
> > bec[count].counter);
> > ++count;
> > }
> >
> > @@ -494,7 +494,7 @@ static int sdsi_state_cert_show(struct sdsi_dev *s)
> > sizeof(*lki) + // size of the
> > license key info
> > offset; // offset
> > to this blob content
> > struct bundle_encoding *bundle = (void *)(lbc) +
> > sizeof(*lbc);
> > - char feature[5];
> > + char feature[FEAT_LEN];
> > uint32_t i;
> >
> > printf(" Blob %d:\n", count - 1);
> > @@ -507,11 +507,9 @@ static int sdsi_state_cert_show(struct sdsi_dev *s)
> > printf(" Blob revision ID: %u\n", lbc-
> > >rev_id);
> > printf(" Number of Features: %u\n", lbc-
> > >num_bundles);
> >
> > - feature[4] = '\0';
> > -
> > for (i = 0; i < min(lbc->num_bundles,
> > STATE_MAX_NUM_IN_BUNDLE); i++) {
> > get_feature(bundle[i].encoding, feature);
> > - printf(" Feature %d: %s\n",
> > i, feature);
> > + printf(" Feature %d:
> > %.4s\n", i, feature);
> > }
> >
> > if (lbc->num_bundles > STATE_MAX_NUM_IN_BUNDLE)
> >
>
> Hi,
>
> After staring this for a while, I cannot get rid of the feeling that the
> removal of NUL termination is a step into wrong direction. But IMO,
> instead of the caller side, the NUL termination could be added inside
> get_feature().
Yeah, you're right. I'll make this change.
David
>
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2024-04-08 22:11 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-05 3:24 [PATCH V3 0/9] Intel On Demand changes David E. Box
2024-04-05 3:24 ` [PATCH V3 1/9] platform/x86/intel/sdsi: Set message size during writes David E. Box
2024-04-05 14:29 ` Kuppuswamy Sathyanarayanan
2024-04-05 3:25 ` [PATCH V3 2/9] platform/x86/intel/sdsi: Combine read and write mailbox flows David E. Box
2024-04-05 3:25 ` [PATCH V3 3/9] platform/x86/intel/sdsi: Add in-band BIOS lock support David E. Box
2024-04-05 3:25 ` [PATCH V3 4/9] platform/x86/intel/sdsi: Add attribute to read the current meter state David E. Box
2024-04-05 3:25 ` [PATCH V3 5/9] tools/arch/x86/intel_sdsi: Fix maximum meter bundle length David E. Box
2024-04-08 16:59 ` Ilpo Järvinen
2024-04-05 3:25 ` [PATCH V3 6/9] tools/arch/x86/intel_sdsi: Fix meter_show display David E. Box
2024-04-05 14:29 ` Kuppuswamy Sathyanarayanan
2024-04-08 17:13 ` Ilpo Järvinen
2024-04-05 3:25 ` [PATCH V3 7/9] tools/arch/x86/intel_sdsi: Fix meter_certificate decoding David E. Box
2024-04-08 17:10 ` Ilpo Järvinen
2024-04-05 3:25 ` [PATCH V3 8/9] platform/x86/intel/sdsi: Simplify ascii printing David E. Box
2024-04-08 17:22 ` Ilpo Järvinen
2024-04-08 22:11 ` David E. Box
2024-04-05 3:25 ` [PATCH V3 9/9] tools: intel_sdsi: Add current meter support David E. Box
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).