From: Alexandre Oliva <lxoliva@fsfla.org>
Date: Wed, 23 Mar 2022 21:56:20 +0000 (-0400)
Subject: GNU Linux-libre 5.15.31-gnu scripts
X-Git-Tag: scripts/v5.15.31-gnu^0
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=84e3780988dd5981b3f96c58a06cdcbeb905f4fc;p=releases.git

GNU Linux-libre 5.15.31-gnu scripts
---

diff --git a/deblob-5.15 b/deblob-5.15
index a398ea0166e..190303eb5d7 100755
--- a/deblob-5.15
+++ b/deblob-5.15
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-#    Copyright (C) 2008-2021 Alexandre Oliva <lxoliva@fsfla.org>
+#    Copyright (C) 2008-2022 Alexandre Oliva <lxoliva@fsfla.org>
 #    Copyright (C) 2008 Jeff Moe
 #    Copyright (C) 2009 Rubén Rodríguez <ruben@gnu.org>
 #
@@ -1782,7 +1782,10 @@ 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 '
+if grep -q loaded_fw_major drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c; then
+  clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+else
+  clean_sed '
 /^int bnx2x_compare_fw_ver/,/^}$/{
   /^		u32 my_fw = /i\
 		/*(DEBLOBBED)*/
@@ -1793,6 +1796,7 @@ clean_sed '
 		u32 my_fw = ~loaded_fw;
   }
 }' drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c 'fail already-loaded test'
+fi
 clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
 clean_sed '
 /static void bnx2x_init_wr_wb/{
@@ -2867,6 +2871,9 @@ 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
+if grep -q MODULE_FIRMWARE drivers/net/phy/mscc/mscc_main.c; then
+  clean_blob drivers/net/phy/mscc/mscc_main.c
+fi
 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
@@ -3199,7 +3206,7 @@ clean_mk CONFIG_USB_UEAGLEATM drivers/usb/atm/Makefile
 
 # host
 
-announce USB_XHCI_PCI_RENESAS - "Support for additional Renesas xHCI controller with firwmare"
+announce USB_XHCI_PCI_RENESAS - "Support for additional Renesas xHCI controller with firmware"
 reject_firmware_nowarn 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
diff --git a/deblob-check b/deblob-check
index 910857795cf..b3f8fd82302 100755
--- a/deblob-check
+++ b/deblob-check
@@ -7,6 +7,7 @@
 #        modified with 2022-01-29 r18573
 #        modified with 2022-02-23 r18607
 #        modified with 2021-12-20 r18515 (partial)
+#        modified with 2022-03-20 r18637
 # Inspired in gNewSense's find-firmware script.
 # Written by Alexandre Oliva <lxoliva@fsfla.org>
 
@@ -6341,6 +6342,9 @@ set_except () {
     # New in 5.15.27.
     defsc 'static[ ]const[ ]u16[ ]amdgpu_unsupported_pciidlist\[\][ ]=' drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
 
+    # New in 5.16.17, 5.15.31, 5.10.108.
+    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
+
     ;;
 
   */*freedo*.patch | */*logo*.patch)