[PATCH v2 0/2] Bluetooth: Fix Transport_Unit_Size and remove redundant NVMEM dependency

[PATCH v2 0/2] Bluetooth: Fix Transport_Unit_Size and remove redundant NVMEM dependency

[Zijun Hu]

This series contains a very simple bug fix and a trivial cleanup.

Signed-off-by: Zijun Hu <zijun.hu@oss.qualcomm.com>
---
Changes in v2:
- Add patch 1 to fix Transport_Unit_Size for HCI data path
- Patch 2: Reword commit message
- Link to v1: https://patch.msgid.link/20261028-fix_kconf-v1-1-624788921368@oss.qualcomm.com

---
Zijun Hu (2):
      Bluetooth: hci_conn: Fix SCO/eSCO Transport_Unit_Size for HCI data path
      Bluetooth: hci_uart: Remove redundant NVMEM dependency

 drivers/bluetooth/Kconfig |  1 -
 net/bluetooth/hci_conn.c  | 18 ++++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)
---
base-commit: 3f425f95ba3923d605f6a8b382e8fcdc59d479db
change-id: 20261028-fix_kconf-4d8e8748bb9f

Best regards,
--  
Zijun Hu <zijun.hu@oss.qualcomm.com>

[PATCH v2 1/2] Bluetooth: hci_conn: Fix SCO/eSCO Transport_Unit_Size for HCI data path

[Zijun Hu]

Correct (Input|Output)_Transport_Unit_Size based on Core spec v6.3,
Vol 4, Part E, 7.1.45:

  "The Host shall set the Input_Transport_Unit_Size and
   Output_Transport_Unit_Size to be equal. For HCI Host transport
   the Host shall set them to 0."

Fixes: b2af264ad3af ("Bluetooth: Add support for HCI_Enhanced_Setup_Synchronous_Connection command")
Signed-off-by: Zijun Hu <zijun.hu@oss.qualcomm.com>
---
 net/bluetooth/hci_conn.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index b007f623b2ec..eebd73988bf6 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -322,18 +322,20 @@ static int hci_enhanced_setup_sync(struct hci_dev *hdev, void *data)
 		cp.in_coded_data_size = __cpu_to_le16(16);
 		cp.out_coded_data_size = __cpu_to_le16(16);
 		cp.in_pcm_data_format = 2;
 		cp.out_pcm_data_format = 2;
 		cp.in_pcm_sample_payload_msb_pos = 0;
 		cp.out_pcm_sample_payload_msb_pos = 0;
 		cp.in_data_path = conn->codec.data_path;
 		cp.out_data_path = conn->codec.data_path;
-		cp.in_transport_unit_size = 1;
-		cp.out_transport_unit_size = 1;
+		if (conn->codec.data_path) {
+			cp.in_transport_unit_size = 1;
+			cp.out_transport_unit_size = 1;
+		}
 		break;
 
 	case BT_CODEC_TRANSPARENT:
 		if (!find_next_esco_param(conn, esco_param_msbc,
 					  ARRAY_SIZE(esco_param_msbc)))
 			goto unlock;
 
 		param = &esco_param_msbc[conn->attempt - 1];
@@ -348,18 +350,20 @@ static int hci_enhanced_setup_sync(struct hci_dev *hdev, void *data)
 		cp.in_coded_data_size = __cpu_to_le16(16);
 		cp.out_coded_data_size = __cpu_to_le16(16);
 		cp.in_pcm_data_format = 2;
 		cp.out_pcm_data_format = 2;
 		cp.in_pcm_sample_payload_msb_pos = 0;
 		cp.out_pcm_sample_payload_msb_pos = 0;
 		cp.in_data_path = conn->codec.data_path;
 		cp.out_data_path = conn->codec.data_path;
-		cp.in_transport_unit_size = 1;
-		cp.out_transport_unit_size = 1;
+		if (conn->codec.data_path) {
+			cp.in_transport_unit_size = 1;
+			cp.out_transport_unit_size = 1;
+		}
 		break;
 
 	case BT_CODEC_CVSD:
 		if (conn->parent && lmp_esco_capable(conn->parent)) {
 			if (!find_next_esco_param(conn, esco_param_cvsd,
 						  ARRAY_SIZE(esco_param_cvsd)))
 				goto unlock;
 			param = &esco_param_cvsd[conn->attempt - 1];
@@ -379,18 +383,20 @@ static int hci_enhanced_setup_sync(struct hci_dev *hdev, void *data)
 		cp.in_coded_data_size = __cpu_to_le16(16);
 		cp.out_coded_data_size = __cpu_to_le16(16);
 		cp.in_pcm_data_format = 2;
 		cp.out_pcm_data_format = 2;
 		cp.in_pcm_sample_payload_msb_pos = 0;
 		cp.out_pcm_sample_payload_msb_pos = 0;
 		cp.in_data_path = conn->codec.data_path;
 		cp.out_data_path = conn->codec.data_path;
-		cp.in_transport_unit_size = 16;
-		cp.out_transport_unit_size = 16;
+		if (conn->codec.data_path) {
+			cp.in_transport_unit_size = 16;
+			cp.out_transport_unit_size = 16;
+		}
 		break;
 	default:
 		goto unlock;
 	}
 
 	hci_dev_unlock(hdev);
 
 	cp.retrans_effort = param->retrans_effort;

-- 
2.34.1

[PATCH v2 2/2] Bluetooth: hci_uart: Remove redundant NVMEM dependency

[Zijun Hu]

'depends on NVMEM || !NVMEM' always evaluates to y, so it has no
impact since the following commit changed NVMEM type from tristate
to bool:

Commit 2a37ce25d9f2 ("nvmem: disallow modular CONFIG_NVMEM")

Signed-off-by: Zijun Hu <zijun.hu@oss.qualcomm.com>
---
 drivers/bluetooth/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index b18482b5677f..ad5eabb8eb77 100644
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -112,17 +112,16 @@ config BT_HCIBTSDIO
 	  SDIO interface.
 
 	  Say Y here to compile support for Bluetooth SDIO devices into the
 	  kernel or say M to compile it as module (btsdio).
 
 config BT_HCIUART
 	tristate "HCI UART driver"
 	depends on SERIAL_DEV_BUS || !SERIAL_DEV_BUS
-	depends on NVMEM || !NVMEM
 	depends on POWER_SEQUENCING || !POWER_SEQUENCING
 	depends on TTY
 	help
 	  Bluetooth HCI UART driver.
 	  This driver is required if you want to use Bluetooth devices with
 	  serial port interface. You will also need this driver if you have
 	  UART based Bluetooth PCMCIA and CF devices like Xircom Credit Card
 	  adapter and BrainBoxes Bluetooth PC Card.

-- 
2.34.1