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: 7708381 Return-Path: X-Original-To: patchwork-linux-arm@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 20E079F2E9 for ; Thu, 26 Nov 2015 18:11:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4140C20622 for ; Thu, 26 Nov 2015 18:11:02 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 74C212061E for ; Thu, 26 Nov 2015 18:11:01 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1a20yg-0004GE-Fz; Thu, 26 Nov 2015 18:09:06 +0000 Received: from mail-lf0-x229.google.com ([2a00:1450:4010:c07::229]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a20yL-0003zH-1f for linux-arm-kernel@lists.infradead.org; Thu, 26 Nov 2015 18:08:45 +0000 Received: by lffu14 with SMTP id u14so105854867lff.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=IzFJbpJzTpwsgcM509JpABnjGVuPSBSf1vzRsbdUVRWMpnqNf0Y750NAEBYsZcf4mv 2b5lzLINYlr2ypISnaiW3PgfKqrsO8MrhHqLQNXvGF/H7toxLl3mhvk68CUAU397MAro lCQjiyTRhm6Tcf0EnXz4vTfuvOUc2IdQppUkEn+ppv/jG8ZVcekelFf7FQfXSD+zkgQU bSxbxX8CqlWaBEFtNbOyjs+OgpBQZ4XK9SXaTCwfBRd+wWN1wYs12EyU9NV0sFeSN0w6 sAUqE7h8FMywrCZE6qTt5j3Es4eYUpiGi6ByBVvLoR2vwqkJzMiRYA1/NXyTnxCGvQUc puWA== X-Gm-Message-State: ALoCoQkPY+4A0gDcqnAXFMfKjy4Jo9Chz3+QoPWaGco1Ehc4w7UWmN5bu9HbH59qXzGbdDUL4bfU 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151126_100845_272285_305D488D X-CRM114-Status: GOOD ( 11.07 ) X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thomas.petazzoni@free-electrons.com, andrew@lunn.ch, linux@arm.linux.org.uk, jason@lakedaemon.net, myair@marvell.com, jaz@semihalf.com, simon.guinot@sequanux.org, xswang@marvell.com, nadavh@marvell.com, alior@marvell.com, stable@vger.kernel.org, tn@semihalf.com, gregory.clement@free-electrons.com, nitroshift@yahoo.com, mw@semihalf.com, davem@davemloft.net, sebastian.hesselbarth@gmail.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,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 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 */