X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-4.4;h=be9aea6bec3f7754ac72b56d0bf466f02455cf26;hb=97bedd83912ef426b5621245847518d02ebe248a;hp=b3f9c427ed6dd6f602bc2e178e68ae218223eb9a;hpb=969f4ae1498609a4ac0b111f7acaf0cad4eddeb2;p=releases.git diff --git a/deblob-4.4 b/deblob-4.4 index b3f9c427ed6d..be9aea6bec3f 100755 --- a/deblob-4.4 +++ b/deblob-4.4 @@ -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=4.4 extra= +kver=4.4 extra=1 set -e @@ -396,7 +396,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\ @@ -404,18 +404,20 @@ report_missing_free_firmware(const char *name, const char *what)\ {\ printk(KERN_ERR "%s: Missing Free %s (non-Free firmware loading is disabled)\\n", name,\ what ? what : "firmware");\ - return -EINVAL;\ + return -ENOENT;\ }\ static inline int\ reject_firmware(const struct firmware **fw,\ const char *name, struct device *device)\ {\ const struct firmware *xfw = NULL;\ - int retval;\ - report_missing_free_firmware(dev_name(device), NULL);\ + int retval, retval0;\ + retval0 = report_missing_free_firmware(dev_name(device), NULL);\ retval = request_firmware(&xfw, NONFREE_FIRMWARE, device);\ - if (!retval)\ + if (!retval) {\ release_firmware(xfw);\ + retval = retval0;\ + }\ return -EINVAL;\ }\ static inline int\ @@ -432,17 +434,15 @@ reject_firmware_direct(const struct firmware **fw,\ const char *name, struct device *device)\ {\ const struct firmware *xfw = NULL;\ - int retval;\ - report_missing_free_firmware(dev_name(device), 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)\ + if (!retval) {\ release_firmware(xfw);\ - return -EINVAL;\ -}\ -static inline void\ -discard_rejected_firmware(const struct firmware *fw, void *context)\ -{\ - release_firmware(fw);\ + retval = retval0;\ + }\ + return retval;\ }\ static inline int\ reject_firmware_nowait(struct module *module, int uevent,\ @@ -451,14 +451,10 @@ reject_firmware_nowait(struct module *module, int uevent,\ void (*cont)(const struct firmware *fw,\ void *context))\ {\ - int retval;\ report_missing_free_firmware(dev_name(device), NULL);\ - retval = request_firmware_nowait(module, uevent, NONFREE_FIRMWARE,\ - device, gfp, NULL,\ - discard_rejected_firmware);\ - if (retval)\ - return retval;\ - return -EINVAL;\ + /* We assume NONFREE_FIRMWARE will not be found; how could it? */\ + return request_firmware_nowait(module, uevent, NONFREE_FIRMWARE,\ + device, gfp, context, cont);\ }\ static inline int\ maybe_reject_firmware_nowait(struct module *module, int uevent,\ @@ -487,7 +483,7 @@ static inline int\ maybe_reject_ihex_firmware(const struct firmware **fw,\ const char *name, struct device *device)\ {\ - if (strstr (name, NONFREE_FIRMWARE))\ + if (is_nonfree_firmware(name))\ return reject_firmware(fw, name, device);\ else\ return request_ihex_firmware(fw, name, device);\ @@ -522,6 +518,18 @@ clean_mk CONFIG_MICROCODE_INTEL arch/x86/kernel/cpu/microcode/Makefile announce MICROCODE_EARLY - "Early load microcode" clean_blob Documentation/x86/early-microcode.txt +# Do no recommend non-Free microcode update. +announce CPU_SUP_INTEL - "Support Intel processors" +clean_blob arch/x86/kernel/cpu/perf_event_intel.c +clean_kconfig arch/x86/Kconfig.cpu CPU_SUP_INTEL +clean_mk CONFIG_CPU_SUP_INTEL arch/x86/kernel/cpu/Makefile + +# Do no recommend non-Free microcode update. +announce SENSORS_CORETEMP - "Intel Core/Core2/Atom temperature sensor" +clean_blob drivers/hwmon/coretemp.c +clean_kconfig drivers/hwmon/Kconfig SENSORS_CORETEMP +clean_mk CONFIG_SENSORS_CORETEMP drivers/hwmon/Makefile + # arm announce IXP4XX_NPE - "IXP4xx Network Processor Engine support" @@ -750,6 +758,22 @@ clean_blob drivers/gpu/drm/sti/sti_hqvdp.c clean_kconfig drivers/gpu/drm/sti/Kconfig DRM_STI clean_mk CONFIG_DRM_STI drivers/gpu/drm/sti/Makefile +# ppc + +announce UCODE_PATCH - "ppc microcode" +clean_blob arch/powerpc/sysdev/micropatch.c +clean_kconfig arch/powerpc/platforms/8xx/Kconfig UCODE_PATCH +clean_mk CONFIG_UCODE_PATCH arch/powerpc/sysdev/Makefile + +announce USB_SOF_UCODE_PATCH - "USB SOF patch" +clean_kconfig arch/powerpc/platforms/8xx/Kconfig USB_SOF_UCODE_PATCH + +announce I2C_SPI_UCODE_PATCH - "I2C/SPI relocation patch" +clean_kconfig arch/powerpc/platforms/8xx/Kconfig I2C_SPI_UCODE_PATCH + +announce I2C_SPI_SMC1_UCODE_PATCH - "I2C/SPI/SMC1 relocation patch" +clean_kconfig arch/powerpc/platforms/8xx/Kconfig I2C_SPI_SMC1_UCODE_PATCH + ####### # dma # ####### @@ -1326,6 +1350,11 @@ clean_blob drivers/media/i2c/s5k5baf.c clean_kconfig drivers/media/i2c/Kconfig VIDEO_S5K5BAF clean_mk CONFIG_VIDEO_S5K5BAF drivers/media/i2c/Makefile +announce VIDEO_VS6624 - "ST VS6624 sensor support" +clean_blob drivers/media/i2c/vs6624.c +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 @@ -1718,14 +1747,20 @@ clean_sed ' goto error;\ } }' drivers/net/wireless/b43/main.c 'double-check and reject non-Free firmware' -# Major portions of firmware filenames not deblobbed. +clean_sed ' +/^[\t]*filename = "\(ucode\|b0g0\(bs\)\?initvals\)5";$/! { + s,^\([\t]*filename = "\)\(ucode\|pcm\|[^ "]*initvals\)[0-9][^ ."]*";,\1/*(DEBLOBBED)*/";,g +}' drivers/net/wireless/b43/main.c 'cleaned up blob basenames' clean_blob drivers/net/wireless/b43/main.c clean_kconfig drivers/net/wireless/b43/Kconfig B43 clean_mk CONFIG_B43 drivers/net/wireless/b43/Makefile announce B43LEGACY - "Broadcom 43xx-legacy wireless support (mac80211 stack)" reject_firmware drivers/net/wireless/b43legacy/main.c -# Major portions of firwmare filenames not deblobbed. +clean_sed ' +{ + s,^\([\t]*filename = "\)\(ucode\|pcm\|[^ "]*initvals\)[0-9][^ ."]*";,\1/*(DEBLOBBED)*/";,g +}' drivers/net/wireless/b43legacy/main.c 'cleaned up blob basenames' clean_blob drivers/net/wireless/b43legacy/main.c clean_kconfig drivers/net/wireless/b43legacy/Kconfig B43LEGACY clean_mk CONFIG_B43LEGACY drivers/net/wireless/b43legacy/Makefile @@ -2574,6 +2609,7 @@ announce SCSI_LPFC - "Emulex LightPulse Fibre Channel Support" # this is the hardware or the software inducing to the installation of # non-Free firmware. reject_firmware drivers/scsi/lpfc/lpfc_init.c +clean_blob drivers/scsi/lpfc/lpfc_init.c clean_kconfig drivers/scsi/Kconfig SCSI_LPFC clean_mk CONFIG_SCSI_LPFC drivers/scsi/lpfc/Makefile @@ -2965,11 +3001,7 @@ clean_blob sound/pci/rme9652/hdsp.c clean_kconfig sound/pci/Kconfig SND_HDSP clean_mk CONFIG_SND_HDSP sound/pci/rme9652/Makefile -announce SND_AICA - "Dreamcast Yamaha AICA sound" -reject_firmware sound/sh/aica.c -clean_blob sound/sh/aica.c -clean_kconfig sound/sh/Kconfig SND_AICA -clean_mk CONFIG_SND_AICA sound/sh/Makefile +# SND_AICA is no longer disabled, its firmware is Free Software. announce SND_MSND_PINNACLE - "Support for Turtle Beach MultiSound Pinnacle" clean_blob sound/isa/msnd/msnd_pinnacle.h @@ -3175,6 +3207,15 @@ clean_blob firmware/WHENCE 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