Merge branch 'for-upstream' of... (ca424b20) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/bluetooth/ath3k.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -103,6 +103,7 @@ static const struct usb_device_id ath3k_table[] = {
		{ USB_DEVICE(0x13d3, 0x3375) },
		{ USB_DEVICE(0x13d3, 0x3393) },
		{ USB_DEVICE(0x13d3, 0x3402) },
		{ USB_DEVICE(0x13d3, 0x3432) },

		/* Atheros AR5BBU12 with sflash firmware */
		{ USB_DEVICE(0x0489, 0xE02C) },
		@@ -152,6 +153,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = {
		{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
		{ USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },
		{ USB_DEVICE(0x13d3, 0x3402), .driver_info = BTUSB_ATH3012 },
		{ USB_DEVICE(0x13d3, 0x3432), .driver_info = BTUSB_ATH3012 },

		/* Atheros AR5BBU22 with sflash firmware */
		{ USB_DEVICE(0x0489, 0xE036), .driver_info = BTUSB_ATH3012 },
		@@ -288,10 +290,10 @@ static int ath3k_load_fwfile(struct usb_device *udev,
		sent += size;
		count -= size;

		while (count) {
		size = min_t(uint, count, BULK_SIZE);
		pipe = usb_sndbulkpipe(udev, 0x02);

		while (count) {
		size = min_t(uint, count, BULK_SIZE);
		memcpy(send_buf, firmware->data + sent, size);

		err = usb_bulk_msg(udev, pipe, send_buf, size,

drivers/bluetooth/btmrvl_drv.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,7 @@ struct btmrvl_adapter {
		u8 hs_state;
		u8 wakeup_tries;
		wait_queue_head_t cmd_wait_q;
		wait_queue_head_t event_hs_wait_q;
		u8 cmd_complete;
		bool is_suspended;
		};
		@@ -89,6 +90,7 @@ struct btmrvl_private {
		#define MRVL_VENDOR_PKT 0xFE

		/* Vendor specific Bluetooth commands */
		#define BT_CMD_PSCAN_WIN_REPORT_ENABLE 0xFC03
		#define BT_CMD_AUTO_SLEEP_MODE 0xFC23
		#define BT_CMD_HOST_SLEEP_CONFIG 0xFC59
		#define BT_CMD_HOST_SLEEP_ENABLE 0xFC5A
		@@ -143,6 +145,7 @@ bool btmrvl_check_evtpkt(struct btmrvl_private priv, struct sk_buff skb);
		int btmrvl_process_event(struct btmrvl_private priv, struct sk_buff skb);

		int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, u8 subcmd);
		int btmrvl_pscan_window_reporting(struct btmrvl_private *priv, u8 subcmd);
		int btmrvl_send_hscfg_cmd(struct btmrvl_private *priv);
		int btmrvl_enable_ps(struct btmrvl_private *priv);
		int btmrvl_prepare_command(struct btmrvl_private *priv);

drivers/bluetooth/btmrvl_main.c

+43 −1

Original line number	Diff line number	Diff line
		@@ -114,6 +114,7 @@ int btmrvl_process_event(struct btmrvl_private priv, struct sk_buff skb)
		adapter->hs_state = HS_ACTIVATED;
		if (adapter->psmode)
		adapter->ps_state = PS_SLEEP;
		wake_up_interruptible(&adapter->event_hs_wait_q);
		BT_DBG("HS ACTIVATED!");
		} else {
		BT_DBG("HS Enable failed");
		@@ -214,6 +215,23 @@ int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, u8 subcmd)
		}
		EXPORT_SYMBOL_GPL(btmrvl_send_module_cfg_cmd);

		int btmrvl_pscan_window_reporting(struct btmrvl_private *priv, u8 subcmd)
		{
		struct btmrvl_sdio_card *card = priv->btmrvl_dev.card;
		int ret;

		if (!card->support_pscan_win_report)
		return 0;

		ret = btmrvl_send_sync_cmd(priv, BT_CMD_PSCAN_WIN_REPORT_ENABLE,
		&subcmd, 1);
		if (ret)
		BT_ERR("PSCAN_WIN_REPORT_ENABLE command failed: %#x", ret);

		return ret;
		}
		EXPORT_SYMBOL_GPL(btmrvl_pscan_window_reporting);

		int btmrvl_send_hscfg_cmd(struct btmrvl_private *priv)
		{
		int ret;
		@@ -253,11 +271,31 @@ EXPORT_SYMBOL_GPL(btmrvl_enable_ps);

		int btmrvl_enable_hs(struct btmrvl_private *priv)
		{
		struct btmrvl_adapter *adapter = priv->adapter;
		int ret;

		ret = btmrvl_send_sync_cmd(priv, BT_CMD_HOST_SLEEP_ENABLE, NULL, 0);
		if (ret)
		if (ret) {
		BT_ERR("Host sleep enable command failed\n");
		return ret;
		}

		ret = wait_event_interruptible_timeout(adapter->event_hs_wait_q,
		adapter->hs_state,
		msecs_to_jiffies(WAIT_UNTIL_HS_STATE_CHANGED));
		if (ret < 0) {
		BT_ERR("event_hs_wait_q terminated (%d): %d,%d,%d",
		ret, adapter->hs_state, adapter->ps_state,
		adapter->wakeup_tries);
		} else if (!ret) {
		BT_ERR("hs_enable timeout: %d,%d,%d", adapter->hs_state,
		adapter->ps_state, adapter->wakeup_tries);
		ret = -ETIMEDOUT;
		} else {
		BT_DBG("host sleep enabled: %d,%d,%d", adapter->hs_state,
		adapter->ps_state, adapter->wakeup_tries);
		ret = 0;
		}

		return ret;
		}
		@@ -358,6 +396,7 @@ static void btmrvl_init_adapter(struct btmrvl_private *priv)
		}

		init_waitqueue_head(&priv->adapter->cmd_wait_q);
		init_waitqueue_head(&priv->adapter->event_hs_wait_q);
		}

		static void btmrvl_free_adapter(struct btmrvl_private *priv)
		@@ -489,6 +528,8 @@ static int btmrvl_setup(struct hci_dev *hdev)

		btmrvl_cal_data_dt(priv);

		btmrvl_pscan_window_reporting(priv, 0x01);

		priv->btmrvl_dev.psmode = 1;
		btmrvl_enable_ps(priv);

		@@ -666,6 +707,7 @@ int btmrvl_remove_card(struct btmrvl_private *priv)
		hdev = priv->btmrvl_dev.hcidev;

		wake_up_interruptible(&priv->adapter->cmd_wait_q);
		wake_up_interruptible(&priv->adapter->event_hs_wait_q);

		kthread_stop(priv->main_thread.task);

drivers/bluetooth/btmrvl_sdio.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -108,6 +108,7 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8688 = {
		.helper = "mrvl/sd8688_helper.bin",
		.firmware = "mrvl/sd8688.bin",
		.reg = &btmrvl_reg_8688,
		.support_pscan_win_report = false,
		.sd_blksz_fw_dl = 64,
		};

		@@ -115,6 +116,7 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8787 = {
		.helper = NULL,
		.firmware = "mrvl/sd8787_uapsta.bin",
		.reg = &btmrvl_reg_87xx,
		.support_pscan_win_report = false,
		.sd_blksz_fw_dl = 256,
		};

		@@ -122,6 +124,7 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8797 = {
		.helper = NULL,
		.firmware = "mrvl/sd8797_uapsta.bin",
		.reg = &btmrvl_reg_87xx,
		.support_pscan_win_report = false,
		.sd_blksz_fw_dl = 256,
		};

		@@ -129,6 +132,7 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8897 = {
		.helper = NULL,
		.firmware = "mrvl/sd8897_uapsta.bin",
		.reg = &btmrvl_reg_88xx,
		.support_pscan_win_report = true,
		.sd_blksz_fw_dl = 256,
		};

		@@ -1067,6 +1071,7 @@ static int btmrvl_sdio_probe(struct sdio_func *func,
		card->firmware = data->firmware;
		card->reg = data->reg;
		card->sd_blksz_fw_dl = data->sd_blksz_fw_dl;
		card->support_pscan_win_report = data->support_pscan_win_report;
		}

		if (btmrvl_sdio_register_dev(card) < 0) {

drivers/bluetooth/btmrvl_sdio.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -89,6 +89,7 @@ struct btmrvl_sdio_card {
		const char *helper;
		const char *firmware;
		const struct btmrvl_sdio_card_reg *reg;
		bool support_pscan_win_report;
		u16 sd_blksz_fw_dl;
		u8 rx_unit;
		struct btmrvl_private *priv;
		@@ -98,6 +99,7 @@ struct btmrvl_sdio_device {
		const char *helper;
		const char *firmware;
		const struct btmrvl_sdio_card_reg *reg;
		const bool support_pscan_win_report;
		u16 sd_blksz_fw_dl;
		};