From patchwork Thu Oct 5 07:31:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wright Feng X-Patchwork-Id: 9986493 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6943560247 for ; Thu, 5 Oct 2017 07:26:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5242528AB0 for ; Thu, 5 Oct 2017 07:26:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 46CC628C45; Thu, 5 Oct 2017 07:26:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ABE1F28AB0 for ; Thu, 5 Oct 2017 07:26:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751278AbdJEH0j (ORCPT ); Thu, 5 Oct 2017 03:26:39 -0400 Received: from mail-cys01nam02on0139.outbound.protection.outlook.com ([104.47.37.139]:10651 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751209AbdJEH0h (ORCPT ); Thu, 5 Oct 2017 03:26:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cycorp.onmicrosoft.com; s=selector1-cypress-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=FOfGCUrpvbWO6CHfQ/B6ZGAk9v03Sk8SnzvO6KNwTfk=; b=xMwGw375OreX2O6Bs9rPloIzm2fNHm4cnn+40JXuQZYaFsa8pRHnm75hzgBPxNmAw8mJrhKGz75s/b+SDiJG9ci3ZLO6Xwki6i+OcatgjSsTIFCPGAeAA3JvUiG4FEeIH39As+LSwPEhS1hq5hqzyJmUtkXQ0vWMfQbKcUdpros= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Wright.Feng@cypress.com; Received: from localhost (61.222.14.99) by CY4PR0601MB3587.namprd06.prod.outlook.com (2603:10b6:910:90::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Thu, 5 Oct 2017 07:26:35 +0000 From: Wright Feng To: arend.vanspriel@broadcom.com, franky.lin@broadcom.com, hante.meuleman@broadcom.com, kvalo@codeaurora.org, chi-hsien.lin@cypress.com Cc: wright.feng@cypress.com, linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, Chung-Hsien Hsu Subject: [PATCH v6] brcmfmac: add CLM download support Date: Thu, 5 Oct 2017 15:31:18 +0800 Message-Id: <1507188678-24985-1-git-send-email-wright.feng@cypress.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Originating-IP: [61.222.14.99] X-ClientProxiedBy: KAWPR01CA0066.jpnprd01.prod.outlook.com (2603:1096:402:b::26) To CY4PR0601MB3587.namprd06.prod.outlook.com (2603:10b6:910:90::38) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 20214e95-ff45-4c20-7d90-08d50bc268ee X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(48565401081)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:CY4PR0601MB3587; X-Microsoft-Exchange-Diagnostics: 1; CY4PR0601MB3587; 3:PfCQJCSlI54g7/sYwyq9iPXsJgmuVZzd3gZDO3+fRO39wJIZLNzp4dF2z32LWwsxWx9pMRQBT8ytYRt6OVT5nGWkrEDqjKGJ2mHsci3OEXvNHRYZ1TWOcINJirszqDVommVPQ7LyiCXToue+89iu3h/K8LJeXughR7XPlLAuuckLCNUvWi5Q0l72EpoGjrfZK1JCdTYHBnZZFfiSA0tGo+Wv1fHczfXqkLRRFSkv78PMfTt4/mhEqEnZKIIAlycX; 25:EzZFCC3sasQ2+dmG+v0ZyRWtpjmQ75rPcqUy57yKOR5vmFnn0NsG/aAkjlElHXBuHXseeCjwHZWrya3xk76a/E7kGjdKEd23bsJut0FkYyPLX4Tnxuh75yrb5NgJfbqygVp0HVhxM7tIvrS8PFL5TdyZsPD57MfYfPYfQrggOlYxZAxgBdK7fukXsekhp+y2olcPoF4aPnc8paJNe4Jm4e+yUG40YVinPqwcPkRDyJUfoG7gCycvc+TSsOMT4vPRnTDNbOrWsnGged8LI0qIflccNwXnW4xKax7nQpEsZaydT32twSkBSHahyQ1/b4//ZgZZzBRFnjZM0nVWi/PyRw==; 31:2jzjNpqBlKf7V3Yk7Ab2t6C0K3rxhqS1fIXKxOwdZdI0R/SxiFTo7SWsUeMuftQwYflyo7DEE5dJL8e26oh6OAzwhOKBIJ0Y3TQS19JDEvleRSPF4YdBBZfqpSipxozVlegx+EnY/ngKShPOygSNw6z/8Ie9qebjyfbQ0jNYnh6C7QESbIzCuMXW9ZN7os97N+T1MzGAaKOhBUZenxEVb5yCCp9/Vu8LlEFWFabH490= X-MS-TrafficTypeDiagnostic: CY4PR0601MB3587: X-Microsoft-Exchange-Diagnostics: 1; CY4PR0601MB3587; 20:c+8Ir6JOGfCRxjR/ymwKyxWecVe2SVh7I2YU1iRSNUJFdbLji3JOPFHAzsL5kGLgBwh4PtYR1EVNabZoYdqwQ0S/BWtLL2k0GSalyRXtX1Boc8IcoK+CXzqfELOaGhRXCKPrAEXlDXDs5RFGMADAZRQ0hZfJrUB8DcTBWKANMZxEH96IB2rOo2LEG3RtfrkGqf7ohKtE2g4VnqJRvxrkp3TcZV6QJ4yZFpkgU6jipOs88u2/b9f5am+Zxo+BxA0xsXbmAJQQPqGXQlduGMEP85CZXf/f97QLVwz4MYygaVj5wL9yXhQ24uPk+LYRs8Iym0/wu2i1sshoIw+ATE4TkLwYWprp/0Ka1tZy9RC4XOlnez1RvrASKl3wD8AWG160kTVTyjzlIKxJNCRd1VhrEzmB4398wpYYwrVXmcg/vx5QrePAVEx+1yO2tNOiRixBJzqGSF7ABrbWImOf9HJFmLVXoXaqfRBW3sJAk23Y337Veg8PwnaMWEqLo42w3/pb; 4:jo3f+7nMgD7LDUblmrjM3OdOrJM8yOYEGqBF7OTPfM1JMkBts5YYxX72jICC/+6uSQHa1gN6amwrH9ljlZVbmycStRO0t1Yc1IvHX7DtTSvhgsC801LKIXhqVGcb4lpRL8V709LNGSskcPorg3XtN2y3SUivCRj92ByF8AGTxeLjR1gCngQ6LgDqhbEYWCHoj+JbZoGpHXR7U0su2/rOuMnDrEJ5kmoWi9Qmyohw1Usv99qh4/tsU/TTGm1dSc3p1RgqVhJzP7wNOFjecbSW8BqkYnka8KdWO8fergqOIiGAV80r8LGPQruQrfrucnpDx8XFEUZ5ckD7YxyXLhRhIg== X-Exchange-Antispam-Report-Test: UriScan:(258095267146985)(788757137089); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(100000703101)(100105400095)(6055026)(6041248)(20161123562025)(20161123560025)(20161123564025)(20161123555025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR0601MB3587; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR0601MB3587; X-Forefront-PRVS: 04519BA941 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(6069001)(346002)(376002)(39860400002)(189002)(199003)(6486002)(50986999)(72206003)(47776003)(66066001)(68736007)(106356001)(97736004)(478600001)(6666003)(50226002)(6636002)(101416001)(16526018)(5660300001)(5003940100001)(48376002)(316002)(16586007)(50466002)(8676002)(6116002)(3846002)(8936002)(81166006)(81156014)(189998001)(53936002)(76506005)(86362001)(2906002)(7736002)(6496005)(33646002)(305945005)(4326008)(25786009)(105586002)(107886003)(36756003); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR0601MB3587; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: cypress.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR0601MB3587; 23:yXh+/eig3iaqv9vKAtIA6ilOnzWMFE2EwZp6w08?= =?us-ascii?Q?0OiHV87D203YHJIrKxN/S+wMxPBE/5eXUcv8mvz3ZuxzPG1K6ITNTNW5cqdT?= =?us-ascii?Q?E/vbc9XD7lqyAPS2uhrufHuJKkt2YHf6yAPwbSIjpSJiPPqfHxnJ8oRJ3ti1?= =?us-ascii?Q?0m5VQomWU1dxxYy5u7pbqkM/vn+MnnnA3qy8F3BbRoVP+G3Cs96bvI2FuIHb?= =?us-ascii?Q?8e2nqs6LC6agFJMTRqtOsnbJvKIwXmfsjiwYWuP7/YX/r1LQCCXnXAsEhuXa?= =?us-ascii?Q?eY+4KalZAKxdFko84kPX0bx3sgkucnctAjvdPtap2O335SJHBiFZ1KaAwq3H?= =?us-ascii?Q?MJoAc03aDNcH9pIdhzpkfQSP8YBReBxCd8KoTplggXEWCvqxiD4c2aYfVHRp?= =?us-ascii?Q?dSuqu0u/iXkn0iT/fcikhXh+Q1SCrLVqz2OeBmuHMHhRghQrUFs23Wko13cG?= =?us-ascii?Q?6/U5em1VnJ89y6Z6vbzVPSLXncW+BcizxVzcqHZ5TrYD7YVygV26GKDS/YkF?= =?us-ascii?Q?pTnRTh1yIfhqdGkYDcX1a+lkGUGW2S7gAKfh+dZkQoCzBVgcPFmtbvsd+d9F?= =?us-ascii?Q?6h65qFeXW7vqfi9NTt/7a4DGXz4r9+r6x2ZduLszwF5W6zrGq7dWPi2EV4DN?= =?us-ascii?Q?BCQhzqKXrSnPRvZHZ/zJRFCtp+JcWdGMkab1GxZCT1468nnPh/rSkh+Dr8Le?= =?us-ascii?Q?ocEo19ScurTQL/hrm27WqOjU3JRU3nZQNXsmcqyen7NR38V00ZJaa1Tcw6cD?= =?us-ascii?Q?nGQ/41OFsVMLpNmp2lt7sTqGWH6eDDP0LRbSv34QRQwWGnyeqULXW9b5QS6O?= =?us-ascii?Q?PNbkUykgwyk6GaGZfh/zGRoha53OQZymQtz3oTSQJUkdo8DzgqWoUtjA6dJ+?= =?us-ascii?Q?fg58+3WU3/MkgGNN4iohX7b4JHwfB3l/SK+wWkt0nadcPYqmWcgVTlNfv0Fo?= =?us-ascii?Q?F7iANNxGFKKd2EWpd023ub7tj0zAoXAiO3d7ylCWMSQP85xZlpESdaDy6rEH?= =?us-ascii?Q?DP6X9WKVBn1mtDYRjYk2vpTzNvPZ9uRyStxhN5J+1llnpSIvB6we7DyZD5At?= =?us-ascii?Q?RQca+39K4Y27xTTa9bn2P8mzPay6TFbFM4tTXwcS/EZVcjtJgvw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR0601MB3587; 6:gx0BZ0aN16cLA/sQ/z5PgAfZGhW5njP4Q1ByO2C+eEw8ilHsJ/LwsqwiroBYibM8rahZ2s5Y5uu7nWslKJAWPAz/c1RLv3lZEfGenji1B+0TMhFM90lBX4txXcR3iNaoAJ2RSr8/XQc83jXPvJXl7I9ZUHovvplVRt9NQZuh8qsVvQKHjEaM8EBrfPjpJz0b2FaG5yPmClypguCg9cX1+7JAvCP6TUQDPTZpp7YW7ToFNN/LolAAmUFgF0EF3yxayJonKiu/gDvyeP6Ok5gGSEBR+dHOBBOHV6IfExVb4ldrajCUc4q160g872zFxSBVCNI2hhUK+lkqxbTifL2ZtA==; 5:EOOSbXLCPddjmYe49Wyp6E6ikPqtpaUv7wcq92SS6c19hU2Ymk0fnPxlncyOELJbXaEblvPCL/A6NR2FjGIGKfVUQRqynSVH4Y2SCi0GC7UBCHhuWFmA81xIW/aRZ0BCP0llkC9E6AeECc7uScgnCA==; 24:BceZbI3jfH9iJ5ynOLeRAQOTeKzZ0bmpw6bSN4otdAP9U8vV+VuyIvBctS1fmVHP2C9xyXNbWiE2BPMp2NH+vejDMRvWRRUFcMf/Tb1getk=; 7:ZCgYw8tGiGvETf0sZQ2foAMXhHXiWTAh7Neo/oscMwrs/cJMO5PwHWj36pF4V52zd9B+Nnkam/WtIPCiYhDWI04mybzD07YMdzNQZR0vhOUP+oeZ/iD9Bfv5QCxzfypsmbkLDSwdxiSGkW6wkoCFGCQYkiaol/vJO64UisvpyvlPa3vFxTcTLa6GBhNFvbkp5xHp7ty9slh3B3/xlg6IWTdFRbG+EIfaWz0EsOh7zfc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cypress.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Oct 2017 07:26:35.0151 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 011addfc-2c09-450d-8938-e0bbc2dd2376 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR0601MB3587 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Chung-Hsien Hsu The firmware for brcmfmac devices includes information regarding regulatory constraints. For certain devices this information is kept separately in a binary form that needs to be downloaded to the device. This patch adds support to download this so-called CLM blob file. It uses the same naming scheme as the other firmware files with extension of .clm_blob. The CLM blob file is optional. If the file does not exist, the download process will be bypassed. It will not affect the driver loading. Signed-off-by: Chung-Hsien Hsu Reviewed-by: Arend van Spriel --- v2: Revise commit message to describe in more detail v3: Add error handling in brcmf_c_get_clm_name function v4: Correct the length of dload_buf in brcmf_c_download function v5: Remove unnecessary cast and alignment v6: Add debug log for the case of no CLM file present --- .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 10 ++ .../wireless/broadcom/brcm80211/brcmfmac/common.c | 162 +++++++++++++++++++++ .../wireless/broadcom/brcm80211/brcmfmac/core.c | 2 + .../wireless/broadcom/brcm80211/brcmfmac/core.h | 2 + .../broadcom/brcm80211/brcmfmac/fwil_types.h | 31 ++++ .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 19 +++ .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 19 +++ .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 18 +++ 8 files changed, 263 insertions(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h index b55c329..df42e09 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h @@ -71,6 +71,7 @@ struct brcmf_bus_dcmd { * @wowl_config: specify if dongle is configured for wowl when going to suspend * @get_ramsize: obtain size of device memory. * @get_memdump: obtain device memory dump in provided buffer. + * @get_fwname: obtain firmware name. * * This structure provides an abstract interface towards the * bus specific driver. For control messages to common driver @@ -87,6 +88,8 @@ struct brcmf_bus_ops { void (*wowl_config)(struct device *dev, bool enabled); size_t (*get_ramsize)(struct device *dev); int (*get_memdump)(struct device *dev, void *data, size_t len); + int (*get_fwname)(struct device *dev, uint chip, uint chiprev, + unsigned char *fw_name); }; @@ -214,6 +217,13 @@ int brcmf_bus_get_memdump(struct brcmf_bus *bus, void *data, size_t len) return bus->ops->get_memdump(bus->dev, data, len); } +static inline +int brcmf_bus_get_fwname(struct brcmf_bus *bus, uint chip, uint chiprev, + unsigned char *fw_name) +{ + return bus->ops->get_fwname(bus->dev, chip, chiprev, fw_name); +} + /* * interface functions from common layer */ diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c index 7a2b495..5397727 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include "core.h" @@ -28,6 +29,7 @@ #include "tracepoint.h" #include "common.h" #include "of.h" +#include "firmware.h" MODULE_AUTHOR("Broadcom Corporation"); MODULE_DESCRIPTION("Broadcom 802.11 wireless LAN fullmac driver."); @@ -104,12 +106,140 @@ void brcmf_c_set_joinpref_default(struct brcmf_if *ifp) brcmf_err("Set join_pref error (%d)\n", err); } +static int brcmf_c_download(struct brcmf_if *ifp, u16 flag, + struct brcmf_dload_data_le *dload_buf, + u32 len) +{ + s32 err; + + flag |= (DLOAD_HANDLER_VER << DLOAD_FLAG_VER_SHIFT); + dload_buf->flag = cpu_to_le16(flag); + dload_buf->dload_type = cpu_to_le16(DL_TYPE_CLM); + dload_buf->len = cpu_to_le32(len); + dload_buf->crc = cpu_to_le32(0); + len = sizeof(*dload_buf) + len - 1; + + err = brcmf_fil_iovar_data_set(ifp, "clmload", dload_buf, len); + + return err; +} + +static int brcmf_c_get_clm_name(struct brcmf_if *ifp, u8 *clm_name) +{ + struct brcmf_bus *bus = ifp->drvr->bus_if; + struct brcmf_rev_info *ri = &ifp->drvr->revinfo; + u8 fw_name[BRCMF_FW_NAME_LEN]; + u8 *ptr; + size_t len; + s32 err; + + memset(fw_name, 0, BRCMF_FW_NAME_LEN); + err = brcmf_bus_get_fwname(bus, ri->chipnum, ri->chiprev, fw_name); + if (err) { + brcmf_err("get firmware name failed (%d)\n", err); + goto done; + } + + /* generate CLM blob file name */ + ptr = strrchr(fw_name, '.'); + if (!ptr) { + err = -ENOENT; + goto done; + } + + len = ptr - fw_name + 1; + if (len + strlen(".clm_blob") > BRCMF_FW_NAME_LEN) { + err = -E2BIG; + } else { + strlcpy(clm_name, fw_name, len); + strlcat(clm_name, ".clm_blob", BRCMF_FW_NAME_LEN); + } +done: + return err; +} + +static int brcmf_c_process_clm_blob(struct brcmf_if *ifp) +{ + struct device *dev = ifp->drvr->bus_if->dev; + struct brcmf_dload_data_le *chunk_buf; + const struct firmware *clm = NULL; + u8 clm_name[BRCMF_FW_NAME_LEN]; + u32 chunk_len; + u32 datalen; + u32 cumulative_len; + u16 dl_flag = DL_BEGIN; + u32 status; + s32 err; + + brcmf_dbg(TRACE, "Enter\n"); + + memset(clm_name, 0, BRCMF_FW_NAME_LEN); + err = brcmf_c_get_clm_name(ifp, clm_name); + if (err) { + brcmf_err("get CLM blob file name failed (%d)\n", err); + return err; + } + + err = request_firmware(&clm, clm_name, dev); + if (err) { + if (err == -ENOENT) { + brcmf_dbg(INFO, "continue with CLM data currently present in firmware\n"); + return 0; + } + brcmf_err("request CLM blob file failed (%d)\n", err); + return err; + } + + chunk_buf = kzalloc(sizeof(*chunk_buf) + MAX_CHUNK_LEN - 1, GFP_KERNEL); + if (!chunk_buf) { + err = -ENOMEM; + goto done; + } + + datalen = clm->size; + cumulative_len = 0; + do { + if (datalen > MAX_CHUNK_LEN) { + chunk_len = MAX_CHUNK_LEN; + } else { + chunk_len = datalen; + dl_flag |= DL_END; + } + memcpy(chunk_buf->data, clm->data + cumulative_len, chunk_len); + + err = brcmf_c_download(ifp, dl_flag, chunk_buf, chunk_len); + + dl_flag &= ~DL_BEGIN; + + cumulative_len += chunk_len; + datalen -= chunk_len; + } while ((datalen > 0) && (err == 0)); + + if (err) { + brcmf_err("clmload (%zu byte file) failed (%d); ", + clm->size, err); + /* Retrieve clmload_status and print */ + err = brcmf_fil_iovar_int_get(ifp, "clmload_status", &status); + if (err) + brcmf_err("get clmload_status failed (%d)\n", err); + else + brcmf_dbg(INFO, "clmload_status=%d\n", status); + err = -EIO; + } + + kfree(chunk_buf); +done: + release_firmware(clm); + return err; +} + int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) { s8 eventmask[BRCMF_EVENTING_MASK_LEN]; u8 buf[BRCMF_DCMD_SMLEN]; struct brcmf_rev_info_le revinfo; struct brcmf_rev_info *ri; + char *clmver; char *ptr; s32 err; @@ -148,6 +278,13 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) } ri->result = err; + /* Do any CLM downloading */ + err = brcmf_c_process_clm_blob(ifp); + if (err < 0) { + brcmf_err("download CLM blob file failed, %d\n", err); + goto done; + } + /* query for 'ver' to get version info from firmware */ memset(buf, 0, sizeof(buf)); strcpy(buf, "ver"); @@ -167,6 +304,31 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) ptr = strrchr(buf, ' ') + 1; strlcpy(ifp->drvr->fwver, ptr, sizeof(ifp->drvr->fwver)); + /* Query for 'clmver' to get CLM version info from firmware */ + memset(buf, 0, sizeof(buf)); + err = brcmf_fil_iovar_data_get(ifp, "clmver", buf, sizeof(buf)); + if (err) { + if (err == -23) { + brcmf_dbg(INFO, "clmver iovar unsupported, %d\n", err); + } else { + brcmf_err("retrieving clmver failed, %d\n", err); + goto done; + } + } else { + clmver = (char *)buf; + /* store CLM version for adding it to revinfo debugfs file */ + memcpy(ifp->drvr->clmver, clmver, sizeof(ifp->drvr->clmver)); + + /* Replace all newline/linefeed characters with space + * character + */ + ptr = clmver; + while ((ptr = strnchr(ptr, '\n', sizeof(buf))) != NULL) + *ptr = ' '; + + brcmf_dbg(INFO, "CLM version = %s\n", clmver); + } + /* set mpc */ err = brcmf_fil_iovar_int_set(ifp, "mpc", 1); if (err) { diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c index 511d190..7414dff 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c @@ -941,6 +941,8 @@ static int brcmf_revinfo_read(struct seq_file *s, void *data) seq_printf(s, "anarev: %u\n", ri->anarev); seq_printf(s, "nvramrev: %08x\n", ri->nvramrev); + seq_printf(s, "clmrev: %s\n", bus_if->drvr->clmver); + return 0; } diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h index a4dd313..ae39128 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h @@ -141,6 +141,8 @@ struct brcmf_pub { struct notifier_block inetaddr_notifier; struct notifier_block inet6addr_notifier; struct brcmf_mp_device *settings; + + u8 clmver[BRCMF_DCMD_SMLEN]; }; /* forward declarations */ diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h index 9a1eb5a..fffe347 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h @@ -147,6 +147,21 @@ #define BRCMF_MFP_CAPABLE 1 #define BRCMF_MFP_REQUIRED 2 +/* MAX_CHUNK_LEN is the maximum length for data passing to firmware in each + * ioctl. It is relatively small because firmware has small maximum size input + * playload restriction for ioctls. + */ +#define MAX_CHUNK_LEN 1400 + +#define DLOAD_HANDLER_VER 1 /* Downloader version */ +#define DLOAD_FLAG_VER_MASK 0xf000 /* Downloader version mask */ +#define DLOAD_FLAG_VER_SHIFT 12 /* Downloader version shift */ + +#define DL_BEGIN 0x0002 +#define DL_END 0x0004 + +#define DL_TYPE_CLM 2 + /* join preference types for join_pref iovar */ enum brcmf_join_pref_types { BRCMF_JOIN_PREF_RSSI = 1, @@ -835,4 +850,20 @@ struct brcmf_gtk_keyinfo_le { u8 replay_counter[BRCMF_RSN_REPLAY_LEN]; }; +/** + * struct brcmf_dload_data_le - data passing to firmware for downloading + * @flag: flags related to download data. + * @dload_type: type of download data. + * @len: length in bytes of download data. + * @crc: crc of download data. + * @data: download data. + */ +struct brcmf_dload_data_le { + __le16 flag; + __le16 dload_type; + __le32 len; + __le32 crc; + u8 data[1]; +}; + #endif /* FWIL_TYPES_H_ */ diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c index f878706..b370ee7 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c @@ -1350,6 +1350,24 @@ static int brcmf_pcie_get_memdump(struct device *dev, void *data, size_t len) return 0; } +static int brcmf_pcie_get_fwname(struct device *dev, u32 chip, u32 chiprev, + u8 *fw_name) +{ + struct brcmf_bus *bus_if = dev_get_drvdata(dev); + struct brcmf_pciedev *buspub = bus_if->bus_priv.pcie; + struct brcmf_pciedev_info *devinfo = buspub->devinfo; + int ret = 0; + + if (devinfo->fw_name[0] != '\0') + strlcpy(fw_name, devinfo->fw_name, BRCMF_FW_NAME_LEN); + else + ret = brcmf_fw_map_chip_to_name(chip, chiprev, + brcmf_pcie_fwnames, + ARRAY_SIZE(brcmf_pcie_fwnames), + fw_name, NULL); + + return ret; +} static const struct brcmf_bus_ops brcmf_pcie_bus_ops = { .txdata = brcmf_pcie_tx, @@ -1359,6 +1377,7 @@ static int brcmf_pcie_get_memdump(struct device *dev, void *data, size_t len) .wowl_config = brcmf_pcie_wowl_config, .get_ramsize = brcmf_pcie_get_ramsize, .get_memdump = brcmf_pcie_get_memdump, + .get_fwname = brcmf_pcie_get_fwname, }; diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c index b1789b1..3a71ca0 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -3972,6 +3972,24 @@ static void brcmf_sdio_buscore_write32(void *ctx, u32 addr, u32 val) } } +static int brcmf_sdio_get_fwname(struct device *dev, u32 chip, u32 chiprev, + u8 *fw_name) +{ + struct brcmf_bus *bus_if = dev_get_drvdata(dev); + struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio; + int ret = 0; + + if (sdiodev->fw_name[0] != '\0') + strlcpy(fw_name, sdiodev->fw_name, BRCMF_FW_NAME_LEN); + else + ret = brcmf_fw_map_chip_to_name(chip, chiprev, + brcmf_sdio_fwnames, + ARRAY_SIZE(brcmf_sdio_fwnames), + fw_name, NULL); + + return ret; +} + static const struct brcmf_bus_ops brcmf_sdio_bus_ops = { .stop = brcmf_sdio_bus_stop, .preinit = brcmf_sdio_bus_preinit, @@ -3982,6 +4000,7 @@ static void brcmf_sdio_buscore_write32(void *ctx, u32 addr, u32 val) .wowl_config = brcmf_sdio_wowl_config, .get_ramsize = brcmf_sdio_bus_get_ramsize, .get_memdump = brcmf_sdio_bus_get_memdump, + .get_fwname = brcmf_sdio_get_fwname, }; static void brcmf_sdio_firmware_callback(struct device *dev, int err, diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c index 8f20a4b..9622dd9 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c @@ -1128,12 +1128,30 @@ static void brcmf_usb_wowl_config(struct device *dev, bool enabled) device_set_wakeup_enable(devinfo->dev, false); } +static int brcmf_usb_get_fwname(struct device *dev, u32 chip, u32 chiprev, + u8 *fw_name) +{ + struct brcmf_usbdev_info *devinfo = brcmf_usb_get_businfo(dev); + int ret = 0; + + if (devinfo->fw_name[0] != '\0') + strlcpy(fw_name, devinfo->fw_name, BRCMF_FW_NAME_LEN); + else + ret = brcmf_fw_map_chip_to_name(chip, chiprev, + brcmf_usb_fwnames, + ARRAY_SIZE(brcmf_usb_fwnames), + fw_name, NULL); + + return ret; +} + static const struct brcmf_bus_ops brcmf_usb_bus_ops = { .txdata = brcmf_usb_tx, .stop = brcmf_usb_down, .txctl = brcmf_usb_tx_ctlpkt, .rxctl = brcmf_usb_rx_ctlpkt, .wowl_config = brcmf_usb_wowl_config, + .get_fwname = brcmf_usb_get_fwname, }; static int brcmf_usb_bus_setup(struct brcmf_usbdev_info *devinfo)