From patchwork Thu Nov 26 18:08:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 549213 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D65DB1402A5 for ; Fri, 27 Nov 2015 05:11:06 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=semihalf-com.20150623.gappssmtp.com header.i=@semihalf-com.20150623.gappssmtp.com header.b=oIwtXePt; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753300AbbKZSKm (ORCPT ); Thu, 26 Nov 2015 13:10:42 -0500 Received: from mail-lf0-f45.google.com ([209.85.215.45]:34154 "EHLO mail-lf0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752826AbbKZSIY (ORCPT ); Thu, 26 Nov 2015 13:08:24 -0500 Received: by lffu14 with SMTP id u14so105854868lff.1 for ; Thu, 26 Nov 2015 10:08:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ieKpBE27wueuQJN+uObTIHNCcfBWMjXP2kfnJ3sPIok=; b=oIwtXePt71Tb6s7s2HZRVIlFuyw9J2/I0faf2SCkmlcz35H+xBvpmSJQ3B15OEpBuW RaueT9kWqhzDnHiWqmCo7JzsrWphOB4GDPyheuqTKbOdhWeFKaYzhiQihnyVaF+5nmMx 5OVkycYGFr8m6tVJxHATSBWrI815XnBG6HTGQohS/IaPxBznJk8edb0Nv26P70gYtduQ 7H03+EpJq94Q1iwQxarrFQ2Wa9A5dRDtq2FhtoJY41tOeJLH0Dkt8vwJv11/LsTmfnp6 +5p5yCa7GST4w2GM7JjkAKhBBDuPCFkIFgx8ykDXx8XNJyD2uHLZ2DkVW83cmTo/kDPI wHOg== 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; bh=ieKpBE27wueuQJN+uObTIHNCcfBWMjXP2kfnJ3sPIok=; b=U0DGMA7mCaihOuY2dSuKN1AO9h1KPZ7VaEpmdx/g/okem/8yLbhadQK6NU31SIj93r CbzhpsEw/KAG1OeiR/ta5rwb15Dj6aQjpfwW5w9R35T50WnnxEawmz81oe0wX5He1IyT 7tFvThVF2Ht6NCJ0SzJWkk104tVtFIHb5m9Xw4lyB2vL8Gng5e6XqrjhPB/I5n9WgUXv GnhxN+c/i/DiHsxdO5HrzqpR8zXWx5fVGvPzsm8vV5zxFZ9RVpFst8h9Mt/DM/zl/lTm D0p/ws1VTBSbEOp3cNheogY/ih/KtEM/D/wsMpeumseHeHQBIZJMJ2546jZV4w1RfZzD m8/g== X-Gm-Message-State: ALoCoQlz4NmT/rmK8HWas4n0dEAweqpVN9eIIHPxrDshjngaeNZQu9mDrzXfbMK98pJgJIe2YYjT X-Received: by 10.112.92.231 with SMTP id cp7mr17406093lbb.7.1448561302935; Thu, 26 Nov 2015 10:08:22 -0800 (PST) Received: from enkidu.semihalf.local ([80.82.22.190]) by smtp.gmail.com with ESMTPSA id a190sm4297654lfa.32.2015.11.26.10.08.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Nov 2015 10:08:22 -0800 (PST) From: Marcin Wojtas To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org Cc: davem@davemloft.net, linux@arm.linux.org.uk, sebastian.hesselbarth@gmail.com, andrew@lunn.ch, jason@lakedaemon.net, thomas.petazzoni@free-electrons.com, gregory.clement@free-electrons.com, simon.guinot@sequanux.org, nadavh@marvell.com, alior@marvell.com, xswang@marvell.com, myair@marvell.com, nitroshift@yahoo.com, mw@semihalf.com, jaz@semihalf.com, tn@semihalf.com, Subject: [PATCH v2 net 1/6] net: mvneta: add configuration for MBUS windows access protection Date: Thu, 26 Nov 2015 19:08:08 +0100 Message-Id: <1448561293-16431-2-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1448561293-16431-1-git-send-email-mw@semihalf.com> References: <1448561293-16431-1-git-send-email-mw@semihalf.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This commit adds missing configuration of MBUS windows access protection in mvneta_conf_mbus_windows function - a dedicated variable for that purpose remained there unused since v3.8 initial mvneta support. Because of that the register contents were inherited from the bootloader. Signed-off-by: Marcin Wojtas Reviewed-by: Gregory CLEMENT Cc: # v3.8+ Fixes: c5aff18204da ("net: mvneta: driver for Marvell Armada 370/XP network unit") --- drivers/net/ethernet/marvell/mvneta.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index e84c7f2..c4327b9 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -62,6 +62,7 @@ #define MVNETA_WIN_SIZE(w) (0x2204 + ((w) << 3)) #define MVNETA_WIN_REMAP(w) (0x2280 + ((w) << 2)) #define MVNETA_BASE_ADDR_ENABLE 0x2290 +#define MVNETA_ACCESS_PROTECT_ENABLE 0x2294 #define MVNETA_PORT_CONFIG 0x2400 #define MVNETA_UNI_PROMISC_MODE BIT(0) #define MVNETA_DEF_RXQ(q) ((q) << 1) @@ -3188,9 +3189,11 @@ static void mvneta_conf_mbus_windows(struct mvneta_port *pp, win_enable &= ~(1 << i); win_protect |= 3 << (2 * i); + } mvreg_write(pp, MVNETA_BASE_ADDR_ENABLE, win_enable); + mvreg_write(pp, MVNETA_ACCESS_PROTECT_ENABLE, win_protect); } /* Power up the port */