From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 631C0C282DD for ; Wed, 8 Jan 2020 20:42:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3171B206DB for ; Wed, 8 Jan 2020 20:42:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cogentembedded-com.20150623.gappssmtp.com header.i=@cogentembedded-com.20150623.gappssmtp.com header.b="Ae+RtYeI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726916AbgAHUmq (ORCPT ); Wed, 8 Jan 2020 15:42:46 -0500 Received: from mail-lf1-f65.google.com ([209.85.167.65]:43176 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726707AbgAHUmq (ORCPT ); Wed, 8 Jan 2020 15:42:46 -0500 Received: by mail-lf1-f65.google.com with SMTP id 9so3463784lfq.10 for ; Wed, 08 Jan 2020 12:42:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=from:subject:to:cc:organization:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=2IiY4N4pReCFQeec/jXgRHTFsEHZAk7Hj3asNpqdl5I=; b=Ae+RtYeIdvcQS40lGc2auBeQbqMIubDNKl0YFadIU/8XDb9xdYaHUtlUU55JpPVLhR xwhbv9wpUneqT6+ENruV+qj6EvTiPLrH/Gel487bucNsLyXkBzJvK7icIDeVM/fSGeOl Prxph3JGTPxTwOOq9LVj79jD1CBKndrdWVJvQd1kE/bIeY5iFy261xRS/FRc/1JdorOM tkJEeOuTWKVn8m3bfoc9s/9zDVnqaTU2ZD5Boze7seoDtYtJ8IOdpHeLqC6vnToJ6LhL TOt10ftHYKBYe0HJ+Bw3GUVJd5IfUEWQ1IX+ntFeUurTAHtq5yQBvOUM7+JPV9WvqsPn EpMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:organization:message-id:date :user-agent:mime-version:content-language:content-transfer-encoding; bh=2IiY4N4pReCFQeec/jXgRHTFsEHZAk7Hj3asNpqdl5I=; b=lE7nwT4nzHq38zP1LSqfU8+ozCeo7OOi5iI/wYzrN6oLoIM9OYI7vMYVEaQAyT9uw8 v9yGSBGByjnKaF+qKOA4W1F9c91lKnliyXEx5xKjt1NRREvf3J3RjjB2ZmZHiqWH0TtC Cxne8blp4HMl9/3CGReGlwSv5JHlMgznJ1lEUShfEmbRKsqo6CTqj11kuPcp6OVhSreT hGvpCG39REtYq39bWOxkZvUeCZ9FxGNzU0U+IxgnkCfEsv1e8phu1XXsqFO2TPkeXLzv YA/MYnKWUv039v1Ec8BI0CyRbmLZni4KyxmpTro0n6Mot5SxDZXuu2lb2HETTDKo81jA dCxQ== X-Gm-Message-State: APjAAAXnfgj6L7QiaZRSZnET6G/Rh61kRZDSKvOjO9UQffr8sCLdWylV EtAKItbLu+M2/+l5CUujjBywqQ== X-Google-Smtp-Source: APXvYqwRpRKPPx7IoeRjM4DhG4s8+U9E0kHHUO0hCavt0O2SVsCEl5tEaCxP5YwCqb/yJ0gBCDz8uw== X-Received: by 2002:a05:6512:25c:: with SMTP id b28mr4077708lfo.184.1578516164782; Wed, 08 Jan 2020 12:42:44 -0800 (PST) Received: from wasted.cogentembedded.com ([2a00:1fa0:825:468a:fc63:5f3d:481e:e931]) by smtp.gmail.com with ESMTPSA id s3sm1954623lfo.77.2020.01.08.12.42.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 12:42:44 -0800 (PST) From: Sergei Shtylyov Subject: [PATCH net] sh_eth: check sh_eth_cpu_data::dual_port when dumping registers To: netdev@vger.kernel.org, "David S. Miller" Cc: linux-renesas-soc@vger.kernel.org, linux-sh@vger.kernel.org Organization: Cogent Embedded Message-ID: <5f03e777-6838-f70d-31bc-2046d253c11a@cogentembedded.com> Date: Wed, 8 Jan 2020 23:42:42 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-MW Content-Transfer-Encoding: 7bit Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org When adding the sh_eth_cpu_data::dual_port flag I forgot to add the flag checks to __sh_eth_get_regs(), causing the non-existing TSU registers to be dumped by 'ethtool' on the single port Ether controllers having TSU... Fixes: a94cf2a614f8 ("sh_eth: fix TSU init on SH7734/R8A7740") Signed-off-by: Sergei Shtylyov --- This patch is against DaveM's 'net.git' repo. There are 3 more alike patches that check the same kind of omissions but they seem to be subject to the latter register offset sanity checking, so shouldn't affect the register dumping... drivers/net/ethernet/renesas/sh_eth.c | 38 ++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 17 deletions(-) Index: net/drivers/net/ethernet/renesas/sh_eth.c =================================================================== --- net.orig/drivers/net/ethernet/renesas/sh_eth.c +++ net/drivers/net/ethernet/renesas/sh_eth.c @@ -2204,24 +2204,28 @@ static size_t __sh_eth_get_regs(struct n if (cd->tsu) { add_tsu_reg(ARSTR); add_tsu_reg(TSU_CTRST); - add_tsu_reg(TSU_FWEN0); - add_tsu_reg(TSU_FWEN1); - add_tsu_reg(TSU_FCM); - add_tsu_reg(TSU_BSYSL0); - add_tsu_reg(TSU_BSYSL1); - add_tsu_reg(TSU_PRISL0); - add_tsu_reg(TSU_PRISL1); - add_tsu_reg(TSU_FWSL0); - add_tsu_reg(TSU_FWSL1); + if (cd->dual_port) { + add_tsu_reg(TSU_FWEN0); + add_tsu_reg(TSU_FWEN1); + add_tsu_reg(TSU_FCM); + add_tsu_reg(TSU_BSYSL0); + add_tsu_reg(TSU_BSYSL1); + add_tsu_reg(TSU_PRISL0); + add_tsu_reg(TSU_PRISL1); + add_tsu_reg(TSU_FWSL0); + add_tsu_reg(TSU_FWSL1); + } add_tsu_reg(TSU_FWSLC); - add_tsu_reg(TSU_QTAGM0); - add_tsu_reg(TSU_QTAGM1); - add_tsu_reg(TSU_FWSR); - add_tsu_reg(TSU_FWINMK); - add_tsu_reg(TSU_ADQT0); - add_tsu_reg(TSU_ADQT1); - add_tsu_reg(TSU_VTAG0); - add_tsu_reg(TSU_VTAG1); + if (cd->dual_port) { + add_tsu_reg(TSU_QTAGM0); + add_tsu_reg(TSU_QTAGM1); + add_tsu_reg(TSU_FWSR); + add_tsu_reg(TSU_FWINMK); + add_tsu_reg(TSU_ADQT0); + add_tsu_reg(TSU_ADQT1); + add_tsu_reg(TSU_VTAG0); + add_tsu_reg(TSU_VTAG1); + } add_tsu_reg(TSU_ADSBSY); add_tsu_reg(TSU_TEN); add_tsu_reg(TSU_POST1);