Merge branch 'for-4.12/asus' into for-linus

1 files changed, 62 insertions, 30 deletions

diff --git a/lib/test_firmware.c b/lib/test_firmware.c
index a3e8ec3fb1c5..09371b0a9baf 100644
--- a/lib/test_firmware.c
+++ b/lib/test_firmware.c
@@ -42,12 +42,6 @@ static const struct file_operations test_fw_fops = {
         .read           = test_fw_misc_read,
 };
 
-static struct miscdevice test_fw_misc_device = {
-        .minor          = MISC_DYNAMIC_MINOR,
-        .name           = "test_firmware",
-        .fops           = &test_fw_fops,
-};
-
 static ssize_t trigger_request_store(struct device *dev,
                                      struct device_attribute *attr,
                                      const char *buf, size_t count)
@@ -132,39 +126,81 @@ out:
 }
 static DEVICE_ATTR_WO(trigger_async_request);
 
-static int __init test_firmware_init(void)
+static ssize_t trigger_custom_fallback_store(struct device *dev,
+                                             struct device_attribute *attr,
+                                             const char *buf, size_t count)
 {
         int rc;
+        char *name;
 
-        rc = misc_register(&test_fw_misc_device);
+        name = kstrndup(buf, count, GFP_KERNEL);
+        if (!name)
+                return -ENOSPC;
+
+        pr_info("loading '%s' using custom fallback mechanism\n", name);
+
+        mutex_lock(&test_fw_mutex);
+        release_firmware(test_firmware);
+        test_firmware = NULL;
+        rc = request_firmware_nowait(THIS_MODULE, FW_ACTION_NOHOTPLUG, name,
+                                     dev, GFP_KERNEL, NULL,
+                                     trigger_async_request_cb);
         if (rc) {
-                pr_err("could not register misc device: %d\n", rc);
-                return rc;
+                pr_info("async load of '%s' failed: %d\n", name, rc);
+                kfree(name);
+                goto out;
         }
-        rc = device_create_file(test_fw_misc_device.this_device,
-                                &dev_attr_trigger_request);
-        if (rc) {
-                pr_err("could not create sysfs interface: %d\n", rc);
-                goto dereg;
+        /* 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;
         }
 
-        rc = device_create_file(test_fw_misc_device.this_device,
-                                &dev_attr_trigger_async_request);
+out:
+        mutex_unlock(&test_fw_mutex);
+
+        return rc;
+}
+static DEVICE_ATTR_WO(trigger_custom_fallback);
+
+#define TEST_FW_DEV_ATTR(name)          &dev_attr_##name.attr
+
+static struct attribute *test_dev_attrs[] = {
+        TEST_FW_DEV_ATTR(trigger_request),
+        TEST_FW_DEV_ATTR(trigger_async_request),
+        TEST_FW_DEV_ATTR(trigger_custom_fallback),
+        NULL,
+};
+
+ATTRIBUTE_GROUPS(test_dev);
+
+static struct miscdevice test_fw_misc_device = {
+        .minor          = MISC_DYNAMIC_MINOR,
+        .name           = "test_firmware",
+        .fops           = &test_fw_fops,
+        .groups         = test_dev_groups,
+};
+
+static int __init test_firmware_init(void)
+{
+        int rc;
+
+        rc = misc_register(&test_fw_misc_device);
         if (rc) {
-                pr_err("could not create async sysfs interface: %d\n", rc);
-                goto remove_file;
+                pr_err("could not register misc device: %d\n", rc);
+                return rc;
         }
 
         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;
 }
 
 module_init(test_firmware_init);
@@ -172,10 +208,6 @@ 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);
         pr_warn("removed interface\n");
 }