From patchwork Sat Feb 15 20:08:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 1238619 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 (no SPF record) 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=cogentembedded.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=cogentembedded-com.20150623.gappssmtp.com header.i=@cogentembedded-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=rrY8u+9F; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48KhC24bM5z9sRN for ; Sun, 16 Feb 2020 07:08:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726682AbgBOUIZ (ORCPT ); Sat, 15 Feb 2020 15:08:25 -0500 Received: from mail-lf1-f67.google.com ([209.85.167.67]:40852 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726254AbgBOUIZ (ORCPT ); Sat, 15 Feb 2020 15:08:25 -0500 Received: by mail-lf1-f67.google.com with SMTP id c23so9094841lfi.7 for ; Sat, 15 Feb 2020 12:08:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=subject:from:to:references:organization:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=Y6Syhw75DrL/16mAWZKPGflpkoRvzzkNCkSXFPlmCNs=; b=rrY8u+9Frg69lzoWFdHxPGeU2h+jaAZsO+XklwtINHXTEM3fmjhMnKJ0Qi5ouo9PvL d47dvCkzy3FFZqtgKdvPcEwEbgUYSotrK6rXGtezu5NiGTCUsNS2Hcd8V/MHYAAw/kdk fahYQrxk9v2vrVawZatXj3cj+MKuRu3p3lyolusjKalW6BHAuxu44R7x33g+37Fq/t1L aYphiy6UbBDeIrSjCotARJBLQRXAnLZEWXU7GnLXCJ1rDA/t1BQ3iI/RuMSxlAEXysUi Eg9v51h0cqquuZJk2nkWcgmg0I9Mm/kUkQS/kxztxpyvNqRmY2pdQYHBQJ+AkRbmmagW 4V4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=Y6Syhw75DrL/16mAWZKPGflpkoRvzzkNCkSXFPlmCNs=; b=sJkkCIVLO0tNhYWxiRMTjCazeSoVABjAXGZuyo6R+1KXnupprE2pZ4Kw3iX5ZvkQeL 7fhBes0cKlPovor3Ud6ejucrNlMmkddfc+67JEDeFZiVZfEXZn0qOX35aq+NgWsR6giL S5UZ5HSF1j1rAUATSb55ErL9lODXZs6nsd7qtmioIviQjq41JvuLjSuBL+7NFESugFi3 TUSe2SDV9To0LspPcEa+QGc8mD0e1GGzZQm1SnmnPeBFeU61VBLsHxQ0wCfke762xhFg vgYjfK6z1h/6Ph2G8seDdtfx729PZqnFuG714OyXYnXOcVg7iLrJdfSbbKyXai7ZLtfi aRWA== X-Gm-Message-State: APjAAAUyhZHWj8UU5uOWk5ly9Wq+Ta/ufHPk/Qix9GDId/x3d+Xy0yzt Pb5d/vJPmoV34uqxtXypCZ7Rod+dwP4= X-Google-Smtp-Source: APXvYqwGKQqCwZBZ0tGmI0lv4dS9Xjx/PnxrwASG5U85v8SnuwyNWY2IXacu5lNza5eOzmz2a80fCQ== X-Received: by 2002:a19:dc1e:: with SMTP id t30mr4487922lfg.34.1581797302698; Sat, 15 Feb 2020 12:08:22 -0800 (PST) Received: from wasted.cogentembedded.com ([2a00:1fa0:49d:f851:9745:99c9:a1aa:2f9c]) by smtp.gmail.com with ESMTPSA id u16sm5506417ljo.22.2020.02.15.12.08.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Feb 2020 12:08:22 -0800 (PST) Subject: [PATCH net-next v2 1/5] sh_eth: check sh_eth_cpu_data::no_tx_cntrs when dumping registers From: Sergei Shtylyov To: "David S. Miller" , linux-renesas-soc@vger.kernel.org, netdev@vger.kernel.org References: Organization: Cogent Embedded Message-ID: <495ef7e8-43e4-9cda-b0a5-5fbec4a5668e@cogentembedded.com> Date: Sat, 15 Feb 2020 23:08:20 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-MW Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When adding the sh_eth_cpu_data::no_tx_cntrs flag I forgot to add the flag check to __sh_eth_get_regs(), causing the non-existing TX counter registers to be considered for dumping on the R7S72100 SoC (the register offset sanity check has the final say here)... Fixes: ce9134dff6d9 ("sh_eth: add sh_eth_cpu_data::no_tx_cntrs flag") Signed-off-by: Sergei Shtylyov Tested-by: Chris Brandt --- Changes in version 2: - added Chris' tag. drivers/net/ethernet/renesas/sh_eth.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) Index: net-next/drivers/net/ethernet/renesas/sh_eth.c =================================================================== --- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c +++ net-next/drivers/net/ethernet/renesas/sh_eth.c @@ -2184,10 +2184,12 @@ static size_t __sh_eth_get_regs(struct n add_reg(BCULR); add_reg(MAHR); add_reg(MALR); - add_reg(TROCR); - add_reg(CDCR); - add_reg(LCCR); - add_reg(CNDCR); + if (!cd->no_tx_cntrs) { + add_reg(TROCR); + add_reg(CDCR); + add_reg(LCCR); + add_reg(CNDCR); + } add_reg(CEFCR); add_reg(FRECR); add_reg(TSFRCR); From patchwork Sat Feb 15 20:09:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 1238620 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 (no SPF record) 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=cogentembedded.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=cogentembedded-com.20150623.gappssmtp.com header.i=@cogentembedded-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=U2q2vERZ; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48KhDQ3LLrz9sSJ for ; Sun, 16 Feb 2020 07:09:42 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727716AbgBOUJk (ORCPT ); Sat, 15 Feb 2020 15:09:40 -0500 Received: from mail-lj1-f196.google.com ([209.85.208.196]:34442 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726273AbgBOUJk (ORCPT ); Sat, 15 Feb 2020 15:09:40 -0500 Received: by mail-lj1-f196.google.com with SMTP id x7so14449159ljc.1 for ; Sat, 15 Feb 2020 12:09:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=subject:from:to:references:organization:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=qpX9ISWHkFz309IXO/pHmDobf1VYnv7TZgYLqKmvfb8=; b=U2q2vERZSDysh5V7hiSxxCh5uVVST41IFhM+4rZTGyvEJxM9Fw4/IgEOMa50LuV5Tv AujzE687myiUrd5t6LR0w3Gj6r4VkrRP/v5BgHg+0BsEb7ecWuzYNKeoPpfP0Hl2G230 AYUjjAGeGYVt7DWQvjf2WRRTnx2k88Po2cpBexrTFh9wTkorusD2sLUU996r6Fnekgl2 d4MW5YOUX/aw31Dze+dYRXTsSiGfW9gp7/0mFFWSJ3ONB1EqKu9r1hmWlT5dKnXy6sfj U3n5eYdGcN5c1v0jJ/edoMduHQ+JwOUX/Xk4bboMG9HPGrCRkFm274tvhhvsVicxJRGs nzcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=qpX9ISWHkFz309IXO/pHmDobf1VYnv7TZgYLqKmvfb8=; b=PHFGUQ9M7JJTUX25kak/Vi1mBhoKk49LgOASY1k7AQTw/wN64UzJrN35mpgpQoGsgd 92o6ZQ+4PGxT8Hr1HIPYVzUtFE8oPMmAcNpajxEsZBpkmlFwBF57bjZCSY+/DKylDrdQ KKt/9i5pMBz6QnzIrx+qATWQpOBP5/wanbrHnAEU8nqydu/HBVRbwROTs4fO8na6IP+c lTaWJhMLCkNREBF00y4GHDOcad67U2Q2ZorD0+YeiwFugUZqPSe1ivUhM4nEifALHBKh w7TmSEy8MM0d+VbH+LlQEXFQMrrHg2SfoInS6J4YTD0gcB7q6OaosHaDwWEbKBJGJ7FU OXnw== X-Gm-Message-State: APjAAAUEr2w18Z1llHnqC7+6okqt6Jty6202IZEDDwmDptxA3FLw4+zC ftZXTCwBRUMcUE3Cj/9SWpS9Q66/rtc= X-Google-Smtp-Source: APXvYqzHwkrRU13DQqLL2wXx9dr+nlAHSaCZK6QIA6osFHRgzGGN2qPs7FkyWBAIYGVHhqCgOe5JUQ== X-Received: by 2002:a2e:b4f6:: with SMTP id s22mr5250018ljm.218.1581797376582; Sat, 15 Feb 2020 12:09:36 -0800 (PST) Received: from wasted.cogentembedded.com ([2a00:1fa0:49d:f851:9745:99c9:a1aa:2f9c]) by smtp.gmail.com with ESMTPSA id v13sm4835581lfq.69.2020.02.15.12.09.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Feb 2020 12:09:36 -0800 (PST) Subject: [PATCH net-next v2 2/5] sh_eth: check sh_eth_cpu_data::cexcr when dumping registers From: Sergei Shtylyov To: "David S. Miller" , linux-renesas-soc@vger.kernel.org, netdev@vger.kernel.org References: Organization: Cogent Embedded Message-ID: <6614e21b-228b-9ad0-0f41-f3b14153b7e6@cogentembedded.com> Date: Sat, 15 Feb 2020 23:09:35 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-MW Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When adding the sh_eth_cpu_data::cexcr flag I forgot to add the flag check to __sh_eth_get_regs(), causing the non-existing RX packet counter registers to be considered for dumping on the R7S72100 SoC (the register offset sanity check has the final say here)... Fixes: 4c1d45850d5 ("sh_eth: add sh_eth_cpu_data::cexcr flag") Signed-off-by: Sergei Shtylyov Tested-by: Chris Brandt --- Changes in version 2: - added Chris' tag. drivers/net/ethernet/renesas/sh_eth.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) Index: net-next/drivers/net/ethernet/renesas/sh_eth.c =================================================================== --- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c +++ net-next/drivers/net/ethernet/renesas/sh_eth.c @@ -2194,8 +2194,10 @@ static size_t __sh_eth_get_regs(struct n add_reg(FRECR); add_reg(TSFRCR); add_reg(TLFRCR); - add_reg(CERCR); - add_reg(CEECR); + if (cd->cexcr) { + add_reg(CERCR); + add_reg(CEECR); + } add_reg(MAFCR); if (cd->rtrate) add_reg(RTRATE); From patchwork Sat Feb 15 20:10:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 1238621 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 (no SPF record) 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=cogentembedded.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=cogentembedded-com.20150623.gappssmtp.com header.i=@cogentembedded-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=zH6T2ujx; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48KhFt4cn5z9sRN for ; Sun, 16 Feb 2020 07:10:58 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727721AbgBOUK5 (ORCPT ); Sat, 15 Feb 2020 15:10:57 -0500 Received: from mail-lf1-f65.google.com ([209.85.167.65]:41350 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726273AbgBOUK4 (ORCPT ); Sat, 15 Feb 2020 15:10:56 -0500 Received: by mail-lf1-f65.google.com with SMTP id m30so9077768lfp.8 for ; Sat, 15 Feb 2020 12:10:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=subject:from:to:references:organization:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=5JzMAcehIW0t8vOej7xQ3xrVv74ciyUM2eWJe6uWF9E=; b=zH6T2ujxqo/0Zi0j0Dyr2EvPKt24cwn1mbuAh+RT0neLM2Vexcg7Rmje84LdAh7qfg yXcnN3hklG4pfaVA3xU8PeazrqMwbDVEpaqhxJQH4huoYQXyCngti2b1fvwzQq5xNmbN /ZfUlFPC0z/7wGeBiiDGjzNQ8XAfCiFf6T9EaQ99Kkb9NdSWJ2KEsopwMsZukDLv7+zO OW84t7vzyEp4SMhyUV3ZDy9H+/UTfshpVFldGHwHeVrKACwExhcnWn93mc1+tlE+k1zB vnxeKHDtTT4Eo6m1L6j5/JCjrEcWCYNqeZ6xdHftW5zKp8nZNGx1luidVtwXmG9E55TV tREg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=5JzMAcehIW0t8vOej7xQ3xrVv74ciyUM2eWJe6uWF9E=; b=Kpn/ZP2surn27L0OE+Ip5dUPW54aC26sEf7TRIyF3n94tjZv/1CFdYIR4y991tLwvw XuVA1SBn7m4TVY5VCDuoaRQaSCgfyHVxmLjtwcjkj/Q3lnY100hHHidBzDK1u07EmFef DeLPY3xLOQeh7vNyTN4/0ZR8bNvmC/h6XFklLBt3W6BgS+l6g1RWq2/pUooa5BvB8FzT UX2FiTG1l64tfnB9bBmJY8oPrvOpmuuSfDGPu1wH033sHOK/PRQqThvg0coZV2bxBSt6 qJMD+uWZLmq1y9sZ5/+JeLN1D3csTtKNemwmbCgWsyN8V3GhRM9zQqsB+RfoLAHPuUlb 4BXQ== X-Gm-Message-State: APjAAAVtJ0xielqmek24hCECVBuQXemL9nv96Iy8sZ7rNAsxa5PPJA0z HGKFao2cULkYInaes6XvfC6QYi80jNw= X-Google-Smtp-Source: APXvYqycDEfqCi1zZ721tz1gV3OlWsRLUixG71UjcIXTbfXrlqxA9ZtGSeYVCvAReEUAbjEsennV6Q== X-Received: by 2002:a19:3f16:: with SMTP id m22mr4607800lfa.116.1581797454736; Sat, 15 Feb 2020 12:10:54 -0800 (PST) Received: from wasted.cogentembedded.com ([2a00:1fa0:49d:f851:9745:99c9:a1aa:2f9c]) by smtp.gmail.com with ESMTPSA id x18sm4772988lfe.37.2020.02.15.12.10.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Feb 2020 12:10:54 -0800 (PST) Subject: [PATCH net-next v2 3/5] sh_eth: check sh_eth_cpu_data::no_xdfar when dumping registers From: Sergei Shtylyov To: "David S. Miller" , linux-renesas-soc@vger.kernel.org, netdev@vger.kernel.org References: Organization: Cogent Embedded Message-ID: Date: Sat, 15 Feb 2020 23:10:53 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-MW Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When adding the sh_eth_cpu_data::no_xdfar flag I forgot to add the flag check to __sh_eth_get_regs(), causing the non-existing RDFAR/TDFAR to be considered for dumping on the R-Car gen1/2 SoCs (the register offset check has the final say here)... Fixes: 4c1d45850d5 ("sh_eth: add sh_eth_cpu_data::cexcr flag") Signed-off-by: Sergei Shtylyov Tested-by: Chris Brandt --- Changes in version 2: - added Chris' tag. drivers/net/ethernet/renesas/sh_eth.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) Index: net-next/drivers/net/ethernet/renesas/sh_eth.c =================================================================== --- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c +++ net-next/drivers/net/ethernet/renesas/sh_eth.c @@ -2140,11 +2140,13 @@ static size_t __sh_eth_get_regs(struct n add_reg(EESR); add_reg(EESIPR); add_reg(TDLAR); - add_reg(TDFAR); + if (!cd->no_xdfar) + add_reg(TDFAR); add_reg(TDFXR); add_reg(TDFFR); add_reg(RDLAR); - add_reg(RDFAR); + if (!cd->no_xdfar) + add_reg(RDFAR); add_reg(RDFXR); add_reg(RDFFR); add_reg(TRSCER); From patchwork Sat Feb 15 20:13:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 1238623 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 (no SPF record) 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=cogentembedded.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=cogentembedded-com.20150623.gappssmtp.com header.i=@cogentembedded-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=SSuro70s; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48KhKD6Mb3z9sRN for ; Sun, 16 Feb 2020 07:13:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726539AbgBOUNv (ORCPT ); Sat, 15 Feb 2020 15:13:51 -0500 Received: from mail-lj1-f175.google.com ([209.85.208.175]:33980 "EHLO mail-lj1-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726273AbgBOUNv (ORCPT ); Sat, 15 Feb 2020 15:13:51 -0500 Received: by mail-lj1-f175.google.com with SMTP id x7so14455459ljc.1 for ; Sat, 15 Feb 2020 12:13:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=subject:from:to:references:organization:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=vA7Kqm1XaQFtm6icVqmb88lhToAgHCoQdr47+e6FfV4=; b=SSuro70st7A2cuRA/MPHKOUJ4LDptsbMO2XoyHuRqVyxr1S4uFlZgzFBPP5MPyAUO/ QR9E9h6RT4vAG9T9gz2d1597LlQn79Trhz5d2ptS5+QXsylb/+0q+bDRULGP2IdQksuM UfDZBMck5rT4boDZNThUdbPeOSQkbcD/Hh8rVdoVa7mnnUgu07SnIvO4P35XgzNtDTwr xa5uJVTtey8hva/TPsIC1kO9Y/PHIc+m76bW3Jk+7BbX7KhUgpODVTcjK/S/hR6lc9Xe 7OfmWgs/JknAH5Q+IjkuJmQqJnEdDYUc9gjnXSIERTgU2AfnyAUiQHeiEtP78oa3Co9x ZCeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=vA7Kqm1XaQFtm6icVqmb88lhToAgHCoQdr47+e6FfV4=; b=sEg6jfAULqckildQNy8JwzYZj1Y4Tt9UzrD3sp2rqXm/q1IASZ8HKu9HhkwoFYhOHW +nrxen3E5YgqDa1wMcHek2CZQmFBcK2q2ZlUrftQ87AWN+rvPKwuxOE4uuuPcLwNPcVa ByZyXXjzq2e/sg57VpNyp0SIXAhoR/fY3L2NQnATFDsDKlUXE1R0DEe1Lwe5EZqrZB63 c6fKxySpdrznIJWki3iUUAu1XqntBO74x4FKf8ru0Ng+Ag/eZdOykRMRuUqkk68sEw6v TI9vod6wgpGDEyIhHxFOJQxZwdl28AaCdloN5kEH3Qzv8SwDkB5skXIwfv8JpUgeomX0 pjMA== X-Gm-Message-State: APjAAAWWylsQRFQR3Ed38byxnu1BQUT6c73xj5Md7+K93g536gK29VZP 4z6P4ZQRG7YXoT9MEQ5kuy3cxZUNWWo= X-Google-Smtp-Source: APXvYqzP3/p9CU/3XLQIruKJMjj99oWYKV+E7Tq/JegZwOOyC8ZO2u111on29P/GCF8Vdi+0s2vljg== X-Received: by 2002:a2e:a361:: with SMTP id i1mr5477298ljn.29.1581797628404; Sat, 15 Feb 2020 12:13:48 -0800 (PST) Received: from wasted.cogentembedded.com ([2a00:1fa0:49d:f851:9745:99c9:a1aa:2f9c]) by smtp.gmail.com with ESMTPSA id m15sm5739984ljg.4.2020.02.15.12.13.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Feb 2020 12:13:47 -0800 (PST) Subject: [PATCH net-next v2 4/5] sh_eth: add sh_eth_cpu_data::gecmr flag From: Sergei Shtylyov To: "David S. Miller" , linux-renesas-soc@vger.kernel.org, netdev@vger.kernel.org References: Organization: Cogent Embedded Message-ID: <6849ccc1-12aa-c4b5-e977-93951edadbfe@cogentembedded.com> Date: Sat, 15 Feb 2020 23:13:45 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-MW Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Not all Ether controllers having the Gigabit register layout have GECMR -- RZ/A1 (AKA R7S72100) actually has the same layout but no Gigabit speed support and hence no GECMR. In the past, the new register map table was added for this SoC, now I think we should have used the existing Gigabit table with the differences (such as GECMR) covered by the mere flags in the 'struct sh_eth_cpu_data'. Add such flag for GECMR -- and then we can get rid of the R7S72100 specific layout in the next patch... Signed-off-by: Sergei Shtylyov Tested-by: Chris Brandt --- Changes in version 2: - added Chris' tag. drivers/net/ethernet/renesas/sh_eth.c | 14 +++++++++++++- drivers/net/ethernet/renesas/sh_eth.h | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) Index: net-next/drivers/net/ethernet/renesas/sh_eth.c =================================================================== --- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c +++ net-next/drivers/net/ethernet/renesas/sh_eth.c @@ -569,6 +569,9 @@ static void sh_eth_set_rate_gether(struc { struct sh_eth_private *mdp = netdev_priv(ndev); + if (WARN_ON(!mdp->cd->gecmr)) + return; + switch (mdp->speed) { case 10: /* 10BASE */ sh_eth_write(ndev, GECMR_10, GECMR); @@ -663,6 +666,7 @@ static struct sh_eth_cpu_data r8a7740_da .apr = 1, .mpr = 1, .tpauser = 1, + .gecmr = 1, .bculr = 1, .hw_swap = 1, .rpadir = 1, @@ -788,6 +792,7 @@ static struct sh_eth_cpu_data r8a77980_d .apr = 1, .mpr = 1, .tpauser = 1, + .gecmr = 1, .bculr = 1, .hw_swap = 1, .nbst = 1, @@ -957,6 +962,9 @@ static void sh_eth_set_rate_giga(struct { struct sh_eth_private *mdp = netdev_priv(ndev); + if (WARN_ON(!mdp->cd->gecmr)) + return; + switch (mdp->speed) { case 10: /* 10BASE */ sh_eth_write(ndev, 0x00000000, GECMR); @@ -1002,6 +1010,7 @@ static struct sh_eth_cpu_data sh7757_dat .apr = 1, .mpr = 1, .tpauser = 1, + .gecmr = 1, .bculr = 1, .hw_swap = 1, .rpadir = 1, @@ -1042,6 +1051,7 @@ static struct sh_eth_cpu_data sh7734_dat .apr = 1, .mpr = 1, .tpauser = 1, + .gecmr = 1, .bculr = 1, .hw_swap = 1, .no_trimd = 1, @@ -1083,6 +1093,7 @@ static struct sh_eth_cpu_data sh7763_dat .apr = 1, .mpr = 1, .tpauser = 1, + .gecmr = 1, .bculr = 1, .hw_swap = 1, .no_trimd = 1, @@ -2181,7 +2192,8 @@ static size_t __sh_eth_get_regs(struct n if (cd->tpauser) add_reg(TPAUSER); add_reg(TPAUSECR); - add_reg(GECMR); + if (cd->gecmr) + add_reg(GECMR); if (cd->bculr) add_reg(BCULR); add_reg(MAHR); Index: net-next/drivers/net/ethernet/renesas/sh_eth.h =================================================================== --- net-next.orig/drivers/net/ethernet/renesas/sh_eth.h +++ net-next/drivers/net/ethernet/renesas/sh_eth.h @@ -490,6 +490,7 @@ struct sh_eth_cpu_data { unsigned apr:1; /* EtherC has APR */ unsigned mpr:1; /* EtherC has MPR */ unsigned tpauser:1; /* EtherC has TPAUSER */ + unsigned gecmr:1; /* EtherC has GECMR */ unsigned bculr:1; /* EtherC has BCULR */ unsigned tsu:1; /* EtherC has TSU */ unsigned hw_swap:1; /* E-DMAC has DE bit in EDMR */ From patchwork Sat Feb 15 20:14:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 1238624 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 (no SPF record) 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=cogentembedded.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=cogentembedded-com.20150623.gappssmtp.com header.i=@cogentembedded-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=RVaKWp+L; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48KhLL1DYxz9sRN for ; Sun, 16 Feb 2020 07:14:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726640AbgBOUOt (ORCPT ); Sat, 15 Feb 2020 15:14:49 -0500 Received: from mail-lf1-f65.google.com ([209.85.167.65]:44493 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726273AbgBOUOs (ORCPT ); Sat, 15 Feb 2020 15:14:48 -0500 Received: by mail-lf1-f65.google.com with SMTP id v201so9064281lfa.11 for ; Sat, 15 Feb 2020 12:14:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=subject:from:to:references:organization:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=RZU6b7gfrdt8OMDzxwYR5gKBxMlnTMfF9BrDkIci5yM=; b=RVaKWp+LU+qpcfltSEhHsKI9/eTvCt5UCyHqOiXnbSZQpuMAJsMQ3U3FVqbrClTzJr FKo1qPtMJ1EMXK8iR6nBHPRc/Vo1QbciKZv4M45N0CwJxDNPZOIYZl02p+CTBE4L58Fl ugARdLQe2en+IJTaVrXgHD+82Jgai8GraEYzbxm28Mg6Fr/JVg3/jVJ9A3iFAapIEBBq I9fOL9Dp8h54UfPa+7LYaWEWKLmC0ud6+pz8WStDIJ8X9wKFPewl6asfbaHk6Nt74cgH 5x+Be+LFLGUGxdjMs14aNWxF1/obnk7gzSpy749pZRxt3n6hK5DUa4nn1P6CVHXkBzR1 j15A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=RZU6b7gfrdt8OMDzxwYR5gKBxMlnTMfF9BrDkIci5yM=; b=iVtC5muJ/3uh+iElXFAWS1uefhk+QYNsCUXJWDq8cCXKUcNeU1qkuZUT+H4+6refQX LrdwG267RCqRW5pvMcMLmhSgdlGhI1MugpO4FnHXYuRyYCnq1ja0cEe/s+kuDB6NXoDL xOwwYXzK9ApkTkpAMkHIi2nxVD/odsPfevjdWwWOxnUn77Sa10kFj5+/Il0hH8+XMy3K 6i6Z7DYZcccAfvWulnWO3be5oK+DE/EUzj/LArNo0vt0snVPNSvLTKJLkZAkFAR5I/NO AEya9YQhNEx+f6VN/EORfOPIBjSBl8zg7V5PubvqTR/ltp27hWr+14Bf7G700qFCgjMG 7K/g== X-Gm-Message-State: APjAAAXXBilpeWVpOHxqRiZGrez3Y6qCOdMs2ZNaGDem/wvg0tW/Wl+w xsDTW1XBtAj0bBa8CKIWoABLoryt/w4= X-Google-Smtp-Source: APXvYqxKz7uDP1jZVW+aCMfYLd2lSMKQIlGEYiJGn9p9fPPyvo1OY2AcrBCF5LXLAybcS6hDMrGfyQ== X-Received: by 2002:a19:5212:: with SMTP id m18mr4643662lfb.7.1581797686556; Sat, 15 Feb 2020 12:14:46 -0800 (PST) Received: from wasted.cogentembedded.com ([2a00:1fa0:49d:f851:9745:99c9:a1aa:2f9c]) by smtp.gmail.com with ESMTPSA id r26sm4748818lfm.82.2020.02.15.12.14.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Feb 2020 12:14:46 -0800 (PST) Subject: [PATCH net-next v2 5/5] sh_eth: use Gigabit register map for R7S72100 From: Sergei Shtylyov To: "David S. Miller" , linux-renesas-soc@vger.kernel.org, netdev@vger.kernel.org References: Organization: Cogent Embedded Message-ID: Date: Sat, 15 Feb 2020 23:14:44 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-MW Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The register maps for the Gigabit controllers and the Ether one used on RZ/A1 (AKA R7S72100) are identical except for GECMR which is only present on the true GEther controllers. We no longer use the register map arrays to determine if a given register exists, and have added the GECMR flag to the 'struct sh_eth_cpu_data' in the previous patch, so we're ready to drop the R7S72100 specific register map -- this saves 216 bytes of object code (ARM gcc 4.8.5). Signed-off-by: Sergei Shtylyov Tested-by: Chris Brandt --- Changes in version 2: - fixed the arch name in the description; - added Chris' tag. drivers/net/ethernet/renesas/sh_eth.c | 68 ---------------------------------- drivers/net/ethernet/renesas/sh_eth.h | 1 2 files changed, 1 insertion(+), 68 deletions(-) Index: net-next/drivers/net/ethernet/renesas/sh_eth.c =================================================================== --- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c +++ net-next/drivers/net/ethernet/renesas/sh_eth.c @@ -142,69 +142,6 @@ static const u16 sh_eth_offset_gigabit[S [FWALCR1] = 0x00b4, }; -static const u16 sh_eth_offset_fast_rz[SH_ETH_MAX_REGISTER_OFFSET] = { - SH_ETH_OFFSET_DEFAULTS, - - [EDSR] = 0x0000, - [EDMR] = 0x0400, - [EDTRR] = 0x0408, - [EDRRR] = 0x0410, - [EESR] = 0x0428, - [EESIPR] = 0x0430, - [TDLAR] = 0x0010, - [TDFAR] = 0x0014, - [TDFXR] = 0x0018, - [TDFFR] = 0x001c, - [RDLAR] = 0x0030, - [RDFAR] = 0x0034, - [RDFXR] = 0x0038, - [RDFFR] = 0x003c, - [TRSCER] = 0x0438, - [RMFCR] = 0x0440, - [TFTR] = 0x0448, - [FDR] = 0x0450, - [RMCR] = 0x0458, - [RPADIR] = 0x0460, - [FCFTR] = 0x0468, - [CSMR] = 0x04E4, - - [ECMR] = 0x0500, - [RFLR] = 0x0508, - [ECSR] = 0x0510, - [ECSIPR] = 0x0518, - [PIR] = 0x0520, - [APR] = 0x0554, - [MPR] = 0x0558, - [PFTCR] = 0x055c, - [PFRCR] = 0x0560, - [TPAUSER] = 0x0564, - [MAHR] = 0x05c0, - [MALR] = 0x05c8, - [CEFCR] = 0x0740, - [FRECR] = 0x0748, - [TSFRCR] = 0x0750, - [TLFRCR] = 0x0758, - [RFCR] = 0x0760, - [MAFCR] = 0x0778, - - [ARSTR] = 0x0000, - [TSU_CTRST] = 0x0004, - [TSU_FWSLC] = 0x0038, - [TSU_VTAG0] = 0x0058, - [TSU_ADSBSY] = 0x0060, - [TSU_TEN] = 0x0064, - [TSU_POST1] = 0x0070, - [TSU_POST2] = 0x0074, - [TSU_POST3] = 0x0078, - [TSU_POST4] = 0x007c, - [TSU_ADRH0] = 0x0100, - - [TXNLCR0] = 0x0080, - [TXALCR0] = 0x0084, - [RXNLCR0] = 0x0088, - [RXALCR0] = 0x008C, -}; - static const u16 sh_eth_offset_fast_rcar[SH_ETH_MAX_REGISTER_OFFSET] = { SH_ETH_OFFSET_DEFAULTS, @@ -593,7 +530,7 @@ static struct sh_eth_cpu_data r7s72100_d .chip_reset = sh_eth_chip_reset, .set_duplex = sh_eth_set_duplex, - .register_type = SH_ETH_REG_FAST_RZ, + .register_type = SH_ETH_REG_GIGABIT, .edtrr_trns = EDTRR_TRNS_GETHER, .ecsr_value = ECSR_ICD, @@ -3139,9 +3076,6 @@ static const u16 *sh_eth_get_register_of case SH_ETH_REG_GIGABIT: reg_offset = sh_eth_offset_gigabit; break; - case SH_ETH_REG_FAST_RZ: - reg_offset = sh_eth_offset_fast_rz; - break; case SH_ETH_REG_FAST_RCAR: reg_offset = sh_eth_offset_fast_rcar; break; Index: net-next/drivers/net/ethernet/renesas/sh_eth.h =================================================================== --- net-next.orig/drivers/net/ethernet/renesas/sh_eth.h +++ net-next/drivers/net/ethernet/renesas/sh_eth.h @@ -145,7 +145,6 @@ enum { enum { SH_ETH_REG_GIGABIT, - SH_ETH_REG_FAST_RZ, SH_ETH_REG_FAST_RCAR, SH_ETH_REG_FAST_SH4, SH_ETH_REG_FAST_SH3_SH2