| From 7883985a3a78677e9a1d5d61fe7fa8badf39f565 Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Wed, 9 Nov 2016 20:45:23 -0800 |
| Subject: [PATCH 10/14] Revert "udev: remove userspace firmware loading |
| support" |
| |
| This reverts commit be2ea723b1d023b3d385d3b791ee4607cbfb20ca. |
| Userspace firmware loading support is needed for Linux < 3.7. |
| |
| Upstream-Status: Inappropriate [OE specific] |
| |
| Signed-off-by: Jonathan Liu <net147@gmail.com> |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| |
| --- |
| Makefile.am | 12 +++ |
| README | 4 +- |
| TODO | 1 + |
| configure.ac | 18 +++++ |
| src/udev/udev-builtin-firmware.c | 154 +++++++++++++++++++++++++++++++++++++++ |
| src/udev/udev-builtin.c | 3 + |
| src/udev/udev.h | 6 ++ |
| src/udev/udevd.c | 13 ++++ |
| 8 files changed, 209 insertions(+), 2 deletions(-) |
| create mode 100644 src/udev/udev-builtin-firmware.c |
| |
| diff --git a/Makefile.am b/Makefile.am |
| index c2b4a99d2..692d7bb95 100644 |
| --- a/Makefile.am |
| +++ b/Makefile.am |
| @@ -3985,6 +3985,18 @@ libudev_core_la_LIBADD = \ |
| $(BLKID_LIBS) \ |
| $(KMOD_LIBS) |
| |
| +libudev_core_la_CPPFLAGS = \ |
| + $(AM_CPPFLAGS) \ |
| + -DFIRMWARE_PATH="$(FIRMWARE_PATH)" |
| + |
| +if ENABLE_FIRMWARE |
| +libudev_core_la_SOURCES += \ |
| + src/udev/udev-builtin-firmware.c |
| + |
| +dist_udevrules_DATA += \ |
| + rules/50-firmware.rules |
| +endif |
| + |
| if HAVE_KMOD |
| libudev_core_la_SOURCES += \ |
| src/udev/udev-builtin-kmod.c |
| diff --git a/README b/README |
| index 60388eebe..e21976393 100644 |
| --- a/README |
| +++ b/README |
| @@ -61,8 +61,8 @@ REQUIREMENTS: |
| Legacy hotplug slows down the system and confuses udev: |
| CONFIG_UEVENT_HELPER_PATH="" |
| |
| - Userspace firmware loading is not supported and should |
| - be disabled in the kernel: |
| + Userspace firmware loading is deprecated, will go away, and |
| + sometimes causes problems: |
| CONFIG_FW_LOADER_USER_HELPER=n |
| |
| Some udev rules and virtualization detection relies on it: |
| diff --git a/TODO b/TODO |
| index 61efa5e9f..67ccac224 100644 |
| --- a/TODO |
| +++ b/TODO |
| @@ -740,6 +740,7 @@ Features: |
| * initialize the hostname from the fs label of /, if /etc/hostname does not exist? |
| |
| * udev: |
| + - remove src/udev/udev-builtin-firmware.c (CONFIG_FW_LOADER_USER_HELPER=n) |
| - move to LGPL |
| - kill scsi_id |
| - add trigger --subsystem-match=usb/usb_device device |
| diff --git a/configure.ac b/configure.ac |
| index b53ca1f1a..1150ca50e 100644 |
| --- a/configure.ac |
| +++ b/configure.ac |
| @@ -1522,6 +1522,23 @@ AM_CONDITIONAL(HAVE_MYHOSTNAME, [test "$have_myhostname" = "yes"]) |
| AC_ARG_ENABLE(hwdb, [AS_HELP_STRING([--disable-hwdb], [disable hardware database support])], |
| enable_hwdb=$enableval, enable_hwdb=yes) |
| AM_CONDITIONAL(ENABLE_HWDB, [test x$enable_hwdb = xyes]) |
| +AC_ARG_WITH(firmware-path, |
| + AS_HELP_STRING([--with-firmware-path=DIR[[[:DIR[...]]]]], |
| + [Firmware search path (default="")]), |
| + [], [with_firmware_path=""]) |
| +OLD_IFS=$IFS |
| +IFS=: |
| +for i in $with_firmware_path; do |
| + if test "x${FIRMWARE_PATH}" = "x"; then |
| + FIRMWARE_PATH="\\\"${i}/\\\"" |
| + else |
| + FIRMWARE_PATH="${FIRMWARE_PATH}, \\\"${i}/\\\"" |
| + fi |
| +done |
| +IFS=$OLD_IFS |
| +AC_SUBST(FIRMWARE_PATH) |
| +AS_IF([test "x${FIRMWARE_PATH}" != "x"], [ AC_DEFINE(HAVE_FIRMWARE, 1, [Define if FIRMWARE is available]) ]) |
| +AM_CONDITIONAL(ENABLE_FIRMWARE, [test "x${FIRMWARE_PATH}" != "x"]) |
| |
| # ------------------------------------------------------------------------------ |
| have_manpages=no |
| @@ -1839,6 +1856,7 @@ AC_MSG_RESULT([ |
| SysV init scripts: ${SYSTEM_SYSVINIT_PATH} |
| SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH} |
| build Python: ${PYTHON} |
| + firmware path: ${FIRMWARE_PATH} |
| PAM modules dir: ${with_pamlibdir} |
| PAM configuration dir: ${with_pamconfdir} |
| RPM macros dir: ${with_rpmmacrosdir} |
| diff --git a/src/udev/udev-builtin-firmware.c b/src/udev/udev-builtin-firmware.c |
| new file mode 100644 |
| index 000000000..bd8c2fb96 |
| --- /dev/null |
| +++ b/src/udev/udev-builtin-firmware.c |
| @@ -0,0 +1,154 @@ |
| +/* |
| + * firmware - Kernel firmware loader |
| + * |
| + * Copyright (C) 2009 Piter Punk <piterpunk@slackware.com> |
| + * Copyright (C) 2009-2011 Kay Sievers <kay@vrfy.org> |
| + * |
| + * This program is free software; you can redistribute it and/or |
| + * modify it under the terms of the GNU General Public License as |
| + * published by the Free Software Foundation; either version 2 of the |
| + * License, or (at your option) any later version. |
| + * |
| + * This program is distributed in the hope that it will be useful, but |
| + * WITHOUT ANY WARRANTY; without even the implied warranty of |
| + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| + * General Public License for more details:* |
| + */ |
| + |
| +#include <unistd.h> |
| +#include <stdlib.h> |
| +#include <string.h> |
| +#include <stdio.h> |
| +#include <getopt.h> |
| +#include <errno.h> |
| +#include <stdbool.h> |
| +#include <sys/utsname.h> |
| +#include <sys/stat.h> |
| + |
| +#include "udev.h" |
| + |
| +static bool set_loading(struct udev *udev, char *loadpath, const char *state) { |
| + FILE *ldfile; |
| + |
| + ldfile = fopen(loadpath, "we"); |
| + if (ldfile == NULL) { |
| + log_error("error: can not open '%s'", loadpath); |
| + return false; |
| + }; |
| + fprintf(ldfile, "%s\n", state); |
| + fclose(ldfile); |
| + return true; |
| +} |
| + |
| +static bool copy_firmware(struct udev *udev, const char *source, const char *target, size_t size) { |
| + char *buf; |
| + FILE *fsource = NULL, *ftarget = NULL; |
| + bool ret = false; |
| + |
| + buf = malloc(size); |
| + if (buf == NULL) { |
| + log_error("No memory available to load firmware file"); |
| + return false; |
| + } |
| + |
| + log_debug("writing '%s' (%zi) to '%s'", source, size, target); |
| + |
| + fsource = fopen(source, "re"); |
| + if (fsource == NULL) |
| + goto exit; |
| + ftarget = fopen(target, "we"); |
| + if (ftarget == NULL) |
| + goto exit; |
| + if (fread(buf, size, 1, fsource) != 1) |
| + goto exit; |
| + if (fwrite(buf, size, 1, ftarget) == 1) |
| + ret = true; |
| +exit: |
| + if (ftarget != NULL) |
| + fclose(ftarget); |
| + if (fsource != NULL) |
| + fclose(fsource); |
| + free(buf); |
| + return ret; |
| +} |
| + |
| +static int builtin_firmware(struct udev_device *dev, int argc, char *argv[], bool test) { |
| + struct udev *udev = udev_device_get_udev(dev); |
| + static const char *searchpath[] = { FIRMWARE_PATH }; |
| + char loadpath[UTIL_PATH_SIZE]; |
| + char datapath[UTIL_PATH_SIZE]; |
| + char fwpath[UTIL_PATH_SIZE]; |
| + const char *firmware; |
| + FILE *fwfile = NULL; |
| + struct utsname kernel; |
| + struct stat statbuf; |
| + unsigned int i; |
| + int rc = EXIT_SUCCESS; |
| + |
| + firmware = udev_device_get_property_value(dev, "FIRMWARE"); |
| + if (firmware == NULL) { |
| + log_error("firmware parameter missing"); |
| + rc = EXIT_FAILURE; |
| + goto exit; |
| + } |
| + |
| + /* lookup firmware file */ |
| + uname(&kernel); |
| + for (i = 0; i < ELEMENTSOF(searchpath); i++) { |
| + strscpyl(fwpath, sizeof(fwpath), searchpath[i], kernel.release, "/", firmware, NULL); |
| + fwfile = fopen(fwpath, "re"); |
| + if (fwfile != NULL) |
| + break; |
| + |
| + strscpyl(fwpath, sizeof(fwpath), searchpath[i], firmware, NULL); |
| + fwfile = fopen(fwpath, "re"); |
| + if (fwfile != NULL) |
| + break; |
| + } |
| + |
| + strscpyl(loadpath, sizeof(loadpath), udev_device_get_syspath(dev), "/loading", NULL); |
| + |
| + if (fwfile == NULL) { |
| + log_debug("did not find firmware file '%s'", firmware); |
| + rc = EXIT_FAILURE; |
| + /* |
| + * Do not cancel the request in the initrd, the real root might have |
| + * the firmware file and the 'coldplug' run in the real root will find |
| + * this pending request and fulfill or cancel it. |
| + * */ |
| + if (!in_initrd()) |
| + set_loading(udev, loadpath, "-1"); |
| + goto exit; |
| + } |
| + |
| + if (stat(fwpath, &statbuf) < 0 || statbuf.st_size == 0) { |
| + if (!in_initrd()) |
| + set_loading(udev, loadpath, "-1"); |
| + rc = EXIT_FAILURE; |
| + goto exit; |
| + } |
| + |
| + if (!set_loading(udev, loadpath, "1")) |
| + goto exit; |
| + |
| + strscpyl(datapath, sizeof(datapath), udev_device_get_syspath(dev), "/data", NULL); |
| + if (!copy_firmware(udev, fwpath, datapath, statbuf.st_size)) { |
| + log_error("error sending firmware '%s' to device", firmware); |
| + set_loading(udev, loadpath, "-1"); |
| + rc = EXIT_FAILURE; |
| + goto exit; |
| + }; |
| + |
| + set_loading(udev, loadpath, "0"); |
| +exit: |
| + if (fwfile) |
| + fclose(fwfile); |
| + return rc; |
| +} |
| + |
| +const struct udev_builtin udev_builtin_firmware = { |
| + .name = "firmware", |
| + .cmd = builtin_firmware, |
| + .help = "kernel firmware loader", |
| + .run_once = true, |
| +}; |
| diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c |
| index e6b36f124..cd9947e2a 100644 |
| --- a/src/udev/udev-builtin.c |
| +++ b/src/udev/udev-builtin.c |
| @@ -31,6 +31,9 @@ static const struct udev_builtin *builtins[] = { |
| [UDEV_BUILTIN_BLKID] = &udev_builtin_blkid, |
| #endif |
| [UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs, |
| +#ifdef HAVE_FIRMWARE |
| + [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware, |
| +#endif |
| [UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb, |
| [UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id, |
| [UDEV_BUILTIN_KEYBOARD] = &udev_builtin_keyboard, |
| diff --git a/src/udev/udev.h b/src/udev/udev.h |
| index c0cb7eae8..9f0f1cf13 100644 |
| --- a/src/udev/udev.h |
| +++ b/src/udev/udev.h |
| @@ -150,6 +150,9 @@ enum udev_builtin_cmd { |
| UDEV_BUILTIN_BLKID, |
| #endif |
| UDEV_BUILTIN_BTRFS, |
| +#ifdef HAVE_FIRMWARE |
| + UDEV_BUILTIN_FIRMWARE, |
| +#endif |
| UDEV_BUILTIN_HWDB, |
| UDEV_BUILTIN_INPUT_ID, |
| UDEV_BUILTIN_KEYBOARD, |
| @@ -178,6 +181,9 @@ struct udev_builtin { |
| extern const struct udev_builtin udev_builtin_blkid; |
| #endif |
| extern const struct udev_builtin udev_builtin_btrfs; |
| +#ifdef HAVE_FIRMWARE |
| +extern const struct udev_builtin udev_builtin_firmware; |
| +#endif |
| extern const struct udev_builtin udev_builtin_hwdb; |
| extern const struct udev_builtin udev_builtin_input_id; |
| extern const struct udev_builtin udev_builtin_keyboard; |
| diff --git a/src/udev/udevd.c b/src/udev/udevd.c |
| index acbddd418..20347b402 100644 |
| --- a/src/udev/udevd.c |
| +++ b/src/udev/udevd.c |
| @@ -125,6 +125,9 @@ struct event { |
| bool is_block; |
| sd_event_source *timeout_warning; |
| sd_event_source *timeout; |
| +#ifdef HAVE_FIRMWARE |
| + bool nodelay; |
| +#endif |
| }; |
| |
| static inline struct event *node_to_event(struct udev_list_node *node) { |
| @@ -613,6 +616,10 @@ static int event_queue_insert(Manager *manager, struct udev_device *dev) { |
| event->devnum = udev_device_get_devnum(dev); |
| event->is_block = streq("block", udev_device_get_subsystem(dev)); |
| event->ifindex = udev_device_get_ifindex(dev); |
| +#ifdef HAVE_FIRMWARE |
| + if (streq(udev_device_get_subsystem(dev), "firmware")) |
| + event->nodelay = true; |
| +#endif |
| |
| log_debug("seq %llu queued, '%s' '%s'", udev_device_get_seqnum(dev), |
| udev_device_get_action(dev), udev_device_get_subsystem(dev)); |
| @@ -698,6 +705,12 @@ static bool is_devpath_busy(Manager *manager, struct event *event) { |
| return true; |
| } |
| |
| +#ifdef HAVE_FIRMWARE |
| + /* allow to bypass the dependency tracking */ |
| + if (event->nodelay) |
| + continue; |
| +#endif |
| + |
| /* parent device event found */ |
| if (event->devpath[common] == '/') { |
| event->delaying_seqnum = loop_event->seqnum; |
| -- |
| 2.13.2 |
| |