tpm: xen-tpmfront: Remove the locality sysfs attribute
PATCH 1/1 tpm: xen-tpmfront: Remove the locality sysfs attribute
Upon deeper review it was agreed to remove the driver-unique 'locality' sysfs attribute before it is present in a released kernel.
The attribute was introduced in e2683957fb268c6b29316fd9e7191e13239a30a5 during the 3.12 merge window, so this patch needs to go in before 3.12 is released.
The hope is to have a well defined locality API that all the other locality aware drivers can use, perhaps in 3.13.
--- drivers/char/tpm/xen-tpmfront.c | 29 ----------------------------- 1 file changed, 29 deletions(-)
Daniel, if you can Ack this..
Konrad: This driver was originally merged through you, can you pick this up?
Regards,
Jason
drivers/char/tpm/xen-tpmfront.c +0 -29
@@ -142,32 +142,6 @@ static int vtpm_recv(struct tpm_chip *chip, u8 *buf, size_t count)return length; } -ssize_t tpm_show_locality (struct device *dev,struct device_attribute *attr, -char *buf) -{ -struct tpm_chip *chip =dev_get_drvdata (dev); -struct tpm_private *priv =TPM_VPRIV (chip); -u8 locality = priv->shr->locality; - -return sprintf (buf,"%d\n" , locality); -} - -ssize_t tpm_store_locality (struct device *dev,struct device_attribute *attr, -const char *buf,size_t len) -{ -struct tpm_chip *chip =dev_get_drvdata (dev); -struct tpm_private *priv =TPM_VPRIV (chip); -u8 val; - -int rv =kstrtou8 (buf,0 , &val); -if (rv) -return rv; - - priv->shr->locality = val; - -return len; -} -static const struct file_operations vtpm_ops = { .owner =THIS_MODULE , .llseek = no_llseek,
@@ -188,8 +162,6 @@ static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps, NULL); static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel); static DEVICE_ATTR(durations, S_IRUGO, tpm_show_durations, NULL); static DEVICE_ATTR(timeouts, S_IRUGO, tpm_show_timeouts, NULL); -static DEVICE_ATTR(locality, S_IRUGO | S_IWUSR, tpm_show_locality, - tpm_store_locality);static struct attribute *vtpm_attrs[] = { &dev_attr_pubek.attr,
@@ -202,7 +174,6 @@ static struct attribute *vtpm_attrs[] = { &dev_attr_cancel.attr, &dev_attr_durations.attr, &dev_attr_timeouts.attr, - &dev_attr_locality.attr, NULL, };
Signature · 1 line
1.8.1.2
Quoted 11 lines · Jason Gunthorpe
Upon deeper review it was agreed to remove the driver-unique 'locality' sysfs attribute before it is present in a released kernel.
The attribute was introduced in
e2683957fb268c6b29316fd9e7191e13239a30a5during the 3.12 merge window, so this patch needs to go in before 3.12 is released.The hope is to have a well defined locality API that all the other locality aware drivers can use, perhaps in 3.13.
Quoted 6 lines
Signed-off-by Jason Gunthorpe <[email protected]>--- drivers/char/tpm/xen-tpmfront.c | 29 ----------------------------- 1 file changed, 29 deletions(-)Daniel, if you can Ack this..
Quoted 61 lines
Konrad: This driver was originally merged through you, can you pick this up?
Regards,
Jasondrivers/char/tpm/xen-tpmfront.c +0
-29@@ -142,32 +142,6 @@ static int vtpm_recv(struct tpm_chip *chip, u8 *buf, size_t count)return length; } -ssize_t tpm_show_locality (struct device *dev,struct device_attribute *attr, -char *buf) -{ -struct tpm_chip *chip =dev_get_drvdata (dev); -struct tpm_private *priv =TPM_VPRIV (chip); -u8 locality = priv->shr->locality; - -return sprintf (buf,"%d\n" , locality); -} - -ssize_t tpm_store_locality (struct device *dev,struct device_attribute *attr, -const char *buf,size_t len) -{ -struct tpm_chip *chip =dev_get_drvdata (dev); -struct tpm_private *priv =TPM_VPRIV (chip); -u8 val; - -int rv =kstrtou8 (buf,0 , &val); -if (rv) -return rv; - - priv->shr->locality = val; - -return len; -} -static const struct file_operations vtpm_ops = { .owner =THIS_MODULE , .llseek = no_llseek,@@ -188,8 +162,6 @@ static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps, NULL); static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel); static DEVICE_ATTR(durations, S_IRUGO, tpm_show_durations, NULL); static DEVICE_ATTR(timeouts, S_IRUGO, tpm_show_timeouts, NULL); -static DEVICE_ATTR(locality, S_IRUGO | S_IWUSR, tpm_show_locality, - tpm_store_locality);static struct attribute *vtpm_attrs[] = { &dev_attr_pubek.attr,@@ -202,7 +174,6 @@ static struct attribute *vtpm_attrs[] = { &dev_attr_cancel.attr, &dev_attr_durations.attr, &dev_attr_timeouts.attr, - &dev_attr_locality.attr, NULL, };
Signature · 2 lines
Daniel De Graaf National Security Agency
Quoted 12 lines · Daniel De Graaf
Quoted 11 lines · Jason Gunthorpe
Upon deeper review it was agreed to remove the driver-unique 'locality' sysfs attribute before it is present in a released kernel.
The attribute was introduced in
e2683957fb268c6b29316fd9e7191e13239a30a5during the 3.12 merge window, so this patch needs to go in before 3.12 is released.The hope is to have a well defined locality API that all the other locality aware drivers can use, perhaps in 3.13.
Quoted 11 lines
Quoted 6 lines
Signed-off-by Jason Gunthorpe <[email protected]>--- drivers/char/tpm/xen-tpmfront.c | 29 ----------------------------- 1 file changed, 29 deletions(-)Daniel, if you can Ack this..
Acked-by Daniel De Graaf <[email protected]>Quoted 2 lines
Konrad: This driver was originally merged through you, can you pick this up?
Sure thing. Thank you!