Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262173AbVD1UnH (ORCPT ); Thu, 28 Apr 2005 16:43:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262174AbVD1UnH (ORCPT ); Thu, 28 Apr 2005 16:43:07 -0400 Received: from e3.ny.us.ibm.com ([32.97.182.143]:47759 "EHLO e3.ny.us.ibm.com") by vger.kernel.org with ESMTP id S262173AbVD1Uk3 (ORCPT ); Thu, 28 Apr 2005 16:40:29 -0400 Date: Thu, 28 Apr 2005 15:40:16 -0500 (CDT) From: Kylene Hall X-X-Sender: kjhall@IBM-8BD8VOWT0JH.austin.ibm.com To: Greg KH cc: linux-kernel@vger.kernel.org Subject: Re: [PATCH 10 of 12] Fix Tpm driver -- sysfs owernship changes In-Reply-To: <20050428041915.GD9723@kroah.com> Message-ID: References: <20050428041915.GD9723@kroah.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 8715 Lines: 250 On Wed, 27 Apr 2005, Greg KH wrote: > On Wed, Apr 27, 2005 at 05:19:03PM -0500, Kylene Hall wrote: > > - device_remove_file(&pci_dev->dev, &dev_attr_pubek); > > - device_remove_file(&pci_dev->dev, &dev_attr_pcrs); > > - device_remove_file(&pci_dev->dev, &dev_attr_caps); > > + for (i = 0; i < TPM_NUM_ATTR; i++) > > + device_remove_file(&pci_dev->dev, &chip->vendor->attr[i]); > > Use an attribute group, instead of this. That will allow you to get > rid of the TPM_NUM_ATTR value, and this looney macro: > > > +#define TPM_DEVICE_ATTRS { \ > > + __ATTR(pubek, S_IRUGO, tpm_show_pubek, NULL), \ > > + __ATTR(pcrs, S_IRUGO, tpm_show_pcrs, NULL), \ > > + __ATTR(caps, S_IRUGO, tpm_show_caps, NULL), \ > > + __ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel) } > > thanks, > > greg k-h > > Ok, the patch below has the same functionality as the previous patch but gets rid of the macro and implements an attribute_group. Is there any way to avoid the repeated code in every tpm_specific file to setup the attribute_group and still ensure the files are owned by the tpm_specific module? The only thing I can come up with is either not using the TPM_DEVICE macro at all or creating with TPM_DEVICE macro and then changing the owner field. Signed-off-by: Kylene Hall --- diff -uprN --exclude='*.orig' linux-2.6.12-rc2/drivers/char/tpm/tpm_atmel.c linux-2.6.12-rc2-tpmdd/drivers/char/tpm/tpm_atmel.c --- linux-2.6.12-rc2/drivers/char/tpm/tpm_atmel.c 2005-04-20 18:58:48.000000000 -0500 +++ linux-2.6.12-rc2-tpmdd/drivers/char/tpm/tpm_atmel.c 2005-04-20 18:36:54.000000000 -0500 @@ -133,7 +133,8 @@ static struct tpm_vendor_specific tpm_at .req_complete_mask = ATML_STATUS_BUSY | ATML_STATUS_DATA_AVAIL, .req_complete_val = ATML_STATUS_DATA_AVAIL, .base = TPM_ATML_BASE, - .miscdev = { .fops = &atmel_ops, }, + .attr_group = &atmel_attr_grp, + .miscdev.fops = &atmel_ops, }; static int __devinit tpm_atml_init(struct pci_dev *pci_dev, diff -uprN --exclude='*.orig' linux-2.6.12-rc2/drivers/char/tpm/tpm.c linux-2.6.12-rc2-tpmdd/drivers/char/tpm/tpm.c --- linux-2.6.12-rc2/drivers/char/tpm/tpm.c 2005-04-20 19:07:43.000000000 -0500 +++ linux-2.6.12-rc2-tpmdd/drivers/char/tpm/tpm.c 2005-04-20 18:57:28.000000000 -0500 @@ -207,7 +207,7 @@ static const u8 pcrread[] = { 0, 0, 0, 0 /* PCR index */ }; -static ssize_t show_pcrs(struct device *dev, char *buf) +ssize_t tpm_show_pcrs(struct device *dev, char *buf) { u8 data[READ_PCR_RESULT_SIZE]; ssize_t len; @@ -242,7 +242,7 @@ static ssize_t show_pcrs(struct device * return str - buf; } -static DEVICE_ATTR(pcrs, S_IRUGO, show_pcrs, NULL); +EXPORT_SYMBOL_GPL(tpm_show_pcrs); #define READ_PUBEK_RESULT_SIZE 314 static const u8 readpubek[] = { @@ -251,7 +251,7 @@ static const u8 readpubek[] = { 0, 0, 0, 124, /* TPM_ORD_ReadPubek */ }; -static ssize_t show_pubek(struct device *dev, char *buf) +ssize_t tpm_show_pubek(struct device *dev, char *buf) { u8 data[READ_PUBEK_RESULT_SIZE]; ssize_t len; @@ -301,7 +301,7 @@ static ssize_t show_pubek(struct device return str - buf; } -static DEVICE_ATTR(pubek, S_IRUGO, show_pubek, NULL); +EXPORT_SYMBOL_GPL(tpm_show_pubek); #define CAP_VER_RESULT_SIZE 18 static const u8 cap_version[] = { @@ -322,7 +322,7 @@ static const u8 cap_manufacturer[] = { 0, 0, 1, 3 }; -static ssize_t show_caps(struct device *dev, char *buf) +ssize_t tpm_show_caps(struct device *dev, char *buf) { u8 data[READ_PUBEK_RESULT_SIZE]; ssize_t len; @@ -356,7 +356,21 @@ static ssize_t show_caps(struct device * return str - buf; } -static DEVICE_ATTR(caps, S_IRUGO, show_caps, NULL); +EXPORT_SYMBOL_GPL(tpm_show_caps); + +ssize_t tpm_store_cancel(struct device * dev, const char *buf, + size_t count) +{ + struct tpm_chip *chip = dev_get_drvdata(dev); + if (chip == NULL) + return 0; + + chip->vendor->cancel(chip); + return count; +} + +EXPORT_SYMBOL_GPL(tpm_store_cancel); + /* * Device file system interface to the TPM @@ -532,9 +546,7 @@ void __devexit tpm_remove(struct pci_dev pci_set_drvdata(pci_dev, NULL); misc_deregister(&chip->vendor->miscdev); - device_remove_file(&pci_dev->dev, &dev_attr_pubek); - device_remove_file(&pci_dev->dev, &dev_attr_pcrs); - device_remove_file(&pci_dev->dev, &dev_attr_caps); + sysfs_remove_group(&pci_dev->dev.kobj, chip->vendor->attr_group); pci_disable_device(pci_dev); @@ -659,9 +672,7 @@ dev_num_search_complete: list_add(&chip->list, &tpm_chip_list); - device_create_file(&pci_dev->dev, &dev_attr_pubek); - device_create_file(&pci_dev->dev, &dev_attr_pcrs); - device_create_file(&pci_dev->dev, &dev_attr_caps); + sysfs_create_group(&pci_dev->dev.kobj, chip->vendor->attr_group); return 0; } --- linux-2.6.12-rc2/drivers/char/tpm/tpm.c 2005-04-21 16:54:56.000000000 -0500 +++ linux-2.6.12-rc2-tpmdd/drivers/char/tpm/tpm.c 2005-04-21 17:05:21.000000000 -0500 @@ -531,6 +531,7 @@ EXPORT_SYMBOL_GPL(tpm_read); void __devexit tpm_remove(struct pci_dev *pci_dev) { struct tpm_chip *chip = pci_get_drvdata(pci_dev); + int i; if (chip == NULL) { dev_err(&pci_dev->dev, "No device data found\n"); --- linux-2.6.12-rc3/drivers/char/tpm/tpm_nsc.c 2005-04-27 10:40:16.000000000 -0500 +++ linux-2.6.12-rc2/drivers/char/tpm/tpm_nsc.c 2005-04-25 18:49:08.000000000 -0500 @@ -223,8 +231,9 @@ static struct tpm_vendor_specific tpm_ns .req_complete_mask = NSC_STATUS_OBF, .req_complete_val = NSC_STATUS_OBF, .base = TPM_NSC_BASE, - .miscdev = { .fops = &nsc_ops, }, - + .attr_group = &nsc_attr_grp, + .miscdev.fops = &nsc_ops, + }; static int __devinit tpm_nsc_init(struct pci_dev *pci_dev, --- linux-2.6.12-rc2/drivers/char/tpm/tpm.h 2005-04-27 11:03:26.000000000 -0500 +++ linux-2.6.12-rc2-tpmdd/drivers/chat/tpm/tpm.h 2005-04-27 11:04:11.000000000 -0500 @@ -36,6 +36,11 @@ enum { TPM_DATA = 0x4F }; +extern ssize_t tpm_show_pubek(struct device *, char *); +extern ssize_t tpm_show_pcrs(struct device *, char *); +extern ssize_t tpm_show_caps(struct device *, char *); +extern ssize_t tpm_store_cancel(struct device *, const char *, size_t); + struct tpm_chip; @@ -48,6 +58,7 @@ struct tpm_vendor_specific { int (*send) (struct tpm_chip *, u8 *, size_t); void (*cancel) (struct tpm_chip *); struct miscdevice miscdev; + struct attribute_group *attr_group; }; struct tpm_chip { --- linux-2.6.12-rc2/drivers/char/tpm/tpm.c 2005-04-28 15:15:24.000000000 -0500 +++ linux-2.6.12-rc2-tpmdd/drivers/char/tpm/tpm.c 2005-04-28 15:33:23.000000000 -0500 @@ -536,7 +536,6 @@ EXPORT_SYMBOL_GPL(tpm_read); void __devexit tpm_remove(struct pci_dev *pci_dev) { struct tpm_chip *chip = pci_get_drvdata(pci_dev); - int i; if (chip == NULL) { dev_err(&pci_dev->dev, "No device data found\n"); --- linux-2.6.12-rc2/drivers/char/tpm/tpm_nsc.c.orig 2005-04-28 14:55:11.000000000 -0500 +++ linux-2.6.12-rc2-tpmdd/drivers/char/tpm/tpm_nsc.c 2005-04-28 16:23:10.000000000 -0500 @@ -224,6 +224,21 @@ static struct file_operations nsc_ops = .release = tpm_release, }; +static DEVICE_ATTR(pubek, S_IRUGO, tpm_show_pubek, NULL); +static DEVICE_ATTR(pcrs, S_IRUGO, tpm_show_pcrs, NULL); +static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps, NULL); +static DEVICE_ATTR(cancel, S_IWUSR|S_IWGRP, NULL, tpm_store_cancel); + +static struct attribute * nsc_attrs[] = { + &dev_attr_pubek.attr, + &dev_attr_pcrs.attr, + &dev_attr_caps.attr, + &dev_attr_cancel.attr, + 0, +}; + +static struct attribute_group nsc_attr_grp = { .attrs = nsc_attrs }; + static struct tpm_vendor_specific tpm_nsc = { .recv = tpm_nsc_recv, .send = tpm_nsc_send, --- linux-2.6.12-rc2/drivers/char/tpm/tpm_atmel.c.orig 2005-04-28 14:55:04.000000000 -0500 +++ linux-2.6.12-rc2-tpmdd/drivers/char/tpm/tpm_atmel.c 2005-04-28 16:16:41.000000000 -0500 @@ -126,6 +126,21 @@ static struct file_operations atmel_ops .release = tpm_release, }; +static DEVICE_ATTR(pubek, S_IRUGO, tpm_show_pubek, NULL); +static DEVICE_ATTR(pcrs, S_IRUGO, tpm_show_pcrs, NULL); +static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps, NULL); +static DEVICE_ATTR(cancel, S_IWUSR |S_IWGRP, NULL, tpm_store_cancel); + +static struct attribute* atmel_attrs[] = { + &dev_attr_pubek.attr, + &dev_attr_pcrs.attr, + &dev_attr_caps.attr, + &dev_attr_cancel.attr, + 0, +}; + +static struct attribute_group atmel_attr_grp = { .attrs = atmel_attrs }; + static struct tpm_vendor_specific tpm_atmel = { .recv = tpm_atml_recv, .send = tpm_atml_send, - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/