diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-07 13:11:44 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-07 13:11:49 +0000 |
commit | f25552c1068a054f2d99afd67a671d5991bf19c1 (patch) | |
tree | d70de5c7262ad572f8323fc4184b8a10522e81ec /debian/patches/bugfix/all/firmware_class-log-every-success-and-failure.patch | |
parent | Merging upstream version 6.9.7. (diff) | |
download | linux-f25552c1068a054f2d99afd67a671d5991bf19c1.tar.xz linux-f25552c1068a054f2d99afd67a671d5991bf19c1.zip |
Merging debian version 6.9.7-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/bugfix/all/firmware_class-log-every-success-and-failure.patch')
-rw-r--r-- | debian/patches/bugfix/all/firmware_class-log-every-success-and-failure.patch | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/debian/patches/bugfix/all/firmware_class-log-every-success-and-failure.patch b/debian/patches/bugfix/all/firmware_class-log-every-success-and-failure.patch deleted file mode 100644 index 092a744961..0000000000 --- a/debian/patches/bugfix/all/firmware_class-log-every-success-and-failure.patch +++ /dev/null @@ -1,83 +0,0 @@ -From: Ben Hutchings <ben@decadent.org.uk> -Subject: firmware_class: Log every success and failure against given device -Date: Sun, 09 Dec 2012 16:02:00 +0000 -Forwarded: no - -The hundreds of users of request_firmware() have nearly as many -different log formats for reporting failures. They also have only the -vaguest hint as to what went wrong; only firmware_class really knows -that. Therefore, add specific log messages for the failure modes that -aren't currently logged. - -In case of a driver that tries multiple names, this may result in the -impression that it failed to initialise. Therefore, also log successes. - -This makes many error messages in drivers redundant, which will be -removed in later patches. - -This does not cover the case where we fall back to a user-mode helper -(which is no longer enabled in Debian). - -NOTE: hw-detect will depend on the "firmware: failed to load %s (%d)\n" -format to detect missing firmware. ---- - drivers/base/firmware_loader/fallback.c | 2 +- - drivers/base/firmware_loader/main.c | 17 ++++++++--------- - 2 files changed, 9 insertions(+), 10 deletions(-) - ---- a/drivers/base/firmware_loader/fallback.c -+++ b/drivers/base/firmware_loader/fallback.c -@@ -558,7 +558,7 @@ static int fw_load_from_user_helper(stru - if (opt_flags & FW_OPT_NOWAIT) { - timeout = usermodehelper_read_lock_wait(timeout); - if (!timeout) { -- dev_dbg(device, "firmware: %s loading timed out\n", -+ dev_err(device, "firmware: %s loading timed out\n", - name); - return -EBUSY; - } ---- a/drivers/base/firmware_loader/main.c -+++ b/drivers/base/firmware_loader/main.c -@@ -535,18 +535,15 @@ fw_get_filesystem_firmware(struct device - file_size_ptr, - READING_FIRMWARE); - if (rc < 0) { -- if (rc != -ENOENT) -- dev_warn(device, "loading %s failed with error %d\n", -- path, rc); -- else -- dev_dbg(device, "loading %s failed for no such file or directory.\n", -- path); -+ dev_dbg(device, "loading %s failed with error %d\n", -+ path, rc); - continue; - } - size = rc; - rc = 0; - -- dev_dbg(device, "Loading firmware from %s\n", path); -+ dev_info(device, "firmware: direct-loading firmware %s\n", -+ fw_priv->fw_name); - if (decompress) { - dev_dbg(device, "f/w decompressing %s\n", - fw_priv->fw_name); -@@ -559,8 +556,6 @@ fw_get_filesystem_firmware(struct device - continue; - } - } else { -- dev_dbg(device, "direct-loading %s\n", -- fw_priv->fw_name); - if (!fw_priv->data) - fw_priv->data = buffer; - fw_priv->size = size; -@@ -570,6 +565,10 @@ fw_get_filesystem_firmware(struct device - } - __putname(path); - -+ if (rc) -+ dev_err(device, "firmware: failed to load %s (%d)\n", -+ fw_priv->fw_name, rc); -+ - return rc; - } - |