drm/etnaviv: rename etnaviv_gem_vaddr to etnaviv_gem_vmap

[linux-2.6-block.git] / lib / test_firmware.c

diff --git a/lib/test_firmware.c b/lib/test_firmware.c
index 86374c1c49a4e13638ec79ad9d5b2349e69db38e..a3e8ec3fb1c50c59192abd8402601960e78d4001 100644 (file)
--- a/lib/test_firmware.c
+++ b/lib/test_firmware.c
@@ -12,6 +12,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/printk.h>
+#include <linux/completion.h>
 #include <linux/firmware.h>
 #include <linux/device.h>
 #include <linux/fs.h>
@@ -54,10 +55,9 @@ static ssize_t trigger_request_store(struct device *dev,
        int rc;
        char *name;
 
-       name = kzalloc(count + 1, GFP_KERNEL);
+       name = kstrndup(buf, count, GFP_KERNEL);
        if (!name)
                return -ENOSPC;
-       memcpy(name, buf, count);
 
        pr_info("loading '%s'\n", name);
 
@@ -65,17 +65,73 @@ static ssize_t trigger_request_store(struct device *dev,
        release_firmware(test_firmware);
        test_firmware = NULL;
        rc = request_firmware(&test_firmware, name, dev);
-       if (rc)
+       if (rc) {
                pr_info("load of '%s' failed: %d\n", name, rc);
-       pr_info("loaded: %zu\n", test_firmware ? test_firmware->size : 0);
+               goto out;
+       }
+       pr_info("loaded: %zu\n", test_firmware->size);
+       rc = count;
+
+out:
        mutex_unlock(&test_fw_mutex);
 
        kfree(name);
 
-       return count;
+       return rc;
 }
 static DEVICE_ATTR_WO(trigger_request);
 
+static DECLARE_COMPLETION(async_fw_done);
+
+static void trigger_async_request_cb(const struct firmware *fw, void *context)
+{
+       test_firmware = fw;
+       complete(&async_fw_done);
+}
+
+static ssize_t trigger_async_request_store(struct device *dev,
+                                          struct device_attribute *attr,
+                                          const char *buf, size_t count)
+{
+       int rc;
+       char *name;
+
+       name = kstrndup(buf, count, GFP_KERNEL);
+       if (!name)
+               return -ENOSPC;
+
+       pr_info("loading '%s'\n", name);
+
+       mutex_lock(&test_fw_mutex);
+       release_firmware(test_firmware);
+       test_firmware = NULL;
+       rc = request_firmware_nowait(THIS_MODULE, 1, name, dev, GFP_KERNEL,
+                                    NULL, trigger_async_request_cb);
+       if (rc) {
+               pr_info("async load of '%s' failed: %d\n", name, rc);
+               kfree(name);
+               goto out;
+       }
+       /* Free 'name' ASAP, to test for race conditions */
+       kfree(name);
+
+       wait_for_completion(&async_fw_done);
+
+       if (test_firmware) {
+               pr_info("loaded: %zu\n", test_firmware->size);
+               rc = count;
+       } else {
+               pr_err("failed to async load firmware\n");
+               rc = -ENODEV;
+       }
+
+out:
+       mutex_unlock(&test_fw_mutex);
+
+       return rc;
+}
+static DEVICE_ATTR_WO(trigger_async_request);
+
 static int __init test_firmware_init(void)
 {
        int rc;
@@ -92,9 +148,20 @@ static int __init test_firmware_init(void)
                goto dereg;
        }
 
+       rc = device_create_file(test_fw_misc_device.this_device,
+                               &dev_attr_trigger_async_request);
+       if (rc) {
+               pr_err("could not create async sysfs interface: %d\n", rc);
+               goto remove_file;
+       }
+
        pr_warn("interface ready\n");
 
        return 0;
+
+remove_file:
+       device_remove_file(test_fw_misc_device.this_device,
+                          &dev_attr_trigger_async_request);
 dereg:
        misc_deregister(&test_fw_misc_device);
        return rc;
@@ -105,6 +172,8 @@ module_init(test_firmware_init);
 static void __exit test_firmware_exit(void)
 {
        release_firmware(test_firmware);
+       device_remove_file(test_fw_misc_device.this_device,
+                          &dev_attr_trigger_async_request);
        device_remove_file(test_fw_misc_device.this_device,
                           &dev_attr_trigger_request);
        misc_deregister(&test_fw_misc_device);