From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9B81B481244; Wed, 1 Jul 2026 12:13:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=60.244.123.138 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782908041; cv=none; b=IO++fKng1+wL9wJeFxq3TmhtCSjF9Qtyeo5cjhinMcO7nPyYQ3eM+eXNSwJ6EGs+GPd4ZjW628bDcFpp1VZMvttBeXZk9gpdfGPBgroTrNBQ3FOiqqCJR8ca8ptfJ3GiKuyQ/BIdvH/IIanxAG6cX1kyBkSC1/Yhz5wM7DCh+QM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782908041; c=relaxed/simple; bh=2My7ZII7X8hEnsXalFGrnEZkHK28kcJn05HYR79Zzu4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=dWqqM2szIpB8REKCWyXNBU3GTY7Nl7osg+nIOU/uUQRR0IcA/PGh305WMtK6xkNtZhLu49HNs5XWBPOA3Pd7m3PikLS63FLZw4P1iZuiD76/BPP/GdKS4Xf96hpbzksaXfhkMhddttocY07Hb3vwRGIm8MNqXi071wFjDSfI6V8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com; spf=pass smtp.mailfrom=mediatek.com; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b=d+mpgTyY; arc=none smtp.client-ip=60.244.123.138 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mediatek.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="d+mpgTyY" X-UUID: 50ccc00a754611f1b1788b6acf885367-20260701 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=dQ9pt6pdhAUEkIL6Lnhp9e6wagB58+Ey6NH5PgalHfc=; b=d+mpgTyYqVyIwdBx0iYwG9BFYSVLnSWsYtfqDLf8/D4g/v0UT96vh0lThAbpOXu9Z+4nQ9mE5tMRL580AckmQlJEghxsnWk/XTLNsg8ztE0Nf/nzz06PYvPjWbwwXSbJ/yiLqpk9GOEASI1JCUW2onAimAmpw2gAuHxaUWR0mC0=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.17,REQID:700afc28-d911-41e9-8a56-bd216cb3e02d,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:d497b38,CLOUDID:2661de81-6310-4e6b-a6b1-aca20d98ed8b,B ulkID:nil,BulkQuantity:0,SF:81|82|102|836|865|888|898,TC:-5,Content:0|15|5 0|99|200|213,EDM:-3,IP:nil,URL:0,File:130,RT:0,Bulk:nil,QS:nil,BEC:-1,COL: 0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 2,SSN|SDN X-CID-BAS: 2,SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: 50ccc00a754611f1b1788b6acf885367-20260701 Received: from mtkmbs09n2.mediatek.inc [(172.21.101.94)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 207708004; Wed, 01 Jul 2026 20:13:48 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs13n1.mediatek.inc (172.21.101.193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.29; Wed, 1 Jul 2026 20:13:47 +0800 Received: from mtksitap99.mediatek.inc (10.233.130.16) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.2562.29 via Frontend Transport; Wed, 1 Jul 2026 20:13:47 +0800 From: Chris Lu To: Marcel Holtmann , Johan Hedberg , Luiz Von Dentz CC: Sean Wang , Will Lee , SS Wu , Steve Lee , linux-bluetooth , linux-kernel , linux-mediatek , Paul Menzel , Chris Lu Subject: [PATCH v7 2/3] Bluetooth: btmtk: Improve BT firmware logging Date: Wed, 1 Jul 2026 20:13:44 +0800 Message-ID: <20260701121345.1231906-3-chris.lu@mediatek.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20260701121345.1231906-1-chris.lu@mediatek.com> References: <20260701121345.1231906-1-chris.lu@mediatek.com> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Improve firmware loading log messages to provide more useful information: - Add firmware filename before loading to help identify which file is being loaded - Display chip ID (dev_id) as HW version instead of firmware's hwver field, which provides more meaningful hardware identification - Use %.16s format specifier for hdr->datetime field to prevent potential buffer over-read, as the field is a 16-byte array that may not be null-terminated log output with MT7922 [ 212.878783] Bluetooth: hci1: Loading BT firmware: mediatek/BT_RAM_CODE_MT7922_1_1_hdr.bin [ 212.889614] Bluetooth: hci1: BT HW ver: 0x7922, SW ver: 0x008a, Build Time: 20260224103448 [ 216.048877] Bluetooth: hci1: Device setup in 3096530 usecs [ 216.048890] Bluetooth: hci1: HCI Enhanced Setup Synchronous Connection command is advertised, but not supported. [ 216.114179] Bluetooth: hci1: AOSP extensions version v1.00 [ 216.114220] Bluetooth: hci1: AOSP quality report is supported [ 216.116782] Bluetooth: MGMT ver 1.23 Signed-off-by: Chris Lu Assisted-by: Claude:Sonnet-4.5 --- drivers/bluetooth/btmtk.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/bluetooth/btmtk.c b/drivers/bluetooth/btmtk.c index 40c2a64aa6b7..e24f9e9fc008 100644 --- a/drivers/bluetooth/btmtk.c +++ b/drivers/bluetooth/btmtk.c @@ -147,6 +147,8 @@ int btmtk_setup_firmware_79xx(struct hci_dev *hdev, const char *fwname, u32 section_num, dl_size, section_offset; u8 cmd[64]; + bt_dev_info(hdev, "Loading BT firmware: %s", fwname); + err = request_firmware(&fw, fwname, &hdev->dev); if (err < 0) { bt_dev_err(hdev, "Failed to load firmware file (%d)", err); @@ -159,8 +161,8 @@ int btmtk_setup_firmware_79xx(struct hci_dev *hdev, const char *fwname, globaldesc = (struct btmtk_global_desc *)(fw_ptr + MTK_FW_ROM_PATCH_HEADER_SIZE); section_num = le32_to_cpu(globaldesc->section_num); - bt_dev_info(hdev, "HW/SW Version: 0x%04x%04x, Build Time: %s", - le16_to_cpu(hdr->hwver), le16_to_cpu(hdr->swver), hdr->datetime); + bt_dev_info(hdev, "BT HW ver: 0x%04x, SW ver: 0x%04x, Build Time: %.16s", + dev_id & 0xffff, le16_to_cpu(hdr->swver), hdr->datetime); for (i = 0; i < section_num; i++) { first_block = 1; -- 2.45.2