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

Commit 25d39131 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by Greg Kroah-Hartman
Browse files

firmware: provide helper for FW_OPT_USERHELPER 



The macro FW_OPT_USERHELPER is only currently defined when
CONFIG_FW_LOADER_USER_HELPER is set. This is handled via an
ifdef around CONFIG_FW_LOADER_USER_HELPER. This makes reading
and understanding use FW_OPT_USERHELPER a bit convoluted.

Instead wrap the functionality implemented behind
CONFIG_FW_LOADER_USER_HELPER as we typically do in the
kernel.

Now when CONFIG_FW_LOADER_USER_HELPER is *not set*, then
simply the helper fw_sysfs_fallback() will not do anything.

Signed-off-by: default avatarLuis R. Rodriguez <mcgrof@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5711ae6d

drivers/base/firmware_class.c

+18 −13
Original line number Original line Diff line number Diff line
@@ -61,11 +61,7 @@ struct fw_state { 
/* firmware behavior options */

/* firmware behavior options */

#define FW_OPT_UEVENT	(1U << 0)

#define FW_OPT_UEVENT	(1U << 0)

#define FW_OPT_NOWAIT	(1U << 1)

#define FW_OPT_NOWAIT	(1U << 1)

#ifdef CONFIG_FW_LOADER_USER_HELPER

#define FW_OPT_USERHELPER	(1U << 2)

#define FW_OPT_USERHELPER	(1U << 2)

#else

#define FW_OPT_USERHELPER	0

#endif

#ifdef CONFIG_FW_LOADER_USER_HELPER_FALLBACK

#ifdef CONFIG_FW_LOADER_USER_HELPER_FALLBACK

#define FW_OPT_FALLBACK		FW_OPT_USERHELPER

#define FW_OPT_FALLBACK		FW_OPT_USERHELPER

#else

#else
@@ -1158,12 +1154,25 @@ static int fw_load_from_user_helper(struct firmware *firmware, 
	return ret;

	return ret;

}

}





static int fw_sysfs_fallback(struct firmware *fw, const char *name,

			    struct device *device,

			    unsigned int opt_flags,

			    int ret)

{

	if (!(opt_flags & FW_OPT_USERHELPER))

		return ret;



	dev_warn(device, "Falling back to user helper\n");

	return fw_load_from_user_helper(fw, name, device, opt_flags);

}

#else /* CONFIG_FW_LOADER_USER_HELPER */

#else /* CONFIG_FW_LOADER_USER_HELPER */

static inline int

static int fw_sysfs_fallback(struct firmware *fw, const char *name,

fw_load_from_user_helper(struct firmware *firmware, const char *name,

			     struct device *device,

			 struct device *device, unsigned int opt_flags)

			     unsigned int opt_flags,

			     int ret)

{

{

	return -ENOENT;

	/* Keep carrying over the same error */

	return ret;

}

}





static inline void kill_pending_fw_fallback_reqs(bool only_kill_custom) { }

static inline void kill_pending_fw_fallback_reqs(bool only_kill_custom) { }
@@ -1273,11 +1282,7 @@ _request_firmware(const struct firmware **firmware_p, const char *name, 
			dev_warn(device,

			dev_warn(device,

				 "Direct firmware load for %s failed with error %d\n",

				 "Direct firmware load for %s failed with error %d\n",

				 name, ret);

				 name, ret);

		if (opt_flags & FW_OPT_USERHELPER) {

		ret = fw_sysfs_fallback(fw, name, device, opt_flags, ret);

			dev_warn(device, "Falling back to user helper\n");

			ret = fw_load_from_user_helper(fw, name, device,

						       opt_flags);

		}

	} else

	} else

		ret = assign_fw(fw, device, opt_flags);

		ret = assign_fw(fw, device, opt_flags);