CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

linux-hwe-5.19: restore silent-patch original function

Browse source
This commit is contained in:
Luis Guzmán 2023-06-13 18:19:41 +00:00
parent b59d82ea6f
commit a01dd44cba
2 changed files with 88 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

162
helpers/DATA/linux-hwe-5.19/silent-accept-firmware.patch
View file

@ -1634,29 +1634,30 @@ diff -Nru --color a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/w
/* add this device to the list of devices using this op_mode */
list_add_tail(&drv->list, &op->drv);
diff -ru a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
--- a/drivers/bluetooth/ath3k.c 2023-06-01 00:40:38.000000000 -0600
+++ b/drivers/bluetooth/ath3k.c 2023-06-09 16:48:40.803964667 -0600
@@ -382,7 +382,7 @@
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index 88262d3..93b3826 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -382,7 +382,7 @@ static int ath3k_load_patch(struct usb_device *udev)
ret = reject_firmware(&firmware, filename, &udev->dev);
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;
}
@@ -445,7 +445,7 @@
@@ -445,7 +445,7 @@ static int ath3k_load_syscfg(struct usb_device *udev)
ret = reject_firmware(&firmware, filename, &udev->dev);
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;
}
@@ -504,8 +504,7 @@
ret = reject_firmware(&firmware, ATH3K_FIRMWARE, &udev->dev);
@@ -504,8 +504,7 @@ static int ath3k_probe(struct usb_interface *intf,
ret = request_firmware(&firmware, ATH3K_FIRMWARE, &udev->dev);
if (ret < 0) {
if (ret == -ENOENT)
- BT_ERR("Firmware file \"%s\" not found",
@ -1665,10 +1666,11 @@ diff -ru a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
else
BT_ERR("Firmware file \"%s\" request failed (err=%d)",
ATH3K_FIRMWARE, ret);
diff -ru a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
--- a/drivers/bluetooth/btbcm.c 2023-06-01 00:40:38.000000000 -0600
+++ b/drivers/bluetooth/btbcm.c 2023-06-09 16:49:53.962459373 -0600
@@ -640,9 +640,7 @@
diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
index d8fe39e..f9c6a53 100644
--- a/drivers/bluetooth/btbcm.c
+++ b/drivers/bluetooth/btbcm.c
@@ -640,9 +640,7 @@ int btbcm_initialize(struct hci_dev *hdev, bool *fw_load_done)
release_firmware(fw);
} else {
@ -1679,12 +1681,13 @@ diff -ru a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
}
kfree(fw_name);
diff -ru a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
--- a/drivers/bluetooth/btintel.c 2023-06-01 00:40:38.000000000 -0600
+++ b/drivers/bluetooth/btintel.c 2023-06-10 04:09:53.015083694 -0600
@@ -346,8 +346,8 @@
diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
index 0c2542c..dc1fa9b 100644
--- a/drivers/bluetooth/btintel.c
+++ b/drivers/bluetooth/btintel.c
@@ -346,8 +346,8 @@ int btintel_load_ddc_config(struct hci_dev *hdev, const char *ddc_name)
err = reject_firmware_direct(&fw, ddc_name, &hdev->dev);
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);
@ -1693,7 +1696,7 @@ diff -ru a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
return err;
}
@@ -1412,8 +1412,8 @@
@@ -1412,8 +1412,8 @@ static const struct firmware *btintel_legacy_rom_get_fw(struct hci_dev *hdev,
return NULL;
}
@ -1704,7 +1707,7 @@ diff -ru a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
/* If the correct firmware patch file is not found, use the
* default firmware patch file instead
@@ -1421,8 +1421,7 @@
@@ -1421,8 +1421,7 @@ static const struct firmware *btintel_legacy_rom_get_fw(struct hci_dev *hdev,
snprintf(fwname, sizeof(fwname), "intel/ibt-hw-%x.%x.bseq",
ver->hw_platform, ver->hw_variant);
if (request_firmware(&fw, fwname, &hdev->dev) < 0) {
@ -1714,7 +1717,7 @@ diff -ru a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
return NULL;
}
}
@@ -1913,8 +1912,8 @@
@@ -1913,8 +1912,8 @@ download:
return 0;
}
@ -1725,7 +1728,7 @@ diff -ru a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
return err;
}
@@ -2102,8 +2101,8 @@
@@ -2102,8 +2101,8 @@ static int btintel_prepare_fw_download_tlv(struct hci_dev *hdev,
return 0;
}
@ -1736,10 +1739,11 @@ diff -ru a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
return err;
}
diff -ru a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
--- a/drivers/bluetooth/btrtl.c 2023-06-01 00:40:38.000000000 -0600
+++ b/drivers/bluetooth/btrtl.c 2023-06-09 16:55:44.058397652 -0600
@@ -693,8 +693,7 @@
diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
index 47c28fd..020fe67 100644
--- a/drivers/bluetooth/btrtl.c
+++ b/drivers/bluetooth/btrtl.c
@@ -693,8 +693,7 @@ out_free:
btrtl_dev->fw_len = rtl_load_file(hdev, btrtl_dev->ic_info->fw_name,
&btrtl_dev->fw_data);
if (btrtl_dev->fw_len < 0) {
@ -1749,7 +1753,7 @@ diff -ru a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
ret = btrtl_dev->fw_len;
goto err_free;
}
@@ -711,8 +710,7 @@
@@ -711,8 +710,7 @@ out_free:
&btrtl_dev->cfg_data);
if (btrtl_dev->ic_info->config_needed &&
btrtl_dev->cfg_len <= 0) {
@ -1759,26 +1763,28 @@ diff -ru a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
ret = btrtl_dev->cfg_len;
goto err_free;
}
diff -ru a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
--- a/drivers/bluetooth/btusb.c 2023-06-01 00:40:38.000000000 -0600
+++ b/drivers/bluetooth/btusb.c 2023-06-09 16:56:44.388454908 -0600
@@ -3338,8 +3338,8 @@
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 3a40f84..8c6d37d 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -3338,8 +3338,8 @@ static int btusb_setup_qca_load_nvm(struct hci_dev *hdev,
err = reject_firmware(&fw, fwname, &hdev->dev);
err = request_firmware(&fw, fwname, &hdev->dev);
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)",
+ bt_dev_err(hdev, "failed to request NVM file: (%d)",
+ err);
return err;
}
diff -ru a/drivers/bluetooth/hci_ag6xx.c b/drivers/bluetooth/hci_ag6xx.c
--- a/drivers/bluetooth/hci_ag6xx.c 2023-06-01 00:40:38.000000000 -0600
+++ b/drivers/bluetooth/hci_ag6xx.c 2023-06-09 16:58:37.792321983 -0600
@@ -195,8 +195,8 @@
diff --git a/drivers/bluetooth/hci_ag6xx.c b/drivers/bluetooth/hci_ag6xx.c
index 2d40302..d35d7e0 100644
--- a/drivers/bluetooth/hci_ag6xx.c
+++ b/drivers/bluetooth/hci_ag6xx.c
@@ -195,8 +195,8 @@ static int ag6xx_setup(struct hci_uart *hu)
err = reject_firmware(&fw, fwname, &hdev->dev);
err = request_firmware(&fw, fwname, &hdev->dev);
if (err < 0) {
- bt_dev_err(hdev, "Failed to open Intel bddata file: %s (%d)",
- fwname, err);
@ -1787,9 +1793,9 @@ diff -ru a/drivers/bluetooth/hci_ag6xx.c b/drivers/bluetooth/hci_ag6xx.c
goto patch;
}
@@ -232,8 +232,8 @@
@@ -232,8 +232,8 @@ patch:
err = reject_firmware(&fw, fwname, &hdev->dev);
err = request_firmware(&fw, fwname, &hdev->dev);
if (err < 0) {
- bt_dev_err(hdev, "Failed to open Intel patch file: %s(%d)",
- fwname, err);
@ -1798,34 +1804,37 @@ diff -ru a/drivers/bluetooth/hci_ag6xx.c b/drivers/bluetooth/hci_ag6xx.c
goto complete;
}
fw_ptr = fw->data;
diff -ru a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c
--- a/drivers/bluetooth/hci_ll.c 2023-06-01 00:40:38.000000000 -0600
+++ b/drivers/bluetooth/hci_ll.c 2023-06-09 17:02:03.515337142 -0600
@@ -539,7 +539,7 @@
diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c
index 5abc01a..3a08e98 100644
--- a/drivers/bluetooth/hci_ll.c
+++ b/drivers/bluetooth/hci_ll.c
@@ -539,7 +539,7 @@ static int download_firmware(struct ll_device *lldev)
err = reject_firmware(&fw, bts_scr_name, &lldev->serdev->dev);
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",
+ bt_dev_err(lldev->hu.hdev, "request_firmware failed (errno %d) for %s",
err, bts_scr_name);
return -EINVAL;
}
diff -ru a/drivers/bluetooth/hci_mrvl.c b/drivers/bluetooth/hci_mrvl.c
--- a/drivers/bluetooth/hci_mrvl.c 2023-06-01 00:40:38.000000000 -0600
+++ b/drivers/bluetooth/hci_mrvl.c 2023-06-09 17:03:08.897566678 -0600
@@ -277,7 +277,7 @@
diff --git a/drivers/bluetooth/hci_mrvl.c b/drivers/bluetooth/hci_mrvl.c
index fbc3f7c..054b30a 100644
--- a/drivers/bluetooth/hci_mrvl.c
+++ b/drivers/bluetooth/hci_mrvl.c
@@ -277,7 +277,7 @@ static int mrvl_load_firmware(struct hci_dev *hdev, const char *name)
err = reject_firmware(&fw, name, &hdev->dev);
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;
}
diff -ru a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
--- a/drivers/gpu/drm/i915/display/intel_dmc.c 2023-06-01 00:40:38.000000000 -0600
+++ b/drivers/gpu/drm/i915/display/intel_dmc.c 2023-06-09 17:08:16.740066542 -0600
@@ -693,11 +693,8 @@
diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
index a171d42..b2fb944 100644
--- a/drivers/gpu/drm/i915/display/intel_dmc.c
+++ b/drivers/gpu/drm/i915/display/intel_dmc.c
@@ -696,11 +696,8 @@ static void dmc_load_work_fn(struct work_struct *work)
DMC_VERSION_MINOR(dmc->version));
} else {
drm_notice(&dev_priv->drm,
@ -1839,11 +1848,12 @@ diff -ru a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/displ
}
release_firmware(fw);
diff -ru a/drivers/gpu/drm/i915/display/intel_opregion.c b/drivers/gpu/drm/i915/display/intel_opregion.c
--- a/drivers/gpu/drm/i915/display/intel_opregion.c 2023-06-01 00:40:38.000000000 -0600
+++ b/drivers/gpu/drm/i915/display/intel_opregion.c 2023-06-09 17:10:28.248552040 -0600
@@ -846,8 +846,8 @@
ret = reject_firmware(&fw, name, dev_priv->drm.dev);
diff --git a/drivers/gpu/drm/i915/display/intel_opregion.c b/drivers/gpu/drm/i915/display/intel_opregion.c
index f31e8c3..a4188d6 100644
--- a/drivers/gpu/drm/i915/display/intel_opregion.c
+++ b/drivers/gpu/drm/i915/display/intel_opregion.c
@@ -846,8 +846,8 @@ static int intel_load_vbt_firmware(struct drm_i915_private *dev_priv)
ret = request_firmware(&fw, name, dev_priv->drm.dev);
if (ret) {
drm_err(&dev_priv->drm,
- "Requesting VBT firmware \"%s\" failed (%d)\n",
@ -1853,7 +1863,7 @@ diff -ru a/drivers/gpu/drm/i915/display/intel_opregion.c b/drivers/gpu/drm/i915/
return ret;
}
@@ -863,8 +863,7 @@
@@ -863,8 +863,7 @@ static int intel_load_vbt_firmware(struct drm_i915_private *dev_priv)
ret = -ENOMEM;
}
} else {
@ -1863,11 +1873,12 @@ diff -ru a/drivers/gpu/drm/i915/display/intel_opregion.c b/drivers/gpu/drm/i915/
ret = -EINVAL;
}
diff -ru a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c 2023-06-01 00:40:38.000000000 -0600
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c 2023-06-09 17:23:28.611169098 -0600
@@ -364,13 +364,8 @@
err = firmware_reject_nowarn(&fw, uc_fw->fallback.path, dev);
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index 703f42b..58c843c 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -368,13 +368,8 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw)
err = firmware_request_nowarn(&fw, uc_fw->fallback.path, dev);
if (!err) {
drm_notice(&i915->drm,
- "%s firmware %s is recommended, but only %s was found\n",
@ -1882,7 +1893,7 @@ diff -ru a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc
uc_fw->path = uc_fw->fallback.path;
uc_fw->major_ver_wanted = uc_fw->fallback.major_ver;
@@ -475,10 +470,8 @@
@@ -479,10 +474,8 @@ fail:
INTEL_UC_FIRMWARE_MISSING :
INTEL_UC_FIRMWARE_ERROR);
@ -1890,12 +1901,12 @@ diff -ru a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc
- intel_uc_fw_type_repr(uc_fw->type), uc_fw->path, err);
- drm_info(&i915->drm, "%s firmware(s) can be downloaded from %s\n",
- intel_uc_fw_type_repr(uc_fw->type), INTEL_UC_FIRMWARE_URL);
+ i915_probe_error(i915, "%s firmware: fetch failed with error %d\n",
+ i915_probe_error(i915, "%s firmware fetch failed with error %d\n",
+ intel_uc_fw_type_repr(uc_fw->type), err);
release_firmware(fw); /* OK even if fw is NULL */
return err;
@@ -614,9 +607,8 @@
@@ -618,9 +611,8 @@ int intel_uc_fw_upload(struct intel_uc_fw *uc_fw, u32 dst_offset, u32 dma_flags)
return 0;
fail:
@ -1907,26 +1918,27 @@ diff -ru a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc
intel_uc_fw_change_status(uc_fw, INTEL_UC_FIRMWARE_LOAD_FAIL);
return err;
}
diff -ru a/drivers/gpu/drm/i915/gvt/firmware.c b/drivers/gpu/drm/i915/gvt/firmware.c
--- a/drivers/gpu/drm/i915/gvt/firmware.c 2023-06-01 00:40:38.000000000 -0600
+++ b/drivers/gpu/drm/i915/gvt/firmware.c 2023-06-09 17:26:07.484588307 -0600
@@ -183,8 +183,8 @@
diff --git a/drivers/gpu/drm/i915/gvt/firmware.c b/drivers/gpu/drm/i915/gvt/firmware.c
index 54fe442..1079138 100644
--- a/drivers/gpu/drm/i915/gvt/firmware.c
+++ b/drivers/gpu/drm/i915/gvt/firmware.c
@@ -183,8 +183,8 @@ static int verify_firmware(struct intel_gvt *gvt,
return 0;
invalid_firmware:
- gvt_dbg_core("Invalid firmware: %s [file] 0x%llx [request] 0x%llx\n",
- item, file, request);
+ gvt_dbg_core("Invalid firmware [request] 0x%llx\n",
+ gvt_dbg_core("Invalid firmware: [request] 0x%llx\n",
+ request);
return -EINVAL;
}
@@ -231,7 +231,7 @@
@@ -231,7 +231,7 @@ int intel_gvt_load_firmware(struct intel_gvt *gvt)
GVT_FIRMWARE_PATH, pdev->vendor, pdev->device,
pdev->revision);
- gvt_dbg_core("request hw state firmware %s...\n", path);
+ gvt_dbg_core("request hw state firmware\n");
ret = reject_firmware(&fw, path, gvt->gt->i915->drm.dev);
ret = request_firmware(&fw, path, gvt->gt->i915->drm.dev);
kfree(path);

2
helpers/make-linux-hwe-5.19
View file

@ -19,7 +19,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=20
VERSION=21
. ./config