From patchwork Mon Jul 23 18:11:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 10540717 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 95F9D184F for ; Mon, 23 Jul 2018 18:11:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7FBA6277D9 for ; Mon, 23 Jul 2018 18:11:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 733932793A; Mon, 23 Jul 2018 18:11:25 +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 0A8BB277D9 for ; Mon, 23 Jul 2018 18:11:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387861AbeGWTNs (ORCPT ); Mon, 23 Jul 2018 15:13:48 -0400 Received: from mail-lf1-f68.google.com ([209.85.167.68]:37544 "EHLO mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387907AbeGWTNs (ORCPT ); Mon, 23 Jul 2018 15:13:48 -0400 Received: by mail-lf1-f68.google.com with SMTP id j8-v6so1138136lfb.4 for ; Mon, 23 Jul 2018 11:11:21 -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=5Whq+GwdHio2GJkAHlCX0SajMZuKoErCVSZtcVpjxAs=; b=YSFtgi3MHuni6SVKSahdRbAJ36AksvvZiXSGtBbnI6/mkbff8dNomJXMpezltaZHkd YukONc80/RjDi0R7s+HncF51huL166SVoENyGnlWWwAs7Owy7RCdeJWryeOrnSxQz3No cOSSpNwCIF9BF1QXYLJDTM66z5sl+Ui8E/PwVzTbTYIQ3OkXjCC+B4muEGIYkel5D99F ATNT9mktFCO0L1S50bU/vaLZUQjPFNRJ7w+yRgCmPURbFnfnmxBS0lyG/gM38t+Fvcch G0GhQ3IYFjqLgNMiRIrXHxT1S1Bf9O3QaMVhfZbfI6FOfB4VMdf+8E/OYTZUwqHOfBLQ gPog== 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=5Whq+GwdHio2GJkAHlCX0SajMZuKoErCVSZtcVpjxAs=; b=CAaouyoflQRoS+3Qc4urnCYJTDC6BbKiEWTK3AVt0KVXdR4cG7TE8GqKEbGXiH1RPl XtFyJdpd5JVnSbJJYbfMDh6c1KBxxbqb++XH7SKsTQv7P1zIDn3dQXmusMrGX7dKf2HA MLusj/Zakn+/hztN1zUamYaQYf2Xg/ehIVRNc98fJW6hotS/KT+rXveITNjQYqQOP4iF DvcC/5zbV2CalKG/gV8tLe9ffPojahFzdaUZrO7nIIz4zLDFl5dqTqkgwJpIXUGUBmDh F0ILiae00T4g71xOkWjrgoOUN5yalSdY/SOOjWQUbIn2yGZ9GJpInYnpx9Xf9/EcEmx7 dD5w== X-Gm-Message-State: AOUpUlFQbcR/57GicWDQ20X6fNwrd/1ngVw5KIfhTF1i6Je82tkqYIvL i1iEra9MllVFhPSSXSSZUBMrSAbPSUU= X-Google-Smtp-Source: AAOMgpcPoODP9LYlvk8kWjkLNfqkGN/dZm0+9iqVGX0D+g8ZrjXDQb1LdVFzkaLEzO7u5vfurSS/qw== X-Received: by 2002:a19:5309:: with SMTP id h9-v6mr8363499lfb.86.1532369480667; Mon, 23 Jul 2018 11:11:20 -0700 (PDT) Received: from wasted.cogentembedded.com ([31.173.85.93]) by smtp.gmail.com with ESMTPSA id j26-v6sm1931928ljc.54.2018.07.23.11.11.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jul 2018 11:11:19 -0700 (PDT) Subject: [PATCH 2/5] sh_eth: make sh_eth_tsu_get_offset() match its name 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: Date: Mon, 23 Jul 2018 21:11:19 +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 sh_eth_tsu_get_offset(), despite its name, returns a TSU register's address, not its offset. Make this function match its name and return a register's offset from the TSU registers base address instead. Signed-off-by: Sergei Shtylyov Reviewed-by: Geert Uytterhoeven --- drivers/net/ethernet/renesas/sh_eth.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 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 @@ -439,9 +439,9 @@ static void sh_eth_modify(struct net_dev enum_index); } -static void *sh_eth_tsu_get_offset(struct sh_eth_private *mdp, int enum_index) +static u16 sh_eth_tsu_get_offset(struct sh_eth_private *mdp, int enum_index) { - return mdp->tsu_addr + mdp->reg_offset[enum_index]; + return mdp->reg_offset[enum_index]; } static void sh_eth_tsu_write(struct sh_eth_private *mdp, u32 data, @@ -2712,12 +2712,12 @@ static void sh_eth_tsu_read_entry(void * static int sh_eth_tsu_find_entry(struct net_device *ndev, const u8 *addr) { struct sh_eth_private *mdp = netdev_priv(ndev); - void *reg_offset = sh_eth_tsu_get_offset(mdp, TSU_ADRH0); + u16 reg_offset = sh_eth_tsu_get_offset(mdp, TSU_ADRH0); int i; u8 c_addr[ETH_ALEN]; for (i = 0; i < SH_ETH_TSU_CAM_ENTRIES; i++, reg_offset += 8) { - sh_eth_tsu_read_entry(reg_offset, c_addr); + sh_eth_tsu_read_entry(mdp->tsu_addr + reg_offset, c_addr); if (ether_addr_equal(addr, c_addr)) return i; } @@ -2739,7 +2739,7 @@ static int sh_eth_tsu_disable_cam_entry_ int entry) { struct sh_eth_private *mdp = netdev_priv(ndev); - void *reg_offset = sh_eth_tsu_get_offset(mdp, TSU_ADRH0); + u16 reg_offset = sh_eth_tsu_get_offset(mdp, TSU_ADRH0); int ret; u8 blank[ETH_ALEN]; @@ -2747,7 +2747,9 @@ 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, reg_offset + entry * 8, blank); + ret = sh_eth_tsu_write_entry(ndev, + mdp->tsu_addr + reg_offset + entry * 8, + blank); if (ret < 0) return ret; return 0; @@ -2756,7 +2758,7 @@ static int sh_eth_tsu_disable_cam_entry_ static int sh_eth_tsu_add_entry(struct net_device *ndev, const u8 *addr) { struct sh_eth_private *mdp = netdev_priv(ndev); - void *reg_offset = sh_eth_tsu_get_offset(mdp, TSU_ADRH0); + u16 reg_offset = sh_eth_tsu_get_offset(mdp, TSU_ADRH0); int i, ret; if (!mdp->cd->tsu) @@ -2768,7 +2770,9 @@ 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, reg_offset + i * 8, addr); + ret = sh_eth_tsu_write_entry(ndev, + mdp->tsu_addr + reg_offset + i * 8, + addr); if (ret < 0) return ret; @@ -2830,15 +2834,15 @@ static int sh_eth_tsu_purge_all(struct n static void sh_eth_tsu_purge_mcast(struct net_device *ndev) { struct sh_eth_private *mdp = netdev_priv(ndev); + u16 reg_offset = sh_eth_tsu_get_offset(mdp, TSU_ADRH0); u8 addr[ETH_ALEN]; - void *reg_offset = sh_eth_tsu_get_offset(mdp, TSU_ADRH0); int i; if (!mdp->cd->tsu) return; for (i = 0; i < SH_ETH_TSU_CAM_ENTRIES; i++, reg_offset += 8) { - sh_eth_tsu_read_entry(reg_offset, addr); + sh_eth_tsu_read_entry(mdp->tsu_addr + reg_offset, addr); if (is_multicast_ether_addr(addr)) sh_eth_tsu_del_entry(ndev, addr); }