1 files changed, 156 insertions, 10 deletions

diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c
index 8eed03938214..fcef54c1c2da 100644
--- a/drivers/pcmcia/socket_sysfs.c
+++ b/drivers/pcmcia/socket_sysfs.c
@@ -163,28 +163,164 @@ static ssize_t pccard_store_resource(struct class_device *dev, const char *buf,
                 return -EINVAL;
 
         spin_lock_irqsave(&s->lock, flags);
-        if (!s->resource_setup_done) {
+        if (!s->resource_setup_done)
                 s->resource_setup_done = 1;
-                spin_unlock_irqrestore(&s->lock, flags);
+        spin_unlock_irqrestore(&s->lock, flags);
+
+        down(&s->skt_sem);
+        if ((s->callback) &&
+            (s->state & SOCKET_PRESENT) &&
+            !(s->state & SOCKET_CARDBUS)) {
+                if (try_module_get(s->callback->owner)) {
+                        s->callback->requery(s);
+                        module_put(s->callback->owner);
+                }
+        }
+        up(&s->skt_sem);
+
+        return count;
+}
+static CLASS_DEVICE_ATTR(available_resources_setup_done, 0600, pccard_show_resource, pccard_store_resource);
+
+
+static ssize_t pccard_extract_cis(struct pcmcia_socket *s, char *buf, loff_t off, size_t count)
+{
+        tuple_t tuple;
+        int status, i;
+        loff_t pointer = 0;
+        ssize_t ret = 0;
+        u_char *tuplebuffer;
+        u_char *tempbuffer;
+
+        tuplebuffer = kmalloc(sizeof(u_char) * 256, GFP_KERNEL);
+        if (!tuplebuffer)
+                return -ENOMEM;
+
+        tempbuffer = kmalloc(sizeof(u_char) * 258, GFP_KERNEL);
+        if (!tempbuffer) {
+                ret = -ENOMEM;
+                goto free_tuple;
+        }
+
+        memset(&tuple, 0, sizeof(tuple_t));
+
+        tuple.Attributes = TUPLE_RETURN_LINK | TUPLE_RETURN_COMMON;
+        tuple.DesiredTuple = RETURN_FIRST_TUPLE;
+        tuple.TupleOffset = 0;
+
+        status = pccard_get_first_tuple(s, BIND_FN_ALL, &tuple);
+        while (!status) {
+                tuple.TupleData = tuplebuffer;
+                tuple.TupleDataMax = 255;
+                memset(tuplebuffer, 0, sizeof(u_char) * 255);
 
+                status = pccard_get_tuple_data(s, &tuple);
+                if (status)
+                        break;
+
+                if (off < (pointer + 2 + tuple.TupleDataLen)) {
+                        tempbuffer[0] = tuple.TupleCode & 0xff;
+                        tempbuffer[1] = tuple.TupleLink & 0xff;
+                        for (i = 0; i < tuple.TupleDataLen; i++)
+                                tempbuffer[i + 2] = tuplebuffer[i] & 0xff;
+
+                        for (i = 0; i < (2 + tuple.TupleDataLen); i++) {
+                                if (((i + pointer) >= off) &&
+                                    (i + pointer) < (off + count)) {
+                                        buf[ret] = tempbuffer[i];
+                                        ret++;
+                                }
+                        }
+                }
+
+                pointer += 2 + tuple.TupleDataLen;
+
+                if (pointer >= (off + count))
+                        break;
+
+                if (tuple.TupleCode == CISTPL_END)
+                        break;
+                status = pccard_get_next_tuple(s, BIND_FN_ALL, &tuple);
+        }
+
+        kfree(tempbuffer);
+ free_tuple:
+        kfree(tuplebuffer);
+
+        return (ret);
+}
+
+static ssize_t pccard_show_cis(struct kobject *kobj, char *buf, loff_t off, size_t count)
+{
+        unsigned int size = 0x200;
+
+        if (off >= size)
+                count = 0;
+        else {
+                struct pcmcia_socket *s;
+                cisinfo_t cisinfo;
+
+                if (off + count > size)
+                        count = size - off;
+
+                s = to_socket(container_of(kobj, struct class_device, kobj));
+
+                if (!(s->state & SOCKET_PRESENT))
+                        return -ENODEV;
+                if (pccard_validate_cis(s, BIND_FN_ALL, &cisinfo))
+                        return -EIO;
+                if (!cisinfo.Chains)
+                        return -ENODATA;
+
+                count = pccard_extract_cis(s, buf, off, count);
+        }
+
+        return (count);
+}
+
+static ssize_t pccard_store_cis(struct kobject *kobj, char *buf, loff_t off, size_t count)
+{
+        struct pcmcia_socket *s = to_socket(container_of(kobj, struct class_device, kobj));
+        cisdump_t *cis;
+        ssize_t ret = count;
+
+        if (off)
+                return -EINVAL;
+
+        if (count >= 0x200)
+                return -EINVAL;
+
+        if (!(s->state & SOCKET_PRESENT))
+                return -ENODEV;
+
+        cis = kmalloc(sizeof(cisdump_t), GFP_KERNEL);
+        if (!cis)
+                return -ENOMEM;
+        memset(cis, 0, sizeof(cisdump_t));
+
+        cis->Length = count + 1;
+        memcpy(cis->Data, buf, count);
+
+        if (pcmcia_replace_cis(s, cis))
+                ret  = -EIO;
+
+        kfree(cis);
+
+        if (!ret) {
                 down(&s->skt_sem);
-                if ((s->callback) &&
-                    (s->state & SOCKET_PRESENT) &&
+                if ((s->callback) && (s->state & SOCKET_PRESENT) &&
                     !(s->state & SOCKET_CARDBUS)) {
                         if (try_module_get(s->callback->owner)) {
-                                s->callback->resources_done(s);
+                                s->callback->requery(s);
                                 module_put(s->callback->owner);
                         }
                 }
                 up(&s->skt_sem);
-
-                return count;
         }
-        spin_unlock_irqrestore(&s->lock, flags);
 
-        return count;
+
+        return (ret);
 }
-static CLASS_DEVICE_ATTR(available_resources_setup_done, 0600, pccard_show_resource, pccard_store_resource);
 
 
 static struct class_device_attribute *pccard_socket_attributes[] = {
@@ -199,6 +335,13 @@ static struct class_device_attribute *pccard_socket_attributes[] = {
         NULL,
 };
 
+static struct bin_attribute pccard_cis_attr = {
+        .attr = { .name = "cis", .mode = S_IRUGO | S_IWUSR, .owner = THIS_MODULE},
+        .size = 0x200,
+        .read = pccard_show_cis,
+        .write = pccard_store_cis,
+};
+
 static int __devinit pccard_sysfs_add_socket(struct class_device *class_dev)
 {
         struct class_device_attribute **attr;
@@ -209,6 +352,8 @@ static int __devinit pccard_sysfs_add_socket(struct class_device *class_dev)
                 if (ret)
                         break;
         }
+        if (!ret)
+                ret = sysfs_create_bin_file(&class_dev->kobj, &pccard_cis_attr);
 
         return ret;
 }
@@ -217,6 +362,7 @@ static void __devexit pccard_sysfs_remove_socket(struct class_device *class_dev)
 {
         struct class_device_attribute **attr;
 
+        sysfs_remove_bin_file(&class_dev->kobj, &pccard_cis_attr);
         for (attr = pccard_socket_attributes; *attr; attr++)
                 class_device_remove_file(class_dev, *attr);
 }