From patchwork Wed Mar 15 03:16:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian Hui Lee X-Patchwork-Id: 1757128 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=ru0Gpuv6; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PbwZC0fMXz1yWs for ; Wed, 15 Mar 2023 14:17:53 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1pcHdw-00041z-7Y; Wed, 15 Mar 2023 03:17:36 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1pcHdu-00041d-7n for kernel-team@lists.ubuntu.com; Wed, 15 Mar 2023 03:17:34 +0000 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 149853F0E1 for ; Wed, 15 Mar 2023 03:17:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1678850254; bh=bUC1BYPC4qZ9IcqrmvuBoVVfazp99T9WK4IgrMxqCFo=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ru0Gpuv6tZuRzkLwm5lv00gdkRiX3Jev+0H6THO66irfvy8Fw70uRMjOAlkcLhyhY ZZv4DzRIe8xvTgVkExIuTMxP5NiT+Jhi8SwM844f3olYCC1MSLIkwhLvj2c6uS6nE/ oH+JzQNXZkpKIOkRR4qfROa6L+Mp71iQaJF1kVVk4ZkgHAKnFKYIlJAG384Np22ELa oXxBzjzEWaagSsjZ26O/bGRrkAmd6L6iyVruGD48ED4+O3B0lLWgI/mS7q5tjgqeZN EvLS0c0vGH20poLFybGyJX/nAXMOSCKipscOXwhIwISfoGXTZbCQrkNyrDO16cFvaN 8MUKny++gMBPQ== Received: by mail-pl1-f197.google.com with SMTP id q1-20020a170902dac100b0019f1e3ea83dso6702760plx.4 for ; Tue, 14 Mar 2023 20:17:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678850252; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bUC1BYPC4qZ9IcqrmvuBoVVfazp99T9WK4IgrMxqCFo=; b=bJbSVwjmc2OnrS9gFRty9yrRhG+ZM4KoLQ91fX4OZ1xK9eY2+nc0Y71Y59IVoehsUE uiPEl82BmiXoLvFLGHGlcSET0BiQYlFcWQw3msbAs3BQkTIwFkyQ0Yn744wwQRVcTbui 4mPO23qgasnG2PkhjN8AwGiaK/F3Po0QaKm48Ax1P7zPawhDf4eUOo+73MDrk+Arys+M CBspo+CHTW7b3G+tvGek4HZnceZBlG2biOaPpwG1LXlCR1+EZW3GyJjpxXLnaRFVj6Zn rRgErL1nL4E+7Jz0VsGwc6veZ2I/OHhHorX0oyRyFQ/t+OlbgrAqoy6ghsWRd8xfEI3s XNtA== X-Gm-Message-State: AO0yUKWwOH6O93pLdhEjVuM/qO+wAdAH21IqEKM4tm+FHel7LbHp/g4h zw+8aPYSrngv8zhUkfPiJfpdc6ueMjvbn7TXeVeOUco2fooLa6kXUHEWbbsAHzs08xKeFxG0ffm nNoHmG7XHcToCbDPK/JiH95JuvlGQRAx7jMMhKtB+opgYwUrg1g== X-Received: by 2002:a17:90a:f018:b0:23b:4388:7d8a with SMTP id bt24-20020a17090af01800b0023b43887d8amr12216807pjb.21.1678850252613; Tue, 14 Mar 2023 20:17:32 -0700 (PDT) X-Google-Smtp-Source: AK7set8x9j0KsfMvL6V03fHfgeeIHd1lj+HCIheP8Db8932eAewsKvpWm8Gy8uNCF7oIvL3D5/jDBQ== X-Received: by 2002:a17:90a:f018:b0:23b:4388:7d8a with SMTP id bt24-20020a17090af01800b0023b43887d8amr12216796pjb.21.1678850252296; Tue, 14 Mar 2023 20:17:32 -0700 (PDT) Received: from localhost.localdomain (36-224-36-10.dynamic-ip.hinet.net. [36.224.36.10]) by smtp.gmail.com with ESMTPSA id f15-20020a170902ff0f00b00199536fbc6fsm296209plj.280.2023.03.14.20.17.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 20:17:31 -0700 (PDT) From: Jian Hui Lee To: kernel-team@lists.ubuntu.com Subject: [SRU][Jammy:linux-intel-iotg][PATCH 1/1] UBUNTU: SAUCE: (no-up) Bluetooth: btusb: Add module firmware information for MT7622 and MT7961 Date: Wed, 15 Mar 2023 11:16:47 +0800 Message-Id: <20230315031647.26467-2-jianhui.lee@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230315031647.26467-1-jianhui.lee@canonical.com> References: <20230315031647.26467-1-jianhui.lee@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2011520 Export the required module firmware information of MT7622 and M7961 used by modinfo. Signed-off-by: Jian Hui Lee --- drivers/bluetooth/btusb.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index c8d31d795530..3e53fd379265 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -2178,8 +2178,10 @@ static int btusb_send_frame_intel(struct hci_dev *hdev, struct sk_buff *skb) #define MTK_BT_RST_DONE 0x00000100 #define MTK_BT_RESET_WAIT_MS 100 #define MTK_BT_RESET_NUM_TRIES 10 +#define FIRMWARE_MT7622 "mediatek/mt7622pr2h.bin" #define FIRMWARE_MT7663 "mediatek/mt7663pr2h.bin" #define FIRMWARE_MT7668 "mediatek/mt7668pr2h.bin" +#define FIRMWARE_MT7961 "mediatek/BT_RAM_CODE_MT7961_1_2_hdr.bin" #define HCI_WMT_MAX_EVENT_SIZE 64 /* It is for mt79xx download rom patch*/ @@ -3119,8 +3121,10 @@ static int btusb_recv_acl_mtk(struct hci_dev *hdev, struct sk_buff *skb) return hci_recv_frame(hdev, skb); } +MODULE_FIRMWARE(FIRMWARE_MT7622); MODULE_FIRMWARE(FIRMWARE_MT7663); MODULE_FIRMWARE(FIRMWARE_MT7668); +MODULE_FIRMWARE(FIRMWARE_MT7961); #ifdef CONFIG_PM /* Configure an out-of-band gpio as wake-up pin, if specified in device tree */