diff options
author | Iván Ávalos <avalos@disroot.org> | 2022-07-10 16:05:04 -0500 |
---|---|---|
committer | bill-auger <mr.j.spam.me@gmail.com> | 2022-07-15 03:33:24 -0400 |
commit | fa70b032579aeb81f0625febff96339da7fa24f5 (patch) | |
tree | ae80f897cc2f27d8d6eb234b0d699ec8fb94be6d /libre/linux-libre-64/0005-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch | |
parent | 3db6372809ed0b37a2d11a072b34230ec0d6a8af (diff) | |
download | abslibre-fa70b032579aeb81f0625febff96339da7fa24f5.tar.gz abslibre-fa70b032579aeb81f0625febff96339da7fa24f5.tar.bz2 abslibre-fa70b032579aeb81f0625febff96339da7fa24f5.zip |
[linux-libre-64]: WIP - upgrade to v5.18.5
Diffstat (limited to 'libre/linux-libre-64/0005-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch')
-rw-r--r-- | libre/linux-libre-64/0005-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/libre/linux-libre-64/0005-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch b/libre/linux-libre-64/0005-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch deleted file mode 100644 index f279924d7..000000000 --- a/libre/linux-libre-64/0005-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch +++ /dev/null @@ -1,60 +0,0 @@ -From cbc793d1444eafb47b1cc0062c605b37fe79736f Mon Sep 17 00:00:00 2001 -From: Kiran K <kiran.k@intel.com> -Date: Wed, 13 Oct 2021 13:35:11 +0530 -Subject: [PATCH 5/6] Bluetooth: btintel: Fix bdaddress comparison with garbage - value - -Intel Read Verision(TLV) data is parsed into a local structure variable -and it contains a field for bd address. Bd address is returned only in -bootloader mode and hence bd address in TLV structure needs to be validated -only if controller is present in boot loader mode. - -Signed-off-by: Kiran K <kiran.k@intel.com> -Reviewed-by: Tedd Ho-Jeong An <tedd.an@intel.com> ---- - drivers/bluetooth/btintel.c | 22 ++++++++++++++-------- - 1 file changed, 14 insertions(+), 8 deletions(-) - -diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c -index f1705b46fc88..b9055a3e61ed 100644 ---- a/drivers/bluetooth/btintel.c -+++ b/drivers/bluetooth/btintel.c -@@ -2006,14 +2006,16 @@ static int btintel_prepare_fw_download_tlv(struct hci_dev *hdev, - if (ver->img_type == 0x03) { - btintel_clear_flag(hdev, INTEL_BOOTLOADER); - btintel_check_bdaddr(hdev); -- } -- -- /* If the OTP has no valid Bluetooth device address, then there will -- * also be no valid address for the operational firmware. -- */ -- if (!bacmp(&ver->otp_bd_addr, BDADDR_ANY)) { -- bt_dev_info(hdev, "No device address configured"); -- set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks); -+ } else { -+ /* -+ * Check for valid bd address in boot loader mode. Device -+ * will be marked as unconfigured if empty bd address is -+ * found. -+ */ -+ if (!bacmp(&ver->otp_bd_addr, BDADDR_ANY)) { -+ bt_dev_info(hdev, "No device address configured"); -+ set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks); -+ } - } - - btintel_get_fw_name_tlv(ver, fwname, sizeof(fwname), "sfi"); -@@ -2303,6 +2305,10 @@ static int btintel_setup_combined(struct hci_dev *hdev) - goto exit_error; - } - -+ /* memset ver_tlv to start with clean state as few fields are exclusive -+ * to bootloader mode and are not populated in operational mode -+ */ -+ memset(&ver_tlv, 0, sizeof(ver_tlv)); - /* For TLV type device, parse the tlv data */ - err = btintel_parse_version_tlv(hdev, &ver_tlv, skb); - if (err) { --- -2.34.1 - |