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 DFB2BC433FE for ; Tue, 4 Jan 2022 10:31:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231504AbiADKbI (ORCPT ); Tue, 4 Jan 2022 05:31:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231481AbiADKbH (ORCPT ); Tue, 4 Jan 2022 05:31:07 -0500 Received: from mail.marcansoft.com (marcansoft.com [IPv6:2a01:298:fe:f::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C05CC061761; Tue, 4 Jan 2022 02:31:07 -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) server-digest SHA256) (No client certificate requested) (Authenticated sender: marcan@marcan.st) by mail.marcansoft.com (Postfix) with ESMTPSA id 9FA4641982; Tue, 4 Jan 2022 10:30:56 +0000 (UTC) Message-ID: Date: Tue, 4 Jan 2022 19:30:53 +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 06/35] brcmfmac: firmware: Support passing in multiple board_types 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-7-marcan@marcan.st> From: Hector Martin In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org On 2022/01/04 19:22, Arend van Spriel wrote: > On 1/4/2022 8:26 AM, Hector Martin wrote: >> In order to make use of the multiple alt_path functionality, change >> board_type to an array. Bus drivers can pass in a NULL-terminated list >> of board type strings to try for the firmware fetch. >> >> Acked-by: Linus Walleij >> Signed-off-by: Hector Martin >> --- >> .../broadcom/brcm80211/brcmfmac/firmware.c | 35 ++++++++++++------- >> .../broadcom/brcm80211/brcmfmac/firmware.h | 2 +- >> .../broadcom/brcm80211/brcmfmac/pcie.c | 4 ++- >> .../broadcom/brcm80211/brcmfmac/sdio.c | 2 +- >> 4 files changed, 27 insertions(+), 16 deletions(-) >> >> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c >> index 7570dbf22cdd..054ea3ed133e 100644 >> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c >> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c >> @@ -594,28 +594,39 @@ static int brcmf_fw_complete_request(const struct firmware *fw, >> return (cur->flags & BRCMF_FW_REQF_OPTIONAL) ? 0 : ret; >> } >> >> -static int brcm_alt_fw_paths(const char *path, const char *board_type, >> +static int brcm_alt_fw_paths(const char *path, struct brcmf_fw *fwctx, >> const char *alt_paths[BRCMF_FW_MAX_ALT_PATHS]) >> { >> + const char **board_types = fwctx->req->board_types; >> + unsigned int i; >> char alt_path[BRCMF_FW_NAME_LEN]; >> const char *suffix; >> >> memset(alt_paths, 0, array_size(sizeof(*alt_paths), >> BRCMF_FW_MAX_ALT_PATHS)); >> >> + if (!board_types[0]) >> + return -ENOENT; >> + >> suffix = strrchr(path, '.'); >> if (!suffix || suffix == path) >> return -EINVAL; >> >> - /* strip extension at the end */ >> - strscpy(alt_path, path, BRCMF_FW_NAME_LEN); >> - alt_path[suffix - path] = 0; >> + for (i = 0; i < BRCMF_FW_MAX_ALT_PATHS; i++) { >> + if (!board_types[i]) >> + break; > > Indentation error I knew I had a feeling I was forgetting to do something... that was running v2 through checkpatch. Sigh. Thanks for catching that, fixed :) -- Hector Martin (marcan@marcan.st) Public Key: https://mrcn.st/pub