Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ebfbd45 authored by Johannes Berg's avatar Johannes Berg Committed by Greg Kroah-Hartman
Browse files

firmware_class: make request_firmware_nowait more useful 



Unfortunately, one cannot hold on to the struct firmware
that request_firmware_nowait() hands off, which is needed
in some cases. Allow this by requiring the callback to
free it (via release_firmware).

Additionally, give it a gfp_t parameter -- all the current
users call it from a GFP_KERNEL context so the GFP_ATOMIC
isn't necessary. This also marks an API break which is
useful in a sense, although that is obviously not the
primary purpose of this change.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Cc: Ming Lei <tom.leiming@gmail.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: David Woodhouse <David.Woodhouse@intel.com>
Cc: Pavel Roskin <proski@gnu.org>
Cc: Abhay Salunke <abhay_salunke@dell.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 03d673e6

drivers/base/firmware_class.c

+6 −8
Original line number Diff line number Diff line
@@ -601,12 +601,9 @@ request_firmware_work_func(void *arg) 
	}

	ret = _request_firmware(&fw, fw_work->name, fw_work->device,

		fw_work->uevent);

	if (ret < 0)

		fw_work->cont(NULL, fw_work->context);

	else {



	fw_work->cont(fw, fw_work->context);

		release_firmware(fw);

	}



	module_put(fw_work->module);

	kfree(fw_work);

	return ret;
@@ -619,6 +616,7 @@ request_firmware_work_func(void *arg) 
 *	is non-zero else the firmware copy must be done manually.

 * @name: name of firmware file

 * @device: device for which firmware is being loaded

 * @gfp: allocation flags

 * @context: will be passed over to @cont, and

 *	@fw may be %NULL if firmware request fails.

 * @cont: function will be called asynchronously when the firmware
@@ -631,12 +629,12 @@ request_firmware_work_func(void *arg) 
int

request_firmware_nowait(

	struct module *module, int uevent,

	const char *name, struct device *device, void *context,

	const char *name, struct device *device, gfp_t gfp, void *context,

	void (*cont)(const struct firmware *fw, void *context))

{

	struct task_struct *task;

	struct firmware_work *fw_work = kmalloc(sizeof (struct firmware_work),

						GFP_ATOMIC);

						gfp);



	if (!fw_work)

		return -ENOMEM;

drivers/firmware/dell_rbu.c

+7 −2
Original line number Diff line number Diff line
@@ -544,9 +544,12 @@ static void callbackfn_rbu(const struct firmware *fw, void *context) 
{

	rbu_data.entry_created = 0;



	if (!fw || !fw->size)

	if (!fw)

		return;



	if (!fw->size)

		goto out;



	spin_lock(&rbu_data.lock);

	if (!strcmp(image_type, "mono")) {

		if (!img_update_realloc(fw->size))
@@ -568,6 +571,8 @@ static void callbackfn_rbu(const struct firmware *fw, void *context) 
	} else

		pr_debug("invalid image type specified.\n");

	spin_unlock(&rbu_data.lock);

 out:

	release_firmware(fw);

}



static ssize_t read_rbu_image_type(struct kobject *kobj,
@@ -615,7 +620,7 @@ static ssize_t write_rbu_image_type(struct kobject *kobj, 
			spin_unlock(&rbu_data.lock);

			req_firm_rc = request_firmware_nowait(THIS_MODULE,

				FW_ACTION_NOHOTPLUG, "dell_rbu",

				&rbu_device->dev, &context,

				&rbu_device->dev, GFP_KERNEL, &context,

				callbackfn_rbu);

			if (req_firm_rc) {

				printk(KERN_ERR

drivers/serial/ucc_uart.c

+5 −3
Original line number Diff line number Diff line
@@ -1179,16 +1179,18 @@ static void uart_firmware_cont(const struct firmware *fw, void *context) 


	if (firmware->header.length != fw->size) {

		dev_err(dev, "invalid firmware\n");

		return;

		goto out;

	}



	ret = qe_upload_firmware(firmware);

	if (ret) {

		dev_err(dev, "could not load firmware\n");

		return;

		goto out;

	}



	firmware_loaded = 1;

 out:

	release_firmware(fw);

}



static int ucc_uart_probe(struct of_device *ofdev,
@@ -1247,7 +1249,7 @@ static int ucc_uart_probe(struct of_device *ofdev, 
			 */

			ret = request_firmware_nowait(THIS_MODULE,

				FW_ACTION_HOTPLUG, filename, &ofdev->dev,

				&ofdev->dev, uart_firmware_cont);

				GFP_KERNEL, &ofdev->dev, uart_firmware_cont);

			if (ret) {

				dev_err(&ofdev->dev,

					"could not load firmware %s\n",

drivers/staging/comedi/drivers/usbdux.c

+4 −1
Original line number Diff line number Diff line
@@ -2327,9 +2327,11 @@ static void usbdux_firmware_request_complete_handler(const struct firmware *fw, 
	if (ret) {

		dev_err(&usbdev->dev,

			"Could not upload firmware (err=%d)\n", ret);

		return;

		goto out;

	}

	comedi_usb_auto_config(usbdev, BOARDNAME);

 out:

	release_firmware(fw);

}



/* allocate memory for the urbs and initialise them */
@@ -2580,6 +2582,7 @@ static int usbduxsub_probe(struct usb_interface *uinterf, 
				      FW_ACTION_HOTPLUG,

				      "usbdux_firmware.bin",

				      &udev->dev,

				      GFP_KERNEL,

				      usbduxsub + index,

				      usbdux_firmware_request_complete_handler);

drivers/staging/comedi/drivers/usbduxfast.c

+4 −1
Original line number Diff line number Diff line
@@ -1451,10 +1451,12 @@ static void usbduxfast_firmware_request_complete_handler(const struct firmware 
	if (ret) {

		dev_err(&usbdev->dev,

			"Could not upload firmware (err=%d)\n", ret);

		return;

		goto out;

	}



	comedi_usb_auto_config(usbdev, BOARDNAME);

 out:

	release_firmware(fw);

}



/*
@@ -1569,6 +1571,7 @@ static int usbduxfastsub_probe(struct usb_interface *uinterf, 
				      FW_ACTION_HOTPLUG,

				      "usbduxfast_firmware.bin",

				      &udev->dev,

				      GFP_KERNEL,

				      usbduxfastsub + index,

				      usbduxfast_firmware_request_complete_handler);