Commit 5517ae24 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'for-net-2024-08-30' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth 

Luiz Augusto von Dentz says:

====================
bluetooth pull request for net:

 - qca: If memdump doesn't work, re-enable IBS
 - MGMT: Fix not generating command complete for MGMT_OP_DISCONNECT
 - Revert "Bluetooth: MGMT/SMP: Fix address type when using SMP over BREDR/LE"
 - MGMT: Ignore keys being loaded with invalid type

* tag 'for-net-2024-08-30' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth:
  Bluetooth: MGMT: Ignore keys being loaded with invalid type
  Revert "Bluetooth: MGMT/SMP: Fix address type when using SMP over BREDR/LE"
  Bluetooth: MGMT: Fix not generating command complete for MGMT_OP_DISCONNECT
  Bluetooth: hci_sync: Introduce hci_cmd_sync_run/hci_cmd_sync_run_once
  Bluetooth: qca: If memdump doesn't work, re-enable IBS
====================

Link: https://patch.msgid.link/20240830220300.1316772-1-luiz.dentz@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 646f4968 1e9683c9

drivers/bluetooth/hci_qca.c

+1 −0
Original line number Diff line number Diff line
@@ -1091,6 +1091,7 @@ static void qca_controller_memdump(struct work_struct *work) 
				qca->memdump_state = QCA_MEMDUMP_COLLECTED;

				cancel_delayed_work(&qca->ctrl_memdump_timeout);

				clear_bit(QCA_MEMDUMP_COLLECTION, &qca->flags);

				clear_bit(QCA_IBS_DISABLED, &qca->flags);

				mutex_unlock(&qca->hci_memdump_lock);

				return;

			}

include/net/bluetooth/hci_core.h

+0 −5
Original line number Diff line number Diff line
@@ -186,7 +186,6 @@ struct blocked_key { 
struct smp_csrk {

	bdaddr_t bdaddr;

	u8 bdaddr_type;

	u8 link_type;

	u8 type;

	u8 val[16];

};
@@ -196,7 +195,6 @@ struct smp_ltk { 
	struct rcu_head rcu;

	bdaddr_t bdaddr;

	u8 bdaddr_type;

	u8 link_type;

	u8 authenticated;

	u8 type;

	u8 enc_size;
@@ -211,7 +209,6 @@ struct smp_irk { 
	bdaddr_t rpa;

	bdaddr_t bdaddr;

	u8 addr_type;

	u8 link_type;

	u8 val[16];

};
@@ -219,8 +216,6 @@ struct link_key { 
	struct list_head list;

	struct rcu_head rcu;

	bdaddr_t bdaddr;

	u8 bdaddr_type;

	u8 link_type;

	u8 type;

	u8 val[HCI_LINK_KEY_SIZE];

	u8 pin_len;

include/net/bluetooth/hci_sync.h

+4 −0
Original line number Diff line number Diff line
@@ -73,6 +73,10 @@ int hci_cmd_sync_queue(struct hci_dev *hdev, hci_cmd_sync_work_func_t func, 
		       void *data, hci_cmd_sync_work_destroy_t destroy);

int hci_cmd_sync_queue_once(struct hci_dev *hdev, hci_cmd_sync_work_func_t func,

			    void *data, hci_cmd_sync_work_destroy_t destroy);

int hci_cmd_sync_run(struct hci_dev *hdev, hci_cmd_sync_work_func_t func,

		     void *data, hci_cmd_sync_work_destroy_t destroy);

int hci_cmd_sync_run_once(struct hci_dev *hdev, hci_cmd_sync_work_func_t func,

			  void *data, hci_cmd_sync_work_destroy_t destroy);

struct hci_cmd_sync_work_entry *

hci_cmd_sync_lookup_entry(struct hci_dev *hdev, hci_cmd_sync_work_func_t func,

			  void *data, hci_cmd_sync_work_destroy_t destroy);

net/bluetooth/hci_conn.c

+5 −1
Original line number Diff line number Diff line
@@ -2952,5 +2952,9 @@ int hci_abort_conn(struct hci_conn *conn, u8 reason) 
		return 0;

	}



	return hci_cmd_sync_queue_once(hdev, abort_conn_sync, conn, NULL);

	/* Run immediately if on cmd_sync_work since this may be called

	 * as a result to MGMT_OP_DISCONNECT/MGMT_OP_UNPAIR which does

	 * already queue its callback on cmd_sync_work.

	 */

	return hci_cmd_sync_run_once(hdev, abort_conn_sync, conn, NULL);

}

net/bluetooth/hci_sync.c

+40 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static void hci_cmd_sync_add(struct hci_request *req, u16 opcode, u32 plen, 
	skb_queue_tail(&req->cmd_q, skb);

}



static int hci_cmd_sync_run(struct hci_request *req)

static int hci_req_sync_run(struct hci_request *req)

{

	struct hci_dev *hdev = req->hdev;

	struct sk_buff *skb;
@@ -169,7 +169,7 @@ struct sk_buff *__hci_cmd_sync_sk(struct hci_dev *hdev, u16 opcode, u32 plen, 


	hdev->req_status = HCI_REQ_PEND;



	err = hci_cmd_sync_run(&req);

	err = hci_req_sync_run(&req);

	if (err < 0)

		return ERR_PTR(err);
@@ -782,6 +782,44 @@ int hci_cmd_sync_queue_once(struct hci_dev *hdev, hci_cmd_sync_work_func_t func, 
}

EXPORT_SYMBOL(hci_cmd_sync_queue_once);



/* Run HCI command:

 *

 * - hdev must be running

 * - if on cmd_sync_work then run immediately otherwise queue

 */

int hci_cmd_sync_run(struct hci_dev *hdev, hci_cmd_sync_work_func_t func,

		     void *data, hci_cmd_sync_work_destroy_t destroy)

{

	/* Only queue command if hdev is running which means it had been opened

	 * and is either on init phase or is already up.

	 */

	if (!test_bit(HCI_RUNNING, &hdev->flags))

		return -ENETDOWN;



	/* If on cmd_sync_work then run immediately otherwise queue */

	if (current_work() == &hdev->cmd_sync_work)

		return func(hdev, data);



	return hci_cmd_sync_submit(hdev, func, data, destroy);

}

EXPORT_SYMBOL(hci_cmd_sync_run);



/* Run HCI command entry once:

 *

 * - Lookup if an entry already exist and only if it doesn't creates a new entry

 *   and run it.

 * - if on cmd_sync_work then run immediately otherwise queue

 */

int hci_cmd_sync_run_once(struct hci_dev *hdev, hci_cmd_sync_work_func_t func,

			  void *data, hci_cmd_sync_work_destroy_t destroy)

{

	if (hci_cmd_sync_lookup_entry(hdev, func, data, destroy))

		return 0;



	return hci_cmd_sync_run(hdev, func, data, destroy);

}

EXPORT_SYMBOL(hci_cmd_sync_run_once);



/* Lookup HCI command entry:

 *

 * - Return first entry that matches by function callback or data or