Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 31 Mar 2023 15:45:27 +0200
From:   Simon Horman <simon.horman@corigine.com>
To:     Takashi Iwai <tiwai@suse.de>
Cc:     Kalle Valo <kvalo@kernel.org>, ath11k@lists.infradead.org,
        linux-wireless@vger.kernel.org, netdev@vger.kernel.org
Subject: Re: [PATCH] ath11k: pci: Add more MODULE_FIRMWARE() entries
Message-ID: <ZCbj94oDuVYLJtBn@corigine.com>
References: <20230330143718.19511-1-tiwai@suse.de>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230330143718.19511-1-tiwai@suse.de>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?z5zbHmNJNctgN+CCAP9cHDvqM5LSu4Wa5mioJZ9oFWXLjdzy93sw6C8YCiVA?=
 =?us-ascii?Q?VnQ4cwpp8coP3AEwCBc0Pc3fE26wOj97GV9KbQb856hoOQeYIypfbFjvqQ9s?=
 =?us-ascii?Q?CswEnUrbes1C1l7DGfZ00FJsrUnJ76jLomdtsksRVK+u1puHrVlLpWaSTU3n?=
 =?us-ascii?Q?t5K5mSMXv3nXDJKz5NKDAMfUhAVj3En0BDaSeUvHeSVbiDCswE8+TqGXoQKL?=
 =?us-ascii?Q?01EZgPMa8L0kSw/nCv7m3mC2uXyGb0Q6JJT1GprdKCb++evRnyHgZ+jy26Ru?=
 =?us-ascii?Q?tU6nrlrqFZQaQieFCUGaP1Uq3PXSECcfrmobgYDEMZnNeYCchRvxfA//lbRx?=
 =?us-ascii?Q?Lseil06untqK+NQ/EQH/EU3uQk0bdLe7/FPMI4qZ0IKnpVXdAH5EKZ1gZFzm?=
 =?us-ascii?Q?QtXzEb3oPad6nOXDnS/6VXKDlFUo+Yi/B2maocn8Wbt4mgx5tuEEVQnJ447y?=
 =?us-ascii?Q?T375PkX/g0BWZ0NK5/r8cMXmX4rS8TuJv7UYhy14EhkULs2y+kGHvaWjHVh8?=
 =?us-ascii?Q?l5KYX506OxCU5JkpdE9FGF2Gw/fzgy19GWZMFiTPVS1D9doLsULemp8Z8Js9?=
 =?us-ascii?Q?KR31aEvCnYtz4/7o9h9j7zhWWzom/DQdalSWaZHUS72mVw6MRCwi1+Y+6yJn?=
 =?us-ascii?Q?J92bloi4uYSibVpA/HEqVivE0v+nvBe4Y+mB5EtkBgt9rz6tAKXKh4lWO2tS?=
 =?us-ascii?Q?cunaqZ2GDku1oQV4ouEWzSBaVWuinNs3sWbfQlg6RMgcoYPvLibtBTR5veVC?=
 =?us-ascii?Q?SHwIeS3FaNmoourIizGTNFP8E9C05Kd6VhPpDWIOMqBC6c79DVtEVuWN0XEt?=
 =?us-ascii?Q?Vzm1P3k5OG7v9ZBug3kn3eAz2dvqGjdIKCBM+G3neFClp64kz22SISR6WAWZ?=
 =?us-ascii?Q?p1wyfGpoS+AVZwtSGAoy6yn+QGk3Wtoe+MezTzREfFBZeUHAeoa/XYZwLMkd?=
 =?us-ascii?Q?+YEdUZEO/rwBU3i949p01A9wI+5O6rajqcHFnSZr1Kdoq4wryWUhuMQe+D6h?=
 =?us-ascii?Q?Q8FaGMIcZA9SDpDD1LCnVJKqZLqbWPRXrFDDXOD7Og/WVWTksfoC+TD2WGsB?=
 =?us-ascii?Q?zoimIWly2qm6Z0UB92X9vCzWvjyL5EqlPU/JS5lUtJV2K4poOmXLojx26Wub?=
 =?us-ascii?Q?FBxaZ+7V78wubVKSjQcYJYId3aeYU3gvv0LyLjVVjXn5Spr/z079T8CDTz/u?=
 =?us-ascii?Q?5xOWv1kAsROblg7/SiJYWgmu5Smlu5aVeJaET7cUiwAf1QAVL+C+wyn0pgfk?=
 =?us-ascii?Q?ZsEqoQZGhT2uEdBxGxYBHjIiPNKoH77Y4NhK0LziBsJx5bq/I0JvHa6Ep/QE?=
 =?us-ascii?Q?JEJrTRlrbfpvAHIEE0xphaWgCl6no4pF+vd2XiTNZY+NDrsAhQSw5LWt5br7?=
 =?us-ascii?Q?IDzYqIByc1nH4cAR1qxysdPB4Ssw/AQ/tgI7ki8o5CYD87tOeGcUJc12RPRb?=
 =?us-ascii?Q?A/wB7/vSYcbpYwfH+Bwfmbh+1q15u1/On+chr+LAHWLogp9qAC9p64gegInC?=
 =?us-ascii?Q?zb6GpHmxZwrXcoIk9ruBIdigXdUcvw4Q5RzzN+IqwBItlFJHL1yxpHWHtEiM?=
 =?us-ascii?Q?+OrP/pTIuga0hdQM8Kj4aE+/WUps8WrSJvMDViqVmNLFP6+9HSSKXEp4J0S7?=
 =?us-ascii?Q?hxqT6+vVtXHqfGdW20YkTwK7K59CBz/gkx0jJ3J0uGBm+km6Bvyv6+2ZXUxT?=
 =?us-ascii?Q?AuE+Tg=3D=3D?=
X-OriginatorOrg: corigine.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2b121922-b93f-4c1c-5066-08db31ee3318
X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB4842.namprd13.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2023 13:45:33.5037
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Ew9LkvHo+5RJaO6elm8azKWbcvKsnLzgjhSqvHD2rxLvI9s/Ucq07J2uU5FYP9aq/NSaZFxIPVII8d4q42i49Vm+I+pobdWskyGa58+b69A=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR13MB4012
X-Spam-Status: No, score=-0.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS
        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: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

On Thu, Mar 30, 2023 at 04:37:18PM +0200, Takashi Iwai wrote:
> As there are a few more models supported by the driver, let's add the
> missing MODULE_FIRMWARE() entries for them.  The lack of them resulted
> in the missing device enablement on some systems, such as the
> installation image of openSUSE.
> 
> While we are at it, use the wildcard instead of listing each firmware
> files individually for each.
> 
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
> 
> I can rewrite without wildcards if it's preferred, too.
> But IMO this makes easier to maintain.
> 
>  drivers/net/wireless/ath/ath11k/pci.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/wireless/ath/ath11k/pci.c b/drivers/net/wireless/ath/ath11k/pci.c
> index 0aeef2948ff5..379f7946a29e 100644
> --- a/drivers/net/wireless/ath/ath11k/pci.c
> +++ b/drivers/net/wireless/ath/ath11k/pci.c
> @@ -1039,7 +1039,8 @@ module_exit(ath11k_pci_exit);
>  MODULE_DESCRIPTION("Driver support for Qualcomm Technologies 802.11ax WLAN PCIe devices");
>  MODULE_LICENSE("Dual BSD/GPL");
>  
> -/* QCA639x 2.0 firmware files */
> -MODULE_FIRMWARE(ATH11K_FW_DIR "/QCA6390/hw2.0/" ATH11K_BOARD_API2_FILE);
> -MODULE_FIRMWARE(ATH11K_FW_DIR "/QCA6390/hw2.0/" ATH11K_AMSS_FILE);
> -MODULE_FIRMWARE(ATH11K_FW_DIR "/QCA6390/hw2.0/" ATH11K_M3_FILE);
> +/* firmware files */
> +MODULE_FIRMWARE(ATH11K_FW_DIR "/QCA6390/hw2.0/*");
> +MODULE_FIRMWARE(ATH11K_FW_DIR "/QCN9074/hw1.0/*");
> +MODULE_FIRMWARE(ATH11K_FW_DIR "/WCN6855/hw2.0/*");
> +MODULE_FIRMWARE(ATH11K_FW_DIR "/WCN6855/hw2.1/*");

I don't feel strongly about this.

But unless I'm mistaken the above does seem to pick up a number of files
totalling around 25Mbytes. Perhaps that isn't ideal.

$ find ath11k/QC* ath11k/WCN6*
ath11k/QCA6390
ath11k/QCA6390/hw2.0
ath11k/QCA6390/hw2.0/board-2.bin
ath11k/QCA6390/hw2.0/Notice.txt
ath11k/QCA6390/hw2.0/amss.bin
ath11k/QCA6390/hw2.0/m3.bin
ath11k/QCN9074
ath11k/QCN9074/hw1.0
ath11k/QCN9074/hw1.0/board-2.bin
ath11k/QCN9074/hw1.0/Notice.txt
ath11k/QCN9074/hw1.0/amss.bin
ath11k/QCN9074/hw1.0/m3.bin
ath11k/WCN6750
ath11k/WCN6750/hw1.0
ath11k/WCN6750/hw1.0/wpss.b02
ath11k/WCN6750/hw1.0/wpss.b04
ath11k/WCN6750/hw1.0/wpss.b03
ath11k/WCN6750/hw1.0/board-2.bin
ath11k/WCN6750/hw1.0/wpss.b08
ath11k/WCN6750/hw1.0/wpss.b05
ath11k/WCN6750/hw1.0/Notice.txt
ath11k/WCN6750/hw1.0/wpss.b01
ath11k/WCN6750/hw1.0/wpss.b06
ath11k/WCN6750/hw1.0/wpss.b07
ath11k/WCN6750/hw1.0/wpss.b00
ath11k/WCN6750/hw1.0/wpss.mdt
ath11k/WCN6855
ath11k/WCN6855/hw2.0
ath11k/WCN6855/hw2.0/board-2.bin
ath11k/WCN6855/hw2.0/regdb.bin
ath11k/WCN6855/hw2.0/Notice.txt
ath11k/WCN6855/hw2.0/amss.bin
ath11k/WCN6855/hw2.0/m3.bin
$ du -sh ath11k/QC* ath11k/WCN6*
3,2M	ath11k/QCA6390
4,0M	ath11k/QCN9074
8,1M	ath11k/WCN6750
9,7M	ath11k/WCN6855