From: Marcin Wojtas <mw@semihalf.com>
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 v4 net 1/6] net: mvneta: add configuration for MBUS windows access protection
Date: Mon, 30 Nov 2015 13:27:41 +0100 [thread overview]
Message-ID: <1448886466-31538-2-git-send-email-mw@semihalf.com> (raw)
In-Reply-To: <1448886466-31538-1-git-send-email-mw@semihalf.com>
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 <mw@semihalf.com>
Reviewed-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
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 */
--
1.8.3.1
next prev parent reply other threads:[~2015-11-30 12:29 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-30 12:27 [PATCH v4 net 0/6] Marvell Armada XP/370/38X Neta fixes Marcin Wojtas
2015-11-30 12:27 ` Marcin Wojtas [this message]
2015-11-30 12:27 ` [PATCH v4 net 2/6] net: mvneta: fix bit assignment in MVNETA_RXQ_CONFIG_REG Marcin Wojtas
2015-11-30 12:27 ` [PATCH v4 net 3/6] net: mvneta: fix bit assignment for RX packet irq enable Marcin Wojtas
2015-11-30 12:27 ` [PATCH v4 net 4/6] net: mvneta: fix error path for building skb Marcin Wojtas
2015-11-30 12:27 ` [PATCH v4 net 5/6] net: mvneta: enable setting custom TX IP checksum limit Marcin Wojtas
2015-11-30 12:27 ` [PATCH v4 net 6/6] mvebu: dts: enable IP checksum with jumbo frames for Armada 38x on Port0 Marcin Wojtas
2015-12-02 3:03 ` [PATCH v4 net 0/6] Marvell Armada XP/370/38X Neta fixes David Miller
2015-12-02 6:02 ` Marcin Wojtas
2015-12-02 8:16 ` Gregory CLEMENT
2015-12-02 20:31 ` David Miller
2015-12-03 13:43 ` Gregory CLEMENT
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1448886466-31538-2-git-send-email-mw@semihalf.com \
--to=mw@semihalf.com \
--cc=alior@marvell.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=gregory.clement@free-electrons.com \
--cc=jason@lakedaemon.net \
--cc=jaz@semihalf.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=myair@marvell.com \
--cc=nadavh@marvell.com \
--cc=netdev@vger.kernel.org \
--cc=nitroshift@yahoo.com \
--cc=sebastian.hesselbarth@gmail.com \
--cc=simon.guinot@sequanux.org \
--cc=thomas.petazzoni@free-electrons.com \
--cc=tn@semihalf.com \
--cc=xswang@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).