From patchwork Fri Nov 27 15:44:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 549510 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 06848140319 for ; Sat, 28 Nov 2015 02:46:45 +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=I5L7cBLt; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755160AbbK0Pq3 (ORCPT ); Fri, 27 Nov 2015 10:46:29 -0500 Received: from mail-lf0-f47.google.com ([209.85.215.47]:34821 "EHLO mail-lf0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754908AbbK0Pof (ORCPT ); Fri, 27 Nov 2015 10:44:35 -0500 Received: by lfdl133 with SMTP id l133so132899753lfd.2 for ; Fri, 27 Nov 2015 07:44:34 -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=bxN4XlrctLun1zOccYzX1kF25pzoxGZf/y/R7nWXePo=; b=I5L7cBLtZUfdcyR4yl2Yd4evmD0ojrYQrlBaYW/kzyiDTNjZUWc2iAEbFMmtP8Ggp+ mZpSlyF/y59O+IXa86A2TWl9EgdiIzEyYFstXMiy+tnbR9VddN8QRwgFD//H0kmhNwtn EfdgXCUHAhjKO/zAD8yWOOZ2oP1/WhRwnYmsZeMaokVROu7Atp/E0v4himLH2HY2ooNe vP/zy/Wfj+lkyha2QlysAzzM5VW8SzN9CqfxUINZs9TWM7jatPfF9hQWZaCp/2jRSGuP VLBaB4J+HZf7EZhJW+FAE5MrJ07R64G81mupt0xpfgosOBAbx8zn6BLexbbEt6HUE73s DxzA== 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=bxN4XlrctLun1zOccYzX1kF25pzoxGZf/y/R7nWXePo=; b=dhYhdVqpsNsk9ALI+DwRNF/9J3XLJj53h69Slr/YcNrzUj8qqp+8hHixfbi9eQrCrV hI1bQ/TnMp70LsMSnAdl6hFgf5yZBxGgVNimV4tafeRzVBa8bBPd/FwAEWC1lQNP0PHb c8oTY5c+ei3dEsZ5yzylU0Em84n4Go5cccRuIPXHh7HeCTkjMc2U9ZSbUn55DWluhEdD DLKiSdeY+ZFvVYcnorl6+8emoKqCUV1jYYOSM29Pvv0sRD4HFsP9/uctC1fX1/miZuji /hI4RuijyqB/nPanccfU0pp6eGdivmTI92gb5Ycly7zqW7zda7MaIPQDSNGlyaS1d7II vueg== X-Gm-Message-State: ALoCoQnOEWAC2iv5cJIWjtYxVHOE7qvMamehi+iuGZTcg2Mr4rcZjVw/ASdeyALI//iz1hULXd+q X-Received: by 10.112.136.136 with SMTP id qa8mr19848278lbb.14.1448639074153; Fri, 27 Nov 2015 07:44:34 -0800 (PST) Received: from enkidu.semihalf.local ([80.82.22.190]) by smtp.gmail.com with ESMTPSA id k189sm5096651lfd.12.2015.11.27.07.44.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Nov 2015 07:44:33 -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 v3 net 1/6] net: mvneta: add configuration for MBUS windows access protection Date: Fri, 27 Nov 2015 16:44:21 +0100 Message-Id: <1448639066-13074-2-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1448639066-13074-1-git-send-email-mw@semihalf.com> References: <1448639066-13074-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 Fixes: c5aff18204da ("net: mvneta: driver for Marvell Armada 370/XP network unit") --- drivers/net/ethernet/marvell/mvneta.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index e84c7f2..2d80256 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) @@ -3191,6 +3192,7 @@ static void mvneta_conf_mbus_windows(struct mvneta_port *pp, } mvreg_write(pp, MVNETA_BASE_ADDR_ENABLE, win_enable); + mvreg_write(pp, MVNETA_ACCESS_PROTECT_ENABLE, win_protect); } /* Power up the port */