From patchwork Wed Aug 30 22:51:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian W MORRISON X-Patchwork-Id: 9930929 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 7DE6B6022E for ; Wed, 30 Aug 2017 22:51:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 645F2287CB for ; Wed, 30 Aug 2017 22:51:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 590CA287CC; Wed, 30 Aug 2017 22:51:10 +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 0A2C9287CF for ; Wed, 30 Aug 2017 22:51:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751100AbdH3WvG (ORCPT ); Wed, 30 Aug 2017 18:51:06 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34362 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750895AbdH3WvG (ORCPT ); Wed, 30 Aug 2017 18:51:06 -0400 Received: by mail-pf0-f193.google.com with SMTP id v22so349934pfk.1 for ; Wed, 30 Aug 2017 15:51:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=i0vcKYTW+Juiu/Kvx/ySFu9WxP7URx7emsoX+XhEmBo=; b=kRLxdsaDfl7k3LKyZjOSi1T/MvNxneO0khCvkDPKOV4R0ZhPJCIlv7tjKsSecWomji XRL3lYOxiaNZfk0+9lDViWHfZu8Iq36iMsbI+N/bm+3CESfWI7r2b9H1ywAGqF4IF1qR PTsnTovApaDgWBnHVbm0UjFU+eg35+zteoYQDyNA0MG4SzL8JdoHIQ5CesndbcxugW9q iQwu/BHs+pbuKQeR9kmQ8V09dyyNVxq+7oklLlYmbRvzeaVNzqNK1BMkr7BhX+tO2REe VxgB/R8VOCVyof+ae82q9iDH+pTAMEzN94kK0b8BDnB56iW3gvNzBiya0MF/+XWuxijo 9sTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=i0vcKYTW+Juiu/Kvx/ySFu9WxP7URx7emsoX+XhEmBo=; b=Q8m8OOz7q2YR6qo2wUpwLMxWIfyVtGiu4LxQDAwkHsakAI5qpZcsoWlIvHMSufB7HR 0zoENrZb5tqHiRnRxBoNOL1YtwoFPS663SJSQix9bqpM9OOGurqEBYWzlBg7HMxjE8Z8 KlrtoGYCidhJROWET64UhU2vHdwgOYCGN78oi1fFZKSUkLvlNyLUE6k65EcLpUIAtZ8K 5pf+sTTjDNbugefHeIrSgr54V1RRK4u2kDeOa+UkHuB2VMePp5yA+7ATJXwqEEqtMxH5 AvZLKriomFRTmm02MWTod7uPrCaTiU7eYBzgOyA2zdWer8Rwv+qUeWTwjo8bCSX+eCDv 8prg== X-Gm-Message-State: AHYfb5hT7BoWPs0AeJDxBXD5S4encD+zuBFCT4NmLIgG4Rx3CVxE2enH V21NNYMW9kS4+Q== X-Google-Smtp-Source: ADKCNb6eAQjDKqFhQ9g8wAAmPls+Y/wEESBupcbjPUkQTp1+4VoJqukaTohg8uoTfKg31Br5KBh1Pg== X-Received: by 10.99.120.5 with SMTP id t5mr153457pgc.438.1504133465453; Wed, 30 Aug 2017 15:51:05 -0700 (PDT) Received: from [10.88.88.79] ([101.164.78.97]) by smtp.gmail.com with ESMTPSA id z8sm10268373pgc.92.2017.08.30.15.51.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Aug 2017 15:51:04 -0700 (PDT) To: arend.vanspriel@broadcom.com, kvalo@codeaurora.org, ian@mnementh.co.uk, linux-wireless@vger.kernel.org From: Ian W MORRISON Subject: [PATCH v2] brcmfmac: feature check for multi-scheduled scan fails on bcm4345 devices Message-ID: <3cfcb175-8031-f5a8-da51-d81fa2d331c8@gmail.com> Date: Thu, 31 Aug 2017 08:51:03 +1000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:54.0) Gecko/20100101 Thunderbird/54.0 MIME-Version: 1.0 Content-Language: en-US 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 The firmware feature check introduced for multi-scheduled scan is also failing for bcm4345 devices resulting in a firmware crash. The reason for this crash has not yet been root cause so this patch avoids the feature check for those device as a short-term fix. Fixes: 9fe929aaace6 ("brcmfmac: add firmware feature detection for gscan feature") Signed-off-by: Ian W MORRISON Acked-by: Arend van Spriel --- v2: Fixed tabs being replaced by spaces in patch submission Tested on MINIX NEO Z83-4 and MINIX NEO Z83-4 Pro devices. --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c index f1b60740e..53ae302 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c @@ -159,7 +159,8 @@ void brcmf_feat_attach(struct brcmf_pub *drvr) brcmf_feat_firmware_capabilities(ifp); memset(&gscan_cfg, 0, sizeof(gscan_cfg)); - if (drvr->bus_if->chip != BRCM_CC_43430_CHIP_ID) + if (drvr->bus_if->chip != BRCM_CC_43430_CHIP_ID && + drvr->bus_if->chip != BRCM_CC_4345_CHIP_ID) brcmf_feat_iovar_data_set(ifp, BRCMF_FEAT_GSCAN, "pfn_gscan_cfg", &gscan_cfg, sizeof(gscan_cfg));