From patchwork Tue Aug 16 20:30:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 9284651 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 A9C27607FD for ; Tue, 16 Aug 2016 20:32:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9AAF828768 for ; Tue, 16 Aug 2016 20:32:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F737287A1; Tue, 16 Aug 2016 20:32:27 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 22FB928768 for ; Tue, 16 Aug 2016 20:32:26 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bZl0r-00008W-DJ; Tue, 16 Aug 2016 20:31:05 +0000 Received: from mail-pa0-x243.google.com ([2607:f8b0:400e:c03::243]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bZl0m-0008Vw-J7 for linux-arm-kernel@lists.infradead.org; Tue, 16 Aug 2016 20:31:01 +0000 Received: by mail-pa0-x243.google.com with SMTP id ez1so5757102pab.3 for ; Tue, 16 Aug 2016 13:30:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=3c//vyrxJL2qz4ErIc02S/Xp2v37PwRC9x1AtlTbaJE=; b=KSu41ZiRw3uqifeXaSerX+XMZiQH9tCSvwxfch2466TgrQCm3H00yv75XUwMYzoUkh PYTkaL2v6yg1THNmvbNZq8cgoVuZPNf6oOTcAlx6HTCa9fRTLh5fA/lHT5/9tj1bICq4 3xjZtTz4emoGr34VHNCCyzNELL8exBCdOh8XMNXxH9b22KsdSAolAsRs7X8sY6Ovcwp8 Pl1zxZjbDabBZ6p06bqs0RXLxt+kMRp3J0ewzW3w0YfI0Bfx8guQS65cGQJLouW0fAsb riYa5emYw5qz90zoad2ZExtwvpom5jv+Lti0oXBuHI382w7QNocx8KfFpGPOjATD69/6 JPIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=3c//vyrxJL2qz4ErIc02S/Xp2v37PwRC9x1AtlTbaJE=; b=OfhU2TefreGgE9mmjAehQpfK7cUDgHAOP6s3lXapBTcecjMWWRjaisxeJcIw4p+gAK QiyALQhcJWx30XWsz8M8WHSnLM0ytSLrWNkqJ1tffNgZfJA6JneoYPkSIzfu5/23ABoB SDClmS+04E6G/j4PFPvi5sPwAxRCAnm42jtJNPuMfZ16VgsCdeOKVCZCjYEFajQL4v20 g3HsM8wOgSp2UQceYFq6nU0VS+6FyrYnGWoKFjYpi5yj4Q6WwlsNCKAe0AxcuHdtvpm5 sKi0jJiskW04P4yhfnj+xiRqj6sHYYu++GjndgnoBpz38HCcUyJyvpUmc3S/rr0TFk3x yYRA== X-Gm-Message-State: AEkoousxPv1s0obSoIAq+m6cIcun/YpINwwpbvmsRxrzyLSwVpYYFL94N55ft0xUbOe5NA== X-Received: by 10.66.249.201 with SMTP id yw9mr68067367pac.130.1471379439707; Tue, 16 Aug 2016 13:30:39 -0700 (PDT) Received: from dl.caveonetworks.com ([50.233.148.156]) by smtp.gmail.com with ESMTPSA id p64sm41432577pfd.11.2016.08.16.13.30.38 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 16 Aug 2016 13:30:38 -0700 (PDT) Received: from dl.caveonetworks.com (localhost.localdomain [127.0.0.1]) by dl.caveonetworks.com (8.14.5/8.14.5) with ESMTP id u7GKUbdw002964; Tue, 16 Aug 2016 13:30:37 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id u7GKUaC5002963; Tue, 16 Aug 2016 13:30:36 -0700 From: David Daney To: netdev@vger.kernel.org, "David S. Miller" , linux-kernel@vger.kernel.org Subject: [PATCH] net: thunderx: Fix OOPs with ethtool --register-dump Date: Tue, 16 Aug 2016 13:30:36 -0700 Message-Id: <1471379436-2932-1-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160816_133100_749150_4FB9CD6B X-CRM114-Status: GOOD ( 11.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sunil Goutham , Robert Richter , linux-arm-kernel@lists.infradead.org, David Daney MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: David Daney The ethtool_ops .get_regs function attempts to read the nonexistent register NIC_QSET_SQ_0_7_CNM_CHG, which produces a "bus error" type OOPs. Fix by not attempting to read, and removing the definition of, NIC_QSET_SQ_0_7_CNM_CHG. A zero is written into the register dump to keep the layout unchanged. Signed-off-by: David Daney Cc: # 4.4.x- --- drivers/net/ethernet/cavium/thunder/nic_reg.h | 1 - drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cavium/thunder/nic_reg.h b/drivers/net/ethernet/cavium/thunder/nic_reg.h index afb10e3..fab35a5 100644 --- a/drivers/net/ethernet/cavium/thunder/nic_reg.h +++ b/drivers/net/ethernet/cavium/thunder/nic_reg.h @@ -170,7 +170,6 @@ #define NIC_QSET_SQ_0_7_DOOR (0x010838) #define NIC_QSET_SQ_0_7_STATUS (0x010840) #define NIC_QSET_SQ_0_7_DEBUG (0x010848) -#define NIC_QSET_SQ_0_7_CNM_CHG (0x010860) #define NIC_QSET_SQ_0_7_STAT_0_1 (0x010900) #define NIC_QSET_RBDR_0_1_CFG (0x010C00) diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c b/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c index d2d8ef2..ad4fddb 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c @@ -382,7 +382,10 @@ static void nicvf_get_regs(struct net_device *dev, p[i++] = nicvf_queue_reg_read(nic, NIC_QSET_SQ_0_7_DOOR, q); p[i++] = nicvf_queue_reg_read(nic, NIC_QSET_SQ_0_7_STATUS, q); p[i++] = nicvf_queue_reg_read(nic, NIC_QSET_SQ_0_7_DEBUG, q); - p[i++] = nicvf_queue_reg_read(nic, NIC_QSET_SQ_0_7_CNM_CHG, q); + /* Padding, was NIC_QSET_SQ_0_7_CNM_CHG, which + * produces bus errors when read + */ + p[i++] = 0; p[i++] = nicvf_queue_reg_read(nic, NIC_QSET_SQ_0_7_STAT_0_1, q); reg_offset = NIC_QSET_SQ_0_7_STAT_0_1 | (1 << 3); p[i++] = nicvf_queue_reg_read(nic, reg_offset, q);