Merge pull request #23 from AdityaGarg8/main

Add Bluetooth support for 16,2

Author: jamlam

9001-bluetooth-add-disable-read-tx-power-quirk.patch

@@ -0,0 +1,63 @@
+From 64dad24333ddb290f4e2f6c489abe03247030320 Mon Sep 17 00:00:00 2001
+From: Orlando Chamberlain <[email protected]>
+Date: Tue, 28 Sep 2021 20:41:35 +1000
+Subject: [PATCH] bluetooth: add disable read tx power quirk
+
+---
+ drivers/bluetooth/btbcm.c   | 4 ++++
+ include/net/bluetooth/hci.h | 9 +++++++++
+ net/bluetooth/hci_core.c    | 3 ++-
+ 3 files changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
+index e4182acee488..4ecc50d93107 100644
+--- a/drivers/bluetooth/btbcm.c
++++ b/drivers/bluetooth/btbcm.c
+@@ -353,6 +353,10 @@ static int btbcm_read_info(struct hci_dev *hdev)
+ 		return PTR_ERR(skb);
+ 
+ 	bt_dev_info(hdev, "BCM: chip id %u", skb->data[1]);
++
++	if (skb->data[1] == 150)
++		set_bit(HCI_QUIRK_BROKEN_READ_TRANSMIT_POWER, &hdev->quirks);
++
+ 	kfree_skb(skb);
+ 
+ 	/* Read Controller Features */
+diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
+index b80415011dcd..9ce46cb8564d 100644
+--- a/include/net/bluetooth/hci.h
++++ b/include/net/bluetooth/hci.h
+@@ -246,6 +246,15 @@ enum {
+ 	 * HCI after resume.
+ 	 */
+ 	HCI_QUIRK_NO_SUSPEND_NOTIFIER,
++
++	/*
++	 * When this quirk is set, LE tx power is not queried on startup
++	 * and the min/max tx power values default to HCI_TX_POWER_INVALID.
++	 *
++	 * This quirk can be set before hci_register_dev is called or
++	 * during the hdev->setup vendor callback.
++	 */
++	HCI_QUIRK_BROKEN_READ_TRANSMIT_POWER,
+ };
+ 
+ /* HCI device flags */
+diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
+index 8a47a3017d61..9a23fe7c8d67 100644
+--- a/net/bluetooth/hci_core.c
++++ b/net/bluetooth/hci_core.c
+@@ -742,7 +742,8 @@ static int hci_init3_req(struct hci_request *req, unsigned long opt)
+ 			hci_req_add(req, HCI_OP_LE_READ_ADV_TX_POWER, 0, NULL);
+ 		}
+ 
+-		if (hdev->commands[38] & 0x80) {
++		if (hdev->commands[38] & 0x80 &&
++	    	!test_bit(HCI_QUIRK_BROKEN_READ_TRANSMIT_POWER, &hdev->quirks)) {
+ 			/* Read LE Min/Max Tx Power*/
+ 			hci_req_add(req, HCI_OP_LE_READ_TRANSMIT_POWER,
+ 				    0, NULL);
+-- 
+2.33.0
+

9001-bluetooth-disable-read-LE-MinMax-Tx-Power.patch

@@ -0,0 +1,22 @@
+From 76d8253d90233b2c2d3fbc82355c603bf0eb9964 Mon Sep 17 00:00:00 2001
+From: Aditya Garg <[email protected]>
+Date: Fri, 1 Oct 2021 13:30:19 +0530
+Subject: [PATCH] Add support for MacBookPro16,2 UART
+
+---
+ drivers/mfd/intel-lpss-pci.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/mfd/intel-lpss-pci.c b/drivers/mfd/intel-lpss-pci.c
+index c54d19fb1..33d5043fd 100644
+--- a/drivers/mfd/intel-lpss-pci.c
++++ b/drivers/mfd/intel-lpss-pci.c
+@@ -253,6 +253,8 @@ static const struct pci_device_id intel_lpss_pci_ids[] = {
+ 	{ PCI_VDEVICE(INTEL, 0x34ea), (kernel_ulong_t)&bxt_i2c_info },
+ 	{ PCI_VDEVICE(INTEL, 0x34eb), (kernel_ulong_t)&bxt_i2c_info },
+ 	{ PCI_VDEVICE(INTEL, 0x34fb), (kernel_ulong_t)&spt_info },
++	/* MacBookPro16,2*/
++	{ PCI_VDEVICE(INTEL, 0x38a8), (kernel_ulong_t)&bxt_uart_info },
+ 	/* TGL-H */
+ 	{ PCI_VDEVICE(INTEL, 0x43a7), (kernel_ulong_t)&bxt_uart_info },
+ 	{ PCI_VDEVICE(INTEL, 0x43a8), (kernel_ulong_t)&bxt_uart_info },

9002-add-bluetooth-support-for-16,2.patch

@@ -62,7 +62,8 @@ source=(
   8001-corellium-wifi-bigsur.patch
   8002-Add-support-for-BCM4377.patch
 
-  9001-bluetooth-disable-read-LE-MinMax-Tx-Power.patch
+  9001-bluetooth-add-disable-read-tx-power-quirk.patch
+  9002-add-bluetooth-support-for-16,2.patch
 )
 
 validpgpkeys=(
@@ -265,4 +266,5 @@ sha256sums=('ca0eda14c512efa7fc054e9eb89dd8f6a6e7075aef1e39d30b5f243f7bde9b89'
             '90a6012cdd8a64ede8e0bbaf7331960bd68f628e0973b65459188eb1ccb5b829'
             '903c9e2d141ddb4ebc7f60fd08b54d97306a187a06bfc8832bc8f442f00027e3'
             'fbbbb17f657d72a36677b556b2b61594a3389191d05de4e4a3a446daab260667'
-            'f1b8accfe1a38aeaf00867577e488a9b958efd22dbe6e95bc7ce5d369cbf6b19')
+            '31e414978a947bdb71f27ed364c4da73b81fcf1921250cb69ee1bcf2bbd25636'
+            'ee4ea917e501104b42ce3b7ca524598c8de849890acbbacebaacbb7d8f877ff9')