Commit d09de7eb authored by Oleksij Rempel's avatar Oleksij Rempel Committed by Jakub Kicinski
Browse files

net: usb: lan78xx: remove PHY register access from ethtool get_regs 



Remove PHY register handling from `lan78xx_get_regs` and
`lan78xx_get_regs_len`. Since the controller can have different PHYs
attached, the first 32 registers are not universally relevant or the
most interesting. Simplify the implementation to focus on MAC and device
registers.

Signed-off-by: default avatarOleksij Rempel <o.rempel@pengutronix.de>
Link: https://patch.msgid.link/20241216120941.1690908-6-o.rempel@pengutronix.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 3a59437e

drivers/net/usb/lan78xx.c

+2 −21
Original line number Diff line number Diff line
@@ -2096,10 +2096,7 @@ static int lan78xx_set_pause(struct net_device *net, 


static int lan78xx_get_regs_len(struct net_device *netdev)

{

	if (!netdev->phydev)

		return (sizeof(lan78xx_regs));

	else

		return (sizeof(lan78xx_regs) + PHY_REG_SIZE);

	return sizeof(lan78xx_regs);

}



static void
@@ -2109,7 +2106,7 @@ lan78xx_get_regs(struct net_device *netdev, struct ethtool_regs *regs, 
	struct lan78xx_net *dev = netdev_priv(netdev);

	unsigned int data_count = 0;

	u32 *data = buf;

	int i, j, ret;

	int i, ret;



	/* Read Device/MAC registers */

	for (i = 0; i < ARRAY_SIZE(lan78xx_regs); i++) {
@@ -2124,22 +2121,6 @@ lan78xx_get_regs(struct net_device *netdev, struct ethtool_regs *regs, 
		data_count++;

	}



	if (!netdev->phydev)

		return;



	/* Read PHY registers */

	for (j = 0; j < 32; i++, j++) {

		ret = phy_read(netdev->phydev, j);

		if (ret < 0) {

			netdev_warn(dev->net,

				    "failed to read PHY register 0x%02x\n", j);

			goto clean_data;

		}



		data[i] = ret;

		data_count++;

	}



	return;



clean_data: