crypto: ccp - Represent capabilities register as a union

Making the capabilities register a union makes it easier to refer
to the members instead of always doing bit shifts.

No intended functional changes.

Acked-by: Tom Lendacky <thomas.lendacky@amd.com>
Suggested-by: Yazen Ghannam <yazen.ghannam@amd.com>
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/ccp/dbc.c b/drivers/crypto/ccp/dbc.c
index d373caab52f886799c4ca58b1e9011dbefcd86ee..5b105a23f6997c90f3a54b38376be941f79a9665 100644 (file)
--- a/drivers/crypto/ccp/dbc.c
+++ b/drivers/crypto/ccp/dbc.c
@@ -223,7 +223,7 @@ int dbc_dev_init(struct psp_device *psp)
        dbc_dev->dev = dev;
        dbc_dev->psp = psp;
 
-       if (PSP_CAPABILITY(psp, DBC_THRU_EXT)) {
+       if (psp->capability.dbc_thru_ext) {
                dbc_dev->use_ext = true;
                dbc_dev->payload_size = &dbc_dev->mbox->ext_req.header.payload_size;
                dbc_dev->result = &dbc_dev->mbox->ext_req.header.status;

diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c
index 56bf832c2947775efaffc81eac68baa68aee9144..7d9d2042be35d82c6e82282b4e41c1c87a60fb4c 100644 (file)
--- a/drivers/crypto/ccp/psp-dev.c
+++ b/drivers/crypto/ccp/psp-dev.c
@@ -154,11 +154,10 @@ static unsigned int psp_get_capability(struct psp_device *psp)
                dev_notice(psp->dev, "psp: unable to access the device: you might be running a broken BIOS.\n");
                return -ENODEV;
        }
-       psp->capability = val;
+       psp->capability.raw = val;
 
        /* Detect TSME and/or SME status */
-       if (PSP_CAPABILITY(psp, PSP_SECURITY_REPORTING) &&
-           psp->capability & (PSP_SECURITY_TSME_STATUS << PSP_CAPABILITY_PSP_SECURITY_OFFSET)) {
+       if (psp->capability.security_reporting && psp->capability.tsme_status) {
                if (cc_platform_has(CC_ATTR_HOST_MEM_ENCRYPT))
                        dev_notice(psp->dev, "psp: Both TSME and SME are active, SME is unnecessary when TSME is active.\n");
                else
@@ -171,7 +170,7 @@ static unsigned int psp_get_capability(struct psp_device *psp)
 static int psp_check_sev_support(struct psp_device *psp)
 {
        /* Check if device supports SEV feature */
-       if (!PSP_CAPABILITY(psp, SEV)) {
+       if (!psp->capability.sev) {
                dev_dbg(psp->dev, "psp does not support SEV\n");
                return -ENODEV;
        }
@@ -182,7 +181,7 @@ static int psp_check_sev_support(struct psp_device *psp)
 static int psp_check_tee_support(struct psp_device *psp)
 {
        /* Check if device supports TEE feature */
-       if (!PSP_CAPABILITY(psp, TEE)) {
+       if (!psp->capability.tee) {
                dev_dbg(psp->dev, "psp does not support TEE\n");
                return -ENODEV;
        }
@@ -214,7 +213,7 @@ static int psp_init(struct psp_device *psp)
 
        /* dbc must come after platform access as it tests the feature */
        if (PSP_FEATURE(psp, DBC) ||
-           PSP_CAPABILITY(psp, DBC_THRU_EXT)) {
+           psp->capability.dbc_thru_ext) {
                ret = dbc_dev_init(psp);
                if (ret)
                        return ret;

diff --git a/drivers/crypto/ccp/psp-dev.h b/drivers/crypto/ccp/psp-dev.h
index ae582ba637295d57654abf251f5b711d5944e058..02a7c94c02df4b7451ae9910dc49cb4f79716417 100644 (file)
--- a/drivers/crypto/ccp/psp-dev.h
+++ b/drivers/crypto/ccp/psp-dev.h
@@ -26,6 +26,29 @@ extern struct psp_device *psp_master;
 
 typedef void (*psp_irq_handler_t)(int, void *, unsigned int);
 
+union psp_cap_register {
+       unsigned int raw;
+       struct {
+               unsigned int sev                        :1,
+                            tee                        :1,
+                            dbc_thru_ext               :1,
+                            rsvd1                      :4,
+                            security_reporting         :1,
+                            fused_part                 :1,
+                            rsvd2                      :1,
+                            debug_lock_on              :1,
+                            rsvd3                      :2,
+                            tsme_status                :1,
+                            rsvd4                      :1,
+                            anti_rollback_status       :1,
+                            rpmc_production_enabled    :1,
+                            rpmc_spirom_available      :1,
+                            hsp_tpm_available          :1,
+                            rom_armor_enforced         :1,
+                            rsvd5                      :12;
+       };
+};
+
 struct psp_device {
        struct list_head entry;
 
@@ -46,7 +69,7 @@ struct psp_device {
        void *platform_access_data;
        void *dbc_data;
 
-       unsigned int capability;
+       union psp_cap_register capability;
 };
 
 void psp_set_sev_irq_handler(struct psp_device *psp, psp_irq_handler_t handler,
@@ -55,26 +78,7 @@ void psp_clear_sev_irq_handler(struct psp_device *psp);
 
 struct psp_device *psp_get_master_device(void);
 
-#define PSP_CAPABILITY_SEV                     BIT(0)
-#define PSP_CAPABILITY_TEE                     BIT(1)
-#define PSP_CAPABILITY_DBC_THRU_EXT            BIT(2)
-#define PSP_CAPABILITY_PSP_SECURITY_REPORTING  BIT(7)
-
 #define PSP_CAPABILITY_PSP_SECURITY_OFFSET     8
-/*
- * The PSP doesn't directly store these bits in the capability register
- * but instead copies them from the results of query command.
- *
- * The offsets from the query command are below, and shifted when used.
- */
-#define PSP_SECURITY_FUSED_PART                        BIT(0)
-#define PSP_SECURITY_DEBUG_LOCK_ON             BIT(2)
-#define PSP_SECURITY_TSME_STATUS               BIT(5)
-#define PSP_SECURITY_ANTI_ROLLBACK_STATUS      BIT(7)
-#define PSP_SECURITY_RPMC_PRODUCTION_ENABLED   BIT(8)
-#define PSP_SECURITY_RPMC_SPIROM_AVAILABLE     BIT(9)
-#define PSP_SECURITY_HSP_TPM_AVAILABLE         BIT(10)
-#define PSP_SECURITY_ROM_ARMOR_ENFORCED                BIT(11)
 
 /**
  * enum psp_cmd - PSP mailbox commands

diff --git a/drivers/crypto/ccp/sp-dev.h b/drivers/crypto/ccp/sp-dev.h
index 03d5b9e04084828f8437eb78ad8dcb3a5d1ad739..c4e125efe6c706147f35dc605871912199e0405f 100644 (file)
--- a/drivers/crypto/ccp/sp-dev.h
+++ b/drivers/crypto/ccp/sp-dev.h
@@ -30,7 +30,6 @@
 
 #define PLATFORM_FEATURE_DBC           0x1
 
-#define PSP_CAPABILITY(psp, cap) (psp->capability & PSP_CAPABILITY_##cap)
 #define PSP_FEATURE(psp, feat) (psp->vdata && psp->vdata->platform_features & PLATFORM_FEATURE_##feat)
 
 /* Structure to hold CCP device data */

diff --git a/drivers/crypto/ccp/sp-pci.c b/drivers/crypto/ccp/sp-pci.c
index 300dda14182b8e08dd89bee6d16862ec6a80270d..b57392292af1012a391373b2931366da82d13254 100644 (file)
--- a/drivers/crypto/ccp/sp-pci.c
+++ b/drivers/crypto/ccp/sp-pci.c
@@ -39,31 +39,30 @@ struct sp_pci {
 };
 static struct sp_device *sp_dev_master;
 
-#define security_attribute_show(name, def)                                     \
+#define security_attribute_show(name)                                          \
 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;                                  \
-       int bit = PSP_SECURITY_##def << PSP_CAPABILITY_PSP_SECURITY_OFFSET;     \
-       return sysfs_emit(buf, "%d\n", (psp->capability & bit) > 0);            \
+       return sysfs_emit(buf, "%d\n", psp->capability.name);                   \
 }
 
-security_attribute_show(fused_part, FUSED_PART)
+security_attribute_show(fused_part)
 static DEVICE_ATTR_RO(fused_part);
-security_attribute_show(debug_lock_on, DEBUG_LOCK_ON)
+security_attribute_show(debug_lock_on)
 static DEVICE_ATTR_RO(debug_lock_on);
-security_attribute_show(tsme_status, TSME_STATUS)
+security_attribute_show(tsme_status)
 static DEVICE_ATTR_RO(tsme_status);
-security_attribute_show(anti_rollback_status, ANTI_ROLLBACK_STATUS)
+security_attribute_show(anti_rollback_status)
 static DEVICE_ATTR_RO(anti_rollback_status);
-security_attribute_show(rpmc_production_enabled, RPMC_PRODUCTION_ENABLED)
+security_attribute_show(rpmc_production_enabled)
 static DEVICE_ATTR_RO(rpmc_production_enabled);
-security_attribute_show(rpmc_spirom_available, RPMC_SPIROM_AVAILABLE)
+security_attribute_show(rpmc_spirom_available)
 static DEVICE_ATTR_RO(rpmc_spirom_available);
-security_attribute_show(hsp_tpm_available, HSP_TPM_AVAILABLE)
+security_attribute_show(hsp_tpm_available)
 static DEVICE_ATTR_RO(hsp_tpm_available);
-security_attribute_show(rom_armor_enforced, ROM_ARMOR_ENFORCED)
+security_attribute_show(rom_armor_enforced)
 static DEVICE_ATTR_RO(rom_armor_enforced);
 
 static struct attribute *psp_security_attrs[] = {
@@ -84,7 +83,7 @@ static umode_t psp_security_is_visible(struct kobject *kobj, struct attribute *a
        struct sp_device *sp = dev_get_drvdata(dev);
        struct psp_device *psp = sp->psp_data;
 
-       if (psp && PSP_CAPABILITY(psp, PSP_SECURITY_REPORTING))
+       if (psp && psp->capability.security_reporting)
                return 0444;
 
        return 0;
@@ -134,8 +133,7 @@ static umode_t psp_firmware_is_visible(struct kobject *kobj, struct attribute *a
            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, TEE) &&
+       if (attr == &dev_attr_tee_version.attr && psp->capability.tee &&
            psp->vdata->tee->info_reg)
                val = ioread32(psp->io_regs + psp->vdata->tee->info_reg);