Merge remote-tracking branch 'origin/f32' into f32-user-thl-vanilla-fedora

24 files changed, 158 insertions, 18 deletions

diff --git a/bluetooth-fix-LL-privacy-BLE-device-fails-to-connect.patch b/bluetooth-fix-LL-privacy-BLE-device-fails-to-connect.patch
new file mode 100644
index 000000000..593af0402
--- /dev/null
+++ b/bluetooth-fix-LL-privacy-BLE-device-fails-to-connect.patch
@@ -0,0 +1,75 @@
+From MAILER-DAEMON Thu Nov 12 18:45:00 2020
+From: Sathish Narasimman <nsathish41@gmail.com>
+To: linux-bluetooth@vger.kernel.org
+Cc: chethan.tumkur.narayan@intel.com, ravishankar.srivatsa@intel.com, kiran.k@intel.com, Sathish Narasimman <sathish.narasimman@intel.com>
+Subject: [PATCH] Bluetooth: Fix: LL PRivacy BLE device fails to connect
+Date: Thu, 22 Oct 2020 13:53:04 +0530
+Message-Id: <20201022082304.31757-1-sathish.narasimman@intel.com>
+List-ID: <linux-bluetooth.vger.kernel.org>
+X-Mailing-List: linux-bluetooth@vger.kernel.org
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 7bit
+
+When adding device to white list the device is added to resolving list
+also it has to be added only when HCI_ENABLE_LL_PRIVACY flag is set.
+HCI_ENABLE_LL_PRIVACY flag has to be tested before adding/deleting devices
+to resolving list. use_ll_privacy macro is used only to check if controller
+supports LL_Privacy.
+
+https://bugzilla.kernel.org/show_bug.cgi?id=209745
+
+Signed-off-by: Sathish Narasimman <sathish.narasimman@intel.com>
+Reviewed-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
+---
+ net/bluetooth/hci_request.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
+index 6f12bab4d2fa..610ed0817bd7 100644
+--- a/net/bluetooth/hci_request.c
++++ b/net/bluetooth/hci_request.c
+@@ -698,7 +698,8 @@ static void del_from_white_list(struct hci_request *req, bdaddr_t *bdaddr,
+ 		   cp.bdaddr_type);
+ 	hci_req_add(req, HCI_OP_LE_DEL_FROM_WHITE_LIST, sizeof(cp), &cp);
+ 
+-	if (use_ll_privacy(req->hdev)) {
++	if (use_ll_privacy(req->hdev) &&
++	    hci_dev_test_flag(req->hdev, HCI_ENABLE_LL_PRIVACY)) {
+ 		struct smp_irk *irk;
+ 
+ 		irk = hci_find_irk_by_addr(req->hdev, bdaddr, bdaddr_type);
+@@ -732,7 +733,8 @@ static int add_to_white_list(struct hci_request *req,
+ 		return -1;
+ 
+ 	/* White list can not be used with RPAs */
+-	if (!allow_rpa && !use_ll_privacy(hdev) &&
++	if (!allow_rpa &&
++	    !hci_dev_test_flag(hdev, HCI_ENABLE_LL_PRIVACY) &&
+ 	    hci_find_irk_by_addr(hdev, &params->addr, params->addr_type)) {
+ 		return -1;
+ 	}
+@@ -750,7 +752,8 @@ static int add_to_white_list(struct hci_request *req,
+ 		   cp.bdaddr_type);
+ 	hci_req_add(req, HCI_OP_LE_ADD_TO_WHITE_LIST, sizeof(cp), &cp);
+ 
+-	if (use_ll_privacy(hdev)) {
++	if (use_ll_privacy(hdev) &&
++	    hci_dev_test_flag(hdev, HCI_ENABLE_LL_PRIVACY)) {
+ 		struct smp_irk *irk;
+ 
+ 		irk = hci_find_irk_by_addr(hdev, &params->addr,
+@@ -812,7 +815,8 @@ static u8 update_white_list(struct hci_request *req)
+ 		}
+ 
+ 		/* White list can not be used with RPAs */
+-		if (!allow_rpa && !use_ll_privacy(hdev) &&
++		if (!allow_rpa &&
++		    !hci_dev_test_flag(hdev, HCI_ENABLE_LL_PRIVACY) &&
+ 		    hci_find_irk_by_addr(hdev, &b->bdaddr, b->bdaddr_type)) {
+ 			return 0x00;
+ 		}
+-- 
+2.17.1
+
+
diff --git a/configs/fedora/generic/CONFIG_ACPI_TABLE_UPGRADE b/configs/fedora/generic/CONFIG_ACPI_TABLE_UPGRADE
index 3ac21bf3a..276233fba 100644
--- a/configs/fedora/generic/CONFIG_ACPI_TABLE_UPGRADE
+++ b/configs/fedora/generic/CONFIG_ACPI_TABLE_UPGRADE
@@ -1 +1 @@
-# CONFIG_ACPI_TABLE_UPGRADE is not set
+CONFIG_ACPI_TABLE_UPGRADE=y
diff --git a/configs/fedora/generic/CONFIG_ATH11K b/configs/fedora/generic/CONFIG_ATH11K
index 584c5e3f1..7927e05a0 100644
--- a/configs/fedora/generic/CONFIG_ATH11K
+++ b/configs/fedora/generic/CONFIG_ATH11K
@@ -1 +1 @@
-# CONFIG_ATH11K is not set
+CONFIG_ATH11K=m
diff --git a/configs/fedora/generic/CONFIG_ATH11K_DEBUG b/configs/fedora/generic/CONFIG_ATH11K_DEBUG
new file mode 100644
index 000000000..8c3c7f975
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_ATH11K_DEBUG
@@ -0,0 +1 @@
+# CONFIG_ATH11K_DEBUG is not set
diff --git a/configs/fedora/generic/CONFIG_ATH11K_DEBUGFS b/configs/fedora/generic/CONFIG_ATH11K_DEBUGFS
new file mode 100644
index 000000000..d4a25f6c3
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_ATH11K_DEBUGFS
@@ -0,0 +1 @@
+CONFIG_ATH11K_DEBUGFS=y
diff --git a/configs/fedora/generic/CONFIG_ATH11K_SPECTRAL b/configs/fedora/generic/CONFIG_ATH11K_SPECTRAL
new file mode 100644
index 000000000..92bb5d3e5
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_ATH11K_SPECTRAL
@@ -0,0 +1 @@
+# CONFIG_ATH11K_SPECTRAL is not set
diff --git a/configs/fedora/generic/CONFIG_ATH11K_TRACING b/configs/fedora/generic/CONFIG_ATH11K_TRACING
new file mode 100644
index 000000000..0ba056e8a
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_ATH11K_TRACING
@@ -0,0 +1 @@
+# CONFIG_ATH11K_TRACING is not set
diff --git a/configs/fedora/generic/CONFIG_MTD_NAND_NANDSIM b/configs/fedora/generic/CONFIG_MTD_NAND_NANDSIM
index 2a4811528..500e1e796 100644
--- a/configs/fedora/generic/CONFIG_MTD_NAND_NANDSIM
+++ b/configs/fedora/generic/CONFIG_MTD_NAND_NANDSIM
@@ -1 +1 @@
-# CONFIG_MTD_NAND_NANDSIM is not set
+CONFIG_MTD_NAND_NANDSIM=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MTD_NAND_NANDSIM b/configs/fedora/generic/arm/armv7/CONFIG_MTD_NAND_NANDSIM
deleted file mode 100644
index 500e1e796..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_MTD_NAND_NANDSIM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MTD_NAND_NANDSIM=m
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 439cf64d1..640b483cf 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -443,7 +443,11 @@ CONFIG_ATH10K_SNOC=m
 # CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
-# CONFIG_ATH11K is not set
+CONFIG_ATH11K_DEBUGFS=y
+# CONFIG_ATH11K_DEBUG is not set
+CONFIG_ATH11K=m
+# CONFIG_ATH11K_SPECTRAL is not set
+# CONFIG_ATH11K_TRACING is not set
 CONFIG_ATH5K_DEBUG=y
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_TRACER is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 5e915d266..d855ee119 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -443,7 +443,11 @@ CONFIG_ATH10K_SNOC=m
 # CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
-# CONFIG_ATH11K is not set
+CONFIG_ATH11K_DEBUGFS=y
+# CONFIG_ATH11K_DEBUG is not set
+CONFIG_ATH11K=m
+# CONFIG_ATH11K_SPECTRAL is not set
+# CONFIG_ATH11K_TRACING is not set
 CONFIG_ATH5K_DEBUG=y
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_TRACER is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index e41fa0e16..eeec78feb 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -440,7 +440,11 @@ CONFIG_ATH10K_SNOC=m
 # CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
-# CONFIG_ATH11K is not set
+CONFIG_ATH11K_DEBUGFS=y
+# CONFIG_ATH11K_DEBUG is not set
+CONFIG_ATH11K=m
+# CONFIG_ATH11K_SPECTRAL is not set
+# CONFIG_ATH11K_TRACING is not set
 CONFIG_ATH5K_DEBUG=y
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_TRACER is not set
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 13573d274..dd6cbf5f5 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -440,7 +440,11 @@ CONFIG_ATH10K_SNOC=m
 # CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
-# CONFIG_ATH11K is not set
+CONFIG_ATH11K_DEBUGFS=y
+# CONFIG_ATH11K_DEBUG is not set
+CONFIG_ATH11K=m
+# CONFIG_ATH11K_SPECTRAL is not set
+# CONFIG_ATH11K_TRACING is not set
 CONFIG_ATH5K_DEBUG=y
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_TRACER is not set
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index f68786326..d3190b1c2 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -429,7 +429,11 @@ CONFIG_ATH10K_SNOC=m
 # CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
-# CONFIG_ATH11K is not set
+CONFIG_ATH11K_DEBUGFS=y
+# CONFIG_ATH11K_DEBUG is not set
+CONFIG_ATH11K=m
+# CONFIG_ATH11K_SPECTRAL is not set
+# CONFIG_ATH11K_TRACING is not set
 CONFIG_ATH5K_DEBUG=y
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_TRACER is not set
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index d04a888a6..8a8d971a8 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -429,7 +429,11 @@ CONFIG_ATH10K_SNOC=m
 # CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
-# CONFIG_ATH11K is not set
+CONFIG_ATH11K_DEBUGFS=y
+# CONFIG_ATH11K_DEBUG is not set
+CONFIG_ATH11K=m
+# CONFIG_ATH11K_SPECTRAL is not set
+# CONFIG_ATH11K_TRACING is not set
 CONFIG_ATH5K_DEBUG=y
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_TRACER is not set
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 554d35ade..b105356e1 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -306,7 +306,11 @@ CONFIG_ATH10K_SDIO=m
 # CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
-# CONFIG_ATH11K is not set
+CONFIG_ATH11K_DEBUGFS=y
+# CONFIG_ATH11K_DEBUG is not set
+CONFIG_ATH11K=m
+# CONFIG_ATH11K_SPECTRAL is not set
+# CONFIG_ATH11K_TRACING is not set
 CONFIG_ATH5K_DEBUG=y
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_TRACER is not set
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 477ed4656..8601ec2f9 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -305,7 +305,11 @@ CONFIG_ATH10K_SDIO=m
 # CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
-# CONFIG_ATH11K is not set
+CONFIG_ATH11K_DEBUGFS=y
+# CONFIG_ATH11K_DEBUG is not set
+CONFIG_ATH11K=m
+# CONFIG_ATH11K_SPECTRAL is not set
+# CONFIG_ATH11K_TRACING is not set
 CONFIG_ATH5K_DEBUG=y
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_TRACER is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 5175e03a7..014609ede 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -245,7 +245,11 @@ CONFIG_ATH10K_SDIO=m
 # CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
-# CONFIG_ATH11K is not set
+CONFIG_ATH11K_DEBUGFS=y
+# CONFIG_ATH11K_DEBUG is not set
+CONFIG_ATH11K=m
+# CONFIG_ATH11K_SPECTRAL is not set
+# CONFIG_ATH11K_TRACING is not set
 CONFIG_ATH5K_DEBUG=y
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_TRACER is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 0bd80363c..afef5c1dc 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -244,7 +244,11 @@ CONFIG_ATH10K_SDIO=m
 # CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
-# CONFIG_ATH11K is not set
+CONFIG_ATH11K_DEBUGFS=y
+# CONFIG_ATH11K_DEBUG is not set
+CONFIG_ATH11K=m
+# CONFIG_ATH11K_SPECTRAL is not set
+# CONFIG_ATH11K_TRACING is not set
 CONFIG_ATH5K_DEBUG=y
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_TRACER is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 67d46e3b7..045af30c6 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -249,7 +249,11 @@ CONFIG_ATH10K_SDIO=m
 # CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
-# CONFIG_ATH11K is not set
+CONFIG_ATH11K_DEBUGFS=y
+# CONFIG_ATH11K_DEBUG is not set
+CONFIG_ATH11K=m
+# CONFIG_ATH11K_SPECTRAL is not set
+# CONFIG_ATH11K_TRACING is not set
 CONFIG_ATH5K_DEBUG=y
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_TRACER is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index f95e2abff..bfe3abbbb 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -248,7 +248,11 @@ CONFIG_ATH10K_SDIO=m
 # CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
-# CONFIG_ATH11K is not set
+CONFIG_ATH11K_DEBUGFS=y
+# CONFIG_ATH11K_DEBUG is not set
+CONFIG_ATH11K=m
+# CONFIG_ATH11K_SPECTRAL is not set
+# CONFIG_ATH11K_TRACING is not set
 CONFIG_ATH5K_DEBUG=y
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_TRACER is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 5ba528b35..1fc6aca23 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -308,7 +308,11 @@ CONFIG_ATH10K_SDIO=m
 # CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
-# CONFIG_ATH11K is not set
+CONFIG_ATH11K_DEBUGFS=y
+# CONFIG_ATH11K_DEBUG is not set
+CONFIG_ATH11K=m
+# CONFIG_ATH11K_SPECTRAL is not set
+# CONFIG_ATH11K_TRACING is not set
 CONFIG_ATH5K_DEBUG=y
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_TRACER is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index eb57a3a8e..e3d58db09 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -307,7 +307,11 @@ CONFIG_ATH10K_SDIO=m
 # CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
-# CONFIG_ATH11K is not set
+CONFIG_ATH11K_DEBUGFS=y
+# CONFIG_ATH11K_DEBUG is not set
+CONFIG_ATH11K=m
+# CONFIG_ATH11K_SPECTRAL is not set
+# CONFIG_ATH11K_TRACING is not set
 CONFIG_ATH5K_DEBUG=y
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_TRACER is not set
diff --git a/kernel.spec b/kernel.spec
index fb01b00c2..782e87c78 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -883,6 +883,9 @@ Patch130: arm64-dts-allwinner-h5-OrangePi-PC2-Fix-ethernet-node.patch
 # https://patchwork.kernel.org/project/linux-arm-kernel/patch/20201023194902.368239-1-jernej.skrabec@siol.net/
 Patch131: arm64-dts-allwinner-h6-Pine-H64-Fix-ethernet-node.patch
 
+# rhbz 1897038
+Patch132: bluetooth-fix-LL-privacy-BLE-device-fails-to-connect.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2999,6 +3002,9 @@ fi
 #
 #
 %changelog
+* Thu Nov 12 2020 Justin M. Forbes <jforbes@fedoraproject.org>
+- Fix bluetooth device disconnect issues. (rhbz 1897038)
+
 * Tue Nov 10 15:34:54 CST 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.9.8-100
 - Linux v5.9.8
 - Fixes CVE-2020-8694 (rhbz 1828580 1896525)