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 16:16:40 +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: <ZCbrSLSnqHLIbkhZ@corigine.com>
References: <20230330143718.19511-1-tiwai@suse.de>
 <ZCbj94oDuVYLJtBn@corigine.com>
 <87a5ztja4m.wl-tiwai@suse.de>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <87a5ztja4m.wl-tiwai@suse.de>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VdZrfL4lNjoB+Nj8y4Uvs2sCPGq8mA72WoSbpE17zeMimeO/czymCfkbuMkt?=
 =?us-ascii?Q?iPdMzah+zbVY6/I0z4Kaga5y6Akw/BJYKkm3PA/2b9at9obt5tRVoyqDWvHh?=
 =?us-ascii?Q?FvuJ2OwDFz8K57KUCEjmn+LUAoNxLsZridVW7Y9tV4497LY1Wbh1lQwCYcgk?=
 =?us-ascii?Q?JbQ6Jz2zhK33JEEK2nsvIyAsgBCr3VpsvmODCCQMYI2JazPPrqrt//VME+Yn?=
 =?us-ascii?Q?RrjO1k8FF3g9ZnoB7wXRPe8/X2RO9FSpDjZKDH+9pb5/H1OVY7Z8aR9Gtfbv?=
 =?us-ascii?Q?qsdHgpuacYThdVSQdJmc9VnoKYYYstkWEXP48/McdHjKhGWmaFUkYvCZ7qqj?=
 =?us-ascii?Q?ZNa6zGUoPw0syf+7EY4m4pGP/RiTeMZL95LF5jkW4SUhtSCbsxTsgD2BVTN3?=
 =?us-ascii?Q?jPgFiRfIL9eUtZJC1LvNOwYBhvBlQ2EsqfOsleEu5hg1fbVlUjs4tt4ATqGT?=
 =?us-ascii?Q?AZzE0NjWdw35QWnkSaFCBeNuihmG8RSsiAb+hkkkHpAnj5tJaRdd0HXEKHjE?=
 =?us-ascii?Q?S9qgl9550gicCKE6G+KQg/0qc52/DOu56mTNAImBeeMcy6SHrLttyyyhI6Ah?=
 =?us-ascii?Q?1vCmLBg28R9IGbbrv6ksemK9CGHM7aPoiPeF99hlj2M46+qPNDwHwQrshtqL?=
 =?us-ascii?Q?DJVXdXcGUiSchbG2uf38Kx2o2oRkMObKSNhienkgPcu9Sh2+qy2780S5/AEZ?=
 =?us-ascii?Q?rdIUum31+bMUF5uKdo44Dw8hlLGQ7gMxeJFly2gSMhpkIiV0IwluHi0hcauD?=
 =?us-ascii?Q?o4ina8Ea6ofJZccyvGB9N02PLXK9QJ//dxYW4nNdwzLVPGqoj+VSTSXLYRzK?=
 =?us-ascii?Q?96UgrdnRAWbRZvRJksUCQ57TyOKBPsMgAGUzSYcATztm/NgAKUmSauzKFNjm?=
 =?us-ascii?Q?R3fvZFQAdNqyuFwwjGHlCwgFHKlxFYK3ep68hiIwQW5o1aRj6NY3VLxj1odn?=
 =?us-ascii?Q?+uSSZtbxd+3SVJ6kS0pXq/klok+E9Jq1uYOwn02/3YcmB96SkjAWHF/5MDbk?=
 =?us-ascii?Q?8J/IViJl3XPPGY36iN8ClFyptgGZ5VDWvijEw97yCf+XDnIcTlVvnjbPPhuY?=
 =?us-ascii?Q?u0buPE0FzgZFWIqPEGIE/z69cR0uoj2LvcCoCMBSX8gQ31xrNv5Pa4QhwBZr?=
 =?us-ascii?Q?RGffsNfcYFMMFSU2buLySyZsbdh6b12KpHuO3TuNc2tkGWRqyALNpmVvMFTf?=
 =?us-ascii?Q?T4xMPiNXwc1JT7rWr+tFbdwTTZRk4Zl0Uu7Gx196s0qj55FbJrHDPFSRLPJC?=
 =?us-ascii?Q?BBUK9vkfgtEWy93EwAvHH8AoJR2bEo73x2zl3e1M3BQJszFWlo7fuxbU+ASc?=
 =?us-ascii?Q?Jn6RRLicTO+3smDq77s4LYbdEs0iYslPs7ddS9Y2T0FvS5c6GFRsBtQZMECa?=
 =?us-ascii?Q?BptLLJPgxUVOUsM2ZmanXapiQAEC3Xgqd6P/etbUPsr+VAhvWNye4krmWneK?=
 =?us-ascii?Q?lu2Of6UBwN9Hi0mEAjNAIlDZTHzzEpCrCimwe+X+EdcyEUpotiqfguW44zmU?=
 =?us-ascii?Q?e5xgRUZnceX+WRriuaoWkp5vGqHn4k/FvzsT4iQY5WjEC9157hB/dGVIYi0J?=
 =?us-ascii?Q?s/ay2w1Jx/r+CxIBFj4So80hRWZ9W5km5AvXyWLvZb90EnVj8Dws369MZX6Z?=
 =?us-ascii?Q?UXx80nSUCdhQ0dU941PbP7HJ7608yUk5Nsw+t9+X+cDRXLK9ssL7FPBkRAWg?=
 =?us-ascii?Q?wFAfdQ=3D=3D?=
X-OriginatorOrg: corigine.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7fc6b4bc-f503-426f-6fef-08db31f28f97
X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB4842.namprd13.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2023 14:16:46.5645
 (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: DS2Y/3683iLfYiltws2DcE/66mejU7w6hy4Mut8kkw0MUcv5JtPNA2Dv55MmblgIDM76HCJkdr7Smsa6tgdWVQhLrnKPB275QE7Bx6vm9Jo=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR13MB5637
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 Fri, Mar 31, 2023 at 03:58:17PM +0200, Takashi Iwai wrote:
> On Fri, 31 Mar 2023 15:45:27 +0200,
> Simon Horman wrote:
> > 
> > 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.
> 
> MODULE_FIRMWARE() itself is nothing but a hint for the required
> firmware files.  The driver supports those models, hence it should
> list up the mandatory firmware files that *can* be used with it;
> without the firmware, the driver itself is just useless, as you know.
> 
> The rest -- how to reduce the actual sizes -- is above the kernel
> modinfo covers, and it depends on the system implementation, IMO.
> It can be somehow more selective, it can compress data, or it can load
> the stuff on demands.

Thanks, understood.
If that is the case then I have no objections.

Reviewed-by: Simon Horman <simon.horman@corigine.com>