]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
Drop bluetooth-fix-use-bdaddr-property-quirk.patch
authorSasha Levin <sashal@kernel.org>
Thu, 13 Jul 2023 16:23:27 +0000 (12:23 -0400)
committerSasha Levin <sashal@kernel.org>
Thu, 13 Jul 2023 16:23:27 +0000 (12:23 -0400)
Signed-off-by: Sasha Levin <sashal@kernel.org>
queue-6.1/bluetooth-fix-use-bdaddr-property-quirk.patch [deleted file]
queue-6.1/series
queue-6.4/bluetooth-fix-use-bdaddr-property-quirk.patch [deleted file]
queue-6.4/series

diff --git a/queue-6.1/bluetooth-fix-use-bdaddr-property-quirk.patch b/queue-6.1/bluetooth-fix-use-bdaddr-property-quirk.patch
deleted file mode 100644 (file)
index d3e4c90..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-From b5ef8fa54bf7cc8962c4f9a9d0b340eb77f1e7fa Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 May 2023 11:04:24 +0200
-Subject: Bluetooth: fix use-bdaddr-property quirk
-
-From: Johan Hovold <johan+linaro@kernel.org>
-
-[ Upstream commit 6945795bc81ab7be22750ecfb365056688f2fada ]
-
-Devices that lack persistent storage for the device address can indicate
-this by setting the HCI_QUIRK_INVALID_BDADDR which causes the controller
-to be marked as unconfigured until user space has set a valid address.
-
-The related HCI_QUIRK_USE_BDADDR_PROPERTY was later added to similarly
-indicate that the device lacks a valid address but that one may be
-specified in the devicetree.
-
-As is clear from commit 7a0e5b15ca45 ("Bluetooth: Add quirk for reading
-BD_ADDR from fwnode property") that added and documented this quirk and
-commits like de79a9df1692 ("Bluetooth: btqcomsmd: use
-HCI_QUIRK_USE_BDADDR_PROPERTY"), the device address of controllers with
-this flag should be treated as invalid until user space has had a chance
-to configure the controller in case the devicetree property is missing.
-
-As it does not make sense to allow controllers with invalid addresses,
-restore the original semantics, which also makes sure that the
-implementation is consistent (e.g. get_missing_options() indicates that
-the address must be set) and matches the documentation (including
-comments in the code, such as, "In case any of them is set, the
-controller has to start up as unconfigured.").
-
-Fixes: e668eb1e1578 ("Bluetooth: hci_core: Don't stop BT if the BD address missing in dts")
-Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
-Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/bluetooth/hci_sync.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
-index 37131a36700a1..9f9299b44f0bf 100644
---- a/net/bluetooth/hci_sync.c
-+++ b/net/bluetooth/hci_sync.c
-@@ -4564,16 +4564,14 @@ static int hci_dev_setup_sync(struct hci_dev *hdev)
-        * BD_ADDR invalid before creating the HCI device or in
-        * its setup callback.
-        */
--      invalid_bdaddr = test_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks);
--
-+      invalid_bdaddr = test_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks) ||
-+                       test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks);
-       if (!ret) {
-               if (test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks) &&
-                   !bacmp(&hdev->public_addr, BDADDR_ANY))
-                       hci_dev_get_bd_addr_from_property(hdev);
--              if ((invalid_bdaddr ||
--                   test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks)) &&
--                  bacmp(&hdev->public_addr, BDADDR_ANY) &&
-+              if (invalid_bdaddr && bacmp(&hdev->public_addr, BDADDR_ANY) &&
-                   hdev->set_bdaddr) {
-                       ret = hdev->set_bdaddr(hdev, &hdev->public_addr);
-                       if (!ret)
--- 
-2.39.2
-
index fd85a240995c1ba08db369b74adf48970bb4db08..99e04504e989e0dc566cfabcdbe840913a1e25d1 100644 (file)
@@ -494,7 +494,6 @@ net-dsa-sja1105-always-enable-the-incl_srcpt-option.patch
 net-dsa-tag_sja1105-always-prefer-source-port-inform.patch
 add-module_firmware-for-firmware_tg357766.patch
 bluetooth-fix-invalid-bdaddr-quirk-for-non-persisten.patch
-bluetooth-fix-use-bdaddr-property-quirk.patch
 bluetooth-hci_bcm-do-not-mark-valid-bd_addr-as-inval.patch
 bluetooth-iso-use-hci_sync-for-setting-cig-parameter.patch
 bluetooth-mgmt-add-cis-feature-bits-to-controller-in.patch
diff --git a/queue-6.4/bluetooth-fix-use-bdaddr-property-quirk.patch b/queue-6.4/bluetooth-fix-use-bdaddr-property-quirk.patch
deleted file mode 100644 (file)
index 6f93cd3..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-From c633b05a4d52a247c3fcfe80c726da2439cf2bf8 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 May 2023 11:04:24 +0200
-Subject: Bluetooth: fix use-bdaddr-property quirk
-
-From: Johan Hovold <johan+linaro@kernel.org>
-
-[ Upstream commit 6945795bc81ab7be22750ecfb365056688f2fada ]
-
-Devices that lack persistent storage for the device address can indicate
-this by setting the HCI_QUIRK_INVALID_BDADDR which causes the controller
-to be marked as unconfigured until user space has set a valid address.
-
-The related HCI_QUIRK_USE_BDADDR_PROPERTY was later added to similarly
-indicate that the device lacks a valid address but that one may be
-specified in the devicetree.
-
-As is clear from commit 7a0e5b15ca45 ("Bluetooth: Add quirk for reading
-BD_ADDR from fwnode property") that added and documented this quirk and
-commits like de79a9df1692 ("Bluetooth: btqcomsmd: use
-HCI_QUIRK_USE_BDADDR_PROPERTY"), the device address of controllers with
-this flag should be treated as invalid until user space has had a chance
-to configure the controller in case the devicetree property is missing.
-
-As it does not make sense to allow controllers with invalid addresses,
-restore the original semantics, which also makes sure that the
-implementation is consistent (e.g. get_missing_options() indicates that
-the address must be set) and matches the documentation (including
-comments in the code, such as, "In case any of them is set, the
-controller has to start up as unconfigured.").
-
-Fixes: e668eb1e1578 ("Bluetooth: hci_core: Don't stop BT if the BD address missing in dts")
-Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
-Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/bluetooth/hci_sync.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
-index b5b1b610df335..8561616abbe5f 100644
---- a/net/bluetooth/hci_sync.c
-+++ b/net/bluetooth/hci_sync.c
-@@ -4623,16 +4623,14 @@ static int hci_dev_setup_sync(struct hci_dev *hdev)
-        * BD_ADDR invalid before creating the HCI device or in
-        * its setup callback.
-        */
--      invalid_bdaddr = test_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks);
--
-+      invalid_bdaddr = test_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks) ||
-+                       test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks);
-       if (!ret) {
-               if (test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks) &&
-                   !bacmp(&hdev->public_addr, BDADDR_ANY))
-                       hci_dev_get_bd_addr_from_property(hdev);
--              if ((invalid_bdaddr ||
--                   test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks)) &&
--                  bacmp(&hdev->public_addr, BDADDR_ANY) &&
-+              if (invalid_bdaddr && bacmp(&hdev->public_addr, BDADDR_ANY) &&
-                   hdev->set_bdaddr) {
-                       ret = hdev->set_bdaddr(hdev, &hdev->public_addr);
-                       if (!ret)
--- 
-2.39.2
-
index 1ff09660584fbddad98c5e125ff299b57d80488f..f385fcf8fada6c30fa49da9deb6173f30e2fd16f 100644 (file)
@@ -670,7 +670,6 @@ net-dsa-sja1105-always-enable-the-incl_srcpt-option.patch
 net-dsa-tag_sja1105-always-prefer-source-port-inform.patch
 add-module_firmware-for-firmware_tg357766.patch
 bluetooth-fix-invalid-bdaddr-quirk-for-non-persisten.patch
-bluetooth-fix-use-bdaddr-property-quirk.patch
 bluetooth-hci_bcm-do-not-mark-valid-bd_addr-as-inval.patch
 bluetooth-iso-use-hci_sync-for-setting-cig-parameter.patch
 bluetooth-mgmt-fix-marking-scan_rsp-as-not-connectab.patch