d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LinuxKPI: firmware, implement deferred loading for "nowait"

Browse Source 
Change linuxkpi_request_firmware_nowait() to deferred firmware loading
scheduling a task.  This changes behaviour in some cases that we
return from loading the driver before the driver is finished
initialising if the driver does not deal with it (wait).
This brings the behaviour one would expect from when this function is
called and I implemented it to see if it would help a specific case.

Sponsored by:	The FreeBSD Foundation
MFC after:	12 days
Reviewed by:	hselasky, imp (earlier version)
Differential Revision: https://reviews.freebsd.org/D30830
This commit is contained in:
Bjoern A. Zeeb 2021-06-20 13:49:46 +00:00
parent 539228d372
commit 399da52fff
1 changed files with 57 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
sys/compat/linuxkpi/common/src/linux_firmware.c
View File

@ -30,9 +30,13 @@
* $FreeBSD$
*/
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/types.h>
#include <sys/malloc.h>
#include <sys/firmware.h>
#include <sys/queue.h>
#include <sys/taskqueue.h>
#include <linux/types.h>
#include <linux/device.h>
@ -42,6 +46,16 @@
MALLOC_DEFINE(M_LKPI_FW, "lkpifw", "LinuxKPI firmware");
struct lkpi_fw_task {
/* Task and arguments for the "nowait" callback. */
struct task fw_task;
gfp_t gfp;
const char *fw_name;
struct device *dev;
void *drv;
void(*cont)(const struct linuxkpi_firmware *, void *);
};
static int
_linuxkpi_request_firmware(const char *fw_name, const struct linuxkpi_firmware **fw,
struct device *dev, gfp_t gfp __unused, bool enoentok, bool warn)
@ -52,8 +66,10 @@ _linuxkpi_request_firmware(const char *fw_name, const struct linuxkpi_firmware *
char *p;
uint32_t flags;
if (fw_name == NULL || fw == NULL || dev == NULL)
if (fw_name == NULL || fw == NULL || dev == NULL) {
*fw = NULL;
return (-EINVAL);
}
/* Set independent on "warn". To debug, bootverbose is avail. */
flags = FIRMWARE_GET_NOWARN;
@ -129,28 +145,54 @@ _linuxkpi_request_firmware(const char *fw_name, const struct linuxkpi_firmware *
return (0);
}
static void
lkpi_fw_task(void *ctx, int pending)
{
struct lkpi_fw_task *lfwt;
const struct linuxkpi_firmware *fw;
int error;
KASSERT(ctx != NULL && pending == 1, ("%s: lfwt %p, pending %d\n",
__func__, ctx, pending));
lfwt = ctx;
if (lfwt->cont == NULL)
goto out;
error = _linuxkpi_request_firmware(lfwt->fw_name, &fw, lfwt->dev,
lfwt->gfp, true, true);
/*
* Linux seems to run the callback if it cannot find the firmware.
* We call it in all cases as it is the only feedback to the requester.
*/
lfwt->cont(fw, lfwt->drv);
/* Do not assume fw is still valid! */
out:
free(lfwt, M_LKPI_FW);
}
int
linuxkpi_request_firmware_nowait(struct module *mod __unused, bool _t __unused,
const char *fw_name, struct device *dev, gfp_t gfp, void *drv,
void(*cont)(const struct linuxkpi_firmware *, void *))
{
const struct linuxkpi_firmware *lfw;
struct lkpi_fw_task *lfwt;
int error;
/*
* Linux seems to run the callback if it cannot find the firmware.
* The fact that this is "_nowait()" and has a callback seems to
* imply that this is run in a deferred conext which we currently
* do not do. Should it become necessary (a driver actually requiring
* it) we would need to implement it here.
*/
error = _linuxkpi_request_firmware(fw_name, &lfw, dev, gfp, true, true);
if (error == -ENOENT)
error = 0;
if (error == 0)
cont(lfw, drv);
lfwt = malloc(sizeof(*lfwt), M_LKPI_FW, M_WAITOK | M_ZERO);
lfwt->gfp = gfp;
lfwt->fw_name = fw_name;
lfwt->dev = dev;
lfwt->drv = drv;
lfwt->cont = cont;
TASK_INIT(&lfwt->fw_task, 0, lkpi_fw_task, lfwt);
error = taskqueue_enqueue(taskqueue_thread, &lfwt->fw_task);
return (error);
if (error)
return (-error);
return (0);
}
int