From patchwork Wed May 2 19:54:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 10376381 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B7E676037D for ; Wed, 2 May 2018 19:54:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A6D7028FB5 for ; Wed, 2 May 2018 19:54:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B91028FB7; Wed, 2 May 2018 19:54:56 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable 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 5108128FB5 for ; Wed, 2 May 2018 19:54:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751095AbeEBTyw (ORCPT ); Wed, 2 May 2018 15:54:52 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:38466 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750939AbeEBTyv (ORCPT ); Wed, 2 May 2018 15:54:51 -0400 Received: by mail-lf0-f68.google.com with SMTP id z130-v6so22639260lff.5 for ; Wed, 02 May 2018 12:54:51 -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=/5UzfkpyGtaxrUMTntqrt5SL/lS6p4CrcmY2Nxua+Vk=; b=E/rDlOQtfJatdF6K9nMfdDGwOx8r4zXPifI7Mz92HMpG7oJb4d5r/OwKmHPHRLTJ9F Xrb77zn8MyiI/67DslNIb81t+JvlMwBjXC+0MRpaa9JvmOjGsKhkpqoW8WEn4f+eUyTy P64BTCW7LNg3dZn5S77SRA3yv9L+QrzBVbYi1r5jkp91/WQC5asz3XE4vh1iHEaHE1L6 G5idcYfCY75H6z0v6K8DLT+EET2CV1Q5E6vezZ2hJf/7amXOrpbCJA04KfKEmHeCGS6e jkz0TYhiCna21QJOrYymb9zEOxcMSVm1A5WYaZuMIIUSsxmyQ8J8O0raL89p4+dVoziz Zq6w== 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=/5UzfkpyGtaxrUMTntqrt5SL/lS6p4CrcmY2Nxua+Vk=; b=oq/rSUca8ZfU3PRRK3w7FFDlZdln029Nj8ztJb6/3mRrCQmdgsVb97m9eekyq2ZSEL yQUBmIS+ngDI+SqxttgdtFzPwpiVQJCMBuzYt2uoE6+4oIwdAX+I6mqXwmHUQgLTlpjV MzN/VUjEsTYwjCmM000ItphHru+JhLxeoALLqL/Ff7c/aH8em4zH0fa6oE8ZkCJNAR25 Ejo1oeBHbqP9a34UeUe5WOIR4qR9GOSfAvOtm8DDz6kJ8wAxmefUXLH2VMFVtlSdnQP2 TFUjBb6V8R87Az8BMs3m0FZKf37ZhDzn0+R/eCl2xhVgfziTzoPAb3Bo0UzKCHLhwSSq cU5A== X-Gm-Message-State: ALQs6tCfDift+87JjhWP5JU6JtMclBO9++q4HND1gaaQOY5R8a4rEJpn XuZV29xYGczPaBAZyzfGf0RaXF3pP9M= X-Google-Smtp-Source: AB8JxZqJpNiagWKwQr9o0ghAsitwkFds7jSzWFK47WZDZm2KyLiR5quZqSN7mP6eaJJ5fdR4X0AI9w== X-Received: by 2002:a19:1fc6:: with SMTP id f189-v6mr4208785lff.98.1525290889828; Wed, 02 May 2018 12:54:49 -0700 (PDT) Received: from wasted.cogentembedded.com ([31.173.87.190]) by smtp.gmail.com with ESMTPSA id z78-v6sm2228765lje.11.2018.05.02.12.54.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 May 2018 12:54:48 -0700 (PDT) Subject: [PATCH 1/2] sh_eth: use TSU register accessors for TSU_POST From: Sergei Shtylyov To: netdev@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, linux-sh@vger.kernel.org References: <4a17ab65-4d9c-897e-c340-7d86e0296f2f@cogentembedded.com> Organization: Cogent Embedded Message-ID: <297c4665-de06-ddf2-5c97-4d56c781b299@cogentembedded.com> Date: Wed, 2 May 2018 22:54:48 +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: <4a17ab65-4d9c-897e-c340-7d86e0296f2f@cogentembedded.com> Content-Language: en-MW Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There's no particularly good reason TSU_POST registers get accessed circumventing sh_eth_tsu_{read|write}() -- start using those, removing (badly named) sh_eth_tsu_get_post_reg_offset(), while at it... Signed-off-by: Sergei Shtylyov --- drivers/net/ethernet/renesas/sh_eth.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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 @@ -2610,12 +2610,6 @@ static int sh_eth_change_mtu(struct net_ } /* For TSU_POSTn. Please refer to the manual about this (strange) bitfields */ -static void *sh_eth_tsu_get_post_reg_offset(struct sh_eth_private *mdp, - int entry) -{ - return sh_eth_tsu_get_offset(mdp, TSU_POST1) + (entry / 8 * 4); -} - static u32 sh_eth_tsu_get_post_mask(int entry) { return 0x0f << (28 - ((entry % 8) * 4)); @@ -2630,27 +2624,25 @@ static void sh_eth_tsu_enable_cam_entry_ int entry) { struct sh_eth_private *mdp = netdev_priv(ndev); + int reg = TSU_POST1 + entry / 8; u32 tmp; - void *reg_offset; - reg_offset = sh_eth_tsu_get_post_reg_offset(mdp, entry); - tmp = ioread32(reg_offset); - iowrite32(tmp | sh_eth_tsu_get_post_bit(mdp, entry), reg_offset); + tmp = sh_eth_tsu_read(mdp, reg); + sh_eth_tsu_write(mdp, tmp | sh_eth_tsu_get_post_bit(mdp, entry), reg); } static bool sh_eth_tsu_disable_cam_entry_post(struct net_device *ndev, int entry) { struct sh_eth_private *mdp = netdev_priv(ndev); + int reg = TSU_POST1 + entry / 8; u32 post_mask, ref_mask, tmp; - void *reg_offset; - reg_offset = sh_eth_tsu_get_post_reg_offset(mdp, entry); post_mask = sh_eth_tsu_get_post_mask(entry); ref_mask = sh_eth_tsu_get_post_bit(mdp, entry) & ~post_mask; - tmp = ioread32(reg_offset); - iowrite32(tmp & ~post_mask, reg_offset); + tmp = sh_eth_tsu_read(mdp, reg); + sh_eth_tsu_write(mdp, tmp & ~post_mask, reg); /* If other port enables, the function returns "true" */ return tmp & ref_mask;