Commit 15843c7f authored by Kiran K's avatar Kiran K Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: btintel: Define a macro for Intel Reset vendor command 



Use macro for Intel Reset command (0xfc01) instead of hard coded value.

Signed-off-by: default avatarKiran K <kiran.k@intel.com>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 0e492dba

drivers/bluetooth/btintel.c

+2 −2
Original line number Diff line number Diff line
@@ -889,7 +889,7 @@ int btintel_send_intel_reset(struct hci_dev *hdev, u32 boot_param) 


	params.boot_param = cpu_to_le32(boot_param);



	skb = __hci_cmd_sync(hdev, 0xfc01, sizeof(params), &params,

	skb = __hci_cmd_sync(hdev, BTINTEL_HCI_OP_RESET, sizeof(params), &params,

			     HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		bt_dev_err(hdev, "Failed to send Intel Reset command");
@@ -1287,7 +1287,7 @@ static void btintel_reset_to_bootloader(struct hci_dev *hdev) 
	params.boot_option = 0x00;

	params.boot_param = cpu_to_le32(0x00000000);



	skb = __hci_cmd_sync(hdev, 0xfc01, sizeof(params),

	skb = __hci_cmd_sync(hdev, BTINTEL_HCI_OP_RESET, sizeof(params),

			     &params, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		bt_dev_err(hdev, "FW download error recovery failed (%ld)",

drivers/bluetooth/btintel.h

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ struct intel_tlv { 
	u8 val[];

} __packed;



#define BTINTEL_HCI_OP_RESET	0xfc01



#define BTINTEL_CNVI_BLAZARI		0x900

#define BTINTEL_CNVI_BLAZARIW		0x901

#define BTINTEL_CNVI_GAP		0x910

drivers/bluetooth/btintel_pcie.c

+6 −6
Original line number Diff line number Diff line
@@ -1977,12 +1977,12 @@ static int btintel_pcie_send_frame(struct hci_dev *hdev, 
			struct hci_command_hdr *cmd = (void *)skb->data;

			__u16 opcode = le16_to_cpu(cmd->opcode);



			/* When the 0xfc01 command is issued to boot into

			 * the operational firmware, it will actually not

			 * send a command complete event. To keep the flow

			/* When the BTINTEL_HCI_OP_RESET command is issued to

			 * boot into the operational firmware, it will actually

			 * not send a command complete event. To keep the flow

			 * control working inject that event here.

			 */

			if (opcode == 0xfc01)

			if (opcode == BTINTEL_HCI_OP_RESET)

				btintel_pcie_inject_cmd_complete(hdev, opcode);

		}

		/* Firmware raises alive interrupt on HCI_OP_RESET */
@@ -2017,10 +2017,10 @@ static int btintel_pcie_send_frame(struct hci_dev *hdev, 
	}



	if (type == BTINTEL_PCIE_HCI_CMD_PKT &&

	    (opcode == HCI_OP_RESET || opcode == 0xfc01)) {

	    (opcode == HCI_OP_RESET || opcode == BTINTEL_HCI_OP_RESET)) {

		old_ctxt = data->alive_intr_ctxt;

		data->alive_intr_ctxt =

			(opcode == 0xfc01 ? BTINTEL_PCIE_INTEL_HCI_RESET1 :

			(opcode == BTINTEL_HCI_OP_RESET ? BTINTEL_PCIE_INTEL_HCI_RESET1 :

				BTINTEL_PCIE_HCI_RESET);

		bt_dev_dbg(data->hdev, "sent cmd: 0x%4.4x alive context changed: %s  ->  %s",

			   opcode, btintel_pcie_alivectxt_state2str(old_ctxt),

drivers/bluetooth/btusb.c

+4 −4
Original line number Diff line number Diff line
@@ -2605,12 +2605,12 @@ static int btusb_send_frame_intel(struct hci_dev *hdev, struct sk_buff *skb) 
			else

				urb = alloc_ctrl_urb(hdev, skb);



			/* When the 0xfc01 command is issued to boot into

			 * the operational firmware, it will actually not

			 * send a command complete event. To keep the flow

			/* When the BTINTEL_HCI_OP_RESET command is issued to

			 * boot into the operational firmware, it will actually

			 * not send a command complete event. To keep the flow

			 * control working inject that event here.

			 */

			if (opcode == 0xfc01)

			if (opcode == BTINTEL_HCI_OP_RESET)

				inject_cmd_complete(hdev, opcode);

		} else {

			urb = alloc_ctrl_urb(hdev, skb);

drivers/bluetooth/hci_intel.c

+5 −5
Original line number Diff line number Diff line
@@ -1029,12 +1029,12 @@ static struct sk_buff *intel_dequeue(struct hci_uart *hu) 
		struct hci_command_hdr *cmd = (void *)skb->data;

		__u16 opcode = le16_to_cpu(cmd->opcode);



		/* When the 0xfc01 command is issued to boot into

		 * the operational firmware, it will actually not

		 * send a command complete event. To keep the flow

		 * control working inject that event here.

		/* When the BTINTEL_HCI_OP_RESET command is issued to boot into

		 * the operational firmware, it will actually not send a command

		 * complete event. To keep the flow control working inject that

		 * event here.

		 */

		if (opcode == 0xfc01)

		if (opcode == BTINTEL_HCI_OP_RESET)

			inject_cmd_complete(hu->hdev, opcode);

	}