From patchwork Thu Mar 30 09:19:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xinming Hu X-Patchwork-Id: 9653387 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 318AE6034C for ; Thu, 30 Mar 2017 09:20:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1793028535 for ; Thu, 30 Mar 2017 09:20:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A6E62850F; Thu, 30 Mar 2017 09:20:01 +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.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 A11B12850F for ; Thu, 30 Mar 2017 09:20:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932836AbdC3JT7 (ORCPT ); Thu, 30 Mar 2017 05:19:59 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:33207 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932760AbdC3JT5 (ORCPT ); Thu, 30 Mar 2017 05:19:57 -0400 Received: by mail-pg0-f66.google.com with SMTP id 79so8614477pgf.0 for ; Thu, 30 Mar 2017 02:19:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DLrns/PkfSwcbkWKYuy0oi7C35iMxmktkhaOdosoUac=; b=EaxDBDC53eC8c04B0hiLr503ZyVyVknrDj71LaB33uvFztLGmO6EJik0ir5e5lMzTx J1N27mMseskTVdc7jesnPpFnnkUEouR8/GtDqNiZk2GgUL41tdOTgp0n5tqf/k//gqcs AeWA8dVD6WNfpvH9g4QWF8Erj8JXYKxUfzqLK7p53qx/9J/wJZgfdYwu2ZT5f/8C/FJG UvoLe5JB0fEn/Tf8vHi8L+aOw3jHGJ6/7kLjDIRis4ZptZ6sYWeF/DShSFHWW0bayPIa kz9R44CWMaGNoj5mbXa8ivHpt5cEPT1tTA2efv8jcVVtqBDmaWpBOUox2nIN5rmZHNMM qdIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DLrns/PkfSwcbkWKYuy0oi7C35iMxmktkhaOdosoUac=; b=VMGXDWF2Mg6je3ET9rRwQiszHP6D5yH3y8p74NI+5TwVy/yta//xevDzFGGCzy4yal DsN9fwy2nVgvq0c83kfLza3afPobvei+McZnzsaJyl4Rztbr287LaP/dmKDKxGPXVQeQ KDfLgMecKEXw/y8+ArwMw8+aqK9Ji40ZVMiYfmOiciJ88MYEemKf05QGYVbRXodJS1o+ BN2MXiYuIEqQzehDdBvOias6A6BD+/8a91WJhH6e1R1mxSD///D224Odpkgc7XJWP0Gr GUsrrpTpfL3PnWTAPNHadffexgBU1550HofpOPknIxTBK8ktHQA4lzCyc7tXVZpbPVSJ SLUw== X-Gm-Message-State: AFeK/H2zR6X3OkXx8WU9EteSTx2EvJQH47qARUyyWf98hQ5REd4EzYmp5gPR/nylvXSqLQ== X-Received: by 10.98.220.65 with SMTP id t62mr5074372pfg.0.1490865586025; Thu, 30 Mar 2017 02:19:46 -0700 (PDT) Received: from ubuntu.members.linode.com ([2400:8902::f03c:91ff:fee7:7cf1]) by smtp.gmail.com with ESMTPSA id x68sm3129437pfx.45.2017.03.30.02.19.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 30 Mar 2017 02:19:45 -0700 (PDT) From: Xinming Hu To: Linux Wireless Cc: Kalle Valo , Brian Norris , Dmitry Torokhov , rajatja@google.com, Amitkumar Karwar , Cathy Luo , Xinming Hu Subject: [PATCH 3/3] mwifiex: pcie: avoid hardcode wifi-only firmware name Date: Thu, 30 Mar 2017 09:19:07 +0000 Message-Id: <1490865547-10208-3-git-send-email-huxinming820@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490865547-10208-1-git-send-email-huxinming820@gmail.com> References: <1490865547-10208-1-git-send-email-huxinming820@gmail.com> 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: Xinming Hu Wifi-only firmware name should be chipset specific. Signed-off-by: Xinming Hu Signed-off-by: Amitkumar Karwar --- drivers/net/wireless/marvell/mwifiex/pcie.c | 8 +++++++- drivers/net/wireless/marvell/mwifiex/pcie.h | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c index 59cb01a..282aa9a 100644 --- a/drivers/net/wireless/marvell/mwifiex/pcie.c +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c @@ -351,6 +351,12 @@ static void mwifiex_pcie_reset_notify(struct pci_dev *pdev, bool prepare) struct pcie_service_card *card = pci_get_drvdata(pdev); struct mwifiex_adapter *adapter = card->adapter; + if (!card->pcie.flr_support) { + pr_err("%s: FLR disabled in current chipset\n", __func__); + return; + } + + adapter = card->adapter; if (!adapter) { dev_err(&pdev->dev, "%s: adapter structure is not valid\n", __func__); @@ -3047,7 +3053,7 @@ static void mwifiex_pcie_up_dev(struct mwifiex_adapter *adapter) * during pcie FLR, so that bluetooth part of firmware which is * already running doesn't get affected. */ - strcpy(adapter->fw_name, PCIE8997_DEFAULT_WIFIFW_NAME); + strcpy(adapter->fw_name, card->pcie.wifi_fw_name); /* tx_buf_size might be changed to 3584 by firmware during * data transfer, we should reset it to default size. diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.h b/drivers/net/wireless/marvell/mwifiex/pcie.h index 00e8ee5..d6c8526 100644 --- a/drivers/net/wireless/marvell/mwifiex/pcie.h +++ b/drivers/net/wireless/marvell/mwifiex/pcie.h @@ -285,6 +285,8 @@ struct mwifiex_pcie_device { struct memory_type_mapping *mem_type_mapping_tbl; u8 num_mem_types; bool can_ext_scan; + u8 flr_support; + char *wifi_fw_name; }; static const struct mwifiex_pcie_device mwifiex_pcie8766 = { @@ -293,6 +295,7 @@ struct mwifiex_pcie_device { .tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K, .can_dump_fw = false, .can_ext_scan = true, + .flr_support = 0, }; static const struct mwifiex_pcie_device mwifiex_pcie8897 = { @@ -303,6 +306,7 @@ struct mwifiex_pcie_device { .mem_type_mapping_tbl = mem_type_mapping_tbl_w8897, .num_mem_types = ARRAY_SIZE(mem_type_mapping_tbl_w8897), .can_ext_scan = true, + .flr_support = 0, }; static const struct mwifiex_pcie_device mwifiex_pcie8997 = { @@ -313,6 +317,8 @@ struct mwifiex_pcie_device { .mem_type_mapping_tbl = mem_type_mapping_tbl_w8997, .num_mem_types = ARRAY_SIZE(mem_type_mapping_tbl_w8997), .can_ext_scan = true, + .flr_support = 1, + .wifi_fw_name = "mrvl/pcie8997_wlan_v4.bin", }; struct mwifiex_evt_buf_desc {