Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp5151791iob; Mon, 9 May 2022 09:38:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyi/X7h8Re+yw2sZ4YBSUUT0pBNOUIraHyXmCmrmABM8QKuI+8vPY63GEIBxX7TSVY+UWqy X-Received: by 2002:a05:6214:c29:b0:45a:fedd:7315 with SMTP id a9-20020a0562140c2900b0045afedd7315mr8616762qvd.59.1652114334819; Mon, 09 May 2022 09:38:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652114334; cv=none; d=google.com; s=arc-20160816; b=qn9cz+l7RL3crr4ACGllagztHniyWZ4v4FNXf+DEz/X0ycsw5cJTd7X+a2uEtpYFKW ydkydoGCvXCpBfgEcfSMwkfkl+rW2BrDkTGSPog6IZGyLnFqWwU6cr5uJ/f82xqFP7/V uRwudqb7QwkwI7OMaAfVi6YUj5zSJJS3ag9wml2oRyBXx415rwzzhXgmnHcD6uaeg1zj BFjw5JiYE7ojLwFc8DxADtp06FtHzBvR4hM2VboUoXnYUMQ9Nk849t2bbiUHV9nISX9w WXbXaPRPHmedd5eRC3U11UH1yWx5uCPQ87p7CLD0QFs6vdKd4pTfGOL+YtN/UpYdNvQD +Yqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=G0fQK34FSbU838pd4orLwIr99mE4R02XgVm1RsaYD5M=; b=ncAcnkgQZNveXyaiRkOPGGB3NVCoW57UzRSYtgQ5WNJWAeHWyrQucvINVp2ntpfdVN c6nIvLZELbu6KMFzH3pLcp5nnKZ5WacSoouY9Eh4xji+t4R2abFGLegqtfdo/NaRkXma tlWf4BTY9/nAylhQ2MfuWmV18M4pD7oiUA/5Ix6Z61pEOWrN1JoCAxXb4YqHcMCdNkeS EkIIiRsnQ+YDx9qqT79EpF6TrbkWQqiC8Gk4nbg8YaXONxZfxYgorOiUPMTVGlIT3h+k nmp4Yejgcxg+nM/3GTijqFFJ0CJYQ/ro+S3uSfPV3OPA33fppEB5a9HSNxnDSexdX2rt iC0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=Bn2xnB7Z; spf=softfail (google.com: domain of transitioning linux-bluetooth-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id gy13-20020a056214242d00b0045a8a410e18si8814451qvb.411.2022.05.09.09.38.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 09:38:54 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-bluetooth-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=Bn2xnB7Z; spf=softfail (google.com: domain of transitioning linux-bluetooth-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id B192C28E4D2; Mon, 9 May 2022 09:33:17 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239166AbiEIQhJ (ORCPT + 99 others); Mon, 9 May 2022 12:37:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239140AbiEIQhI (ORCPT ); Mon, 9 May 2022 12:37:08 -0400 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20D1728D4C8 for ; Mon, 9 May 2022 09:33:13 -0700 (PDT) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (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-0.canonical.com (Postfix) with ESMTPS id AD1CF3F164 for ; Mon, 9 May 2022 16:33:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1652113990; bh=G0fQK34FSbU838pd4orLwIr99mE4R02XgVm1RsaYD5M=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Bn2xnB7ZToKx27Yna7Z8AiUg8m55h6HWS78Y2CppOzroHX/R91Mnkc1CwFfjjueCH dptoPgL6oqJcvmipIYHsyKCO40Y22YG1ffUpaEOSnHcVW0nA72CYvexp2sMKlPwp13 cn0SxdCoEMp/hH+EVjrxMLEDKEuFM0gdrH+9M7zl6Trt1ABzI9gjyGGVSI8kj+OCBw d1oq2e0OmEIfx8RMaO0Sp+EsGBguf7+rWnhqe58CZeSkmWKCPVHZq203BTq3oa16Nw o3iQmQbj5ruGpZ6/Figed/j/9MeBcnONXh2eJ8/IoervdHYTaEGAPlMLDpXURytD5o 1zkr0BVNw/lwA== Received: by mail-wr1-f72.google.com with SMTP id ba21-20020a0560001c1500b0020ca6a45dfcso4131102wrb.9 for ; Mon, 09 May 2022 09:33:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=G0fQK34FSbU838pd4orLwIr99mE4R02XgVm1RsaYD5M=; b=TO8m1tkVM1L3c3QCe/GXArcG1DyZ3XrpXt53ouIPAu54IOxEKKmh9GRGmpBwQVIyM4 /HSsvuo77djXsUknJatm5idoQQtgOZz5rjwEkh/xRwnHeTtqxtpxJwNTMG2z1uSVJMZW LXKSSv2K9Z/F4UeAZZAuQVs+F6M72CVRZuY28HSIwnNuf+souOoOBqAsYZ8BZtC2KKVn lJ2X9i7chwBC/unMIVbd+hIFv2yO5u9ZgV3lz1wLmwt37RuOAfltDhczCtXz9mXLE6wh eeEigGudnK7KbbunBPctbJ4a6H/m49+EJksUeV4qvJ9/yfinxtEe2CUmYJtTHaCJZemW 0RxQ== X-Gm-Message-State: AOAM531ziISB6hK4R7tiTaMCZAZulbn0FDj0G9ROhJjpI3rcHl7GQmIf mm57/yZqxNjxhxpv2LkGKS+0U6bJXQETKK9N170DUwNk4pA4U3UuB0OL3M82fH6YQ1WHrGRwRly 5cAzAhCRAGLyQ8IS+wz9Zbn7VkRArT3S03sxePvkvD9hAIQ== X-Received: by 2002:a5d:4090:0:b0:20c:8b91:3b17 with SMTP id o16-20020a5d4090000000b0020c8b913b17mr14421289wrp.348.1652113990233; Mon, 09 May 2022 09:33:10 -0700 (PDT) X-Received: by 2002:a5d:4090:0:b0:20c:8b91:3b17 with SMTP id o16-20020a5d4090000000b0020c8b913b17mr14421261wrp.348.1652113989903; Mon, 09 May 2022 09:33:09 -0700 (PDT) Received: from localhost ([2a01:4b00:85fd:d700:4359:3fb2:1bdd:60fe]) by smtp.gmail.com with ESMTPSA id m65-20020a1ca344000000b003943558a976sm13210503wme.29.2022.05.09.09.33.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 09:33:09 -0700 (PDT) From: Dimitri John Ledkov To: Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz Cc: linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] Bluetooth: btintel: Correctly declare all module firmware files. Date: Mon, 9 May 2022 17:32:59 +0100 Message-Id: <20220509163259.1513242-1-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Correctly declare wildcard of module firmwares to include, as the driver & linux-firmware ship many sfi/ddc files for many different devices which are dynamically calculated and loaded by the driver. This especially affects environments that only install firmware files declared and referenced by the kernel module. In such environments, only the declared firmware files were copied resulting in most Intel Bluetooth devices not working. I.e. host-only dracut-install initrds, or Ubuntu Core kernel snaps. BugLink: https://bugs.launchpad.net/bugs/1970819 Signed-off-by: Dimitri John Ledkov --- drivers/bluetooth/btintel.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c index 06514ed66022..9f5fc1ab154d 100644 --- a/drivers/bluetooth/btintel.c +++ b/drivers/bluetooth/btintel.c @@ -2654,7 +2654,5 @@ MODULE_AUTHOR("Marcel Holtmann "); MODULE_DESCRIPTION("Bluetooth support for Intel devices ver " VERSION); MODULE_VERSION(VERSION); MODULE_LICENSE("GPL"); -MODULE_FIRMWARE("intel/ibt-11-5.sfi"); -MODULE_FIRMWARE("intel/ibt-11-5.ddc"); -MODULE_FIRMWARE("intel/ibt-12-16.sfi"); -MODULE_FIRMWARE("intel/ibt-12-16.ddc"); +MODULE_FIRMWARE("intel/ibt-*.sfi"); +MODULE_FIRMWARE("intel/ibt-*.ddc"); -- 2.32.0