From patchwork Mon Jul 23 18:14:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 10540721 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B0136184F for ; Mon, 23 Jul 2018 18:14:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D1D427B2F for ; Mon, 23 Jul 2018 18:14:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 90EFA280CF; Mon, 23 Jul 2018 18:14:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7FD7B27CEE for ; Mon, 23 Jul 2018 18:14:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387873AbeGWTRH (ORCPT ); Mon, 23 Jul 2018 15:17:07 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:46240 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388279AbeGWTRH (ORCPT ); Mon, 23 Jul 2018 15:17:07 -0400 Received: by mail-lj1-f193.google.com with SMTP id 203-v6so1319422ljj.13 for ; Mon, 23 Jul 2018 11:14:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=subject:from:to:cc:references:organization:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=hY0T6x6MI7R+yeTEPrztF4rOloLC9FvaR09oqcyDPUU=; b=l2LIqp+QcHvpoLiqSVsBA48AjbC9BFG5TESyOwKzbAzQO8cUbpzK/OctD9A9f2AcqP nKfc5vX62vwluxeGulF3xuDUO6mw3AXJqIeEBhk2JCBGDgtQ3ohsTn/jOfK86FJSIzat NTXEldS1HcLR+UNMu0jGCk3LeTMolXLKeG4nSyJnOEM3sjz2eZrgTZC5i6nuqxijnhlj UwDm3gZCLwdYDyuhQ6QBrQvO4YbDDH1emLtHhSGwm9w/EIIedHeyWmaBQDTqWjRHRSFX nHWa6Z9aWp7gfm8msT2R5hiH9+ge0vlUL9eqt9VOOx5MtAuOEH3MFvqrwxDcXEG+zrLq gsYA== 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:cc:references:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=hY0T6x6MI7R+yeTEPrztF4rOloLC9FvaR09oqcyDPUU=; b=WmFXRkaRlGFemUgS9eMgChcCFK1Ts9NuloTaymC3HM7hfya7N5CPDGiBmdrCVVBfC6 Co0ODbN4EbMA22hSXHA2CKaQhJymC2C5QllVGOUfjUhkKmfhekYmwT1V8hdeix/HjYRe DZ4qzz6OCb87dDC89sON2qpUzE5J5h3v+VjiLh7q2WVVGcVQOJrnOFYNZ1SrLOKIo+Py nVewxMyimoFte76jAAuhC0Lv7J0QQ/4SeLdKkR9GvZ+w5SgxFoPKwB3elmzekEUUhtN8 LAUFTipqYGWsvxvCh9xL2Of/VCzAxx4uR3cxlUrz3BsQRlGvHskdi06/D03A/Bo5HXID JVOQ== X-Gm-Message-State: AOUpUlEOZf5TNJ+j9ACHfDtzFTTiymWaMYZU8ulG8sSjfucO6p+OqPse ml/zjzv3/FdWhE2S5C6/fjMKZqeDylU= X-Google-Smtp-Source: AAOMgpczYQa8RF9tq7xrmwoHqHPnkzq9YIAc9NPRFYX5cU+YGSjUo0v5inr5kWxYIJev4IbG1WDmBw== X-Received: by 2002:a2e:7c12:: with SMTP id x18-v6mr9385729ljc.71.1532369680337; Mon, 23 Jul 2018 11:14:40 -0700 (PDT) Received: from wasted.cogentembedded.com ([31.173.85.93]) by smtp.gmail.com with ESMTPSA id i75-v6sm1506415lfh.29.2018.07.23.11.14.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jul 2018 11:14:39 -0700 (PDT) Subject: [PATCH 4/5] sh_eth: make sh_eth_tsu_write_entry() take 'offset' parameter From: Sergei Shtylyov To: netdev@vger.kernel.org, "David S. Miller" Cc: linux-renesas-soc@vger.kernel.org References: <24093fd0-1b9b-a211-f988-0272483185d6@cogentembedded.com> Organization: Cogent Embedded Message-ID: <1b60d8c8-e06f-6bff-df06-9b1cbe953340@cogentembedded.com> Date: Mon, 23 Jul 2018 21:14:38 +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: <24093fd0-1b9b-a211-f988-0272483185d6@cogentembedded.com> Content-Language: en-MW Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We can add the TSU register base address to a TSU register offset right in sh_eth_tsu_write_entry(), no need to do it in its callers... Signed-off-by: Sergei Shtylyov Reviewed-by: Geert Uytterhoeven --- drivers/net/ethernet/renesas/sh_eth.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 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 @@ -2676,18 +2676,19 @@ static int sh_eth_tsu_busy(struct net_de return 0; } -static int sh_eth_tsu_write_entry(struct net_device *ndev, void *reg, +static int sh_eth_tsu_write_entry(struct net_device *ndev, u16 offset, const u8 *addr) { + struct sh_eth_private *mdp = netdev_priv(ndev); u32 val; val = addr[0] << 24 | addr[1] << 16 | addr[2] << 8 | addr[3]; - iowrite32(val, reg); + iowrite32(val, mdp->tsu_addr + offset); if (sh_eth_tsu_busy(ndev) < 0) return -EBUSY; val = addr[4] << 8 | addr[5]; - iowrite32(val, reg + 4); + iowrite32(val, mdp->tsu_addr + offset + 4); if (sh_eth_tsu_busy(ndev) < 0) return -EBUSY; @@ -2747,9 +2748,7 @@ static int sh_eth_tsu_disable_cam_entry_ ~(1 << (31 - entry)), TSU_TEN); memset(blank, 0, sizeof(blank)); - ret = sh_eth_tsu_write_entry(ndev, - mdp->tsu_addr + reg_offset + entry * 8, - blank); + ret = sh_eth_tsu_write_entry(ndev, reg_offset + entry * 8, blank); if (ret < 0) return ret; return 0; @@ -2770,9 +2769,7 @@ static int sh_eth_tsu_add_entry(struct n i = sh_eth_tsu_find_empty(ndev); if (i < 0) return -ENOMEM; - ret = sh_eth_tsu_write_entry(ndev, - mdp->tsu_addr + reg_offset + i * 8, - addr); + ret = sh_eth_tsu_write_entry(ndev, reg_offset + i * 8, addr); if (ret < 0) return ret;