Commit 2684dd61 authored by Neeraj Sanjay Kale's avatar Neeraj Sanjay Kale Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: btnxpuart: Enable status prints for firmware download 



This enables prints for firmware download which can help automation
tests to verify firmware download functionality.

dmesg logs before:
modprobe btnxpuart
[ 1999.187264] Bluetooth: MGMT ver 1.22

dmesg logs with this patch:
modprobe btnxpuart
[16179.758515] Bluetooth: hci0: ChipID: 7601, Version: 0
[16179.764748] Bluetooth: hci0: Request Firmware: nxp/uartspi_n61x_v1.bin.se
[16181.217490] Bluetooth: hci0: FW Download Complete: 372696 bytes
[16182.701398] Bluetooth: MGMT ver 1.22

Signed-off-by: default avatarNeeraj Sanjay Kale <neeraj.sanjaykale@nxp.com>
Tested-by: default avatarGuillaume Legoupil <guillaume.legoupil@nxp.com>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent c68bbf5e

drivers/bluetooth/btnxpuart.c

+5 −4
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ static int nxp_request_firmware(struct hci_dev *hdev, const char *fw_name) 
	if (!strlen(nxpdev->fw_name)) {

		snprintf(nxpdev->fw_name, MAX_FW_FILE_NAME_LEN, "%s", fw_name);



		bt_dev_dbg(hdev, "Request Firmware: %s", nxpdev->fw_name);

		bt_dev_info(hdev, "Request Firmware: %s", nxpdev->fw_name);

		err = request_firmware(&nxpdev->fw, nxpdev->fw_name, &hdev->dev);

		if (err < 0) {

			bt_dev_err(hdev, "Firmware file %s not found", nxpdev->fw_name);
@@ -781,7 +781,7 @@ static int nxp_recv_fw_req_v1(struct hci_dev *hdev, struct sk_buff *skb) 
	}



	if (!len) {

		bt_dev_dbg(hdev, "FW Downloaded Successfully: %zu bytes",

		bt_dev_info(hdev, "FW Download Complete: %zu bytes",

			   nxpdev->fw->size);

		if (nxp_data->helper_fw_name && !nxpdev->helper_downloaded) {

			nxpdev->helper_downloaded = true;
@@ -890,6 +890,7 @@ static int nxp_recv_chip_ver_v3(struct hci_dev *hdev, struct sk_buff *skb) 


	chip_id = le16_to_cpu(req->chip_id);

	loader_ver = req->loader_ver;

	bt_dev_info(hdev, "ChipID: %04x, Version: %d", chip_id, loader_ver);

	if (!nxp_request_firmware(hdev, nxp_get_fw_name_from_chipid(hdev,

								    chip_id, loader_ver)))

		nxp_send_ack(NXP_ACK_V3, hdev);
@@ -934,7 +935,7 @@ static int nxp_recv_fw_req_v3(struct hci_dev *hdev, struct sk_buff *skb) 
	}



	if (req->len == 0) {

		bt_dev_dbg(hdev, "FW Downloaded Successfully: %zu bytes",

		bt_dev_info(hdev, "FW Download Complete: %zu bytes",

			   nxpdev->fw->size);

		clear_bit(BTNXPUART_FW_DOWNLOADING, &nxpdev->tx_state);

		wake_up_interruptible(&nxpdev->fw_dnld_done_wait_q);
@@ -1037,7 +1038,7 @@ static int nxp_setup(struct hci_dev *hdev) 
		if (err < 0)

			return err;

	} else {

		bt_dev_dbg(hdev, "FW already running.");

		bt_dev_info(hdev, "FW already running.");

		clear_bit(BTNXPUART_FW_DOWNLOADING, &nxpdev->tx_state);

	}