Abhay Salunke <[email protected]> wrote:
>
> --- /usr/src/linux-2.6.11.11.orig/drivers/base/firmware_class.c 2005-06-14 20:53:04.000000000 -0500
> +++ /usr/src/linux-2.6.11.11.new/drivers/base/firmware_class.c 2005-06-16 00:21:10.000000000 -0500
- Please prepare patches in `patch -p1' form, as per
http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt
- Please use hard tabs, not a mixture of spaces and hard tabs
- Try to avoid adding new trailing whitespace.
Here's a cleaned-up patch:
From: Abhay Salunke <[email protected]>
This is a patch to make the /sys/class/firmware entries persistent. This
has been tested with dell_rbu; dell_rbu was modified to not call
request_firmware_nowait again form the callback function.
The new mechanism to make the entries persistent is as follows
1> echo 0 > /sys/class/firmware/timeout
2> echo 2 > /sys/class/firmware/xxx/loading
step 1 prevents timeout to occur , step 2 makes the entry xxx persistent
if we want to remove persistence then do this
ech0 -2 > /sys/class/firmware/xxx/loading
The rest of the functionality is not affected.
Also not the persistence is supported only if the driver calls
request_firmware_nowait. If the driver is just calling request_firmware,
step 2 is treated as unknown entry.
Signed-off-by: Abhay Salunke <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---
drivers/base/firmware_class.c | 59 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 6 deletions(-)
diff -puN drivers/base/firmware_class.c~firmware-add-persistent-entries-using-request_firmware_nowait drivers/base/firmware_class.c
--- 25/drivers/base/firmware_class.c~firmware-add-persistent-entries-using-request_firmware_nowait 2005-06-15 17:58:46.000000000 -0700
+++ 25-akpm/drivers/base/firmware_class.c 2005-06-15 17:58:46.000000000 -0700
@@ -6,6 +6,11 @@
* Please see Documentation/firmware_class/ for more information.
*
*/
+ /*
+ * 2005-06-15: Abhay Salunke <[email protected]>
+ * Added firmware persistent when request_firmware_nowait.
+ * is called.
+ */
#include <linux/device.h>
#include <linux/module.h>
@@ -28,6 +33,8 @@ enum {
FW_STATUS_DONE,
FW_STATUS_ABORT,
FW_STATUS_READY,
+ FW_STATUS_PERSISTENT,
+ FW_STATUS_PERSISTENT_ABORT,
};
static int loading_timeout = 10; /* In seconds */
@@ -145,13 +152,20 @@ firmware_loading_store(struct class_devi
set_bit(FW_STATUS_LOADING, &fw_priv->status);
up(&fw_lock);
break;
+ case 2:
+ set_bit(FW_STATUS_PERSISTENT, &fw_priv->status);
+ fw_load_abort(fw_priv);
+ break;
case 0:
if (test_bit(FW_STATUS_LOADING, &fw_priv->status)) {
complete(&fw_priv->completion);
clear_bit(FW_STATUS_LOADING, &fw_priv->status);
break;
}
- /* fallthrough */
+ case -2:
+ set_bit(FW_STATUS_PERSISTENT_ABORT, &fw_priv->status);
+ fw_load_abort(fw_priv);
+ break;
default:
printk(KERN_ERR "%s: unexpected value (%d)\n", __FUNCTION__,
loading);
@@ -392,8 +406,8 @@ out:
* firmware image for this or any other device.
**/
int
-request_firmware(const struct firmware **firmware_p, const char *name,
- struct device *device)
+_request_firmware(const struct firmware **firmware_p, const char *name,
+ struct device *device, unsigned long *fw_status)
{
struct class_device *class_dev;
struct firmware_priv *fw_priv;
@@ -425,6 +439,14 @@ request_firmware(const struct firmware *
kobject_hotplug(&class_dev->kobj, KOBJ_ADD);
wait_for_completion(&fw_priv->completion);
+
+ if (test_bit(FW_STATUS_PERSISTENT, &fw_priv->status) ||
+ test_bit(FW_STATUS_PERSISTENT_ABORT, &fw_priv->status)) {
+ *fw_status = fw_priv->status;
+ clear_bit(FW_STATUS_PERSISTENT, &fw_priv->status);
+ clear_bit(FW_STATUS_PERSISTENT_ABORT, &fw_priv->status);
+ }
+
set_bit(FW_STATUS_DONE, &fw_priv->status);
del_timer_sync(&fw_priv->timeout);
@@ -446,6 +468,25 @@ error_kfree_fw:
out:
return retval;
}
+/**
+ * request_firmware: - request firmware to hotplug and wait for it
+ * Description:
+ * @firmware will be used to return a firmware image by the name
+ * of @name for device @device.
+ *
+ * Should be called from user context where sleeping is allowed.
+ *
+ * @name will be use as $FIRMWARE in the hotplug environment and
+ * should be distinctive enough not to be confused with any other
+ * firmware image for this or any other device.
+ **/
+int
+request_firmware(const struct firmware **firmware_p, const char *name,
+ struct device *device)
+{
+ unsigned long status;
+ return _request_firmware(firmware_p, name,device,&status);
+}
/**
* release_firmware: - release the resource associated with a firmware image
@@ -484,6 +525,7 @@ struct firmware_work {
struct device *device;
void *context;
void (*cont)(const struct firmware *fw, void *context);
+ unsigned long status;
};
static int
@@ -496,9 +538,14 @@ request_firmware_work_func(void *arg)
return 0;
}
daemonize("%s/%s", "firmware", fw_work->name);
- request_firmware(&fw, fw_work->name, fw_work->device);
- fw_work->cont(fw, fw_work->context);
- release_firmware(fw);
+ fw_work->status = FW_STATUS_LOADING;
+
+ do {
+ _request_firmware(&fw, fw_work->name, fw_work->device, &fw_work->status);
+ fw_work->cont(fw, fw_work->context);
+ release_firmware(fw);
+ } while (test_bit(FW_STATUS_PERSISTENT, &fw_work->status));
+
module_put(fw_work->module);
kfree(fw_work);
return 0;
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
