From patchwork Tue Jan 26 16:57:02 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: 8124831 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 0E33A9F6DA for ; Tue, 26 Jan 2016 16:57:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4AEEB2026D for ; Tue, 26 Jan 2016 16:57:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6730D20266 for ; Tue, 26 Jan 2016 16:57:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966994AbcAZQ5b (ORCPT ); Tue, 26 Jan 2016 11:57:31 -0500 Received: from mail-lf0-f41.google.com ([209.85.215.41]:32833 "EHLO mail-lf0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966867AbcAZQ5Z (ORCPT ); Tue, 26 Jan 2016 11:57:25 -0500 Received: by mail-lf0-f41.google.com with SMTP id s81so2865605lfd.0 for ; Tue, 26 Jan 2016 08:57:24 -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=y/kskRCp4EzM2e5usT/OP0dS2KJnHPk7BASqs+2m+qs=; b=Wq6xK0aT0/5HnbMOzDf7O9NkS4s5ZztaSElv/xOXoWxhkwqJy4xmwwtZyvWKyu+qc4 N/CV3mBT9YAIbCSaHHLw6W0zZMh6ShOKlqHds9XXYb0e4MOvqidvQBxk59lfl74Qd3+S kI6xVS/mifjaxUBNDDscRRJBI2Igf52LiUx/w9PAzXBs9llIU1A4ftsNX2iSLhjKtw00 Tia7l+rI+yuehaQs3NF50OE+Y0t1XX/xPRXPjxVlNCyhGYSKvswHd6Rkdz3N6SAyQYDJ +NiTyGnJDpQzmOKdhh0Qp1bwM9yaIRZEg12Gy87+YXVQflExdEp6W5Z1WmX6OWRw/pVg KIPA== 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=y/kskRCp4EzM2e5usT/OP0dS2KJnHPk7BASqs+2m+qs=; b=irbjx5wfAPMoa2q6sOpsS7x7/1dR+nt9iQezyIBy0G9CU9SvrZ8Hl0TS7iOzBjp3c1 B3XZH3oLvFKIKREi8OIBN6sUKZHw+60lT/sTkCDFu/51unj9I8hX8zz5fGSwEt3DQ0ed MY6CjpPe0PX+kxnzudjsm5zIvgZo8/UpW6Y7ftV7T7rifQ6EkZ+ZkO/nbLX+gKEdxNrS db6vX0nM1VxRe9s6/QQWvXo1qXn1+EGv4yV6LEBc2dU8BD0FrykD9A4jDMX6WWHB+bSc vL0SGo592M9pTu98e2FzH7rZ/fSs0kZfP5y+vCY9CNsNlZiX7fwmZPnMYGjCj4KQsltQ I9AQ== X-Gm-Message-State: AG10YOTIzl8/2VP9TO6CJgdCINzniRG1vVIPdEmHJDF9Lz6nd/kzhkj4lnP6XHNfL4fR3g== X-Received: by 10.25.17.229 with SMTP id 98mr7212581lfr.3.1453827444170; Tue, 26 Jan 2016 08:57:24 -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.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jan 2016 08:57:23 -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 2/5] brcmfmac: allow storing PMU core without wrapper address Date: Tue, 26 Jan 2016 17:57:02 +0100 Message-Id: <1453827425-16455-3-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 Separated PMU core can be found in new devices and should be used for accessing PMU registers (which were routed through ChipCommon so far). This core is one of exceptions that doesn't have or need wrapper address to be still safely accessible. Signed-off-by: Rafa? Mi?ecki --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c index e434e2a..55952d4 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c @@ -883,7 +883,8 @@ int brcmf_chip_dmp_erom_scan(struct brcmf_chip_priv *ci) rev = (val & DMP_COMP_REVISION) >> DMP_COMP_REVISION_S; /* need core with ports */ - if (nmw + nsw == 0) + if (nmw + nsw == 0 && + id != BCMA_CORE_PMU) continue; /* try to obtain register address info */