| Message ID | 20230428185543.8381-2-mario.limonciello@amd.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | Add dynamic boost control support | expand |
On 4/28/23 13:55, Mario Limonciello wrote: > The attribute_show() macro is only valid for determining the availability > of security related sysfs entries. Rename the macro to better show this > relationship. > > Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> Acked-by: Tom Lendacky <thomas.lendacky@amd.com> > --- > drivers/crypto/ccp/sp-pci.c | 26 +++++++++++++------------- > 1 file changed, 13 insertions(+), 13 deletions(-) > > diff --git a/drivers/crypto/ccp/sp-pci.c b/drivers/crypto/ccp/sp-pci.c > index aa15bc4cac2b..85e3dc8853e2 100644 > --- a/drivers/crypto/ccp/sp-pci.c > +++ b/drivers/crypto/ccp/sp-pci.c > @@ -32,7 +32,7 @@ struct sp_pci { > }; > static struct sp_device *sp_dev_master; > > -#define attribute_show(name, def) \ > +#define security_attribute_show(name, def) \ > static ssize_t name##_show(struct device *d, struct device_attribute *attr, \ > char *buf) \ > { \ > @@ -42,24 +42,24 @@ static ssize_t name##_show(struct device *d, struct device_attribute *attr, \ > return sysfs_emit(buf, "%d\n", (psp->capability & bit) > 0); \ > } > > -attribute_show(fused_part, FUSED_PART) > +security_attribute_show(fused_part, FUSED_PART) > static DEVICE_ATTR_RO(fused_part); > -attribute_show(debug_lock_on, DEBUG_LOCK_ON) > +security_attribute_show(debug_lock_on, DEBUG_LOCK_ON) > static DEVICE_ATTR_RO(debug_lock_on); > -attribute_show(tsme_status, TSME_STATUS) > +security_attribute_show(tsme_status, TSME_STATUS) > static DEVICE_ATTR_RO(tsme_status); > -attribute_show(anti_rollback_status, ANTI_ROLLBACK_STATUS) > +security_attribute_show(anti_rollback_status, ANTI_ROLLBACK_STATUS) > static DEVICE_ATTR_RO(anti_rollback_status); > -attribute_show(rpmc_production_enabled, RPMC_PRODUCTION_ENABLED) > +security_attribute_show(rpmc_production_enabled, RPMC_PRODUCTION_ENABLED) > static DEVICE_ATTR_RO(rpmc_production_enabled); > -attribute_show(rpmc_spirom_available, RPMC_SPIROM_AVAILABLE) > +security_attribute_show(rpmc_spirom_available, RPMC_SPIROM_AVAILABLE) > static DEVICE_ATTR_RO(rpmc_spirom_available); > -attribute_show(hsp_tpm_available, HSP_TPM_AVAILABLE) > +security_attribute_show(hsp_tpm_available, HSP_TPM_AVAILABLE) > static DEVICE_ATTR_RO(hsp_tpm_available); > -attribute_show(rom_armor_enforced, ROM_ARMOR_ENFORCED) > +security_attribute_show(rom_armor_enforced, ROM_ARMOR_ENFORCED) > static DEVICE_ATTR_RO(rom_armor_enforced); > > -static struct attribute *psp_attrs[] = { > +static struct attribute *psp_security_attrs[] = { > &dev_attr_fused_part.attr, > &dev_attr_debug_lock_on.attr, > &dev_attr_tsme_status.attr, > @@ -83,13 +83,13 @@ static umode_t psp_security_is_visible(struct kobject *kobj, struct attribute *a > return 0; > } > > -static struct attribute_group psp_attr_group = { > - .attrs = psp_attrs, > +static struct attribute_group psp_security_attr_group = { > + .attrs = psp_security_attrs, > .is_visible = psp_security_is_visible, > }; > > static const struct attribute_group *psp_groups[] = { > - &psp_attr_group, > + &psp_security_attr_group, > NULL, > }; >
diff --git a/drivers/crypto/ccp/sp-pci.c b/drivers/crypto/ccp/sp-pci.c index aa15bc4cac2b..85e3dc8853e2 100644 --- a/drivers/crypto/ccp/sp-pci.c +++ b/drivers/crypto/ccp/sp-pci.c @@ -32,7 +32,7 @@ struct sp_pci { }; static struct sp_device *sp_dev_master; -#define attribute_show(name, def) \ +#define security_attribute_show(name, def) \ static ssize_t name##_show(struct device *d, struct device_attribute *attr, \ char *buf) \ { \ @@ -42,24 +42,24 @@ static ssize_t name##_show(struct device *d, struct device_attribute *attr, \ return sysfs_emit(buf, "%d\n", (psp->capability & bit) > 0); \ } -attribute_show(fused_part, FUSED_PART) +security_attribute_show(fused_part, FUSED_PART) static DEVICE_ATTR_RO(fused_part); -attribute_show(debug_lock_on, DEBUG_LOCK_ON) +security_attribute_show(debug_lock_on, DEBUG_LOCK_ON) static DEVICE_ATTR_RO(debug_lock_on); -attribute_show(tsme_status, TSME_STATUS) +security_attribute_show(tsme_status, TSME_STATUS) static DEVICE_ATTR_RO(tsme_status); -attribute_show(anti_rollback_status, ANTI_ROLLBACK_STATUS) +security_attribute_show(anti_rollback_status, ANTI_ROLLBACK_STATUS) static DEVICE_ATTR_RO(anti_rollback_status); -attribute_show(rpmc_production_enabled, RPMC_PRODUCTION_ENABLED) +security_attribute_show(rpmc_production_enabled, RPMC_PRODUCTION_ENABLED) static DEVICE_ATTR_RO(rpmc_production_enabled); -attribute_show(rpmc_spirom_available, RPMC_SPIROM_AVAILABLE) +security_attribute_show(rpmc_spirom_available, RPMC_SPIROM_AVAILABLE) static DEVICE_ATTR_RO(rpmc_spirom_available); -attribute_show(hsp_tpm_available, HSP_TPM_AVAILABLE) +security_attribute_show(hsp_tpm_available, HSP_TPM_AVAILABLE) static DEVICE_ATTR_RO(hsp_tpm_available); -attribute_show(rom_armor_enforced, ROM_ARMOR_ENFORCED) +security_attribute_show(rom_armor_enforced, ROM_ARMOR_ENFORCED) static DEVICE_ATTR_RO(rom_armor_enforced); -static struct attribute *psp_attrs[] = { +static struct attribute *psp_security_attrs[] = { &dev_attr_fused_part.attr, &dev_attr_debug_lock_on.attr, &dev_attr_tsme_status.attr, @@ -83,13 +83,13 @@ static umode_t psp_security_is_visible(struct kobject *kobj, struct attribute *a return 0; } -static struct attribute_group psp_attr_group = { - .attrs = psp_attrs, +static struct attribute_group psp_security_attr_group = { + .attrs = psp_security_attrs, .is_visible = psp_security_is_visible, }; static const struct attribute_group *psp_groups[] = { - &psp_attr_group, + &psp_security_attr_group, NULL, };
The attribute_show() macro is only valid for determining the availability of security related sysfs entries. Rename the macro to better show this relationship. Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> --- drivers/crypto/ccp/sp-pci.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)