From patchwork Sun Oct 1 11:02:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 820260 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jDmg8GP8"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y4j7Q6hlkz9t2V for ; Sun, 1 Oct 2017 22:02:42 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751339AbdJALCl (ORCPT ); Sun, 1 Oct 2017 07:02:41 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:36723 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750983AbdJALCO (ORCPT ); Sun, 1 Oct 2017 07:02:14 -0400 Received: by mail-wm0-f66.google.com with SMTP id 63so678488wmn.3 for ; Sun, 01 Oct 2017 04:02:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fMtTGZPtLfZvaGIYRlnEi9ltVaVqCjAut5cDcthBemM=; b=jDmg8GP8Tu1gElgIphNSz0uCeBBqE/UUmS/8nkzbjSV+DSXaXIGTlnuBS2p5T+cPmC kSIWv2XOzzBt4RJ7ALtZ1iTCxDouer1h48jN8a9/ogE/hyiRdQr1ysa4fCrQKaWORNoa LQ2FVc00lyDDVmjBEFY7IMQaHkbv+X2OGjaBOcG+aUU7STa8HfL52Lc+q0JG8jrWznfP 8225uv9AhDiTQUO3CRNCwuQedhpjEaqiIsuIA5qX8tqhv2lZzt1J/mn/vsm/0/C1hhqg OafsEOviH29jYtjx6/6DNJroGaUpVqnkk7fGkgnED8M3Bv7Kh2JlXp6f6m3RqYtMLBwK 3vRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fMtTGZPtLfZvaGIYRlnEi9ltVaVqCjAut5cDcthBemM=; b=iDVohJhTBQCTC00ExHS9cr2LrowPFbsFKbnd7Fq7QNmFb9uSt5n0OmlIfHb4OeR330 dq19Bgu+3+mAQMv4z45VefbC5QQlT92YsEXuFPO1nJUyCHKMWwatyFxjEM7W93yH94Nv azfwWRmta5zEUHS4et2YeEdF+PGX7ny+KLJX6MEz0TnCq2YdgXevanOQUTM52fLoO1CZ CQBvPn/p6cEfImKIVxNdQeUEBm8tk9g/csZK4dv6uoHF7pZfuwLM+M79d4VUy9cWrfKj Zs2JneIF7IqN08qM6yZD3bDghJnV+slGY927zMXBukJnwxxydaxmmsD+2PiZt3rbN//m WARg== X-Gm-Message-State: AHPjjUgyiyMfGb6+qbpxpwBl1CWH2+IJqc2Z0M1txMLoJA81kcaLWrIG +ZkMnesEYnFcoWCHvmm1E4cJfw== X-Google-Smtp-Source: AOwi7QAIctEB0fWGWUk3Cc6xi5NElqsrsZz9h0u73gjf5uBegOcx7cqAjEe23ZJ3AgU4O5Zz7p1pDw== X-Received: by 10.80.165.23 with SMTP id y23mr16569732edb.155.1506855733260; Sun, 01 Oct 2017 04:02:13 -0700 (PDT) Received: from localhost.localdomain ([2001:470:9e39::48e]) by smtp.gmail.com with ESMTPSA id 26sm7404270eds.5.2017.10.01.04.02.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Oct 2017 04:02:12 -0700 (PDT) From: Jonas Gorski To: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.or Cc: "David S. Miller" , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com Subject: [PATCH 2/6] bcm63xx_enet: do not write to random DMA channel on BCM6345 Date: Sun, 1 Oct 2017 13:02:16 +0200 Message-Id: <20171001110220.27668-3-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20171001110220.27668-1-jonas.gorski@gmail.com> References: <20171001110220.27668-1-jonas.gorski@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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 a45ec97b5b1e..a1e1e12e187a 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c @@ -1062,7 +1062,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);