From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) (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 5C905309EF9; Fri, 17 Jul 2026 08:54:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.61.82.184 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784278493; cv=none; b=Gkfe/1JcKtcZigsRMultQJZnb2DQsCphPQ4OAyFkLECbt3x+mFXhuUBAGWCyObQUyGjE+u+RnH3Wix5SCzXKAAfYB0lhC+yS+PiJS7JEl66oAZnu7oV+C9CaPA5gRZD3uwKUIEHxkb7m7xp+6M5HNCvuQGGCLDSagt4aInK4eI8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784278493; c=relaxed/simple; bh=NR9a31Nxm/tY6pfJQsyeM3EBw4X2ZoQ+YD6VSpkhjkY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MzG9ptoA4sULnH83qDSuyRLgh9JRWs+MaZCtChds6PhRkvvROVxMEif7exEq3T7Uzvh1XFayo5bk91a6Zd6pB/X1f+MERRJVdAMUuVAce5M4vgwNrYmm2gUP5Phh5qBWQt/L68fkF/uo8cOmz9JcAhVvHeq1Yvgt1jRorSCk308= 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=GzbR0QUl; arc=none smtp.client-ip=210.61.82.184 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="GzbR0QUl" X-UUID: 0c6592f881bb11f18dc8c9802ae25ab1-20260717 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=gClFNFgrtaHPWtlE4hYkdf8yRIDeX0/Whb0JUsUCu0s=; b=GzbR0QUlb3Yxxo9r+6YNLXDyl9vMKA5quybHsItjfHcYPauPgruJXKP3iBWkkoxIp2rxk7m1EslWAaLl016VXouCFjXQzc6AyKgVaCuGWf5qdbL2/wBquaLKXd2L0zUoFEL/hPN9lrudGE34fnM/hdMSNMb93p8s0hrKMBmzon4=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.18,REQID:7badaff9-9d70-46d0-a703-93953155b27c,IP:0,U RL:0,TC:0,Content:-25,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:-25 X-CID-META: VersionHash:8a735a6,CLOUDID:bfc2965f-762a-4584-baab-4eebe609beea,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: 0c6592f881bb11f18dc8c9802ae25ab1-20260717 Received: from mtkmbs14n1.mediatek.inc [(172.21.101.75)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 249934291; Fri, 17 Jul 2026 16:39:39 +0800 Received: from mtkmbs13n2.mediatek.inc (172.21.101.108) by MTKMBS09N1.mediatek.inc (172.21.101.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.29; Fri, 17 Jul 2026 16:39:38 +0800 Received: from mtksitap99.mediatek.inc (10.233.130.16) by mtkmbs13n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.2562.29 via Frontend Transport; Fri, 17 Jul 2026 16:39:38 +0800 From: Chris Lu To: Marcel Holtmann , Johan Hedberg , Luiz Von Dentz CC: Sean Wang , Will Lee , SS Wu , Steve Lee , Paul Menzel , linux-bluetooth , linux-kernel , linux-mediatek , Chris Lu Subject: [PATCH v16 3/7] Bluetooth: btmtksdio: Pass hardware dev_id to mt79xx_setup() Date: Fri, 17 Jul 2026 16:39:32 +0800 Message-ID: <20260717083936.2923891-4-chris.lu@mediatek.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20260717083936.2923891-1-chris.lu@mediatek.com> References: <20260717083936.2923891-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 mt79xx_setup() hardcodes dev_id=0 when calling btmtk_setup_firmware_79xx(), causing SDIO devices to log incorrect chip ID "BT HW ver: 0x0000" instead of the actual hardware version read from register 0x70010200. Pass the hardware dev_id to mt79xx_setup() and forward it to btmtk_setup_firmware_79xx() to match USB driver behavior and display correct chip identification. Fixes: 28b7c5a6db74 ("Bluetooth: btmtk: Add MT6639 (MT7927) Bluetooth support") Signed-off-by: Chris Lu --- drivers/bluetooth/btmtksdio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/bluetooth/btmtksdio.c b/drivers/bluetooth/btmtksdio.c index aea7d07b49ad..ea6fefffef0f 100644 --- a/drivers/bluetooth/btmtksdio.c +++ b/drivers/bluetooth/btmtksdio.c @@ -921,14 +921,14 @@ static int mt76xx_setup(struct hci_dev *hdev, const char *fwname) return 0; } -static int mt79xx_setup(struct hci_dev *hdev, const char *fwname) +static int mt79xx_setup(struct hci_dev *hdev, const char *fwname, u32 dev_id) { struct btmtksdio_dev *bdev = hci_get_drvdata(hdev); struct btmtk_hci_wmt_params wmt_params; u8 param = 0x1; int err; - err = btmtk_setup_firmware_79xx(hdev, fwname, mtk_hci_wmt_sync, 0); + err = btmtk_setup_firmware_79xx(hdev, fwname, mtk_hci_wmt_sync, dev_id); if (err < 0) { bt_dev_err(hdev, "Failed to setup 79xx firmware (%d)", err); return err; @@ -1187,7 +1187,7 @@ static int btmtksdio_setup(struct hci_dev *hdev) snprintf(fwname, sizeof(fwname), "mediatek/BT_RAM_CODE_MT%04x_1_%x_hdr.bin", dev_id & 0xffff, (fw_version & 0xff) + 1); - err = mt79xx_setup(hdev, fwname); + err = mt79xx_setup(hdev, fwname, dev_id); if (err < 0) return err; -- 2.45.2