2003-07-26 10:03:39

by Manuel Estrada Sainz

[permalink] [raw]
Subject: [PATCH] request_firmware() private workqueue (was: Re: Using firmware_class with recent 2.6 kernels)

On Mon, Jul 21, 2003 at 01:41:11PM +0200, Michael Hunold wrote:
[snip]
> To get a start, I took your sample driver and compiled it as a module.
> I commented out all firmware load methods, except the async
> notification I'm most interested in.
>
> When I load the module, it prints the debug message and goes to sleep --
> ok. But now the system is completely frozen (no keyboard or mouse
> interaction possible) until the timeout is reached and the async
> notification function is called, which of course says that the firmware
> could not been loaded.

Using a private workqueue fixes the issue, sleeping for many seconds
from the common workqueue was not nice.

Note that the problem only happens when appropriate firmware hotplug
support is not available and request_firmware_work_func() has to wait
until the timeout.

About the attached patch:

- use a private workqueue so we can sleep without interfering
with other subsystems.

Have a nice day

Manuel

--
--- Manuel Estrada Sainz <[email protected]>
<[email protected]>
<[email protected]>
------------------------ <[email protected]> -------------------
Let us have the serenity to accept the things we cannot change, courage to
change the things we can, and wisdom to know the difference.


2003-07-26 15:51:38

by Manuel Estrada Sainz

[permalink] [raw]
Subject: Re: [PATCH] request_firmware() private workqueue (was: Re: Using firmware_class with recent 2.6 kernels)

Index: firmware_class.c
===================================================================
RCS file: /home/cvs/linux-2.5/drivers/base/firmware_class.c,v
retrieving revision 1.3
diff -u -r1.3 firmware_class.c
--- firmware_class.c 4 Jul 2003 02:21:18 -0000 1.3
+++ firmware_class.c 26 Jul 2003 08:38:07 -0000
@@ -22,6 +22,8 @@
MODULE_LICENSE("GPL");

static int loading_timeout = 10; /* In seconds */
+static struct workqueue_struct *firmware_wq;
+

struct firmware_priv {
char fw_id[FIRMWARE_NAME_MAX];
@@ -467,7 +469,7 @@
};
INIT_WORK(&fw_work->work, request_firmware_work_func, fw_work);

- schedule_work(&fw_work->work);
+ queue_work(firmware_wq, &fw_work->work);
return 0;
}

@@ -485,12 +487,20 @@
__FUNCTION__);
class_unregister(&firmware_class);
}
+ firmware_wq = create_workqueue("firmware");
+ if (!firmware_wq) {
+ printk(KERN_ERR "%s: create_workqueue failed\n", __FUNCTION__);
+ class_remove_file(&firmware_class, &class_attr_timeout);
+ class_unregister(&firmware_class);
+ error = -EIO;
+ }
return error;

}
static void __exit
firmware_class_exit(void)
{
+ destroy_workqueue(firmware_wq);
class_remove_file(&firmware_class, &class_attr_timeout);
class_unregister(&firmware_class);
}


Attachments:
(No filename) (696.00 B)
request_firmware_own-workqueue.diff (1.21 kB)
Download all attachments

2003-07-29 15:02:35

by Michael Hunold

[permalink] [raw]
Subject: Re: [PATCH] request_firmware() private workqueue

Hello Manuel,

I've applied your patches
- request_firmware_own-workqueue.diff
- sysfs-bin-unbreak.diff

and it's working very well for the av7110 DVB driver.

I hope that these patches are applied to the mainline kernel soon, so
the other DVB drivers which need binary firmware blobs (namely
dvb-ttusb-dec, dvb-ttusb-budget and one frontend driver) can be ported.

This will get rid of the av7110 firmware in the kernel and the ugly
config hacks to get the other drivers working.

CU
Michael.

2003-08-01 19:15:17

by Manuel Estrada Sainz

[permalink] [raw]
Subject: [PATCH] Re: request_firmware() private workqueue

Index: drivers/base/firmware_class.c
===================================================================
RCS file: /home/cvs/linux-2.5/drivers/base/firmware_class.c,v
retrieving revision 1.3
diff -u -r1.3 drivers/base/firmware_class.c
--- drivers/base/firmware_class.c 4 Jul 2003 02:21:18 -0000 1.3
+++ drivers/base/firmware_class.c 26 Jul 2003 08:38:07 -0000
@@ -22,6 +22,8 @@
MODULE_LICENSE("GPL");

static int loading_timeout = 10; /* In seconds */
+static struct workqueue_struct *firmware_wq;
+

struct firmware_priv {
char fw_id[FIRMWARE_NAME_MAX];
@@ -467,7 +469,7 @@
};
INIT_WORK(&fw_work->work, request_firmware_work_func, fw_work);

- schedule_work(&fw_work->work);
+ queue_work(firmware_wq, &fw_work->work);
return 0;
}

@@ -485,12 +487,20 @@
__FUNCTION__);
class_unregister(&firmware_class);
}
+ firmware_wq = create_workqueue("firmware");
+ if (!firmware_wq) {
+ printk(KERN_ERR "%s: create_workqueue failed\n", __FUNCTION__);
+ class_remove_file(&firmware_class, &class_attr_timeout);
+ class_unregister(&firmware_class);
+ error = -EIO;
+ }
return error;

}
static void __exit
firmware_class_exit(void)
{
+ destroy_workqueue(firmware_wq);
class_remove_file(&firmware_class, &class_attr_timeout);
class_unregister(&firmware_class);
}


Attachments:
(No filename) (1.22 kB)
request_firmware_own-workqueue.diff (1.26 kB)
Download all attachments