diff --git a/helpers/DATA/linux/deblob-5.15 b/helpers/DATA/linux/deblob-5.15 index 4d406ed7ecb3a1a34c5c41b53c8d28e05442b470..6ff362cf2cb6e7100a44a46f64573fbce19f4311 100644 --- a/helpers/DATA/linux/deblob-5.15 +++ b/helpers/DATA/linux/deblob-5.15 @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2008-2022 Alexandre Oliva <lxoliva@fsfla.org> +# Copyright (C) 2008-2023 Alexandre Oliva <lxoliva@fsfla.org> # Copyright (C) 2008 Jeff Moe # Copyright (C) 2009 Rubén RodrÃguez <ruben@gnu.org> # @@ -646,6 +646,9 @@ s,\(timeout = \)\(firmware_loading_timeout()\),\1is_nonfree_firmware(name) ? 1 : announce MICROCODE_AMD - "AMD microcode patch loading support" reject_firmware arch/x86/kernel/cpu/microcode/amd.c clean_blob arch/x86/kernel/cpu/microcode/amd.c +if grep -q -i zenbleed.*microcode arch/x86/kernel/cpu/amd.c; then + clean_blob arch/x86/kernel/cpu/amd.c +fi clean_kconfig arch/x86/Kconfig MICROCODE_AMD clean_mk CONFIG_MICROCODE_AMD arch/x86/kernel/cpu/microcode/Makefile @@ -3825,14 +3828,26 @@ 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 +if test -f drivers/bus/mhi/host/boot.c; then + 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 +else + 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 +fi 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 +if test -f drivers/bus/mhi/host/pci_generic.c; then + 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 +else + 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 +fi # Greybus @@ -3873,6 +3888,9 @@ 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 +if grep -q '/apq8016/' arch/arm64/boot/dts/qcom/apq8016-sbc.dts; then + clean_blob arch/arm64/boot/dts/qcom/apq8016-sbc.dts +fi clean_kconfig arch/arm/mach-qcom/Kconfig ARCH_QCOM clean_mk CONFIG_ARCH_QCOM arch/arm64/boot/dts/qcom/Makefile diff --git a/helpers/DATA/linux/deblob-check b/helpers/DATA/linux/deblob-check index 4a6e68efc861ba0677702e9c2222f04ed2f381e4..f95f260cdf11cd2ea07d5721f8c8899f1653bb09 100644 --- a/helpers/DATA/linux/deblob-check +++ b/helpers/DATA/linux/deblob-check @@ -18,6 +18,12 @@ # modified with 2022-11-16 r18984 # modified with 2022-11-27 r18997 (partial) # modified with 2023-02-01 r19031 +# modified with 2023-03-17 r19120 +# modified with 2023-05-17 r19267 +# modified with 2023-06-09 r19312 +# modified with 2021-12-20 r18515 (more partial) +# modified with 2023-07-24 r19347 +# modified with 2023-08-08 r19366 # Inspired in gNewSense's find-firmware script. # Written by Alexandre Oliva <lxoliva@fsfla.org> @@ -6391,6 +6397,26 @@ set_except () { # New in 6.1.9, 5.15.91, 5.10.166. blobname 'gsl1680-csl-panther-tab-hd\.fw' drivers/platform/x86/touchscreen_dmi.c + # New in 6.2.7, 6.1.20, 5.15.103, 5.10.175, 5.4.237, 4.19.278, 4.14.310. + accept '[\t][ ][*][ ]updated[ ]microcode[ ]at[ ]the[ ]time' arch/x86/kernel/cpu/amd.c + + # New in 6.3.3, 6.2.16, 6.1.29, 5.15.112, 5.10.180, 5.4.243, 4.19.283. + blobname 'gsl1680-dexp-ursus-kx210i\.fw' drivers/platform/x86/touchscreen_dmi.c + + # New in 6.3.7, 6.1.33, 5.15.115, 5.10.183, 5.4.246. + accept '[\t][\t]req->name[ ]=[ ]test_fw_config->name[;][\n][\t][\t]req->fw_buf[ ]=[ ]NULL[;][\n][\t][\t]req->fw[ ]=[ ]NULL[;][\n][\t][\t]req->idx[ ]=[ ]i[;][\n][\t][\t]init_completion[(][&]req->completion[)][;][\n][\t][\t]rc[ ]=[ ]request_firmware_nowait[(]THIS_MODULE[,][ ]\([^);, \t\n]*[,][ \t\n]*\)*trigger_batched_cb[)][;]' lib/test_firmware.c + + # New in 5.15.121. + blobname 'qcom[/]apq8016[/]\(\(mba\|modem\|wcnss\)\.mbn\|WCNSS_qcom_wlan_nv_sbc\.bin\)' arch/arm64/boot/dts/qcom/apq8016-sbc.dts + + # New in 6.4.6, 6.1.41, 5.15.122, 5.10.187, 5.4.250, 4.19.289. + blobna 'please[ ]update[ ]your[ ]microcode' arch/x86/kernel/cpu/amd.c + + # New in 6.4.9, 6.1.44, 5.15.125, 5.10.189, 5.4.252, 4.19.290, 4.14.320. + accept 'GDS[ ]can[ ]also[ ]be[ ]mitigated[ ]on[ ]systems[ ]that[ ]don.t[ ]have[ ]updated[ ]microcode' Documentation/admin-guide/hw-vuln/gather_data_sampling.rst + accept 'The[ ]updated[ ]microcode[ ]will[ ]enable[ ]the[ ]mitigation[ ]by[ ]default' Documentation/admin-guide/hw-vuln/gather_data_sampling.rst + accept '[\t]*This[ ]issue[ ]is[ ]mitigated[ ]by[ ]default[ ]in[ ]updated[ ]microcode' Documentation/admin-guide/kernel-parameters.txt + ;; */*freedo*.patch | */*logo*.patch)