From 3ff4421202e4e023fd3084a39406072aa911100c Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Thu, 13 Jul 2023 12:23:35 -0400 Subject: [PATCH] Drop bluetooth-hci_bcm-do-not-mark-valid-bd_addr-as-inval.patch Signed-off-by: Sasha Levin --- ...m-do-not-mark-valid-bd_addr-as-inval.patch | 51 ------------------- queue-6.1/series | 1 - ...m-do-not-mark-valid-bd_addr-as-inval.patch | 51 ------------------- queue-6.4/series | 1 - 4 files changed, 104 deletions(-) delete mode 100644 queue-6.1/bluetooth-hci_bcm-do-not-mark-valid-bd_addr-as-inval.patch delete mode 100644 queue-6.4/bluetooth-hci_bcm-do-not-mark-valid-bd_addr-as-inval.patch diff --git a/queue-6.1/bluetooth-hci_bcm-do-not-mark-valid-bd_addr-as-inval.patch b/queue-6.1/bluetooth-hci_bcm-do-not-mark-valid-bd_addr-as-inval.patch deleted file mode 100644 index 07d7862a014..00000000000 --- a/queue-6.1/bluetooth-hci_bcm-do-not-mark-valid-bd_addr-as-inval.patch +++ /dev/null @@ -1,51 +0,0 @@ -From cd1f79e8e3d6e096366179826040f03e90cfa838 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 2 Jun 2023 10:19:12 +0200 -Subject: Bluetooth: hci_bcm: do not mark valid bd_addr as invalid - -From: Johan Hovold - -[ Upstream commit 56b7f325db139c9255b1eb1d1e741576d5f8fa34 ] - -A recent commit restored the original (and still documented) semantics -for the HCI_QUIRK_USE_BDADDR_PROPERTY quirk so that the device address -is considered invalid unless an address is provided by firmware. - -This specifically means that this flag must only be set for devices with -invalid addresses, but the Broadcom driver has so far been setting this -flag unconditionally. - -Fortunately the driver already checks for invalid addresses during setup -and sets the HCI_QUIRK_INVALID_BDADDR flag. Use this flag to indicate -when the address can be overridden by firmware (long term, this should -probably just always be allowed). - -Fixes: 6945795bc81a ("Bluetooth: fix use-bdaddr-property quirk") -Reported-by: Marek Szyprowski -Link: https://lore.kernel.org/lkml/ecef83c8-497f-4011-607b-a63c24764867@samsung.com -Signed-off-by: Johan Hovold -Tested-by: Marek Szyprowski -Signed-off-by: Luiz Augusto von Dentz -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/bluetooth/hci_bcm.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c -index 2b6c0e1922cb3..207611132b8ef 100644 ---- a/drivers/bluetooth/hci_bcm.c -+++ b/drivers/bluetooth/hci_bcm.c -@@ -641,7 +641,8 @@ static int bcm_setup(struct hci_uart *hu) - * Allow the bootloader to set a valid address through the - * device tree. - */ -- set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hu->hdev->quirks); -+ if (test_bit(HCI_QUIRK_INVALID_BDADDR, &hu->hdev->quirks)) -+ set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hu->hdev->quirks); - - if (!bcm_request_irq(bcm)) - err = bcm_setup_sleep(hu); --- -2.39.2 - diff --git a/queue-6.1/series b/queue-6.1/series index 99e04504e98..741a8dba220 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -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-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 bluetooth-mgmt-use-bit-macro-when-defining-bitfields.patch diff --git a/queue-6.4/bluetooth-hci_bcm-do-not-mark-valid-bd_addr-as-inval.patch b/queue-6.4/bluetooth-hci_bcm-do-not-mark-valid-bd_addr-as-inval.patch deleted file mode 100644 index 7b49efab417..00000000000 --- a/queue-6.4/bluetooth-hci_bcm-do-not-mark-valid-bd_addr-as-inval.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 2cfb11b81d344afe4080da54e6bd057425c7ac0a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 2 Jun 2023 10:19:12 +0200 -Subject: Bluetooth: hci_bcm: do not mark valid bd_addr as invalid - -From: Johan Hovold - -[ Upstream commit 56b7f325db139c9255b1eb1d1e741576d5f8fa34 ] - -A recent commit restored the original (and still documented) semantics -for the HCI_QUIRK_USE_BDADDR_PROPERTY quirk so that the device address -is considered invalid unless an address is provided by firmware. - -This specifically means that this flag must only be set for devices with -invalid addresses, but the Broadcom driver has so far been setting this -flag unconditionally. - -Fortunately the driver already checks for invalid addresses during setup -and sets the HCI_QUIRK_INVALID_BDADDR flag. Use this flag to indicate -when the address can be overridden by firmware (long term, this should -probably just always be allowed). - -Fixes: 6945795bc81a ("Bluetooth: fix use-bdaddr-property quirk") -Reported-by: Marek Szyprowski -Link: https://lore.kernel.org/lkml/ecef83c8-497f-4011-607b-a63c24764867@samsung.com -Signed-off-by: Johan Hovold -Tested-by: Marek Szyprowski -Signed-off-by: Luiz Augusto von Dentz -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/bluetooth/hci_bcm.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c -index 83bf5d4330c40..874d23089b39b 100644 ---- a/drivers/bluetooth/hci_bcm.c -+++ b/drivers/bluetooth/hci_bcm.c -@@ -643,7 +643,8 @@ static int bcm_setup(struct hci_uart *hu) - * Allow the bootloader to set a valid address through the - * device tree. - */ -- set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hu->hdev->quirks); -+ if (test_bit(HCI_QUIRK_INVALID_BDADDR, &hu->hdev->quirks)) -+ set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hu->hdev->quirks); - - if (!bcm_request_irq(bcm)) - err = bcm_setup_sleep(hu); --- -2.39.2 - diff --git a/queue-6.4/series b/queue-6.4/series index f385fcf8fad..0abe51f9360 100644 --- a/queue-6.4/series +++ b/queue-6.4/series @@ -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-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 sfc-support-for-devlink-port-requires-mae-access.patch -- 2.47.3