From patchwork Mon Jan 4 09:01:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 562280 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 AB52F1402EC for ; Mon, 4 Jan 2016 20:02:26 +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=gRYdehu0; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753145AbcADJCG (ORCPT ); Mon, 4 Jan 2016 04:02:06 -0500 Received: from mail-wm0-f46.google.com ([74.125.82.46]:38830 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751340AbcADJCE (ORCPT ); Mon, 4 Jan 2016 04:02:04 -0500 Received: by mail-wm0-f46.google.com with SMTP id b14so174278821wmb.1 for ; Mon, 04 Jan 2016 01:02:03 -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=3PnYnXrvgsboCm4rnK6Y523JmHmLpw1sF0nKbJIv99I=; b=gRYdehu0xF7Ev2DpgFqG/6mFPp02NWpuVBFX80P4Rm9G1I72mvImwsJ1a7moXf4T73 tl5ELHnhlTKUDS/eQDIFpCsh3wvLiPd0He1jQbXNzY1fZrGc+FLpNsLcsJ/dB7f2sxAc W3/fmeOe6vtpjTm7Kf0/FgvXKS1ZxXoIta2HXYVZFnUDykDAAkSGQVLL+3zscJv43WGA mwFZGciavbhBcVDFdZ3HkTG0GtIsYE9zSeHAXqETTr7WyM8n1E7gWs6Yadtihi01hoyF AOkbJQl0/6zsqVmFKdenE2/sOEjCNFymgVZ1WyJnISSaaopEwa6ephCHDrvSTu3do+16 4Now== 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=3PnYnXrvgsboCm4rnK6Y523JmHmLpw1sF0nKbJIv99I=; b=YaI0or0+Oql7JTDncxb8WOukdKLilBiTggEiWg/Q7n7AO44Pp7bPmEKLgtvBUWVq49 ITP0iI8+qgLuZ0mHCUsEY6bM0VySUYd9kdBa4ee/8NBDxXUU3nTHG46VMGEpV9pka/Nd xba4EUPrHKd864libc403xKaxeuj5T4k5MFgPoksKzgG6cf6o8rm2dNSWdk291/hFR3q lcOIGbUCI3tozVqioHXOIf/8LKNHQMFpnAXyyI/FATMJt/4TuBTYjR7RknJWUYXZJzCe NYJ87QyTapFLXD5yKi46qoFIDZGQkP/7JnzpdQpxWO60c/fXe4XrHAWTX94LBHDleD3e weCg== X-Gm-Message-State: ALoCoQlJ9FLqufwdH1e7r9LUu8h7XKoF3SiZrPPHR74kxnoT6/XV/EgeUCYvqCX7esRO4ZKAfH1mDxO17FAIPmZU99L8O+LoUQ== X-Received: by 10.28.47.11 with SMTP id v11mr88112243wmv.27.1451898122567; Mon, 04 Jan 2016 01:02:02 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id av8sm10255551wjc.13.2016.01.04.01.02.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Jan 2016 01:02:01 -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 Cc: Neil Armstrong Subject: [PATCH v3 net-next] net: ethernet: cadence-macb: Add disabled usrio caps Date: Mon, 4 Jan 2016 10:01:43 +0100 Message-Id: <1451898103-21868-1-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: <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(-) Nicolas, I post only the first patch of the previous set posted here : http://lkml.kernel.org/r/1449582726-6148-1-git-send-email-narmstrong@baylibre.com to hopefully make it into the 4.5 merge time, I'll post the vendor prefix once this patch will hit mainline. Regards, Neil 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