From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5E62C43217 for ; Thu, 6 Jan 2022 11:11:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229624AbiAFLLG (ORCPT ); Thu, 6 Jan 2022 06:11:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238090AbiAFLLE (ORCPT ); Thu, 6 Jan 2022 06:11:04 -0500 Received: from mail.marcansoft.com (marcansoft.com [IPv6:2a01:298:fe:f::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34D29C061245; Thu, 6 Jan 2022 03:11:04 -0800 (PST) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: marcan@marcan.st) by mail.marcansoft.com (Postfix) with ESMTPSA id A50A941F55; Thu, 6 Jan 2022 11:10:53 +0000 (UTC) Message-ID: <6a54eabe-1013-0e3c-024d-971178278dc9@marcan.st> Date: Thu, 6 Jan 2022 20:10:51 +0900 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.4.1 Subject: Re: [PATCH v2 02/35] brcmfmac: pcie: Declare missing firmware files in pcie.c Content-Language: en-US To: Arend van Spriel , Kalle Valo , "David S. Miller" , Jakub Kicinski , Rob Herring , "Rafael J. Wysocki" , Len Brown , Arend van Spriel , Franky Lin , Hante Meuleman , Chi-hsien Lin , Wright Feng , Dmitry Osipenko Cc: Sven Peter , Alyssa Rosenzweig , Mark Kettenis , =?UTF-8?B?UmFmYcWCIE1pxYJlY2tp?= , Pieter-Paul Giesberts , Linus Walleij , Hans de Goede , "John W. Linville" , "brian m. carlson" , Andy Shevchenko , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, SHA-cyfmac-dev-list@infineon.com References: <20220104072658.69756-1-marcan@marcan.st> <20220104072658.69756-3-marcan@marcan.st> <3268b423-09eb-e7d9-b427-fc964d217087@broadcom.com> From: Hector Martin In-Reply-To: <3268b423-09eb-e7d9-b427-fc964d217087@broadcom.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2022/01/06 18:56, Arend van Spriel wrote: > On 1/4/2022 8:26 AM, Hector Martin wrote: >> Move one of the declarations from sdio.c to pcie.c, since it makes no >> sense in the former (SDIO support is optional), and add missing ones. > > Actually, any bus is optional so each bus should indeed declare the > applicable firmware names/patterns. Of course; I didn't mean *only* SDIO support is optional :) >> +/* firmware config files */ >> +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-pcie.txt"); > > what is this one for? Those would be covered by the specific > BRCMF_FW_DEF() macro instances, no? The BRCMF_FW_DEF() macro only declares the .bin file; BRCMF_FW_CLM_DEF declares that and the .clm_blob. Neither declare the NVRAM .txt. -- Hector Martin (marcan@marcan.st) Public Key: https://mrcn.st/pub