From patchwork Mon Jan 4 09:42:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 562291 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 A47311402EC for ; Mon, 4 Jan 2016 20:43:53 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b=o4GSKPAK; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753354AbcADJnM (ORCPT ); Mon, 4 Jan 2016 04:43:12 -0500 Received: from mail-wm0-f54.google.com ([74.125.82.54]:37912 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753314AbcADJnI (ORCPT ); Mon, 4 Jan 2016 04:43:08 -0500 Received: by mail-wm0-f54.google.com with SMTP id b14so175847470wmb.1 for ; Mon, 04 Jan 2016 01:43:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qBJVpIFgKkqFB3AZ0Zk3HjUdC2KduiQJJemgz9A0uPU=; b=o4GSKPAK31IoPtLs3xHLBgK28Faum0qBO+R2dmWPXPPFOPNmMSI0DTl++5GmMEKStj zw0L4oFSJjIedsS5pPEijGVf59P9M5HmlHVKLhExnwG3nimEN2nSrbln1n32Gnb+2Wit x0jcCqm8JNsbhNziqhIpfxuw/PQEHfL7EArA9KBTM6Rv9k69xra2Mb763eubLCPhIFew GbZVpYjsFMlApHYZerDRJTn1b5SrD67L99klvHid8uD6sL9tSU/Q6ZGKSlPqndD5WLhm Vs/OQvldseu/D0ySJ1uKrj+Go7KO8kYqHwW41+RkNwspHgDNVw5XzbXSd3rCIOTl1q1C C4ag== 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=qBJVpIFgKkqFB3AZ0Zk3HjUdC2KduiQJJemgz9A0uPU=; b=loEjVGilVbd/lwV2MkThFhuCt7YHumVCShp7J61OGjzzboQHXHmn4gyozPoWo3mYVE 2WSNkKCP3WjibIjOWYjpgaRNFAf3Ufo29XqizQ2a8MOn1TNDue5aw9bCGvmJ0YGVSkRl rp5jCWMi8d7zdj0zbfHvm5ARAxIJ+qektF4ufTCKNiPjxfsKZo9mQwgHktnJXYl6ddEk DawOo8Xnh3EOVI5F+SkG7tUgWz+zXpCLlI/Zba9PV98pIRSTz+c7luTrt2KR9CiP4CDl 5N3xO2SjQrYc3l280t64msFAkPQ3nqWtV+bMe8LgJrb1jLa2CgWzKUjH4uB86ymaFNYH miPg== X-Gm-Message-State: ALoCoQm+oFgwT130XEpdQME7nM7bhMA47ID3VjaiCvUTjNs5TsAIVWm42ZDBbhYl4iQmATu89T3XaOrNmdawTNmDk4tOoLx2+g== X-Received: by 10.28.54.78 with SMTP id d75mr46353795wma.6.1451900586972; Mon, 04 Jan 2016 01:43:06 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id x10sm50819626wjx.8.2016.01.04.01.43.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Jan 2016 01:43:06 -0800 (PST) From: Neil Armstrong To: nicolas.ferre@atmel.com, davem@davemloft.net, harini.katakam@xilinx.com, boris.brezillon@free-electrons.com, alexandre.belloni@free-electrons.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, joshc@ni.com, devicetree@vger.kernel.org Cc: Neil Armstrong Subject: [PATCH v4 net-next 1/3] net: ethernet: cadence-macb: Add disabled usrio caps Date: Mon, 4 Jan 2016 10:42:51 +0100 Message-Id: <1451900573-22657-2-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1451900573-22657-1-git-send-email-narmstrong@baylibre.com> References: <1451898103-21868-1-git-send-email-narmstrong@baylibre.com> <1451900573-22657-1-git-send-email-narmstrong@baylibre.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On some platforms, the macb integration does not use the USRIO register to configure the (R)MII port and clocks. When the register is not implemented and the MACB error signal is connected to the bus error, reading or writing to the USRIO register can trigger some Imprecise External Aborts on ARM platforms. Signed-off-by: Neil Armstrong --- drivers/net/ethernet/cadence/macb.c | 27 +++++++++++++++------------ drivers/net/ethernet/cadence/macb.h | 1 + 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index 8b45bc9..fa53bc3 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -2124,7 +2124,8 @@ static void macb_get_regs(struct net_device *dev, struct ethtool_regs *regs, regs_buff[10] = macb_tx_dma(&bp->queues[0], tail); regs_buff[11] = macb_tx_dma(&bp->queues[0], head); - regs_buff[12] = macb_or_gem_readl(bp, USRIO); + if (!(bp->caps & MACB_CAPS_USRIO_DISABLED)) + regs_buff[12] = macb_or_gem_readl(bp, USRIO); if (macb_is_gem(bp)) { regs_buff[13] = gem_readl(bp, DMACFG); } @@ -2403,19 +2404,21 @@ static int macb_init(struct platform_device *pdev) dev->hw_features &= ~NETIF_F_SG; dev->features = dev->hw_features; - val = 0; - if (bp->phy_interface == PHY_INTERFACE_MODE_RGMII) - val = GEM_BIT(RGMII); - else if (bp->phy_interface == PHY_INTERFACE_MODE_RMII && - (bp->caps & MACB_CAPS_USRIO_DEFAULT_IS_MII)) - val = MACB_BIT(RMII); - else if (!(bp->caps & MACB_CAPS_USRIO_DEFAULT_IS_MII)) - val = MACB_BIT(MII); + if (!(bp->caps & MACB_CAPS_USRIO_DISABLED)) { + val = 0; + if (bp->phy_interface == PHY_INTERFACE_MODE_RGMII) + val = GEM_BIT(RGMII); + else if (bp->phy_interface == PHY_INTERFACE_MODE_RMII && + (bp->caps & MACB_CAPS_USRIO_DEFAULT_IS_MII)) + val = MACB_BIT(RMII); + else if (!(bp->caps & MACB_CAPS_USRIO_DEFAULT_IS_MII)) + val = MACB_BIT(MII); - if (bp->caps & MACB_CAPS_USRIO_HAS_CLKEN) - val |= MACB_BIT(CLKEN); + if (bp->caps & MACB_CAPS_USRIO_HAS_CLKEN) + val |= MACB_BIT(CLKEN); - macb_or_gem_writel(bp, USRIO, val); + macb_or_gem_writel(bp, USRIO, val); + } /* Set MII management clock divider */ val = macb_mdc_clk_div(bp); diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h index 5c03e81..0d4ecfc 100644 --- a/drivers/net/ethernet/cadence/macb.h +++ b/drivers/net/ethernet/cadence/macb.h @@ -400,6 +400,7 @@ #define MACB_CAPS_USRIO_HAS_CLKEN 0x00000002 #define MACB_CAPS_USRIO_DEFAULT_IS_MII 0x00000004 #define MACB_CAPS_NO_GIGABIT_HALF 0x00000008 +#define MACB_CAPS_USRIO_DISABLED 0x00000010 #define MACB_CAPS_FIFO_MODE 0x10000000 #define MACB_CAPS_GIGABIT_MODE_AVAILABLE 0x20000000 #define MACB_CAPS_SG_DISABLED 0x40000000