Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1423661f authored by David Daney's avatar David Daney Committed by David S. Miller
Browse files

net: thunderx: Fix OOPs with ethtool --register-dump 



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: default avatarDavid Daney <david.daney@cavium.com>
Cc: <stable@vger.kernel.org> # 4.4.x-
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 039a3927

drivers/net/ethernet/cavium/thunder/nic_reg.h

+0 −1
Original line number Diff line number Diff line
@@ -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)

drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c

+4 −1
Original line number Diff line number Diff line
@@ -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);