Commit 8a48a2dc authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'for-net-next-2023-12-22' of... 

Merge tag 'for-net-next-2023-12-22' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next



Luiz Augusto von Dentz says:

====================
bluetooth-next pull request for net-next:

 - btnxpuart: Fix recv_buf return value
 - L2CAP: Fix responding with multiple rejects
 - Fix atomicity violation in {min,max}_key_size_set
 - ISO: Allow binding a PA sync socket
 - ISO: Reassociate a socket with an active BIS
 - ISO: Avoid creating child socket if PA sync is terminating
 - Add device 13d3:3572 IMC Networks Bluetooth Radio
 - Don't suspend when there are connections
 - Remove le_restart_scan work
 - Fix bogus check for re-auth not supported with non-ssp
 - lib: Add documentation to exported functions
 - Support HFP offload for QCA2066
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7df54188 da9065ca

drivers/bluetooth/btintel.c

+5 −0
Original line number Diff line number Diff line
@@ -535,6 +535,8 @@ static int btintel_version_info_tlv(struct hci_dev *hdev, 
	bt_dev_info(hdev, "%s timestamp %u.%u buildtype %u build %u", variant,

		    2000 + (version->timestamp >> 8), version->timestamp & 0xff,

		    version->build_type, version->build_num);

	if (version->img_type == 0x03)

		bt_dev_info(hdev, "Firmware SHA1: 0x%8.8x", version->git_sha1);



	return 0;

}
@@ -630,6 +632,9 @@ static int btintel_parse_version_tlv(struct hci_dev *hdev, 
			memcpy(&version->otp_bd_addr, tlv->val,

							sizeof(bdaddr_t));

			break;

		case INTEL_TLV_GIT_SHA1:

			version->git_sha1 = get_unaligned_le32(tlv->val);

			break;

		default:

			/* Ignore rest of information */

			break;

drivers/bluetooth/btintel.h

+3 −1
Original line number Diff line number Diff line
@@ -41,7 +41,8 @@ enum { 
	INTEL_TLV_LIMITED_CCE,

	INTEL_TLV_SBE_TYPE,

	INTEL_TLV_OTP_BDADDR,

	INTEL_TLV_UNLOCKED_STATE

	INTEL_TLV_UNLOCKED_STATE,

	INTEL_TLV_GIT_SHA1

};



struct intel_tlv {
@@ -69,6 +70,7 @@ struct intel_version_tlv { 
	u8	min_fw_build_yy;

	u8	limited_cce;

	u8	sbe_type;

	u32	git_sha1;

	bdaddr_t otp_bd_addr;

};

drivers/bluetooth/btmtkuart.c

+3 −8
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ mtk_stp_split(struct btmtkuart_dev *bdev, const unsigned char *data, int count, 
	return data;

}



static int btmtkuart_recv(struct hci_dev *hdev, const u8 *data, size_t count)

static void btmtkuart_recv(struct hci_dev *hdev, const u8 *data, size_t count)

{

	struct btmtkuart_dev *bdev = hci_get_drvdata(hdev);

	const unsigned char *p_left = data, *p_h4;
@@ -375,25 +375,20 @@ static int btmtkuart_recv(struct hci_dev *hdev, const u8 *data, size_t count) 
			bt_dev_err(bdev->hdev,

				   "Frame reassembly failed (%d)", err);

			bdev->rx_skb = NULL;

			return err;

			return;

		}



		sz_left -= sz_h4;

		p_left += sz_h4;

	}



	return 0;

}



static int btmtkuart_receive_buf(struct serdev_device *serdev, const u8 *data,

				 size_t count)

{

	struct btmtkuart_dev *bdev = serdev_device_get_drvdata(serdev);

	int err;



	err = btmtkuart_recv(bdev->hdev, data, count);

	if (err < 0)

		return err;

	btmtkuart_recv(bdev->hdev, data, count);



	bdev->hdev->stat.byte_rx += count;

drivers/bluetooth/btnxpuart.c

+3 −5
Original line number Diff line number Diff line
@@ -1276,11 +1276,9 @@ static int btnxpuart_receive_buf(struct serdev_device *serdev, const u8 *data, 
	if (IS_ERR(nxpdev->rx_skb)) {

		int err = PTR_ERR(nxpdev->rx_skb);

		/* Safe to ignore out-of-sync bootloader signatures */

		if (is_fw_downloading(nxpdev))

			return count;

		if (!is_fw_downloading(nxpdev))

			bt_dev_err(nxpdev->hdev, "Frame reassembly failed (%d)", err);

		nxpdev->rx_skb = NULL;

		return err;

		return count;

	}

	if (!is_fw_downloading(nxpdev))

		nxpdev->hdev->stat.byte_rx += count;

drivers/bluetooth/btusb.c

+6 −0
Original line number Diff line number Diff line
@@ -550,6 +550,8 @@ static const struct usb_device_id quirks_table[] = { 
						     BTUSB_WIDEBAND_SPEECH },

	{ USB_DEVICE(0x13d3, 0x3571), .driver_info = BTUSB_REALTEK |

						     BTUSB_WIDEBAND_SPEECH },

	{ USB_DEVICE(0x13d3, 0x3572), .driver_info = BTUSB_REALTEK |

						     BTUSB_WIDEBAND_SPEECH },



	/* Realtek Bluetooth devices */

	{ USB_VENDOR_AND_INTERFACE_INFO(0x0bda, 0xe0, 0x01, 0x01),
@@ -4629,6 +4631,10 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message) 


	BT_DBG("intf %p", intf);



	/* Don't suspend if there are connections */

	if (hci_conn_count(data->hdev))

		return -EBUSY;



	if (data->suspend_count++)

		return 0;