From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 95F9B15F301; Fri, 29 Mar 2024 12:33:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711715586; cv=none; b=Xe8gtCJZyaozWEHNLajAzH7dUn3DMd/WgrRznxoM7wN81MiwgU5rt8/3j0CbWPV0tCtkol/09LQn0TXeoQ2dVJ3soYKwxeRwVFeZv1AvClMIIPeT6zWE0xsOqNFnj+/FdKugXhjPq9a6L5wnErhfkEHRxZ7ERBy7L7Y7384WXqQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711715586; c=relaxed/simple; bh=4fg65O1FuQRomrbX9eU2W2hmBoGbIhKA8D1UBF0ceD0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H2eyKroz1IXFwYvn/JsoQWfqNi5FunH4Uol7nTNzZ7vuTcpR2iDENs5ky4Sz5wnjZ+oAtBU8p5DFV3rGQF2awgxbLuB42uMV+q197b5BVyTDDybzlm7s6SiLFSNBWm1fNyDfU+qISk1Vni3kvLWoq8/hTmfqbxemtXPhfH8JA0k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=h/7M6ic8; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="h/7M6ic8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 24F0EC43394; Fri, 29 Mar 2024 12:33:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711715586; bh=4fg65O1FuQRomrbX9eU2W2hmBoGbIhKA8D1UBF0ceD0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h/7M6ic8J4G8Wn5MQv9wX/AJ1f6lulUs9VqLFM1Tff4O1JlpobKdKqTexAnDW2gvS kcLWst3RcU/M9lSNG8stPct6YujoS7GHjJr48i25SRPLrD4p1T9vVHGVh1OcBpHIkb 1dzp2mcvxkFWyBV+9+a8Cb1sIB14WAoKwZYDNtjiIJ5hmHuoYKyeRXIfVEG3JlkAcn kaTt1jaU7CjD44lBnbkyCeZAw0ujimJDn0Um+L+JnbWtI3y77hI/x8APCv26C90wtp adP6XvID3eqkdCoXP59nbRrZoTjY9eaHs5GXBNkd9ePrkzlq41n8nXA86vWLxoHv4K pg8ZFe/kplnyQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Takashi Iwai , Paul Menzel , Matthias Brugger , Luiz Augusto von Dentz , Sasha Levin , marcel@holtmann.org, luiz.dentz@gmail.com, angelogioacchino.delregno@collabora.com, linux-bluetooth@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH AUTOSEL 6.1 31/31] Bluetooth: btmtk: Add MODULE_FIRMWARE() for MT7922 Date: Fri, 29 Mar 2024 08:31:50 -0400 Message-ID: <20240329123207.3085013-31-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240329123207.3085013-1-sashal@kernel.org> References: <20240329123207.3085013-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.83 Content-Transfer-Encoding: 8bit From: Takashi Iwai [ Upstream commit 3e465a07cdf444140f16bc57025c23fcafdde997 ] Since dracut refers to the module info for defining the required firmware files and btmtk driver doesn't provide the firmware info for MT7922, the generate initrd misses the firmware, resulting in the broken Bluetooth. This patch simply adds the MODULE_FIRMWARE() for the missing entry for covering that. Link: https://bugzilla.suse.com/show_bug.cgi?id=1214133 Signed-off-by: Takashi Iwai Reviewed-by: Paul Menzel Reviewed-by: Matthias Brugger Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Sasha Levin --- drivers/bluetooth/btmtk.c | 1 + drivers/bluetooth/btmtk.h | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/bluetooth/btmtk.c b/drivers/bluetooth/btmtk.c index 809762d64fc65..b77e337778a44 100644 --- a/drivers/bluetooth/btmtk.c +++ b/drivers/bluetooth/btmtk.c @@ -288,4 +288,5 @@ MODULE_LICENSE("GPL"); MODULE_FIRMWARE(FIRMWARE_MT7622); MODULE_FIRMWARE(FIRMWARE_MT7663); MODULE_FIRMWARE(FIRMWARE_MT7668); +MODULE_FIRMWARE(FIRMWARE_MT7922); MODULE_FIRMWARE(FIRMWARE_MT7961); diff --git a/drivers/bluetooth/btmtk.h b/drivers/bluetooth/btmtk.h index 2a88ea8e475e8..ee0b1d27aa5c0 100644 --- a/drivers/bluetooth/btmtk.h +++ b/drivers/bluetooth/btmtk.h @@ -4,6 +4,7 @@ #define FIRMWARE_MT7622 "mediatek/mt7622pr2h.bin" #define FIRMWARE_MT7663 "mediatek/mt7663pr2h.bin" #define FIRMWARE_MT7668 "mediatek/mt7668pr2h.bin" +#define FIRMWARE_MT7922 "mediatek/BT_RAM_CODE_MT7922_1_1_hdr.bin" #define FIRMWARE_MT7961 "mediatek/BT_RAM_CODE_MT7961_1_2_hdr.bin" #define HCI_EV_WMT 0xe4 -- 2.43.0