From patchwork Tue Aug 29 20:35:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 807294 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="jEwOcPtK"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xhgXK37hJz9s9Y for ; Wed, 30 Aug 2017 06:41:21 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751600AbdH2UlT (ORCPT ); Tue, 29 Aug 2017 16:41:19 -0400 Received: from mail-qk0-f196.google.com ([209.85.220.196]:37593 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751249AbdH2UlQ (ORCPT ); Tue, 29 Aug 2017 16:41:16 -0400 Received: by mail-qk0-f196.google.com with SMTP id m4so3847437qke.4 for ; Tue, 29 Aug 2017 13:41:15 -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=frGKJXgovrrI1aoA6wak8X8woz3TTGrDaLqeNPaYwwQ=; b=jEwOcPtKMkJlMJx+ry+zR8JDjUl6hfF1S475Lwh37+Ps5cmh1HayhkhHN5Bg/PN1Or jhwGoAMKphgIuNXu4MqBX8exSFLy7fjVepq/oPwATTU57SXlmf3+xvQ7TUcXIQkMYIp1 UE0XktvBhxTrhvECbAL93U/oo9AFjkxiGM1c7O6TxddiZNrhTfdtThBqnTU6WpZ7DM7G jBhNhnHOqnnIaZClAt9j1MUnlWLltWtpl13IctqktrUdo1W4qhU3SyTQjExorc1mAy6F xFlFADoE+AdhGa/naCaKGZcVyl7k7JFRBhdtua22AKsrwlFNTanyB0t0LVq5C1IPZLZ/ T32Q== 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=frGKJXgovrrI1aoA6wak8X8woz3TTGrDaLqeNPaYwwQ=; b=OG8zD11abULDK8/zTHk6r5moTi9D9iZrVPLJ1ROBv/owyR7H3NwKBawsgzCIvH2VMY tMRoGSc/vDtZUo1yGmkTxBglwxGZsu9sbntUUScp+rhRt/ZXyS9g8GFNFtW6xK1qHvIW IK2CfIdu7ineZJYyEBz0Me+mM9GYWhTvPle2XwPHUGy1FhTdl7P7HKykTUhgQygvMju+ d88e5r/18AkpawgoW+452cdxT3sASYhmGge2iA8T+u6fcNadeDa422DcT/YZ5rtYx8jp 7pKRfXsXuZYPPKZNThmipIVpK+qfTWW5RnLRt1PJ5zkU0f6dJnx9SyzofuI1z7uimpmc RSDQ== X-Gm-Message-State: AHYfb5g/189n8K3UOoJosIHOwdoT4xPpVdWS6W0gTEUp1WYSzEH88yzX r8rfWlPDaTZbUo3TGqk= X-Received: by 10.233.235.69 with SMTP id b66mr7877220qkg.200.1504039275184; Tue, 29 Aug 2017 13:41:15 -0700 (PDT) Received: from stb-bld-04.irv.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id u17sm2645446qtc.43.2017.08.29.13.41.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Aug 2017 13:41:14 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: davem@davemloft.net, opendmb@gmail.com, andrew@lunn.ch, vivien.didelot@savoirfairelinux.com, Florian Fainelli Subject: [PATCH net-next v2 1/4] net: systemport: Use correct I/O accessors Date: Tue, 29 Aug 2017 13:35:15 -0700 Message-Id: <1504038918-49254-2-git-send-email-f.fainelli@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504038918-49254-1-git-send-email-f.fainelli@gmail.com> References: <1504038918-49254-1-git-send-email-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The SYSTEMPORT driver currently uses __raw_{read,write}l which means native I/O endian. This works correctly for an ARM LE kernel (default) but fails miserably on an ARM BE (BE8) kernel where registers are kept little endian, so replace uses with {read,write}l_relaxed here which is what we want because this is all performance sensitive code. Signed-off-by: Florian Fainelli --- drivers/net/ethernet/broadcom/bcmsysport.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index b3a21418f511..a7e84292af50 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -32,13 +32,13 @@ #define BCM_SYSPORT_IO_MACRO(name, offset) \ static inline u32 name##_readl(struct bcm_sysport_priv *priv, u32 off) \ { \ - u32 reg = __raw_readl(priv->base + offset + off); \ + u32 reg = readl_relaxed(priv->base + offset + off); \ return reg; \ } \ static inline void name##_writel(struct bcm_sysport_priv *priv, \ u32 val, u32 off) \ { \ - __raw_writel(val, priv->base + offset + off); \ + writel_relaxed(val, priv->base + offset + off); \ } \ BCM_SYSPORT_IO_MACRO(intrl2_0, SYS_PORT_INTRL2_0_OFFSET); @@ -59,14 +59,14 @@ static inline u32 rdma_readl(struct bcm_sysport_priv *priv, u32 off) { if (priv->is_lite && off >= RDMA_STATUS) off += 4; - return __raw_readl(priv->base + SYS_PORT_RDMA_OFFSET + off); + return readl_relaxed(priv->base + SYS_PORT_RDMA_OFFSET + off); } static inline void rdma_writel(struct bcm_sysport_priv *priv, u32 val, u32 off) { if (priv->is_lite && off >= RDMA_STATUS) off += 4; - __raw_writel(val, priv->base + SYS_PORT_RDMA_OFFSET + off); + writel_relaxed(val, priv->base + SYS_PORT_RDMA_OFFSET + off); } static inline u32 tdma_control_bit(struct bcm_sysport_priv *priv, u32 bit) @@ -110,10 +110,10 @@ static inline void dma_desc_set_addr(struct bcm_sysport_priv *priv, dma_addr_t addr) { #ifdef CONFIG_PHYS_ADDR_T_64BIT - __raw_writel(upper_32_bits(addr) & DESC_ADDR_HI_MASK, + writel_relaxed(upper_32_bits(addr) & DESC_ADDR_HI_MASK, d + DESC_ADDR_HI_STATUS_LEN); #endif - __raw_writel(lower_32_bits(addr), d + DESC_ADDR_LO); + writel_relaxed(lower_32_bits(addr), d + DESC_ADDR_LO); } static inline void tdma_port_write_desc_addr(struct bcm_sysport_priv *priv,