diff --git a/helpers/DATA/linux-hwe-5.13/check.sh b/helpers/DATA/linux-hwe-5.19/check.sh similarity index 54% rename from helpers/DATA/linux-hwe-5.13/check.sh rename to helpers/DATA/linux-hwe-5.19/check.sh index c6df332..ea1f2c7 100644 --- a/helpers/DATA/linux-hwe-5.13/check.sh +++ b/helpers/DATA/linux-hwe-5.19/check.sh @@ -1,9 +1,7 @@ #!/bin/bash -WD=$(dirname $0) - files=`find -type f` while read -r line do - sh $WD/deblob-check --use-awk -C $line + ./deblob-check $line done <<< "$files" diff --git a/helpers/DATA/linux-hwe-5.13/deblob-5.13 b/helpers/DATA/linux-hwe-5.19/deblob-5.19 similarity index 90% rename from helpers/DATA/linux-hwe-5.13/deblob-5.13 rename to helpers/DATA/linux-hwe-5.19/deblob-5.19 index 1451643..865aee1 100644 --- a/helpers/DATA/linux-hwe-5.13/deblob-5.13 +++ b/helpers/DATA/linux-hwe-5.19/deblob-5.19 @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2008-2021 Alexandre Oliva +# Copyright (C) 2008-2022 Alexandre Oliva # Copyright (C) 2008 Jeff Moe # Copyright (C) 2009 Rubén Rodríguez # @@ -48,7 +48,7 @@ # For each kver release, start extra with an empty string, then count # from 1 if changes are needed that require rebuilding the tarball. -kver=5.13 extra=1 +kver=5.19 extra= case $1 in --force) @@ -185,17 +185,10 @@ reject_firmware () { filetest $1 || return 0 clean_sed "$2"' s,\(^\|[^>.0-9a-zA-Z_$]\)\(request\(_ihex\|\(_partial\)\)\?_firmware\|firmware_request_platform\)\(_nowait\|_direct\|_into_buf\)\?\($\|[^-.0-9a-zA-Z_$),; ]\),\1reject\4_firmware\5\6,g +s,\(^\|[^>.0-9a-zA-Z_$]\)firmware_request_\(nowarn\|builtin\)\($\|[^-.0-9a-zA-Z_$),; ]\),\1firmware_reject_\2\3,g ' "$1" 'disabled non-Free firmware-loading machinery' } -reject_firmware_nowarn () { - #$1 = file $2 = pre sed pattern - filetest $1 || return 0 - clean_sed "$2"' -s,\(^\|[^>.0-9a-zA-Z_$]\)firmware_request_nowarn\($\|[^-.0-9a-zA-Z_$),; ]\),\1firmware_reject_nowarn\2,g -' "$1" 'disabled silent non-Free firmware-loading machinery' -} - maybe_reject_firmware () { #$1 = file $2 = pre sed pattern filetest $1 || return 0 @@ -234,6 +227,7 @@ for f in \ drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx8.asm \ drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm \ drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm \ + `: sources for gfx11 are in ..._gfx10.asm` \ drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h \ \ drivers/gpu/drm/i915/gt/shaders/README \ @@ -313,7 +307,7 @@ for f in \ drivers/scsi/sym53c8xx_2/sym_fw2.h \ drivers/scsi/sym53c8xx_2/sym_fw2.h \ \ - kernel/bpf/preload/iterators/iterators.skel.h \ + kernel/bpf/preload/iterators/iterators.lskel.h \ kernel/bpf/preload/iterators/iterators.bpf.c \ ; do filetest $f || : @@ -416,9 +410,12 @@ clean_sed ' s,git://git\..*torvalds/linux\.git,/*(DEBLOBBED)*/, ' scripts/package/mkdebian 'upstream development repo' -clean_sed ' -s,Name: kernel,&-libre, -' scripts/package/mkspec 'package name' +# The tarball name and its expansion do not include -libre. +# We could change KERNELPATH and keep this, but what else would break? +# Enabling this would require the other commented-out mkspec bits below. +# clean_sed ' +# s,Name: kernel,&-libre, +# ' scripts/package/mkspec 'package name' clean_sed ' s,The Linux,The GNU Linux-libre, @@ -432,18 +429,34 @@ clean_sed ' s,https\?://www\.kernel\.org,https://linux-libre.fsfla.org, ' scripts/package/mkspec 'home page' +# clean_sed ' +# s,\(%description\) -n kernel-,\1 , +# ' scripts/package/mkspec '-libre subpackages' + +# clean_sed ' +# /Provides: kernel-/{p;s,kernel-,&libre-,;} +# ' scripts/package/mkspec '-libre provides' + +# As with rpms, we leave the package name as kernel. clean_sed ' -s,\(%description\) -n kernel-,\1 , -' scripts/package/mkspec '-libre subpackages' +s,The upstream Linux kernel,The GNU Linux-libre kernel, +' scripts/package/snapcraft.template 'description' clean_sed ' -/Provides: kernel-/{p;s,kernel-,&libre-,;} -' scripts/package/mkspec '-libre provides' +s,Linux kernel,GNU Linux-libre, +' scripts/package/snapcraft.template 'summary' clean_sed ' s,linux-upstream,linux-libre, ' scripts/Makefile.package 'libre, not upstream' +# We replace several blob name s[n]printf format strings +# with "/*(DEBLOBBED)*/", counting on extra args to be ignored. +# These are warned about, but -Werror turns them into errors. +clean_sed ' +s, -Werror$, -Werror -Wno-error=format-extra-args -Wno-error=comment -Wno-error=unused-function -Wno-error=unused-variable, +' Makefile 'avoid compile failures at /*(DEBLOBBED)*/ warnings' + # Add reject_firmware and maybe_reject_firmware grep -q _LINUX_LIBRE_FIRMWARE_H include/linux/firmware.h || clean_sed '$i\ @@ -457,7 +470,7 @@ clean_sed '$i\ static inline int\ is_nonfree_firmware(const char *name)\ {\ - return strstr(name, NONFREE_FIRMWARE) != 0;\ + return strstr(name, NONFREE_FIRMWARE) != 0;\ }\ \ static inline int\ @@ -467,12 +480,18 @@ report_missing_free_firmware(const char *name, const char *what)\ what ? what : "firmware");\ return -ENOENT;\ }\ +static inline bool\ +firmware_reject_builtin(struct firmware *fw, const char *name)\ +{\ + return false;\ +}\ static inline int\ firmware_reject_nowarn(const struct firmware **fw,\ const char *name, struct device *device)\ {\ const struct firmware *xfw = NULL;\ int retval, retval0 = -ENOENT;\ + if (fw) *fw = xfw;\ retval = firmware_request_nowarn(&xfw, NONFREE_FIRMWARE, device);\ if (!retval) {\ release_firmware(xfw);\ @@ -507,6 +526,7 @@ reject_firmware_direct(const struct firmware **fw,\ {\ const struct firmware *xfw = NULL;\ int retval, retval0;\ + if (fw) *fw = xfw;\ retval0 = report_missing_free_firmware(dev_name(device), NULL);\ retval = request_firmware_direct(&xfw, NONFREE_FIRMWARE, device);\ if (!retval) {\ @@ -547,6 +567,7 @@ reject_firmware_into_buf(const struct firmware **firmware_p, const char *name,\ {\ const struct firmware *xfw = NULL;\ int retval, retval0;\ + if (firmware_p) *firmware_p = xfw;\ retval0 = report_missing_free_firmware(dev_name(device), NULL);\ retval = request_firmware_into_buf(&xfw, NONFREE_FIRMWARE, device, buf, size);\ if (!retval) {\ @@ -570,6 +591,7 @@ reject_partial_firmware_into_buf(const struct firmware **firmware_p, const char {\ const struct firmware *xfw = NULL;\ int retval, retval0;\ + if (firmware_p) *firmware_p = xfw;\ retval0 = report_missing_free_firmware(dev_name(device), NULL);\ retval = request_partial_firmware_into_buf(&xfw, NONFREE_FIRMWARE, device, buf, size, offset);\ if (!retval) {\ @@ -696,12 +718,6 @@ clean_kconfig arch/powerpc/platforms/8xx/Kconfig SMC_UCODE_PATCH # ATM # ####### -announce ATM_AMBASSADOR - "Madge Ambassador, Collage PCI 155 Server" -reject_firmware drivers/atm/ambassador.c -clean_blob drivers/atm/ambassador.c -clean_kconfig drivers/atm/Kconfig ATM_AMBASSADOR -clean_mk CONFIG_ATM_AMBASSADOR drivers/atm/Makefile - announce ATM_FORE200E - "FORE Systems 200E-series" reject_firmware drivers/atm/fore200e.c clean_blob drivers/atm/fore200e.c @@ -734,13 +750,13 @@ clean_kconfig drivers/crypto/cavium/nitrox/Kconfig CRYPTO_DEV_NITROX_CNN55XX clean_mk CONFIG_CRYPTO_DEV_NITROX_CNN55XX drivers/crypto/cavium/nitrox/Makefile announce CRYPTO_DEV_SP_PSP - "Platform Security Processor (PSP) device" -reject_firmware_nowarn drivers/crypto/ccp/sev-dev.c +reject_firmware drivers/crypto/ccp/sev-dev.c clean_blob drivers/crypto/ccp/sev-dev.c clean_kconfig drivers/crypto/ccp/Kconfig CRYPTO_DEV_SP_PSP clean_mk CONFIG_CRYPTO_DEV_SP_PSP drivers/crypto/ccp/Makefile announce CRYPTO_DEV_SAFEXCEL - "Inside Secure's SafeXcel cryptographic engine driver" -reject_firmware_nowarn drivers/crypto/inside-secure/safexcel.c +reject_firmware drivers/crypto/inside-secure/safexcel.c clean_blob drivers/crypto/inside-secure/safexcel.c clean_kconfig drivers/crypto/Kconfig CRYPTO_DEV_SAFEXCEL clean_mk CONFIG_CRYPTO_DEV_SAFEXCEL drivers/crypto/inside-secure/Makefile @@ -804,12 +820,11 @@ clean_mk CONFIG_MOXA_INTELLIO drivers/tty/Makefile # gpu drm -announce DRM - "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)" -reject_firmware drivers/gpu/drm/drm_hdcp.c -clean_blob drivers/gpu/drm/drm_hdcp.c -clean_kconfig drivers/gpu/drm/Kconfig DRM -clean_mk CONFIG_DRM drivers/gpu/drm/Makefile - +announce DRM_DISPLAY_HDCP_HELPER +reject_firmware drivers/gpu/drm/display/drm_hdcp_helper.c +clean_blob drivers/gpu/drm/display/drm_hdcp_helper.c +clean_kconfig drivers/gpu/drm/display/Kconfig DRM_DISPLAY_HDCP_HELPER +clean_mk CONFIG_DRM_DISPLAY_HDCP_HELPER drivers/gpu/drm/display/Makefile announce DRM_AMDGPU - "AMD GPU" reject_firmware drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c @@ -824,10 +839,16 @@ reject_firmware drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c clean_blob drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c reject_firmware drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c clean_blob drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +reject_firmware drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +clean_blob drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c reject_firmware drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c clean_blob drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +reject_firmware drivers/gpu/drm/amd/amdgpu/imu_v11_0.c +clean_blob drivers/gpu/drm/amd/amdgpu/imu_v11_0.c reject_firmware drivers/gpu/drm/amd/amdgpu/mes_v10_1.c clean_blob drivers/gpu/drm/amd/amdgpu/mes_v10_1.c +reject_firmware drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +clean_blob drivers/gpu/drm/amd/amdgpu/mes_v11_0.c clean_blob drivers/gpu/drm/amd/amdgpu/psp_v3_1.c reject_firmware drivers/gpu/drm/amd/amdgpu/psp_v10_0.c clean_blob drivers/gpu/drm/amd/amdgpu/psp_v10_0.c @@ -846,6 +867,8 @@ reject_firmware drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c clean_blob drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c reject_firmware drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c clean_blob drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +reject_firmware drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c +clean_blob drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c reject_firmware drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c clean_blob drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c reject_firmware drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -859,6 +882,8 @@ reject_firmware drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c clean_blob drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c reject_firmware drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c clean_blob drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +reject_firmware drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +clean_blob drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c clean_kconfig drivers/gpu/drm/Kconfig DRM_AMDGPU clean_mk CONFIG_DRM_AMDGPU drivers/gpu/drm/amd/amdgpu/Makefile @@ -873,8 +898,8 @@ clean_kconfig drivers/gpu/drm/amd/amdgpu/Kconfig DRM_AMDGPU_CIK clean_mk CONFIG_DRM_AMDGPU_CIK drivers/gpu/drm/amd/amdgpu/Makefile announce DRM_AMDGPU_SI - "Enable amdgpu support for SI parts" -reject_firmware drivers/gpu/drm/amd/pm/powerplay/si_dpm.c -clean_blob drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +reject_firmware drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +clean_blob drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c reject_firmware drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c clean_blob drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c reject_firmware drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c @@ -896,8 +921,8 @@ clean_kconfig drivers/gpu/drm/bridge/cadence/Kconfig DRM_CDNS_MHDP8546 clean_mk CONFIG_DRM_CDNS_MHDP8546 drivers/gpu/drm/bridge/cadence/Makefile announce DRM_I915 - "Intel 8xx/9xx/G3x/G4x/HD Graphics" -reject_firmware drivers/gpu/drm/i915/display/intel_csr.c -clean_blob drivers/gpu/drm/i915/display/intel_csr.c +reject_firmware drivers/gpu/drm/i915/display/intel_dmc.c +clean_blob drivers/gpu/drm/i915/display/intel_dmc.c reject_firmware drivers/gpu/drm/i915/display/intel_opregion.c reject_firmware drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c clean_blob drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c @@ -917,7 +942,7 @@ clean_kconfig drivers/gpu/drm/bridge/Kconfig DRM_LONTIUM_LT9611UXC clean_mk CONFIG_DRM_LONTIUM_LT9611UXC drivers/gpu/drm/bridge/Makefile announce DRM_NOUVEAU - "Nouveau (nVidia) cards" -reject_firmware_nowarn drivers/gpu/drm/nouveau/nvkm/core/firmware.c +reject_firmware drivers/gpu/drm/nouveau/nvkm/core/firmware.c clean_blob drivers/gpu/drm/nouveau/nvkm/core/firmware.c reject_firmware drivers/gpu/drm/nouveau/nvkm/engine/falcon.c clean_blob drivers/gpu/drm/nouveau/nvkm/engine/falcon.c @@ -936,11 +961,8 @@ clean_blob drivers/gpu/drm/nouveau/nvkm/engine/gr/gv100.c clean_blob drivers/gpu/drm/nouveau/nvkm/engine/gr/tu102.c clean_blob drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp102.c clean_blob drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp108.c -if grep MODULE_FIRMWARE \ - drivers/gpu/drm/nouveau/nvkm/engine/sec2/tu102.c > /dev/null; then - # Added in 5.6.6. - clean_blob drivers/gpu/drm/nouveau/nvkm/engine/sec2/tu102.c -fi +# Added in 5.6.6. +clean_blob drivers/gpu/drm/nouveau/nvkm/engine/sec2/tu102.c clean_blob drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm200.c clean_blob drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm20b.c clean_blob drivers/gpu/drm/nouveau/nvkm/subdev/acr/gp102.c @@ -963,6 +985,7 @@ clean_mk CONFIG_DRM_MGA drivers/gpu/drm/Makefile announce DRM_MSM - "MSM DRM" reject_firmware drivers/gpu/drm/msm/adreno/adreno_gpu.c clean_blob drivers/gpu/drm/msm/adreno/adreno_device.c +clean_blob drivers/gpu/drm/msm/adreno/a6xx_gpu.c clean_kconfig drivers/gpu/drm/msm/Kconfig DRM_MSM clean_mk CONFIG_DRM_MSM drivers/gpu/drm/msm/Makefile @@ -972,6 +995,12 @@ clean_blob drivers/gpu/drm/r128/r128_cce.c clean_kconfig drivers/gpu/drm/Kconfig DRM_R128 clean_mk CONFIG_DRM_R128 drivers/gpu/drm/Makefile +announce DRM_PANEL_MIPI_DBI - "DRM support for MIPI DBI compatible panels" +reject_firmware drivers/gpu/drm/tiny/panel-mipi-dbi.c +clean_blob drivers/gpu/drm/tiny/panel-mipi-dbi.c +clean_kconfig drivers/gpu/drm/tiny/Kconfig DRM_PANEL_MIPI_DBI +clean_mk CONFIG_DRM_PANEL_MIPI_DBI drivers/gpu/drm/tiny/Makefile + announce DRM_RADEON - "ATI Radeon" reject_firmware drivers/gpu/drm/radeon/r100.c clean_blob drivers/gpu/drm/radeon/r100.c @@ -1027,6 +1056,7 @@ clean_mk CONFIG_DRM_STI drivers/gpu/drm/sti/Makefile announce DRM_TEGRA - "NVIDIA Tegra DRM" reject_firmware drivers/gpu/drm/tegra/falcon.c +clean_blob drivers/gpu/drm/tegra/nvdec.c clean_blob drivers/gpu/drm/tegra/vic.c clean_kconfig drivers/gpu/drm/tegra/Kconfig DRM_TEGRA clean_mk CONFIG_DRM_TEGRA drivers/gpu/drm/tegra/Makefile @@ -1056,6 +1086,7 @@ clean_blob arch/arm64/boot/dts/freescale/imx8mn.dtsi clean_blob arch/arm64/boot/dts/freescale/imx8mp.dtsi clean_blob arch/arm64/boot/dts/freescale/imx8mq.dtsi clean_blob Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt +clean_blob Documentation/devicetree/bindings/dsp/fsl,dsp.yaml clean_kconfig drivers/dma/Kconfig IMX_SDMA clean_mk CONFIG_IMX_SDMA drivers/dma/Makefile @@ -1079,7 +1110,7 @@ clean_mk CONFIG_MEDIA_TUNER_SI2157 drivers/media/tuners/Makefile announce MEDIA_TUNER_XC2028 - "XCeive xc2028/xc3028 tuners" undefault_firmware 'XC\(2028\|3028L\)' \ - drivers/media/tuners/tuner-xc2028.h \ + drivers/media/tuners/xc2028.h \ drivers/media/pci/saa7134/saa7134-cards.c \ drivers/media/pci/ivtv/ivtv-driver.c \ drivers/media/pci/cx18/cx18-driver.c \ @@ -1091,8 +1122,8 @@ undefault_firmware 'XC\(2028\|3028L\)' \ drivers/media/usb/em28xx/em28xx-cards.c \ drivers/media/usb/dvb-usb/dib0700_devices.c \ drivers/media/usb/dvb-usb/cxusb.c -reject_firmware drivers/media/tuners/tuner-xc2028.c -clean_blob drivers/media/tuners/tuner-xc2028.c +reject_firmware drivers/media/tuners/xc2028.c +clean_blob drivers/media/tuners/xc2028.c clean_kconfig drivers/media/tuners/Kconfig MEDIA_TUNER_XC2028 clean_mk CONFIG_MEDIA_TUNER_XC2028 drivers/media/tuners/Makefile @@ -1376,10 +1407,10 @@ clean_kconfig drivers/media/dvb-frontends/Kconfig DVB_SI2168 clean_mk CONFIG_DVB_SI2168 drivers/media/dvb-frontends/Makefile announce DVB_SP8870 - "Spase sp8870" -undefault_firmware 'SP8870' drivers/media/dvb-frontends/sp8870.c -clean_blob drivers/media/dvb-frontends/sp8870.c -clean_kconfig drivers/media/dvb-frontends/Kconfig DVB_SP8870 -clean_mk CONFIG_DVB_SP8870 drivers/media/dvb-frontends/Makefile +undefault_firmware 'SP8870' drivers/staging/media/av7110/sp8870.c +clean_blob drivers/staging/media/av7110/sp8870.c +clean_kconfig drivers/staging/media/av7110/Kconfig DVB_SP8870 +clean_mk CONFIG_DVB_SP8870 drivers/staging/media/av7110/Makefile announce DVB_SP887X - "Spase sp887x based" undefault_firmware 'SP887X' drivers/media/dvb-frontends/sp887x.c @@ -1417,10 +1448,10 @@ clean_kconfig drivers/media/usb/as102/Kconfig DVB_AS102 clean_mk CONFIG_DVB_AS102 drivers/media/usb/as102/Makefile announce DVB_AV7110 - "AV7110 cards" -reject_firmware drivers/media/pci/ttpci/av7110.c -clean_blob drivers/media/pci/ttpci/av7110.c -clean_kconfig drivers/media/pci/ttpci/Kconfig DVB_AV7110 -clean_mk CONFIG_DVB_AV7110 drivers/media/pci/ttpci/Makefile +reject_firmware drivers/staging/media/av7110/av7110.c +clean_blob drivers/staging/media/av7110/av7110.c +clean_kconfig drivers/staging/media/av7110/Kconfig DVB_AV7110 +clean_mk CONFIG_DVB_AV7110 drivers/staging/media/av7110/Makefile announce DVB_BUDGET - "Budget cards" reject_firmware drivers/media/pci/ttpci/budget.c @@ -1432,10 +1463,10 @@ announce DVB_BUDGET_CI - "Budget cards with onboard CI connector" reject_firmware drivers/media/pci/ttpci/budget-ci.c announce DVB_C8SECTPFE - "STMicroelectronics C8SECTPFE DVB support" -reject_firmware drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c -clean_blob drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c -clean_kconfig drivers/media/platform/sti/c8sectpfe/Kconfig DVB_C8SECTPFE -clean_mk CONFIG_DVB_C8SECTPFE drivers/media/platform/sti/c8sectpfe/Makefile +reject_firmware drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-core.c +clean_blob drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-core.c +clean_kconfig drivers/media/platform/st/sti/c8sectpfe/Kconfig DVB_C8SECTPFE +clean_mk CONFIG_DVB_C8SECTPFE drivers/media/platform/st/sti/c8sectpfe/Makefile announce DVB_DRXD - "Micronas DRXD driver" reject_firmware drivers/media/dvb-frontends/drxd_hard.c @@ -1502,9 +1533,15 @@ clean_mk CONFIG_DVB_TTUSB_DEC drivers/media/usb/ttusb-dec/Makefile announce VIDEO_ALLEGRO_DVT - "Allegro DVT Video IP Core" reject_firmware drivers/media/platform/allegro-dvt/allegro-core.c clean_blob drivers/media/platform/allegro-dvt/allegro-core.c -clean_kconfig drivers/media/platform/Kconfig VIDEO_ALLEGRO_DVT +clean_kconfig drivers/media/platform/allegro-dvt/Kconfig VIDEO_ALLEGRO_DVT clean_mk CONFIG_VIDEO_ALLEGRO_DVT drivers/media/platform/allegro-dvt/Makefile +announce VIDEO_AMPHION_VPU - "Amphion VPU (Video Processing Unit) Codec IP" +reject_firmware drivers/media/platform/amphion/vpu_core.c +clean_blob drivers/media/platform/amphion/vpu_core.c +clean_kconfig drivers/media/platform/amphion/Kconfig VIDEO_AMPHION_VPU +clean_mk CONFIG_VIDEO_AMPHION_VPU drivers/media/platform/amphion/Makefile + announce VIDEO_ATOMISP - "Intel Atom Image Signal Processor Driver" reject_firmware drivers/staging/media/atomisp/pci/atomisp_v4l2.c clean_blob drivers/staging/media/atomisp/pci/atomisp_v4l2.c @@ -1526,10 +1563,10 @@ clean_kconfig drivers/media/i2c/ccs/Kconfig VIDEO_CCS clean_mk CONFIG_VIDEO_CCS drivers/media/i2c/ccs/Makefile announce VIDEO_CODA - "Chips&Media Coda multi-standard codec IP" -reject_firmware drivers/media/platform/coda/coda-common.c -clean_blob drivers/media/platform/coda/coda-common.c -clean_kconfig drivers/media/platform/Kconfig VIDEO_CODA -clean_mk CONFIG_VIDEO_CODA drivers/media/platform/coda/Makefile +reject_firmware drivers/media/platform/chips-media/coda-common.c +clean_blob drivers/media/platform/chips-media/coda-common.c +clean_kconfig drivers/media/platform/chips-media/Kconfig VIDEO_CODA +clean_mk CONFIG_VIDEO_CODA drivers/media/platform/chips-media/Makefile announce VIDEO_CPIA2 - "CPiA2 Video For Linux" reject_firmware drivers/media/usb/cpia2/cpia2_core.c @@ -1580,10 +1617,10 @@ clean_kconfig drivers/media/usb/em28xx/Kconfig VIDEO_EM28XX_DVB clean_mk CONFIG_VIDEO_EM28XX_DVB drivers/media/usb/em28xx/Makefile announce VIDEO_EXYNOS4_FIMC_IS - "EXYNOS4x12 FIMC-IS (Imaging Subsystem) driver" -reject_firmware drivers/media/platform/exynos4-is/fimc-is.c -clean_blob drivers/media/platform/exynos4-is/fimc-is.h -clean_kconfig drivers/media/platform/exynos4-is/Kconfig VIDEO_EXYNOS4_FIMC_IS -clean_mk CONFIG_VIDEO_EXYNOS4_FIMC_IS drivers/media/platform/exynos4-is/Makefile +reject_firmware drivers/media/platform/samsung/exynos4-is/fimc-is.c +clean_blob drivers/media/platform/samsung/exynos4-is/fimc-is.h +clean_kconfig drivers/media/platform/samsung/exynos4-is/Kconfig VIDEO_EXYNOS4_FIMC_IS +clean_mk CONFIG_VIDEO_EXYNOS4_FIMC_IS drivers/media/platform/samsung/exynos4-is/Makefile announce VIDEO_IPU3_IMGU - "Intel ipu3-imgu driver" reject_firmware drivers/staging/media/ipu3/ipu3-css-fw.c @@ -1599,10 +1636,10 @@ clean_kconfig drivers/media/pci/ivtv/Kconfig VIDEO_IVTV clean_mk CONFIG_VIDEO_IVTV drivers/media/pci/ivtv/Makefile announce VIDEO_MEDIATEK_VPU - "Mediatek Video Processor Unit" -reject_firmware drivers/media/platform/mtk-vpu/mtk_vpu.c -clean_blob drivers/media/platform/mtk-vpu/mtk_vpu.c -clean_kconfig drivers/media/platform/Kconfig VIDEO_MEDIATEK_VPU -clean_mk CONFIG_VIDEO_MEDIATEK_VPU drivers/media/platform/mtk-vpu/Makefile +reject_firmware drivers/media/platform/mediatek/vpu/mtk_vpu.c +clean_blob drivers/media/platform/mediatek/vpu/mtk_vpu.c +clean_kconfig drivers/media/platform/mediatek/vpu/Kconfig VIDEO_MEDIATEK_VPU +clean_mk CONFIG_VIDEO_MEDIATEK_VPU drivers/media/platform/mediatek/vpu/Makefile announce VIDEO_MESON_VDEC - "Amlogic video decoder driver" reject_firmware drivers/staging/media/meson/vdec/vdec_1.c @@ -1674,10 +1711,10 @@ clean_kconfig drivers/media/i2c/Kconfig VIDEO_VS6624 clean_mk CONFIG_VIDEO_VS6624 drivers/media/i2c/Makefile announce VIDEO_SAMSUNG_S5P_MFC - "Samsung S5P MFC 5.1 Video Codec" -reject_firmware drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c -clean_blob drivers/media/platform/s5p-mfc/s5p_mfc.c -clean_kconfig drivers/media/platform/Kconfig VIDEO_SAMSUNG_S5P_MFC -clean_mk CONFIG_VIDEO_SAMSUNG_S5P_MFC drivers/media/platform/s5p-mfc/Makefile +reject_firmware drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c +clean_blob drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c +clean_kconfig drivers/media/platform/samsung/s5p-mfc/Kconfig VIDEO_SAMSUNG_S5P_MFC +clean_mk CONFIG_VIDEO_SAMSUNG_S5P_MFC drivers/media/platform/samsung/s5p-mfc/Makefile announce USB_S2255 - "USB Sensoray 2255 video capture device" reject_firmware drivers/media/usb/s2255/s2255drv.c @@ -1694,14 +1731,14 @@ clean_mk CONFIG_USB_GSPCA_VICAM drivers/media/usb/gspca/Makefile announce VIDEO_QCOM_VENUS - "Qualcomm Venus V4L2 encoder/decoder driver" reject_firmware drivers/media/platform/qcom/venus/firmware.c clean_blob drivers/media/platform/qcom/venus/core.c -clean_kconfig drivers/media/platform/Kconfig VIDEO_QCOM_VENUS +clean_kconfig drivers/media/platform/qcom/venus/Kconfig VIDEO_QCOM_VENUS clean_mk CONFIG_VIDEO_QCOM_VENUS drivers/media/platform/qcom/venus/Makefile announce VIDEO_TI_VPE - "TI VPE (Video Processing Engine) driver" -reject_firmware drivers/media/platform/ti-vpe/vpdma.c -clean_blob drivers/media/platform/ti-vpe/vpdma.c -clean_kconfig drivers/media/platform/Kconfig VIDEO_TI_VPE -clean_mk CONFIG_VIDEO_TI_VPE drivers/media/platform/ti-vpe/Makefile +reject_firmware drivers/media/platform/ti/vpe/vpdma.c +clean_blob drivers/media/platform/ti/vpe/vpdma.c +clean_kconfig drivers/media/platform/ti/Kconfig VIDEO_TI_VPE +clean_mk CONFIG_VIDEO_TI_VPE drivers/media/platform/ti/vpe/Makefile # radio @@ -1758,17 +1795,7 @@ clean_sed ' -EINVAL) }' drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c 'report missing Free firmware' clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c -clean_sed ' -/^int bnx2x_compare_fw_ver/,/^}$/{ - /^ u32 my_fw = /i\ - /*(DEBLOBBED)*/ - /^ u32 my_fw = /,/<< 24);/d; - /^ u32 loaded_fw = /,/^$/{ - /^$/i\ -\ - u32 my_fw = ~loaded_fw; - } -}' drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c 'fail already-loaded test' +clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h clean_sed ' /static void bnx2x_init_wr_wb/{ @@ -1808,7 +1835,6 @@ clean_kconfig drivers/net/ethernet/intel/Kconfig E100 clean_mk CONFIG_E100 drivers/net/ethernet/intel/Makefile announce ICE - "Intel(R) Ethernet Connection E800 Series Support" -reject_firmware_nowarn drivers/net/ethernet/intel/ice/ice_main.c reject_firmware drivers/net/ethernet/intel/ice/ice_main.c clean_blob drivers/net/ethernet/intel/ice/ice_main.c clean_blob Documentation/networking/device_drivers/ethernet/intel/ice.rst @@ -1821,10 +1847,14 @@ clean_blob drivers/net/ethernet/cavium/liquidio/lio_main.c clean_kconfig drivers/net/ethernet/cavium/Kconfig LIQUIDIO clean_mk CONFIG_LIQUIDIO drivers/net/ethernet/cavium/liquidio/Makefile +announce MLXSW_CORE - "Mellanox Technologies Switch ASICs support" +reject_firmware drivers/net/ethernet/mellanox/mlxsw/core.c +reject_firmware drivers/net/ethernet/mellanox/mlxsw/core_linecards.c +clean_blob drivers/net/ethernet/mellanox/mlxsw/core_linecards.c +clean_kconfig drivers/net/ethernet/mellanox/mlxsw/Kconfig MLXSW_CORE +clean_mk CONFIG_MLXSW_CORE drivers/net/ethernet/mellanox/mlxsw/Makefile + announce MLXSW_SPECTRUM - "Mellanox Technologies Spectrum support" -reject_firmware drivers/net/ethernet/mellanox/mlxsw/core.c ' -/request_firmware_direct.*[ ]params->file_name/{p;d;}; -' clean_blob drivers/net/ethernet/mellanox/mlxsw/spectrum.c clean_kconfig drivers/net/ethernet/mellanox/mlxsw/Kconfig MLXSW_SPECTRUM clean_mk CONFIG_MLXSW_SPECTRUM drivers/net/ethernet/mellanox/mlxsw/Makefile @@ -2061,11 +2091,7 @@ clean_mk CONFIG_BRCMSMAC drivers/net/wireless/broadcom/brcm80211/Makefile announce BRCMFMAC - "Broadcom IEEE802.11n embedded FullMAC WLAN driver" reject_firmware drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c -if grep -q firmware_request_nowarn drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c; then - reject_firmware_nowarn drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c -else - reject_firmware drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c -fi +reject_firmware drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c clean_blob drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c clean_blob drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h clean_kconfig drivers/net/wireless/broadcom/brcm80211/brcmfmac/Kconfig BRCMFMAC @@ -2127,8 +2153,8 @@ clean_mk CONFIG_IWL4965 drivers/net/wireless/intel/iwlegacy/Makefile announce IWLWIFI - "Intel Wireless WiFi Next Gen AGN" reject_firmware drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c reject_firmware drivers/net/wireless/intel/iwlwifi/iwl-drv.c -reject_firmware_nowarn drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c -reject_firmware_nowarn drivers/net/wireless/intel/iwlwifi/fw/pnvm.c +reject_firmware drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c +reject_firmware drivers/net/wireless/intel/iwlwifi/fw/pnvm.c clean_blob drivers/net/wireless/intel/iwlwifi/iwl-drv.c clean_blob drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c clean_kconfig drivers/net/wireless/intel/iwlwifi/Kconfig IWLWIFI @@ -2207,7 +2233,6 @@ clean_kconfig drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig MT76x0E clean_mk CONFIG_MT76x0E drivers/net/wireless/mediatek/mt76/mt76x0/Makefile announce MT76x0U - "MediaTek MT76x0U (USB) support" -reject_firmware_nowarn drivers/net/wireless/mediatek/mt76/mt76x0/usb_mcu.c reject_firmware drivers/net/wireless/mediatek/mt76/mt76x0/usb_mcu.c clean_blob drivers/net/wireless/mediatek/mt76/mt76x0/usb.c clean_kconfig drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig MT76x0U @@ -2235,7 +2260,6 @@ clean_kconfig drivers/net/wireless/mediatek/mt76/mt7603/Kconfig MT7603E clean_mk CONFIG_MT7603E drivers/net/wireless/mediatek/mt76/mt7603/Makefile announce MT7615E - "MediaTek MT7615E (PCIe) support" -reject_firmware_nowarn drivers/net/wireless/mediatek/mt76/mt7615/mcu.c reject_firmware drivers/net/wireless/mediatek/mt76/mt7615/mcu.c clean_blob drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h clean_blob drivers/net/wireless/mediatek/mt76/mt7615/pci.c @@ -2255,18 +2279,38 @@ clean_mk CONFIG_MT7663U drivers/net/wireless/mediatek/mt76/mt7615/Makefile announce MT7915E - "MediaTek MT7915E (PCIe) support" reject_firmware drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +reject_firmware drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c clean_blob drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h clean_blob drivers/net/wireless/mediatek/mt76/mt7915/pci.c clean_kconfig drivers/net/wireless/mediatek/mt76/mt7915/Kconfig MT7915E clean_mk CONFIG_MT7915E drivers/net/wireless/mediatek/mt76/mt7915/Makefile -announce MT7921E - "MediaTek MT7921E (PCIe) support" +announce MT7986_WMAC - "MT7986 (SoC) WMAC support" +clean_blob drivers/net/wireless/mediatek/mt76/mt7915/soc.c +clean_kconfig drivers/net/wireless/mediatek/mt76/mt7915/Kconfig MT7986_WMAC +clean_mk CONFIG_MT7986_WMAC drivers/net/wireless/mediatek/mt76/mt7915/Makefile + +announce MT7921_COMMON - "MediaTek MT7921 support" reject_firmware drivers/net/wireless/mediatek/mt76/mt7921/mcu.c clean_blob drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h +clean_kconfig drivers/net/wireless/mediatek/mt76/mt7921/Kconfig MT7921_COMMON +clean_mk CONFIG_MT7921_COMMON drivers/net/wireless/mediatek/mt76/mt7921/Makefile + +announce MT7921E - "MediaTek MT7921E (PCIe) support" clean_blob drivers/net/wireless/mediatek/mt76/mt7921/pci.c clean_kconfig drivers/net/wireless/mediatek/mt76/mt7921/Kconfig MT7921E clean_mk CONFIG_MT7921E drivers/net/wireless/mediatek/mt76/mt7921/Makefile +announce MT7921S - "MediaTek MT7921S (SDIO) support" +clean_blob drivers/net/wireless/mediatek/mt76/mt7921/sdio.c +clean_kconfig drivers/net/wireless/mediatek/mt76/mt7921/Kconfig MT7921S +clean_mk CONFIG_MT7921S drivers/net/wireless/mediatek/mt76/mt7921/Makefile + +announce MT7921U - "MediaTek MT7921U (USB) support" +clean_blob drivers/net/wireless/mediatek/mt76/mt7921/usb.c +clean_kconfig drivers/net/wireless/mediatek/mt76/mt7921/Kconfig MT7921U +clean_mk CONFIG_MT7921U drivers/net/wireless/mediatek/mt76/mt7921/Makefile + announce MWIFIEX - "Marvell WiFi-Ex Driver" clean_blob drivers/net/wireless/marvell/mwifiex/README reject_firmware drivers/net/wireless/marvell/mwifiex/main.c @@ -2328,7 +2372,7 @@ clean_kconfig drivers/net/wireless/ath/ath6kl/Kconfig ATH6KL_USB clean_mk CONFIG_ATH6KL_USB drivers/net/wireless/ath/ath6kl/Makefile announce ATH10K - "Atheros 802.11ac wireless cards support" -reject_firmware_nowarn drivers/net/wireless/ath/ath10k/core.c +reject_firmware drivers/net/wireless/ath/ath10k/core.c clean_blob drivers/net/wireless/ath/ath10k/core.c clean_blob drivers/net/wireless/ath/ath10k/hw.h clean_blob Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt @@ -2336,7 +2380,7 @@ clean_kconfig drivers/net/wireless/ath/ath10k/Kconfig ATH10K clean_mk CONFIG_ATH10K drivers/net/wireless/ath/ath10k/Makefile announce ATH10K NL80211_TESTMODE - "nl80211 testmode command" -reject_firmware_nowarn drivers/net/wireless/ath/ath10k/testmode.c +reject_firmware drivers/net/wireless/ath/ath10k/testmode.c clean_sed ' s,^\([\t ]*\/\* We didn.t find FW UTF API 1 \)("utf\.bin"),\1*//*(DEBLOBBED)*//*, ' drivers/net/wireless/ath/ath10k/testmode.c 'removed blob name in comment' @@ -2350,9 +2394,10 @@ clean_kconfig drivers/net/wireless/ath/ath10k/Kconfig ATH10K_PCI clean_mk CONFIG_ATH10K_PCI drivers/net/wireless/ath/ath10k/Makefile announce ATH11K - "Qualcomm Technologies 802.11ax chipset support" -reject_firmware_nowarn drivers/net/wireless/ath/ath11k/core.c +reject_firmware drivers/net/wireless/ath/ath11k/core.c clean_blob drivers/net/wireless/ath/ath11k/hw.h clean_blob drivers/net/wireless/ath/ath11k/core.c +clean_blob drivers/net/wireless/ath/ath11k/qmi.c clean_blob Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml clean_kconfig drivers/net/wireless/ath/ath11k/Kconfig ATH11K clean_mk CONFIG_ATH11K drivers/net/wireless/ath/ath11k/Makefile @@ -2412,11 +2457,12 @@ clean_blob drivers/net/wireless/intersil/p54/p54usb.h clean_kconfig drivers/net/wireless/intersil/p54/Kconfig P54_USB clean_mk CONFIG_P54_USB drivers/net/wireless/intersil/p54/Makefile -announce PRISM54 - "Intersil Prism GT/Duette/Indigo PCI/Cardbus" -reject_firmware drivers/net/wireless/intersil/prism54/islpci_dev.c -clean_blob drivers/net/wireless/intersil/prism54/islpci_dev.c -clean_kconfig drivers/net/wireless/intersil/Kconfig PRISM54 -clean_mk CONFIG_PRISM54 drivers/net/wireless/intersil/prism54/Makefile +announce PLFXLC - "pureLiFi X, XL, XC device support" +reject_firmware drivers/net/wireless/purelifi/plfxlc/firmware.c +clean_blob drivers/net/wireless/purelifi/plfxlc/firmware.c +clean_blob drivers/net/wireless/purelifi/plfxlc/usb.c +clean_kconfig drivers/net/wireless/purelifi/plfxlc/Kconfig PLFXLC +clean_mk CONFIG_PLFXLC drivers/net/wireless/purelifi/plfxlc/Makefile announce QTNFMAC_PCIE - "Quantenna QSR1000/QSR2000/QSR10g PCIe support" reject_firmware drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c @@ -2493,12 +2539,14 @@ clean_kconfig drivers/net/wireless/realtek/rtlwifi/Kconfig RTL8188EE clean_mk CONFIG_RTL8188EE drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile announce R8188EU - "Realtek RTL8188EU Wireless LAN NIC driver" -reject_firmware drivers/staging/rtl8188eu/hal/fw.c -clean_blob drivers/staging/rtl8188eu/hal/fw.c -clean_blob drivers/staging/rtl8188eu/include/rtl8188e_hal.h -clean_blob drivers/staging/rtl8188eu/os_dep/os_intfs.c -clean_kconfig drivers/staging/rtl8188eu/Kconfig R8188EU -clean_mk CONFIG_R8188EU drivers/staging/rtl8188eu/Makefile +reject_firmware drivers/staging/r8188eu/core/rtw_fw.c +clean_blob drivers/staging/r8188eu/core/rtw_fw.c +# Added in 5.19.8. +if grep -q MODULE_FIRMWARE drivers/staging/r8188eu/os_dep/os_intfs.c; then + clean_blob drivers/staging/r8188eu/os_dep/os_intfs.c +fi +clean_kconfig drivers/staging/r8188eu/Kconfig R8188EU +clean_mk CONFIG_R8188EU drivers/staging/r8188eu/Makefile announce RTL8192CE - "Realtek RTL8192CE/RTL8188CE Wireless Network Adapter" reject_firmware drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c @@ -2602,6 +2650,25 @@ clean_blob drivers/net/wireless/realtek/rtw88/rtw8723d.c clean_kconfig drivers/net/wireless/realtek/rtw88/Kconfig RTW88_8723DE clean_mk CONFIG_RTW88_8723DE drivers/net/wireless/realtek/rtw88/Makefile +announce RTW89 - "Realtek 802.11ax wireless chips support" +reject_firmware drivers/net/wireless/realtek/rtw89/fw.c +clean_kconfig drivers/net/wireless/realtek/rtw89/Kconfig RTW89 +clean_mk CONFIG_RTW89 drivers/net/wireless/realtek/rtw89/Makefile + +announce RTW89_8852A - "Realtek 802.11ax wireless chips support" +clean_blob drivers/net/wireless/realtek/rtw89/rtw8852a.c +clean_kconfig drivers/net/wireless/realtek/rtw89/Kconfig RTW89_8852A +clean_mk CONFIG_RTW89_8852A drivers/net/wireless/realtek/rtw89/Makefile + +# This driver seems to be under development, without Kconfig or +# Makefile entries as of 5.18-rc6. +announce RTW89_8852C - "Realtek 802.11ax wireless chips support" +clean_blob drivers/net/wireless/realtek/rtw89/rtw8852c.c +if fgrep -q rtw8852c.o drivers/net/wireless/realtek/rtw89/Makefile; then + clean_kconfig drivers/net/wireless/realtek/rtw89/Kconfig RTW89_8852C + clean_mk CONFIG_RTW89_8852C drivers/net/wireless/realtek/rtw89/Makefile +fi + announce VT6656 - "VIA Technologies VT6656 support" reject_firmware drivers/staging/vt6656/main_usb.c clean_blob drivers/staging/vt6656/device.h @@ -2659,14 +2726,14 @@ announce WFX - "Silicon Labs wireless chips WF200 and further" # wfm_wf200_C0.sec appears to be the firmware name obtained from the # hardware, that these requests would load. It's encrypted and # signed, definitely not meant to be Free Software. -reject_firmware_nowarn drivers/staging/wfx/fwio.c -reject_firmware drivers/staging/wfx/fwio.c +reject_firmware drivers/net/wireless/silabs/wfx/fwio.c +clean_blob drivers/net/wireless/silabs/wfx/fwio.c # This loads platform data set configuration files, that are pure # data, with template input files and tools to compress the text input # into the expected compressed format. No reason to reject these. # reject_firmware drivers/staging/wfx/main.c -clean_kconfig drivers/staging/wfx/Kconfig WFX -clean_mk CONFIG_WFX drivers/staging/wfx/Makefile +clean_kconfig drivers/net/wireless/silabs/wfx/Kconfig WFX +clean_mk CONFIG_WFX drivers/net/wireless/silabs/wfx/Makefile announce WILC1000 - "WILC1000 support (WiFi only)" reject_firmware drivers/net/wireless/microchip/wilc1000/netdev.c @@ -2699,7 +2766,7 @@ clean_kconfig drivers/bluetooth/Kconfig BT_ATH3K clean_mk CONFIG_BT_ATH3K drivers/bluetooth/Makefile announce BT_BCM - "Broadcom protocol support" -reject_firmware_nowarn drivers/bluetooth/btbcm.c +reject_firmware drivers/bluetooth/btbcm.c clean_blob drivers/bluetooth/btbcm.c clean_kconfig drivers/bluetooth/Kconfig BT_BCM clean_mk CONFIG_BT_BCM drivers/bluetooth/Makefile @@ -2747,7 +2814,6 @@ clean_kconfig drivers/bluetooth/Kconfig BT_HCIBT3C clean_mk CONFIG_BT_HCIBT3C drivers/bluetooth/Makefile announce BT_HCIBTUSB - "HCI USB driver" -reject_firmware_nowarn drivers/bluetooth/btusb.c reject_firmware drivers/bluetooth/btusb.c clean_blob drivers/bluetooth/btusb.c clean_kconfig drivers/bluetooth/Kconfig BT_HCIBTUSB @@ -2772,22 +2838,27 @@ clean_blob Documentation/admin-guide/btmrvl.rst clean_kconfig drivers/bluetooth/Kconfig BT_MRVL_SDIO clean_mk CONFIG_BT_MRVL_SDIO drivers/bluetooth/Makefile +announce BT_MTK - "MediaTek Bluetooth" +clean_blob drivers/bluetooth/btmtk.h +reject_firmware drivers/bluetooth/btmtk.c +clean_blob drivers/bluetooth/btmtk.c +clean_kconfig drivers/bluetooth/Kconfig BT_MTK +clean_mk CONFIG_BT_MTK drivers/bluetooth/Makefile + announce BT_MTKSDIO - "MediaTek HCI SDIO driver" -reject_firmware drivers/bluetooth/btmtksdio.c clean_blob drivers/bluetooth/btmtksdio.c clean_kconfig drivers/bluetooth/Kconfig BT_MTKSDIO clean_mk CONFIG_BT_MTKSDIO drivers/bluetooth/Makefile announce BT_MTKUART - "MediaTek HCI UART driver" -reject_firmware drivers/bluetooth/btmtkuart.c -clean_blob drivers/bluetooth/btmtkuart.c +# Blob loading consolidated in btmtk dep driver. clean_kconfig drivers/bluetooth/Kconfig BT_MTKUART clean_mk CONFIG_BT_MTKUART drivers/bluetooth/Makefile announce BT_QCA - "Bluetooh support for Qualcomm/Atheros devices" reject_firmware drivers/bluetooth/btqca.c clean_blob drivers/bluetooth/btqca.c -clean_blob Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt +clean_blob Documentation/devicetree/bindings/net/qualcomm-bluetooth.yaml clean_kconfig drivers/bluetooth/Kconfig BT_QCA clean_mk CONFIG_BT_QCA drivers/bluetooth/Makefile @@ -2850,6 +2921,7 @@ clean_mk CONFIG_NET_DSA_LANTIQ_GSWIP drivers/net/dsa/Makefile announce MICROSEMI_PHY - "Microsemi PHYs" reject_firmware drivers/net/phy/mscc/mscc_main.c +clean_blob drivers/net/phy/mscc/mscc_main.c clean_blob drivers/net/phy/mscc/mscc.h clean_kconfig drivers/net/phy/Kconfig MICROSEMI_PHY clean_mk CONFIG_MICROSEMI_PHY drivers/net/phy/mscc/Makefile @@ -2952,6 +3024,8 @@ clean_mk CONFIG_TOUCHSCREEN_ATMEL_MXT drivers/input/touchscreen/Makefile announce TOUCHSCREEN_GOODIX - "Goodix I2C touchscreen" reject_firmware drivers/input/touchscreen/goodix.c clean_blob drivers/input/touchscreen/goodix.c +reject_firmware drivers/input/touchscreen/goodix_fwupload.c +clean_blob drivers/input/touchscreen/goodix_fwupload.c clean_kconfig drivers/input/touchscreen/Kconfig TOUCHSCREEN_GOODIX clean_mk CONFIG_TOUCHSCREEN_GOODIX drivers/input/touchscreen/Makefile @@ -2961,6 +3035,12 @@ clean_blob drivers/input/touchscreen/hideep.c clean_kconfig drivers/input/touchscreen/Kconfig TOUCHSCREEN_HIDEEP clean_mk CONFIG_TOUCHSCREEN_HIDEEP drivers/input/touchscreen/Makefile +announce TOUCHSCREEN_ILI210X - "Ilitek ILI210X based touchscreen" +reject_firmware drivers/input/touchscreen/ili210x.c +clean_blob drivers/input/touchscreen/ili210x.c +clean_kconfig drivers/input/touchscreen/Kconfig TOUCHSCREEN_ILI210X +clean_mk CONFIG_TOUCHSCREEN_ILI210X drivers/input/touchscreen/Makefile + announce TOUCHSCREEN_IQS5XX - "Azoteq IQS550/572/525 trackpad/touchscreen controller" reject_firmware drivers/input/touchscreen/iqs5xx.c clean_kconfig drivers/input/touchscreen/Kconfig TOUCHSCREEN_IQS5XX @@ -2995,6 +3075,11 @@ clean_blob drivers/platform/x86/touchscreen_dmi.c clean_kconfig drivers/platform/x86/Kconfig TOUCHSCREEN_DMI clean_mk CONFIG_TOUCHSCREEN_DMI drivers/platform/x86/Makefile +announce X86_ANDROID_TABLETS - "X86 Android tablet support" +clean_blob drivers/platform/x86/x86-android-tablets.c +clean_kconfig drivers/platform/x86/Kconfig X86_ANDROID_TABLETS +clean_mk CONFIG_X86_ANDROID_TABLETS drivers/platform/x86/Makefile + announce TOUCHSCREEN_WDT87XX_I2C - "Weida HiTech I2C touchscreen" reject_firmware drivers/input/touchscreen/wdt87xx_i2c.c clean_blob drivers/input/touchscreen/wdt87xx_i2c.c @@ -3114,6 +3199,17 @@ clean_blob drivers/scsi/csiostor/csio_init.c clean_kconfig drivers/scsi/csiostor/Kconfig SCSI_CHELSIO_FCOE clean_mk CONFIG_SCSI_CHELSIO_FCOE drivers/scsi/csiostor/Makefile +announce SCSI_EFCT - "Emulex Fibre Channel Target" +# The firmware name is built out of Vital Product Data read from the +# adapter. The firmware is definitely code, and I couldn't find +# evidence it is Free, so I'm disabling it. It's not clear whether +# this is the hardware or the software inducing to the installation of +# non-Free firmware. +reject_firmware drivers/scsi/elx/efct/efct_driver.c +clean_blob drivers/scsi/elx/efct/efct_driver.c +clean_kconfig drivers/scsi/elx/Kconfig SCSI_EFCT +clean_mk CONFIG_SCSI_EFCT drivers/scsi/elx/Makefile + announce SCSI_LPFC - "Emulex LightPulse Fibre Channel Support" # The firmware name is built out of Vital Product Data read from the # adapter. The firmware is definitely code, and I couldn't find @@ -3171,12 +3267,8 @@ clean_mk CONFIG_USB_UEAGLEATM drivers/usb/atm/Makefile # host -announce USB_XHCI_PCI_RENESAS - "Support for additional Renesas xHCI controller with firwmare" -if grep -q 'firmware_request_nowarn' drivers/usb/host/xhci-pci-renesas.c; then - reject_firmware_nowarn drivers/usb/host/xhci-pci-renesas.c -else - reject_firmware drivers/usb/host/xhci-pci-renesas.c -fi +announce USB_XHCI_PCI_RENESAS - "Support for additional Renesas xHCI controller with firmware" +reject_firmware drivers/usb/host/xhci-pci-renesas.c clean_kconfig drivers/usb/host/Kconfig USB_XHCI_PCI_RENESAS clean_mk CONFIG_USB_XHCI_PCI_RENESAS drivers/usb/host/Makefile @@ -3287,6 +3379,13 @@ clean_blob drivers/misc/bcm-vk/bcm_vk_dev.c clean_kconfig drivers/misc/bcm-vk/Kconfig BCM_VK clean_mk CONFIG_BCM_VK drivers/misc/bcm-vk/Makefile +announce GEHC_ACHC - "GEHC ACHC support" +reject_firmware drivers/misc/gehc-achc.c +clean_blob drivers/misc/gehc-achc.c +clean_blob Documentation/ABI/testing/sysfs-driver-ge-achc +clean_kconfig drivers/misc/Kconfig GEHC_ACHC +clean_mk CONFIG_GEHC_ACHC drivers/misc/Makefile + announce HABANA_AI - "HabanaAI accelerators (habanalabs)" reject_firmware drivers/misc/habanalabs/common/firmware_if.c reject_firmware drivers/misc/habanalabs/gaudi/gaudi.c @@ -3306,6 +3405,14 @@ maybe_reject_firmware drivers/remoteproc/remoteproc_core.c clean_kconfig drivers/remoteproc/Kconfig REMOTEPROC clean_mk CONFIG_REMOTEPROC drivers/remoteproc/Makefile +announce IMX_DSP_REMOTEPROC - "i.MX DSP remoteproc support" +# This uses rproc_of_parse_firmware to read firmware-name from a +# devicetree file. AFAICT the files this would end up loading are +# non-Free, so we inactivate it. +reject_firmware drivers/remoteproc/imx_dsp_rproc.c +clean_kconfig drivers/remoteproc/Kconfig IMX_DSP_REMOTEPROC +clean_mk CONFIG_IMX_DSP_REMOTEPROC drivers/remoteproc/Makefile + announce KEYSTONE_REMOTEPROC - "Keystone Remoteproc support" clean_blob drivers/remoteproc/keystone_remoteproc.c clean_kconfig drivers/remoteproc/Kconfig KEYSTONE_REMOTEPROC @@ -3320,13 +3427,23 @@ announce WKUP_M3_RPROC - "AMx3xx Wakeup M3 remoteproc support" clean_blob Documentation/devicetree/bindings/remoteproc/wkup_m3_rproc.txt clean_blob arch/arm/boot/dts/am33xx-l4.dtsi clean_blob arch/arm/boot/dts/am437x-l4.dtsi -if grep -q 'Block system suspend' arch/arm/mach-omap2/pm33xx-core.c; then - clean_blob arch/arm/mach-omap2/pm33xx-core.c -fi +clean_blob arch/arm/mach-omap2/pm33xx-core.c clean_kconfig drivers/remoteproc/Kconfig WKUP_M3_RPROC clean_mk CONFIG_WKUP_M3_RPROC drivers/remoteproc/Makefile -announce QCOM_Q6V5_ADSP - "Qualcomm Technology Inc ADSP Peripherial Image Loader" +announce WKUP_M3_IPC - "TI AMx3 Wkup-M3 IPC Driver" +reject_firmware drivers/soc/ti/wkup_m3_ipc.c +clean_blob Documentation/devicetree/bindings/soc/ti/wkup-m3-ipc.yaml +clean_blob arch/arm/boot/dts/am335x-bone-common.dtsi +clean_blob arch/arm/boot/dts/am335x-evm.dts +clean_blob arch/arm/boot/dts/am335x-evmsk.dts +clean_blob arch/arm/boot/dts/am437x-gp-evm.dts +clean_blob arch/arm/boot/dts/am437x-sk-evm.dts +clean_blob arch/arm/boot/dts/am43x-epos-evm.dts +clean_kconfig drivers/soc/ti/Kconfig WKUP_M3_IPC +clean_mk CONFIG_WKUP_M3_IPC drivers/soc/ti/Makefile + +announce QCOM_Q6V5_ADSP - "Qualcomm Technology Inc ADSP Peripheral Image Loader" clean_blob drivers/remoteproc/qcom_q6v5_adsp.c clean_kconfig drivers/remoteproc/Kconfig QCOM_Q6V5_ADSP clean_mk CONFIG_QCOM_Q6V5_ADSP drivers/remoteproc/Makefile @@ -3337,7 +3454,7 @@ clean_blob drivers/remoteproc/qcom_q6v5_mss.c clean_kconfig drivers/remoteproc/Kconfig QCOM_Q6V5_MSS clean_mk CONFIG_QCOM_Q6V5_MSS drivers/remoteproc/Makefile -announce QCOM_Q6V5_PAS - "Qualcomm Hexagon V5 Peripherial Authentication Service support" +announce QCOM_Q6V5_PAS - "Qualcomm Hexagon V5 Peripheral Authentication Service support" clean_blob drivers/remoteproc/qcom_q6v5_pas.c clean_kconfig drivers/remoteproc/Kconfig QCOM_Q6V5_PAS clean_mk CONFIG_QCOM_Q6V5_PAS drivers/remoteproc/Makefile @@ -3347,10 +3464,10 @@ clean_blob drivers/remoteproc/qcom_q6v5_wcss.c clean_kconfig drivers/remoteproc/Kconfig QCOM_Q6V5_WCSS clean_mk CONFIG_QCOM_Q6V5_WCSS drivers/remoteproc/Makefile -announce QCOM_WCNSS_PIL - "Qualcomm WCNSS Peripherial Image Loader" +announce QCOM_WCNSS_PIL - "Qualcomm WCNSS Peripheral Image Loader" clean_blob drivers/remoteproc/qcom_wcnss.c clean_blob Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt -clean_blob Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.txt +clean_blob Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.yaml clean_kconfig drivers/remoteproc/Kconfig QCOM_WCNSS_PIL clean_mk CONFIG_QCOM_WCNSS_PIL drivers/remoteproc/Makefile @@ -3650,6 +3767,14 @@ clean_blob sound/soc/intel/common/soc-acpi-intel-skl-match.c clean_kconfig sound/soc/intel/Kconfig SND_SOC_ACPI_INTEL_MATCH clean_mk CONFIG_SND_SOC_ACPI_INTEL_MATCH sound/soc/intel/common/Makefile +announce SND_SOC_INTEL_AVS - "Intel AVS driver" +reject_firmware sound/soc/intel/avs/topology.c +reject_firmware sound/soc/intel/avs/utils.c +clean_blob sound/soc/intel/avs/board_selection.c +clean_blob sound/soc/intel/avs/loader.c +clean_kconfig sound/soc/intel/Kconfig SND_SOC_INTEL_AVS +clean_mk CONFIG_SND_SOC_INTEL_AVS sound/soc/intel/avs/Makefile + announce SND_SOC_INTEL_CATPT - undocumented reject_firmware sound/soc/intel/catpt/loader.c clean_blob sound/soc/intel/catpt/loader.c @@ -3685,6 +3810,12 @@ clean_blob sound/soc/codecs/rt5514.h clean_kconfig sound/soc/codecs/Kconfig SND_SOC_RT5514 clean_mk CONFIG_SND_SOC_RT5514 sound/soc/codecs/Makefile +announce SND_SOC_TAS5805M - "Texas Instruments TAS5805M speaker amplifier" +reject_firmware sound/soc/codecs/tas5805m.c +clean_blob sound/soc/codecs/tas5805m.c +clean_kconfig sound/soc/codecs/Kconfig SND_SOC_TAS5805M +clean_mk CONFIG_SND_SOC_TAS5805M sound/soc/codecs/Makefile + announce SND_SOC_WM0010 - "WM0010 DSP driver" reject_firmware sound/soc/codecs/wm0010.c clean_blob sound/soc/codecs/wm0010.c @@ -3747,6 +3878,12 @@ clean_mk CONFIG_SND_SOC_SH4_SIU sound/soc/sh/Makefile # clean_kconfig sound/soc/sof/intel/Kconfig SND_SOC_SOF_HDA_COMMON # clean_mk CONFIG_SND_SOC_SOF_HDA_COMMON sound/soc/sof/intel/Makefile +announce SND_SOC_QDSP6_APM - "SoC ALSA audio driver for QDSP6 (APM)" +reject_firmware sound/soc/qcom/qdsp6/topology.c +clean_blob sound/soc/qcom/qdsp6/topology.c +clean_kconfig sound/soc/qcom/Kconfig SND_SOC_QDSP6_APM +clean_mk CONFIG_SND_SOC_QDSP6_APM sound/soc/qcom/qdsp6/Makefile + announce SND_USB_6FIRE - "TerraTec DMX 6Fire USB" reject_firmware sound/usb/6fire/firmware.c clean_blob sound/usb/6fire/firmware.c @@ -3785,14 +3922,14 @@ clean_kconfig drivers/i2c/Kconfig I2C_SLAVE_EEPROM clean_mk CONFIG_I2C_SLAVE_EEPROM drivers/i2c/Makefile announce MHI_BUS - "Modem Host Interface (MHI) bus" -reject_firmware drivers/bus/mhi/core/boot.c -clean_kconfig drivers/bus/mhi/Kconfig MHI_BUS -clean_mk CONFIG_MHI_BUS drivers/bus/mhi/core/Makefile +reject_firmware drivers/bus/mhi/host/boot.c +clean_kconfig drivers/bus/mhi/host/Kconfig MHI_BUS +clean_mk CONFIG_MHI_BUS drivers/bus/mhi/host/Makefile announce MHI_BUS_PCI_GENERIC - "MHI PCI controller driver" -clean_blob drivers/bus/mhi/pci_generic.c -clean_kconfig drivers/bus/mhi/Kconfig MHI_BUS_PCI_GENERIC -clean_mk CONFIG_MHI_BUS_PCI_GENERIC drivers/bus/mhi/Makefile +clean_blob drivers/bus/mhi/host/pci_generic.c +clean_kconfig drivers/bus/mhi/host/Kconfig MHI_BUS_PCI_GENERIC +clean_mk CONFIG_MHI_BUS_PCI_GENERIC drivers/bus/mhi/host/Makefile # Greybus @@ -3819,18 +3956,32 @@ announce ARCH_QCOM - "Qualcomm Support" clean_blob arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts clean_blob arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi clean_blob arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi +clean_blob arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi clean_blob arch/arm64/boot/dts/qcom/sdm845-db845c.dts clean_blob arch/arm64/boot/dts/qcom/sdm845-mtp.dts +clean_blob arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts clean_blob arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts clean_blob arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts +clean_blob arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts clean_blob arch/arm64/boot/dts/qcom/sm8150-hdk.dts +clean_blob arch/arm64/boot/dts/qcom/sm8150-microsoft-surface-duo.dts clean_blob arch/arm64/boot/dts/qcom/sm8150-mtp.dts -clean_blob Documentation/devicetree/bindings/display/msm/gpu.txt +clean_blob Documentation/devicetree/bindings/display/msm/gpu.yaml clean_blob arch/arm64/boot/dts/qcom/sm8250-mtp.dts clean_blob arch/arm64/boot/dts/qcom/qrb5165-rb5.dts clean_blob arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi clean_blob arch/arm64/boot/dts/qcom/sm8350-hdk.dts clean_blob arch/arm64/boot/dts/qcom/sm8350-mtp.dts +clean_blob arch/arm64/boot/dts/qcom/apq8016-sbc.dts +clean_blob arch/arm64/boot/dts/qcom/apq8096-db820c.dts +clean_blob arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts +clean_blob arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts +clean_blob arch/arm64/boot/dts/qcom/sa8155p-adp.dts +clean_blob arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts +clean_blob arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts +clean_blob arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi +clean_blob arch/arm64/boot/dts/qcom/sm8450-hdk.dts +clean_blob arch/arm64/boot/dts/qcom/sm8450-qrd.dts clean_kconfig arch/arm/mach-qcom/Kconfig ARCH_QCOM clean_mk CONFIG_ARCH_QCOM arch/arm64/boot/dts/qcom/Makefile @@ -3854,7 +4005,7 @@ clean_kconfig drivers/soc/ti/Kconfig KEYSTONE_NAVIGATOR_QMSS clean_mk CONFIG_KEYSTONE_NAVIGATOR_QMSS drivers/soc/ti/Makefile announce BRCMSTB_DPFE - "Broadcom STM DPFE driver" -reject_firmware_nowarn drivers/memory/brcmstb_dpfe.c +reject_firmware drivers/memory/brcmstb_dpfe.c clean_blob drivers/memory/brcmstb_dpfe.c clean_kconfig drivers/memory/Kconfig BRCMSTB_DPFE clean_mk CONFIG_BRCMSTB_DPFE drivers/memory/Makefile @@ -3866,6 +4017,15 @@ clean_blob arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi clean_kconfig arch/arm/mach-mediatek/Kconfig ARCH_MEDIATEK clean_mk CONFIG_ARCH_MEDIATEK arch/arm64/boot/dts/mediatek/Makefile +announce INTEL_IFS - "Intel In Field Scan" +# The .scan file loaded here contains CPU tests. It's not clear +# whether it's code or pure data, but I'm conservatively disabling it +# because it's most certainly proprietary. +reject_firmware drivers/platform/x86/intel/ifs/load.c +clean_blob drivers/platform/x86/intel/ifs/load.c +clean_kconfig drivers/platform/x86/intel/ifs/Kconfig INTEL_IFS +clean_mk CONFIG_INTEL_IFS drivers/platform/x86/intel/ifs/Makefile + ################# # Documentation # ################# @@ -3878,6 +4038,15 @@ clean_sed s,usb8388,whatever,g drivers/base/firmware_loader/Kconfig 'removed blo if $errors; then echo errors above were ignored because of --force >&2 +else + echo cleaning up has completed successfully, without verification >&2 + # Verification is largely manual, comparing the changes with + # those of a previous known (presumed) good version, e.g. + # git merge the previous known good version onto the current base + # version, and then git diff with this cleaned-up version. + # Creating a tarball of this version, named linux-*.*.tar, + # and running deblob-check on it may also help catch cleaning-up + # errors: .../deblob-check --use-awk -B linux-*.*.tar. fi exit 0 diff --git a/helpers/DATA/linux-hwe-5.13/deblob-check b/helpers/DATA/linux-hwe-5.19/deblob-check similarity index 94% rename from helpers/DATA/linux-hwe-5.13/deblob-check rename to helpers/DATA/linux-hwe-5.19/deblob-check index ada1162..7e863ee 100644 --- a/helpers/DATA/linux-hwe-5.13/deblob-check +++ b/helpers/DATA/linux-hwe-5.19/deblob-check @@ -1,13 +1,15 @@ #! /bin/sh -# deblob-check version 2021-08-29 +# deblob-check version 2022-07-10 r18820 +# modified with 2022-08-25 r18881 +# modified with 2022-09-11 r18905 # Inspired in gNewSense's find-firmware script. # Written by Alexandre Oliva # Check http://www.fsfla.org/svn/fsfla/software/linux-libre for newer # versions. -# Copyright 2008-2021 Alexandre Oliva +# Copyright 2008-2022 Alexandre Oliva # # This program is part of GNU Linux-libre, a GNU project that # publishes scripts to clean up Linux so as to make it suitable for @@ -1266,7 +1268,7 @@ set_except () { blobname 'dabusb[/]\(firmware\.fw\|bitstream\.bin\)' drivers/media/video/dabusb.c - blob 'static[ ]u32[ ]tigon2\?Fw\(Text\|Rodata\|Data\)\[[(]MAX_\(TEXT\|RODATA\|DATA\)_LEN[/]4[)][ ][+][ ]1\][ ]__\(dev\)\?initdata[ ]=[ ][{][^}]*[}][;]\([\n]static[ ]u32[ ]tigon2\?Fw\(Text\|Rodata\|Data\)\[[(]MAX_\(TEXT\|RODATA\|DATA\)_LEN[/]4[)][ ][+][ ]1\][ ]__\(dev\)\?initdata[ ]=[ ][{][^}]*[}][;]\)*' drivers/net/acenic_firwmare.h + blob 'static[ ]u32[ ]tigon2\?Fw\(Text\|Rodata\|Data\)\[[(]MAX_\(TEXT\|RODATA\|DATA\)_LEN[/]4[)][ ][+][ ]1\][ ]__\(dev\)\?initdata[ ]=[ ][{][^}]*[}][;]\([\n]static[ ]u32[ ]tigon2\?Fw\(Text\|Rodata\|Data\)\[[(]MAX_\(TEXT\|RODATA\|DATA\)_LEN[/]4[)][ ][+][ ]1\][ ]__\(dev\)\?initdata[ ]=[ ][{][^}]*[}][;]\)*' drivers/net/acenic_firmware.h blob '#define[ ]tigon2\?Fw[^ ]*\(Addr\|Len\)[ ]0x[^\n]*\([\n]#define[ ]tigon2\?Fw[^ ]*\(Addr\|Len\)[ ]0x[^\n]*\)\+' drivers/net/acenic_firmware.h blob '\([/][*][^*]*\([*]\+[^/*][^*]*\)*[*]*Do[ ]not[ ]try[ ]to[ ]clear[^*]*\([*]\+[^/*][^*]*\)*[*]\+[/][\n][ ]\)\?ace_clear[^;]*[;][\n]\([^}]*[{][^}]*ace_copy[^}]*tigon2\?Fw[^}]*[}]\)*[\n]\+[ ]return[ ]0[;][\n][}]' drivers/net/acenic.c blob 'if[ ][(]\(ACE_IS_TIGON_I[(]ap[)]\|ap->version[ ]==[ ]2\)[)][\n][ ][ ]writel[(]tigon2\?FwStartAddr,[ ][&]regs->Pc[)][;]\([\n][ ]if[ ][(]\(ACE_IS_TIGON_I[(]ap[)]\|ap->version[ ]==[ ]2\)[)][\n][ ][ ]writel[(]tigon2\?FwStartAddr,[ ][&]regs->Pc[)][;]\)*' drivers/net/acenic.c @@ -1419,7 +1421,7 @@ set_except () { # This driver enables the user to update the non-Free BIOS, but it # only issues a firmware request if specifically told to. It - # doesn't require any non-Free firwmare to function, and it + # doesn't require any non-Free firmware to function, and it # doesn't actually recommend users to perform updates, so I'm # leaving it in. accept '[ ][ ][ ]req_firm_rc[ ]=[ ]request_firmware_nowait[(][^;]*,[ ]["]dell_rbu["],' drivers/firmware/dell_rbu.c @@ -1553,7 +1555,7 @@ set_except () { blobname '930-fpga\.bin' drivers/usb/atm/ueagle-atm.c blobname 'CMV[x9ae][yip]\.bin\(\.v2\)\?' drivers/usb/atm/ueagle-atm.c - blobname 'isight\.fw' drivers/usb/misc/isight_firwmare.c + blobname 'isight\.fw' drivers/usb/misc/isight_firmware.c blobname '\(i1480-\(pre-phy\|usb\|phy\)\|ptc\)-0\.0\.bin' drivers/uwb/i1480/dfu/usb.c @@ -1663,7 +1665,7 @@ set_except () { blobna 'The[ ]hcwamc\.rbf[ ]firmware[ ]file[^*]*\([*]\+[^/*][^*]*\)*[*]\+[/]' drivers/media/video/bt8xx/bttv-cards.c blobname 'v4l-cx23418-dig\.fw' drivers/media/video/cx18/cx18-av-firmware.c - blobname 'v4l-cx23418-[ac]pu\.fw' drivers/media/video/cx18/cx18-firwmare.c + blobname 'v4l-cx23418-[ac]pu\.fw' drivers/media/video/cx18/cx18-firmware.c blobname 'v4l-cx23885-enc\.fw' 'drivers/media/video/cx23\(1xx\|885\)/cx23885-417.c' @@ -1671,7 +1673,7 @@ set_except () { blobname 'v4l-cx2341x-\(enc\|dec\)\.fw' include/media/cr2341x.h - blobname 'v4l-cx2341x-init\.mpg' drivers/media/video/ivtv/ivtv-firwmare.c + blobname 'v4l-cx2341x-init\.mpg' drivers/media/video/ivtv/ivtv-firmware.c blobname 'v4l-pvrusb2-\(2[49]\|73\)xxx-01\.fw' drivers/media/video/pvrusb2/pvrusb2-devattr.c @@ -2281,7 +2283,8 @@ set_except () { defsnc 'static[ ]\(u16\|struct[ ]i2c_reg_u16\)[ ]\(bridge\|mt9\(v\(11[12]\|011\)\|m001\)\)_init\[\]\(\[2\]\)\?[ ]=' drivers/media/video/gspca/sn9c20x.c defsnc 'static[ ]\(u8\|struct[ ]i2c_reg_u8\)[ ]\(soi968\|ov\(76[67]0\|965[05]\)\|hv7131r\)_init\[\]\(\[2\]\)\?[ ]=' drivers/media/video/gspca/sn9c20x.c defsnc 'static[ ]struct[ ]nand_ecclayout[ ]onenand_oob_128[ ]=' drivers/mtd/onenand/onenand_base.c - blob '#define[ ]BCM_5710_FW_\(\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\|COMPILE_FLAGS\)[ ]*[0-9]\+\([\n]#define[ ]BCM_5710_FW_\(\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\|COMPILE_FLAGS\)[ ]*[0-9]\+\)*' 'drivers/net/\(bnx2x[/]\)\?bnx2x_hsi\.h' + # Moved down to avoid shorter earlier match. + # blob '#define[ ]BCM_5710_FW_\(\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\|COMPILE_FLAGS\)[ ]*[0-9]\+\([\n]#define[ ]BCM_5710_FW_\(\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\|COMPILE_FLAGS\)[ ]*[0-9]\+\)*' 'drivers/net/\(bnx2x[/]\)\?bnx2x_hsi\.h' blob 'static[ ]int[ ]\(__devinit[ ]\)\?bnx2x_check_firmware[(]struct[ ]bnx2x[ ][*]bp[)][\n][{][^\n]*\([\n]\+[^\n}][^\n]*\)*[\n]\+[}]' 'drivers/net/\(bnx2x[/]\)\?bnx2x_main\.c' blobna 'if[ ][(][(]fw_ver\[[0-3]\][ ]!=[ ]BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION[)]\([ ][|][|][\n][ ]*[(]fw_ver\[[0-3]\][ ]!=[ ]BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION[)]\)*[)][ ][{][^{}]*[}]' 'drivers/net/\(bnx2x[/]\)\?bnx2x_main\.c' blobna 'sprintf[(]fw_file_name[ ][+][ ]offset,[ ]["]%d[.]%d[.]%d[.]%d[.]fw["]\(,[\n][ ]*BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\)*[)][;]' 'drivers/net/\(bnx2x[/]\)\?bnx2x_main\.c' @@ -2411,7 +2414,8 @@ set_except () { blob '#define[ ]_FW_NAME[(]api[)][ ]DRV_NAME[ ]["][.]["][ ]#api[ ]["]\.fw["]' drivers/media/video/iwmc3200top.h blob '#define[ ]FW_FILE_VERSION\([ ]*[\\][\n][ ]__stringify[(]BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION[)]\([ ]["][.]["]\)\?\)\+' 'drivers/net/\(bnx2x/\)\?bnx2x_main\.c' blobname '\(bnx2x[/]\)\?bnx2x-e[12]h\?-["][ ]FW_FILE_VERSION[ ]["]\.fw' 'drivers/net/\(bnx2x/\)\?bnx2x_main\.c' - blobname '\(bnx2x[/]\)\?bnx2x-e[12]h\?-\([0-9.%d]*\.fw\)\?' 'drivers/net/\(bnx2x/\)\?bnx2x_main\.c' + # Moved down to avoid shorter earlier match. + # blobname '\(bnx2x[/]\)\?bnx2x-e[12]h\?-\([0-9.%d]*\.fw\)\?' 'drivers/net/\(bnx2x/\)\?bnx2x_main\.c' blob '#define[ ]FW_VERSION\([ ]__stringify[(]FW_VERSION_\(MAJOR\|MINOR\|MICRO\)[)]\([ ]["][.]["]\)\?\([ ]*[\\][\n]\)\?\)\+' drivers/net/cxgb3/cxgb3_main.c blobname 'cxgb3[/]t3fw-["][ ]FW_VERSION[ ]["]\.bin' drivers/net/cxgb3/cxgb3_main.c blob '#define[ ]TPSRAM_VERSION\([ ]__stringify[(]TP_VERSION_\(MAJOR\|MINOR\|MICRO\)[)]\([ ]["][.]["]\)\?\([ ]*[\\][\n]\)\?\)\+' drivers/net/cxgb3/cxgb3_main.c @@ -3928,7 +3932,7 @@ set_except () { accept '[\t]rc[ ]=[ ]mwl8k_request_firmware[(]' drivers/net/wireless/mwl8k.c accept 'static[ ]int[ ]p54spi_request_firmware[(]' drivers/net/wireless/p54/p54spi.c accept '[\t]ret[ ]=[ ]p54spi_request_firmware[(]' drivers/net/wireless/p54/p54spi.c - accept 'static[ ]int[ ]rt2x00lib_request_firmware[(]' drivers/net/wireless/rt2x00/rt2x00firwmare.c + accept 'static[ ]int[ ]rt2x00lib_request_firmware[(]' drivers/net/wireless/rt2x00/rt2x00firmware.c accept '[\t][\t]retval[ ]=[ ]rt2x00lib_request_firmware[(]' drivers/net/wireless/rt2x00/rt2x00firmware.c accept '[\t][\t]*wl1271_error[(]["]request_firmware_nowait[ ]failed' drivers/net/wireless/ti/wlcore/main.c accept '[\t][\t]nfc_err[(][&]drv->pdev->dev[,][ ]["]request_firmware[ ]failed' drivers/nfc/nfcwilink.c @@ -5269,7 +5273,7 @@ set_except () { blobname 'intel[/]ipu3-fw\.bin' drivers/staging/media/ipu3/ipu3-css-fw.h blobname 'intel[/]dsp_fw_icl\.bin' sound/soc/intel/common/soc-acpi-intel-icl-match.c # SOF stands for Sound Open Firmware, and it is Free Software. - # blobname 'sof-icl\(\.ri\|-rt274\.tplg\)' sound/soc/intel/common/soc-acpi-intel-icl-match.c + # blobname '\(sof\|reef\)-icl\(\.ri\|-rt274\.tplg\)' sound/soc/intel/common/soc-acpi-intel-icl-match.c blobname 'iwl-dbg-tlv\.ini' drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c accept '\(static[ ]int[ ]\|[\t]*\)brcmf_fw_request_firmware[(]' drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c blobna 'snprintf[(]version[,][ ]ETHTOOL_FWVERS_LEN[,][ ]["][ ]storm[ ]%d\.%d\.%d\.%d["]\([,][ \t\n]*BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\)\+[)]' drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c @@ -5278,14 +5282,14 @@ set_except () { # macros will be caught and dropped by other much earlier patterns. blobname '[ ]storm[ ]%d\.%d\.%d\.%d' drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c # These are probably older, we did not check for .ri and .tplg before. - # blobname 'intel[/]sof-apl\(\.ri\|-\(rt298\|da7219\|pcm512x\|wm8804\|tdf8532\)\.tplg\)' sound/soc/intel/common/soc-acpi-intel-bxt-match.c - # blobname 'intel[/]sof-byt\(\.ri\|-\(rt5670\|rt5640\|rt5651\|da7213\|rt5645\|max98090\)\.tplg\)' sound/soc/intel/common/soc-acpi-intel-byt-match.c - # blobname 'intel[/]sof-cht\(\.ri\|-\(rt5645\|rt5670\|max98090\|nau8824\|da7213\|es8316\|rt5640\|rt5651\)\.tplg\)' sound/soc/intel/common/soc-acpi-intel-cht-match.c - # blobname 'intel[/]sof-cnl\(\.ri\|-rt274\.tplg\)' sound/soc/intel/common/soc-acpi-intel-cnl-match.c - # blobname 'intel[/]sof-glk\(\.ri\|-\(alc298\|da7219\)\.tplg\)' sound/soc/intel/common/soc-acpi-intel-glk-match.c - # blobname 'intel[/]sof-hda-generic\.tplg' sound/soc/intel/common/soc-acpi-intel-hda-match.c - # blobname 'intel[/]sof-hsw\(\.ri\|\.tplg\)' sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c - # blobname 'intel[/]sof-bdw\(\.ri\|-\(rt286\|rt5677\|rt5640\)\.tplg\)' sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c + # blobname 'intel[/]\(sof\|reef\)-apl\(\.ri\|-\(rt298\|da7219\|pcm512x\|wm8804\|tdf8532\)\.tplg\)' sound/soc/intel/common/soc-acpi-intel-bxt-match.c + # blobname 'intel[/]\(sof\|reef\)-byt\(\.ri\|-\(rt5670\|rt5640\|rt5651\|da7213\|rt5645\|max98090\)\.tplg\)' sound/soc/intel/common/soc-acpi-intel-byt-match.c + # blobname 'intel[/]\(sof\|reef\)-cht\(\.ri\|-\(rt5645\|rt5670\|max98090\|nau8824\|da7213\|es8316\|rt5640\|rt5651\)\.tplg\)' sound/soc/intel/common/soc-acpi-intel-cht-match.c + # blobname 'intel[/]\(sof\|reef\)-cnl\(\.ri\|-rt274\.tplg\)' sound/soc/intel/common/soc-acpi-intel-cnl-match.c + # blobname 'intel[/]\(sof\|reef\)-glk\(\.ri\|-\(alc298\|da7219\)\.tplg\)' sound/soc/intel/common/soc-acpi-intel-glk-match.c + # blobname 'intel[/]\(sof\|reef\)-hda-generic\.tplg' sound/soc/intel/common/soc-acpi-intel-hda-match.c + # blobname 'intel[/]\(sof\|reef\)-hsw\(\.ri\|\.tplg\)' sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c + # blobname 'intel[/]\(sof\|reef\)-bdw\(\.ri\|-\(rt286\|rt5677\|rt5640\)\.tplg\)' sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c accept '[\t][\t]pr_err[(]["]%s:[ ]request_firmware[ ]error' drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c # New in 5.0.7. @@ -5326,15 +5330,15 @@ set_except () { blobname 'gsl3676-chuwi-hi8-air\.fw' drivers/platform/x86/touchscreen_dmi.c blobname 'gsl1680-chuwi-hi10-air\.fw' drivers/platform/x86/touchscreen_dmi.c blobname 'gsl3692-pov-mobii-wintab-p1006w-v10\.fw' drivers/platform/x86/touchscreen_dmi.c - # blobname 'sof-apl\(\.ri\|-\(rt298\|da7219\|pcm512x\|wm8804\|tdf8532\)\.tplg\)' sound/soc/intel/common/soc-acpi-intel-bxt-match.c - # blobname 'sof-byt\(\.ri\|-\(rt5670\|rt5640\|rt5651\|da7213\|es8316\|rt5645\|max98090\)\.tplg\)' sound/soc/intel/common/soc-acpi-intel-byt-match.c - # blobname 'sof-cht\(\.ri\|-\(rt5645\|rt5670\|rt5645\|max98090\|nau8824\|da7213\|es8316\|rt5640\|rt5651\)\.tplg\)' sound/soc/intel/common/soc-acpi-intel-cht-match.c - # blobname 'sof-cnl\(\.ri\|-rt274\.tplg\)' sound/soc/intel/common/soc-acpi-intel-cnl-match.c - # blobname 'sof-glk\(\.ri\|-\(alc298\|da7219\)\.tplg\)' sound/soc/intel/common/soc-acpi-intel-glk-match.c - # blobname 'sof-hda-generic\.tplg' sound/soc/intel/common/soc-acpi-intel-hda-match.c - # blobname 'sof-hsw\(\.ri\|\.tplg\)' sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c - # blobname 'sof-bdw\(\.ri\|-\(rt286\|rt5677\|rt5640\)\.tplg\)' sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c - # blobname 'sof-icl\(\.ri\|-rt274\.tplg\)' sound/soc/intel/common/soc-acpi-intel-icl-match.c + # blobname '\(sof\|reef\)-apl\(\.ri\|-\(rt298\|da7219\|pcm512x\|wm8804\|tdf8532\)\.tplg\)' sound/soc/intel/common/soc-acpi-intel-bxt-match.c + # blobname '\(sof\|reef\)-byt\(\.ri\|-\(rt5670\|rt5640\|rt5651\|da7213\|es8316\|rt5645\|max98090\)\.tplg\)' sound/soc/intel/common/soc-acpi-intel-byt-match.c + # blobname '\(sof\|reef\)-cht\(\.ri\|-\(rt5645\|rt5670\|rt5645\|max98090\|nau8824\|da7213\|es8316\|rt5640\|rt5651\)\.tplg\)' sound/soc/intel/common/soc-acpi-intel-cht-match.c + # blobname '\(sof\|reef\)-cnl\(\.ri\|-rt274\.tplg\)' sound/soc/intel/common/soc-acpi-intel-cnl-match.c + # blobname '\(sof\|reef\)-glk\(\.ri\|-\(alc298\|da7219\)\.tplg\)' sound/soc/intel/common/soc-acpi-intel-glk-match.c + # blobname '\(sof\|reef\)-hda-generic\.tplg' sound/soc/intel/common/soc-acpi-intel-hda-match.c + # blobname '\(sof\|reef\)-hsw\(\.ri\|\.tplg\)' sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c + # blobname '\(sof\|reef\)-bdw\(\.ri\|-\(rt286\|rt5677\|rt5640\)\.tplg\)' sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c + # blobname '\(sof\|reef\)-icl\(\.ri\|-rt274\.tplg\)' sound/soc/intel/common/soc-acpi-intel-icl-match.c blobna '[/][*][ ]brcmfmac4366c-pcie\.\(ap\.\)\?bin[ ]from[ ]linux-firmware\.git[ ]commit[ ][0-9a-f]*[ ][*][/]' drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c blobname 'iwlwifi-[^ ]*-[ab]0-' drivers/net/wireless/intel/iwlwifi/cfg/22000.c blobname 'iwlwifi-\(\(QuZ-a0-hr\|QuQnj-b0-jf\|so-a0-\(jf\|hr\)\)-b0\|\(cc\|\(so\|ty\)-a0-gf\)-a0\)-' drivers/net/wireless/intel/iwlwifi/cfg/22000.c @@ -5390,21 +5394,21 @@ set_except () { blobname 'ccg_\(boot\|primary\|secondary\)\.cyacd' drivers/usb/typec/ucsi/ucsi_ccg.c defsnc 'static[ ]const[ ]struct[ ]utf8data[ ]utf8nfdi\(cf\|\)data\[\][ ]=' fs/unicode/utf8data.h_shipped defsc 'static[ ]const[ ]unsigned[ ]char[ ]utf8data\[64256\][ ]=' fs/unicode/utf8data.h_shipped - accept '[\t]*\.sof_fw_filename[ ]=[ ]["]\(intel[/]\)\?sof-[^" ;]*\.ri["]' sound/soc/intel/common/soc-acpi-intel-'\(b[xy]t\|cht\|cnl\|icl\|glk\|hda\|hsw-bdw\|kbl\|skl\)-match\.c' - accept '[\t]*\.sof_tplg_filename[ ]=[ ]["]\(intel[/]\)\?sof-[^" ;]*\.tplg["]' sound/soc/intel/common/soc-acpi-intel-'\(b[xy]t\|cht\|cnl\|icl\|glk\|hda\|hsw-bdw\|kbl\|skl\)-match\.c' + accept '[\t]*\.sof_fw_filename[ ]=[ ]["]\(intel[/]\)\?\(sof\|reef\)-[^" ;]*\.ri["]' sound/soc/intel/common/soc-acpi-intel-'\(b[xy]t\|cht\|cnl\|icl\|glk\|hda\|hsw-bdw\|kbl\|skl\)-match\.c' + accept '[\t]*\.sof_tplg_filename[ ]=[ ]["]\(intel[/]\)\?\(sof\|reef\)-[^" ;]*\.tplg["]' sound/soc/intel/common/soc-acpi-intel-'\(b[xy]t\|cht\|cnl\|icl\|glk\|hda\|hsw-bdw\|kbl\|skl\)-match\.c' accept '[\t]*tplg_filename[ ]=[ ]devm_kasprintf[(]sdev->dev[,][ ]GFP_KERNEL[,][\n\t ]*["]%s-idisp\.tplg["][,][ ]split_ext[)]' sound/soc/sof/intel/hda.c accept '[\t]ret[ ]=[ ]request_firmware[(][&]plat_data->fw[,][ ]fw_filename[,][ ]sdev->dev[)]' sound/soc/sof/loader.c - accept '[\t]*\.\(nocodec\|sof\)_fw_filename[ ]=[ ]["]sof-[^" ;]*\.ri["]' sound/soc/sof/sof-'\(acpi\|pci\)-dev\.c' - accept '[\t]*\.\(nocodec\|sof\)_tplg_filename[ ]=[ ]["]sof-[^" ;]*\.tplg["]' sound/soc/sof/sof-'\(acpi\|pci\)-dev\.c' + accept '[\t]*\.\(nocodec\|sof\)_fw_filename[ ]=[ ]["]\(sof\|reef\)-[^" ;]*\.ri["]' sound/soc/sof/'\(sof\|reef\)-\(acpi\|pci\)-dev\.c' + accept '[\t]*\.\(nocodec\|sof\)_tplg_filename[ ]=[ ]["]\(sof\|reef\)-[^" ;]*\.tplg["]' sound/soc/sof/'\(sof\|reef\)-\(acpi\|pci\)-dev\.c' accept '[\t]ret[ ]=[ ]request_firmware[(][&]fw[,][ ]file[,][ ]sdev->dev[)]' sound/soc/sof/topology.c - # blobname 'sof-byt-rt5682\.tplg' sound/soc/intel/common/soc-acpi-intel-byt-match.c - # blobname 'sof-cht-rt5682\.tplg' sound/soc/intel/common/soc-acpi-intel-cht-match.c - # blobname 'sof-cml-rt5682\(-max98357a\)\?\.tplg' sound/soc/intel/common/soc-acpi-intel-cnl-match.c - # blobname 'sof-glk-rt5682\.tplg' sound/soc/intel/common/soc-acpi-intel-glk-match.c - # blobname 'sof-icl-rt5682\.tplg' sound/soc/intel/common/soc-acpi-intel-icl-match.c + # blobname '\(sof\|reef\)-byt-rt5682\.tplg' sound/soc/intel/common/soc-acpi-intel-byt-match.c + # blobname '\(sof\|reef\)-cht-rt5682\.tplg' sound/soc/intel/common/soc-acpi-intel-cht-match.c + # blobname '\(sof\|reef\)-cml-rt5682\(-max98357a\)\?\.tplg' sound/soc/intel/common/soc-acpi-intel-cnl-match.c + # blobname '\(sof\|reef\)-glk-rt5682\.tplg' sound/soc/intel/common/soc-acpi-intel-glk-match.c + # blobname '\(sof\|reef\)-icl-rt5682\.tplg' sound/soc/intel/common/soc-acpi-intel-icl-match.c # blobname '%s-idisp\.tplg' sound/soc/sof/intel/hda.c - # blobname 'sof-\(hsw\|bdw\|byt\|cht\)\(\.ri\|\(-nocodec\)\?\.tplg\)' sound/soc/sof/sof-acpi-dev.c - # blobname 'sof-\(apl\|glk\|cnl\|icl\|skl\|kbl\)\(\.ri\|\(-nocodec\)\?\.tplg\)' sound/soc/sof/sof-pci-dev.c + # blobname '\(sof\|reef\)-\(hsw\|bdw\|byt\|cht\)\(\.ri\|\(-nocodec\)\?\.tplg\)' sound/soc/sof/'\(sof\|reef\)-acpi-dev\.c' + # blobname '\(sof\|reef\)-\(apl\|glk\|cnl\|icl\|skl\|kbl\)\(\.ri\|\(-nocodec\)\?\.tplg\)' sound/soc/sof/'\(sof\|reef\)-pci-dev\.c' # New in 5.2.1, 5.1.18, and 4.19.58. accept '[ ][ ][ ]the[ ]latest[ ]updated[ ]microcode\.' Documentation/admin-guide/hw-vuln/spectre.rst @@ -5791,7 +5795,7 @@ set_except () { defsnc 'static[ ]const[ ]short[ ]\(attack\|decay\)_time_tbl\[128\][ ]=' sound/synth/emux/soundfont.c defsnc 'static[ ]const[ ]unsigned[ ]char[ ]bcd2000_init_sequence\[\][ ]=' sound/usb/bcd2000/bcd2000.c defsc 'static[ ]const[ ]struct[ ]s_c2[ ]SetRate48000\[\][ ]=' sound/usb/usx2y/usbusx2yaudio.c - accept '[\t]*\.default_fw_filename[ ]=[ ]["]sof-[^" ;]*\.ri["]' sound/soc/sof/sof-'\(acpi\|pci\)-dev\.c' + accept '[\t]*\.default_fw_filename[ ]=[ ]["]\(sof\|reef\)-[^" ;]*\.ri["]' sound/soc/sof/'\(sof\|reef\)-\(acpi\|pci\)-dev\.c' accept '[\t]*tplg_filename[ ]=[ ]devm_kasprintf[(]sdev->dev[,][ ]GFP_KERNEL[,][\n][\t ]*["]%s-%s\.tplg["][,]' sound/soc/sof/intel/byt.c accept '[\t]*dev_dbg[(]sdev->dev[,][ ]["]request_firmware[ ]%s[ ]successful' sound/soc/sof/loader.c accept '[\t]ret[ ]=[ ]request_firmware[(][&]fw[,][ ]file[,][ ]scomp->dev[)]' sound/soc/sof/topology.c @@ -5879,7 +5883,7 @@ set_except () { blobname 'microchip[/]mscc_vsc8574_revb_int8051_29e8.bin' drivers/net/phy/mscc/mscc.h # This driver enables the user to update the non-Free BIOS, but it # only issues a firmware request if specifically told to. It - # doesn't require any non-Free firwmare to function, and it + # doesn't require any non-Free firmware to function, and it # doesn't actually recommend users to perform updates, so I'm # leaving it in. accept '[\t]*pr_err[(]["]request_firmware_nowait[ ]failed' drivers/platform/x86/dell_rbu.c @@ -6017,7 +6021,7 @@ set_except () { defsc 'static[ ]struct[ ]font_data[ ]fontdata_ter16x32[ ]=' lib/fonts/font_ter16x32.c # New in 5.9.2 and 5.8.17. - accept '[\t][\t]\.driver_data[ ]=[ ]["]sof-[^" ;]*\.tplg["]' sound/soc/sof/sof-pci-dev.c + accept '[\t][\t]\.driver_data[ ]=[ ]["]\(sof\|reef\)-[^" ;]*\.tplg["]' sound/soc/sof/'\(sof\|reef\)-pci-dev\.c' # New in 5.9.7 and 5.4.76. defsc 'static[ ]const[ ]struct[ ]font_data[ ]fontdata_ter16x32[ ]=' lib/fonts/font_ter16x32.c @@ -6090,7 +6094,8 @@ set_except () { blobname 'rtl_bt[/]rtl8852au_fw\.bin' drivers/bluetooth/btrtl.c blobname 'qca[/]nvm_usb_%08x_%04x\.bin' drivers/bluetooth/btusb.c blobname 'amdgpu[/]%s_toc\.bin' drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c - blobname 'amdgpu[/]%s' drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c + # Moved down, after %s_cap and %s.bin under 5.18-rc. + # blobname 'amdgpu[/]%s' drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c blobname 'amdgpu[/]vangogh_vcn\.bin' drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c blobname 'amdgpu[/]dimgrey_cavefish_vcn\.bin' drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c blobname 'amdgpu[/]vangogh_dmcub\.bin' drivers/gpu/drm/amd/amdgpu/amdgpu_dm.c @@ -6164,11 +6169,6 @@ set_except () { # New in 5.12.9, 5.10.42. blobname '\(silead[/]\)\?gsl1680-chuwi-hi10-pro\.fw' drivers/platform/x86/touchscreen_dmi.c - # Added by Trisquel for nabia - blobname '\(silead[/]\)\?gsl1680-chuwi-hibook\.fw' drivers/platform/x86/touchscreen_dmi.c - blobna '[/][*][ ]linux-firmware\.git[ ]hash[ ][0-9a-f]*[ ][*][/]' drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c - blobname 'mediatek[/]WIFI_RAM_CODE_MT7922_1\.bin' drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h - blobname 'mediatek[/]WIFI_MT7922_patch_mcu_1_1_hdr\.bin' drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h # New in 5.13-rc. # Sources are in cwsr_trap_handler_gfx9.asm. @@ -6284,7 +6284,327 @@ set_except () { # Present in 4.9, links to Free Software. accept 'ARM[ ]assembly[ ]source[ ]code[ ]available[ ]at[ ]https[:][/][/]linuxtv\.org[/]downloads[/]firmware[/]Boot\.S' firmware/WHENCE + # New in 5.14.11, 5.10.72. + blobname '\(silead[/]\)\?gsl1680-chuwi-hi\(10plus\|book\)\.fw' drivers/platform/x86/touchscreen_dmi.c + # New in 5.15-rc. + blobname 'achc\.bin' 'Documentation/ABI/testing/sysfs-driver-ge-achc\|drivers/misc/gehc-achc\.c' + blobname 'qcom[/]sdm845[/]oneplus6[/]ipa_fws\.mbn' arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi + defsnc 'static[ ]__amode31_data[ ]u32[ ]__ctl_duald_amode31\[32\][ ]__aligned[(]128[)][ ]=' arch/s390/kernel/setup.c + defsnc '[\t]umc_v6_7_channel_idx_tbl_\(second\|first\)\[UMC_V6_7_UMC_INSTANCE_NUM\]\[UMC_V6_7_CHANNEL_INSTANCE_NUM\][ ]=' drivers/gpu/drm/amd/amdgpu/umc_v6_7.c + defsnc 'static[ ]const[ ]struct[ ]reg_sequence[ ]ej030na_init_sequence\[\][ ]=' drivers/gpu/drm/panel/panel-innolux-ej030na.c + defsnc '[\t]static[ ]const[ ]int[ ]voltages\[\][ ]=' drivers/hid/hid-logitech-hidpp.c + defsnc 'static[ ]const[ ]struct[ ]imx335_reg[ ]mode_2592x1940_regs\[\][ ]=' drivers/media/i2c/imx335.c + defsnc 'static[ ]const[ ]struct[ ]imx412_reg[ ]mode_4056x3040_regs\[\][ ]=' drivers/media/i2c/imx412.c + defsnc 'static[ ]const[ ]struct[ ]ov9282_reg[ ]mode_1280x720_regs\[\][ ]=' drivers/media/i2c/ov9282.c + defsnc 'static[ ]const[ ]u8[ ]channel_all\[59\][ ]=' drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c + defsnc 'static[ ]const[ ]struct[ ]ab8500_v_to_cap[ ]cap_tbl\(_[ab]_thermistor\)\?\[\][ ]=' drivers/power/supply/ab8500_bmdata.c + blobname 'rtlwifi\([/]\|[\\][\\]\)rtl8188eufw\.bin' drivers/staging/r8188eu/hal/rtl8188e_hal_init.c + defsnc 'static[ ]char[ ]NEGOTIATE_GSS_HEADER\[AUTH_GSS_LENGTH\][ ]=' fs/ksmbd/auth.c + defsnc 'const[ ]u8[ ]s_default_security\[\][ ]__aligned[(]8[)][ ]=' fs/ntfs3/fsntfs.c + accept '[ ]*[*][ ][ ][ ]1[ ]0[ ]9[ ]8[ ]7[ ]6[ ]5[ ]4[ ]3[ ]2[ ]1[ ]0[ ]9[ ]8[ ]7[ ]6[ ]5[ ]4[ ]3[ ]2[ ]1[ ]0[ ]9[ ]8[ ]7[ ]6[ ]5[ ]4[ ]3[ ]2[ ]1[ ]0' fs/ntfs3/ntfs.h + defsnc 'static[ ]const[ ]u32[ ]__cacheline_aligned[ ]ck\[32\][ ]=' lib/crypto/sm4.c + defsnc 'static[ ]const[ ]u8[ ]__cacheline_aligned[ ]sbox\[256\][ ]=' lib/crypto/sm4.c + defsnc 'static[ ]const[ ]char[ ]large_mask\[\][ ]__initconst[ ]=' lib/test_bitmap.c + defsnc 'static[ ]const[ ]struct[ ]cs8409_i2c_param[ ]dolphin_c[01]_init_reg_seq\[\][ ]=' sound/pci/hda/patch_cs8409-tables.c + defsnc 'const[ ]__u8[ ]nci_rf_activate_ntf\[\][ ]=' tools/testing/selftests/nci/nci_dev.c + blobname 'brcmfmac43\(430b0\|752\)-sdio' drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c + # Catch other names likely to appear in BRCMF_FW*_DEF strings in these files. + blobna 'brcmfmac43[^";) \t\n]*\(-sdio\|-pcie\)\?' drivers/net/wireless/broadcom/brcm80211/brcmfmac/'\(sdio\|pcie\|usb\)\.c' + + # New in 5.15.3-gnu and 5.14.19-gnu. + blobna '[/][*][ ]linux-firmware\.git[ ]hash[ ][0-9a-f]*[ ][*][/]' drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c + + # New in 5.15.3-gnu. + defsnc 'static[ ]const[ ]u32[ ]____cacheline_aligned[ ]ck\[32\][ ]=' lib/crypto/sm4.c + defsnc 'static[ ]const[ ]u8[ ]____cacheline_aligned[ ]sbox\[256\][ ]=' lib/crypto/sm4.c + + # New in 5.16-rc. + blobname 'imx[/]dsp[/]hifi4\.bin' Documentation/devicetree/bindings/dsp/fsl,dsp.yaml + accept '[ ]*\[[ ]\(0x[1248]0*[ \n,]*\)*\]' Documentation/devicetree/bindings/leds/register-bit-led.yaml + accept '[ ]*\[0[,][ ]\(\(1[6789]\|2[012]\)[02468]0[, \n]*\)*\]' Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml + blobname 'qcom[/]apq8016[/]\(\(mba\|modem\|wcnss\)\.mbn\|WCNSS_qcom_wlan_nv_sbc\.bin\)' arch/arm64/boot/dts/qcom/apq8016-sbc.dts + blobname 'qcom[/]msm8996[/]gemini[/]\(adsp\|a530_zap\|venus\)\.mbn' arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts + blobname 'qcom[/]msm8996[/]scorpio[/]\(adsp\|a530_zap\|venus\)\.mbn' arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts + blobname 'qcom[/]sa8155p[/][ac]dsp\.mdt' arch/arm64/boot/dts/qcom/sa8155p-adp.dts + accept '[ ][*][ ]firmware_request_builtin\(_buf\)\?[(][)][ ]-[ ]load[ ]builtin[ ]firmware' drivers/base/firmware_loader/builtin/main.c + accept 'bool[ ]firmware_request_builtin[(]' drivers/base/firmware_loader/builtin/main.c + accept 'EXPORT_SYMBOL_NS_GPL[(]firmware_request_builtin[,]' drivers/base/firmware_loader/builtin/main.c + accept '[ ][*][\t]callers[ ]such[ ]as[ ]request_firmware_into_buf[(]' drivers/base/firmware_loader/builtin/main.c + accept '[ ][*][\t]request_partial_firmware_into_buf[(]' drivers/base/firmware_loader/builtin/main.c + accept 'bool[ ]firmware_request_builtin_buf[(][^)]*[)][\n][{][\n][\t]if[ ][(]!firmware_request_builtin[(]' drivers/base/firmware_loader/builtin/main.c + accept '\(static[ ]inline[ ]\)\?bool[ ]firmware_request_builtin_buf[(]' drivers/base/firmware_loader/firmware.h + accept '[\t]if[ ][(]firmware_request_builtin_buf[(][^)]*[)][)][ ][{][\n][\t][\t]dev_dbg[(]device[,][ ]["]using[ ]built-in[ ]' drivers/base/firmware_loader/main.c + accept '[\t]if[ ][(]firmware_request_builtin[(][^)]*[)][)][\n][\t][\t]return[ ]0[;][\n][\n][\t]fw_priv[ ]=[ ]lookup_fw_priv[(]' drivers/base/firmware_loader/main.c + accept '[\t]retval[ ]=[ ]firmware_request_builtin[(][&]xfw[,][ ]NONFREE_FIRMWARE[)]' include/linux/firmware.h + blobname 'amdgpu[/]ip_discovery\.bin' drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c + defsc 'static[ ]const[ ]u16[ ]amdgpu_unsupported_pciidlist\[\][ ]=' drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c + defsnc '[\t]mipi_dbi_command[(]dbi[,][ ]S6D27A1_PANELCTL[,]' drivers/gpu/drm/panel/panel-samsung-s6d27a1.c + defsc 'static[ ]const[ ]struct[ ]joycon_rumble_freq_data[ ]joycon_rumble_frequencies\[\][ ]=' drivers/hid/hid-nintendo.c + defsc 'static[ ]const[ ]struct[ ]joycon_rumble_amp_data[ ]joycon_rumble_amplitudes\[\][ ]=' drivers/hid/hid-nintendo.c + blobname 'goodix[/]%s' drivers/input/touchscreen/goodix_fwupload.c + blobname 'ilitek[/]ili251x.bin' drivers/input/touchscreen/ili210x.c + # These register initializers cover large contiguous regions. + # ~180b and ~512b respectively. It's not inconceivable that they + # contain some code, but it doesn't quite feel like code to me, so + # I'm tentatively leaving it in. + defsc 'static[ ]const[ ]struct[ ]hi846_reg[ ]hi846_init_[24]lane\[\][ ]' drivers/media/i2c/hi846.c + defsnc 'static[ ]const[ ]struct[ ]ov13b10_reg[ ]mipi_data_rate_1120mbps\[\][ ]=' drivers/media/i2c/ov13b10.c + defsnc 'static[ ]const[ ]struct[ ]ov13b10_reg[ ]mode_\(4208x3120\|4160x\(3120\|2340\)\|2104x1560\|2080x1170\)_regs\[\][ ]=' drivers/media/i2c/ov13b10.c + defsnc 'static[ ]const[ ]unsigned[ ]char[ ]jpeg_image_red\[\][ ]=' drivers/media/platform/imx-jpeg/mxc-jpeg.c + blobname 'qcom[/]venus-4\.4[/]venus\.mdt' drivers/media/platform/qcom/venus/core.c + blobname 'qcom[/]vpu-2\.0[/]venus\.mbn' drivers/media/platform/qcom/venus/core.c + defsnc 'static[ ]const[ ]struct[ ]rtl8365mb_jam_tbl_entry[ ]rtl8365mb_init_jam_8365mb_vc\[\][ ]=' drivers/net/dsa/rtl8365mb.c + defsc 'static[ ]const[ ]u8[ ]dummy_\(vlan_\)\?\(tcp\|udp\)_ipv6_packet\[\][ ]=' drivers/net/ethernet/intel/ice/ice_switch.c + blobname 'cal-%s-%s\.bin' drivers/net/wireless/ath/ath11k/qmi.c + blobna '[/][*][ ]cal--\.bin[ ][*][/]' drivers/net/wireless/ath/ath11k/qmi.c + accept '[\t]*return[ ]1[;][ ][/][*][ ]not[ ]present[,][ ]try[ ]firmware_request[ ]' drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c + defsnc '[\t]static[ ]const[ ]u8[ ]chan_list_6ghz\[\][ ]=' drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c + blobname 'mediatek[/]WIFI_\(RAM_CODE_MT7922_1\|MT7922_patch_mcu_1_1_hdr\)\.bin' drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h + defsnc 'static[ ]const[ ]struct[ ]rtw89_reg2_def[ ][ ]*rtw8852a_pmac_ht20_mcs7_tbl\[\][ ]=' drivers/net/wireless/realtek/rtw89/rtw8852a.c + blobname 'rtw89[/]rtw8852a_fw\.bin' drivers/net/wireless/realtek/rtw89/rtw8852a.c + defsnc 'static[ ]const[ ]struct[ ]rtw89_reg2_def[ ]rtw89_8852a_phy_\(bb\|radio[ab]\|nctl\)_regs\[\][ ]=' drivers/net/wireless/realtek/rtw89/rtw8852a_table.c + defsnc 'static[ ]const[ ]struct[ ]rtw89_txpwr_byrate_cfg[ ]rtw89_8852a_txpwr_byrate\[\][ ]=' drivers/net/wireless/realtek/rtw89/rtw8852a_table.c + defsnc 'static[ ]const[ ]u8[ ]_txpwr_track_delta_swingidx_5g[ba]_[np]\[\]\[DELTA_SWINGIDX_SIZE\][ ]=' drivers/net/wireless/realtek/rtw89/rtw8852a_table.c + # This names various coredump section names that resemble file + # names, such as eeprom.bin, bootcore_trace.bin, AFAICT extracted + # from the modem. + defsnc 'static[ ]struct[ ]iosm_coredump_file_info[ ]list\[IOSM_NOF_CD_REGION\][ ]=' drivers/net/wwan/iosm/iosm_ipc_devlink.c + defsnc 'static[ ]const[ ]struct[ ]msm_gpio_wakeirq_map[ ]sm6350_pdc_map\[\]' drivers/pinctrl/qcom/pinctrl-sm6350.c + defsnc 'static[ ]const[ ]char[ ]*[*][ ]const[ ]omen_thermal_profile_boards\[\][ ]=' drivers/platform/x86/hp-wmi.c + defsnc 'static[ ]const[ ]int[ ]mlxplat_modular_channels\[\][ ]=' drivers/platform/x86/mlx-platform.c + blobname 'gsl3680-viglen-connect-10\.fw' drivers/platform/x86/touchscreen_dmi.c + accept '\(static[ ]inline[ ]\)\?bool[ ]firmware_request_builtin[(]' include/linux/firmware.h + accept '#define[ ]_MAP_0_32_ASCII_SEG14_NON_PRINTABLE[\t]*[\\][\n][\t]\(0[,]\)*' include/uapi/linux/map_to_14segment.h + defsnc '[\t]struct[ ]some_bytes[ ]\(control\|middle\|three\|five\|overlap\(_expected\)\?\|complete\|after\|startat\)[ ]=' lib/memcpy_kunit.c + defsnc '[ \t]*static[ ]const[ ]\(unsigned\|U32\)[ ]DeBruijnClz\[32\][ ]=' lib/zstd/common/'\(bitstream\)zstd_internal\)\.h' + defsnc 'static[ ]const[ ]unsigned[ ]BIT_mask\[\][ ]=' lib/zstd/common/bitstream.h + defsnc 'static[ ]UNUSED_ATTR[ ]const[ ]U32[ ]LL_bits\[MaxLL[+]1\][ ]=' lib/zstd/common/zstd_internal.h + defsnc 'static[ ]UNUSED_ATTR[ ]const[ ]S16[ ]LL_defaultNorm\[MaxLL[+]1\][ ]=' lib/zstd/common/zstd_internal.h + defsnc 'static[ ]UNUSED_ATTR[ ]const[ ]U32[ ]ML_bits\[MaxML[+]1\][ ]=' lib/zstd/common/zstd_internal.h + defsnc 'static[ ]UNUSED_ATTR[ ]const[ ]S16[ ]ML_defaultNorm\[MaxML[+]1\][ ]=' lib/zstd/common/zstd_internal.h + defsnc '[ \t]*static[ ]const[ ]BYTE[ ]LL_Code\[64\][ ]=' lib/zstd/compress/zstd_compress_internal.h + defsnc '[ \t]*static[ ]const[ ]BYTE[ ]ML_Code\[128\][ ]=' lib/zstd/compress/zstd_compress_internal.h + defsnc '[ \t]*static[ ]const[ ]int[ ]DeBruijnBytePos\[\(64\|32\)\][ ]=' lib/zstd/common/zstd_compress_internal.h + defsnc '[ \t]*static[ ]unsigned[ ]const[ ]kInverseProbabilityLog256\[256\][ ]=' lib/zstd/common/zstd_compress_sequences.c + defsnc 'static[ ]U64[ ]ZSTD_ldm_gearTab\[256\][ ]=' lib/zstd/compress/zstd_ldm_geartab.h + defsc 'static[ ]const[ ]ZSTD_seqSymbol[ ]\(LL\|OF\|ML\)_defaultDTable\[[^]]*\][ ]=' lib/zstd/decompress/zstd_decompress_block.c + defsnc 'static[ ]UNUSED_ATTR[ ]const[ ]U32[ ]LL_base\[MaxLL[+]1\][ ]=' lib/zstd/common/zstd_decompress_internal.h + defsnc 'static[ ]UNUSED_ATTR[ ]const[ ]U32[ ]OF_\(base\|bits\)\[MaxOff[+]1\][ ]=' lib/zstd/common/zstd_decompress_internal.h + defsnc 'static[ ]UNUSED_ATTR[ ]const[ ]U32[ ]ML_base\[MaxML[+]1\][ ]=' lib/zstd/common/zstd_decompress_internal.h + defsnc 'static[ ]const[ ]struct[ ]cs35l41_pll_sysclk_config[ ]cs35l41_pll_sysclk\[\][ ]=' sound/soc/codecs/cs35l41.c + defsnc 'static[ ]const[ ]struct[ ]cs35l41_fs_mon_config[ ]cs35l41_fs_mon\[\][ ]=' sound/soc/codecs/cs35l41.c + defsnc 'static[ ]const[ ]struct[ ]reg_default[ ]rt5682s_reg\[\][ ]=' sound/soc/codecs/rt5682s.c + accept 'static[ ]int[ ]wm_adsp_request_firmware_files\?[(]' sound/soc/codecs/wm_adsp.c + accept '[\t]*\(ret[ ]=[ ]\)\?wm_adsp_request_firmware_files\?[(]' sound/soc/codecs/wm_adsp.c + blobname 'qcom[/]%s[/]%s-tplg\.bin' sound/soc/qcom/qdsp6/topology.c + blobname '%s-%s-%s\.%s' sound/soc/codecs/wm_adsp.c + + # New in 5.16.3, 5.15.17, 5.10.94, 5.4.174, 4.19.226, 4.14.263. + accept 'static[ ]struct[ ]dvb_usb_device_properties[ ]\(p1100\|s660\|p7500\)_properties[ ]=[ ][{][\n]\([ ]\.\(caps\|usb_ctrl\|size_of_priv\)[ ]*=[ ][^",]*,[\n]*\)*[ ]\.firmware[ ]*=[ ]' drivers/media/usb/dvb-usb/dw2102.c + + # New in 5.16.4, 5.15.18, 5.10.95. + blob '#define[ ]BCM_5710_FW_\(\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\|COMPILE_FLAGS\)\(_V15\)\?[ ]*[0-9]\+\([\n]#define[ ]BCM_5710_FW_\(\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\|COMPILE_FLAGS\)\(_V15\)\?[ ]*[0-9]\+\)*' 'drivers/net/\(bnx2x[/]\)\?bnx2x_hsi\.h' + blob '#define[ ]FW_FILE_VERSION\(_V15\)\?\([ ]*[\\][\n][ ]__stringify[(]BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\(_V15\)\?[)]\([ ]["][.]["]\)\?\)\+' 'drivers/net/\(bnx2x/\)\?bnx2x_main\.c' + blobname '\(bnx2x[/]\)\?bnx2x-e[12]h\?-["][ ]FW_FILE_VERSION\(_V15\)\?[ ]["]\.fw' 'drivers/net/\(bnx2x/\)\?bnx2x_main\.c' + blobname '\(bnx2x[/]\)\?bnx2x-e[12]h\?-\([0-9.%d]*\.fw\)\?' 'drivers/net/\(bnx2x/\)\?bnx2x_main\.c' + blobna '\([,][\n \t]*BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\)\+' drivers/net/wireless/broadcom/bnx2x/bnx2x_main.c + accept '[\t][\t][\t]goto[ ]request_firmware_exit[;]' drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c + blobna 'bp->fw_\(major\|minor\|eng\|rev\)[ ]=[ ]BCM_5710_FW_\(MAJOR\|MINOR\|ENGINEERING\|REVISION\)_VERSION\(_V15\)\?[;]\([\n][\t]*bp->fw_\(major\|minor\|eng\|rev\)[ ]=[ ]BCM_5710_FW_\(MAJOR\|MINOR\|ENGINEERING\|REVISION\)_VERSION\(_V15\)\?[;]\)*' drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c + blobna '\([,][\n \t]*bp->fw_\(major\|minor\|rev\)\)\+' drivers/net/wireless/broadcom/bnx2x/bnx2x_main.c + + # New in 5.16.11, 5.15.25, 5.10.102. + blobname 'gsl1680-rwc-nanote-p8\.fw' drivers/platform/x86/touchscreen_dmi.c + + # New in 5.17-rc. + accept '[ ]*Index\([ ]*\(CPU\|IRQ\|Thr\)-[0-9]*\)*\([\n]\([ ]*[0-9]*\)*\)*' Documentation/tools/rtla/rtla-osnoise-hist.rst + accept '[\t]*nvidia[,]emc-configuration[ ]=[ ]*<[ \t\n0-9xa-f]*>[;]' 'arch/arm/boot/dts/tegra30-\(asus-tf\(201\|300tg\?\|700t\)\|pegatron-chagall\)\.dts' + blobname 'qcom[/]sdm845[/]oneplus6[/]venus\.mbn' 'arch/arm64/boot/dts/qcom/sdm845-oneplus-\(common.dtsi\|beryllium\.dts\)' + blobname 'mediatek[/]BT_RAM_CODE_MT7961_1_2_hdr\.bin' drivers/bluetooth/btmtk.h + blobname 'qca[/]nvm_usb_%08x\(%s\(_%04x\)\?\)\?\.bin' drivers/bluetooth/btusb.c + defsc 'static[ ]const[ ]struct[ ]rcar_gen4_cpg_pll_config[ ]cpg_pll_configs\[4\][ ]=' drivers/clk/renesas/r8a779a0-cpg-mssr.c + blobname 'qat_4xxx_dc\.bin' drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h + blobname 'a506_zap\.mdt' drivers/gpu/drm/msm/adreno/adreno_device.c + defsnc 'static[ ]const[ ]u32[ ]hsfreqrange_table\[\]\[2\][ ]=' drivers/gpu/drm/rcar-du/rcar_mipi_dsi.c + blobname 'nvidia[/]tegra\(210\|186\|194\)[/]nvdec\.bin' drivers/gpu/drm/tegra/nvdec.c + accept 'static[ ]const[ ]struct[ ]nvdec_config[ ]nvdec_t\(210\|186\|194\)_config[ ]=[ ][{][\n][ ]\.firmware[ ]*=[ ]' drivers/gpu/drm/tegra/nvdec.c + defsnc 'static[ ]const[ ]unsigned[ ]int[ ]ad74413r_debounce_map\[AD74413R_DIN_DEBOUNCE_LEN\][ ]=' drivers/iio/addac/ad74413r.c + blobname 'dvb_driver_si2141_rom6[01]\.fw' drivers/media/tuners/si2157_priv.h + blobname 'dvb_driver_si2146_rom11\.fw' drivers/media/tuners/si2157_priv.h + blobname 'dvb_driver_si2147_rom50\.fw' drivers/media/tuners/si2157_priv.h + blobname 'dvb_driver_si2148_rom3[23]\.fw' drivers/media/tuners/si2157_priv.h + blobname 'dvb_driver_si2157_rom50\.fw' drivers/media/tuners/si2157_priv.h + blobname 'dvb_driver_si2178_rom50\.fw' drivers/media/tuners/si2157_priv.h + blobname 'dvb_driver_si2158_rom51\.fw' drivers/media/tuners/si2157_priv.h + blobname 'dvb_driver_si2177_rom50\.fw' drivers/media/tuners/si2157_priv.h + defsc 'const[ ]struct[ ]v4l2_vp9_frame_context[ ]v4l2_vp9_default_probs[ ]=' drivers/media/v4l2-core/v4l2-vp9.c + defsnc 'static[ ]const[ ]u8[ ]hclge_comm_hash_key\[\][ ]=' drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.c + defsnc 'static[ ]const[ ]u16[ ]mlxsw_sp2_acl_bf_crc16_tab\[256\][ ]=' drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_bloom_filter.c + defsnc 'static[ ]const[ ]u16[ ]mlxsw_sp4_acl_bf_crc10_tab\[256\][ ]=' drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_bloom_filter.c + defsnc 'static[ ]const[ ]u8[ ]mlxsw_sp4_acl_bf_crc6_tab\[256\][ ]=' drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_bloom_filter.c + blobname 'regdb\.bin' drivers/net/wireless/ath/ath11k/hw.h + blobname 'mediatek[/]mt7915_eeprom\(_dbdc\)\?\.bin' drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h + defsnc 'static[ ]const[ ]struct[ ]msm_gpio_wakeirq_map[ ]sdx65_pdc_map\[\][ ]=' drivers/pinctrl/qcom/pinctrl-sdx65.c + defsnc 'static[ ]const[ ]struct[ ]msm_gpio_wakeirq_map[ ]sm8450_pdc_map\[\][ ]=' drivers/pinctrl/qcom/pinctrl-sm8450.c + blobname 'gsl1680-chuwi-hi8\.fw' drivers/platform/x86/x86-android-tablets.c + blobname 'gt912-tm800a550l\.fw' drivers/platform/x86/x86-android-tablets.c + defsnc 'static[ ]const[ ]u32[ ]bq25890_tspct_tbl\[\][ ]=' drivers/power/supply/bq25890_charger.c + defsnc 'static[ ]const[ ]struct[ ]reg_default[ ]ak4375_reg_defaults\[\][ ]=' sound/soc/codecs/ak4375.c + defsc 'static[ ]const[ ]struct[ ]reg_default[ ]adc3xxx_defaults\[\][ ]=' sound/soc/codecs/tlv320adc3xxx.c + # sof-rn.ri is built out of CONFIG_RENOIR from sof/ project's sources. + accept '[\t]\([\t]\.\|\.default_\)fw_filename[ \t]=[ ]["]sof-rn\.ri["][,]' sound/soc/amd/acp-config.c + accept '[\t]\.nocodec_tplg_filename[ \t]=[ ]["]sof-acp\.tplg["][,]' sound/soc/sof/amd/pci-rn.c + blobna 'For[ ]both[ ]Cherrytrail[ ][(]CHT[)][ ]and[ ]Baytrail[ ][(]BHT[)][ ]the[ ]driver[\n]requires[^\n]*\([\n][^\n]\+\)*\([\n][\n][- ][^\n]*\)*' drivers/staging/media/atomisp/TODO + blobname 'qcom[/]apq8096[/]adsp\.mbn' arch/arm64/boot/dts/qcom/apq8096-db820c.dts + blobname 'qcom[/]sdm845[/]beryllium[/]venus\.mbn' arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts + blobname 'qcom[/]sm7225[/]fairphone4[/]\(adsp\|cdsp\|modem\)\.mdt' arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts + blobname 'qcom[/]sm8350[/]microsoft[/]\(adsp\|cdsp\|modem\|slpi\)\.mbn' arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts + blobname 'qcom[/]\(adsp\|cdsp\|ipa_fws\|modem\|slpi\)\.mbn' arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi + + # New in 5.17. + blobna 'if[ ][(]loaded_fw_\(major\|minor\|eng\|rev\)[ ]\(!=\|<\)[ ]BCM_5710_FW_\(MAJOR\|MINOR\|ENGINEERING\|REVISION\)_VERSION\(_V15\)\?\([ ][|][|][\n][\t ]*loaded_fw_\(major\|minor\|eng\|rev\)[ ]\(!=\|<\)[ ]BCM_5710_FW_\(MAJOR\|MINOR\|ENGINEERING\|REVISION\)_VERSION\(_V15\)\?\)*[)]' drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c + + # New in 5.17.4 and 5.15.35. + accept '[ ][*][ ]enabled[ ]with[ ]updated[ ]microcode[.]' arch/x86/kernel/cpu/tsx.c + + # New in 5.17.6, 5.15.38, 5.10.114, 5.4.192. + accept '[ ][*][ ]microcode_bsp_resume[ ]-[ ]Update[ ]boot[ ]CPU[ ]microcode[ ]during[ ]resume' arch/x86/kernel/cpu/microcode/core.c + + # New in 5.18-rc. + defsnc 'static[ ]const[ ]u8[ ]irq_prio_[hdl]\[256\][ ]=' arch/arm/mach-rpc/irq.c + blobname 'qcom[/]sdm845[/]axolotl[/]\([ac]dsp\|a630_zap\|ipa_fws\|mba\|modem\|venus\)\.mbn' arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts + blobname 'qcom[/]samsung[/]w737[/]qc\([ac]dsp\|dsp\(1v\)\?2\|vss\)850\.mbn' arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts + blobname 'qcom[/]samsung[/]w737[/]ipa_fws\.elf' arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts + blobname 'qcom[/]sm8450[/]\([ac]dsp\|modem\|slpi\)\.mbn' arch/arm64/boot/dts/qcom/sm8450-qrd.dts + initnc '__nsau_data[:]' arch/xtensa/lib/modsi3.S + blobname 'rtl_bt[/]rtl8852bu_fw\.bin' drivers/bluetooth/btrtl.c + blobname 'amdgpu[/]%s_cap\.bin' drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c + blobname 'amdgpu[/]vcn_3_1_2\.bin' drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c + blobname 'amdgpu[/]%s\.bin' drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c + blobname 'amdgpu[/]dcn_3_1_[56]_dmcub\.bin' drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c + blobname '%s\.bin' drivers/gpu/drm/tiny/panel-mipi-dbi.c + defsnc 'static[ ]unsigned[ ]char[ ]blackwidow_init\[RAZER_BLACKWIDOW_TRANSFER_BUF_SIZE\][ ]=' drivers/hid/hid-razer.c + defsnc '[\t]static[ ]const[ ]u8[ ]sine\[\][ ]=' drivers/media/dvb-frontends/dib7000p.c + defsnc 'static[ ]const[ ]struct[ ]hi847_reg[ ]mipi_data_rate_lane_4\[\][ ]=' drivers/media/i2c/hi847.c + defsnc 'static[ ]const[ ]struct[ ]hi847_reg[ ]mode_\(3264x2448\|1632x1224\)_regs\[\][ ]=' drivers/media/i2c/hi847.c + defsnc 'static[ ]const[ ]struct[ ]og01a1b_reg[ ]mode_1280x1024_regs\[\][ ]=' drivers/media/i2c/og01a1b.c + defsc 'static[ ]const[ ]struct[ ]ov08d10_reg[ ]lane_2_mode_\(3280x2460\|3264x2448\|1632x1224\)\[\][ ]=' drivers/media/i2c/ov08d10.c + accept '[\t]dev_dbg[(]core->dev[,][ ]["]request_firmware[ ]' drivers/media/platform/amphion/vpu_core.c + blobname 'vpu[/]vpu_fw_imx8_\(enc\|dec\)\.bin' drivers/media/platform/amphion/vpu_core.c + defsc 'static[ ]const[ ]u8[ ]dummy_\(\(gre\|udp_tun\|ipv[46]_gtpu\)_ipv[46]_\(tcp\|udp\)\|ipv6_gtp\)_packet\[\][ ]=' drivers/net/ethernet/intel/ice/ice_switch.c + blobname 'mediatek[/]mt79[18]6_\(w[am]\|rom_patch\|eeprom\)\(_mt797[56]\(_dual\|_dbdc\)\?\)\?\.bin' drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h + blobname 'mellanox[/]mlxsw_spectrum[23]\?-\(["][ ]__stringify[(]MLXSW_SP[123]\?_FWREV_[^)]*[)][ \\\n\t]*["]\.\)*mfa2' drivers/net/ethernet/mellanox/mlxsw/spectrum.c + blobname 'rtw89[/]rtw8852c_fw\.bin' drivers/net/wireless/realtek/rtw89/rtw8852c.c + defsnc 'static[ ]const[ ]struct[ ]cdns_dphy_rx_band[ ]bands\[\][ ]=' drivers/phy/cadence/cdns-dphy-rx.c + defsnc 'static[ ]struct[ ]gbe_phy_init_data_fix[ ]gbe_phy_init_fix\[\][ ]=' drivers/phy/marvell/phy-mvebu-a3700-comphy.c + defsnc 'static[ ]const[ ]struct[ ]wpcm450_bank[ ]wpcm450_banks\[WPCM450_NUM_BANKS\][ ]=' drivers/pinctrl/nuvoton/pinctrl-wpcm450.c + defsnc 'static[ ]const[ ]struct[ ]msm_gpio_wakeirq_map[ ]qcm2290_mpm_map\[\][ ]=' drivers/pinctrl/qcom/pinctrl-qcm2290.c + defsnc 'static[ ]const[ ]struct[ ]msm_gpio_wakeirq_map[ ]sc8280xp_pdc_map\[\][ ]=' drivers/pinctrl/qcom/pinctrl-sc8280xp.c + defsc 'static[ ]const[ ]unsigned[ ]int[ ]bsc_data_pins\[\][ ]=' drivers/pinctrl/renesas/pfc-r8a7740.c + blobname 'wpss\.mdt' drivers/remoteproc/qcom_q6v5_adsp.c + defsnc 'static[ ]const[ ]unsigned[ ]char[ ]zigzag\[\][ ]=' drivers/staging/media/hantro/hantro_jpeg.c + defsnc 'static[ ]const[ ]u32[ ]hw_reorder\[\][ ]=' drivers/staging/media/hantro/hantro_jpeg.c + defsc 'static[ ]const[ ]unsigned[ ]char[ ]hantro_jpeg_header\[\][ ]=' drivers/staging/media/hantro/hantro_jpeg.c + defsnc '[\t]opts\.\(data\|insns\)[ ]=[ ][(]void[ ][*][)]["]' kernel/bpf/preload/iterators/iterators.lskel.h + defsnc '[\t]skel->rodata[ ]=[ ]skel_prep_map_data[(][(]void[ ][*][)]["]' kernel/bpf/preload/iterators/iterators.lskel.h + defsnc 'static[ ]const[ ]u32[ ]____cacheline_aligned[ ]K\[64\][ ]=' lib/crypto/sm3.c + blobname 'tas5805m_dsp_%s\.bin' sound/soc/codecs/tas5805m.c + accept '[\t]*if[ ][(][!]wm_adsp_request_firmware_files\?[(]' sound/soc/codecs/wm_adsp.c + accept 'int[ ]avs_request_firmware[(]' sound/soc/intel/avs/avs.h + blobname 'dsp_basefw\.bin' sound/soc/intel/avs/loader.c + blobname '%s[/]%s[/]dsp_mod_%pUL\.bin' sound/soc/intel/avs/loader.c + accept '[\t]*ret[ ]=[ ]avs_request_firmware[(]' sound/soc/intel/avs/loader.c + accept '\(int[ ]\|[ ][*][ ]\)avs_request_firmware[(]' sound/soc/intel/avs/utils.c + accept '[\t]*tplg_filename[ ]=[ ]devm_kasprintf[(]sdev->dev[,][ ]GFP_KERNEL[,][\n][\t ]*["]%s%s["][,][\n][\t ]*sof_pdata->tplg_filename[,][\n][\t ]*["]\.tplg["]' sound/soc/sof/intel/hda.c + blobname '%s\.sec' drivers/staging/wfx/fwio.c + blobname '%s%s-%s-%s\(-%s\)*\.%s' sound/soc/codecs/wm_adsp.c + + # New in 5.18.3, 5.17.14, 5.15.46, 5.10.121. + accept 'MODULE_FIRMWARE[(]["]regulatory\.db\(\.p7s\)\?["][)][;]' net/wireless/reg.c + + # New in 5.18.5, 5.15.48, 5.10.123, 5.4.199, 4.19.248, 4.14.284, 4.9.319. + accept 'combination[ ]with[ ]a[ ]microcode[ ]update[.][ ]The[ ]microcode[ ]clears' Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst + + # New in 5.19-rc. + # I'm not sure the following pattern matches actual blob names, in + # two senses: it's not clear they're software, and maybe they're + # just examples. I'm tentatively cleaing them up. + blobname 'am\(335\|43\)x-evm-scale-data\.bin' Documentation/devicetree/bindings/soc/ti/wkup-m3-ipc.yaml + blobname 'am335x-bone-scale-data\.bin' arch/arm/boot/dts/am335x-bone-common.dtsi + blobname 'am335x-evm-scale-data\.bin' arch/arm/boot/dts/'am335x-evm\(\|sk\)\.dts' + blobname 'am43x-evm-scale-data\.bin' arch/arm/boot/dts/'am43\(7x-\(gp\|sk\)\|x-epos\)-evm\.dts' + blobname 'qcom[/]apq8096[/]\(mba\|modem\)\.mbn' arch/arm64/boot/dts/qcom/apq8096-db802c.dts + blobname 'qcom[/]msm8996[/]gemini[/]\(mba\|modem\|slpi\)\.mbn' arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts + blobname 'qcom[/]msm8996[/]scorpio[/]\(mba\|modem\|slpi\)\.mbn' arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts + blobname 'qcom[/]sdm845[/]beryllium[/]\([ac]dsp\|a630_zap\|mba\|modem\|ipa_fws\)\.mbn' arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts + blobname 'qcom[/]sm8450[/]\([ac]dsp\|modem\|slpi\)\.mbn' arch/arm64/boot/dts/qcom/sm8450-hdk.dts + defsnc 'static[ ]const[ ]__initconst[ ]u8[ ]certs_selftest_\(keys\|1_\(data\|pkcs7\)\)\[\][ ]=' crypto/asymmetric_keys/selftest.c + blobname 'rtl_bt[/]rtl8852cu_fw\.bin' drivers/bluetooth/btrtl.c + blobname 'amdgpu[/]vcn_4_0_[04]\.bin' drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c + blobname 'amdgpu[/]\(%s\|gc_11_0_[012]\)_imu\.bin' drivers/gpu/drm/amd/amdgpu/imu_v11_0.c + blobname 'amdgpu[/]\(%s\|gc_11_0_[012]\)_mes1\?\.bin' drivers/gpu/drm/amd/amdgpu/mes_v11_0.c + blobname 'amdgpu[/]\(%s\|sdma_6_0_[012]\)\.bin' drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c + # The following is not new, it was just moved down to allow for + # new patterns to match despite being prefixed by it, when using + # non-NDA regexp engines. + blobname 'amdgpu[/]%s' drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c + # The asm source for this is drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm, there is no _gfx11.asm. + defsnc 'static[ ]const[ ]uint32_t[ ]cwsr_trap_gfx11_hex\[\][ ]=' drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h + defsnc '[\t]static[ ]const[ ]u8[ ]even_dividers\[\][ ]=' drivers/gpu/drm/i915/display/intel_dpll_mgr.c + defsnc 'static[ ]const[ ]struct[ ]nv3052c_reg[ ]nv3052c_panel_regs\[\][ ]=' drivers/gpu/drm/panel/panel-newvision-nv3052c.c + defsc 'ICE_DECLARE_PKT_TEMPLATE[(]\(\(gre\|udp_tun\|\(vlan_\)\?\(tcp\|udp\)\|ipv[46]_gtpu\)_ipv[46]\(_\(tcp\|udp\)\)\?\|ipv6_gtp\)[)][ ]=' drivers/net/ethernet/intel/ice/ice_switch.c + blobname 'mellanox[/]lc_ini_bundle_%u_%u\.bin' drivers/net/ethernet/mellanox/mlxsw/core_linecards.c + blobname 'mellanox[/]lc_ini_bundle_\(["][ \\\n\t]*__stringify[(]MLXSW_SP\?_FWREV_\(SUB\)\?MINOR[)][ ]["][_.]\)*bin' drivers/net/ethernet/mellanox/mlxsw/spectrum.c + blobname 'mrvl[/]sdiouart8997_combo_v4\.bin' drivers/net/wireless/marvell/mwifiex/sdio.h + blobname 'plfxlc[/]lifi-x[cl]\?\.bin' drivers/net/wireless/purelifi/plfxlc/firmware.c + accept '[\t][\t]dev_err[(][&]intf->dev[,][ ]["][Rr]equest_firmware[ ]' drivers/net/wireless/purelifi/plfxlc/firmware.c + defsnc 'static[ ]const[ ]s8[ ]_txpwr_track_delta_swingidx_[56]g[ba]_[np]\[\]\[DELTA_SWINGIDX_SIZE\][ ]=' drivers/net/wireless/realtek/rtw89/'rtw8852[ac]_table\.c' + defsnc 'static[ ]const[ ]struct[ ]rtw89_reg2_def[ ]rtw89_8852c_phy_bb_reg\(s\|_gain\)\[\][ ]=' drivers/net/wireless/realtek/rtw89/rtw8852c_table.c + defsnc 'static[ ]const[ ]struct[ ]rtw89_reg2_def[ ]rtw89_8852c_phy_\(radio[ab]\|nctl\)_regs\[\][ ]=' drivers/net/wireless/realtek/rtw89/rtw8852c_table.c + defsnc 'static[ ]const[ ]struct[ ]rtw89_txpwr_byrate_cfg[ ]rtw89_8852c_txpwr_byrate\[\][ ]=' drivers/net/wireless/realtek/rtw89/rtw8852c_table.c + defsnc 'static[ ]const[ ]struct[ ]msm_gpio_wakeirq_map[ ]sm8150_pdc_map\[\][ ]=' drivers/pinctrl/qcom/pinctrl-sm8150.c + # It's not clear whether this contains code, but it's presumed proprietary, so tentatively disable it. + blobname 'intel[/]ifs[/]%02x-%02x-%02x\.scan' drivers/platform/x86/intel/ifs/load.c + defsnc 'static[ ]const[ ]int[ ]sm5703_buck_voltagemap\[\][ ]=' drivers/regulator/sm5703-regulator.c + blobname 'intel[/]irci_irci_ecr-master_20161208_0213_20170112_1500\.bin' drivers/staging/media/ipu3/ipu3-css-fw.h + defsnc '[\t]static[ ]u8[ ]p\[\]\[2\][ ]=' drivers/tty/serial/8250/8250_pci.c + defsnc '[}][ ]cs35l45_pll_refclk_freq\[\][ ]=' sound/soc/codecs/cs35l45-tables.c + defsnc 'static[ ]const[ ]char[ ][*][ ]const[ ]max98396_thermal_thresh_text\[\][ ]=' sound/soc/codecs/max98396.c + # Topology files are presumed not code, but since we block the + # loading of actual firmware by this driver, there's no harm in + # being conservative and blocking them too. These don't seem to + # be built out of SOF. + blobname '\(rt286\|nau8825\|ssm4567\|max98357a\|rt298\|max98373\|da7219\|tdf8532\|i2s-test\|dmic\|hda-%08x\)-tplg\.bin' sound/soc/intel/avs/board_selection.c + accept '[\t][\t]\[SOF_IPC\][ ]=[ ]["]sof-rn\.ri["]' sound/soc/sof/amd/pci-rn.c + accept '[\t][\t]\[SOF_IPC\][ ]=[ ]["]sof-imx8x\?\.ri["]' sound/soc/sof/imx/imx8.c + accept '[\t][\t]\[SOF_IPC\][ ]=[ ]["]sof-imx8m\.ri["]' sound/soc/sof/imx/imx8m.c + accept '[\t][\t]\[SOF_IPC\][ ]=[ ]["]sof-bdw\.ri["]' sound/soc/sof/intel/bdw.c + accept '[\t][\t]\[SOF_IPC\][ ]=[ ]["]sof-\(byt\|cht\)\.ri["]' sound/soc/sof/intel/'\(byt\|pci-tng\)\.c' + accept '[\t][\t]\[SOF_IPC\][ ]=[ ]["]sof-\(apl\|glk\)\.ri["]' sound/soc/sof/intel/pci-apl.c + accept '[\t][\t]\[SOF_IPC\][ ]=[ ]["]sof-\(cnl\|cfl\|cml\)\.ri["]' sound/soc/sof/intel/pci-cnl.c + accept '[\t][\t]\[SOF_IPC\][ ]=[ ]["]sof-\(icl\|jsl\)\.ri["]' sound/soc/sof/intel/pci-icl.c + accept '[\t][\t]\[SOF_IPC\][ ]=[ ]["]sof-\(tgl\(-h\)\?\|ehl\|adl\(-s\)\?\)\.ri["]' sound/soc/sof/intel/pci-tgl.c + # This is a new naming convention for the sof-*.ri files. SOF + # zephyr build scripts will output either name depending on the + # selected naming convention. + accept '[\t][\t]\[SOF_INTEL_IPC4\][ ]=[ ]["]dsp_basefw\.bin["]' sound/soc/sof/intel/'pci-\(apl\|cnl\|icl\|tgl\)\.c' + accept '[\t][\t]\[SOF_IPC\][ ]=[ ]["]sof-mt8186\.ri["]' sound/soc/sof/mediatek/mt8186/mt8186.c + accept '[\t][\t]\[SOF_IPC\][ ]=[ ]["]sof-mt8195\.ri["]' sound/soc/sof/mediatek/mt8195/mt8195.c + accept '\([ ]*\|[$][(]OUTPUT[)]\)test-libbpf-bpf_object__next_program\.bin' tools/build/feature/Makefile + accept '[\t][\t]test_batched_request_firmware\(\|_into_buf\|_direct\)[$]suffix' tools/testing/selftests/firmware/fw_filesystem.sh + accept '[\t][\t]test_request_firmware_nowait_\(uevent\|custom\)[$]suffix' tools/testing/selftests/firmware/fw_filesystem.sh + accept '[\t]\?test_request_firmware_compressed' tools/testing/selftests/firmware/fw_filesystem.sh + + # New in 5.19.4, 5.15.63. + accept '[\t]if[ ][(]!request_firmware_direct[(][&]fw[,][ ]kpu_profile[,][ ]rvu->dev[)][)]' drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c + + # New in 6.0-rc5, 5.19.9, 5.15.68. + defsnc '[\t]unsigned[ ]char[ ]modified_gray_code\[\][ ]=' arch/arm/mach-at91/pm.c + +# Trisquel Aramo chnages + # New in 6.1-rc, 6.0.11, 5.15.81, 5.10.157. + blobname 'gsl1680-rca-cambio-w101-v2\.fw' drivers/platform/x86/touchscreen_dmi.c +# ;; */*freedo*.patch | */*logo*.patch) @@ -7728,7 +8048,7 @@ check () { # Match $1 as a blob anywhere. $2 is just for documentation purposes. blobname () { - badx "$1" + badx "$1" $2 } # Match $1 in $2 as a blob. The expectation is a match in the diff --git a/helpers/DATA/linux-hwe-5.19/enable_blobless_activation_radeon.patch b/helpers/DATA/linux-hwe-5.19/enable_blobless_activation_radeon.patch new file mode 100644 index 0000000..ba0f092 --- /dev/null +++ b/helpers/DATA/linux-hwe-5.19/enable_blobless_activation_radeon.patch @@ -0,0 +1,227 @@ +Based on https://libreplanet.org/wiki/Group:Hardware/research/gpu/radeon + +diff -ru source.orig/drivers/gpu/drm/radeon/btc_dpm.c source/drivers/gpu/drm/radeon/btc_dpm.c +--- source.orig/drivers/gpu/drm/radeon/btc_dpm.c 2021-10-31 16:53:10.000000000 -0400 ++++ source/drivers/gpu/drm/radeon/btc_dpm.c 2023-02-13 15:50:41.218608376 -0500 +@@ -2437,7 +2437,6 @@ + ret = rv770_upload_firmware(rdev); + if (ret) { + DRM_ERROR("rv770_upload_firmware failed\n"); +- return ret; + } + ret = cypress_get_table_locations(rdev); + if (ret) { +diff -ru source.orig/drivers/gpu/drm/radeon/ci_dpm.c source/drivers/gpu/drm/radeon/ci_dpm.c +--- source.orig/drivers/gpu/drm/radeon/ci_dpm.c 2021-10-31 16:53:10.000000000 -0400 ++++ source/drivers/gpu/drm/radeon/ci_dpm.c 2023-02-13 15:53:38.591724496 -0500 +@@ -5157,7 +5157,6 @@ + ret = ci_upload_firmware(rdev); + if (ret) { + DRM_ERROR("ci_upload_firmware failed\n"); +- return ret; + } + ret = ci_process_firmware_header(rdev); + if (ret) { +diff -ru source.orig/drivers/gpu/drm/radeon/cik.c source/drivers/gpu/drm/radeon/cik.c +--- source.orig/drivers/gpu/drm/radeon/cik.c 2023-02-13 15:21:35.174999782 -0500 ++++ source/drivers/gpu/drm/radeon/cik.c 2023-02-13 15:47:37.149601121 -0500 +@@ -8285,7 +8285,6 @@ + r = ci_mc_load_microcode(rdev); + if (r) { + DRM_ERROR("Failed to load MC firmware!\n"); +- return r; + } + } + +@@ -8591,7 +8590,6 @@ + r = cik_init_microcode(rdev); + if (r) { + DRM_ERROR("Failed to load firmware!\n"); +- return r; + } + } + } else { +@@ -8601,7 +8599,6 @@ + r = cik_init_microcode(rdev); + if (r) { + DRM_ERROR("Failed to load firmware!\n"); +- return r; + } + } + } +@@ -8668,7 +8665,6 @@ + */ + if (!rdev->mc_fw && !(rdev->flags & RADEON_IS_IGP)) { + DRM_ERROR("radeon: MC ucode required for NI+.\n"); +- return -EINVAL; + } + + return 0; +diff -ru source.orig/drivers/gpu/drm/radeon/cypress_dpm.c source/drivers/gpu/drm/radeon/cypress_dpm.c +--- source.orig/drivers/gpu/drm/radeon/cypress_dpm.c 2021-10-31 16:53:10.000000000 -0400 ++++ source/drivers/gpu/drm/radeon/cypress_dpm.c 2023-02-13 15:50:25.130869935 -0500 +@@ -1862,7 +1862,6 @@ + ret = rv770_upload_firmware(rdev); + if (ret) { + DRM_ERROR("rv770_upload_firmware failed\n"); +- return ret; + } + + ret = cypress_get_table_locations(rdev); +diff -ru source.orig/drivers/gpu/drm/radeon/evergreen.c source/drivers/gpu/drm/radeon/evergreen.c +--- source.orig/drivers/gpu/drm/radeon/evergreen.c 2021-10-31 16:53:10.000000000 -0400 ++++ source/drivers/gpu/drm/radeon/evergreen.c 2023-02-13 15:47:50.457384749 -0500 +@@ -5018,7 +5018,6 @@ + r = ni_mc_load_microcode(rdev); + if (r) { + DRM_ERROR("Failed to load MC firmware!\n"); +- return r; + } + } + +@@ -5235,7 +5234,6 @@ + r = ni_init_microcode(rdev); + if (r) { + DRM_ERROR("Failed to load firmware!\n"); +- return r; + } + } + } else { +@@ -5243,7 +5241,6 @@ + r = r600_init_microcode(rdev); + if (r) { + DRM_ERROR("Failed to load firmware!\n"); +- return r; + } + } + } +@@ -5289,7 +5286,6 @@ + if (ASIC_IS_DCE5(rdev)) { + if (!rdev->mc_fw && !(rdev->flags & RADEON_IS_IGP)) { + DRM_ERROR("radeon: MC ucode required for NI+.\n"); +- return -EINVAL; + } + } + +diff -ru source.orig/drivers/gpu/drm/radeon/ni.c source/drivers/gpu/drm/radeon/ni.c +--- source.orig/drivers/gpu/drm/radeon/ni.c 2021-10-31 16:53:10.000000000 -0400 ++++ source/drivers/gpu/drm/radeon/ni.c 2023-02-13 15:46:45.402442454 -0500 +@@ -2163,7 +2163,6 @@ + r = ni_mc_load_microcode(rdev); + if (r) { + DRM_ERROR("Failed to load MC firmware!\n"); +- return r; + } + } + +@@ -2390,7 +2389,6 @@ + r = ni_init_microcode(rdev); + if (r) { + DRM_ERROR("Failed to load firmware!\n"); +- return r; + } + } + } else { +@@ -2398,7 +2396,6 @@ + r = ni_init_microcode(rdev); + if (r) { + DRM_ERROR("Failed to load firmware!\n"); +- return r; + } + } + } +@@ -2453,7 +2450,6 @@ + */ + if (!rdev->mc_fw && !(rdev->flags & RADEON_IS_IGP)) { + DRM_ERROR("radeon: MC ucode required for NI+.\n"); +- return -EINVAL; + } + + return 0; +diff -ru source.orig/drivers/gpu/drm/radeon/r100.c source/drivers/gpu/drm/radeon/r100.c +--- source.orig/drivers/gpu/drm/radeon/r100.c 2023-02-13 15:21:35.174999782 -0500 ++++ source/drivers/gpu/drm/radeon/r100.c 2023-02-13 15:49:15.548001277 -0500 +@@ -1134,7 +1134,6 @@ + r = r100_cp_init_microcode(rdev); + if (r) { + DRM_ERROR("Failed to load firmware!\n"); +- return r; + } + } + +diff -ru source.orig/drivers/gpu/drm/radeon/r600.c source/drivers/gpu/drm/radeon/r600.c +--- source.orig/drivers/gpu/drm/radeon/r600.c 2023-02-13 15:21:35.174999782 -0500 ++++ source/drivers/gpu/drm/radeon/r600.c 2023-02-13 15:46:07.291062125 -0500 +@@ -3299,7 +3299,6 @@ + r = r600_init_microcode(rdev); + if (r) { + DRM_ERROR("Failed to load firmware!\n"); +- return r; + } + } + +diff -ru source.orig/drivers/gpu/drm/radeon/rv770.c source/drivers/gpu/drm/radeon/rv770.c +--- source.orig/drivers/gpu/drm/radeon/rv770.c 2021-10-31 16:53:10.000000000 -0400 ++++ source/drivers/gpu/drm/radeon/rv770.c 2023-02-13 15:26:54.385808292 -0500 +@@ -1966,7 +1966,6 @@ + r = r600_init_microcode(rdev); + if (r) { + DRM_ERROR("Failed to load firmware!\n"); +- return r; + } + } + +diff -ru source.orig/drivers/gpu/drm/radeon/rv770_dpm.c source/drivers/gpu/drm/radeon/rv770_dpm.c +--- source.orig/drivers/gpu/drm/radeon/rv770_dpm.c 2021-10-31 16:53:10.000000000 -0400 ++++ source/drivers/gpu/drm/radeon/rv770_dpm.c 2023-02-13 15:50:13.591057564 -0500 +@@ -1948,12 +1948,10 @@ + ret = rv770_upload_firmware(rdev); + if (ret) { + DRM_ERROR("rv770_upload_firmware failed\n"); +- return ret; + } + ret = rv770_init_smc_table(rdev, boot_ps); + if (ret) { + DRM_ERROR("rv770_init_smc_table failed\n"); +- return ret; + } + + rv770_program_response_times(rdev); +diff -ru source.orig/drivers/gpu/drm/radeon/si.c source/drivers/gpu/drm/radeon/si.c +--- source.orig/drivers/gpu/drm/radeon/si.c 2023-02-13 15:21:35.178999717 -0500 ++++ source/drivers/gpu/drm/radeon/si.c 2023-02-13 15:47:00.042204445 -0500 +@@ -6619,7 +6619,6 @@ + r = si_mc_load_microcode(rdev); + if (r) { + DRM_ERROR("Failed to load MC firmware!\n"); +- return r; + } + } + +@@ -6867,7 +6866,6 @@ + r = si_init_microcode(rdev); + if (r) { + DRM_ERROR("Failed to load firmware!\n"); +- return r; + } + } + +@@ -6926,7 +6924,6 @@ + */ + if (!rdev->mc_fw) { + DRM_ERROR("radeon: MC ucode required for NI+.\n"); +- return -EINVAL; + } + + return 0; +diff -ru source.orig/drivers/gpu/drm/radeon/si_dpm.c source/drivers/gpu/drm/radeon/si_dpm.c +--- source.orig/drivers/gpu/drm/radeon/si_dpm.c 2021-10-31 16:53:10.000000000 -0400 ++++ source/drivers/gpu/drm/radeon/si_dpm.c 2023-02-13 15:53:00.844338238 -0500 +@@ -6366,7 +6366,6 @@ + ret = si_upload_firmware(rdev); + if (ret) { + DRM_ERROR("si_upload_firmware failed\n"); +- return ret; + } + ret = si_process_firmware_header(rdev); + if (ret) { diff --git a/helpers/DATA/linux-hwe-5.19/revert_iwlwifi_clear_firmware1.patch b/helpers/DATA/linux-hwe-5.19/revert_iwlwifi_clear_firmware1.patch new file mode 100644 index 0000000..a1149cf --- /dev/null +++ b/helpers/DATA/linux-hwe-5.19/revert_iwlwifi_clear_firmware1.patch @@ -0,0 +1,21 @@ +reverts https://lore.kernel.org/all/iwlwifi.20211210110539.1f742f0eb58a.I1315f22f6aa632d94ae2069f85e1bca5e734dce0@changeid/ + +--- b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c ++++ a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +@@ -1597,8 +1597,15 @@ + * else from proceeding if the module fails to load + * or hangs loading. + */ ++ if (load_module) { +- if (load_module) + request_module("%s", op->name); ++#ifdef CONFIG_IWLWIFI_OPMODE_MODULAR ++ if (err) ++ IWL_ERR(drv, ++ "failed to load module %s (error %d), is dynamic loading enabled?\n", ++ op->name, err); ++#endif ++ } + failure = false; + goto free; + diff --git a/helpers/DATA/linux-hwe-5.19/revert_iwlwifi_clear_firmware2.patch b/helpers/DATA/linux-hwe-5.19/revert_iwlwifi_clear_firmware2.patch new file mode 100644 index 0000000..22879b6 --- /dev/null +++ b/helpers/DATA/linux-hwe-5.19/revert_iwlwifi_clear_firmware2.patch @@ -0,0 +1,40 @@ +reverts https://lore.kernel.org/all/iwlwifi.20211210110539.1f742f0eb58a.I1315f22f6aa632d94ae2069f85e1bca5e734dce0@changeid/ + +--- b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c ++++ a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +@@ -130,9 +130,6 @@ + + for (i = 0; i < IWL_UCODE_TYPE_MAX; i++) + iwl_free_fw_img(drv, drv->fw.img + i); +- +- /* clear the data for the aborted load case */ +- memset(&drv->fw, 0, sizeof(drv->fw)); + } + + static int iwl_alloc_fw_desc(struct iwl_drv *drv, struct fw_desc *desc, +@@ -1429,7 +1426,6 @@ + int i; + bool load_module = false; + bool usniffer_images = false; +- bool failure = true; + + fw->ucode_capa.max_probe_length = IWL_DEFAULT_MAX_PROBE_LENGTH; + fw->ucode_capa.standard_phy_calibration_size = +@@ -1699,7 +1695,6 @@ + op->name, err); + #endif + } +- failure = false; + goto free; + + try_again: +@@ -1715,9 +1710,6 @@ + complete(&drv->request_firmware_complete); + device_release_driver(drv->trans->dev); + free: +- if (failure) +- iwl_dealloc_ucode(drv); +- + if (pieces) { + for (i = 0; i < ARRAY_SIZE(pieces->img); i++) + kfree(pieces->img[i].sec); diff --git a/helpers/DATA/linux-hwe-5.19/revert_iwlwifi_clear_firmware3.patch b/helpers/DATA/linux-hwe-5.19/revert_iwlwifi_clear_firmware3.patch new file mode 100644 index 0000000..b30d597 --- /dev/null +++ b/helpers/DATA/linux-hwe-5.19/revert_iwlwifi_clear_firmware3.patch @@ -0,0 +1,13 @@ +reverts https://lore.kernel.org/all/iwlwifi.20211210110539.1f742f0eb58a.I1315f22f6aa632d94ae2069f85e1bca5e734dce0@changeid/ + +diff -ru source.orig/drivers/net/wireless/intel/iwlwifi/iwl-drv.c source/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +--- source.orig/drivers/net/wireless/intel/iwlwifi/iwl-drv.c 2022-05-13 16:10:11.883295769 -0400 ++++ source/drivers/net/wireless/intel/iwlwifi/iwl-drv.c 2022-05-13 20:13:06.568151229 -0400 +@@ -1605,7 +1605,6 @@ + complete(&drv->request_firmware_complete); + device_release_driver(drv->trans->dev); + /* drv has just been freed by the release */ +- failure = false; + free: + if (pieces) { + for (i = 0; i < ARRAY_SIZE(pieces->img); i++) diff --git a/helpers/DATA/linux-hwe-5.13/silent-accept-firmware.patch b/helpers/DATA/linux-hwe-5.19/silent-accept-firmware.patch similarity index 51% rename from helpers/DATA/linux-hwe-5.13/silent-accept-firmware.patch rename to helpers/DATA/linux-hwe-5.19/silent-accept-firmware.patch index 2db482c..d9328e3 100644 --- a/helpers/DATA/linux-hwe-5.13/silent-accept-firmware.patch +++ b/helpers/DATA/linux-hwe-5.19/silent-accept-firmware.patch @@ -4,10 +4,10 @@ An alternative solution is to preserve the loading functionality and remove the 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. -diff -ru a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c ---- a/arch/x86/kernel/cpu/microcode/amd.c 2021-06-14 01:15:29.636702258 +0200 -+++ b/arch/x86/kernel/cpu/microcode/amd.c 2021-06-14 01:16:26.456820658 +0200 -@@ -902,7 +902,7 @@ +diff --color -Nru a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c +--- a/arch/x86/kernel/cpu/microcode/amd.c 2023-03-09 11:48:45.000000000 -0600 ++++ b/arch/x86/kernel/cpu/microcode/amd.c 2023-03-09 11:53:09.989441841 -0600 +@@ -918,7 +918,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)) { @@ -16,10 +16,10 @@ diff -ru a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/a goto out; } -diff -ru 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-14 01:15:29.636702258 +0200 -+++ b/arch/x86/kernel/cpu/microcode/intel.c 2021-06-14 01:16:26.456820658 +0200 -@@ -940,7 +940,7 @@ +diff --color -Nru a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c +--- a/arch/x86/kernel/cpu/microcode/intel.c 2022-07-31 16:03:01.000000000 -0500 ++++ b/arch/x86/kernel/cpu/microcode/intel.c 2023-03-09 11:53:09.989441841 -0600 +@@ -902,7 +902,7 @@ c->x86, c->x86_model, c->x86_stepping); if (request_firmware_direct(&firmware, name, device)) { @@ -28,11 +28,11 @@ diff -ru a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode return UCODE_NFOUND; } -diff -ru a/drivers/base/firmware_loader/fallback.c b/drivers/base/firmware_loader/fallback.c ---- a/drivers/base/firmware_loader/fallback.c 2021-06-14 01:15:29.876702766 +0200 -+++ b/drivers/base/firmware_loader/fallback.c 2021-06-14 01:16:26.460820667 +0200 -@@ -521,7 +521,7 @@ - if (opt_flags & FW_OPT_UEVENT) { +diff --color -Nru a/drivers/base/firmware_loader/fallback.c b/drivers/base/firmware_loader/fallback.c +--- a/drivers/base/firmware_loader/fallback.c 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/base/firmware_loader/fallback.c 2023-03-09 11:53:09.989441841 -0600 +@@ -97,7 +97,7 @@ + if (fw_priv->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); @@ -40,7 +40,7 @@ diff -ru a/drivers/base/firmware_loader/fallback.c b/drivers/base/firmware_loade kobject_uevent(&fw_sysfs->dev.kobj, KOBJ_ADD); } else { timeout = MAX_JIFFY_OFFSET; -@@ -560,15 +560,13 @@ +@@ -135,15 +135,13 @@ if (opt_flags & FW_OPT_NOWAIT) { timeout = usermodehelper_read_lock_wait(timeout); if (!timeout) { @@ -58,7 +58,7 @@ diff -ru a/drivers/base/firmware_loader/fallback.c b/drivers/base/firmware_loade return ret; } } -@@ -650,10 +648,8 @@ +@@ -226,10 +224,8 @@ return ret; if (!(opt_flags & FW_OPT_NO_WARN)) @@ -71,10 +71,10 @@ diff -ru a/drivers/base/firmware_loader/fallback.c b/drivers/base/firmware_loade + dev_dbg(device, "Falling back to sysfs fallback\n"); return fw_load_from_user_helper(fw, name, device, opt_flags); } -diff -ru a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c ---- a/drivers/base/firmware_loader/main.c 2021-06-14 01:15:29.876702766 +0200 -+++ b/drivers/base/firmware_loader/main.c 2021-06-14 01:16:26.460820667 +0200 -@@ -538,20 +538,18 @@ +diff --color -Nru a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c +--- a/drivers/base/firmware_loader/main.c 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/base/firmware_loader/main.c 2023-03-09 11:53:09.989441841 -0600 +@@ -542,11 +542,10 @@ READING_FIRMWARE); if (rc < 0) { if (rc != -ENOENT) @@ -89,18 +89,7 @@ diff -ru a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/ma continue; } size = rc; - rc = 0; - -- dev_dbg(device, "Loading firmware from %s\n", path); -+ dev_dbg(device, "Loading firmware\n"); - if (decompress) { -- dev_dbg(device, "f/w decompressing %s\n", -- fw_priv->fw_name); -+ dev_dbg(device, "f/w decompressing\n"); - rc = decompress(device, fw_priv, size, buffer); - /* discard the superfluous original content */ - vfree(buffer); -@@ -561,8 +559,7 @@ +@@ -565,8 +564,7 @@ continue; } } else { @@ -110,42 +99,42 @@ diff -ru a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/ma if (!fw_priv->data) fw_priv->data = buffer; fw_priv->size = size; -@@ -737,7 +734,7 @@ +@@ -741,7 +739,7 @@ } - if (fw_get_builtin_firmware(firmware, name, dbuf, size)) { + if (firmware_request_builtin_buf(firmware, name, dbuf, size)) { - dev_dbg(device, "using built-in %s\n", name); + dev_dbg(device, "using built-in\n"); return 0; /* assigned */ } -@@ -827,8 +824,8 @@ +@@ -850,8 +848,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", ++ "Direct firmware load for failed with error %d\n", + ret); if (nondirect) ret = firmware_fallback_sysfs(fw, name, device, opt_flags, ret); -diff -ru 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 2021-06-14 01:15:30.504704095 +0200 -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c 2021-06-14 01:16:26.460820667 +0200 -@@ -443,7 +443,7 @@ +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c 2023-03-09 19:28:13.650922651 -0600 +@@ -419,7 +419,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"); ++ DRM_ERROR("Failed to load firmware\n"); release_firmware(adev->pm.fw); adev->pm.fw = NULL; return err; -diff -ru 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-14 01:15:30.540704172 +0200 -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c 2021-06-14 01:16:26.464820675 +0200 -@@ -1598,15 +1598,13 @@ +diff --color -Nru 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 2023-03-09 11:48:45.000000000 -0600 ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c 2023-03-09 19:29:28.335287765 -0600 +@@ -2002,15 +2002,13 @@ err = request_firmware(&adev->firmware.gpu_info_fw, fw_name, adev->dev); if (err) { dev_err(adev->dev, @@ -163,10 +152,37 @@ diff -ru a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdg goto out; } -diff -ru 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-14 01:15:30.512704112 +0200 -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c 2021-06-14 01:26:26.857914676 +0200 -@@ -189,15 +189,13 @@ +diff --color -Nru a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c 2023-03-09 19:32:35.648203491 -0600 +@@ -1500,8 +1500,8 @@ + if (ret) + continue; + +- seq_printf(m, "TA %s feature version: 0x%08x, firmware version: 0x%08x\n", +- ta_fw_name[i], fw_info.feature, fw_info.ver); ++ seq_printf(m, "TA feature version: 0x%08x, firmware version: 0x%08x\n", ++ fw_info.feature, fw_info.ver); + } + + /* SMC */ +diff --color -Nru a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c 2023-03-09 11:48:45.000000000 -0600 ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c 2023-03-09 19:35:41.949114270 -0600 +@@ -627,8 +627,7 @@ + */ + if (!skip_unsupport && (psp->cmd_buf_mem->resp.status || !timeout) && !ras_intr) { + if (ucode) +- DRM_WARN("failed to load ucode %s(0x%X) ", +- amdgpu_ucode_name(ucode->ucode_id), ucode->ucode_id); ++ DRM_WARN("failed to load ucode"); + DRM_WARN("psp gfx command %s(0x%X) failed and response status is (0x%X)\n", + psp_gfx_cmd_name(psp->cmd_buf_mem->cmd_id), psp->cmd_buf_mem->cmd_id, + psp->cmd_buf_mem->resp.status); +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c 2023-03-09 19:38:05.801817530 -0600 +@@ -262,15 +262,13 @@ r = request_firmware(&adev->uvd.fw, fw_name, adev->dev); if (r) { @@ -184,10 +200,10 @@ diff -ru a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/ release_firmware(adev->uvd.fw); adev->uvd.fw = NULL; return r; -diff -ru 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 2021-06-14 01:15:30.512704112 +0200 -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c 2021-06-14 01:27:11.405988585 +0200 -@@ -158,15 +158,13 @@ +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c 2023-03-09 19:40:03.778394288 -0600 +@@ -160,15 +160,13 @@ r = request_firmware(&adev->vce.fw, fw_name, adev->dev); if (r) { @@ -205,10 +221,10 @@ diff -ru a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/ release_firmware(adev->vce.fw); adev->vce.fw = NULL; return r; -diff -ru 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-14 01:15:30.544704180 +0200 -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c 2021-06-14 01:31:27.674403292 +0200 -@@ -112,15 +112,13 @@ +diff --color -Nru 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 2023-03-09 11:48:45.000000000 -0600 ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c 2023-03-09 19:41:58.842956810 -0600 +@@ -200,15 +200,13 @@ r = request_firmware(&adev->vcn.fw, fw_name, adev->dev); if (r) { @@ -226,9 +242,9 @@ diff -ru a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/ release_firmware(adev->vcn.fw); adev->vcn.fw = NULL; return r; -diff -ru 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-14 01:15:30.544704180 +0200 -+++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c 2021-06-14 01:16:26.464820675 +0200 +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c 2023-03-09 19:44:48.183784675 -0600 @@ -144,7 +144,7 @@ } out: @@ -238,10 +254,10 @@ diff -ru a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/ci for (i = 0; i < adev->sdma.num_instances; i++) { release_firmware(adev->sdma.instance[i].fw); adev->sdma.instance[i].fw = NULL; -diff -ru 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-14 01:15:30.544704180 +0200 -+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c 2021-06-14 01:19:58.765234735 +0200 -@@ -3675,8 +3675,7 @@ +diff --color -Nru 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 2023-03-09 11:48:45.000000000 -0600 ++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c 2023-03-09 19:45:40.492040397 -0600 +@@ -4291,8 +4291,7 @@ out: if (err) { dev_err(adev->dev, @@ -251,9 +267,9 @@ diff -ru a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/g release_firmware(adev->gfx.pfp_fw); adev->gfx.pfp_fw = NULL; release_firmware(adev->gfx.me_fw); -diff -ru 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 2021-06-14 01:15:30.520704129 +0200 -+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c 2021-06-14 01:16:26.464820675 +0200 +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c 2023-03-09 19:48:18.700813841 -0600 @@ -381,7 +381,7 @@ out: @@ -263,9 +279,9 @@ diff -ru a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gf release_firmware(adev->gfx.pfp_fw); adev->gfx.pfp_fw = NULL; release_firmware(adev->gfx.me_fw); -diff -ru 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-14 01:15:30.520704129 +0200 -+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c 2021-06-14 01:16:26.464820675 +0200 +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c 2023-03-09 19:49:39.717209910 -0600 @@ -976,7 +976,7 @@ out: @@ -275,10 +291,10 @@ diff -ru a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gf release_firmware(adev->gfx.pfp_fw); adev->gfx.pfp_fw = NULL; release_firmware(adev->gfx.me_fw); -diff -ru 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-14 01:15:30.544704180 +0200 -+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c 2021-06-14 01:16:26.468820683 +0200 -@@ -1222,8 +1222,7 @@ +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c 2023-03-09 19:52:22.738006878 -0600 +@@ -1217,8 +1217,7 @@ out: if (err) { dev_err(adev->dev, @@ -288,10 +304,10 @@ diff -ru a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gf release_firmware(adev->gfx.pfp_fw); adev->gfx.pfp_fw = NULL; release_firmware(adev->gfx.me_fw); -diff -ru 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-14 01:15:30.544704180 +0200 -+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c 2021-06-14 01:32:32.298505650 +0200 -@@ -1366,8 +1366,7 @@ +diff --color -Nru 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 2023-03-09 11:48:45.000000000 -0600 ++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c 2023-03-09 19:57:30.143509707 -0600 +@@ -1334,8 +1334,7 @@ out: if (err) { dev_err(adev->dev, @@ -301,7 +317,7 @@ diff -ru a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gf release_firmware(adev->gfx.pfp_fw); adev->gfx.pfp_fw = NULL; release_firmware(adev->gfx.me_fw); -@@ -1501,8 +1500,7 @@ +@@ -1469,8 +1468,7 @@ out: if (err) { dev_err(adev->dev, @@ -311,7 +327,7 @@ diff -ru a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gf release_firmware(adev->gfx.rlc_fw); adev->gfx.rlc_fw = NULL; } -@@ -1590,8 +1588,7 @@ +@@ -1572,8 +1570,7 @@ gfx_v9_0_check_fw_write_wait(adev); if (err) { dev_err(adev->dev, @@ -321,9 +337,9 @@ diff -ru a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gf release_firmware(adev->gfx.mec_fw); adev->gfx.mec_fw = NULL; release_firmware(adev->gfx.mec2_fw); -diff -ru 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 2021-06-14 01:15:30.524704138 +0200 -+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c 2021-06-14 01:32:45.474436916 +0200 +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c 2023-03-09 19:58:54.279921029 -0600 @@ -140,8 +140,7 @@ out: if (err) { @@ -334,9 +350,9 @@ diff -ru a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gm release_firmware(adev->gmc.fw); adev->gmc.fw = NULL; } -diff -ru 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 2021-06-14 01:15:30.524704138 +0200 -+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c 2021-06-14 01:16:26.472820691 +0200 +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c 2023-03-09 20:00:00.496244744 -0600 @@ -163,7 +163,7 @@ out: @@ -346,10 +362,10 @@ diff -ru a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gm release_firmware(adev->gmc.fw); adev->gmc.fw = NULL; } -diff -ru 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 2021-06-14 01:15:30.524704138 +0200 -+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c 2021-06-14 01:16:26.472820691 +0200 -@@ -280,7 +280,7 @@ +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c 2023-03-09 20:01:46.768764284 -0600 +@@ -271,7 +271,7 @@ out: if (err) { @@ -358,9 +374,9 @@ diff -ru a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gm release_firmware(adev->gmc.fw); adev->gmc.fw = NULL; } -diff -ru 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 2021-06-14 01:15:30.532704155 +0200 -+++ b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c 2021-06-14 01:21:32.609406505 +0200 +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c 2023-03-09 20:04:55.509686991 -0600 @@ -75,8 +75,7 @@ release_firmware(adev->psp.ta_fw); adev->psp.ta_fw = NULL; @@ -371,7 +387,7 @@ diff -ru a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c b/drivers/gpu/drm/amd/amdgpu/p } else { err = amdgpu_ucode_validate(adev->psp.ta_fw); if (err) -@@ -111,8 +110,7 @@ +@@ -119,8 +118,7 @@ out: if (err) { dev_err(adev->dev, @@ -381,10 +397,10 @@ diff -ru a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c b/drivers/gpu/drm/amd/amdgpu/p } return err; -diff -ru 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-14 01:15:30.532704155 +0200 -+++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c 2021-06-14 01:21:51.357440156 +0200 -@@ -116,7 +116,7 @@ +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c 2023-03-09 20:09:20.270981343 -0600 +@@ -146,7 +146,7 @@ release_firmware(adev->psp.ta_fw); adev->psp.ta_fw = NULL; dev_info(adev->dev, @@ -393,7 +409,7 @@ diff -ru a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/p } else { err = amdgpu_ucode_validate(adev->psp.ta_fw); if (err) -@@ -145,7 +145,7 @@ +@@ -185,7 +185,7 @@ release_firmware(adev->psp.ta_fw); adev->psp.ta_fw = NULL; dev_info(adev->dev, @@ -402,9 +418,32 @@ diff -ru a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/p } else { err = amdgpu_ucode_validate(adev->psp.ta_fw); if (err) -diff -ru 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-14 01:15:30.532704155 +0200 -+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c 2021-06-14 01:16:26.472820691 +0200 +diff --color -Nru a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c +--- a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c 2023-03-09 11:48:45.000000000 -0600 ++++ b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c 2023-03-09 20:15:18.748733852 -0600 +@@ -75,8 +75,7 @@ + release_firmware(adev->psp.ta_fw); + adev->psp.ta_fw = NULL; + dev_info(adev->dev, +- "psp v12.0: Failed to load firmware \"%s\"\n", +- fw_name); ++ "psp v12.0: Failed to load firmware\n"); + } else { + err = amdgpu_ucode_validate(adev->psp.ta_fw); + if (err) +@@ -120,8 +119,7 @@ + adev->psp.ta_fw = NULL; + if (err) { + dev_err(adev->dev, +- "psp v12.0: Failed to load firmware \"%s\"\n", +- fw_name); ++ "psp v12.0: Failed to load firmware\n"); + } + + return err; +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c 2023-03-09 20:16:41.561138701 -0600 @@ -175,7 +175,7 @@ out: @@ -414,9 +453,9 @@ diff -ru a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/s for (i = 0; i < adev->sdma.num_instances; i++) { release_firmware(adev->sdma.instance[i].fw); adev->sdma.instance[i].fw = NULL; -diff -ru 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-14 01:15:30.532704155 +0200 -+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c 2021-06-14 01:16:26.472820691 +0200 +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c 2023-03-09 20:17:54.125493450 -0600 @@ -331,7 +331,7 @@ } out: @@ -426,10 +465,10 @@ diff -ru a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/s for (i = 0; i < adev->sdma.num_instances; i++) { release_firmware(adev->sdma.instance[i].fw); adev->sdma.instance[i].fw = NULL; -diff -ru 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-14 01:15:30.532704155 +0200 -+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c 2021-06-14 01:16:26.472820691 +0200 -@@ -639,7 +639,7 @@ +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c 2023-03-09 20:18:38.785711783 -0600 +@@ -704,7 +704,7 @@ out: if (err) { @@ -438,10 +477,10 @@ diff -ru a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/s sdma_v4_0_destroy_inst_ctx(adev); } return err; -diff -ru 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-14 01:15:30.532704155 +0200 -+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c 2021-06-14 01:20:49.889329026 +0200 -@@ -248,7 +248,7 @@ +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c 2023-03-09 20:21:16.870484620 -0600 +@@ -297,7 +297,7 @@ } out: if (err) { @@ -450,10 +489,22 @@ diff -ru a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c b/drivers/gpu/drm/amd/amdgpu/s for (i = 0; i < adev->sdma.num_instances; i++) { release_firmware(adev->sdma.instance[i].fw); adev->sdma.instance[i].fw = NULL; -diff -ru a/drivers/gpu/drm/amd/amdgpu/si_dpm.c b/drivers/gpu/drm/amd/amdgpu/si_dpm.c ---- a/drivers/gpu/drm/amd/pm/powerplay/si_dpm.c 2021-06-14 01:15:30.536704163 +0200 -+++ b/drivers/gpu/drm/amd/pm/powerplay/si_dpm.c 2021-06-14 01:16:26.476820699 +0200 -@@ -7655,8 +7655,8 @@ +diff --color -Nru a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c 2023-03-09 20:23:00.390990706 -0600 +@@ -201,7 +201,7 @@ + + out: + if (err) { +- DRM_ERROR("sdma_v5_2: Failed to load firmware \"%s\"\n", fw_name); ++ DRM_ERROR("sdma_v5_2: Failed to load firmware\n"); + sdma_v5_2_destroy_inst_ctx(adev); + } + return err; +diff --color -Nru a/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c b/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +--- a/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c 2023-03-09 11:53:09.993441860 -0600 +@@ -7721,8 +7721,8 @@ out: if (err) { @@ -464,10 +515,18 @@ diff -ru a/drivers/gpu/drm/amd/amdgpu/si_dpm.c b/drivers/gpu/drm/amd/amdgpu/si_d release_firmware(adev->pm.fw); adev->pm.fw = NULL; } -diff -ru a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c ---- a/drivers/gpu/drm/drm_edid_load.c 2021-06-14 01:15:31.428706050 +0200 -+++ b/drivers/gpu/drm/drm_edid_load.c 2021-06-14 01:16:26.476820699 +0200 -@@ -195,8 +195,8 @@ +diff --color -Nru a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c +--- a/drivers/gpu/drm/drm_edid_load.c 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/drm_edid_load.c 2023-03-09 11:53:09.993441860 -0600 +@@ -188,15 +188,15 @@ + pdev = platform_device_register_simple(connector_name, -1, NULL, 0); + if (IS_ERR(pdev)) { + DRM_ERROR("Failed to register EDID firmware platform device " +- "for connector \"%s\"\n", connector_name); ++ "for connector\n"); + return ERR_CAST(pdev); + } + err = request_firmware(&fw, name, &pdev->dev); platform_device_unregister(pdev); if (err) { @@ -478,10 +537,31 @@ diff -ru a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c return ERR_PTR(err); } -diff -ru a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c ---- a/drivers/gpu/drm/r128/r128_cce.c 2021-06-14 01:15:31.724706676 +0200 -+++ b/drivers/gpu/drm/r128/r128_cce.c 2021-06-14 01:16:26.476820699 +0200 -@@ -163,14 +163,13 @@ +@@ -205,8 +205,8 @@ + } + + if (edid_size(fwdata, fwsize) != fwsize) { +- DRM_ERROR("Size of EDID firmware \"%s\" is invalid " +- "(expected %d, got %d\n", name, ++ DRM_ERROR("Size of EDID firmware is invalid " ++ "(expected %d, got %d\n", + edid_size(fwdata, fwsize), (int)fwsize); + edid = ERR_PTR(-EINVAL); + goto out; +@@ -221,8 +221,7 @@ + if (!drm_edid_block_valid(edid, 0, print_bad_edid, + &connector->edid_corrupt)) { + connector->bad_edid_counter++; +- DRM_ERROR("Base block of EDID firmware \"%s\" is invalid ", +- name); ++ DRM_ERROR("Base block of EDID firmware is invalid "); + kfree(edid); + edid = ERR_PTR(-EINVAL); + goto out; +diff --color -Nru a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c +--- a/drivers/gpu/drm/r128/r128_cce.c 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/r128/r128_cce.c 2023-03-09 16:40:53.689839779 -0600 +@@ -162,14 +162,13 @@ rc = request_firmware(&fw, FIRMWARE_NAME, &pdev->dev); platform_device_unregister(pdev); if (rc) { @@ -499,10 +579,10 @@ diff -ru a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c rc = -EINVAL; goto out_release; } -diff -ru a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c ---- a/drivers/gpu/drm/radeon/cik.c 2021-06-14 01:15:31.732706693 +0200 -+++ b/drivers/gpu/drm/radeon/cik.c 2021-06-14 01:16:26.476820699 +0200 -@@ -2058,7 +2058,7 @@ +diff --color -Nru a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c +--- a/drivers/gpu/drm/radeon/cik.c 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/radeon/cik.c 2023-03-09 18:09:31.511837288 -0600 +@@ -2049,7 +2049,7 @@ default: BUG(); } @@ -511,7 +591,7 @@ diff -ru a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c snprintf(fw_name, sizeof(fw_name), "radeon/%s_pfp.bin", new_chip_name); err = request_firmware(&rdev->pfp_fw, fw_name, rdev->dev); -@@ -2068,16 +2068,15 @@ +@@ -2059,16 +2059,15 @@ if (err) goto out; if (rdev->pfp_fw->size != pfp_req_size) { @@ -531,7 +611,7 @@ diff -ru a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c goto out; } else { new_fw++; -@@ -2092,15 +2091,14 @@ +@@ -2083,15 +2082,14 @@ if (err) goto out; if (rdev->me_fw->size != me_req_size) { @@ -550,7 +630,7 @@ diff -ru a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c goto out; } else { new_fw++; -@@ -2115,15 +2113,14 @@ +@@ -2106,15 +2104,14 @@ if (err) goto out; if (rdev->ce_fw->size != ce_req_size) { @@ -569,7 +649,7 @@ diff -ru a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c goto out; } else { new_fw++; -@@ -2138,15 +2135,14 @@ +@@ -2129,15 +2126,14 @@ if (err) goto out; if (rdev->mec_fw->size != mec_req_size) { @@ -588,7 +668,7 @@ diff -ru a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c goto out; } else { new_fw++; -@@ -2176,15 +2172,14 @@ +@@ -2167,15 +2163,14 @@ if (err) goto out; if (rdev->rlc_fw->size != rlc_req_size) { @@ -607,14 +687,14 @@ diff -ru a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c goto out; } else { new_fw++; -@@ -2199,15 +2194,14 @@ +@@ -2190,15 +2185,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); ++ rdev->sdma_fw->size); err = -EINVAL; } } else { @@ -626,7 +706,7 @@ diff -ru a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c goto out; } else { new_fw++; -@@ -2229,16 +2223,15 @@ +@@ -2220,16 +2214,15 @@ } if ((rdev->mc_fw->size != mc_req_size) && (rdev->mc_fw->size != mc2_req_size)){ @@ -646,14 +726,7 @@ diff -ru a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c goto out; } else { new_fw++; -@@ -2254,21 +2247,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); +@@ -2251,15 +2244,14 @@ rdev->smc_fw = NULL; err = 0; } else if (rdev->smc_fw->size != smc_req_size) { @@ -672,7 +745,7 @@ diff -ru a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c goto out; } else { new_fw++; -@@ -2288,8 +2279,7 @@ +@@ -2279,8 +2271,7 @@ out: if (err) { if (err != -EINVAL) @@ -682,10 +755,79 @@ diff -ru a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c release_firmware(rdev->pfp_fw); rdev->pfp_fw = NULL; release_firmware(rdev->me_fw); -diff -ru a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c ---- a/drivers/gpu/drm/radeon/r100.c 2021-06-14 01:15:31.736706702 +0200 -+++ b/drivers/gpu/drm/radeon/r100.c 2021-06-14 01:37:19.785010983 +0200 -@@ -1048,10 +1048,10 @@ +diff --color -Nru a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c +--- a/drivers/gpu/drm/radeon/ni.c 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/radeon/ni.c 2023-03-09 11:53:09.993441860 -0600 +@@ -807,7 +807,7 @@ + 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; +@@ -821,8 +821,7 @@ + out: + if (err) { + if (err != -EINVAL) +- pr_err("ni_cp: Failed to load firmware \"%s\"\n", +- fw_name); ++ pr_err("ni_cp: Failed to load firmware\n"); + release_firmware(rdev->pfp_fw); + rdev->pfp_fw = NULL; + release_firmware(rdev->me_fw); +diff --color -Nru a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c +--- a/drivers/gpu/drm/radeon/r100.c 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/radeon/r100.c 2023-03-09 11:53:09.993441860 -0600 +@@ -1017,13 +1017,13 @@ + if ((rdev->family == CHIP_R100) || (rdev->family == CHIP_RV100) || + (rdev->family == CHIP_RV200) || (rdev->family == CHIP_RS100) || + (rdev->family == CHIP_RS200)) { +- DRM_INFO("Loading R100 Microcode\n"); ++ DRM_INFO("Loading Microcode\n"); + fw_name = FIRMWARE_R100; + } else if ((rdev->family == CHIP_R200) || + (rdev->family == CHIP_RV250) || + (rdev->family == CHIP_RV280) || + (rdev->family == CHIP_RS300)) { +- DRM_INFO("Loading R200 Microcode\n"); ++ DRM_INFO("Loading Microcode\n"); + fw_name = FIRMWARE_R200; + } else if ((rdev->family == CHIP_R300) || + (rdev->family == CHIP_R350) || +@@ -1031,19 +1031,19 @@ + (rdev->family == CHIP_RV380) || + (rdev->family == CHIP_RS400) || + (rdev->family == CHIP_RS480)) { +- DRM_INFO("Loading R300 Microcode\n"); ++ DRM_INFO("Loading Microcode\n"); + fw_name = FIRMWARE_R300; + } else if ((rdev->family == CHIP_R420) || + (rdev->family == CHIP_R423) || + (rdev->family == CHIP_RV410)) { +- DRM_INFO("Loading R400 Microcode\n"); ++ DRM_INFO("Loading Microcode\n"); + fw_name = FIRMWARE_R420; + } else if ((rdev->family == CHIP_RS690) || + (rdev->family == CHIP_RS740)) { +- DRM_INFO("Loading RS690/RS740 Microcode\n"); ++ DRM_INFO("Loading Microcode\n"); + fw_name = FIRMWARE_RS690; + } else if (rdev->family == CHIP_RS600) { +- DRM_INFO("Loading RS600 Microcode\n"); ++ DRM_INFO("Loading Microcode\n"); + fw_name = FIRMWARE_RS600; + } else if ((rdev->family == CHIP_RV515) || + (rdev->family == CHIP_R520) || +@@ -1051,16 +1051,16 @@ + (rdev->family == CHIP_R580) || + (rdev->family == CHIP_RV560) || + (rdev->family == CHIP_RV570)) { +- DRM_INFO("Loading R500 Microcode\n"); ++ DRM_INFO("Loading Microcode\n"); + fw_name = FIRMWARE_R520; + } err = request_firmware(&rdev->me_fw, fw_name, rdev->dev); if (err) { @@ -699,10 +841,10 @@ diff -ru a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c err = -EINVAL; release_firmware(rdev->me_fw); rdev->me_fw = NULL; -diff -ru a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c ---- a/drivers/gpu/drm/radeon/r600.c 2021-06-14 01:15:31.740706710 +0200 -+++ b/drivers/gpu/drm/radeon/r600.c 2021-06-14 01:16:26.484820716 +0200 -@@ -2549,15 +2549,15 @@ +diff --color -Nru a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c +--- a/drivers/gpu/drm/radeon/r600.c 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/radeon/r600.c 2023-03-09 11:53:09.993441860 -0600 +@@ -2548,15 +2548,15 @@ rlc_req_size = R600_RLC_UCODE_SIZE * 4; } @@ -721,7 +863,7 @@ diff -ru a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c err = -EINVAL; goto out; } -@@ -2567,8 +2567,8 @@ +@@ -2566,8 +2566,8 @@ if (err) goto out; if (rdev->me_fw->size != me_req_size) { @@ -730,8 +872,8 @@ diff -ru a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c + pr_err("r600_cp: Bogus length %zu in firmware\n", + rdev->me_fw->size); err = -EINVAL; + goto out; } - @@ -2577,8 +2577,8 @@ if (err) goto out; @@ -741,9 +883,9 @@ diff -ru a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c + pr_err("r600_rlc: Bogus length %zu in firmware\n", + rdev->rlc_fw->size); err = -EINVAL; + goto out; } - -@@ -2586,13 +2586,13 @@ +@@ -2587,13 +2587,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) { @@ -760,7 +902,7 @@ diff -ru a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c err = -EINVAL; } } -@@ -2600,8 +2600,7 @@ +@@ -2601,8 +2601,7 @@ out: if (err) { if (err != -EINVAL) @@ -770,9 +912,9 @@ diff -ru a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c release_firmware(rdev->pfp_fw); rdev->pfp_fw = NULL; release_firmware(rdev->me_fw); -diff -ru a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_uvd.c ---- a/drivers/gpu/drm/radeon/radeon_uvd.c 2021-06-14 01:15:31.752706735 +0200 -+++ b/drivers/gpu/drm/radeon/radeon_uvd.c 2021-06-14 01:16:26.484820716 +0200 +diff --color -Nru a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_uvd.c +--- a/drivers/gpu/drm/radeon/radeon_uvd.c 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/radeon/radeon_uvd.c 2023-03-09 11:53:09.993441860 -0600 @@ -140,8 +140,7 @@ /* Let's try to load the newer firmware first */ r = request_firmware(&rdev->uvd_fw, fw_name, rdev->dev); @@ -783,7 +925,7 @@ diff -ru a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_u } else { struct common_firmware_header *hdr = (void *)rdev->uvd_fw->data; unsigned version_major, version_minor, family_id; -@@ -175,8 +174,7 @@ +@@ -177,8 +176,7 @@ if (!fw_name || r) { r = request_firmware(&rdev->uvd_fw, legacy_fw_name, rdev->dev); if (r) { @@ -793,10 +935,10 @@ diff -ru a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_u return r; } } -diff -ru a/drivers/gpu/drm/radeon/radeon_vce.c b/drivers/gpu/drm/radeon/radeon_vce.c ---- a/drivers/gpu/drm/radeon/radeon_vce.c 2021-06-14 01:15:31.752706735 +0200 -+++ b/drivers/gpu/drm/radeon/radeon_vce.c 2021-06-14 01:16:26.484820716 +0200 -@@ -87,8 +87,7 @@ +diff --color -Nru a/drivers/gpu/drm/radeon/radeon_vce.c b/drivers/gpu/drm/radeon/radeon_vce.c +--- a/drivers/gpu/drm/radeon/radeon_vce.c 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/radeon/radeon_vce.c 2023-03-09 11:53:09.993441860 -0600 +@@ -86,8 +86,7 @@ r = request_firmware(&rdev->vce_fw, fw_name, rdev->dev); if (r) { @@ -806,10 +948,10 @@ diff -ru a/drivers/gpu/drm/radeon/radeon_vce.c b/drivers/gpu/drm/radeon/radeon_v return r; } -diff -ru a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c ---- a/drivers/gpu/drm/radeon/si.c 2021-06-14 01:15:31.756706744 +0200 -+++ b/drivers/gpu/drm/radeon/si.c 2021-06-14 01:16:26.484820716 +0200 -@@ -1780,7 +1780,7 @@ +diff --color -Nru a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c +--- a/drivers/gpu/drm/radeon/si.c 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/gpu/drm/radeon/si.c 2023-03-09 11:53:09.993441860 -0600 +@@ -1775,7 +1775,7 @@ if (((RREG32(MC_SEQ_MISC0) & 0xff000000) >> 24) == 0x58) si58_fw = true; @@ -818,7 +960,7 @@ diff -ru a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c 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 @@ +@@ -1785,16 +1785,15 @@ if (err) goto out; if (rdev->pfp_fw->size != pfp_req_size) { @@ -838,7 +980,7 @@ diff -ru a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c goto out; } else { new_fw++; -@@ -1814,15 +1813,14 @@ +@@ -1809,15 +1808,14 @@ if (err) goto out; if (rdev->me_fw->size != me_req_size) { @@ -857,7 +999,7 @@ diff -ru a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c goto out; } else { new_fw++; -@@ -1837,15 +1835,14 @@ +@@ -1832,15 +1830,14 @@ if (err) goto out; if (rdev->ce_fw->size != ce_req_size) { @@ -876,7 +1018,7 @@ diff -ru a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c goto out; } else { new_fw++; -@@ -1860,15 +1857,14 @@ +@@ -1855,15 +1852,14 @@ if (err) goto out; if (rdev->rlc_fw->size != rlc_req_size) { @@ -895,7 +1037,7 @@ diff -ru a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c goto out; } else { new_fw++; -@@ -1891,16 +1887,15 @@ +@@ -1886,16 +1882,15 @@ } if ((rdev->mc_fw->size != mc_req_size) && (rdev->mc_fw->size != mc2_req_size)) { @@ -915,7 +1057,7 @@ diff -ru a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c goto out; } else { new_fw++; -@@ -1918,20 +1913,19 @@ +@@ -1913,20 +1908,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) { @@ -940,7 +1082,7 @@ diff -ru a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c goto out; } else { new_fw++; -@@ -1949,8 +1943,7 @@ +@@ -1944,8 +1938,7 @@ out: if (err) { if (err != -EINVAL) @@ -950,10 +1092,59 @@ diff -ru a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c release_firmware(rdev->pfp_fw); rdev->pfp_fw = NULL; release_firmware(rdev->me_fw); -diff -ru 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-14 01:15:34.020711528 +0200 -+++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c 2021-06-14 01:16:26.488820724 +0200 -@@ -8394,8 +8394,8 @@ +diff --color -Nru a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c 2023-03-09 11:53:09.993441860 -0600 +@@ -763,9 +763,6 @@ + if (!fwreq) + return NULL; + +- brcmf_info("using %s for chip %s\n", +- mapping_table[i].fw_base, chipname); +- + mp_path = brcmf_mp_global.firmware_path; + mp_path_len = strnlen(mp_path, BRCMF_FW_ALTPATH_LEN); + if (mp_path_len) +diff --color -Nru a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c 2023-03-09 11:53:09.993441860 -0600 +@@ -1545,7 +1545,7 @@ + if (err) + return err; + +- brcmf_dbg(PCIE, "Download FW %s\n", devinfo->fw_name); ++ brcmf_dbg(PCIE, "Download FW\n"); + memcpy_toio(devinfo->tcm + devinfo->ci->rambase, + (void *)fw->data, fw->size); + +diff --color -Nru a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c +--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c 2023-03-09 11:53:09.993441860 -0600 +@@ -377,16 +377,16 @@ + UCODE_LOADER_API_VER); + status = request_firmware(&wl->fw.fw_bin[i], fw_name, device); + if (status) { +- wiphy_err(wl->wiphy, "%s: fail to load firmware %s\n", +- KBUILD_MODNAME, fw_name); ++ wiphy_err(wl->wiphy, "%s: fail to load firmware\n", ++ KBUILD_MODNAME); + return status; + } + sprintf(fw_name, "%s_hdr-%d.fw", brcms_firmwares[i], + UCODE_LOADER_API_VER); + status = request_firmware(&wl->fw.fw_hdr[i], fw_name, device); + if (status) { +- wiphy_err(wl->wiphy, "%s: fail to load firmware %s\n", +- KBUILD_MODNAME, fw_name); ++ wiphy_err(wl->wiphy, "%s: fail to load firmware\n", ++ KBUILD_MODNAME); + return status; + } + wl->fw.hdr_num_entries[i] = +diff --color -Nru a/drivers/net/wireless/intel/ipw2x00/ipw2100.c b/drivers/net/wireless/intel/ipw2x00/ipw2100.c +--- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c 2023-03-09 11:53:09.997441880 -0600 +@@ -8372,8 +8372,8 @@ if (rc < 0) { printk(KERN_ERR DRV_NAME ": " @@ -964,10 +1155,10 @@ diff -ru a/drivers/net/wireless/intel/ipw2x00/ipw2100.c b/drivers/net/wireless/i return rc; } IPW_DEBUG_INFO("firmware data %p size %zd\n", fw->fw_entry->data, -diff -ru 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-14 01:15:34.020711528 +0200 -+++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c 2021-06-14 01:16:26.488820724 +0200 -@@ -3398,12 +3398,12 @@ +diff --color -Nru a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c +--- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c 2023-03-09 19:21:02.780816235 -0600 +@@ -3394,12 +3394,12 @@ /* ask firmware_class module to get the boot firmware off disk */ rc = request_firmware(raw, name, &priv->pci_dev->dev); if (rc < 0) { @@ -982,7 +1173,7 @@ diff -ru a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/i return -EINVAL; } -@@ -3411,13 +3411,12 @@ +@@ -3407,13 +3407,12 @@ if ((*raw)->size < sizeof(*fw) + le32_to_cpu(fw->boot_size) + le32_to_cpu(fw->ucode_size) + le32_to_cpu(fw->fw_size)) { @@ -999,10 +1190,46 @@ diff -ru a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/i le32_to_cpu(fw->ver) >> 16, le32_to_cpu(fw->ver) & 0xff, (*raw)->size - sizeof(*fw)); -diff -ru 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-14 01:15:34.024711537 +0200 -+++ b/drivers/net/wireless/intel/iwlegacy/3945-mac.c 2021-06-14 01:16:26.488820724 +0200 -@@ -1837,7 +1837,7 @@ +@@ -3547,7 +3546,7 @@ + /* DMA the initial boot firmware into the device */ + rc = ipw_load_firmware(priv, boot_img, le32_to_cpu(fw->boot_size)); + if (rc < 0) { +- IPW_ERROR("Unable to load boot firmware: %d\n", rc); ++ IPW_ERROR("Unable to load boot firmware\n"); + goto error; + } + +@@ -3569,7 +3568,7 @@ + /* DMA the ucode into the device */ + rc = ipw_load_ucode(priv, ucode_img, le32_to_cpu(fw->ucode_size)); + if (rc < 0) { +- IPW_ERROR("Unable to load ucode: %d\n", rc); ++ IPW_ERROR("Unable to load ucode\n"); + goto error; + } + +@@ -3579,7 +3578,7 @@ + /* DMA bss firmware into the device */ + rc = ipw_load_firmware(priv, fw_img, le32_to_cpu(fw->fw_size)); + if (rc < 0) { +- IPW_ERROR("Unable to load firmware: %d\n", rc); ++ IPW_ERROR("Unable to load firmware\n"); + goto error; + } + #ifdef CONFIG_PM +@@ -11175,7 +11174,7 @@ + * Also start the clocks. */ + rc = ipw_load(priv); + if (rc) { +- IPW_ERROR("Unable to load firmware: %d\n", rc); ++ IPW_ERROR("Unable to load firmware\n"); + return rc; + } + +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/net/wireless/intel/iwlegacy/3945-mac.c 2023-03-09 18:19:33.326779411 -0600 +@@ -1835,19 +1835,19 @@ sprintf(buf, "%s%u%s", name_pre, idx, ".ucode"); ret = request_firmware(&ucode_raw, buf, &il->pci_dev->dev); if (ret < 0) { @@ -1011,7 +1238,23 @@ diff -ru a/drivers/net/wireless/intel/iwlegacy/3945-mac.c b/drivers/net/wireless if (ret == -ENOENT) continue; else -@@ -3698,7 +3697,7 @@ + goto error; + } else { + if (idx < api_max) +- IL_ERR("Loaded firmware %s, " ++ IL_ERR("Loaded firmware, " + "which is deprecated. " +- " Please use API v%u instead.\n", buf, ++ " Please use API v%u instead.\n", + api_max); +- D_INFO("Got firmware '%s' file " +- "(%zd bytes) from disk\n", buf, ucode_raw->size); ++ D_INFO("Got firmware file " ++ "(%zd bytes) from disk\n", ucode_raw->size); + break; + } + } +@@ -3692,7 +3692,7 @@ goto out_unset_hw_params; } @@ -1020,10 +1263,10 @@ diff -ru a/drivers/net/wireless/intel/iwlegacy/3945-mac.c b/drivers/net/wireless /*********************** * 7. Setup Services -diff -ru 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-14 01:15:34.024711537 +0200 -+++ b/drivers/net/wireless/intel/iwlegacy/4965-mac.c 2021-06-14 01:16:26.488820724 +0200 -@@ -4690,7 +4690,7 @@ +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/net/wireless/intel/iwlegacy/4965-mac.c 2023-03-09 11:53:09.997441880 -0600 +@@ -4684,7 +4684,7 @@ sprintf(il->firmware_name, "%s%s%s", name_pre, tag, ".ucode"); @@ -1032,20 +1275,26 @@ diff -ru a/drivers/net/wireless/intel/iwlegacy/4965-mac.c b/drivers/net/wireless return request_firmware_nowait(THIS_MODULE, 1, il->firmware_name, &il->pci_dev->dev, GFP_KERNEL, il, -@@ -4780,8 +4780,7 @@ +@@ -4774,13 +4774,11 @@ 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"); ++ IL_ERR("request for firmware file failed.\n"); goto try_again; } -diff -ru 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 2021-06-14 01:15:34.032711554 +0200 -+++ b/drivers/net/wireless/intel/iwlwifi/dvm/main.c 2021-06-14 01:16:26.492820732 +0200 -@@ -1254,7 +1254,7 @@ +- D_INFO("Loaded firmware file '%s' (%zd bytes).\n", il->firmware_name, +- ucode_raw->size); ++ D_INFO("Loaded firmware file (%zd bytes).\n", ucode_raw->size); + + /* Make sure that we got at least the API version number */ + if (ucode_raw->size < 4) { +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/net/wireless/intel/iwlwifi/dvm/main.c 2023-03-09 11:53:09.997441880 -0600 +@@ -1248,7 +1248,7 @@ ************************/ hw = iwl_alloc_all(); if (!hw) { @@ -1054,7 +1303,7 @@ diff -ru a/drivers/net/wireless/intel/iwlwifi/dvm/main.c b/drivers/net/wireless/ goto out; } -@@ -1382,8 +1382,7 @@ +@@ -1376,8 +1376,7 @@ /*********************** * 2. Read REV register ***********************/ @@ -1064,10 +1313,29 @@ diff -ru a/drivers/net/wireless/intel/iwlwifi/dvm/main.c b/drivers/net/wireless/ if (iwl_trans_start_hw(priv->trans)) goto out_free_hw; -diff -ru 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 2021-06-14 01:15:34.040711570 +0200 -+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c 2021-06-14 01:16:26.492820732 +0200 -@@ -251,7 +251,6 @@ +diff --color -Nru 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-07-31 16:03:01.000000000 -0500 ++++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c 2023-03-09 11:53:09.997441880 -0600 +@@ -184,27 +184,13 @@ + + 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; + } + snprintf(drv->firmware_name, sizeof(drv->firmware_name), "%s%s.ucode", cfg->fw_name_pre, tag); @@ -1076,24 +1344,30 @@ diff -ru a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/i + IWL_DEBUG_FW_INFO(drv, "attempting to load firmware\n"); return request_firmware_nowait(THIS_MODULE, 1, drv->firmware_name, -diff -ru 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-14 01:15:34.040711570 +0200 -+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c 2021-06-14 01:16:26.492820732 +0200 -@@ -1321,8 +1321,8 @@ + drv->trans->dev, +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c 2023-03-09 11:53:09.997441880 -0600 +@@ -1583,13 +1583,11 @@ */ 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); ++ IWL_ERR(trans, "ERROR: firmware isn't available %d\n", ret); return ret; } -diff -ru 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-14 01:15:34.048711587 +0200 -+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c 2021-06-14 01:16:26.492820732 +0200 -@@ -809,8 +809,7 @@ +- IWL_INFO(trans, "Loaded NVM file %s (%zu bytes)\n", +- nvm_file_name, fw_entry->size); ++ IWL_INFO(trans, "Loaded NVM file (%zu bytes)\n", fw_entry->size); + + if (fw_entry->size > MAX_NVM_FILE_LEN) { + IWL_ERR(trans, "NVM file too large\n"); +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c 2023-03-09 11:53:09.997441880 -0600 +@@ -1285,8 +1285,7 @@ goto out_free; } @@ -1103,10 +1377,10 @@ diff -ru a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/i if (iwlwifi_mod_params.nvm_file) mvm->nvm_file_name = iwlwifi_mod_params.nvm_file; -diff -ru 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-14 01:15:34.116711731 +0200 -+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c 2021-06-14 01:16:26.492820732 +0200 -@@ -2069,9 +2069,9 @@ +diff --color -Nru 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 2023-03-09 11:48:45.000000000 -0600 ++++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c 2023-03-09 11:53:09.997441880 -0600 +@@ -2073,9 +2073,9 @@ int ret = 0; u16 signature; @@ -1118,9 +1392,9 @@ diff -ru a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/w ret = -EAGAIN; goto exit; } -diff -ru a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c ---- a/drivers/net/wireless/realtek/rtlwifi/core.c 2021-06-14 01:15:34.156711815 +0200 -+++ b/drivers/net/wireless/realtek/rtlwifi/core.c 2021-06-14 01:16:26.492820732 +0200 +diff --color -Nru a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c +--- a/drivers/net/wireless/realtek/rtlwifi/core.c 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/net/wireless/realtek/rtlwifi/core.c 2023-03-09 11:53:09.997441880 -0600 @@ -83,8 +83,7 @@ err = request_firmware(&firmware, rtlpriv->cfg->alt_fw_name, @@ -1131,9 +1405,9 @@ diff -ru a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/re if (!err) goto found_alt; } -diff -ru 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 2021-06-14 01:15:34.124711748 +0200 -+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c 2021-06-14 01:16:26.492820732 +0200 +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c 2023-03-09 11:53:09.997441880 -0600 @@ -143,7 +143,7 @@ fw_name = "rtlwifi/rtl8188efw.bin"; @@ -1143,9 +1417,9 @@ diff -ru a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c b/drivers/net/wir err = request_firmware_nowait(THIS_MODULE, 1, fw_name, rtlpriv->io.dev, GFP_KERNEL, hw, rtl_fw_cb); -diff -ru 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 2021-06-14 01:15:34.128711756 +0200 -+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c 2021-06-14 01:16:26.492820732 +0200 +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c 2023-03-09 11:53:09.997441880 -0600 @@ -146,7 +146,7 @@ fw_name = "rtlwifi/rtl8192cfw.bin"; @@ -1155,9 +1429,9 @@ diff -ru a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c b/drivers/net/wir err = request_firmware_nowait(THIS_MODULE, 1, fw_name, rtlpriv->io.dev, GFP_KERNEL, hw, rtl_fw_cb); -diff -ru 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 2021-06-14 01:15:34.132711765 +0200 -+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c 2021-06-14 01:16:26.492820732 +0200 +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c 2023-03-09 11:53:09.997441880 -0600 @@ -55,7 +55,7 @@ } /* provide name of alternative file */ @@ -1167,21 +1441,21 @@ diff -ru a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c b/drivers/net/wir rtlpriv->max_fw_size = 0x4000; err = request_firmware_nowait(THIS_MODULE, 1, fw_name, rtlpriv->io.dev, -diff -ru 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-14 01:15:34.132711765 +0200 -+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c 2021-06-14 01:16:26.492820732 +0200 +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c 2023-03-09 11:53:10.001441899 -0600 @@ -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"); ++ pr_info("Loading firmware file\n"); /* request fw */ err = request_firmware_nowait(THIS_MODULE, 1, fw_name, -diff -ru 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 2021-06-14 01:15:34.136711773 +0200 -+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c 2021-06-14 01:16:26.492820732 +0200 +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c 2023-03-09 11:53:10.001441899 -0600 @@ -149,7 +149,7 @@ fw_name = "rtlwifi/rtl8192eefw.bin"; @@ -1191,11 +1465,11 @@ diff -ru a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c b/drivers/net/wir err = request_firmware_nowait(THIS_MODULE, 1, fw_name, rtlpriv->io.dev, GFP_KERNEL, hw, rtl_fw_cb); -diff -ru 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 2021-06-14 01:15:34.140711782 +0200 -+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c 2021-06-14 01:16:26.492820732 +0200 +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c 2023-03-09 11:53:10.001441899 -0600 @@ -69,7 +69,7 @@ - "Firmware callback routine entered!\n"); + "Firmware callback routine entered!\n"); complete(&rtlpriv->firmware_loading_complete); if (!firmware) { - pr_err("Firmware %s not available\n", fw_name); @@ -1212,9 +1486,9 @@ diff -ru a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c b/drivers/net/wir /* request fw */ err = request_firmware_nowait(THIS_MODULE, 1, fw_name, rtlpriv->io.dev, GFP_KERNEL, hw, -diff -ru 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 2021-06-14 01:15:34.144711790 +0200 -+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c 2021-06-14 01:16:26.492820732 +0200 +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c 2023-03-09 11:53:10.001441899 -0600 @@ -152,7 +152,7 @@ fw_name = "rtlwifi/rtl8723fw_B.bin"; @@ -1224,9 +1498,9 @@ diff -ru a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c b/drivers/net/wir err = request_firmware_nowait(THIS_MODULE, 1, fw_name, rtlpriv->io.dev, GFP_KERNEL, hw, rtl_fw_cb); -diff -ru 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 2021-06-14 01:15:34.148711798 +0200 -+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c 2021-06-14 01:16:26.492820732 +0200 +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c 2023-03-09 11:53:10.001441899 -0600 @@ -156,7 +156,7 @@ } @@ -1236,9 +1510,9 @@ diff -ru a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c b/drivers/net/wir err = request_firmware_nowait(THIS_MODULE, 1, fw_name, rtlpriv->io.dev, GFP_KERNEL, hw, rtl_fw_cb); -diff -ru 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 2021-06-14 01:15:34.152711807 +0200 -+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c 2021-06-14 01:16:26.492820732 +0200 +diff --color -Nru 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 2022-07-31 16:03:01.000000000 -0500 ++++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c 2023-03-09 11:53:10.001441899 -0600 @@ -185,7 +185,7 @@ rtlpriv->max_fw_size = 0x8000; @@ -1257,254 +1531,106 @@ diff -ru a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c b/drivers/net/wir err = request_firmware_nowait(THIS_MODULE, 1, wowlan_fw_name, rtlpriv->io.dev, GFP_KERNEL, hw, -diff -r -u linux-hwe-5.13-5.13.0.orig/drivers/bluetooth/ath3k.c linux-hwe-5.13-5.13.0/drivers/bluetooth/ath3k.c ---- linux-hwe-5.13-5.13.0.orig/drivers/bluetooth/ath3k.c 2021-06-27 18:21:11.000000000 -0400 -+++ linux-hwe-5.13-5.13.0/drivers/bluetooth/ath3k.c 2022-01-06 14:02:09.005670683 -0500 -@@ -383,7 +383,7 @@ +diff -Nru --color a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c 2023-03-13 07:14:05.000000000 +0000 ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c 2023-03-13 07:46:23.778827386 +0000 +@@ -223,8 +223,7 @@ - ret = request_firmware(&firmware, filename, &udev->dev); - if (ret < 0) { -- BT_ERR("Patch file not found %s", filename); -+ BT_ERR("Patch file not found"); - return ret; + r = request_firmware(&fw, fw_name, adev->dev); + if (r) { +- dev_err(adev->dev, "can't load firmware \"%s\"\n", +- fw_name); ++ dev_err(adev->dev, "can't load firmware\n", fw_name); + return r; } -@@ -446,7 +446,7 @@ - - ret = request_firmware(&firmware, filename, &udev->dev); - if (ret < 0) { -- BT_ERR("Configuration file not found %s", filename); -+ BT_ERR("Configuration file not found"); - return ret; - } - -@@ -505,11 +505,10 @@ - ret = request_firmware(&firmware, ATH3K_FIRMWARE, &udev->dev); - if (ret < 0) { - if (ret == -ENOENT) -- BT_ERR("Firmware file \"%s\" not found", -- ATH3K_FIRMWARE); -+ BT_ERR("Firmware file not found"); - else -- BT_ERR("Firmware file \"%s\" request failed (err=%d)", -- ATH3K_FIRMWARE, ret); -+ BT_ERR("Firmware file request failed (err=%d)", -+ ret); - return ret; - } - -diff -r -u linux-hwe-5.13-5.13.0.orig/drivers/bluetooth/btintel.c linux-hwe-5.13-5.13.0/drivers/bluetooth/btintel.c ---- linux-hwe-5.13-5.13.0.orig/drivers/bluetooth/btintel.c 2021-06-27 18:21:11.000000000 -0400 -+++ linux-hwe-5.13-5.13.0/drivers/bluetooth/btintel.c 2022-01-06 13:52:00.284072017 -0500 -@@ -304,8 +304,8 @@ - - err = request_firmware_direct(&fw, ddc_name, &hdev->dev); - if (err < 0) { -- bt_dev_err(hdev, "Failed to load Intel DDC file %s (%d)", -- ddc_name, err); -+ bt_dev_err(hdev, "Failed to load Intel DDC file (%d)", -+ err); - return err; - } - -diff -r -u linux-hwe-5.13-5.13.0.orig/drivers/bluetooth/btqca.c linux-hwe-5.13-5.13.0/drivers/bluetooth/btqca.c ---- linux-hwe-5.13-5.13.0.orig/drivers/bluetooth/btqca.c 2022-01-06 13:31:26.000000000 -0500 -+++ linux-hwe-5.13-5.13.0/drivers/bluetooth/btqca.c 2022-01-06 14:19:24.164456053 -0500 -@@ -394,20 +394,19 @@ - const u8 *segment; - int ret, size, remain, i = 0; - -- bt_dev_info(hdev, "QCA Downloading %s", config->fwname); -+ bt_dev_info(hdev, "QCA loading"); - - ret = request_firmware(&fw, config->fwname, &hdev->dev); - if (ret) { -- bt_dev_err(hdev, "QCA Failed to request file: %s (%d)", -- config->fwname, ret); -+ bt_dev_err(hdev, "QCA Failed to request file (%d)", -+ ret); - return ret; - } - - size = fw->size; - data = vmalloc(fw->size); - if (!data) { -- bt_dev_err(hdev, "QCA Failed to allocate memory for file: %s", -- config->fwname); -+ bt_dev_err(hdev, "QCA Failed to allocate memory for file"); - release_firmware(fw); - return -ENOMEM; - } -diff -r -u linux-hwe-5.13-5.13.0.orig/drivers/bluetooth/btrtl.c linux-hwe-5.13-5.13.0/drivers/bluetooth/btrtl.c ---- linux-hwe-5.13-5.13.0.orig/drivers/bluetooth/btrtl.c 2021-06-27 18:21:11.000000000 -0400 -+++ linux-hwe-5.13-5.13.0/drivers/bluetooth/btrtl.c 2022-01-06 14:04:09.911642928 -0500 -@@ -475,7 +475,7 @@ - const struct firmware *fw; - int ret; - -- rtl_dev_info(hdev, "loading %s", name); -+ rtl_dev_info(hdev, "loading firmware"); - ret = request_firmware(&fw, name, &hdev->dev); - if (ret < 0) - return ret; -@@ -649,8 +649,7 @@ - btrtl_dev->fw_len = rtl_load_file(hdev, btrtl_dev->ic_info->fw_name, - &btrtl_dev->fw_data); - if (btrtl_dev->fw_len < 0) { -- rtl_dev_err(hdev, "firmware file %s not found", -- btrtl_dev->ic_info->fw_name); -+ rtl_dev_err(hdev, "firmware file not found"); - ret = btrtl_dev->fw_len; - goto err_free; - } -@@ -667,8 +666,7 @@ - &btrtl_dev->cfg_data); - if (btrtl_dev->ic_info->config_needed && - btrtl_dev->cfg_len <= 0) { -- rtl_dev_err(hdev, "mandatory config file %s not found", -- btrtl_dev->ic_info->cfg_name); -+ rtl_dev_err(hdev, "mandatory config file not found"); - ret = btrtl_dev->cfg_len; - goto err_free; - } -diff -r -u linux-hwe-5.13-5.13.0.orig/drivers/bluetooth/btusb.c linux-hwe-5.13-5.13.0/drivers/bluetooth/btusb.c ---- linux-hwe-5.13-5.13.0.orig/drivers/bluetooth/btusb.c 2022-01-06 13:31:26.000000000 -0500 -+++ linux-hwe-5.13-5.13.0/drivers/bluetooth/btusb.c 2022-01-06 13:47:17.680749780 -0500 -@@ -1995,8 +1995,8 @@ - return NULL; - } - -- bt_dev_err(hdev, "failed to open Intel firmware file: %s (%d)", -- fwname, ret); -+ bt_dev_err(hdev, "failed to open Intel firmware file (%d)", -+ ret); - - /* If the correct firmware patch file is not found, use the - * default firmware patch file instead -@@ -2004,8 +2004,7 @@ - snprintf(fwname, sizeof(fwname), "intel/ibt-hw-%x.%x.bseq", - ver->hw_platform, ver->hw_variant); - if (request_firmware(&fw, fwname, &hdev->dev) < 0) { -- bt_dev_err(hdev, "failed to open default fw file: %s", -- fwname); -+ bt_dev_err(hdev, "failed to open default fw file"); - return NULL; - } - } -@@ -2581,7 +2580,7 @@ - } - - bt_dev_err(hdev, "Failed to load Intel firmware file %s (%d)", -- fwname, err); -+ err); - - return err; - } -@@ -2750,8 +2749,8 @@ - return 0; - } - -- bt_dev_err(hdev, "Failed to load Intel firmware file %s (%d)", -- fwname, err); -+ bt_dev_err(hdev, "Failed to load Intel firmware file (%d)", -+ err); - return err; - } - -@@ -4191,8 +4190,8 @@ - - err = request_firmware(&fw, fwname, &hdev->dev); +diff -Nru --color a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +--- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c2023-03-13 07:14:05.000000000 +0000 ++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c 2023-03-13 07:43:14.487511703 +0000 +@@ -821,8 +821,7 @@ + out: if (err) { -- bt_dev_err(hdev, "failed to request rampatch file: %s (%d)", -- fwname, err); -+ bt_dev_err(hdev, "failed to request rampatch file (%d)", -+ err); - return err; - } - -@@ -4252,8 +4251,8 @@ - - err = request_firmware(&fw, fwname, &hdev->dev); + dev_err(adev->dev, +- "gfx11: Failed to load firmware \"%s\"\n", +- fw_name); ++ "gfx11: Failed to load firmware\n", fw_name); + release_firmware(adev->gfx.pfp_fw); + adev->gfx.pfp_fw = NULL; + release_firmware(adev->gfx.me_fw); +diff -Nru --color a/drivers/gpu/drm/amd/amdgpu/imu_v11_0.c b/drivers/gpu/drm/amd/amdgpu/imu_v11_0.c +--- a/drivers/gpu/drm/amd/amdgpu/imu_v11_0.c2022-07-31 21:03:01.000000000 +0000 ++++ b/drivers/gpu/drm/amd/amdgpu/imu_v11_0.c 2023-03-13 07:45:31.295016045 +0000 +@@ -71,8 +71,7 @@ + out: if (err) { -- bt_dev_err(hdev, "failed to request NVM file: %s (%d)", -- fwname, err); -+ bt_dev_err(hdev, "failed to request NVM file (%d)", -+ err); - return err; + dev_err(adev->dev, +- "gfx11: Failed to load firmware \"%s\"\n", +- fw_name); ++ "gfx11: Failed to load firmware\n"); + release_firmware(adev->gfx.imu_fw); } -diff -r -u linux-hwe-5.13-5.13.0.orig/drivers/bluetooth/hci_ag6xx.c linux-hwe-5.13-5.13.0/drivers/bluetooth/hci_ag6xx.c ---- linux-hwe-5.13-5.13.0.orig/drivers/bluetooth/hci_ag6xx.c 2021-06-27 18:21:11.000000000 -0400 -+++ linux-hwe-5.13-5.13.0/drivers/bluetooth/hci_ag6xx.c 2022-01-06 13:56:48.375097181 -0500 -@@ -195,13 +195,13 @@ +diff -Nru --color a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c +--- a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c 2023-03-13 07:14:05.000000000 +0000 ++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c 2023-03-13 07:44:37.099211678 +0000 +@@ -162,7 +162,7 @@ - err = request_firmware(&fw, fwname, &hdev->dev); - if (err < 0) { -- bt_dev_err(hdev, "Failed to open Intel bddata file: %s (%d)", -- fwname, err); -+ bt_dev_err(hdev, "Failed to open Intel bddata file (%d)", -+ err); - goto patch; + out: + if (err) { +- DRM_ERROR("sdma_v6_0: Failed to load firmware \"%s\"\n", fw_name); ++ DRM_ERROR("sdma_v6_0: Failed to load firmware\n"); + sdma_v6_0_destroy_inst_ctx(adev); } - fw_ptr = fw->data; - -- bt_dev_info(hdev, "Applying bddata (%s)", fwname); -+ bt_dev_info(hdev, "Applying bddata"); - - skb = __hci_cmd_sync_ev(hdev, 0xfc2f, fw->size, fw->data, - HCI_EV_CMD_STATUS, HCI_CMD_TIMEOUT); -@@ -233,13 +233,13 @@ - - err = request_firmware(&fw, fwname, &hdev->dev); - if (err < 0) { -- bt_dev_err(hdev, "Failed to open Intel patch file: %s(%d)", -- fwname, err); -+ bt_dev_err(hdev, "Failed to open Intel patch file(%d)", -+ err); - goto complete; + return err; +diff -Nru --color a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c +--- a/drivers/gpu/drm/radeon/cik.c 2023-03-13 07:30:35.362282308 +0000 ++++ b/drivers/gpu/drm/radeon/cik.c 2023-03-13 07:47:11.750655564 +0000 +@@ -2238,8 +2238,7 @@ + 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; +diff -Nru --color a/drivers/net/wireless/intel/ipw2x00/ipw2100.c b/drivers/net/wireless/intel/ipw2x00/ipw2100.c +--- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c 2023-03-13 07:30:35.446282020 +0000 ++++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c 2023-03-13 07:48:46.790316692 +0000 +@@ -1058,8 +1058,8 @@ + /* load f/w */ + err = ipw2100_fw_download(priv, &ipw2100_firmware); + if (err) { +- IPW_DEBUG_ERROR("%s: Error loading firmware: %d\n", +- priv->net_dev->name, err); ++ IPW_DEBUG_ERROR("%s: Error loading firmware\n", ++ priv->net_dev->name); + goto fail; } - fw_ptr = fw->data; + #ifndef CONFIG_PM +diff -Nru --color 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 2023-03-13 07:30:35.554281653 +0000 ++++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c 2023-03-13 07:55:50.464823615 +0000 +@@ -1402,8 +1402,8 @@ + if (!ucode_raw) + goto try_again; -- bt_dev_info(hdev, "Patching firmware file (%s)", fwname); -+ bt_dev_info(hdev, "Patching firmware file"); +- IWL_DEBUG_FW_INFO(drv, "Loaded firmware file '%s' (%zd bytes).\n", +- drv->firmware_name, ucode_raw->size); ++ IWL_DEBUG_FW_INFO(drv, "Loaded firmware file (%zd bytes).\n", ++ ucode_raw->size); - /* PBN patch file contains a list of binary patches to be applied on top - * of the embedded firmware. Each patch entry header contains the target -diff -r -u linux-hwe-5.13-5.13.0.orig/drivers/bluetooth/hci_intel.c linux-hwe-5.13-5.13.0/drivers/bluetooth/hci_intel.c ---- linux-hwe-5.13-5.13.0.orig/drivers/bluetooth/hci_intel.c 2021-06-27 18:21:11.000000000 -0400 -+++ linux-hwe-5.13-5.13.0/drivers/bluetooth/hci_intel.c 2022-01-06 13:55:26.408500469 -0500 -@@ -706,7 +706,7 @@ - return err; + /* Make sure that we got at least the API version number */ + if (ucode_raw->size < 4) { +@@ -1616,8 +1616,8 @@ + break; } -- bt_dev_info(hdev, "Found device firmware: %s", fwname); -+ bt_dev_info(hdev, "Found device firmware"); - - /* Save the DDC file name for later */ - switch (ver.hw_variant) { -diff -r -u linux-hwe-5.13-5.13.0.orig/drivers/bluetooth/hci_ll.c linux-hwe-5.13-5.13.0/drivers/bluetooth/hci_ll.c ---- linux-hwe-5.13-5.13.0.orig/drivers/bluetooth/hci_ll.c 2021-06-27 18:21:11.000000000 -0400 -+++ linux-hwe-5.13-5.13.0/drivers/bluetooth/hci_ll.c 2022-01-06 14:21:46.930095575 -0500 -@@ -539,8 +539,8 @@ - - err = request_firmware(&fw, bts_scr_name, &lldev->serdev->dev); - if (err || !fw->data || !fw->size) { -- bt_dev_err(lldev->hu.hdev, "request_firmware failed(errno %d) for %s", -- err, bts_scr_name); -+ bt_dev_err(lldev->hu.hdev, "request_firmware failed(errno %d)", -+ err); - return -EINVAL; - } - ptr = (void *)fw->data; -diff -r -u linux-hwe-5.13-5.13.0.orig/drivers/bluetooth/hci_mrvl.c linux-hwe-5.13-5.13.0/drivers/bluetooth/hci_mrvl.c ---- linux-hwe-5.13-5.13.0.orig/drivers/bluetooth/hci_mrvl.c 2021-06-27 18:21:11.000000000 -0400 -+++ linux-hwe-5.13-5.13.0/drivers/bluetooth/hci_mrvl.c 2022-01-06 14:22:37.877253532 -0500 -@@ -277,7 +277,7 @@ - - err = request_firmware(&fw, name, &hdev->dev); - if (err < 0) { -- bt_dev_err(hdev, "Failed to load firmware file %s", name); -+ bt_dev_err(hdev, "Failed to load firmware file"); - return err; - } +- IWL_INFO(drv, "loaded firmware version %s op_mode %s\n", +- drv->fw.fw_version, op->name); ++ IWL_INFO(drv, "loaded firmware version %s\n", ++ drv->fw.fw_version); + /* add this device to the list of devices using this op_mode */ + list_add_tail(&drv->list, &op->drv); diff --git a/helpers/make-linux-hwe-5.13 b/helpers/make-linux-hwe-5.19 similarity index 51% rename from helpers/make-linux-hwe-5.13 rename to helpers/make-linux-hwe-5.19 index 88c5aae..7035db0 100644 --- a/helpers/make-linux-hwe-5.13 +++ b/helpers/make-linux-hwe-5.19 @@ -1,8 +1,7 @@ #!/bin/sh # -# Copyright (C) 2008-2022 Ruben Rodriguez -# Copyright (C) 2021 Luis Guzman -# Copyright (C) 2021 Pablo Correa Gómez +# Copyright (C) 2023 Luis Guzman +# Copyright (C) 2008-2023 Ruben Rodriguez # Copyright (C) 2019 David Trudgian # # This program is free software; you can redistribute it and/or modify @@ -20,18 +19,13 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=3 +VERSION=19 . ./config -for PATCH in $DATA/*.patch ; do - echo $PATCH - patch --no-backup-if-mismatch -p1 < $PATCH -done - PRESERVEDIRS=' -drivers/bluetooth drivers/gpu/drm/amd/amdgpu +drivers/gpu/drm/amd/pm/powerplay drivers/gpu/drm/r128 drivers/gpu/drm/radeon drivers/net/wireless/intel/ipw2x00 @@ -48,7 +42,9 @@ drivers/net/wireless/realtek/rtlwifi/rtl8192se drivers/net/wireless/realtek/rtlwifi/rtl8723ae drivers/net/wireless/realtek/rtlwifi/rtl8723be drivers/net/wireless/realtek/rtlwifi/rtl8821ae +drivers/net/wireless/broadcom/brcm80211 ' + TMPDIR=$(mktemp -d preserve-XXXX) PRESERVE=$(grep '^+++' $DATA/silent-accept-firmware.patch | /bin/sed 's/+++ //; s/\t.*//;' | cut -d/ -f2- | sort -u ) for FILE in $PRESERVE; do @@ -58,38 +54,63 @@ for DIR in $PRESERVEDIRS; do cp $DIR $TMPDIR --parents -a done -# Enable blobless activation - https://libreplanet.org/wiki/Group:Hardware/research/gpu/radeon -rm $TMPDIR/drivers/gpu/drm/radeon/ni.c - -sh $DATA/deblob-5.13 +sh $DATA/deblob-5.19 echo "Reverting deblobbing for files patched by silent-accept-firmware" cp $TMPDIR/* . -av rm -rf $TMPDIR +for PATCH in $DATA/*.patch ; do + echo $PATCH + patch --no-backup-if-mismatch -p1 < $PATCH +done + +# Simple test for finding missing cases of silent_accept_firmware method +#for dir in $PRESERVEDIRS; do +# grep -i "load.*firmware.*%" $PRESERVEDIRS -r +# grep -i "load.*ucode.*%" $PRESERVEDIRS -r +#done + # Wipe dkms-versions -# lists zfs / nvidia versions +# lists zfs / v4l2loopback versions echo > debian/dkms-versions # Remove ZFS rm zfs spl debian/scripts/misc/update-zfs.sh -rf -/bin/sed 's/spl-dkms, zfs-dkms//' -i debian/control debian.master/control.d/vars.generic debian.master/control.d/vars.* -/bin/sed '/^define build_zfs/,/^endef/d; /^define install_zfs/,/^endef/d; /zfs/d' -i debian/rules.d/2-binary-arch.mk -/bin/sed '/ifeq ($(do_zfs),false)/,/endif/d' -i debian/rules -/bin/sed '/zfs/d' -i debian.master/rules.d/* debian.master/d-i/modules/fs-core-modules debian.master/control.d/generic.inclusion-list debian.master/abi/*/*.modules debian/rules debian.master/control.d/vars.* +/bin/sed 's/spl-dkms, zfs-dkms//' -i debian/control \ + debian.master/control.d/vars.generic \ + debian.master/control.d/vars.* -# Remove nvidia -rm -rf debian/scripts/debian/scripts/dkms-build--nvidia-N -sed -i '/dkms-build--nvidia-N/d' debian.master/reconstruct -/bin/sed '/do_dkms_nvidia = true/d' -i debian/rules -/bin/sed '/do_dkms_nvidia/,/endif/d' -i debian/rules.d/2-binary-arch.mk +/bin/sed -i '/ifeq ($(do_zfs),false)/,/endif$/d' debian/rules +/bin/sed -i '/zfs/d' debian.master/abi/*/*.modules \ + debian/rules.d/2-binary-arch.mk \ + debian.master/rules.d/* \ + debian/rules +# debian.master/d-i/modules/fs-core-modules \ +# debian.master/control.d/generic.inclusion-list \ +# debian.master/control.d/vars.* # Remove VBox -/bin/sed '/do_dkms_vbox/d' -i debian.*/rules.d/* debian.hwe-*/scripts/helpers/local-mangle +#sed -i '/vbox/s|true|false|' debian.master/rules.d/amd64.mk + +# Remove v4l2loopback +/bin/sed -i '/ifeq ($(do_v4l2loopback),false)/,/endif$/d' debian/rules +/bin/sed -i '/v4l2loopback/d' debian/rules.d/2-binary-arch.mk \ + debian/rules +/bin/sed -i '/do_v4l2loopback/d' debian.master/rules.d/* + +# Remove nvidia +rm -rf debian/scripts/dkms-build--nvidia-N +grep -l dkms-build--nvidia-N debian.*/reconstruct|xargs sed -i '/dkms-build--nvidia-N/d' + +#/bin/sed '/do_dkms_nvidia = true/d' -i debian.master/abi/*/*/*.modules \ +# debian/rules \ +# debian.master/control.d/vars.* # Remove wireguard +/bin/sed '/ifeq ($(do_dkms_wireguard),false)/,/endif$/d' -i debian/rules #sed '/do_dkms_wireguard/d' -i debian/rules.d/2-binary-arch.mk -/bin/sed '/do_dkms_wireguard/d' -i debian.master/rules.d/* +#/bin/sed '/do_dkms_wireguard/d' -i debian.master/rules.d/* # Compile with less modules and avoid abi check echo 'skipmodule = true' >> debian.master/rules.d/0-common-vars.mk @@ -107,29 +128,48 @@ sed 's/.unsigned//' -i debian/scripts/control-create line=$(grep -n ')-Ubuntu' debian/rules.d/0-common-vars.mk|cut -d: -f1) sed $(expr $line - 1 ),$(expr $line + 1 )d debian/rules.d/0-common-vars.mk -i -sed 's/family=ubuntu/family=trisquel/' -i debian/rules.d/0-common-vars.mk -sed 's/ubuntu/trisquel/1' -i debian.*/etc/kernelconfig +#sed s/family=ubuntu/family=trisquel/ -i debian/rules.d/0-common-vars.mk +cat << EOF > debian.master/etc/kernelconfig +archs="amd64 i386 armhf arm64 ppc64el" +family='trisquel' +EOF rename s/ubuntu/trisquel/ debian.*/config/config.common.ubuntu +grep -lr config.common.ubuntu debian*/ | xargs sed -i 's|config.common.ubuntu|config.common.trisquel|g' find debian* -type f -name *control* -exec sed 's/ with Ubuntu patches//; s/Linux/Linux-libre/g' -i {} \; # Descriptions should not change based on the build arch sed 's/on DESC//; s/PKGVER on/PKGVER/; /^ DESC.$/d;' debian*/control.d/flavour-control.stub -i -sed '/^firmware/d' debian.master/abi/fwinfo debian.hwe-*/abi/fwinfo -i -echo > ./debian.master/d-i/firmware/nic-modules -echo > ./debian.master/d-i/firmware/scsi-modules +sed '/^firmware/d' ./debian*/abi/fwinfo -i +#echo > ./debian.master/d-i/firmware/nic-modules +#echo > ./debian.master/d-i/firmware/scsi-modules # Disable using udev as a fallback for firmware loading replace "CONFIG_FW_LOADER_USER_HELPER=y" "CONFIG_FW_LOADER_USER_HELPER=n" debian.master/config -cp debian.master/config debian.hwe -a +# Fix ports build +sed -i "/CONFIG_FW_LOADER_USER_HELPER/s|'armhf': 'y',|'armhf': 'n',|g" debian.master/config/annotations +sed -i "/CONFIG_FW_LOADER_USER_HELPER/s|'arm64': 'y',|'arm64': 'n',|g" debian.master/config/annotations +sed -i "/CONFIG_FW_LOADER_USER_HELPER/s|'ppc64el': 'y',|'ppc64el': 'n',|g" debian.master/config/annotations +sed -i "/CONFIG_FW_LOADER_USER_HELPER_FALLBACK/s|'armhf': 'n',|'armhf': '-',|g" debian.master/config/annotations +sed -i "/CONFIG_FW_LOADER_USER_HELPER_FALLBACK/s|'arm64': 'n',|'arm64': '-',|g" debian.master/config/annotations +sed -i "/CONFIG_FW_LOADER_USER_HELPER_FALLBACK/s|'ppc64el': 'n',|'ppc64el': '-',|g" debian.master/config/annotations + +# Disable aaeon. +sed -i "/AAEON/d" debian.master/config/annotations + +# Aramo using gcc-11 requires to disbale the following anottations, +# see more at: debian.hwe-5.19/scripts/helpers/local-mangle +sed -i '/CONFIG_INIT_STACK_ALL_ZERO/s|y|-|g' debian.master/config/annotations +sed -i '/CONFIG_SHADOW_CALL_STACK/s|y|-|g' debian.master/config/annotations + +cp debian.master/config debian.hwe-5.19 -a changelog "Removed non-free bits" cp debian/changelog debian.master/changelog -cp debian/changelog debian.hwe/changelog -cp debian/changelog debian.hwe-5.13/changelog +cp debian/changelog debian.hwe-5.19/changelog compile diff --git a/helpers/make-linux-meta-hwe-5.13 b/helpers/make-linux-meta-hwe-5.19 similarity index 59% rename from helpers/make-linux-meta-hwe-5.13 rename to helpers/make-linux-meta-hwe-5.19 index e90948d..b2ab6a8 100644 --- a/helpers/make-linux-meta-hwe-5.13 +++ b/helpers/make-linux-meta-hwe-5.19 @@ -1,7 +1,6 @@ #!/bin/sh # -# Copyright (C) 2017-2020 Ruben Rodriguez -# Copyright (C) 2021 Luis Guzman +# Copyright (C) 2017-2018 Ruben Rodriguez # # 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 @@ -18,22 +17,18 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=1 - +VERSION=6 . ./config -find debian/control.d/ -type f | grep -v -e '/generic$' -e '/lowlatency$' -e '/virtual$' |xargs rm - -cat debian/control.d/* >> debian/control -sed 's/${variant:suffix}/-20.04/' -i debian/control - -/bin/sed 's/linux-firmware/firmware-linux-free/' -i debian/control ./debian/control.d/* +sed 's/22.04/11.0/g' -i debian/control +sed 's/20.04/10.0/g' -i debian/control +#sed 's/Xenial/Flidas/; s/Bionic/Etiona/' -i debian/control +sed 's/linux-firmware/firmware-linux-free/' -i debian/control ./debian/control.d/generic* sed 's/Ubuntu/upstream/' -i debian/control -sed 's/Linux/Linux-libre/g' -i debian/control ./debian/control.d/generic debian/control.d/lowlatency -sed 's/, intel-microcode \[amd64\]//; s/, amd64-microcode \[amd64\]//;' debian/control debian/control.d/generic debian/control.d/lowlatency -i +sed 's/Linux/Linux-libre/g' -i debian/control ./debian/control.d/generic* +sed 's/, intel-microcode \[amd64\]//; s/, amd64-microcode \[amd64\]//;' -i debian/control debian/control.d/generic -echo '-hwe-20.04' > debian/variants -changelog "Removed nonfree kernel variants, renamed release for Trisquel" +changelog "Removed linux-firmware dependency, renamed release for Trisquel" compile