Linux kernel -stable discussions
 help / color / mirror / Atom feed
From: Amit Pundir <amit.pundir@linaro.org>
To: Greg KH <gregkh@linuxfoundation.org>, Stable <stable@vger.kernel.org>
Cc: Jonas Gorski <jonas.gorski@gmail.com>,
	"David S . Miller" <davem@davemloft.net>
Subject: [PATCH for-4.9.y 5/5] bcm63xx_enet: do not write to random DMA channel on BCM6345
Date: Tue, 17 Jul 2018 13:49:18 +0530	[thread overview]
Message-ID: <1531815558-20002-6-git-send-email-amit.pundir@linaro.org> (raw)
In-Reply-To: <1531815558-20002-1-git-send-email-amit.pundir@linaro.org>

From: Jonas Gorski <jonas.gorski@gmail.com>

commit d6213c1f2ad54a964b77471690264ed685718928 upstream.

The DMA controller regs actually point to DMA channel 0, so the write to
ENETDMA_CFG_REG will actually modify a random DMA channel.

Since DMA controller registers do not exist on BCM6345, guard the write
with the usual check for dma_has_sram.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
---
Cherry-picked from lede tree https://git.lede-project.org/?p=source.git

 drivers/net/ethernet/broadcom/bcm63xx_enet.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index 3760a2be5dbc..c4078401b7de 100644
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -1063,7 +1063,8 @@ static int bcm_enet_open(struct net_device *dev)
 	val = enet_readl(priv, ENET_CTL_REG);
 	val |= ENET_CTL_ENABLE_MASK;
 	enet_writel(priv, val, ENET_CTL_REG);
-	enet_dma_writel(priv, ENETDMA_CFG_EN_MASK, ENETDMA_CFG_REG);
+	if (priv->dma_has_sram)
+		enet_dma_writel(priv, ENETDMA_CFG_EN_MASK, ENETDMA_CFG_REG);
 	enet_dmac_writel(priv, priv->dma_chan_en_mask,
 			 ENETDMAC_CHANCFG, priv->rx_chan);
 
-- 
2.7.4

      parent reply	other threads:[~2018-07-17  8:51 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-17  8:19 [PATCH for-4.9.y 0/5] Stable commits picked up from lede project Amit Pundir
2018-07-17  8:19 ` [PATCH for-4.9.y 1/5] mtd: m25p80: consider max message size in m25p80_read Amit Pundir
2018-07-17  8:19 ` [PATCH for-4.9.y 2/5] spi/bcm63xx: make spi subsystem aware of message size limits Amit Pundir
2018-07-18 10:47   ` Mark Brown
2018-07-18 10:55     ` Greg KH
2018-07-18 11:14       ` Mark Brown
2018-07-17  8:19 ` [PATCH for-4.9.y 3/5] spi/bcm63xx: fix typo in bcm63xx_spi_max_length breaking compilation Amit Pundir
2018-07-17  8:19 ` [PATCH for-4.9.y 4/5] bcm63xx_enet: correct clock usage Amit Pundir
2018-07-17  8:19 ` Amit Pundir [this message]

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=1531815558-20002-6-git-send-email-amit.pundir@linaro.org \
    --to=amit.pundir@linaro.org \
    --cc=davem@davemloft.net \
    --cc=gregkh@linuxfoundation.org \
    --cc=jonas.gorski@gmail.com \
    --cc=stable@vger.kernel.org \
    /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