From patchwork Tue Jan 26 16:57:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 8124841 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D10D59F6DA for ; Tue, 26 Jan 2016 16:57:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 04AE32026D for ; Tue, 26 Jan 2016 16:57:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2081B20266 for ; Tue, 26 Jan 2016 16:57:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966881AbcAZQ5g (ORCPT ); Tue, 26 Jan 2016 11:57:36 -0500 Received: from mail-lf0-f51.google.com ([209.85.215.51]:34701 "EHLO mail-lf0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966826AbcAZQ5a (ORCPT ); Tue, 26 Jan 2016 11:57:30 -0500 Received: by mail-lf0-f51.google.com with SMTP id 17so109173175lfz.1 for ; Tue, 26 Jan 2016 08:57:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=GoN/2wgvu+OR27gSgVLEELzckGV1UPJ68kcosE2SUzU=; b=avRq8ATEXdstq9COxIQCANcPQPmkp3lk/9m0HDPMF+7e5NAuSvuHL74SZfXcEOpMvi w4DHOSs1LkukaWDztYQ870rh0HoFDQS3niPOqLEvFU1zDMN3kfdygwinKnRCKUmZ54Ty Wn+T8oyoJt4oi5yBXadGYPDcA34+hfXHexTGJ6g/shGdXnAlJeBf98gIdZ9Q0avnHxH3 DqRoOWhBpvdcggShULlAXVmWiR9fteqWI9lXan5cowv0RRNbv3Fa7W71RS6sAN7bMYc8 Uhc7auA/PM9XhmbjMiQpWTK7NYfgdmDtstmdmJP4jA9b9kpe3fGCv+bGG0/lYfQN474w zikQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=GoN/2wgvu+OR27gSgVLEELzckGV1UPJ68kcosE2SUzU=; b=OtCAC6d6xLaAIqLvHCmkjnWONA4Q0B+GlQvj+pQ5BIcCvhBuAjslEPoP4BLehLtbmJ asqAGGJoi0Oo4THtl2RLMMr65PD/CpGogZuqgQBt0EjzjSVdbrg0jXdpiZScxxbRuLA8 uVXNY4vDw12hP0TDbhVIIjzEIRk+p1UWitQemkMHe21jSpLOz2z6D/7MB8qXFpcs9/rB JT3xG2Px7JoLVH4SovO+UXLsVJh9EXVCPAOPXWAnIRAglKZxW0h95Th9kriO+xGyizMl prI0+EGiMSXk7xYMn3R3zrdcZ76HPMF4SoZUoAiQ6oy+DRf4LtvsyrvTx9iDyFzuvZ2i 6Exw== X-Gm-Message-State: AG10YOS5nwxW/JUWWPJInXv6FWeVAtnK2AEu9AEJ6QUvaHZ9CmgD5Iyt8pevb/RDm6xnJQ== X-Received: by 10.25.32.16 with SMTP id g16mr1535630lfg.82.1453827449145; Tue, 26 Jan 2016 08:57:29 -0800 (PST) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id h187sm292998lfg.18.2016.01.26.08.57.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jan 2016 08:57:28 -0800 (PST) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Kalle Valo , linux-wireless@vger.kernel.org Cc: Brett Rudley , Arend van Spriel , "Franky (Zhenhui) Lin" , Hante Meuleman , brcm80211-dev-list@broadcom.com, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH 3/5] brcmfmac: read extended capabilities of ChipCommon core Date: Tue, 26 Jan 2016 17:57:03 +0100 Message-Id: <1453827425-16455-4-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1453827425-16455-1-git-send-email-zajec5@gmail.com> References: <1453827425-16455-1-git-send-email-zajec5@gmail.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is an extra bitfield with info about some present hardware. Signed-off-by: Rafa? Mi?ecki --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c | 3 +++ drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c index 55952d4..f4a4d00 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c @@ -1025,6 +1025,9 @@ static int brcmf_chip_setup(struct brcmf_chip_priv *chip) /* get chipcommon capabilites */ pub->cc_caps = chip->ops->read32(chip->ctx, CORE_CC_REG(base, capabilities)); + pub->cc_caps_ext = chip->ops->read32(chip->ctx, + CORE_CC_REG(base, + capabilities_ext)); /* get pmu caps & rev */ if (pub->cc_caps & CC_CAP_PMU) { diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h index f6b5fee..cb9145f 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h @@ -27,6 +27,7 @@ * @chip: chip identifier. * @chiprev: chip revision. * @cc_caps: chipcommon core capabilities. + * @cc_caps_ext: chipcommon core extended capabilities. * @pmucaps: PMU capabilities. * @pmurev: PMU revision. * @rambase: RAM base address (only applicable for ARM CR4 chips). @@ -38,6 +39,7 @@ struct brcmf_chip { u32 chip; u32 chiprev; u32 cc_caps; + u32 cc_caps_ext; u32 pmucaps; u32 pmurev; u32 rambase;