From patchwork Tue Dec 8 13:52:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 553904 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 03371140518 for ; Wed, 9 Dec 2015 00:53:37 +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=jai/Dpxo; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964895AbbLHNxS (ORCPT ); Tue, 8 Dec 2015 08:53:18 -0500 Received: from mail-wm0-f47.google.com ([74.125.82.47]:33092 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756523AbbLHNwS (ORCPT ); Tue, 8 Dec 2015 08:52:18 -0500 Received: by wmec201 with SMTP id c201so213329275wme.0 for ; Tue, 08 Dec 2015 05:52:17 -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=ZlfPLSkc/iYDX45asr4BWKjNoMrNuNPLpxL+CQ8CAXM=; b=jai/DpxoDmJdnb8Y/vuj25vZXOA43g+ylHxKAPXfKOsg3Vd460RAgMh3TZL+u5NajS +APbh6vOZjM+yKAveAudsdnwj1qozjHUqypqHN/ygiWylSidFgys4RmL9FTBlE/4cyiU kZ+I7PI3UMPRPAsCFA1wCODBQZ6Vot43UwvkExrGOf2VlvmiqUOUhinuyH+Pdtyy0zpw E1l9bFGPdsOgdpCcUBXxlb+zKHC8K0R+8+Dt29PHua2k1x1jtqucqo1OfHi+oSXwBpH3 315Er7pitOiGPV5qaVwAeb2lZRcI2W4aTXJC77mstaJYcuuZ5soDAxq7wGtKoJKKoCd0 1LPw== 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=ZlfPLSkc/iYDX45asr4BWKjNoMrNuNPLpxL+CQ8CAXM=; b=I2NJxwlpOPGEDFYsw3KnGN8odemJoRbEqVQrIhczfo/mo3+7Xdbcyjnt/8H2G2rvEZ HRFkbCS7uKDxQLka+ojv+7o/V37NRwqHxooP/5oVGma6re/LC8uVM0daNXtAbfzD0AwO YBvBnf0COPWpZYIvqbLApvjcSy8sT9UM6FKjCU5q6IIrKDhRVfbNONuMhDjpFhWn1yd3 tOqA9QT4IdsvEeVhoUk5VFQq+Zafgm3CkzG2kqmxzS3KF0vYx5Q4jSN94T+7bz7tgyWn 4y8C8u5C1Q7KVOR7qkg5Vul5YxfG/lLt8mQLsIgcTbcQl4sg0JJGxi+SyokxF4FkRjvd yooA== X-Gm-Message-State: ALoCoQmRiOoPa9pcvTBempFHdjyePrKieWzpQQL0BjrIWfH9PJ6I/aQ6mPzo/sRPez70kMBTMlYsarmjDB4Zuqb8Inje+jwTCA== X-Received: by 10.194.178.202 with SMTP id da10mr3845661wjc.158.1449582737668; Tue, 08 Dec 2015 05:52:17 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id 193sm21563410wmp.16.2015.12.08.05.52.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Dec 2015 05:52:16 -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, devicetree@vger.kernel.org, joshc@ni.com Cc: Neil Armstrong Subject: [PATCH v2 net-next 1/3] net: ethernet: cadence-macb: Add disabled usrio caps Date: Tue, 8 Dec 2015 14:52:04 +0100 Message-Id: <1449582726-6148-2-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1449582726-6148-1-git-send-email-narmstrong@baylibre.com> References: <1449485914-12883-1-git-send-email-narmstrong@baylibre.com> <1449582726-6148-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 169059c..9325140 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -2122,7 +2122,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); } @@ -2401,19 +2402,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 d83b0db..65ea049 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