Commit 4a63ef71 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-upstream' of... 

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next



Johan Hedberg says:

====================
pull request: bluetooth-next 2019-12-09

Here's the first bluetooth-next pull request for 5.6:

 - Devicetree bindings updates for Broadcom controllers
 - Add support for PCM configuration for Broadcom controllers
 - btusb: Fixes for Realtek devices
 - butsb: A few other smaller fixes (mem leak & non-atomic allocation issue)

Please let me know if there are any issues pulling. Thanks.
====================

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

Documentation/devicetree/bindings/net/broadcom-bluetooth.txt

+7 −0
Original line number Diff line number Diff line
@@ -30,6 +30,12 @@ Optional properties: 
   - "lpo": external low power 32.768 kHz clock

 - vbat-supply: phandle to regulator supply for VBAT

 - vddio-supply: phandle to regulator supply for VDDIO

 - brcm,bt-pcm-int-params: configure PCM parameters via a 5-byte array

    - sco-routing: 0 = PCM, 1 = Transport, 2 = Codec, 3 = I2S

    - pcm-interface-rate: 128KBps, 256KBps, 512KBps, 1024KBps, 2048KBps

    - pcm-frame-type: short, long

    - pcm-sync-mode: slave, master

    - pcm-clock-mode: slave, master





Example:
@@ -41,5 +47,6 @@ Example: 
       bluetooth {

               compatible = "brcm,bcm43438-bt";

               max-speed = <921600>;

               brcm,bt-pcm-int-params = [01 02 00 01 01];

       };

};

drivers/bluetooth/btbcm.c

+46 −0
Original line number Diff line number Diff line
@@ -107,6 +107,52 @@ int btbcm_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr) 
}

EXPORT_SYMBOL_GPL(btbcm_set_bdaddr);



int btbcm_read_pcm_int_params(struct hci_dev *hdev,

			      struct bcm_set_pcm_int_params *params)

{

	struct sk_buff *skb;

	int err = 0;



	skb = __hci_cmd_sync(hdev, 0xfc1d, 0, NULL, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		err = PTR_ERR(skb);

		bt_dev_err(hdev, "BCM: Read PCM int params failed (%d)", err);

		return err;

	}



	if (skb->len != 6 || skb->data[0]) {

		bt_dev_err(hdev, "BCM: Read PCM int params length mismatch");

		kfree_skb(skb);

		return -EIO;

	}



	if (params)

		memcpy(params, skb->data + 1, 5);



	kfree_skb(skb);



	return 0;

}

EXPORT_SYMBOL_GPL(btbcm_read_pcm_int_params);



int btbcm_write_pcm_int_params(struct hci_dev *hdev,

			       const struct bcm_set_pcm_int_params *params)

{

	struct sk_buff *skb;

	int err;



	skb = __hci_cmd_sync(hdev, 0xfc1c, 5, params, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		err = PTR_ERR(skb);

		bt_dev_err(hdev, "BCM: Write PCM int params failed (%d)", err);

		return err;

	}

	kfree_skb(skb);



	return 0;

}

EXPORT_SYMBOL_GPL(btbcm_write_pcm_int_params);



int btbcm_patchram(struct hci_dev *hdev, const struct firmware *fw)

{

	const struct hci_command_hdr *cmd;

drivers/bluetooth/btbcm.h

+16 −0
Original line number Diff line number Diff line
@@ -54,6 +54,10 @@ struct bcm_set_pcm_format_params { 
int btbcm_check_bdaddr(struct hci_dev *hdev);

int btbcm_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr);

int btbcm_patchram(struct hci_dev *hdev, const struct firmware *fw);

int btbcm_read_pcm_int_params(struct hci_dev *hdev,

			      struct bcm_set_pcm_int_params *params);

int btbcm_write_pcm_int_params(struct hci_dev *hdev,

			       const struct bcm_set_pcm_int_params *params);



int btbcm_setup_patchram(struct hci_dev *hdev);

int btbcm_setup_apple(struct hci_dev *hdev);
@@ -74,6 +78,18 @@ static inline int btbcm_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr) 
	return -EOPNOTSUPP;

}



int btbcm_read_pcm_int_params(struct hci_dev *hdev,

			      struct bcm_set_pcm_int_params *params)

{

	return -EOPNOTSUPP;

}



int btbcm_write_pcm_int_params(struct hci_dev *hdev,

			       const struct bcm_set_pcm_int_params *params)

{

	return -EOPNOTSUPP;

}



static inline int btbcm_patchram(struct hci_dev *hdev, const struct firmware *fw)

{

	return -EOPNOTSUPP;

drivers/bluetooth/btusb.c

+8 −4
Original line number Diff line number Diff line
@@ -552,9 +552,9 @@ static void btusb_rtl_cmd_timeout(struct hci_dev *hdev) 
	}



	bt_dev_err(hdev, "Reset Realtek device via gpio");

	gpiod_set_value_cansleep(reset_gpio, 0);

	msleep(200);

	gpiod_set_value_cansleep(reset_gpio, 1);

	msleep(200);

	gpiod_set_value_cansleep(reset_gpio, 0);

}



static inline void btusb_free_frags(struct btusb_data *data)
@@ -2602,7 +2602,7 @@ static void btusb_mtk_wmt_recv(struct urb *urb) 
		 * and being processed the events from there then.

		 */

		if (test_bit(BTUSB_TX_WAIT_VND_EVT, &data->flags)) {

			data->evt_skb = skb_clone(skb, GFP_KERNEL);

			data->evt_skb = skb_clone(skb, GFP_ATOMIC);

			if (!data->evt_skb)

				goto err_out;

		}
@@ -2867,7 +2867,7 @@ static int btusb_mtk_setup_firmware(struct hci_dev *hdev, const char *fwname) 
	err = btusb_mtk_hci_wmt_sync(hdev, &wmt_params);

	if (err < 0) {

		bt_dev_err(hdev, "Failed to send wmt rst (%d)", err);

		return err;

		goto err_release_fw;

	}



	/* Wait a few moments for firmware activation done */
@@ -3832,6 +3832,10 @@ static int btusb_probe(struct usb_interface *intf, 
		 * (DEVICE_REMOTE_WAKEUP)

		 */

		set_bit(BTUSB_WAKEUP_DISABLE, &data->flags);



		err = usb_autopm_get_interface(intf);

		if (err < 0)

			goto out_free_dev;

	}



	if (id->driver_info & BTUSB_AMP) {

drivers/bluetooth/hci_bcm.c

+48 −2
Original line number Diff line number Diff line
@@ -47,6 +47,14 @@ 


#define BCM_NUM_SUPPLIES 2



/**

 * struct bcm_device_data - device specific data

 * @no_early_set_baudrate: Disallow set baudrate before driver setup()

 */

struct bcm_device_data {

	bool	no_early_set_baudrate;

};



/**

 * struct bcm_device - device driver resources

 * @serdev_hu: HCI UART controller struct
@@ -79,6 +87,7 @@ 
 * @hu: pointer to HCI UART controller struct,

 *	used to disable flow control during runtime suspend and system sleep

 * @is_suspended: whether flow control is currently disabled

 * @no_early_set_baudrate: don't set_baudrate before setup()

 */

struct bcm_device {

	/* Must be the first member, hci_serdev.c expects this. */
@@ -112,6 +121,8 @@ struct bcm_device { 
	struct hci_uart		*hu;

	bool			is_suspended;

#endif

	bool			no_early_set_baudrate;

	u8			pcm_int_params[5];

};



/* generic bcm uart resources */
@@ -447,7 +458,13 @@ out: 
	if (bcm->dev) {

		hci_uart_set_flow_control(hu, true);

		hu->init_speed = bcm->dev->init_speed;



		/* If oper_speed is set, ldisc/serdev will set the baudrate

		 * before calling setup()

		 */

		if (!bcm->dev->no_early_set_baudrate)

			hu->oper_speed = bcm->dev->oper_speed;



		err = bcm_gpio_set_power(bcm->dev, true);

		hci_uart_set_flow_control(hu, false);

		if (err)
@@ -565,6 +582,8 @@ static int bcm_setup(struct hci_uart *hu) 
	/* Operational speed if any */

	if (hu->oper_speed)

		speed = hu->oper_speed;

	else if (bcm->dev && bcm->dev->oper_speed)

		speed = bcm->dev->oper_speed;

	else if (hu->proto->oper_speed)

		speed = hu->proto->oper_speed;

	else
@@ -576,6 +595,16 @@ static int bcm_setup(struct hci_uart *hu) 
			host_set_baudrate(hu, speed);

	}



	/* PCM parameters if provided */

	if (bcm->dev && bcm->dev->pcm_int_params[0] != 0xff) {

		struct bcm_set_pcm_int_params params;



		btbcm_read_pcm_int_params(hu->hdev, &params);



		memcpy(&params, bcm->dev->pcm_int_params, 5);

		btbcm_write_pcm_int_params(hu->hdev, &params);

	}



finalize:

	release_firmware(fw);
@@ -1113,6 +1142,8 @@ static int bcm_acpi_probe(struct bcm_device *dev) 
static int bcm_of_probe(struct bcm_device *bdev)

{

	device_property_read_u32(bdev->dev, "max-speed", &bdev->oper_speed);

	device_property_read_u8_array(bdev->dev, "brcm,bt-pcm-int-params",

				      bdev->pcm_int_params, 5);

	return 0;

}
@@ -1128,6 +1159,9 @@ static int bcm_probe(struct platform_device *pdev) 
	dev->dev = &pdev->dev;

	dev->irq = platform_get_irq(pdev, 0);



	/* Initialize routing field to an unused value */

	dev->pcm_int_params[0] = 0xff;



	if (has_acpi_companion(&pdev->dev)) {

		ret = bcm_acpi_probe(dev);

		if (ret)
@@ -1374,6 +1408,7 @@ static struct platform_driver bcm_driver = { 
static int bcm_serdev_probe(struct serdev_device *serdev)

{

	struct bcm_device *bcmdev;

	const struct bcm_device_data *data;

	int err;



	bcmdev = devm_kzalloc(&serdev->dev, sizeof(*bcmdev), GFP_KERNEL);
@@ -1387,6 +1422,9 @@ static int bcm_serdev_probe(struct serdev_device *serdev) 
	bcmdev->serdev_hu.serdev = serdev;

	serdev_device_set_drvdata(serdev, bcmdev);



	/* Initialize routing field to an unused value */

	bcmdev->pcm_int_params[0] = 0xff;



	if (has_acpi_companion(&serdev->dev))

		err = bcm_acpi_probe(bcmdev);

	else
@@ -1408,6 +1446,10 @@ static int bcm_serdev_probe(struct serdev_device *serdev) 
	if (err)

		dev_err(&serdev->dev, "Failed to power down\n");



	data = device_get_match_data(bcmdev->dev);

	if (data)

		bcmdev->no_early_set_baudrate = data->no_early_set_baudrate;



	return hci_uart_register_device(&bcmdev->serdev_hu, &bcm_proto);

}
@@ -1419,12 +1461,16 @@ static void bcm_serdev_remove(struct serdev_device *serdev) 
}



#ifdef CONFIG_OF

static struct bcm_device_data bcm4354_device_data = {

	.no_early_set_baudrate = true,

};



static const struct of_device_id bcm_bluetooth_of_match[] = {

	{ .compatible = "brcm,bcm20702a1" },

	{ .compatible = "brcm,bcm4345c5" },

	{ .compatible = "brcm,bcm4330-bt" },

	{ .compatible = "brcm,bcm43438-bt" },

	{ .compatible = "brcm,bcm43540-bt" },

	{ .compatible = "brcm,bcm43540-bt", .data = &bcm4354_device_data },

	{ .compatible = "brcm,bcm4335a0" },

	{ },

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE