From patchwork Tue Sep 25 06:32:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 974226 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="h+CaO/KU"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42KB8k2t35z9s9G for ; Tue, 25 Sep 2018 16:33:10 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727428AbeIYMjD (ORCPT ); Tue, 25 Sep 2018 08:39:03 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:34274 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726356AbeIYMjD (ORCPT ); Tue, 25 Sep 2018 08:39:03 -0400 Received: by mail-wm1-f66.google.com with SMTP id j25-v6so11691584wmc.1 for ; Mon, 24 Sep 2018 23:33:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id; bh=6KpZH0D73KVg+wWRaacagW7K6E+8TdmEq8TYGTKnet0=; b=h+CaO/KUo70aVsnWAy/zaYf4Owv1l7e90426VmUWbaHWXbTCUYe/eyDkTmQ1NOZLC1 Qa2dJE2gW+E0Say+ZnX7LV5ioGwMlXg8tKVQc4d5TVYXRbNo8djZAsmKeOFO6Su2CAxL jnS/mqOnXNlLa/Tm4OcKG/KKYBs2LydJJnhgVpzJ9D+7z9Phe5ayjkOhg/LY8MkPYqMH 5UNjO4/Ol0AFJVkF2U5AK+rPcadY2AEZgJo2Yt+VtmHG+crjbW/D/Tq2/pHjqQ/KVR/4 2LreF6GQt/Fgz+8gi4S2EeRnspy5xQXPvdAWFdRH7lueJTQ1kEsjTWut6nnO5sGTh6si jRiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=6KpZH0D73KVg+wWRaacagW7K6E+8TdmEq8TYGTKnet0=; b=bW5b1Vi+4eOUSQJq0fuFnjPSTW1A71Pr+B0CAgffbWxwl/+JvyDN3YHgy3GuhVKpvf 83xLLcIwL4cCeKr4Wp+At9eH7yjuvV9G1WX3T27/kOatZtP9eQ+w8LSng6MvuqYxTTgx 88YH4uiX6PnUMOwoogzjATNiL0NlTaFgWHT4V1oYM7Q1FPgxC4tuygk18qbSPtEgPvfA jhA6tzhpIzLvNYGYRdyPSEo+0BKMyuBHXwubHBPeAI/4ODDm5pv9+0yMEGabIgnX+Mg5 pitUgvUHVign69epV0TSEiNEUo3oocYUZ4mHy9LwY/ocI+xiE1R5sJ+YXvsjDQ67uFgZ yzsQ== X-Gm-Message-State: ABuFfoj16qrmEVpZrqN3YdnnlZvr1PmTHANidUndVOPkQCRb7/9RDFpO cg/AU6z2nzLe9ymN/U/YKQJI4g== X-Google-Smtp-Source: ACcGV60QtBHNRu1mi19YHZBvuMNAKIcsp9DDZRzxb3PLO5GhNBiLje/BDF6O8Er6jnX58xBfRvWZYA== X-Received: by 2002:a1c:a187:: with SMTP id k129-v6mr656028wme.111.1537857181377; Mon, 24 Sep 2018 23:33:01 -0700 (PDT) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id o6-v6sm848448wmc.15.2018.09.24.23.33.00 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Mon, 24 Sep 2018 23:33:00 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, "Edgar E. Iglesias" Cc: "David S. Miller" , netdev@vger.kernel.org, Nicolas Ferre Subject: [PATCH v2] net: macb: Clean 64b dma addresses if they are not detected Date: Tue, 25 Sep 2018 08:32:50 +0200 Message-Id: <68051905ba59d7cfd74c63ef5bf0830dc2b9f6fe.1537857166.git.michal.simek@xilinx.com> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Clear ADDR64 dma bit in DMACFG register in case that HW_DMA_CAP_64B is not detected on 64bit system. The issue was observed when bootloader(u-boot) does not check macb feature at DCFG6 register (DAW64_OFFSET) and enabling 64bit dma support by default. Then macb driver is reading DMACFG register back and only adding 64bit dma configuration but not cleaning it out. Signed-off-by: Michal Simek Acked-by: Nicolas Ferre --- Changes in v2: - Clean reg at the first place - Edgar - Update commit message drivers/net/ethernet/cadence/macb_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 16e4ef7d7185..ed8a5c53467e 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -2160,6 +2160,7 @@ static void macb_configure_dma(struct macb *bp) else dmacfg &= ~GEM_BIT(TXCOEN); + dmacfg &= ~GEM_BIT(ADDR64); #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT if (bp->hw_dma_cap & HW_DMA_CAP_64B) dmacfg |= GEM_BIT(ADDR64);