The Linux-Libre deblob script that is used to make the Trisquel kernel packages disables all functionality related to loading nonfree firmware blobs. Even if the user chooses to install the blob files, these would still not be loaded and the driver would not activate.
An alternative solution is to preserve the loading functionality and remove the *advertisment* to the user of the blob filenames when these fail to be loaded, as to not imply that those files are recommended in any way, so the driver would just print "failed to load firmware" or equivalent. This allows the user to use the driver if they so decide.
This method is done by a patch (silent-accept-firmware.patch) that removes all the instances where the blob filenames are printed to the user (via kernel logs), and a section on the package helper that takes care of preventing the deblob script from acting on the files modified by the patch. This is done manually, for individual drivers (usually those for very common devices). It needs to be reviewed on any new major release, checking that no new lines were added to the upstream driver in where it prints the blob filename on the log.
Printing the blob filename on success operations (that is, when the blob file is present) is acceptable. If in doubt, all instances of printing the blob filenames should be removed.
--- a/arch/x86/kernel/cpu/microcode/amd.c 2019-11-25 01:32:01.000000000 +0100
+++ b/arch/x86/kernel/cpu/microcode/amd.c 2021-06-25 14:54:58.316092472 +0200
@@ -902,7 +902,7 @@
snprintf(fw_name, sizeof(fw_name), "amd-ucode/microcode_amd_fam%.2xh.bin", c->x86);
if (request_firmware_direct(&fw, (const char *)fw_name, device)) {
- pr_debug("failed to load file %s\n", fw_name);
+ pr_debug("failed to load file\n");
goto out;
}
diff -ur a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
--- a/arch/x86/kernel/cpu/microcode/intel.c 2021-06-25 14:52:20.000000000 +0200
+++ b/arch/x86/kernel/cpu/microcode/intel.c 2021-06-25 14:54:58.320092521 +0200
@@ -939,7 +939,7 @@
c->x86, c->x86_model, c->x86_stepping);
if (request_firmware_direct(&firmware, name, device)) {
- pr_debug("data file %s load failed\n", name);
+ pr_debug("data file load failed\n");
return UCODE_NFOUND;
}
diff -ur a/drivers/base/firmware_loader/fallback.c b/drivers/base/firmware_loader/fallback.c
--- a/drivers/base/firmware_loader/fallback.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/base/firmware_loader/fallback.c 2021-06-25 14:54:58.320092521 +0200
@@ -518,7 +518,7 @@
if (opt_flags & FW_OPT_UEVENT) {
fw_priv->need_uevent = true;
dev_set_uevent_suppress(f_dev, false);
- dev_dbg(f_dev, "firmware: requesting %s\n", fw_priv->fw_name);
+ dev_dbg(f_dev, "firmware: requesting\n");
kobject_uevent(&fw_sysfs->dev.kobj, KOBJ_ADD);
} else {
timeout = MAX_JIFFY_OFFSET;
@@ -557,15 +557,13 @@
if (opt_flags & FW_OPT_NOWAIT) {
timeout = usermodehelper_read_lock_wait(timeout);
if (!timeout) {
- dev_dbg(device, "firmware: %s loading timed out\n",
- name);
+ dev_dbg(device, "firmware: loading timed out\n");
return -EBUSY;
}
} else {
ret = usermodehelper_read_trylock();
if (WARN_ON(ret)) {
- dev_err(device, "firmware: %s will not be loaded\n",
- name);
+ dev_err(device, "firmware: will not be loaded\n");
return ret;
}
}
@@ -646,10 +644,8 @@
return ret;
if (!(opt_flags & FW_OPT_NO_WARN))
- dev_warn(device, "Falling back to sysfs fallback for: %s\n",
- name);
+ dev_warn(device, "Falling back to sysfs fallback\n");
else
- dev_dbg(device, "Falling back to sysfs fallback for: %s\n",
- name);
+ dev_dbg(device, "Falling back to sysfs fallback\n");
return fw_load_from_user_helper(fw, name, device, opt_flags);
}
diff -ur a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c
--- a/drivers/base/firmware_loader/main.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/base/firmware_loader/main.c 2021-06-25 14:57:07.550971727 +0200
@@ -502,11 +502,10 @@
msize, id);
if (rc) {
if (rc != -ENOENT)
- dev_warn(device, "loading %s failed with error %d\n",
- path, rc);
+ dev_warn(device, "loading firmware failed with error %d\n",
+ rc);
else
- dev_dbg(device, "loading %s failed for no such file or directory.\n",
- path);
+ dev_dbg(device, "loading firmware failed for no such file or directory.\n");
continue;
}
if (decompress) {
@@ -521,8 +520,7 @@
continue;
}
} else {
- dev_dbg(device, "direct-loading %s\n",
- fw_priv->fw_name);
+ dev_dbg(device, "direct-loading\n");
if (!fw_priv->data)
fw_priv->data = buffer;
fw_priv->size = size;
@@ -703,7 +701,7 @@
}
if (fw_get_builtin_firmware(firmware, name, dbuf, size)) {
- dev_dbg(device, "using built-in %s\n", name);
+ dev_dbg(device, "using built-in\n");
return 0; /* assigned */
}
@@ -783,8 +781,8 @@
if (ret) {
if (!(opt_flags & FW_OPT_NO_WARN))
dev_warn(device,
- "Direct firmware load for %s failed with error %d\n",
- name, ret);
+ "Direct firmware load failed with error %d\n",
+ ret);
ret = firmware_fallback_sysfs(fw, name, device, opt_flags, ret);
} else
ret = assign_fw(fw, device, opt_flags);
diff -ur a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c 2019-11-25 01:32:01.000000000 +0100
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c 2021-06-25 14:54:58.320092521 +0200
@@ -443,7 +443,7 @@
err = amdgpu_ucode_validate(adev->pm.fw);
if (err) {
- DRM_ERROR("Failed to load firmware \"%s\"", fw_name);
+ DRM_ERROR("Failed to load firmware");
release_firmware(adev->pm.fw);
adev->pm.fw = NULL;
return err;
diff -ur a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c 2021-06-25 14:54:58.320092521 +0200
@@ -1445,15 +1445,13 @@
err = request_firmware(&adev->firmware.gpu_info_fw, fw_name, adev->dev);
if (err) {
dev_err(adev->dev,
- "Failed to load gpu_info firmware \"%s\"\n",
- fw_name);
+ "Failed to load gpu_info firmware\n");
goto out;
}
err = amdgpu_ucode_validate(adev->firmware.gpu_info_fw);
if (err) {
dev_err(adev->dev,
- "Failed to validate gpu_info firmware \"%s\"\n",
- fw_name);
+ "Failed to validate gpu_info firmware\n");
goto out;
}
diff -ur a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c 2021-06-25 14:54:58.320092521 +0200
@@ -187,15 +187,13 @@
r = request_firmware(&adev->uvd.fw, fw_name, adev->dev);
if (r) {
- dev_err(adev->dev, "amdgpu_uvd: Can't load firmware \"%s\"\n",
- fw_name);
+ dev_err(adev->dev, "amdgpu_uvd: Can't load firmware\n");
return r;
}
r = amdgpu_ucode_validate(adev->uvd.fw);
if (r) {
- dev_err(adev->dev, "amdgpu_uvd: Can't validate firmware \"%s\"\n",
- fw_name);
+ dev_err(adev->dev, "amdgpu_uvd: Can't validate firmware\n");
release_firmware(adev->uvd.fw);
adev->uvd.fw = NULL;
return r;
diff -ur a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c 2019-11-25 01:32:01.000000000 +0100
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c 2021-06-25 14:54:58.324092569 +0200
@@ -153,15 +153,13 @@
r = request_firmware(&adev->vce.fw, fw_name, adev->dev);
if (r) {
- dev_err(adev->dev, "amdgpu_vce: Can't load firmware \"%s\"\n",
- fw_name);
+ dev_err(adev->dev, "amdgpu_vce: Can't load firmware\n");
return r;
}
r = amdgpu_ucode_validate(adev->vce.fw);
if (r) {
- dev_err(adev->dev, "amdgpu_vce: Can't validate firmware \"%s\"\n",
- fw_name);
+ dev_err(adev->dev, "amdgpu_vce: Can't validate firmware\n");
release_firmware(adev->vce.fw);
adev->vce.fw = NULL;
return r;
diff -ur a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c 2021-06-25 14:54:58.324092569 +0200
@@ -113,15 +113,13 @@
r = request_firmware(&adev->vcn.fw, fw_name, adev->dev);
if (r) {
- dev_err(adev->dev, "amdgpu_vcn: Can't load firmware \"%s\"\n",
- fw_name);
+ dev_err(adev->dev, "amdgpu_vcn: Can't load firmware\n");
return r;
}
r = amdgpu_ucode_validate(adev->vcn.fw);
if (r) {
- dev_err(adev->dev, "amdgpu_vcn: Can't validate firmware \"%s\"\n",
- fw_name);
+ dev_err(adev->dev, "amdgpu_vcn: Can't validate firmware\n");
release_firmware(adev->vcn.fw);
adev->vcn.fw = NULL;
return r;
diff -ur a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
--- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c 2021-06-25 14:54:58.324092569 +0200
@@ -144,7 +144,7 @@
}
out:
if (err) {
- pr_err("cik_sdma: Failed to load firmware \"%s\"\n", fw_name);
+ pr_err("cik_sdma: Failed to load firmware\n");
for (i = 0; i < adev->sdma.num_instances; i++) {
release_firmware(adev->sdma.instance[i].fw);
adev->sdma.instance[i].fw = NULL;
diff -ur a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c 2021-06-25 14:54:58.324092569 +0200
@@ -855,8 +855,7 @@
out:
if (err) {
dev_err(adev->dev,
- "gfx10: Failed to load firmware \"%s\"\n",
- fw_name);
+ "gfx10: Failed to load firmware\n");
release_firmware(adev->gfx.pfp_fw);
adev->gfx.pfp_fw = NULL;
release_firmware(adev->gfx.me_fw);
diff -ur a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c 2019-11-25 01:32:01.000000000 +0100
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c 2021-06-25 14:54:58.324092569 +0200
@@ -381,7 +381,7 @@
out:
if (err) {
- pr_err("gfx6: Failed to load firmware \"%s\"\n", fw_name);
+ pr_err("gfx6: Failed to load firmware\n");
release_firmware(adev->gfx.pfp_fw);
adev->gfx.pfp_fw = NULL;
release_firmware(adev->gfx.me_fw);
diff -ur a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c 2021-06-25 14:54:58.324092569 +0200
@@ -976,7 +976,7 @@
out:
if (err) {
- pr_err("gfx7: Failed to load firmware \"%s\"\n", fw_name);
+ pr_err("gfx7: Failed to load firmware\n");
release_firmware(adev->gfx.pfp_fw);
adev->gfx.pfp_fw = NULL;
release_firmware(adev->gfx.me_fw);
diff -ur a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c 2021-06-25 14:54:58.324092569 +0200
@@ -1221,8 +1221,7 @@
out:
if (err) {
dev_err(adev->dev,
- "gfx8: Failed to load firmware \"%s\"\n",
- fw_name);
+ "gfx8: Failed to load firmware\n");
release_firmware(adev->gfx.pfp_fw);
adev->gfx.pfp_fw = NULL;
release_firmware(adev->gfx.me_fw);
diff -ur a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c 2021-06-25 14:54:58.328092618 +0200
@@ -1126,8 +1126,7 @@
out:
if (err) {
dev_err(adev->dev,
- "gfx9: Failed to load firmware \"%s\"\n",
- fw_name);
+ "gfx9: Failed to load firmware\n");
release_firmware(adev->gfx.pfp_fw);
adev->gfx.pfp_fw = NULL;
release_firmware(adev->gfx.me_fw);
@@ -1261,8 +1260,7 @@
out:
if (err) {
dev_err(adev->dev,
- "gfx9: Failed to load firmware \"%s\"\n",
- fw_name);
+ "gfx9: Failed to load firmware\n");
release_firmware(adev->gfx.rlc_fw);
adev->gfx.rlc_fw = NULL;
}
@@ -1349,8 +1347,7 @@
gfx_v9_0_check_fw_write_wait(adev);
if (err) {
dev_err(adev->dev,
- "gfx9: Failed to load firmware \"%s\"\n",
- fw_name);
+ "gfx9: Failed to load firmware\n");
release_firmware(adev->gfx.mec_fw);
adev->gfx.mec_fw = NULL;
release_firmware(adev->gfx.mec2_fw);
diff -ur a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c 2019-11-25 01:32:01.000000000 +0100
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c 2021-06-25 14:54:58.328092618 +0200
@@ -151,8 +151,7 @@
out:
if (err) {
dev_err(adev->dev,
- "si_mc: Failed to load firmware \"%s\"\n",
- fw_name);
+ "si_mc: Failed to load firmware\n");
release_firmware(adev->gmc.fw);
adev->gmc.fw = NULL;
}
diff -ur a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c 2019-11-25 01:32:01.000000000 +0100
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c 2021-06-25 14:54:58.328092618 +0200
@@ -163,7 +163,7 @@
out:
if (err) {
- pr_err("cik_mc: Failed to load firmware \"%s\"\n", fw_name);
+ pr_err("cik_mc: Failed to load firmware\n");
release_firmware(adev->gmc.fw);
adev->gmc.fw = NULL;
}
diff -ur a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c 2019-11-25 01:32:01.000000000 +0100
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c 2021-06-25 14:54:58.328092618 +0200
@@ -280,7 +280,7 @@
out:
if (err) {
- pr_err("mc: Failed to load firmware \"%s\"\n", fw_name);
+ pr_err("mc: Failed to load firmware\n");
release_firmware(adev->gmc.fw);
adev->gmc.fw = NULL;
}
diff -ur a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
--- a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c 2019-11-25 01:32:01.000000000 +0100
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c 2021-06-25 15:00:19.088551321 +0200
@@ -83,8 +83,7 @@
out:
if (err) {
dev_err(adev->dev,
- "psp v10.0: Failed to load firmware \"%s\"\n",
- fw_name);
+ "psp v10.0: Failed to load firmware\n");
release_firmware(adev->psp.asd_fw);
adev->psp.asd_fw = NULL;
}
diff -ur a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
--- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c 2021-06-25 15:01:11.314442919 +0200
@@ -156,7 +156,7 @@
release_firmware(adev->psp.ta_fw);
adev->psp.ta_fw = NULL;
dev_info(adev->dev,
- "psp v11.0: Failed to load firmware \"%s\"\n", fw_name);
+ "psp v11.0: Failed to load firmware\n");
} else {
err = amdgpu_ucode_validate(adev->psp.ta_fw);
if (err)
@@ -193,7 +193,7 @@
adev->psp.asd_fw = NULL;
out:
dev_err(adev->dev,
- "psp v11.0: Failed to load firmware \"%s\"\n", fw_name);
+ "psp v11.0: Failed to load firmware\n");
release_firmware(adev->psp.sos_fw);
adev->psp.sos_fw = NULL;
diff -ur a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
--- a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c 2019-11-25 01:32:01.000000000 +0100
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c 2021-06-25 15:02:09.156281812 +0200
@@ -116,8 +116,7 @@
out:
if (err) {
dev_err(adev->dev,
- "psp v3.1: Failed to load firmware \"%s\"\n",
- fw_name);
+ "psp v3.1: Failed to load firmware\n");
release_firmware(adev->psp.sos_fw);
adev->psp.sos_fw = NULL;
release_firmware(adev->psp.asd_fw);
diff -ur a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c 2021-06-25 14:54:58.328092618 +0200
@@ -175,7 +175,7 @@
out:
if (err) {
- pr_err("sdma_v2_4: Failed to load firmware \"%s\"\n", fw_name);
+ pr_err("sdma_v2_4: Failed to load firmware\n");
for (i = 0; i < adev->sdma.num_instances; i++) {
release_firmware(adev->sdma.instance[i].fw);
adev->sdma.instance[i].fw = NULL;
diff -ur a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c 2021-06-25 14:54:58.328092618 +0200
@@ -331,7 +331,7 @@
}
out:
if (err) {
- pr_err("sdma_v3_0: Failed to load firmware \"%s\"\n", fw_name);
+ pr_err("sdma_v3_0: Failed to load firmware\n");
for (i = 0; i < adev->sdma.num_instances; i++) {
release_firmware(adev->sdma.instance[i].fw);
adev->sdma.instance[i].fw = NULL;
diff -ur a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c 2021-06-25 14:54:58.328092618 +0200
@@ -524,7 +524,7 @@
out:
if (err) {
- DRM_ERROR("sdma_v4_0: Failed to load firmware \"%s\"\n", fw_name);
+ DRM_ERROR("sdma_v4_0: Failed to load firmware\n");
sdma_v4_0_destroy_inst_ctx(adev);
}
return err;
diff -ur a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c 2021-06-25 14:54:58.328092618 +0200
@@ -217,7 +217,7 @@
}
out:
if (err) {
- DRM_ERROR("sdma_v5_0: Failed to load firmware \"%s\"\n", fw_name);
+ DRM_ERROR("sdma_v5_0: Failed to load firmware\n");
for (i = 0; i < adev->sdma.num_instances; i++) {
release_firmware(adev->sdma.instance[i].fw);
adev->sdma.instance[i].fw = NULL;
diff -ur a/drivers/gpu/drm/amd/amdgpu/si_dpm.c b/drivers/gpu/drm/amd/amdgpu/si_dpm.c
--- a/drivers/gpu/drm/amd/amdgpu/si_dpm.c 2019-11-25 01:32:01.000000000 +0100
+++ b/drivers/gpu/drm/amd/amdgpu/si_dpm.c 2021-06-25 14:54:58.328092618 +0200
@@ -7676,8 +7676,8 @@
out:
if (err) {
- DRM_ERROR("si_smc: Failed to load firmware. err = %d\"%s\"\n",
- err, fw_name);
+ DRM_ERROR("si_smc: Failed to load firmware. err = %d\n",
+ err);
release_firmware(adev->pm.fw);
adev->pm.fw = NULL;
}
diff -ur a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c
--- a/drivers/gpu/drm/drm_edid_load.c 2019-11-25 01:32:01.000000000 +0100
+++ b/drivers/gpu/drm/drm_edid_load.c 2021-06-25 14:54:58.332092667 +0200
@@ -195,8 +195,8 @@
err = request_firmware(&fw, name, &pdev->dev);
platform_device_unregister(pdev);
if (err) {
- DRM_ERROR("Requesting EDID firmware \"%s\" failed (err=%d)\n",
- name, err);
+ DRM_ERROR("Requesting EDID firmware failed (err=%d)\n",
+ err);
return ERR_PTR(err);
}
diff -ur a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
--- a/drivers/gpu/drm/r128/r128_cce.c 2019-11-25 01:32:01.000000000 +0100
+++ b/drivers/gpu/drm/r128/r128_cce.c 2021-06-25 14:54:58.332092667 +0200
@@ -163,14 +163,13 @@
rc = request_firmware(&fw, FIRMWARE_NAME, &pdev->dev);
platform_device_unregister(pdev);
if (rc) {
- pr_err("r128_cce: Failed to load firmware \"%s\"\n",
- FIRMWARE_NAME);
+ pr_err("r128_cce: Failed to load firmware\n");
return rc;
}
if (fw->size != 256 * 8) {
- pr_err("r128_cce: Bogus length %zu in firmware \"%s\"\n",
- fw->size, FIRMWARE_NAME);
+ pr_err("r128_cce: Bogus length %zu in firmware\n",
+ fw->size);
rc = -EINVAL;
goto out_release;
}
diff -ur a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
--- a/drivers/gpu/drm/radeon/cik.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/gpu/drm/radeon/cik.c 2021-06-25 14:54:58.332092667 +0200
@@ -2062,7 +2062,7 @@
default: BUG();
}
- DRM_INFO("Loading %s Microcode\n", new_chip_name);
+ DRM_INFO("Loading Microcode\n");
snprintf(fw_name, sizeof(fw_name), "radeon/%s_pfp.bin", new_chip_name);
err = request_firmware(&rdev->pfp_fw, fw_name, rdev->dev);
@@ -2072,16 +2072,15 @@
if (err)
goto out;
if (rdev->pfp_fw->size != pfp_req_size) {
- pr_err("cik_cp: Bogus length %zu in firmware \"%s\"\n",
- rdev->pfp_fw->size, fw_name);
+ pr_err("cik_cp: Bogus length %zu in firmware\n",
+ rdev->pfp_fw->size);
err = -EINVAL;
goto out;
}
} else {
err = radeon_ucode_validate(rdev->pfp_fw);
if (err) {
- pr_err("cik_fw: validation failed for firmware \"%s\"\n",
- fw_name);
+ pr_err("cik_fw: validation failed for firmware\n");
goto out;
} else {
new_fw++;
@@ -2096,15 +2095,14 @@
if (err)
goto out;
if (rdev->me_fw->size != me_req_size) {
- pr_err("cik_cp: Bogus length %zu in firmware \"%s\"\n",
- rdev->me_fw->size, fw_name);
+ pr_err("cik_cp: Bogus length %zu in firmware\n",
+ rdev->me_fw->size);
err = -EINVAL;
}
} else {
err = radeon_ucode_validate(rdev->me_fw);
if (err) {
- pr_err("cik_fw: validation failed for firmware \"%s\"\n",
- fw_name);
+ pr_err("cik_fw: validation failed for firmware\n");
goto out;
} else {
new_fw++;
@@ -2119,15 +2117,14 @@
if (err)
goto out;
if (rdev->ce_fw->size != ce_req_size) {
- pr_err("cik_cp: Bogus length %zu in firmware \"%s\"\n",
- rdev->ce_fw->size, fw_name);
+ pr_err("cik_cp: Bogus length %zu in firmware\n",
+ rdev->ce_fw->size);
err = -EINVAL;
}
} else {
err = radeon_ucode_validate(rdev->ce_fw);
if (err) {
- pr_err("cik_fw: validation failed for firmware \"%s\"\n",
- fw_name);
+ pr_err("cik_fw: validation failed for firmware\n");
goto out;
} else {
new_fw++;
@@ -2142,15 +2139,14 @@
if (err)
goto out;
if (rdev->mec_fw->size != mec_req_size) {
- pr_err("cik_cp: Bogus length %zu in firmware \"%s\"\n",
- rdev->mec_fw->size, fw_name);
+ pr_err("cik_cp: Bogus length %zu in firmware\n",
+ rdev->mec_fw->size);
err = -EINVAL;
}
} else {
err = radeon_ucode_validate(rdev->mec_fw);
if (err) {
- pr_err("cik_fw: validation failed for firmware \"%s\"\n",
- fw_name);
+ pr_err("cik_fw: validation failed for firmware\n");
goto out;
} else {
new_fw++;
@@ -2180,15 +2176,14 @@
if (err)
goto out;
if (rdev->rlc_fw->size != rlc_req_size) {
- pr_err("cik_rlc: Bogus length %zu in firmware \"%s\"\n",
- rdev->rlc_fw->size, fw_name);
+ pr_err("cik_rlc: Bogus length %zu in firmware\n",
+ rdev->rlc_fw->size);
err = -EINVAL;
}
} else {
err = radeon_ucode_validate(rdev->rlc_fw);
if (err) {
- pr_err("cik_fw: validation failed for firmware \"%s\"\n",
- fw_name);
+ pr_err("cik_fw: validation failed for firmware\n");
goto out;
} else {
new_fw++;
@@ -2203,15 +2198,14 @@
if (err)
goto out;
if (rdev->sdma_fw->size != sdma_req_size) {
- pr_err("cik_sdma: Bogus length %zu in firmware \"%s\"\n",
- rdev->sdma_fw->size, fw_name);
+ pr_err("cik_sdma: Bogus length %zu in firmware\n",
+ rdev->sdma_fw->size);
err = -EINVAL;
}
} else {
err = radeon_ucode_validate(rdev->sdma_fw);
if (err) {
- pr_err("cik_fw: validation failed for firmware \"%s\"\n",
- fw_name);
+ pr_err("cik_fw: validation failed for firmware\n");
goto out;
} else {
new_fw++;
@@ -2233,16 +2227,15 @@
}
if ((rdev->mc_fw->size != mc_req_size) &&
(rdev->mc_fw->size != mc2_req_size)){
- pr_err("cik_mc: Bogus length %zu in firmware \"%s\"\n",
- rdev->mc_fw->size, fw_name);
+ pr_err("cik_mc: Bogus length %zu in firmware\n",
+ rdev->mc_fw->size);
err = -EINVAL;
}
DRM_INFO("%s: %zu bytes\n", fw_name, rdev->mc_fw->size);
} else {
err = radeon_ucode_validate(rdev->mc_fw);
if (err) {
- pr_err("cik_fw: validation failed for firmware \"%s\"\n",
- fw_name);
+ pr_err("cik_fw: validation failed for firmware\n");
goto out;
} else {
new_fw++;
@@ -2258,21 +2251,19 @@
snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name);
err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev);
if (err) {
- pr_err("smc: error loading firmware \"%s\"\n",
- fw_name);
+ pr_err("smc: error loading firmware\n");
release_firmware(rdev->smc_fw);
rdev->smc_fw = NULL;
err = 0;
} else if (rdev->smc_fw->size != smc_req_size) {
- pr_err("cik_smc: Bogus length %zu in firmware \"%s\"\n",
- rdev->smc_fw->size, fw_name);
+ pr_err("cik_smc: Bogus length %zu in firmware\n",
+ rdev->smc_fw->size);
err = -EINVAL;
}
} else {
err = radeon_ucode_validate(rdev->smc_fw);
if (err) {
- pr_err("cik_fw: validation failed for firmware \"%s\"\n",
- fw_name);
+ pr_err("cik_fw: validation failed for firmware\n");
goto out;
} else {
new_fw++;
@@ -2292,8 +2283,7 @@
out:
if (err) {
if (err != -EINVAL)
- pr_err("cik_cp: Failed to load firmware \"%s\"\n",
- fw_name);
+ pr_err("cik_cp: Failed to load firmware\n");
release_firmware(rdev->pfp_fw);
rdev->pfp_fw = NULL;
release_firmware(rdev->me_fw);
diff -ur a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
--- a/drivers/gpu/drm/radeon/r100.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/gpu/drm/radeon/r100.c 2021-06-25 14:54:58.332092667 +0200
@@ -1048,10 +1048,10 @@
err = request_firmware(&rdev->me_fw, fw_name, rdev->dev);
if (err) {
- pr_err("radeon_cp: Failed to load firmware \"%s\"\n", fw_name);
+ pr_err("radeon_cp: Failed to load firmware\n");
} else if (rdev->me_fw->size % 8) {
- pr_err("radeon_cp: Bogus length %zu in firmware \"%s\"\n",
- rdev->me_fw->size, fw_name);
+ pr_err("radeon_cp: Bogus length %zu in firmware\n",
+ rdev->me_fw->size);
err = -EINVAL;
release_firmware(rdev->me_fw);
rdev->me_fw = NULL;
diff -ur a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
--- a/drivers/gpu/drm/radeon/r600.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/gpu/drm/radeon/r600.c 2021-06-25 14:54:58.332092667 +0200
@@ -2549,15 +2549,15 @@
rlc_req_size = R600_RLC_UCODE_SIZE * 4;
}
- DRM_INFO("Loading %s Microcode\n", chip_name);
+ DRM_INFO("Loading Microcode\n");
snprintf(fw_name, sizeof(fw_name), "radeon/%s_pfp.bin", chip_name);
err = request_firmware(&rdev->pfp_fw, fw_name, rdev->dev);
if (err)
goto out;
if (rdev->pfp_fw->size != pfp_req_size) {
- pr_err("r600_cp: Bogus length %zu in firmware \"%s\"\n",
- rdev->pfp_fw->size, fw_name);
+ pr_err("r600_cp: Bogus length %zu in firmware\n",
+ rdev->pfp_fw->size);
err = -EINVAL;
goto out;
}
@@ -2567,8 +2567,8 @@
if (err)
goto out;
if (rdev->me_fw->size != me_req_size) {
- pr_err("r600_cp: Bogus length %zu in firmware \"%s\"\n",
- rdev->me_fw->size, fw_name);
+ pr_err("r600_cp: Bogus length %zu in firmware\n",
+ rdev->me_fw->size);
err = -EINVAL;
}
@@ -2577,8 +2577,8 @@
if (err)
goto out;
if (rdev->rlc_fw->size != rlc_req_size) {
- pr_err("r600_rlc: Bogus length %zu in firmware \"%s\"\n",
- rdev->rlc_fw->size, fw_name);
+ pr_err("r600_rlc: Bogus length %zu in firmware\n",
+ rdev->rlc_fw->size);
err = -EINVAL;
}
@@ -2586,13 +2586,13 @@
snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", smc_chip_name);
err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev);
if (err) {
- pr_err("smc: error loading firmware \"%s\"\n", fw_name);
+ pr_err("smc: error loading firmware\n");
release_firmware(rdev->smc_fw);
rdev->smc_fw = NULL;
err = 0;
} else if (rdev->smc_fw->size != smc_req_size) {
- pr_err("smc: Bogus length %zu in firmware \"%s\"\n",
- rdev->smc_fw->size, fw_name);
+ pr_err("smc: Bogus length %zu in firmware\n",
+ rdev->smc_fw->size);
err = -EINVAL;
}
}
@@ -2600,8 +2600,7 @@
out:
if (err) {
if (err != -EINVAL)
- pr_err("r600_cp: Failed to load firmware \"%s\"\n",
- fw_name);
+ pr_err("r600_cp: Failed to load firmware\n");
release_firmware(rdev->pfp_fw);
rdev->pfp_fw = NULL;
release_firmware(rdev->me_fw);
diff -ur a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_uvd.c
--- a/drivers/gpu/drm/radeon/radeon_uvd.c 2019-11-25 01:32:01.000000000 +0100
+++ b/drivers/gpu/drm/radeon/radeon_uvd.c 2021-06-25 14:54:58.332092667 +0200
@@ -140,8 +140,7 @@
/* Let's try to load the newer firmware first */
r = request_firmware(&rdev->uvd_fw, fw_name, rdev->dev);
if (r) {
- dev_err(rdev->dev, "radeon_uvd: Can't load firmware \"%s\"\n",
- fw_name);
+ dev_err(rdev->dev, "radeon_uvd: Can't load firmware\n");
} else {
struct common_firmware_header *hdr = (void *)rdev->uvd_fw->data;
unsigned version_major, version_minor, family_id;
@@ -175,8 +174,7 @@
if (!fw_name || r) {
r = request_firmware(&rdev->uvd_fw, legacy_fw_name, rdev->dev);
if (r) {
- dev_err(rdev->dev, "radeon_uvd: Can't load firmware \"%s\"\n",
- legacy_fw_name);
+ dev_err(rdev->dev, "radeon_uvd: Can't load firmware\n");
return r;
}
}
diff -ur a/drivers/gpu/drm/radeon/radeon_vce.c b/drivers/gpu/drm/radeon/radeon_vce.c
--- a/drivers/gpu/drm/radeon/radeon_vce.c 2019-11-25 01:32:01.000000000 +0100
+++ b/drivers/gpu/drm/radeon/radeon_vce.c 2021-06-25 14:54:58.332092667 +0200
@@ -87,8 +87,7 @@
r = request_firmware(&rdev->vce_fw, fw_name, rdev->dev);
if (r) {
- dev_err(rdev->dev, "radeon_vce: Can't load firmware \"%s\"\n",
- fw_name);
+ dev_err(rdev->dev, "radeon_vce: Can't load firmware\n");
return r;
}
diff -ur a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
--- a/drivers/gpu/drm/radeon/si.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/gpu/drm/radeon/si.c 2021-06-25 14:54:58.336092716 +0200
@@ -1780,7 +1780,7 @@
if (((RREG32(MC_SEQ_MISC0) & 0xff000000) >> 24) == 0x58)
si58_fw = true;
- DRM_INFO("Loading %s Microcode\n", new_chip_name);
+ DRM_INFO("Loading Microcode\n");
snprintf(fw_name, sizeof(fw_name), "radeon/%s_pfp.bin", new_chip_name);
err = request_firmware(&rdev->pfp_fw, fw_name, rdev->dev);
@@ -1790,16 +1790,15 @@
if (err)
goto out;
if (rdev->pfp_fw->size != pfp_req_size) {
- pr_err("si_cp: Bogus length %zu in firmware \"%s\"\n",
- rdev->pfp_fw->size, fw_name);
+ pr_err("si_cp: Bogus length %zu in firmware\n",
+ rdev->pfp_fw->size);
err = -EINVAL;
goto out;
}
} else {
err = radeon_ucode_validate(rdev->pfp_fw);
if (err) {
- pr_err("si_cp: validation failed for firmware \"%s\"\n",
- fw_name);
+ pr_err("si_cp: validation failed for firmware\n");
goto out;
} else {
new_fw++;
@@ -1814,15 +1813,14 @@
if (err)
goto out;
if (rdev->me_fw->size != me_req_size) {
- pr_err("si_cp: Bogus length %zu in firmware \"%s\"\n",
- rdev->me_fw->size, fw_name);
+ pr_err("si_cp: Bogus length %zu in firmware\n",
+ rdev->me_fw->size);
err = -EINVAL;
}
} else {
err = radeon_ucode_validate(rdev->me_fw);
if (err) {
- pr_err("si_cp: validation failed for firmware \"%s\"\n",
- fw_name);
+ pr_err("si_cp: validation failed for firmware\n");
goto out;
} else {
new_fw++;
@@ -1837,15 +1835,14 @@
if (err)
goto out;
if (rdev->ce_fw->size != ce_req_size) {
- pr_err("si_cp: Bogus length %zu in firmware \"%s\"\n",
- rdev->ce_fw->size, fw_name);
+ pr_err("si_cp: Bogus length %zu in firmware\n",
+ rdev->ce_fw->size);
err = -EINVAL;
}
} else {
err = radeon_ucode_validate(rdev->ce_fw);
if (err) {
- pr_err("si_cp: validation failed for firmware \"%s\"\n",
- fw_name);
+ pr_err("si_cp: validation failed for firmware\n");
goto out;
} else {
new_fw++;
@@ -1860,15 +1857,14 @@
if (err)
goto out;
if (rdev->rlc_fw->size != rlc_req_size) {
- pr_err("si_rlc: Bogus length %zu in firmware \"%s\"\n",
- rdev->rlc_fw->size, fw_name);
+ pr_err("si_rlc: Bogus length %zu in firmware\n",
+ rdev->rlc_fw->size);
err = -EINVAL;
}
} else {
err = radeon_ucode_validate(rdev->rlc_fw);
if (err) {
- pr_err("si_cp: validation failed for firmware \"%s\"\n",
- fw_name);
+ pr_err("si_cp: validation failed for firmware\n");
goto out;
} else {
new_fw++;
@@ -1891,16 +1887,15 @@
}
if ((rdev->mc_fw->size != mc_req_size) &&
(rdev->mc_fw->size != mc2_req_size)) {
- pr_err("si_mc: Bogus length %zu in firmware \"%s\"\n",
- rdev->mc_fw->size, fw_name);
+ pr_err("si_mc: Bogus length %zu in firmware\n",
+ rdev->mc_fw->size);
err = -EINVAL;
}
DRM_INFO("%s: %zu bytes\n", fw_name, rdev->mc_fw->size);
} else {
err = radeon_ucode_validate(rdev->mc_fw);
if (err) {
- pr_err("si_cp: validation failed for firmware \"%s\"\n",
- fw_name);
+ pr_err("si_cp: validation failed for firmware\n");
goto out;
} else {
new_fw++;
@@ -1918,20 +1913,19 @@
snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name);
err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev);
if (err) {
- pr_err("smc: error loading firmware \"%s\"\n", fw_name);
+ pr_err("smc: error loading firmware\n");
release_firmware(rdev->smc_fw);
rdev->smc_fw = NULL;
err = 0;
} else if (rdev->smc_fw->size != smc_req_size) {
- pr_err("si_smc: Bogus length %zu in firmware \"%s\"\n",
- rdev->smc_fw->size, fw_name);
+ pr_err("si_smc: Bogus length %zu in firmware\n",
+ rdev->smc_fw->size);
err = -EINVAL;
}
} else {
err = radeon_ucode_validate(rdev->smc_fw);
if (err) {
- pr_err("si_cp: validation failed for firmware \"%s\"\n",
- fw_name);
+ pr_err("si_cp: validation failed for firmware\n");
goto out;
} else {
new_fw++;
@@ -1949,8 +1943,7 @@
out:
if (err) {
if (err != -EINVAL)
- pr_err("si_cp: Failed to load firmware \"%s\"\n",
- fw_name);
+ pr_err("si_cp: Failed to load firmware\n");
release_firmware(rdev->pfp_fw);
rdev->pfp_fw = NULL;
release_firmware(rdev->me_fw);
diff -ur a/drivers/net/wireless/intel/ipw2x00/ipw2100.c b/drivers/net/wireless/intel/ipw2x00/ipw2100.c
--- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c 2021-06-25 14:54:58.336092716 +0200
@@ -8395,8 +8395,8 @@
if (rc < 0) {
printk(KERN_ERR DRV_NAME ": "
- "%s: Firmware '%s' not available or load failed.\n",
- priv->net_dev->name, fw_name);
+ "%s: Firmware not available or load failed.\n",
+ priv->net_dev->name);
return rc;
}
IPW_DEBUG_INFO("firmware data %p size %zd\n", fw->fw_entry->data,
diff -ur a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
--- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c 2021-06-25 14:54:58.336092716 +0200
@@ -3398,12 +3398,12 @@
/* ask firmware_class module to get the boot firmware off disk */
rc = request_firmware(raw, name, &priv->pci_dev->dev);
if (rc < 0) {
- IPW_ERROR("%s request_firmware failed: Reason %d\n", name, rc);
+ IPW_ERROR("request_firmware failed: Reason %d\n", rc);
return rc;
}
if ((*raw)->size < sizeof(*fw)) {
- IPW_ERROR("%s is too small (%zd)\n", name, (*raw)->size);
+ IPW_ERROR("Firmware file is too small (%zd)\n", (*raw)->size);
return -EINVAL;
}
@@ -3411,13 +3411,12 @@
if ((*raw)->size < sizeof(*fw) + le32_to_cpu(fw->boot_size) +
le32_to_cpu(fw->ucode_size) + le32_to_cpu(fw->fw_size)) {
- IPW_ERROR("%s is too small or corrupt (%zd)\n",
- name, (*raw)->size);
+ IPW_ERROR("Firmware file is too small or corrupt (%zd)\n",
+ (*raw)->size);
return -EINVAL;
}
- IPW_DEBUG_INFO("Read firmware '%s' image v%d.%d (%zd bytes)\n",
- name,
+ IPW_DEBUG_INFO("Read firmware image v%d.%d (%zd bytes)\n",
le32_to_cpu(fw->ver) >> 16,
le32_to_cpu(fw->ver) & 0xff,
(*raw)->size - sizeof(*fw));
diff -ur a/drivers/net/wireless/intel/iwlegacy/3945-mac.c b/drivers/net/wireless/intel/iwlegacy/3945-mac.c
--- a/drivers/net/wireless/intel/iwlegacy/3945-mac.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/net/wireless/intel/iwlegacy/3945-mac.c 2021-06-25 14:54:58.336092716 +0200
@@ -1839,7 +1839,7 @@
sprintf(buf, "%s%u%s", name_pre, idx, ".ucode");
ret = request_firmware(&ucode_raw, buf, &il->pci_dev->dev);
if (ret < 0) {
- IL_ERR("%s firmware file req failed: %d\n", buf, ret);
+ IL_ERR("Firmware file req failed: %d\n", ret);
if (ret == -ENOENT)
continue;
else
@@ -3702,7 +3702,7 @@
goto out_unset_hw_params;
}
- IL_INFO("Detected Intel Wireless WiFi Link %s\n", il->cfg->name);
+ IL_INFO("Detected Intel Wireless WiFi Link\n");
/***********************
* 7. Setup Services
diff -ur a/drivers/net/wireless/intel/iwlegacy/4965-mac.c b/drivers/net/wireless/intel/iwlegacy/4965-mac.c
--- a/drivers/net/wireless/intel/iwlegacy/4965-mac.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/net/wireless/intel/iwlegacy/4965-mac.c 2021-06-25 14:54:58.336092716 +0200
@@ -4690,7 +4690,7 @@
sprintf(il->firmware_name, "%s%s%s", name_pre, tag, ".ucode");
- D_INFO("attempting to load firmware '%s'\n", il->firmware_name);
+ D_INFO("attempting to load firmware\n");
return request_firmware_nowait(THIS_MODULE, 1, il->firmware_name,
&il->pci_dev->dev, GFP_KERNEL, il,
@@ -4780,8 +4780,7 @@
if (!ucode_raw) {
if (il->fw_idx <= il->cfg->ucode_api_max)
- IL_ERR("request for firmware file '%s' failed.\n",
- il->firmware_name);
+ IL_ERR("request for firmware failed.\n");
goto try_again;
}
diff -ur a/drivers/net/wireless/intel/iwlwifi/dvm/main.c b/drivers/net/wireless/intel/iwlwifi/dvm/main.c
--- a/drivers/net/wireless/intel/iwlwifi/dvm/main.c 2019-11-25 01:32:01.000000000 +0100
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/main.c 2021-06-25 14:59:00.475523656 +0200
@@ -1255,7 +1255,7 @@
************************/
hw = iwl_alloc_all();
if (!hw) {
- pr_err("%s: Cannot allocate network device\n", cfg->name);
+ pr_err(": Cannot allocate network device\n");
goto out;
}
@@ -1389,8 +1389,7 @@
/***********************
* 2. Read REV register
***********************/
- IWL_INFO(priv, "Detected %s, REV=0x%X\n",
- priv->cfg->name, priv->trans->hw_rev);
+ IWL_INFO(priv, "Detected, REV=0x%X\n", priv->trans->hw_rev);
if (iwl_trans_start_hw(priv->trans))
goto out_free_hw;
diff -ur a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c 2022-05-13 15:20:06.000000000 -0400
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c 2022-05-13 15:40:28.252484852 -0400
@@ -237,19 +237,6 @@
if (drv->fw_index < cfg->ucode_api_min) {
IWL_ERR(drv, "no suitable firmware found!\n");
-
- if (cfg->ucode_api_min == cfg->ucode_api_max) {
- IWL_ERR(drv, "%s%d is required\n", cfg->fw_name_pre,
- cfg->ucode_api_max);
- } else {
- IWL_ERR(drv, "minimum version required: %s%d\n",
- cfg->fw_name_pre, cfg->ucode_api_min);
- IWL_ERR(drv, "maximum version supported: %s%d\n",
- cfg->fw_name_pre, cfg->ucode_api_max);
- }
-
- IWL_ERR(drv,
- "check git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git\n");
return -ENOENT;
}
@@ -253,8 +253,7 @@
snprintf(drv->firmware_name, sizeof(drv->firmware_name), "%s%s.ucode",
cfg->fw_name_pre, tag);
- IWL_DEBUG_FW_INFO(drv, "attempting to load firmware '%s'\n",
- drv->firmware_name);
+ IWL_DEBUG_FW_INFO(drv, "attempting to load firmware\n");
return request_firmware_nowait(THIS_MODULE, 1, drv->firmware_name,
drv->trans->dev,
diff -ur a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c 2021-06-25 14:54:58.340092764 +0200
@@ -1312,8 +1312,8 @@
*/
ret = request_firmware(&fw_entry, nvm_file_name, trans->dev);
if (ret) {
- IWL_ERR(trans, "ERROR: %s isn't available %d\n",
- nvm_file_name, ret);
+ IWL_ERR(trans, "ERROR: firmware isn't available %d\n",
+ ret);
return ret;
}
diff -ur a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c 2021-06-25 14:57:59.617549796 +0200
@@ -807,8 +807,7 @@
goto out_free;
}
- IWL_INFO(mvm, "Detected %s, REV=0x%X\n",
- mvm->cfg->name, mvm->trans->hw_rev);
+ IWL_INFO(mvm, "Detected, REV=0x%X\n", mvm->trans->hw_rev);
if (iwlwifi_mod_params.nvm_file)
mvm->nvm_file_name = iwlwifi_mod_params.nvm_file;
diff -ur a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c 2021-06-25 14:54:58.340092764 +0200
@@ -2070,9 +2070,9 @@
int ret = 0;
u16 signature;
- dev_info(dev, "%s: Loading firmware %s\n", DRIVER_NAME, fw_name);
+ dev_info(dev, "%s: Loading firmware\n", DRIVER_NAME);
if (request_firmware(&fw, fw_name, &priv->udev->dev)) {
- dev_warn(dev, "request_firmware(%s) failed\n", fw_name);
+ dev_warn(dev, "request_firmware failed\n");
ret = -EAGAIN;
goto exit;
}
diff -ur a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c
--- a/drivers/net/wireless/realtek/rtlwifi/core.c 2019-11-25 01:32:01.000000000 +0100
+++ b/drivers/net/wireless/realtek/rtlwifi/core.c 2021-06-25 14:54:58.340092764 +0200
@@ -84,8 +84,7 @@
err = request_firmware(&firmware,
rtlpriv->cfg->alt_fw_name,
rtlpriv->io.dev);
- pr_info("Loading alternative firmware %s\n",
- rtlpriv->cfg->alt_fw_name);
+ pr_info("Loading alternative firmware\n");
if (!err)
goto found_alt;
}
diff -ur a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c 2019-11-25 01:32:01.000000000 +0100
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c 2021-06-25 14:54:58.340092764 +0200
@@ -144,7 +144,7 @@
fw_name = "rtlwifi/rtl8188efw.bin";
rtlpriv->max_fw_size = 0x8000;
- pr_info("Using firmware %s\n", fw_name);
+ pr_info("Using firmware\n");
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw,
rtl_fw_cb);
diff -ur a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c 2019-11-25 01:32:01.000000000 +0100
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c 2021-06-25 14:54:58.340092764 +0200
@@ -147,7 +147,7 @@
fw_name = "rtlwifi/rtl8192cfw.bin";
rtlpriv->max_fw_size = 0x4000;
- pr_info("Using firmware %s\n", fw_name);
+ pr_info("Using firmware\n");
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw,
rtl_fw_cb);
diff -ur a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c 2019-11-25 01:32:01.000000000 +0100
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c 2021-06-25 14:54:58.340092764 +0200
@@ -56,7 +56,7 @@
}
/* provide name of alternative file */
rtlpriv->cfg->alt_fw_name = "rtlwifi/rtl8192cufw.bin";
- pr_info("Loading firmware %s\n", fw_name);
+ pr_info("Loading firmware\n");
rtlpriv->max_fw_size = 0x4000;
err = request_firmware_nowait(THIS_MODULE, 1,
fw_name, rtlpriv->io.dev,
diff -ur a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c 2021-06-25 14:52:20.000000000 +0200
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c 2021-06-25 14:54:58.340092764 +0200
@@ -154,7 +154,7 @@
rtlpriv->max_fw_size = 0x8000;
pr_info("Driver for Realtek RTL8192DE WLAN interface\n");
- pr_info("Loading firmware file %s\n", fw_name);
+ pr_info("Loading firmware\n");
/* request fw */
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
diff -ur a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c 2019-11-25 01:32:01.000000000 +0100
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c 2021-06-25 14:54:58.340092764 +0200
@@ -150,7 +150,7 @@
fw_name = "rtlwifi/rtl8192eefw.bin";
rtlpriv->max_fw_size = 0x8000;
- pr_info("Using firmware %s\n", fw_name);
+ pr_info("Using firmware\n");
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw,
rtl_fw_cb);
diff -ur a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c 2019-11-25 01:32:01.000000000 +0100
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c 2021-06-25 14:54:58.340092764 +0200
@@ -70,7 +70,7 @@
"Firmware callback routine entered!\n");
complete(&rtlpriv->firmware_loading_complete);
if (!firmware) {
- pr_err("Firmware %s not available\n", fw_name);
+ pr_err("Firmware not available\n");
rtlpriv->max_fw_size = 0;
return;
}
@@ -186,7 +186,7 @@
rtlpriv->max_fw_size = RTL8190_MAX_FIRMWARE_CODE_SIZE*2 +
sizeof(struct fw_hdr);
pr_info("Driver for Realtek RTL8192SE/RTL8191SE\n"
- "Loading firmware %s\n", fw_name);
+ "Loading firmware\n");
/* request fw */
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw,
diff -ur a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c 2019-11-25 01:32:01.000000000 +0100
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c 2021-06-25 14:54:58.340092764 +0200
@@ -153,7 +153,7 @@
fw_name = "rtlwifi/rtl8723fw_B.bin";
rtlpriv->max_fw_size = 0x6000;
- pr_info("Using firmware %s\n", fw_name);
+ pr_info("Using firmware\n");
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw,
rtl_fw_cb);
diff -ur a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c 2019-11-25 01:32:01.000000000 +0100
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c 2021-06-25 14:54:58.340092764 +0200
@@ -157,7 +157,7 @@
}
rtlpriv->max_fw_size = 0x8000;
- pr_info("Using firmware %s\n", fw_name);
+ pr_info("Using firmware\n");
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw,
rtl_fw_cb);
diff -ur a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c 2019-11-25 01:32:01.000000000 +0100
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c 2021-06-25 14:54:58.340092764 +0200
@@ -186,7 +186,7 @@
rtlpriv->max_fw_size = 0x8000;
/*load normal firmware*/
- pr_info("Using firmware %s\n", fw_name);
+ pr_info("Using firmware\n");
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw,
rtl_fw_cb);
@@ -197,7 +197,7 @@
return 1;
}
/*load wowlan firmware*/
- pr_info("Using firmware %s\n", wowlan_fw_name);
+ pr_info("Using firmware\n");
err = request_firmware_nowait(THIS_MODULE, 1,
wowlan_fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw,