Merge branch 'master' of /usr/src/ntfs-2.6/

1 files changed, 80 insertions, 66 deletions

diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c
index c0d64914595f..8cb42e84723c 100644
--- a/drivers/char/tpm/tpm_atmel.c
+++ b/drivers/char/tpm/tpm_atmel.c
@@ -40,7 +40,7 @@ enum tpm_atmel_read_status {
         ATML_STATUS_READY = 0x08
 };
 
-static int tpm_atml_recv(struct tpm_chip *chip, u8 * buf, size_t count)
+static int tpm_atml_recv(struct tpm_chip *chip, u8 *buf, size_t count)
 {
         u8 status, *hdr = buf;
         u32 size;
@@ -54,7 +54,7 @@ static int tpm_atml_recv(struct tpm_chip *chip, u8 * buf, size_t count)
         for (i = 0; i < 6; i++) {
                 status = inb(chip->vendor->base + 1);
                 if ((status & ATML_STATUS_DATA_AVAIL) == 0) {
-                        dev_err(&chip->pci_dev->dev,
+                        dev_err(chip->dev,
                                 "error reading header\n");
                         return -EIO;
                 }
@@ -66,12 +66,12 @@ static int tpm_atml_recv(struct tpm_chip *chip, u8 * buf, size_t count)
         size = be32_to_cpu(*native_size);
 
         if (count < size) {
-                dev_err(&chip->pci_dev->dev,
+                dev_err(chip->dev,
                         "Recv size(%d) less than available space\n", size);
                 for (; i < size; i++) { /* clear the waiting data anyway */
                         status = inb(chip->vendor->base + 1);
                         if ((status & ATML_STATUS_DATA_AVAIL) == 0) {
-                                dev_err(&chip->pci_dev->dev,
+                                dev_err(chip->dev,
                                         "error reading data\n");
                                 return -EIO;
                         }
@@ -83,7 +83,7 @@ static int tpm_atml_recv(struct tpm_chip *chip, u8 * buf, size_t count)
         for (; i < size; i++) {
                 status = inb(chip->vendor->base + 1);
                 if ((status & ATML_STATUS_DATA_AVAIL) == 0) {
-                        dev_err(&chip->pci_dev->dev,
+                        dev_err(chip->dev,
                                 "error reading data\n");
                         return -EIO;
                 }
@@ -93,20 +93,20 @@ static int tpm_atml_recv(struct tpm_chip *chip, u8 * buf, size_t count)
         /* make sure data available is gone */
         status = inb(chip->vendor->base + 1);
         if (status & ATML_STATUS_DATA_AVAIL) {
-                dev_err(&chip->pci_dev->dev, "data available is stuck\n");
+                dev_err(chip->dev, "data available is stuck\n");
                 return -EIO;
         }
 
         return size;
 }
 
-static int tpm_atml_send(struct tpm_chip *chip, u8 * buf, size_t count)
+static int tpm_atml_send(struct tpm_chip *chip, u8 *buf, size_t count)
 {
         int i;
 
-        dev_dbg(&chip->pci_dev->dev, "tpm_atml_send: ");
+        dev_dbg(chip->dev, "tpm_atml_send:\n");
         for (i = 0; i < count; i++) {
-                dev_dbg(&chip->pci_dev->dev, "0x%x(%d) ", buf[i], buf[i]);
+                dev_dbg(chip->dev, "%d 0x%x(%d)\n",  i, buf[i], buf[i]);
                 outb(buf[i], chip->vendor->base);
         }
 
@@ -118,6 +118,11 @@ static void tpm_atml_cancel(struct tpm_chip *chip)
         outb(ATML_STATUS_ABORT, chip->vendor->base + 1);
 }
 
+static u8 tpm_atml_status(struct tpm_chip *chip)
+{
+        return inb(chip->vendor->base + 1);
+}
+
 static struct file_operations atmel_ops = {
         .owner = THIS_MODULE,
         .llseek = no_llseek,
@@ -137,7 +142,7 @@ static struct attribute* atmel_attrs[] = {
         &dev_attr_pcrs.attr,
         &dev_attr_caps.attr,
         &dev_attr_cancel.attr,
-        0,
+        NULL,
 };
 
 static struct attribute_group atmel_attr_grp = { .attrs = atmel_attrs };
@@ -146,6 +151,7 @@ static struct tpm_vendor_specific tpm_atmel = {
         .recv = tpm_atml_recv,
         .send = tpm_atml_send,
         .cancel = tpm_atml_cancel,
+        .status = tpm_atml_status,
         .req_complete_mask = ATML_STATUS_BUSY | ATML_STATUS_DATA_AVAIL,
         .req_complete_val = ATML_STATUS_DATA_AVAIL,
         .req_canceled = ATML_STATUS_READY,
@@ -153,86 +159,94 @@ static struct tpm_vendor_specific tpm_atmel = {
         .miscdev = { .fops = &atmel_ops, },
 };
 
-static int __devinit tpm_atml_init(struct pci_dev *pci_dev,
-                                   const struct pci_device_id *pci_id)
+static struct platform_device *pdev;
+
+static void __devexit tpm_atml_remove(struct device *dev)
+{
+        struct tpm_chip *chip = dev_get_drvdata(dev);
+        if (chip) {
+                release_region(chip->vendor->base, 2);
+                tpm_remove_hardware(chip->dev);
+        }
+}
+
+static struct device_driver atml_drv = {
+        .name = "tpm_atmel",
+        .bus = &platform_bus_type,
+        .owner = THIS_MODULE,
+        .suspend = tpm_pm_suspend,
+        .resume = tpm_pm_resume,
+};
+
+static int __init init_atmel(void)
 {
-        u8 version[4];
         int rc = 0;
         int lo, hi;
 
-        if (pci_enable_device(pci_dev))
-                return -EIO;
+        driver_register(&atml_drv);
 
         lo = tpm_read_index(TPM_ADDR, TPM_ATMEL_BASE_ADDR_LO);
         hi = tpm_read_index(TPM_ADDR, TPM_ATMEL_BASE_ADDR_HI);
 
         tpm_atmel.base = (hi<<8)|lo;
-        dev_dbg( &pci_dev->dev, "Operating with base: 0x%x\n", tpm_atmel.base);
 
         /* verify that it is an Atmel part */
         if (tpm_read_index(TPM_ADDR, 4) != 'A' || tpm_read_index(TPM_ADDR, 5) != 'T'
             || tpm_read_index(TPM_ADDR, 6) != 'M' || tpm_read_index(TPM_ADDR, 7) != 'L') {
-                rc = -ENODEV;
-                goto out_err;
+                return -ENODEV;
         }
 
-        /* query chip for its version number */
-        if ((version[0] = tpm_read_index(TPM_ADDR, 0x00)) != 0xFF) {
-                version[1] = tpm_read_index(TPM_ADDR, 0x01);
-                version[2] = tpm_read_index(TPM_ADDR, 0x02);
-                version[3] = tpm_read_index(TPM_ADDR, 0x03);
-        } else {
-                dev_info(&pci_dev->dev, "version query failed\n");
-                rc = -ENODEV;
-                goto out_err;
+        /* verify chip version number is 1.1 */
+        if (    (tpm_read_index(TPM_ADDR, 0x00) != 0x01) ||
+                (tpm_read_index(TPM_ADDR, 0x01) != 0x01 ))
+                return -ENODEV;
+
+        pdev = kzalloc(sizeof(struct platform_device), GFP_KERNEL);
+        if ( !pdev )
+                return -ENOMEM;
+
+        pdev->name = "tpm_atmel0";
+        pdev->id = -1;
+        pdev->num_resources = 0;
+        pdev->dev.release = tpm_atml_remove;
+        pdev->dev.driver = &atml_drv;
+
+        if ((rc = platform_device_register(pdev)) < 0) {
+                kfree(pdev);
+                pdev = NULL;
+                return rc;
         }
 
-        if ((rc = tpm_register_hardware(pci_dev, &tpm_atmel)) < 0)
-                goto out_err;
+        if (request_region(tpm_atmel.base, 2, "tpm_atmel0") == NULL ) {
+                platform_device_unregister(pdev);
+                kfree(pdev);
+                pdev = NULL;
+                return -EBUSY;
+        }
 
-        dev_info(&pci_dev->dev,
-                 "Atmel TPM version %d.%d.%d.%d\n", version[0], version[1],
-                 version[2], version[3]);
+        if ((rc = tpm_register_hardware(&pdev->dev, &tpm_atmel)) < 0) {
+                release_region(tpm_atmel.base, 2);
+                platform_device_unregister(pdev);
+                kfree(pdev);
+                pdev = NULL;
+                return rc;
+        }
 
+        dev_info(&pdev->dev, "Atmel TPM 1.1, Base Address: 0x%x\n",
+                        tpm_atmel.base);
         return 0;
-out_err:
-        pci_disable_device(pci_dev);
-        return rc;
-}
-
-static struct pci_device_id tpm_pci_tbl[] __devinitdata = {
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_0)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0)},
-        {PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_LPC)},
-        {PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6LPC)},
-        {0,}
-};
-
-MODULE_DEVICE_TABLE(pci, tpm_pci_tbl);
-
-static struct pci_driver atmel_pci_driver = {
-        .name = "tpm_atmel",
-        .id_table = tpm_pci_tbl,
-        .probe = tpm_atml_init,
-        .remove = __devexit_p(tpm_remove),
-        .suspend = tpm_pm_suspend,
-        .resume = tpm_pm_resume,
-};
-
-static int __init init_atmel(void)
-{
-        return pci_register_driver(&atmel_pci_driver);
 }
 
 static void __exit cleanup_atmel(void)
 {
-        pci_unregister_driver(&atmel_pci_driver);
+        if (pdev) {
+                tpm_atml_remove(&pdev->dev);
+                platform_device_unregister(pdev);
+                kfree(pdev);
+                pdev = NULL;
+        }
+
+        driver_unregister(&atml_drv);
 }
 
 module_init(init_atmel);