From: Tom Lendacky <thomas.lendacky@amd.com>
To: Mario Limonciello <mario.limonciello@amd.com>,
Herbert Xu <herbert@gondor.apana.org.au>,
John Allen <john.allen@amd.com>
Cc: "David S . Miller" <davem@davemloft.net>,
linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org
Subject: Re: [PATCH 02/10] crypto: ccp: Add support for displaying PSP firmware versions
Date: Thu, 20 Apr 2023 14:17:06 -0500 [thread overview]
Message-ID: <2a296473-3abb-a1d0-93c6-42b074ca9f7f@amd.com> (raw)
In-Reply-To: <20230420163140.14940-3-mario.limonciello@amd.com>
On 4/20/23 11:31, Mario Limonciello wrote:
> As it's not always obvious what PSP bootloader or TEE version are
> present in OEM systems, add the ability to get this information from
> sysfs for supported platforms.
>
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
> ---
> Documentation/ABI/testing/sysfs-driver-ccp | 18 +++++++
> drivers/crypto/ccp/sp-dev.h | 2 +
> drivers/crypto/ccp/sp-pci.c | 58 ++++++++++++++++++++++
> 3 files changed, 78 insertions(+)
>
> diff --git a/Documentation/ABI/testing/sysfs-driver-ccp b/Documentation/ABI/testing/sysfs-driver-ccp
> index 7aded9b75553..ee6b787eee7a 100644
> --- a/Documentation/ABI/testing/sysfs-driver-ccp
> +++ b/Documentation/ABI/testing/sysfs-driver-ccp
> @@ -85,3 +85,21 @@ Description:
> Possible values:
> 0: Not enforced
> 1: Enforced
> +
> +What: /sys/bus/pci/devices/<BDF>/bootloader_version
> +Date: June 2023
> +KernelVersion: 6.4
> +Contact: mario.limonciello@amd.com
> +Description:
> + The /sys/bus/pci/devices/<BDF>/bootloader_version
> + file reports the firmware version of the AMD AGESA
> + bootloader.
> +
> +What: /sys/bus/pci/devices/<BDF>/tee_version
> +Date: June 2023
> +KernelVersion: 6.4
> +Contact: mario.limonciello@amd.com
> +Description:
> + The /sys/bus/pci/devices/<BDF>/tee_version
> + file reports the firmware version of the AMD Trusted
> + Execution Environment (TEE).
> diff --git a/drivers/crypto/ccp/sp-dev.h b/drivers/crypto/ccp/sp-dev.h
> index 1253a0217985..76c32ee6bd65 100644
> --- a/drivers/crypto/ccp/sp-dev.h
> +++ b/drivers/crypto/ccp/sp-dev.h
> @@ -51,6 +51,7 @@ struct tee_vdata {
> const unsigned int cmdbuff_addr_hi_reg;
> const unsigned int ring_wptr_reg;
> const unsigned int ring_rptr_reg;
> + const unsigned int info_reg;
> };
>
> struct platform_access_vdata {
> @@ -69,6 +70,7 @@ struct psp_vdata {
> const unsigned int feature_reg;
> const unsigned int inten_reg;
> const unsigned int intsts_reg;
> + const unsigned int bootloader_info_reg;
> };
>
> /* Structure to hold SP device data */
> diff --git a/drivers/crypto/ccp/sp-pci.c b/drivers/crypto/ccp/sp-pci.c
> index 85e3dc8853e2..4d729aa1b260 100644
> --- a/drivers/crypto/ccp/sp-pci.c
> +++ b/drivers/crypto/ccp/sp-pci.c
> @@ -8,6 +8,7 @@
> * Author: Gary R Hook <gary.hook@amd.com>
> */
>
> +#include <linux/bitfield.h>
> #include <linux/module.h>
> #include <linux/kernel.h>
> #include <linux/device.h>
> @@ -88,8 +89,65 @@ static struct attribute_group psp_security_attr_group = {
> .is_visible = psp_security_is_visible,
> };
>
> +#define version_attribute_show(name, _offset) \
> +static ssize_t name##_show(struct device *d, struct device_attribute *attr, \
> + char *buf) \
> +{ \
> + struct sp_device *sp = dev_get_drvdata(d); \
> + struct psp_device *psp = sp->psp_data; \
> + unsigned int val = ioread32(psp->io_regs + _offset); \
> + return sysfs_emit(buf, "%02lx.%02lx.%02lx.%02lx\n", \
> + FIELD_GET(GENMASK(31, 24), val), \
> + FIELD_GET(GENMASK(23, 16), val), \
> + FIELD_GET(GENMASK(15, 8), val), \
> + FIELD_GET(GENMASK(7, 0), val)); \
> +}
> +
> +version_attribute_show(bootloader_version, psp->vdata->bootloader_info_reg)
> +static DEVICE_ATTR_RO(bootloader_version);
> +version_attribute_show(tee_version, psp->vdata->tee->info_reg)
> +static DEVICE_ATTR_RO(tee_version);
> +
> +static struct attribute *psp_firmware_attrs[] = {
> + &dev_attr_bootloader_version.attr,
> + &dev_attr_tee_version.attr,
> + NULL,
> +};
> +
> +static umode_t psp_firmware_is_visible(struct kobject *kobj, struct attribute *attr, int idx)
> +{
> + struct device *dev = kobj_to_dev(kobj);
> + struct sp_device *sp = dev_get_drvdata(dev);
> + struct psp_device *psp = sp->psp_data;
> + unsigned int val = 0xffffffff;
> +
> + if (!psp)
> + return 0;
> +
> + if (attr == &dev_attr_bootloader_version.attr &&
> + psp->vdata->bootloader_info_reg)
> + val = ioread32(psp->io_regs + psp->vdata->bootloader_info_reg);
> +
> + if (attr == &dev_attr_tee_version.attr &&
> + psp->capability & PSP_CAPABILITY_TEE &&
> + psp->vdata->tee->info_reg)
> + val = ioread32(psp->io_regs + psp->vdata->tee->info_reg);
> +
> +
Extra blank line.
Also, add a comment about how the PSP security policy might block access
to these areas resulting in reading all f's, so this hides the sysfs
attribute in that case.
Thanks,
Tom
> + if (val != 0xffffffff)
> + return 0444;
> +
> + return 0;
> +}
> +
> +static struct attribute_group psp_firmware_attr_group = {
> + .attrs = psp_firmware_attrs,
> + .is_visible = psp_firmware_is_visible,
> +};
> +
> static const struct attribute_group *psp_groups[] = {
> &psp_security_attr_group,
> + &psp_firmware_attr_group,
> NULL,
> };
>
next prev parent reply other threads:[~2023-04-20 19:17 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-20 16:31 [PATCH 00/10] Add dynamic boost control support Mario Limonciello
2023-04-20 16:31 ` [PATCH 01/10] crypto: ccp: Rename macro for security attributes Mario Limonciello
2023-04-20 16:31 ` [PATCH 02/10] crypto: ccp: Add support for displaying PSP firmware versions Mario Limonciello
2023-04-20 19:17 ` Tom Lendacky [this message]
2023-04-20 16:31 ` [PATCH 03/10] crypto: ccp: Add bootloader and TEE version offsets Mario Limonciello
2023-04-20 16:31 ` [PATCH 04/10] crypto: ccp: move setting PSP master to earlier in the init Mario Limonciello
2023-04-20 16:31 ` [PATCH 05/10] crypto: ccp: Add support for fetching a nonce for dynamic boost control Mario Limonciello
2023-04-20 16:31 ` [PATCH 06/10] crypto: ccp: Add support for setting user ID " Mario Limonciello
2023-04-20 16:31 ` [PATCH 07/10] crypto: ccp: Add support for getting and setting DBC parameters Mario Limonciello
2023-04-20 16:31 ` [PATCH 08/10] crypto: ccp: Add a sample script for Dynamic Boost Control Mario Limonciello
2023-04-20 16:31 ` [PATCH 09/10] crypto: ccp: Add unit tests for dynamic boost control Mario Limonciello
2023-04-20 16:31 ` [PATCH 10/10] crypto: ccp: Add Mario to MAINTAINERS Mario Limonciello
2023-04-26 13:47 ` [PATCH 00/10] Add dynamic boost control support Pavel Machek
2023-04-26 14:43 ` Mario Limonciello
2023-07-15 6:23 ` Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2a296473-3abb-a1d0-93c6-42b074ca9f7f@amd.com \
--to=thomas.lendacky@amd.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=john.allen@amd.com \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mario.limonciello@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 NNTP newsgroup(s).