From nobody Wed Dec 17 17:59:36 2025 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9AD64197A9F for ; Wed, 4 Dec 2024 08:41:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733301715; cv=none; b=hz7hwMsBO8yRF2B41PjG/8n+WMi/TkkOexjqD3LXDZM3muaAQFhn1VSAkeHGQnWnVntUQbR5HqYPgETSPq3yfWavdBlMyHjgtKAClVv5KIiVzn/3l7q/akI6mMC/Xk6wMt0pLMvBHlRSZ+amgNtIeI467pBJwrk50H3YSk+D5rg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733301715; c=relaxed/simple; bh=u33syiicEIaonuoBeEib0kONlZukMcsn71SdeVu9Azo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ovK89g4YoKJrLe+k6ga7x4lHXJIBwHq88nEJgpCIDMoNGhA/xaG/SVOQeIN6AEd+2NldmY6vfjSvzgPDmEi2aFYFgznaqksINY/wlFkQzAWpLWf6n2bD3S/dJjp71P6hxkMerwlatosfbxomAw50ZofoDPGkq/8wysKDtwq7MeM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tIkx7-0001I7-46; Wed, 04 Dec 2024 09:41:45 +0100 Received: from dude04.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::ac]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tIkx5-001cUL-0z; Wed, 04 Dec 2024 09:41:44 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1tIkx5-004ptq-36; Wed, 04 Dec 2024 09:41:43 +0100 From: Oleksij Rempel To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Woojung Huh , Andrew Lunn Cc: Oleksij Rempel , Andrew Lunn , kernel@pengutronix.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, UNGLinuxDriver@microchip.com, Phil Elwell Subject: [PATCH net-next v2 08/10] net: usb: lan78xx: Add error handling to set_rx_max_frame_length and set_mtu Date: Wed, 4 Dec 2024 09:41:40 +0100 Message-Id: <20241204084142.1152696-9-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241204084142.1152696-1-o.rempel@pengutronix.de> References: <20241204084142.1152696-1-o.rempel@pengutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ore@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Improve error handling in `lan78xx_set_rx_max_frame_length` by: - Checking return values from register read/write operations and propagating errors. - Exiting immediately on failure to ensure proper error reporting. In `lan78xx_change_mtu`, log errors when changing MTU fails, using `%pe` for clear error representation. Signed-off-by: Oleksij Rempel Reviewed-by: Andrew Lunn --- drivers/net/usb/lan78xx.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index 33cda7f3dd12..2d16c1fc850e 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -2599,27 +2599,36 @@ static int lan78xx_phy_init(struct lan78xx_net *dev) =20 static int lan78xx_set_rx_max_frame_length(struct lan78xx_net *dev, int si= ze) { - u32 buf; bool rxenabled; + u32 buf; + int ret; =20 - lan78xx_read_reg(dev, MAC_RX, &buf); + ret =3D lan78xx_read_reg(dev, MAC_RX, &buf); + if (ret < 0) + return ret; =20 rxenabled =3D ((buf & MAC_RX_RXEN_) !=3D 0); =20 if (rxenabled) { buf &=3D ~MAC_RX_RXEN_; - lan78xx_write_reg(dev, MAC_RX, buf); + ret =3D lan78xx_write_reg(dev, MAC_RX, buf); + if (ret < 0) + return ret; } =20 /* add 4 to size for FCS */ buf &=3D ~MAC_RX_MAX_SIZE_MASK_; buf |=3D (((size + 4) << MAC_RX_MAX_SIZE_SHIFT_) & MAC_RX_MAX_SIZE_MASK_); =20 - lan78xx_write_reg(dev, MAC_RX, buf); + ret =3D lan78xx_write_reg(dev, MAC_RX, buf); + if (ret < 0) + return ret; =20 if (rxenabled) { buf |=3D MAC_RX_RXEN_; - lan78xx_write_reg(dev, MAC_RX, buf); + ret =3D lan78xx_write_reg(dev, MAC_RX, buf); + if (ret < 0) + return ret; } =20 return 0; @@ -2685,7 +2694,10 @@ static int lan78xx_change_mtu(struct net_device *net= dev, int new_mtu) return ret; =20 ret =3D lan78xx_set_rx_max_frame_length(dev, max_frame_len); - if (!ret) + if (ret < 0) + netdev_err(dev->net, "MTU changed to %d from %d failed with %pe\n", + new_mtu, netdev->mtu, ERR_PTR(ret)); + else WRITE_ONCE(netdev->mtu, new_mtu); =20 usb_autopm_put_interface(dev->intf); --=20 2.39.5