Commit 1a280c54 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'for-net-next-2025-01-15' of... 

Merge tag 'for-net-next-2025-01-15' 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:

 - btusb: Add new VID/PID 13d3/3610 for MT7922
 - btusb: Add new VID/PID 13d3/3628 for MT7925
 - btusb: Add MT7921e device 13d3:3576
 - btusb: Add RTL8851BE device 13d3:3600
 - btusb: Add ID 0x2c7c:0x0130 for Qualcomm WCN785x
 - btusb: add sysfs attribute to control USB alt setting
 - qca: Expand firmware-name property
 - qca: Fix poor RF performance for WCN6855
 - L2CAP: handle NULL sock pointer in l2cap_sock_alloc
 - Allow reset via sysfs
 - ISO: Allow BIG re-sync
 - dt-bindings: Utilize PMU abstraction for WCN6750
 - MGMT: Mark LL Privacy as stable

* tag 'for-net-next-2025-01-15' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next: (23 commits)
  Bluetooth: MGMT: Fix slab-use-after-free Read in mgmt_remove_adv_monitor_sync
  Bluetooth: qca: Fix poor RF performance for WCN6855
  Bluetooth: Allow reset via sysfs
  Bluetooth: Get rid of cmd_timeout and use the reset callback
  Bluetooth: Remove the cmd timeout count in btusb
  Bluetooth: Use str_enable_disable-like helpers
  Bluetooth: btmtk: Remove resetting mt7921 before downloading the fw
  Bluetooth: L2CAP: handle NULL sock pointer in l2cap_sock_alloc
  Bluetooth: btusb: Add RTL8851BE device 13d3:3600
  dt-bindings: bluetooth: Utilize PMU abstraction for WCN6750
  Bluetooth: btusb: Add MT7921e device 13d3:3576
  Bluetooth: btrtl: check for NULL in btrtl_setup_realtek()
  Bluetooth: btbcm: Fix NULL deref in btbcm_get_board_name()
  Bluetooth: qca: Expand firmware-name to load specific rampatch
  Bluetooth: qca: Update firmware-name to support board specific nvm
  dt-bindings: net: bluetooth: qca: Expand firmware-name property
  Bluetooth: btusb: Add new VID/PID 13d3/3628 for MT7925
  Bluetooth: btusb: Add new VID/PID 13d3/3610 for MT7922
  Bluetooth: btusb: add sysfs attribute to control USB alt setting
  Bluetooth: btusb: Add ID 0x2c7c:0x0130 for Qualcomm WCN785x
  ...
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 66cc61a2 26fbd349

Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml

+4 −6
Original line number Diff line number Diff line
@@ -101,7 +101,10 @@ properties: 
  max-speed: true



  firmware-name:

    description: specify the name of nvm firmware to load

    minItems: 1

    items:

      - description: specify the name of nvm firmware to load

      - description: specify the name of rampatch firmware to load



  local-bd-address: true
@@ -154,16 +157,11 @@ allOf: 
              - qcom,wcn6750-bt

    then:

      required:

        - enable-gpios

        - swctrl-gpios

        - vddio-supply

        - vddaon-supply

        - vddbtcxmx-supply

        - vddrfacmn-supply

        - vddrfa0p8-supply

        - vddrfa1p7-supply

        - vddrfa1p2-supply

        - vddasd-supply

  - if:

      properties:

        compatible:

drivers/bluetooth/btbcm.c

+3 −0
Original line number Diff line number Diff line
@@ -553,6 +553,9 @@ static const char *btbcm_get_board_name(struct device *dev) 


	/* get rid of any '/' in the compatible string */

	board_type = devm_kstrdup(dev, tmp, GFP_KERNEL);

	if (!board_type)

		return NULL;



	strreplace(board_type, '/', '-');



	return board_type;

drivers/bluetooth/btintel.c

+9 −8
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/module.h>

#include <linux/firmware.h>

#include <linux/regmap.h>

#include <linux/string_choices.h>

#include <linux/acpi.h>

#include <acpi/acpi_bus.h>

#include <linux/unaligned.h>
@@ -506,13 +507,13 @@ int btintel_version_info_tlv(struct hci_dev *hdev, 


		bt_dev_info(hdev, "Device revision is %u", version->dev_rev_id);

		bt_dev_info(hdev, "Secure boot is %s",

			    version->secure_boot ? "enabled" : "disabled");

			    str_enabled_disabled(version->secure_boot));

		bt_dev_info(hdev, "OTP lock is %s",

			    version->otp_lock ? "enabled" : "disabled");

			    str_enabled_disabled(version->otp_lock));

		bt_dev_info(hdev, "API lock is %s",

			    version->api_lock ? "enabled" : "disabled");

			    str_enabled_disabled(version->api_lock));

		bt_dev_info(hdev, "Debug lock is %s",

			    version->debug_lock ? "enabled" : "disabled");

			    str_enabled_disabled(version->debug_lock));

		bt_dev_info(hdev, "Minimum firmware build %u week %u %u",

			    version->min_fw_build_nn, version->min_fw_build_cw,

			    2000 + version->min_fw_build_yy);
@@ -927,16 +928,16 @@ int btintel_read_boot_params(struct hci_dev *hdev, 
		    le16_to_cpu(params->dev_revid));



	bt_dev_info(hdev, "Secure boot is %s",

		    params->secure_boot ? "enabled" : "disabled");

		    str_enabled_disabled(params->secure_boot));



	bt_dev_info(hdev, "OTP lock is %s",

		    params->otp_lock ? "enabled" : "disabled");

		    str_enabled_disabled(params->otp_lock));



	bt_dev_info(hdev, "API lock is %s",

		    params->api_lock ? "enabled" : "disabled");

		    str_enabled_disabled(params->api_lock));



	bt_dev_info(hdev, "Debug lock is %s",

		    params->debug_lock ? "enabled" : "disabled");

		    str_enabled_disabled(params->debug_lock));



	bt_dev_info(hdev, "Minimum firmware build %u week %u %u",

		    params->min_fw_build_nn, params->min_fw_build_cw,

drivers/bluetooth/btmrvl_main.c

+2 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


#include <linux/module.h>

#include <linux/of.h>

#include <linux/string_choices.h>

#include <net/bluetooth/bluetooth.h>

#include <net/bluetooth/hci_core.h>

#include <linux/mmc/sdio_func.h>
@@ -88,7 +89,7 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb) 
			else

				adapter->psmode = 0;

			BT_DBG("PS Mode:%s",

				(adapter->psmode) ? "Enable" : "Disable");

			       str_enable_disable(adapter->psmode));

		} else {

			BT_DBG("PS Mode command failed");

		}

drivers/bluetooth/btmtk.c

+2 −2
Original line number Diff line number Diff line
@@ -1329,7 +1329,6 @@ int btmtk_usb_setup(struct hci_dev *hdev) 
		fwname = FIRMWARE_MT7668;

		break;

	case 0x7922:

	case 0x7961:

	case 0x7925:

		/* Reset the device to ensure it's in the initial state before

		 * downloading the firmware to ensure.
@@ -1337,7 +1336,8 @@ int btmtk_usb_setup(struct hci_dev *hdev) 


		if (!test_bit(BTMTK_FIRMWARE_LOADED, &btmtk_data->flags))

			btmtk_usb_subsys_reset(hdev, dev_id);



		fallthrough;

	case 0x7961:

		btmtk_fw_get_filename(fw_bin_name, sizeof(fw_bin_name), dev_id,

				      fw_version, fw_flavor);