From patchwork Mon May 22 21:39:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Franky Lin X-Patchwork-Id: 9741443 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 07A31601C2 for ; Mon, 22 May 2017 21:39:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EE28C2873F for ; Mon, 22 May 2017 21:39:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E288728764; Mon, 22 May 2017 21:39:41 +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, 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 3B8592873F for ; Mon, 22 May 2017 21:39:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934639AbdEVVjh (ORCPT ); Mon, 22 May 2017 17:39:37 -0400 Received: from mail-yb0-f177.google.com ([209.85.213.177]:34575 "EHLO mail-yb0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934362AbdEVVje (ORCPT ); Mon, 22 May 2017 17:39:34 -0400 Received: by mail-yb0-f177.google.com with SMTP id 132so33704147ybq.1 for ; Mon, 22 May 2017 14:39:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=hzwVQ9sIkFUKY9G6IOZlJg4dRko8OFwcFWj9cgywXxY=; b=U7O5OxnZRhySZ5cvfVYiel0g6cw9UpIQqUgtEnbxe2+U2PE4103s/mAIKp08sHDZIL Yna/KiYkHJlLpYxc/V54fttUFdenmYUOwcbSaVHQkbjJu7TpXCLNud/1kZF63NGdWyOT COqANjwEUmvWQodDR5Nk+VGUIUDP3PDZ1JsaE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=hzwVQ9sIkFUKY9G6IOZlJg4dRko8OFwcFWj9cgywXxY=; b=mNwPuy5ctWvl3YIaQpVocMJfUNM3WauiHmVNuEsHR3Hd9hgaZeH5nKAb16iWgutPUh itoIg+/m/0MAhcEljhUH2HnQy/rbr5UeniE25q7GX1gcBgEOQV2vzhUJH8Qnr6Q/tHgK pLjxA3RmVbJgTmsfVxbDgQcaysOwEhSIhDaXt5CGQlTLUEEKumRpN8XFWTUMnt8uvY9W dZlMUbffPAnZg+7LjH7NjUHZljJ1R4WMbbb6quL/wCc8CCU/9VHLRSTMRASV9cs6MS+h bzzYNAtyIRrxudRk9Xw5kjA3JqYejpDyLyb/Kd0Kjtzarlas0jbL1EG5EWJjy66csOt+ cOOQ== X-Gm-Message-State: AODbwcCKV2NJ0tp9kUrI6mmLfjlsd4TqvWEDgea+f4xh6mNhAXn69HrN aCU1aaNxH/edx+J5h95zrSr7n0NSPy3C X-Received: by 10.37.194.66 with SMTP id s63mr19382845ybf.119.1495489173519; Mon, 22 May 2017 14:39:33 -0700 (PDT) MIME-Version: 1.0 Received: by 10.37.231.69 with HTTP; Mon, 22 May 2017 14:39:13 -0700 (PDT) In-Reply-To: References: From: Franky Lin Date: Mon, 22 May 2017 14:39:13 -0700 Message-ID: Subject: Re: brcmfmac firmware issue on NanoPi K2 To: =?UTF-8?Q?Andreas_F=C3=A4rber?= Cc: linux-wireless@vger.kernel.org, "open list:BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER" , netdev@vger.kernel.org, technicalsupport , Arend Van Spriel , linux-amlogic 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 Hi Andreas, On Sun, May 21, 2017 at 9:20 AM, Andreas Färber wrote: > Hello, > > The NanoPi K2 has an Ampak AP6212 SDIO module. brcmfmac driver loads > brcmfmac43430-sdio.bin. > > When using the firmware file from linux-firmware.git that openSUSE ships > I get the following errors on 4.11.0 and next-20170519: > > [ 2103.618716] brcmfmac: brcmf_sdio_htclk: HT Avail timeout (1000000): > clkctl 0x50 > [ 2104.668746] brcmfmac: brcmf_sdio_htclk: HT Avail timeout (1000000): > clkctl 0x50 > [ 2105.678677] brcmfmac: brcmf_sdio_htclk: HT Avail timeout (1000000): > clkctl 0x50 > > If I overwrite /lib/firmware/brcm/bcm43430-sdio.bin with > fw_bcm43438a0.bin from FriendlyARM's Android repository it suddenly works: > > [ +0.157738] brcmfmac: brcmf_c_preinit_dcmds: Firmware version = wl0: > Jun 6 2014 14:50:39 version 7.10.226.49 (r) FWID 01-8962686a > [ +0.160108] brcmfmac: brcmf_cfg80211_reg_notifier: not a ISO3166 code > (0x30 0x30) > > I recall using the linux-firmware.git brcmfmac43430-sdio.bin file > successfully on the Raspberry Pi 3 with a downstream (Leap 42.2) kernel. > > I've tested both nvram_ap6212.txt and nvram_ap6212a.txt, the latter has > the following diff to nvram.txt: > > --- nvram_ap6212.txt 2017-05-21 04:24:40.372113426 +0200 > +++ nvram_ap6212a.txt 2017-05-21 04:24:49.852116599 +0200 > @@ -1,4 +1,4 @@ > -#AP6212_NVRAM_V1.0_20140603 > +#AP6212_NVRAM_V1.0.1_20160606 > # 2.4 GHz, 20 MHz BW mode > > # The following parameter values are just placeholders, need to be updated. > @@ -51,4 +51,4 @@ > muxenab=0x10 > # CLDO PWM voltage settings - 0x4 - 1.1 volt > #cldo_pwm=0x4 > - > +glitch_based_crsmin=1 > > https://github.com/friendlyarm/android_hardware_amlogic_wifi/tree/l-amlogic-gx-sync/bcm_ampak/config/6212 > > * Does the linux-firmware.git brcmfmac43430-sdio.bin need a fix for AP6212? > https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/brcm > > * Does the brcmfmac driver need to distinguish revisions in sdio.c as > done for 43241, plus a separate firmware file? > BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFF, 43430), It seems we are dealing with different revisions of 43430. The firmware file you pointed to is for 43430a0 and raspberry pi 3 is using 43430a1. So yes brcmfmac needs to load different firmware and nvram for them just like 43241. Could you please help try the attached patch? I don't have the hardware to test it. Please rename the 43438 firmware and nvram to brcmfmac43430a0-sdio.bin/txt. Thanks, Franky --- BRCMF_FW_NVRAM_DEF(43455, "brcmfmac43455-sdio.bin", "brcmfmac43455-sdio.txt"); BRCMF_FW_NVRAM_DEF(4354, "brcmfmac4354-sdio.bin", "brcmfmac4354-sdio.txt"); @@ -626,7 +627,8 @@ static struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = { BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4335_CHIP_ID, 0xFFFFFFFF, 4335), BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43362_CHIP_ID, 0xFFFFFFFE, 43362), BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, 4339), - BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFF, 43430), + BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000001, 43430A0), + BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFE, 43430), BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFFC0, 43455), BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, 4354), BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c index a999f95..1b12ccb 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -608,6 +608,7 @@ BRCMF_FW_NVRAM_DEF(43340, "brcmfmac43340-sdio.bin", "brcmfmac43340-sdio.txt"); BRCMF_FW_NVRAM_DEF(4335, "brcmfmac4335-sdio.bin", "brcmfmac4335-sdio.txt"); BRCMF_FW_NVRAM_DEF(43362, "brcmfmac43362-sdio.bin", "brcmfmac43362-sdio.txt"); BRCMF_FW_NVRAM_DEF(4339, "brcmfmac4339-sdio.bin", "brcmfmac4339-sdio.txt"); +BRCMF_FW_NVRAM_DEF(43430A0, "brcmfmac43430a0-sdio.bin", "brcmfmac43430a0-sdio.txt"); BRCMF_FW_NVRAM_DEF(43430, "brcmfmac43430-sdio.bin", "brcmfmac43430-sdio.txt");