From nobody Tue Sep 29 08:26:18 2026 Received: from bkemail.birger-koblitz.de (bkemail.birger-koblitz.de [23.88.97.239]) (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 CDAA343C056; Tue, 29 Sep 2026 03:19:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=23.88.97.239 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651958; cv=none; b=rwis+qdkIsdeYXlBXCZS+I+2/FzWwAqKqo0bQFjeUIYLMLVpxM7Ic+BF/dN0m50p+IYxdvQpcM6+fRa77QLjyKNz2S8dSvIIk/ziw2QdOS18XGUu4erkFbF4Ym5zeK4IaPWMkvzo9kcxOpjuJGVAh0dN/nk1R2MkLxhHCvziibU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651958; c=relaxed/simple; bh=eFFpSJGTY9H51+Ppr2ck9NUn017OEic632u7lr+XJFs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Vnw8pWxeIRAOSE6BBAWpyEhAF13EcxnNxfjyEmkSgWkDkNQfj5DZEFXQYQ4JwNEcbh6sKa8QN0S8mszOypeaJkWrv1bdRixu8iaWLnM0Ny7CcxFuNDoYhuctLtNr9HH3IwxILNbvK9YAth0Za8xCy40deVzrk528fXfeSaOsAVk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de; spf=pass smtp.mailfrom=birger-koblitz.de; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=in7S4NcX; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=WyvbW2mr; arc=none smtp.client-ip=23.88.97.239 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="in7S4NcX"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="WyvbW2mr" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651942; bh=eFFpSJGTY9H51+Ppr2ck9NUn017OEic632u7lr+XJFs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=in7S4NcXBLwGV5p8oRmrM10z69InSjoIUpBGR5fv/VOyV1PErN53DmVm202ou1yRo E6zIWmnEWEN3bxdz0+wxr1qAHEe2vQwvcHgSYJhCb0ex/svH6+z/c0t7HxfG+OTKuQ 33zmuDGAf0vZ1gUeWspm4TBruR4ESv2uTR2ULxTTXdrwR8HBUkU2ToehDhPmyxJHlW wAMbP0/N0oRWqLDo8FE9dioqt3rbGFVAWsnzYoUdDEo5qkYDJzo1oNVFYX8LhV9/vH 7mYu7ccDA1j86GLTPreGri6nrYympCy51A3KvinS0XWyUBUW7tB5KL6tYDKHHBiF8A zyiPYFdIqHbSQ== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id 95F0B4228D; Tue, 29 Sep 2026 03:19:02 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651938; bh=eFFpSJGTY9H51+Ppr2ck9NUn017OEic632u7lr+XJFs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=WyvbW2mrNFF4ph9PXQnGEQ/2+bgGxHZ3vVPILPYdDjMWruJeCn4qUP1OCQIkmeERC veee9AvQBfEFw/8d3wnV/EFiNUX/GUklqlBjWdDzVaP/LlCjUIdkZuGEkIslTQhkO5 3mdFTjUWvwxd4rG7QtKhPR+jeoMQUXiJL9xVhk5zOJ+nHtM0gcknZa97dtcGPhIg82 Dn53u7Au3HwxHAWadBAu/xkgzWXRfzvO6j+U/7aAA/Kggjc+9JqDiQVF62dZ4Oc3AN Zz9GZA7gfzQiEMAIK8UNMOmmyRInXc7QUvGlNSoGrx1UJeHbQDIwejx6QQtUCh2WGw kAOXLST7YhoTA== Received: from AMDDesktop.lan (p5dd1eaf2.dip0.t-ipconnect.de [93.209.234.242]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id 12D6142255; Tue, 29 Sep 2026 03:18:58 +0000 (UTC) From: Birger Koblitz Date: Tue, 29 Sep 2026 05:18:49 +0200 Subject: [PATCH net-next v14 01/14] phylink: Add phylink_mac_interrupt Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260929-ax88179a-v14-1-a1f2249e42ea@birger-koblitz.de> References: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> In-Reply-To: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit , Huacai Chen , WANG Xuerui Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, Jianhui Xu , Birger Koblitz , Nicolai Buchwitz X-Mailer: b4 0.14.2 Add the phylink_mac_interrupt() function to phylink, which passes a link-change interrupt received by the MAC to phylib. This function can be used by drivers which want to avoid polling the PHY and instead rely on an interrupt received by the MAC when a link-change happens. Signed-off-by: Birger Koblitz Reviewed-by: Andrew Lunn Reviewed-by: Nicolai Buchwitz Tested-by: Jianhui Xu --- drivers/net/phy/phylink.c | 20 ++++++++++++++++++++ include/linux/phylink.h | 1 + 2 files changed, 21 insertions(+) diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 3ec3bb43910953f3d57a4601633d0c3be65e959d..2621d568dfa24c29d69def019e1= 1427d5f355b01 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -1612,6 +1612,26 @@ static bool phylink_link_is_up(struct phylink *pl) return pl->netdev ? netif_carrier_ok(pl->netdev) : pl->old_link_state; } =20 +/** + * phylink_mac_interrupt() - wrapper for phy_mac_interrupt() + * @pl: a pointer to a &struct phylink returned from phylink_create() + * + * Passes a link-change interrupt received by the MAC to phylib. + * This function may be called in interrupt context, and therefore cannot = take + * a mutex. However, it is safe to assume that the reference to phy does n= ot + * disappear during the call, as only an SFP module may be unplugged to ma= ke a + * PHY disappear. SFP modules however do not support interrupts. + */ +void phylink_mac_interrupt(struct phylink *pl) +{ + struct phy_device *phy; + + phy =3D pl->phydev; + if (phy) + phy_mac_interrupt(phy); +} +EXPORT_SYMBOL_GPL(phylink_mac_interrupt); + static void phylink_resolve(struct work_struct *w) { struct phylink *pl =3D container_of(w, struct phylink, resolve); diff --git a/include/linux/phylink.h b/include/linux/phylink.h index 1dda5c7ed5f146930d1acc6f06072e6755167af6..f6c1db837fb5062c6d42ffc6489= ec06ae84e535b 100644 --- a/include/linux/phylink.h +++ b/include/linux/phylink.h @@ -768,6 +768,7 @@ int phylink_ethtool_set_eee(struct phylink *link, struc= t ethtool_keee *eee); int phylink_mii_ioctl(struct phylink *, struct ifreq *, int); int phylink_speed_down(struct phylink *pl, bool sync); int phylink_speed_up(struct phylink *pl); +void phylink_mac_interrupt(struct phylink *pl); =20 #define phylink_zero(bm) \ bitmap_zero(bm, __ETHTOOL_LINK_MODE_MASK_NBITS) --=20 2.47.3 From nobody Tue Sep 29 08:26:18 2026 Received: from bkemail.birger-koblitz.de (bkemail.birger-koblitz.de [23.88.97.239]) (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 AC4B24349B0; Tue, 29 Sep 2026 03:19:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=23.88.97.239 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651960; cv=none; b=g9U5W1jas5Y1gDC7elh94NjK7AxCetJ7NLjjOtoGhfSKHZuQkovDszkjZXKJCuuhsI3AYujVYK9YoXc9/ZsJ/U5JAPQDDMmnkTiC4809mlEbi0Q3ajNk7mJ+t/K+sx/n1FXEJvntHfZTg0ULkY7cZhIXemve07HcKbTI1Z/Op4g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651960; c=relaxed/simple; bh=IW0//u1gpMevyolcBWeSbUdau23fguyuh11+5qqrMgQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EdAL08jGK3LX2ypAC6vtlvN0o6wUFfVrW/F3d5JDFBlnOIyE8d7tA+o/LY55eg895codEr3f8xvaH6ai9TN6TwdaeJmAaHITd5Sed98vOemY4dfsn2P4gcndAgXrEwVxlD5OZitVpvsTuZAEmObU9SxrR8MNVXt/X6culrd+xIQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de; spf=pass smtp.mailfrom=birger-koblitz.de; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=A6u2RN3R; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=cVaUuEvi; arc=none smtp.client-ip=23.88.97.239 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="A6u2RN3R"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="cVaUuEvi" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651943; bh=IW0//u1gpMevyolcBWeSbUdau23fguyuh11+5qqrMgQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=A6u2RN3RuVhRjmp4vmTis7OiYInkz6fdqhdGMerOARAc2vlhJSDMVUTroWaUxjJAo njON0MPE4QvGsdTlZr9q8iGoT+RNejMJLp7iIsz01iLlj2g+8lBiz3hnnHpFKRYDkp J0hp4q29uERoU7za0rdGFt7Ut5VzrrW6xg7srLqFqqKZLiavTBcuLdVjBoNpv5jRGn qMiC5qsRQnh9wAo3pSX276nDOQemJ/py9rpZmwC/1noSySQUMbcu/VeBw8iynqx4yO nwv6HWC7zrCrFG0aRTkLthGVhfKVNzlV8xfqp1JPdRBfMW01XhQDXEKsP5e6y91VKM gZzTTi02nMQsw== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id 87C55422C4; Tue, 29 Sep 2026 03:19:03 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651938; bh=IW0//u1gpMevyolcBWeSbUdau23fguyuh11+5qqrMgQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=cVaUuEviMGaiJCFmUF3/xJdcGw7ZCUz7qPQwBgH9shQYSVR8OvqbME8+FSeOZG8zO JqJcIqQjZGK6qxMMBvxsVPC4gCGQ/DZHsWWpbzZL5lOXgdcPSOF6jR0HMJpdm9G1ER iFSJ5YRJksSnGlfco1oSQJZChw7YRgpo5HjfKfbVcLGPiIiqmASQRq8XoPVpO4h8Lq XzNK4riQ6ekrsYGc80H7O8ngDHeBT4fpzdINrQQK0jjoYo/mcnynW7IeoOaM+BFSs/ x8IQIOUnAAYNUbQQU4cx7vvn03U2usU8Lfc9Yv7kA0r32supDq9NB7pYkfXIJL9mUc COxcxFaqcfWGQ== Received: from AMDDesktop.lan (p5dd1eaf2.dip0.t-ipconnect.de [93.209.234.242]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id 5484942257; Tue, 29 Sep 2026 03:18:58 +0000 (UTC) From: Birger Koblitz Date: Tue, 29 Sep 2026 05:18:50 +0200 Subject: [PATCH net-next v14 02/14] phylib: Add support for PHYs with broken forced mode Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260929-ax88179a-v14-2-a1f2249e42ea@birger-koblitz.de> References: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> In-Reply-To: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit , Huacai Chen , WANG Xuerui Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, Jianhui Xu , Birger Koblitz , Nicolai Buchwitz X-Mailer: b4 0.14.2 Add support for PHYs which only supported auto-negotiated speed modes. This prevents a kernel warning and stack-trace within the phy_state_machine when PHYs return -EOPNOTSUPP from config_aneg() because they do not support forced modes. Signed-off-by: Birger Koblitz Reviewed-by: Andrew Lunn Reviewed-by: Nicolai Buchwitz Tested-by: Jianhui Xu --- drivers/net/phy/phy.c | 4 ++++ include/linux/phy.h | 1 + 2 files changed, 5 insertions(+) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index fce9bc7be3304b408c9f3ec9b5b95c76d3680a88..b83f938fe7c3bd619ae453434fd= 9582c0a055a57 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -1190,6 +1190,10 @@ int phy_ethtool_ksettings_set(struct phy_device *phy= dev, duplex !=3D DUPLEX_FULL))) return -EINVAL; =20 + if (autoneg =3D=3D AUTONEG_DISABLE && + (phydev->drv->flags & PHY_BROKEN_FORCED)) + return -EOPNOTSUPP; + mutex_lock(&phydev->lock); phydev->autoneg =3D autoneg; =20 diff --git a/include/linux/phy.h b/include/linux/phy.h index 5f8d65868e0ff558c163421cfea5a6f3bd73a53e..d5f8e527ce8dfefd40a8b34e7c2= f9adbcd6c87c1 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -64,6 +64,7 @@ extern const int phy_basic_ports_array[3]; #define PHY_RST_AFTER_CLK_EN 0x00000002 #define PHY_POLL_CABLE_TEST 0x00000004 #define PHY_ALWAYS_CALL_SUSPEND 0x00000008 +#define PHY_BROKEN_FORCED 0x00000010 #define MDIO_DEVICE_IS_PHY 0x80000000 =20 /** --=20 2.47.3 From nobody Tue Sep 29 08:26:18 2026 Received: from bkemail.birger-koblitz.de (bkemail.birger-koblitz.de [23.88.97.239]) (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 AC3AF3EB118; Tue, 29 Sep 2026 03:19:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=23.88.97.239 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651963; cv=none; b=UpvGKrpbaDfNjNLtMFymGetrfpDDElLJYIE4/Tn1tH5fGXB+Qr4VSzK8Wi8mUg7q5GjNMDruAwecFBVR7/YdD8/CSEDl1REojkcaTQnb+l9cnYIgdaCcEZnh7NzjXWEpTLjkUs7zPbIDEL86AdRfEToLaNGTd0t78gPilj4OVUY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651963; c=relaxed/simple; bh=UcT1TW4Sdw6h/EHK92PDO/srxgGudwpIfaE1pzE+OMg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nlBTZNcid9KhIlGlNUxAW7o7u4uLk/kfLvZUfaTNb9JqN6Zdx08Ash1te55HvxxdTcX4eiSuoWXJboGlXWL0I67Lm2ZFp7roZB7pMnReG+kl0bkW1BeZ0jBU91HfcVdqydrhhwiSYabvOr2LzBNZH/33V3c+rt/+Y+CmaQxsrW0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de; spf=pass smtp.mailfrom=birger-koblitz.de; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=Dca25PyJ; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=pdaPTl45; arc=none smtp.client-ip=23.88.97.239 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="Dca25PyJ"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="pdaPTl45" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651944; bh=UcT1TW4Sdw6h/EHK92PDO/srxgGudwpIfaE1pzE+OMg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Dca25PyJTelDW7ByhGcH17Q0M9ph/BmeGvnfhHnbbRGsSmqll/d8qmjVrppCflxjF 32cahB0Jd3cBMCnHtmVZQ/CmbLzsT2m1/sDaOofysW6DQggvMH8VvsnZKjOtLwc4hF cPbrefolAc4CDp/xbDIvzKvbM9MoJOniO3dlA9Qj6NLsq6lQl0zgWPW4hCZsYjq+Hy YqoCircqovGapUBck9AVhv6WXaTbAMshgn5F/zHgy5B55sxvi6StW/qul4R/Lgi820 sQ6tirZm+XwlLVhqGi0WOQCJdgGB4bag/j9yXIgcR7IIO11q+r/9FXZ5wykXKIKq2q G+1rjkQFedy5Q== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id 6C45F42259; Tue, 29 Sep 2026 03:19:04 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651938; bh=UcT1TW4Sdw6h/EHK92PDO/srxgGudwpIfaE1pzE+OMg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=pdaPTl459HxIO4uhYH1RQEgYV/9v5b3SXZNAaEfQju2cEva04YkeV+PimbV5nl5Yj gcuyDVa0saOV5AVUOLxCcpJVBy87WW0++4meGmjjuC7xDnj5cu6LYifsHrtWb6m3V2 GDf9U0rQxw/Z5pU9R9S/n/U/C+cUaVN4Np9dlhOkaZSsD5MB7LLXQPbiENY4DB78tS cE0owhu7cqzM5B/QPiNnlq/hqsZlewTxNkM4lOdyE2Pfp5s9qUj+5W/45sOpSQaXQa /RmHvwPpCGscW/4LbWPuv+FtDoWLsllTFIHE8obNcY8R4H4roF4rrBkhEvSOUeGs+7 mKv/mrGmxm+/g== Received: from AMDDesktop.lan (p5dd1eaf2.dip0.t-ipconnect.de [93.209.234.242]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id 96DDB42259; Tue, 29 Sep 2026 03:18:58 +0000 (UTC) From: Birger Koblitz Date: Tue, 29 Sep 2026 05:18:51 +0200 Subject: [PATCH net-next v14 03/14] ax88179_178a: Fix endianness of pause watermark register Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260929-ax88179a-v14-3-a1f2249e42ea@birger-koblitz.de> References: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> In-Reply-To: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit , Huacai Chen , WANG Xuerui Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, Jianhui Xu , Birger Koblitz X-Mailer: b4 0.14.2 The 16-bit pause watermark register is little endian as described in the ASIX 4.1.0 out-of-tree driver. Correct the register byte sequence but also swap the configuration values used in the code in order to keep the current behaviour. The endianness is relevant for 16-bit writes to the register. Signed-off-by: Birger Koblitz Reviewed-by: Andrew Lunn Tested-by: Jianhui Xu --- drivers/net/usb/ax88179_178a.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c index 81d8412ce8e2fac981df076ea1385e6e87525cfe..2ed46ab62c0065d32040439f31d= 44f118d7e9952 100644 --- a/drivers/net/usb/ax88179_178a.c +++ b/drivers/net/usb/ax88179_178a.c @@ -32,8 +32,8 @@ #define AX_ACCESS_EEPROM 0x04 #define AX_ACCESS_EFUS 0x05 #define AX_RELOAD_EEPROM_EFUSE 0x06 -#define AX_PAUSE_WATERLVL_HIGH 0x54 -#define AX_PAUSE_WATERLVL_LOW 0x55 +#define AX_PAUSE_WATERLVL_LOW 0x54 +#define AX_PAUSE_WATERLVL_HIGH 0x55 =20 #define PHYSICAL_LINK_STATUS 0x02 #define AX_USB_SS 0x04 @@ -1619,11 +1619,10 @@ static int ax88179_reset(struct usbnet *dev) dev->rx_urb_size =3D 1024 * 20; =20 *tmp =3D 0x34; - ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PAUSE_WATERLVL_LOW, 1, 1, tmp); + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PAUSE_WATERLVL_HIGH, 1, 1, tmp); =20 *tmp =3D 0x52; - ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PAUSE_WATERLVL_HIGH, - 1, 1, tmp); + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PAUSE_WATERLVL_LOW, 1, 1, tmp); =20 /* Enable checksum offload */ *tmp =3D AX_RXCOE_IP | AX_RXCOE_TCP | AX_RXCOE_UDP | --=20 2.47.3 From nobody Tue Sep 29 08:26:18 2026 Received: from bkemail.birger-koblitz.de (bkemail.birger-koblitz.de [23.88.97.239]) (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 3B3B143D508; Tue, 29 Sep 2026 03:19:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=23.88.97.239 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651964; cv=none; b=Q0ccj3tr7Hja5/Ep7MuB326ybsI7u4/miTg0G7Fopsz403mcZqD8OtR85qqf6AOT42tDD5a26aeizWX7450xxb/wP+dx7np6HjsUdf8Fu3jNs7H7o1Hqeo0xw0oXreEtmVNBCf6sI4SQYhv9s/0DW0ePFUlvGt3z2WUkve/7TsY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651964; c=relaxed/simple; bh=vEmlApg88wLsIDQRPO7/BFJbxqETWdr2AnNYP8U8U+k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=s1NTWuC80RWYfq9vy1/hkArUlH/e2FQwZ6bMKULkGbIB62IV9XRVe9Z7HoipoHwCgJU10jdiOwDi7lTKrKPc+CCQOymA+C+fmw9+pE/X2Cm6D+lHRS9moXIxw1J8ShdPq8RdgoazKrGqMSJcI6Zqk8KaJY79roJZlcR0Zw73k/s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de; spf=pass smtp.mailfrom=birger-koblitz.de; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=nXxCWdCR; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=Cz3aze6F; arc=none smtp.client-ip=23.88.97.239 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="nXxCWdCR"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="Cz3aze6F" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651949; bh=vEmlApg88wLsIDQRPO7/BFJbxqETWdr2AnNYP8U8U+k=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=nXxCWdCRJ1AVl9Zbbt5zCZN3/L5seZPgS6sm68v7zFa2tB/LR2FwwgLdG1Ys2R74z Pq+Tfuc4YnVKCGIfYwGxYG3r7J1QTglI5q72ja8cxFJx32wYVw8wThyLaES3xH49Ze Pr4DJrn9qPHMbbz7RwuZ2ge0WAxs/2vQCF2WbY/wHzokA7PR6tBDyyuOzqAS7jsGWc h6jp6mINho1mIH1QgtEel4IQ2EQdx744QdBWTJsahJqime7Q4rRN5+7e12gzIO+bkW ZYx0gdaxVrmPxz1YE5DF+1JshUv1HW7lqItE+FrpcZ9F0rIa6oM+qPMEF5oFtnqrbg 7XrVEqiALsVoA== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id C45E54229F; Tue, 29 Sep 2026 03:19:09 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651939; bh=vEmlApg88wLsIDQRPO7/BFJbxqETWdr2AnNYP8U8U+k=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Cz3aze6FE8crXjr7k8VrnwX5zWaWGREzgz+IUbisMeiFWYsCnPl/FZhbzQ40Nyowf nKuuom+On/5+wKta9xBVTFttuqZXfNvvPaZK3Kmlja2RWvaFqlSedqXrwj6fcoIaNe q8cqiIJv4X9cClwT9oybzw96auKYMN9hZLo1bXrnOrUoUFtSly69RrG7hUlQ668T8A PqEhRO00GSMe7X5+2e9eM5wmEF9uhqfKjNTehONKUIGb2DrpOALP4xuG95w1R2n70n HjYb9m5OWvKiOaHTOP3LTlinoIaK3olCwNHPXf+fW2X8wOQuP2gJeL3fCB7ys/WF9z wLkDiWSfPgVdQ== Received: from AMDDesktop.lan (p5dd1eaf2.dip0.t-ipconnect.de [93.209.234.242]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id D598C4225A; Tue, 29 Sep 2026 03:18:58 +0000 (UTC) From: Birger Koblitz Date: Tue, 29 Sep 2026 05:18:52 +0200 Subject: [PATCH net-next v14 04/14] ax88179_178a: Split driver into library and device specific code Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260929-ax88179a-v14-4-a1f2249e42ea@birger-koblitz.de> References: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> In-Reply-To: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit , Huacai Chen , WANG Xuerui Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, Jianhui Xu , Birger Koblitz , Nicolai Buchwitz X-Mailer: b4 0.14.2 Split the ax88179_178a module code into code common to the AX88179/178a/179a and 279 family of controllers and device specific code for the currently supported devices based on the AX88179 and AX88178a. Rename the module to ax88179 to reflect the broader scope of controllers supported by the module and add an alias to the old module name: MODULE_ALIAS("ax88179_178a"); Signed-off-by: Birger Koblitz Reviewed-by: Andrew Lunn Reviewed-by: Nicolai Buchwitz Tested-by: Jianhui Xu --- drivers/net/usb/Makefile | 3 +- drivers/net/usb/ax88179_178a.c | 612 +------------------------------------= ---- drivers/net/usb/ax88179_lib.c | 447 ++++++++++++++++++++++++++++++ drivers/net/usb/ax88179_lib.h | 194 +++++++++++++ 4 files changed, 645 insertions(+), 611 deletions(-) diff --git a/drivers/net/usb/Makefile b/drivers/net/usb/Makefile index 4964f7b326fbcedffc1e5a1bf004aea95560db8c..ddd76fa71e2ee670888df1c9715= 632e5c04a8149 100644 --- a/drivers/net/usb/Makefile +++ b/drivers/net/usb/Makefile @@ -12,7 +12,8 @@ obj-$(CONFIG_USB_HSO) +=3D hso.o obj-$(CONFIG_USB_LAN78XX) +=3D lan78xx.o obj-$(CONFIG_USB_NET_AX8817X) +=3D asix.o asix-y :=3D asix_devices.o asix_common.o ax88172a.o -obj-$(CONFIG_USB_NET_AX88179_178A) +=3D ax88179_178a.o +obj-$(CONFIG_USB_NET_AX88179_178A) +=3D ax88179.o +ax88179-y :=3D ax88179_178a.o ax88179_lib.o obj-$(CONFIG_USB_NET_CDCETHER) +=3D cdc_ether.o obj-$(CONFIG_USB_NET_CDC_EEM) +=3D cdc_eem.o obj-$(CONFIG_USB_NET_DM9601) +=3D dm9601.o diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c index 2ed46ab62c0065d32040439f31d44f118d7e9952..053463412875948ba9cfbe91674= ebca033859abf 100644 --- a/drivers/net/usb/ax88179_178a.c +++ b/drivers/net/usb/ax88179_178a.c @@ -8,179 +8,12 @@ #include #include #include -#include -#include -#include #include #include - -#define AX88179_PHY_ID 0x03 -#define AX_EEPROM_LEN 0x100 -#define AX88179_EEPROM_MAGIC 0x17900b95 -#define AX_MCAST_FLTSIZE 8 -#define AX_MAX_MCAST 64 -#define AX_INT_PPLS_LINK ((u32)BIT(16)) -#define AX_RXHDR_L4_TYPE_MASK 0x1c -#define AX_RXHDR_L4_TYPE_UDP 4 -#define AX_RXHDR_L4_TYPE_TCP 16 -#define AX_RXHDR_L3CSUM_ERR 2 -#define AX_RXHDR_L4CSUM_ERR 1 -#define AX_RXHDR_CRC_ERR ((u32)BIT(29)) -#define AX_RXHDR_DROP_ERR ((u32)BIT(31)) -#define AX_ACCESS_MAC 0x01 -#define AX_ACCESS_PHY 0x02 -#define AX_ACCESS_EEPROM 0x04 -#define AX_ACCESS_EFUS 0x05 -#define AX_RELOAD_EEPROM_EFUSE 0x06 -#define AX_PAUSE_WATERLVL_LOW 0x54 -#define AX_PAUSE_WATERLVL_HIGH 0x55 - -#define PHYSICAL_LINK_STATUS 0x02 - #define AX_USB_SS 0x04 - #define AX_USB_HS 0x02 - -#define GENERAL_STATUS 0x03 -/* Check AX88179 version. UA1:Bit2 =3D 0, UA2:Bit2 =3D 1 */ - #define AX_SECLD 0x04 - -#define AX_SROM_ADDR 0x07 -#define AX_SROM_CMD 0x0a - #define EEP_RD 0x04 - #define EEP_BUSY 0x10 - -#define AX_SROM_DATA_LOW 0x08 -#define AX_SROM_DATA_HIGH 0x09 - -#define AX_RX_CTL 0x0b - #define AX_RX_CTL_DROPCRCERR 0x0100 - #define AX_RX_CTL_IPE 0x0200 - #define AX_RX_CTL_START 0x0080 - #define AX_RX_CTL_AP 0x0020 - #define AX_RX_CTL_AM 0x0010 - #define AX_RX_CTL_AB 0x0008 - #define AX_RX_CTL_AMALL 0x0002 - #define AX_RX_CTL_PRO 0x0001 - #define AX_RX_CTL_STOP 0x0000 - -#define AX_NODE_ID 0x10 -#define AX_MULFLTARY 0x16 - -#define AX_MEDIUM_STATUS_MODE 0x22 - #define AX_MEDIUM_GIGAMODE 0x01 - #define AX_MEDIUM_FULL_DUPLEX 0x02 - #define AX_MEDIUM_EN_125MHZ 0x08 - #define AX_MEDIUM_RXFLOW_CTRLEN 0x10 - #define AX_MEDIUM_TXFLOW_CTRLEN 0x20 - #define AX_MEDIUM_RECEIVE_EN 0x100 - #define AX_MEDIUM_PS 0x200 - #define AX_MEDIUM_JUMBO_EN 0x8040 - -#define AX_MONITOR_MOD 0x24 - #define AX_MONITOR_MODE_RWLC 0x02 - #define AX_MONITOR_MODE_RWMP 0x04 - #define AX_MONITOR_MODE_PMEPOL 0x20 - #define AX_MONITOR_MODE_PMETYPE 0x40 - -#define AX_GPIO_CTRL 0x25 - #define AX_GPIO_CTRL_GPIO3EN 0x80 - #define AX_GPIO_CTRL_GPIO2EN 0x40 - #define AX_GPIO_CTRL_GPIO1EN 0x20 - -#define AX_PHYPWR_RSTCTL 0x26 - #define AX_PHYPWR_RSTCTL_BZ 0x0010 - #define AX_PHYPWR_RSTCTL_IPRL 0x0020 - #define AX_PHYPWR_RSTCTL_AT 0x1000 - -#define AX_RX_BULKIN_QCTRL 0x2e -#define AX_CLK_SELECT 0x33 - #define AX_CLK_SELECT_BCS 0x01 - #define AX_CLK_SELECT_ACS 0x02 - #define AX_CLK_SELECT_ULR 0x08 - -#define AX_RXCOE_CTL 0x34 - #define AX_RXCOE_IP 0x01 - #define AX_RXCOE_TCP 0x02 - #define AX_RXCOE_UDP 0x04 - #define AX_RXCOE_TCPV6 0x20 - #define AX_RXCOE_UDPV6 0x40 - -#define AX_TXCOE_CTL 0x35 - #define AX_TXCOE_IP 0x01 - #define AX_TXCOE_TCP 0x02 - #define AX_TXCOE_UDP 0x04 - #define AX_TXCOE_TCPV6 0x20 - #define AX_TXCOE_UDPV6 0x40 - -#define AX_LEDCTRL 0x73 - -#define GMII_PHY_PHYSR 0x11 - #define GMII_PHY_PHYSR_SMASK 0xc000 - #define GMII_PHY_PHYSR_GIGA 0x8000 - #define GMII_PHY_PHYSR_100 0x4000 - #define GMII_PHY_PHYSR_FULL 0x2000 - #define GMII_PHY_PHYSR_LINK 0x400 - -#define GMII_LED_ACT 0x1a - #define GMII_LED_ACTIVE_MASK 0xff8f - #define GMII_LED0_ACTIVE BIT(4) - #define GMII_LED1_ACTIVE BIT(5) - #define GMII_LED2_ACTIVE BIT(6) - -#define GMII_LED_LINK 0x1c - #define GMII_LED_LINK_MASK 0xf888 - #define GMII_LED0_LINK_10 BIT(0) - #define GMII_LED0_LINK_100 BIT(1) - #define GMII_LED0_LINK_1000 BIT(2) - #define GMII_LED1_LINK_10 BIT(4) - #define GMII_LED1_LINK_100 BIT(5) - #define GMII_LED1_LINK_1000 BIT(6) - #define GMII_LED2_LINK_10 BIT(8) - #define GMII_LED2_LINK_100 BIT(9) - #define GMII_LED2_LINK_1000 BIT(10) - #define LED0_ACTIVE BIT(0) - #define LED0_LINK_10 BIT(1) - #define LED0_LINK_100 BIT(2) - #define LED0_LINK_1000 BIT(3) - #define LED0_FD BIT(4) - #define LED0_USB3_MASK 0x001f - #define LED1_ACTIVE BIT(5) - #define LED1_LINK_10 BIT(6) - #define LED1_LINK_100 BIT(7) - #define LED1_LINK_1000 BIT(8) - #define LED1_FD BIT(9) - #define LED1_USB3_MASK 0x03e0 - #define LED2_ACTIVE BIT(10) - #define LED2_LINK_1000 BIT(13) - #define LED2_LINK_100 BIT(12) - #define LED2_LINK_10 BIT(11) - #define LED2_FD BIT(14) - #define LED_VALID BIT(15) - #define LED2_USB3_MASK 0x7c00 - -#define GMII_PHYPAGE 0x1e -#define GMII_PHY_PAGE_SELECT 0x1f - #define GMII_PHY_PGSEL_EXT 0x0007 - #define GMII_PHY_PGSEL_PAGE0 0x0000 - #define GMII_PHY_PGSEL_PAGE3 0x0003 - #define GMII_PHY_PGSEL_PAGE5 0x0005 +#include "ax88179_lib.h" =20 static int ax88179_reset(struct usbnet *dev); =20 -struct ax88179_data { - u8 eee_enabled; - u8 eee_active; - u16 rxctl; - u8 in_pm; - u32 wol_supported; - u32 wolopts; - u8 disconnecting; -}; - -struct ax88179_int_data { - __le32 intdata1; - __le32 intdata2; -}; - static const struct { unsigned char ctrl, timer_l, timer_h, size, ifg; } AX88179_BULKIN_SIZE[] =3D { @@ -190,165 +23,6 @@ static const struct { {7, 0xcc, 0x4c, 0x18, 8}, }; =20 -static void ax88179_set_pm_mode(struct usbnet *dev, bool pm_mode) -{ - struct ax88179_data *ax179_data =3D dev->driver_priv; - - ax179_data->in_pm =3D pm_mode; -} - -static int ax88179_in_pm(struct usbnet *dev) -{ - struct ax88179_data *ax179_data =3D dev->driver_priv; - - return ax179_data->in_pm; -} - -static int __ax88179_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 i= ndex, - u16 size, void *data) -{ - int ret; - int (*fn)(struct usbnet *, u8, u8, u16, u16, void *, u16); - struct ax88179_data *ax179_data =3D dev->driver_priv; - - BUG_ON(!dev); - - if (!ax88179_in_pm(dev)) - fn =3D usbnet_read_cmd; - else - fn =3D usbnet_read_cmd_nopm; - - ret =3D fn(dev, cmd, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - value, index, data, size); - - if (unlikely((ret < 0) && !(ret =3D=3D -ENODEV && ax179_data->disconnecti= ng))) - netdev_warn(dev->net, "Failed to read reg index 0x%04x: %d\n", - index, ret); - - return ret; -} - -static int __ax88179_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 = index, - u16 size, const void *data) -{ - int ret; - int (*fn)(struct usbnet *, u8, u8, u16, u16, const void *, u16); - struct ax88179_data *ax179_data =3D dev->driver_priv; - - BUG_ON(!dev); - - if (!ax88179_in_pm(dev)) - fn =3D usbnet_write_cmd; - else - fn =3D usbnet_write_cmd_nopm; - - ret =3D fn(dev, cmd, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - value, index, data, size); - - if (unlikely((ret < 0) && !(ret =3D=3D -ENODEV && ax179_data->disconnecti= ng))) - netdev_warn(dev->net, "Failed to write reg index 0x%04x: %d\n", - index, ret); - - return ret; -} - -static void ax88179_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value, - u16 index, u16 size, void *data) -{ - u16 buf; - - if (2 =3D=3D size) { - buf =3D *((u16 *)data); - cpu_to_le16s(&buf); - usbnet_write_cmd_async(dev, cmd, USB_DIR_OUT | USB_TYPE_VENDOR | - USB_RECIP_DEVICE, value, index, &buf, - size); - } else { - usbnet_write_cmd_async(dev, cmd, USB_DIR_OUT | USB_TYPE_VENDOR | - USB_RECIP_DEVICE, value, index, data, - size); - } -} - -static int ax88179_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 ind= ex, - u16 size, void *data) -{ - int ret; - - if (2 =3D=3D size) { - u16 buf =3D 0; - ret =3D __ax88179_read_cmd(dev, cmd, value, index, size, &buf); - le16_to_cpus(&buf); - *((u16 *)data) =3D buf; - } else if (4 =3D=3D size) { - u32 buf =3D 0; - ret =3D __ax88179_read_cmd(dev, cmd, value, index, size, &buf); - le32_to_cpus(&buf); - *((u32 *)data) =3D buf; - } else { - ret =3D __ax88179_read_cmd(dev, cmd, value, index, size, data); - } - - return ret; -} - -static int ax88179_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 in= dex, - u16 size, const void *data) -{ - int ret; - - if (2 =3D=3D size) { - u16 buf; - buf =3D *((u16 *)data); - cpu_to_le16s(&buf); - ret =3D __ax88179_write_cmd(dev, cmd, value, index, - size, &buf); - } else { - ret =3D __ax88179_write_cmd(dev, cmd, value, index, - size, data); - } - - return ret; -} - -static void ax88179_status(struct usbnet *dev, struct urb *urb) -{ - struct ax88179_int_data *event; - u32 link; - - if (urb->actual_length < 8) - return; - - event =3D urb->transfer_buffer; - le32_to_cpus((void *)&event->intdata1); - - link =3D (((__force u32)event->intdata1) & AX_INT_PPLS_LINK) >> 16; - - if (netif_carrier_ok(dev->net) !=3D link) { - usbnet_link_change(dev, link, 1); - if (!link) - netdev_info(dev->net, "ax88179 - Link status is: 0\n"); - } -} - -static int ax88179_mdio_read(struct net_device *netdev, int phy_id, int lo= c) -{ - struct usbnet *dev =3D netdev_priv(netdev); - u16 res; - - ax88179_read_cmd(dev, AX_ACCESS_PHY, phy_id, (__u16)loc, 2, &res); - return res; -} - -static void ax88179_mdio_write(struct net_device *netdev, int phy_id, int = loc, - int val) -{ - struct usbnet *dev =3D netdev_priv(netdev); - u16 res =3D (u16) val; - - ax88179_write_cmd(dev, AX_ACCESS_PHY, phy_id, (__u16)loc, 2, &res); -} - static inline int ax88179_phy_mmd_indirect(struct usbnet *dev, u16 prtad, u16 devad) { @@ -510,146 +184,11 @@ static void ax88179_disconnect(struct usb_interface = *intf) usbnet_disconnect(intf); } =20 -static void -ax88179_get_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo) -{ - struct usbnet *dev =3D netdev_priv(net); - struct ax88179_data *priv =3D dev->driver_priv; - - wolinfo->supported =3D priv->wol_supported; - wolinfo->wolopts =3D priv->wolopts; -} - -static int -ax88179_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo) -{ - struct usbnet *dev =3D netdev_priv(net); - struct ax88179_data *priv =3D dev->driver_priv; - - if (wolinfo->wolopts & ~(priv->wol_supported)) - return -EINVAL; - - priv->wolopts =3D wolinfo->wolopts; - - return 0; -} - static int ax88179_get_eeprom_len(struct net_device *net) { return AX_EEPROM_LEN; } =20 -static int -ax88179_get_eeprom(struct net_device *net, struct ethtool_eeprom *eeprom, - u8 *data) -{ - struct usbnet *dev =3D netdev_priv(net); - u16 *eeprom_buff; - int first_word, last_word; - int i, ret; - - if (eeprom->len =3D=3D 0) - return -EINVAL; - - eeprom->magic =3D AX88179_EEPROM_MAGIC; - - first_word =3D eeprom->offset >> 1; - last_word =3D (eeprom->offset + eeprom->len - 1) >> 1; - eeprom_buff =3D kmalloc_array(last_word - first_word + 1, sizeof(u16), - GFP_KERNEL); - if (!eeprom_buff) - return -ENOMEM; - - /* ax88179/178A returns 2 bytes from eeprom on read */ - for (i =3D first_word; i <=3D last_word; i++) { - ret =3D __ax88179_read_cmd(dev, AX_ACCESS_EEPROM, i, 1, 2, - &eeprom_buff[i - first_word]); - if (ret < 0) { - kfree(eeprom_buff); - return -EIO; - } - } - - memcpy(data, (u8 *)eeprom_buff + (eeprom->offset & 1), eeprom->len); - kfree(eeprom_buff); - return 0; -} - -static int -ax88179_set_eeprom(struct net_device *net, struct ethtool_eeprom *eeprom, - u8 *data) -{ - struct usbnet *dev =3D netdev_priv(net); - u16 *eeprom_buff; - int first_word; - int last_word; - int ret; - int i; - - netdev_dbg(net, "write EEPROM len %d, offset %d, magic 0x%x\n", - eeprom->len, eeprom->offset, eeprom->magic); - - if (eeprom->len =3D=3D 0) - return -EINVAL; - - if (eeprom->magic !=3D AX88179_EEPROM_MAGIC) - return -EINVAL; - - first_word =3D eeprom->offset >> 1; - last_word =3D (eeprom->offset + eeprom->len - 1) >> 1; - - eeprom_buff =3D kmalloc_array(last_word - first_word + 1, sizeof(u16), - GFP_KERNEL); - if (!eeprom_buff) - return -ENOMEM; - - /* align data to 16 bit boundaries, read the missing data from - the EEPROM */ - if (eeprom->offset & 1) { - ret =3D ax88179_read_cmd(dev, AX_ACCESS_EEPROM, first_word, 1, 2, - &eeprom_buff[0]); - if (ret < 0) { - netdev_err(net, "Failed to read EEPROM at offset 0x%02x.\n", first_word= ); - goto free; - } - } - - if ((eeprom->offset + eeprom->len) & 1) { - ret =3D ax88179_read_cmd(dev, AX_ACCESS_EEPROM, last_word, 1, 2, - &eeprom_buff[last_word - first_word]); - if (ret < 0) { - netdev_err(net, "Failed to read EEPROM at offset 0x%02x.\n", last_word); - goto free; - } - } - - memcpy((u8 *)eeprom_buff + (eeprom->offset & 1), data, eeprom->len); - - for (i =3D first_word; i <=3D last_word; i++) { - netdev_dbg(net, "write to EEPROM at offset 0x%02x, data 0x%04x\n", - i, eeprom_buff[i - first_word]); - ret =3D ax88179_write_cmd(dev, AX_ACCESS_EEPROM, i, 1, 2, - &eeprom_buff[i - first_word]); - if (ret < 0) { - netdev_err(net, "Failed to write EEPROM at offset 0x%02x.\n", i); - goto free; - } - msleep(20); - } - - /* reload EEPROM data */ - ret =3D ax88179_write_cmd(dev, AX_RELOAD_EEPROM_EFUSE, 0x0000, 0, 0, NULL= ); - if (ret < 0) { - netdev_err(net, "Failed to reload EEPROM data\n"); - goto free; - } - - ret =3D 0; -free: - kfree(eeprom_buff); - return ret; -} - static int ax88179_get_link_ksettings(struct net_device *net, struct ethtool_link_ksettings *cmd) { @@ -864,125 +403,6 @@ static const struct ethtool_ops ax88179_ethtool_ops = =3D { .get_ts_info =3D ethtool_op_get_ts_info, }; =20 -static void ax88179_set_multicast(struct net_device *net) -{ - struct usbnet *dev =3D netdev_priv(net); - struct ax88179_data *data =3D dev->driver_priv; - u8 *m_filter =3D ((u8 *)dev->data); - - data->rxctl =3D (AX_RX_CTL_START | AX_RX_CTL_AB | AX_RX_CTL_IPE); - - if (net->flags & IFF_PROMISC) { - data->rxctl |=3D AX_RX_CTL_PRO; - } else if (net->flags & IFF_ALLMULTI || - netdev_mc_count(net) > AX_MAX_MCAST) { - data->rxctl |=3D AX_RX_CTL_AMALL; - } else if (netdev_mc_empty(net)) { - /* just broadcast and directed */ - } else { - /* We use dev->data for our 8 byte filter buffer - * to avoid allocating memory that is tricky to free later - */ - u32 crc_bits; - struct netdev_hw_addr *ha; - - memset(m_filter, 0, AX_MCAST_FLTSIZE); - - netdev_for_each_mc_addr(ha, net) { - crc_bits =3D ether_crc(ETH_ALEN, ha->addr) >> 26; - *(m_filter + (crc_bits >> 3)) |=3D (1 << (crc_bits & 7)); - } - - ax88179_write_cmd_async(dev, AX_ACCESS_MAC, AX_MULFLTARY, - AX_MCAST_FLTSIZE, AX_MCAST_FLTSIZE, - m_filter); - - data->rxctl |=3D AX_RX_CTL_AM; - } - - ax88179_write_cmd_async(dev, AX_ACCESS_MAC, AX_RX_CTL, - 2, 2, &data->rxctl); -} - -static int -ax88179_set_features(struct net_device *net, netdev_features_t features) -{ - u8 tmp; - struct usbnet *dev =3D netdev_priv(net); - netdev_features_t changed =3D net->features ^ features; - - if (changed & NETIF_F_IP_CSUM) { - ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, 1, 1, &tmp); - tmp ^=3D AX_TXCOE_TCP | AX_TXCOE_UDP; - ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, 1, 1, &tmp); - } - - if (changed & NETIF_F_IPV6_CSUM) { - ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, 1, 1, &tmp); - tmp ^=3D AX_TXCOE_TCPV6 | AX_TXCOE_UDPV6; - ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, 1, 1, &tmp); - } - - if (changed & NETIF_F_RXCSUM) { - ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_RXCOE_CTL, 1, 1, &tmp); - tmp ^=3D AX_RXCOE_IP | AX_RXCOE_TCP | AX_RXCOE_UDP | - AX_RXCOE_TCPV6 | AX_RXCOE_UDPV6; - ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RXCOE_CTL, 1, 1, &tmp); - } - - return 0; -} - -static int ax88179_change_mtu(struct net_device *net, int new_mtu) -{ - struct usbnet *dev =3D netdev_priv(net); - u16 tmp16; - - WRITE_ONCE(net->mtu, new_mtu); - dev->hard_mtu =3D net->mtu + net->hard_header_len; - - if (net->mtu > 1500) { - ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE, - 2, 2, &tmp16); - tmp16 |=3D AX_MEDIUM_JUMBO_EN; - ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE, - 2, 2, &tmp16); - } else { - ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE, - 2, 2, &tmp16); - tmp16 &=3D ~AX_MEDIUM_JUMBO_EN; - ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE, - 2, 2, &tmp16); - } - - /* max qlen depend on hard_mtu and rx_urb_size */ - usbnet_update_max_qlen(dev); - - return 0; -} - -static int ax88179_set_mac_addr(struct net_device *net, void *p) -{ - struct usbnet *dev =3D netdev_priv(net); - struct sockaddr *addr =3D p; - int ret; - - if (netif_running(net)) - return -EBUSY; - if (!is_valid_ether_addr(addr->sa_data)) - return -EADDRNOTAVAIL; - - eth_hw_addr_set(net, addr->sa_data); - - /* Set the MAC address */ - ret =3D ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_NODE_ID, ETH_ALEN, - ETH_ALEN, net->dev_addr); - if (ret < 0) - return ret; - - return 0; -} - static const struct net_device_ops ax88179_netdev_ops =3D { .ndo_open =3D usbnet_open, .ndo_stop =3D usbnet_stop, @@ -1249,35 +669,6 @@ static int ax88179_led_setting(struct usbnet *dev) return 0; } =20 -static void ax88179_get_mac_addr(struct usbnet *dev) -{ - u8 mac[ETH_ALEN]; - - memset(mac, 0, sizeof(mac)); - - /* Maybe the boot loader passed the MAC address via device tree */ - if (!eth_platform_get_mac_address(&dev->udev->dev, mac)) { - netif_dbg(dev, ifup, dev->net, - "MAC address read from device tree"); - } else { - ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_NODE_ID, ETH_ALEN, - ETH_ALEN, mac); - netif_dbg(dev, ifup, dev->net, - "MAC address read from ASIX chip"); - } - - if (is_valid_ether_addr(mac)) { - eth_hw_addr_set(dev->net, mac); - if (!is_local_ether_addr(mac)) - dev->net->addr_assign_type =3D NET_ADDR_PERM; - } else { - netdev_info(dev->net, "invalid MAC address, using random\n"); - } - - ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_NODE_ID, ETH_ALEN, ETH_ALEN, - dev->net->dev_addr); -} - static int ax88179_bind(struct usbnet *dev, struct usb_interface *intf) { struct ax88179_data *ax179_data; @@ -1951,3 +1342,4 @@ module_usb_driver(ax88179_178a_driver); =20 MODULE_DESCRIPTION("ASIX AX88179/178A based USB 3.0/2.0 Gigabit Ethernet D= evices"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("ax88179_178a"); diff --git a/drivers/net/usb/ax88179_lib.c b/drivers/net/usb/ax88179_lib.c new file mode 100644 index 0000000000000000000000000000000000000000..522ea2447a1116cfbba15a5b77a= b5074ea1b922c --- /dev/null +++ b/drivers/net/usb/ax88179_lib.c @@ -0,0 +1,447 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * ASIX AX88179/178A USB 3.0/2.0 to Gigabit Ethernet Devices + * + * Copyright (C) 2011-2013 ASIX + */ + +#include +#include +#include "ax88179_lib.h" + +void ax88179_set_pm_mode(struct usbnet *dev, bool pm_mode) +{ + struct ax88179_data *ax179_data =3D dev->driver_priv; + + ax179_data->in_pm =3D pm_mode; +} + +static int ax88179_in_pm(struct usbnet *dev) +{ + struct ax88179_data *ax179_data =3D dev->driver_priv; + + return ax179_data->in_pm; +} + +int __ax88179_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index, + u16 size, void *data) +{ + int (*fn)(struct usbnet *dev, u8 cmd, u8 rtype, u16 val, u16 i, void *d, = u16 size); + struct ax88179_data *ax179_data =3D dev->driver_priv; + int ret; + + if (!ax88179_in_pm(dev)) + fn =3D usbnet_read_cmd; + else + fn =3D usbnet_read_cmd_nopm; + + ret =3D fn(dev, cmd, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, + value, index, data, size); + + if (unlikely(ret < 0 && !(ret =3D=3D -ENODEV && ax179_data->disconnecting= ))) + netdev_warn(dev->net, "Failed to read reg index 0x%04x: %d\n", + index, ret); + + return ret; +} + +static int __ax88179_write_cmd(struct usbnet *dev, u8 cmd, u16 value, + u16 index, u16 size, const void *data) +{ + int (*fn)(struct usbnet *dev, u8 cmd, u8 rtype, u16 val, u16 i, const voi= d *d, u16 size); + struct ax88179_data *ax179_data =3D dev->driver_priv; + int ret; + + if (!ax88179_in_pm(dev)) + fn =3D usbnet_write_cmd; + else + fn =3D usbnet_write_cmd_nopm; + + ret =3D fn(dev, cmd, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, + value, index, data, size); + + if (unlikely(ret < 0 && !(ret =3D=3D -ENODEV && ax179_data->disconnecting= ))) + netdev_warn(dev->net, "Failed to write reg index 0x%04x: %d\n", + index, ret); + + return ret; +} + +void ax88179_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value, + u16 index, u16 size, void *data) +{ + u16 buf; + + if (size =3D=3D 2) { + buf =3D *((u16 *)data); + cpu_to_le16s(&buf); + usbnet_write_cmd_async(dev, cmd, USB_DIR_OUT | USB_TYPE_VENDOR | + USB_RECIP_DEVICE, value, index, &buf, + size); + } else { + usbnet_write_cmd_async(dev, cmd, USB_DIR_OUT | USB_TYPE_VENDOR | + USB_RECIP_DEVICE, value, index, data, + size); + } +} + +int ax88179_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index, + u16 size, void *data) +{ + int ret; + + if (size =3D=3D 2) { + u16 buf =3D 0; + + ret =3D __ax88179_read_cmd(dev, cmd, value, index, size, &buf); + le16_to_cpus(&buf); + *((u16 *)data) =3D buf; + } else if (size =3D=3D 4) { + u32 buf =3D 0; + + ret =3D __ax88179_read_cmd(dev, cmd, value, index, size, &buf); + le32_to_cpus(&buf); + *((u32 *)data) =3D buf; + } else { + ret =3D __ax88179_read_cmd(dev, cmd, value, index, size, data); + } + + return ret; +} + +int ax88179_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index, + u16 size, const void *data) +{ + int ret; + + if (size =3D=3D 2) { + u16 buf; + + buf =3D *((u16 *)data); + cpu_to_le16s(&buf); + ret =3D __ax88179_write_cmd(dev, cmd, value, index, + size, &buf); + } else { + ret =3D __ax88179_write_cmd(dev, cmd, value, index, + size, data); + } + + return ret; +} + +void ax88179_status(struct usbnet *dev, struct urb *urb) +{ + struct ax88179_int_data *event; + u32 link; + + if (urb->actual_length < 8) + return; + + event =3D urb->transfer_buffer; + le32_to_cpus((void *)&event->intdata1); + + link =3D (((__force u32)event->intdata1) & AX_INT_PPLS_LINK) >> 16; + + if (netif_carrier_ok(dev->net) !=3D link) { + usbnet_link_change(dev, link, 1); + if (!link) + netdev_info(dev->net, "ax88179 - Link status is: 0\n"); + } +} + +int ax88179_mdio_read(struct net_device *netdev, int phy_id, int loc) +{ + struct usbnet *dev =3D netdev_priv(netdev); + u16 res; + + ax88179_read_cmd(dev, AX_ACCESS_PHY, phy_id, (__u16)loc, 2, &res); + return res; +} + +void ax88179_mdio_write(struct net_device *netdev, int phy_id, int loc, in= t val) +{ + struct usbnet *dev =3D netdev_priv(netdev); + u16 res =3D (u16)val; + + ax88179_write_cmd(dev, AX_ACCESS_PHY, phy_id, (__u16)loc, 2, &res); +} + +void ax88179_get_wol(struct net_device *net, struct ethtool_wolinfo *wolin= fo) +{ + struct usbnet *dev =3D netdev_priv(net); + struct ax88179_data *priv =3D dev->driver_priv; + + wolinfo->supported =3D priv->wol_supported; + wolinfo->wolopts =3D priv->wolopts; +} + +int ax88179_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinf= o) +{ + struct usbnet *dev =3D netdev_priv(net); + struct ax88179_data *priv =3D dev->driver_priv; + + if (wolinfo->wolopts & ~(priv->wol_supported)) + return -EINVAL; + + priv->wolopts =3D wolinfo->wolopts; + + return 0; +} + +int ax88179_get_eeprom(struct net_device *net, struct ethtool_eeprom *eepr= om, u8 *data) +{ + struct usbnet *dev =3D netdev_priv(net); + u16 *eeprom_buff; + int first_word, last_word; + int i, ret; + + if (eeprom->len =3D=3D 0) + return -EINVAL; + + eeprom->magic =3D AX88179_EEPROM_MAGIC; + + first_word =3D eeprom->offset >> 1; + last_word =3D (eeprom->offset + eeprom->len - 1) >> 1; + eeprom_buff =3D kmalloc_array(last_word - first_word + 1, sizeof(u16), + GFP_KERNEL); + if (!eeprom_buff) + return -ENOMEM; + + /* ax88179/178A returns 2 bytes from eeprom on read */ + for (i =3D first_word; i <=3D last_word; i++) { + ret =3D __ax88179_read_cmd(dev, AX_ACCESS_EEPROM, i, 1, 2, + &eeprom_buff[i - first_word]); + if (ret < 0) { + kfree(eeprom_buff); + return -EIO; + } + } + + memcpy(data, (u8 *)eeprom_buff + (eeprom->offset & 1), eeprom->len); + kfree(eeprom_buff); + return 0; +} + +int ax88179_set_eeprom(struct net_device *net, struct ethtool_eeprom *eepr= om, u8 *data) +{ + struct usbnet *dev =3D netdev_priv(net); + u16 *eeprom_buff; + int first_word; + int last_word; + int ret; + int i; + + netdev_dbg(net, "write EEPROM len %d, offset %d, magic 0x%x\n", + eeprom->len, eeprom->offset, eeprom->magic); + + if (eeprom->len =3D=3D 0) + return -EINVAL; + + if (eeprom->magic !=3D AX88179_EEPROM_MAGIC) + return -EINVAL; + + first_word =3D eeprom->offset >> 1; + last_word =3D (eeprom->offset + eeprom->len - 1) >> 1; + + eeprom_buff =3D kmalloc_array(last_word - first_word + 1, sizeof(u16), + GFP_KERNEL); + if (!eeprom_buff) + return -ENOMEM; + + /* align data to 16 bit boundaries, read the missing data from + * the EEPROM + */ + if (eeprom->offset & 1) { + ret =3D ax88179_read_cmd(dev, AX_ACCESS_EEPROM, first_word, 1, 2, + &eeprom_buff[0]); + if (ret < 0) { + netdev_err(net, "Failed to read EEPROM at offset 0x%02x.\n", first_word= ); + goto free; + } + } + + if ((eeprom->offset + eeprom->len) & 1) { + ret =3D ax88179_read_cmd(dev, AX_ACCESS_EEPROM, last_word, 1, 2, + &eeprom_buff[last_word - first_word]); + if (ret < 0) { + netdev_err(net, "Failed to read EEPROM at offset 0x%02x.\n", last_word); + goto free; + } + } + + memcpy((u8 *)eeprom_buff + (eeprom->offset & 1), data, eeprom->len); + + for (i =3D first_word; i <=3D last_word; i++) { + netdev_dbg(net, "write to EEPROM at offset 0x%02x, data 0x%04x\n", + i, eeprom_buff[i - first_word]); + ret =3D ax88179_write_cmd(dev, AX_ACCESS_EEPROM, i, 1, 2, + &eeprom_buff[i - first_word]); + if (ret < 0) { + netdev_err(net, "Failed to write EEPROM at offset 0x%02x.\n", i); + goto free; + } + msleep(20); + } + + /* reload EEPROM data */ + ret =3D ax88179_write_cmd(dev, AX_RELOAD_EEPROM_EFUSE, 0x0000, 0, 0, NULL= ); + if (ret < 0) { + netdev_err(net, "Failed to reload EEPROM data\n"); + goto free; + } + + ret =3D 0; +free: + kfree(eeprom_buff); + return ret; +} + +void ax88179_set_multicast(struct net_device *net) +{ + struct usbnet *dev =3D netdev_priv(net); + struct ax88179_data *data =3D dev->driver_priv; + u8 *m_filter =3D ((u8 *)dev->data); + + data->rxctl =3D (AX_RX_CTL_START | AX_RX_CTL_AB | AX_RX_CTL_IPE); + + if (net->flags & IFF_PROMISC) { + data->rxctl |=3D AX_RX_CTL_PRO; + } else if (net->flags & IFF_ALLMULTI || + netdev_mc_count(net) > AX_MAX_MCAST) { + data->rxctl |=3D AX_RX_CTL_AMALL; + } else if (netdev_mc_empty(net)) { + /* just broadcast and directed */ + } else { + /* We use dev->data for our 8 byte filter buffer + * to avoid allocating memory that is tricky to free later + */ + u32 crc_bits; + struct netdev_hw_addr *ha; + + memset(m_filter, 0, AX_MCAST_FLTSIZE); + + netdev_for_each_mc_addr(ha, net) { + crc_bits =3D ether_crc(ETH_ALEN, ha->addr) >> 26; + *(m_filter + (crc_bits >> 3)) |=3D (1 << (crc_bits & 7)); + } + + ax88179_write_cmd_async(dev, AX_ACCESS_MAC, AX_MULFLTARY, + AX_MCAST_FLTSIZE, AX_MCAST_FLTSIZE, + m_filter); + + data->rxctl |=3D AX_RX_CTL_AM; + } + + ax88179_write_cmd_async(dev, AX_ACCESS_MAC, AX_RX_CTL, + 2, 2, &data->rxctl); +} + +int ax88179_set_features(struct net_device *net, netdev_features_t feature= s) +{ + u8 tmp; + struct usbnet *dev =3D netdev_priv(net); + netdev_features_t changed =3D net->features ^ features; + + if (changed & NETIF_F_IP_CSUM) { + ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, 1, 1, &tmp); + tmp ^=3D AX_TXCOE_TCP | AX_TXCOE_UDP; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, 1, 1, &tmp); + } + + if (changed & NETIF_F_IPV6_CSUM) { + ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, 1, 1, &tmp); + tmp ^=3D AX_TXCOE_TCPV6 | AX_TXCOE_UDPV6; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, 1, 1, &tmp); + } + + if (changed & NETIF_F_RXCSUM) { + ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_RXCOE_CTL, 1, 1, &tmp); + tmp ^=3D AX_RXCOE_IP | AX_RXCOE_TCP | AX_RXCOE_UDP | + AX_RXCOE_TCPV6 | AX_RXCOE_UDPV6; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RXCOE_CTL, 1, 1, &tmp); + } + + return 0; +} + +void ax88179_get_mac_addr(struct usbnet *dev) +{ + u8 mac[ETH_ALEN]; + + memset(mac, 0, sizeof(mac)); + + /* Maybe the boot loader passed the MAC address via device tree */ + if (!eth_platform_get_mac_address(&dev->udev->dev, mac)) { + netif_dbg(dev, ifup, dev->net, + "MAC address read from device tree"); + } else { + ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_NODE_ID, ETH_ALEN, + ETH_ALEN, mac); + netif_dbg(dev, ifup, dev->net, + "MAC address read from ASIX chip"); + } + + if (is_valid_ether_addr(mac)) { + eth_hw_addr_set(dev->net, mac); + if (!is_local_ether_addr(mac)) + dev->net->addr_assign_type =3D NET_ADDR_PERM; + } else { + netdev_info(dev->net, "invalid MAC address, using random\n"); + } + + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_NODE_ID, ETH_ALEN, ETH_ALEN, + dev->net->dev_addr); +} + +int ax88179_change_mtu(struct net_device *net, int new_mtu) +{ + struct usbnet *dev =3D netdev_priv(net); + u16 tmp16; + + WRITE_ONCE(net->mtu, new_mtu); + dev->hard_mtu =3D net->mtu + net->hard_header_len; + + rtnl_lock(); + if (net->mtu > 1500) { + ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE, + 2, 2, &tmp16); + tmp16 |=3D AX_MEDIUM_JUMBO_EN; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE, + 2, 2, &tmp16); + } else { + ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE, + 2, 2, &tmp16); + tmp16 &=3D ~AX_MEDIUM_JUMBO_EN; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE, + 2, 2, &tmp16); + } + rtnl_unlock(); + + /* max qlen depend on hard_mtu and rx_urb_size */ + usbnet_update_max_qlen(dev); + + return 0; +} + +int ax88179_set_mac_addr(struct net_device *net, void *p) +{ + struct usbnet *dev =3D netdev_priv(net); + struct sockaddr *addr =3D p; + int ret; + + if (netif_running(net)) + return -EBUSY; + if (!is_valid_ether_addr(addr->sa_data)) + return -EADDRNOTAVAIL; + + eth_hw_addr_set(net, addr->sa_data); + + /* Set the MAC address */ + ret =3D ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_NODE_ID, ETH_ALEN, + ETH_ALEN, net->dev_addr); + if (ret < 0) + return ret; + + return 0; +} + diff --git a/drivers/net/usb/ax88179_lib.h b/drivers/net/usb/ax88179_lib.h new file mode 100644 index 0000000000000000000000000000000000000000..b2ee1356727cf4b3fa05f0b0d5f= d863ac3f9a87d --- /dev/null +++ b/drivers/net/usb/ax88179_lib.h @@ -0,0 +1,194 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include +#include +#include + +#ifndef __LINUX_USBNET_AX88179_H +#define __LINUX_USBNET_AX88179_H + +#define AX88179_PHY_ID 0x03 +#define AX_EEPROM_LEN 0x100 +#define AX88179_EEPROM_MAGIC 0x17900b95 +#define AX_MCAST_FLTSIZE 8 +#define AX_MAX_MCAST 64 +#define AX_INT_PPLS_LINK ((u32)BIT(16)) +#define AX_RXHDR_L4_TYPE_MASK 0x1c +#define AX_RXHDR_L4_TYPE_UDP 4 +#define AX_RXHDR_L4_TYPE_TCP 16 +#define AX_RXHDR_L3CSUM_ERR 2 +#define AX_RXHDR_L4CSUM_ERR 1 +#define AX_RXHDR_CRC_ERR ((u32)BIT(29)) +#define AX_RXHDR_DROP_ERR ((u32)BIT(31)) +#define AX_ACCESS_MAC 0x01 +#define AX_ACCESS_PHY 0x02 +#define AX_ACCESS_EEPROM 0x04 +#define AX_ACCESS_EFUS 0x05 +#define AX_RELOAD_EEPROM_EFUSE 0x06 +#define AX_PAUSE_WATERLVL_LOW 0x54 +#define AX_PAUSE_WATERLVL_HIGH 0x55 + +#define PHYSICAL_LINK_STATUS 0x02 + #define AX_USB_SS 0x04 + #define AX_USB_HS 0x02 + +#define GENERAL_STATUS 0x03 +/* Check AX88179 version. UA1:Bit2 =3D 0, UA2:Bit2 =3D 1 */ + #define AX_SECLD 0x04 + +#define AX_SROM_ADDR 0x07 +#define AX_SROM_CMD 0x0a + #define EEP_RD 0x04 + #define EEP_BUSY 0x10 + +#define AX_SROM_DATA_LOW 0x08 +#define AX_SROM_DATA_HIGH 0x09 + +#define AX_RX_CTL 0x0b + #define AX_RX_CTL_DROPCRCERR 0x0100 + #define AX_RX_CTL_IPE 0x0200 + #define AX_RX_CTL_START 0x0080 + #define AX_RX_CTL_AP 0x0020 + #define AX_RX_CTL_AM 0x0010 + #define AX_RX_CTL_AB 0x0008 + #define AX_RX_CTL_AMALL 0x0002 + #define AX_RX_CTL_PRO 0x0001 + #define AX_RX_CTL_STOP 0x0000 + +#define AX_NODE_ID 0x10 +#define AX_MULFLTARY 0x16 + +#define AX_MEDIUM_STATUS_MODE 0x22 + #define AX_MEDIUM_GIGAMODE 0x01 + #define AX_MEDIUM_FULL_DUPLEX 0x02 + #define AX_MEDIUM_EN_125MHZ 0x08 + #define AX_MEDIUM_RXFLOW_CTRLEN 0x10 + #define AX_MEDIUM_TXFLOW_CTRLEN 0x20 + #define AX_MEDIUM_RECEIVE_EN 0x100 + #define AX_MEDIUM_PS 0x200 + #define AX_MEDIUM_JUMBO_EN 0x8040 + +#define AX_MONITOR_MOD 0x24 + #define AX_MONITOR_MODE_RWLC 0x02 + #define AX_MONITOR_MODE_RWMP 0x04 + #define AX_MONITOR_MODE_PMEPOL 0x20 + #define AX_MONITOR_MODE_PMETYPE 0x40 + +#define AX_GPIO_CTRL 0x25 + #define AX_GPIO_CTRL_GPIO3EN 0x80 + #define AX_GPIO_CTRL_GPIO2EN 0x40 + #define AX_GPIO_CTRL_GPIO1EN 0x20 + +#define AX_PHYPWR_RSTCTL 0x26 + #define AX_PHYPWR_RSTCTL_BZ 0x0010 + #define AX_PHYPWR_RSTCTL_IPRL 0x0020 + #define AX_PHYPWR_RSTCTL_AT 0x1000 + +#define AX_RX_BULKIN_QCTRL 0x2e +#define AX_CLK_SELECT 0x33 + #define AX_CLK_SELECT_BCS 0x01 + #define AX_CLK_SELECT_ACS 0x02 + #define AX_CLK_SELECT_ULR 0x08 + +#define AX_RXCOE_CTL 0x34 + #define AX_RXCOE_IP 0x01 + #define AX_RXCOE_TCP 0x02 + #define AX_RXCOE_UDP 0x04 + #define AX_RXCOE_TCPV6 0x20 + #define AX_RXCOE_UDPV6 0x40 + +#define AX_TXCOE_CTL 0x35 + #define AX_TXCOE_IP 0x01 + #define AX_TXCOE_TCP 0x02 + #define AX_TXCOE_UDP 0x04 + #define AX_TXCOE_TCPV6 0x20 + #define AX_TXCOE_UDPV6 0x40 + +#define AX_LEDCTRL 0x73 + +#define GMII_PHY_PHYSR 0x11 + #define GMII_PHY_PHYSR_SMASK 0xc000 + #define GMII_PHY_PHYSR_GIGA 0x8000 + #define GMII_PHY_PHYSR_100 0x4000 + #define GMII_PHY_PHYSR_FULL 0x2000 + #define GMII_PHY_PHYSR_LINK 0x400 + +#define GMII_LED_ACT 0x1a + #define GMII_LED_ACTIVE_MASK 0xff8f + #define GMII_LED0_ACTIVE BIT(4) + #define GMII_LED1_ACTIVE BIT(5) + #define GMII_LED2_ACTIVE BIT(6) + +#define GMII_LED_LINK 0x1c + #define GMII_LED_LINK_MASK 0xf888 + #define GMII_LED0_LINK_10 BIT(0) + #define GMII_LED0_LINK_100 BIT(1) + #define GMII_LED0_LINK_1000 BIT(2) + #define GMII_LED1_LINK_10 BIT(4) + #define GMII_LED1_LINK_100 BIT(5) + #define GMII_LED1_LINK_1000 BIT(6) + #define GMII_LED2_LINK_10 BIT(8) + #define GMII_LED2_LINK_100 BIT(9) + #define GMII_LED2_LINK_1000 BIT(10) + #define LED0_ACTIVE BIT(0) + #define LED0_LINK_10 BIT(1) + #define LED0_LINK_100 BIT(2) + #define LED0_LINK_1000 BIT(3) + #define LED0_FD BIT(4) + #define LED0_USB3_MASK 0x001f + #define LED1_ACTIVE BIT(5) + #define LED1_LINK_10 BIT(6) + #define LED1_LINK_100 BIT(7) + #define LED1_LINK_1000 BIT(8) + #define LED1_FD BIT(9) + #define LED1_USB3_MASK 0x03e0 + #define LED2_ACTIVE BIT(10) + #define LED2_LINK_1000 BIT(13) + #define LED2_LINK_100 BIT(12) + #define LED2_LINK_10 BIT(11) + #define LED2_FD BIT(14) + #define LED_VALID BIT(15) + #define LED2_USB3_MASK 0x7c00 + +#define GMII_PHYPAGE 0x1e +#define GMII_PHY_PAGE_SELECT 0x1f + #define GMII_PHY_PGSEL_EXT 0x0007 + #define GMII_PHY_PGSEL_PAGE0 0x0000 + #define GMII_PHY_PGSEL_PAGE3 0x0003 + #define GMII_PHY_PGSEL_PAGE5 0x0005 + +struct ax88179_data { + u8 eee_enabled; + u8 eee_active; + u16 rxctl; + u8 in_pm; + u32 wol_supported; + u32 wolopts; + u8 disconnecting; +}; + +struct ax88179_int_data { + __le32 intdata1; + __le32 intdata2; +}; + +void ax88179_set_pm_mode(struct usbnet *dev, bool pm_mode); +int __ax88179_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index, u= 16 size, void *data); +int ax88179_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index, u16= size, void *data); +int ax88179_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index, u1= 6 size, + const void *data); +void ax88179_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value, u16 in= dex, + u16 size, void *data); +int ax88179_mdio_read(struct net_device *netdev, int phy_id, int loc); +void ax88179_mdio_write(struct net_device *netdev, int phy_id, int loc, in= t val); +void ax88179_status(struct usbnet *dev, struct urb *urb); +void ax88179_get_wol(struct net_device *net, struct ethtool_wolinfo *wolin= fo); +int ax88179_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinf= o); +int ax88179_get_eeprom(struct net_device *net, struct ethtool_eeprom *eepr= om, u8 *data); +int ax88179_set_eeprom(struct net_device *net, struct ethtool_eeprom *eepr= om, u8 *data); +void ax88179_set_multicast(struct net_device *net); +int ax88179_set_features(struct net_device *net, netdev_features_t feature= s); +void ax88179_get_mac_addr(struct usbnet *dev); +int ax88179_change_mtu(struct net_device *net, int new_mtu); +int ax88179_set_mac_addr(struct net_device *net, void *p); +#endif /*__LINUX_USBNET_AX88179_H */ --=20 2.47.3 From nobody Tue Sep 29 08:26:18 2026 Received: from bkemail.birger-koblitz.de (bkemail.birger-koblitz.de [23.88.97.239]) (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 78A9A4D0A17; Tue, 29 Sep 2026 03:19:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=23.88.97.239 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651971; cv=none; b=MqcO0WuT4CcyWyiXv4Lf5bzjszBxMTQw3WmNEmw/Rc2hOxrt4n0xESpp6NHyITFhRiPSsgTHckCKZeGjNLMVM2qcDoT0ihOvFvtPuALdD7ZTdssu0jFZSsy8fk8SSVgyhH15xR3h9jbGW0kR+O+PcbVT0XumpdOX4BpIiy5CQt8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651971; c=relaxed/simple; bh=u1bsb7ufMouqHVFEsKGJjBV6lYDbWi9+v+ZoslOXRRE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nt6Lr19L74nrivu7hr+LTXrlCXBNojiiP5IlDBNtfM8ZpBcPgfdeU1UN2kWalC0k6NGJPME2uhh/08OaQQf6BKJGEZlkvENC4BzXIU2G80DrhXmcYUIXA6rzHTY9BATWfuQRQ6PlU42olC+dpDTejUsrGtK11Q1IfCrGg8M5nSM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de; spf=pass smtp.mailfrom=birger-koblitz.de; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=WuN0uM3Z; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=O+uhJWPX; arc=none smtp.client-ip=23.88.97.239 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="WuN0uM3Z"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="O+uhJWPX" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651955; bh=u1bsb7ufMouqHVFEsKGJjBV6lYDbWi9+v+ZoslOXRRE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=WuN0uM3Zf7EiQFNlPIOU51ZcEFVcwbvA4DONjskkyWki13m4uVMyowDjQ7jTkRKI0 AcGBfe1HCXiUfSXTRqavOYPVZewJEV4QVMpNF0RHJvKWHq9qsvz7vels0qM5sapOAV vI5PqTLxBQ1xFSKwQeh0a9V6SNX6vwBe9OMUFY9eq7uw1MI69hGYpZNGrnJyidsDrb IJ+ErsAjNDm+p5zcpytJU7WFsHjKqjp2ZRr6O09NxsN7Z9I+u2SGR08fXNLGWqzJqg DErvWZB6abSJbSuanyLY15zCXunyzqSARTXxi5nj3Y+qQDGLhrgbpfDZs4KVYLAGR+ uGRMexldgHBbQ== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id 867DD4228C; Tue, 29 Sep 2026 03:19:15 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651939; bh=u1bsb7ufMouqHVFEsKGJjBV6lYDbWi9+v+ZoslOXRRE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=O+uhJWPXYbQwB2voDpRzO1aRxN+mnZuoHdCD3L+vRpwg9bgVQbhfeRKuPqo6mec7V e+bt9mVZlGVi9zAw3vLc0FUz71Y+Mmd2ag4q2P5QRBoP75YTTxsEyJ+eu0wl9xCNCQ fvG0zImQ6dTy2DGxGmzf/5Eoumy/uQbqbn+f2lECsSS2gFidfvrMz8la5qZGqwMmoq x8kE88iiALw0go9eGn9DoSa1vISJ/4XFvx0nm6P3isjeUthGrD1jDcoZz78ZsCXwjD D54HleFvsgq0NYMA6PqROChL+ZEAD9ci6KV2t+EflzJmgbYeXnVz87D/6kc0igKKRq k3oSIPyBI4+QA== Received: from AMDDesktop.lan (p5dd1eaf2.dip0.t-ipconnect.de [93.209.234.242]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id 29E6C4225B; Tue, 29 Sep 2026 03:18:59 +0000 (UTC) From: Birger Koblitz Date: Tue, 29 Sep 2026 05:18:53 +0200 Subject: [PATCH net-next v14 05/14] ax88179_178a: Add HW support for AX179A-based chips Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260929-ax88179a-v14-5-a1f2249e42ea@birger-koblitz.de> References: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> In-Reply-To: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit , Huacai Chen , WANG Xuerui Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, Jianhui Xu , Birger Koblitz X-Mailer: b4 0.14.2 This adds bindings and HW support for AX179A-based USB-Ethernet controllers. The AX179A-family of chips consists of the AX88279 (2.5GBit PHY) AX88179A/B (1GBit PHY, B variant has wider temperature range) AX772D/E (100Mbit PHY) The controllers all have the same vendor and device ID (0x0b95, 0x1790) and are distinguished by their BCD device versions, which are 2.00 AX88179A/B 3.00 AX88772D/E 4.00 AX88279 For all chips, the driver calls the same ax88179a_bind() function and the chips are then distinguished by the chip version and BCD device ID. The AX179A-based chips all provide both a CDC-NCM compatible USB interface, and a proprietary vendor interface. By default, the proprietary vendor interface is not active and Linux will load the CDC-NCM driver to support the devices. If the ax88179_178a module is configured by the OS to have precedence over CDC-NCM, then this driver will switch the device to use the vendor interface, and the device will be controlled by the ax88179_178a driver when the device is probed again after an automatic reset by the device. Also add a convenience function for the ethtool ops that use phylink and need to retrieve the ax88179_data structure from net_device: netdev2data(). Signed-off-by: Birger Koblitz Reviewed-by: Andrew Lunn Tested-by: Jianhui Xu --- MAINTAINERS | 6 + drivers/net/usb/Kconfig | 2 +- drivers/net/usb/Makefile | 2 +- drivers/net/usb/ax88179_178a.c | 25 + drivers/net/usb/ax88179_lib.c | 30 ++ drivers/net/usb/ax88179_lib.h | 161 ++++++ drivers/net/usb/ax88179a_devices.c | 980 +++++++++++++++++++++++++++++++++= ++++ 7 files changed, 1204 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 0b42e898f4d8e4892e943bb3db839ff9afcd3569..442e8ea3ca04e41037021fe0457= 0549ecdde49ab 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4020,6 +4020,12 @@ S: Maintained F: Documentation/devicetree/bindings/net/asix,ax88796c.yaml F: drivers/net/ethernet/asix/ax88796c_* =20 +ASIX AX88179 USB ETHERNET DRIVER +M: Birger Koblitz +L: netdev@vger.kernel.org +S: Maintained +F: drivers/net/usb/ax88179* + ASIX PHY DRIVER [RUST] M: FUJITA Tomonori R: Trevor Gross diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig index 52a5c0922c79fc52906d4d4040ec2b3411ff0984..115990b0d9537aea2776544c976= 8b034f32aa7a4 100644 --- a/drivers/net/usb/Kconfig +++ b/drivers/net/usb/Kconfig @@ -199,7 +199,7 @@ config USB_NET_AX88179_178A tristate "ASIX AX88179/178A USB 3.0/2.0 to Gigabit Ethernet" depends on USB_USBNET select CRC32 - select PHYLIB + select PHYLINK default y help This option adds support for ASIX AX88179 based USB 3.0/2.0 diff --git a/drivers/net/usb/Makefile b/drivers/net/usb/Makefile index ddd76fa71e2ee670888df1c9715632e5c04a8149..2ecead0181eaf8d66fb6f5dbd6f= 2905b22b6eb57 100644 --- a/drivers/net/usb/Makefile +++ b/drivers/net/usb/Makefile @@ -13,7 +13,7 @@ obj-$(CONFIG_USB_LAN78XX) +=3D lan78xx.o obj-$(CONFIG_USB_NET_AX8817X) +=3D asix.o asix-y :=3D asix_devices.o asix_common.o ax88172a.o obj-$(CONFIG_USB_NET_AX88179_178A) +=3D ax88179.o -ax88179-y :=3D ax88179_178a.o ax88179_lib.o +ax88179-y :=3D ax88179_178a.o ax88179a_devices.o ax88179_lib.o obj-$(CONFIG_USB_NET_CDCETHER) +=3D cdc_ether.o obj-$(CONFIG_USB_NET_CDC_EEM) +=3D cdc_eem.o obj-$(CONFIG_USB_NET_DM9601) +=3D dm9601.o diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c index 053463412875948ba9cfbe91674ebca033859abf..5864cf5bd5361469ad23935848a= 559b6fd66ed45 100644 --- a/drivers/net/usb/ax88179_178a.c +++ b/drivers/net/usb/ax88179_178a.c @@ -684,6 +684,19 @@ static int ax88179_bind(struct usbnet *dev, struct usb= _interface *intf) =20 dev->driver_priv =3D ax179_data; =20 + ret =3D ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_CHIP_STATUS, + 1, 1, &ax179_data->chip_version); + if (ret < 0) + goto err_nodev; + + ax179_data->chip_version =3D (ax179_data->chip_version & 0xf0) >> 4; + ax179_data->is_ax88772d =3D 0; + ax179_data->ip_align =3D 1; + ax179_data->eeprom_read_cmd =3D AX_ACCESS_EEPROM; + ax179_data->eeprom_write_cmd =3D AX_ACCESS_EEPROM; + ax179_data->eeprom_block =3D 2; + ax179_data->eeprom_wen =3D 0; + dev->net->netdev_ops =3D &ax88179_netdev_ops; dev->net->ethtool_ops =3D &ax88179_ethtool_ops; dev->net->needed_headroom =3D 8; @@ -1270,6 +1283,18 @@ static const struct driver_info at_umc2000sp_info = =3D { =20 static const struct usb_device_id products[] =3D { { + /* ASIX AX88179A USB 3.2 1000Mbit Ethernet */ + USB_DEVICE_VER(0x0b95, 0x1790, 0x0200, 0x0200), + .driver_info =3D (unsigned long)&ax88179a_info, +}, { + /* ASIX AX88772D USB 2.0 100Mbit Ethernet */ + USB_DEVICE_VER(0x0b95, 0x1790, 0x0300, 0x0300), + .driver_info =3D (unsigned long)&ax88772d_info, +}, { + /* ASIX AX88279 USB 3.2 2500Mbit Ethernet */ + USB_DEVICE_VER(0x0b95, 0x1790, 0x0400, 0x0400), + .driver_info =3D (unsigned long)&ax88279_info, +}, { /* ASIX AX88179 10/100/1000 */ USB_DEVICE_AND_INTERFACE_INFO(0x0b95, 0x1790, 0xff, 0xff, 0), .driver_info =3D (unsigned long)&ax88179_info, diff --git a/drivers/net/usb/ax88179_lib.c b/drivers/net/usb/ax88179_lib.c index 522ea2447a1116cfbba15a5b77ab5074ea1b922c..53ccfc5d56c24eff102fc94f631= d50d2d2ec1abd 100644 --- a/drivers/net/usb/ax88179_lib.c +++ b/drivers/net/usb/ax88179_lib.c @@ -129,6 +129,28 @@ int ax88179_write_cmd(struct usbnet *dev, u8 cmd, u16 = value, u16 index, return ret; } =20 +int ax88179_write_u16(struct usbnet *dev, u8 cmd, u16 value, u16 index, u1= 6 data) +{ + u16 buf =3D data; + + cpu_to_le16s(&buf); + return __ax88179_write_cmd(dev, cmd, value, index, 2, &buf); +} + +int ax88179_write_u8(struct usbnet *dev, u8 cmd, u16 value, u16 index, u8 = data) +{ + u8 buf =3D data; + + return __ax88179_write_cmd(dev, cmd, value, index, 1, &buf); +} + +struct ax88179_data *netdev2data(struct net_device *net) +{ + struct usbnet *dev =3D netdev_priv(net); + + return dev->driver_priv; +} + void ax88179_status(struct usbnet *dev, struct urb *urb) { struct ax88179_int_data *event; @@ -340,6 +362,7 @@ int ax88179_set_features(struct net_device *net, netdev= _features_t features) { u8 tmp; struct usbnet *dev =3D netdev_priv(net); + struct ax88179_data *data =3D dev->driver_priv; netdev_features_t changed =3D net->features ^ features; =20 if (changed & NETIF_F_IP_CSUM) { @@ -355,10 +378,17 @@ int ax88179_set_features(struct net_device *net, netd= ev_features_t features) } =20 if (changed & NETIF_F_RXCSUM) { + /* When we disable rx-checksumming, we need to clear the rx_checksum + * flag before disabling the engine + */ + if (!(features & NETIF_F_RXCSUM)) + data->rx_checksum =3D 0; + ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_RXCOE_CTL, 1, 1, &tmp); tmp ^=3D AX_RXCOE_IP | AX_RXCOE_TCP | AX_RXCOE_UDP | AX_RXCOE_TCPV6 | AX_RXCOE_UDPV6; ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RXCOE_CTL, 1, 1, &tmp); + data->rx_checksum =3D !!(features & NETIF_F_RXCSUM); } =20 return 0; diff --git a/drivers/net/usb/ax88179_lib.h b/drivers/net/usb/ax88179_lib.h index b2ee1356727cf4b3fa05f0b0d5fd863ac3f9a87d..41d57803491ac6dfa3c896d36b3= 257fc3d4503db 100644 --- a/drivers/net/usb/ax88179_lib.h +++ b/drivers/net/usb/ax88179_lib.h @@ -2,6 +2,7 @@ =20 #include #include +#include #include =20 #ifndef __LINUX_USBNET_AX88179_H @@ -25,17 +26,34 @@ #define AX_ACCESS_EEPROM 0x04 #define AX_ACCESS_EFUS 0x05 #define AX_RELOAD_EEPROM_EFUSE 0x06 +#define AX88179A_WAKEUP_SETTING 0x07 +#define AX_FW_MODE 0x08 +#define AX_GPHY_CTL 0x0F +#define AX88179A_FLASH_READ 0x21 +#define AX88179A_FLASH_WEN 0x22 +#define AX88179A_FLASH_WDIS 0x23 +#define AX88179A_FLASH_WRITE 0x24 +#define AX88179A_PHY_CLAUSE45 0x27 +#define AX88179A_FLASH_ERASE_SECTION 0x28 +#define AX88179A_ACCESS_BL 0x2A +#define AX88179A_PHY_POWER 0x31 +#define AX88179A_AUTODETACH 0xC0 + #define AX_PAUSE_WATERLVL_LOW 0x54 #define AX_PAUSE_WATERLVL_HIGH 0x55 =20 +#define AX_FW_MODE_179A 0x01 #define PHYSICAL_LINK_STATUS 0x02 #define AX_USB_SS 0x04 #define AX_USB_HS 0x02 + #define AX_USB_FS 0x01 =20 #define GENERAL_STATUS 0x03 /* Check AX88179 version. UA1:Bit2 =3D 0, UA2:Bit2 =3D 1 */ #define AX_SECLD 0x04 =20 +#define AX_CHIP_STATUS 0x05 + #define AX_SROM_ADDR 0x07 #define AX_SROM_CMD 0x0a #define EEP_RD 0x04 @@ -55,6 +73,15 @@ #define AX_RX_CTL_PRO 0x0001 #define AX_RX_CTL_STOP 0x0000 =20 +#define AX88179A_ETH_TX_GAP 0x0D + +#define AX88179A_BFM_DATA 0x0E + #define AX_TX_QUEUE_CFG 0x02 + #define AX_TX_QUEUE_SET 0x08 + #define AX_TX_Q1_AHB_FC_EN 0x10 + #define AX_TX_Q2_AHB_FC_EN 0x20 + #define AX_XGMII_EN 0x80 + #define AX_NODE_ID 0x10 #define AX_MULFLTARY 0x16 =20 @@ -84,7 +111,20 @@ #define AX_PHYPWR_RSTCTL_IPRL 0x0020 #define AX_PHYPWR_RSTCTL_AT 0x1000 =20 +#define AX88179A_VLAN_ID_ADDRESS 0x2A + +#define AX88179A_VLAN_ID_CONTROL 0x2B + #define AX_VLAN_CONTROL_WE 0x0001 + #define AX_VLAN_CONTROL_RD 0x0002 + #define AX_VLAN_CONTROL_VSO 0x0010 + #define AX_VLAN_CONTROL_VFE 0x0020 + +#define AX88179A_VLAN_ID_DATA0 0x2C +#define AX88179A_VLAN_ID_DATA1 0x2D + #define AX_RX_BULKIN_QCTRL 0x2e +#define AX_GPHY_EEE_CTRL 0x01 + #define AX_CLK_SELECT 0x33 #define AX_CLK_SELECT_BCS 0x01 #define AX_CLK_SELECT_ACS 0x02 @@ -104,7 +144,51 @@ #define AX_TXCOE_TCPV6 0x20 #define AX_TXCOE_UDPV6 0x40 =20 +#define AX88179A_MAC_BM_INT_MASK 0x41 +#define AX88179A_MAC_BM_RX_DMA_CTL 0x43 +#define AX88179A_MAC_BM_TX_DMA_CTL 0x46 + +#define AX88179A_MAC_RX_STATUS_CDC 0x6D + #define AX_LSOFC_WCNT_7_ACCESS 0x03 + #define AX_GMII_CRC_APPEND 0x10 + #define AX_LEDCTRL 0x73 +#define AX88179A_MAC_ARC_CTRL 0x9E +#define AX88179A_MAC_SWP_CTRL 0xB1 + +#define AX88179A_MAC_TX_PAUSE 0xB2 + +#define AX88179A_MAC_CDC_DELAY_TX 0xB5 + +#define AX88179A_MAC_PATH 0xB7 + #define AX_MAC_RX_PATH_READY 0x01 + #define AX_MAC_TX_PATH_READY 0x02 + +#define AX88179A_NEW_PAUSE_CTRL 0xB8 + #define AX_NEW_PAUSE_EN 0x01 + +#define AX88179A_MAC_BULK_OUT_CTRL 0xB9 + #define AX_MAC_EFF_EN 0x02 + +#define AX88179A_MAC_RX_DATA_CDC_CNT 0xC0 + #define AX_MAC_LSO_ERR_EN 0x04 + #define AX_MAC_MIQFFCTRL_FORMAT 0x10 + #define AX_MAC_MIQFFCTRL_DROP_CRC 0x20 + +#define AX88179A_AUTODETACH_DELAY (5UL << 8) +#define AX88179A_AUTODETACH_EN 1 + +#define AX88179A_MAC_LSO_ENHANCE_CTRL 0xC3 + #define AX_LSO_ENHANCE_EN 0x01 + +#define AX88179A_MAC_TX_HDR_CKSUM 0xCC +#define AX88179A_EP5_EHR 0xF9 + +#define AX_PHY_POWER 0x02 + +#define EPHY_LOW_POWER_EN 0x01 +#define S5_WOL_EN 0x04 +#define S5_WOL_LOW_POWER 0x20 =20 #define GMII_PHY_PHYSR 0x11 #define GMII_PHY_PHYSR_SMASK 0xc000 @@ -157,6 +241,55 @@ #define GMII_PHY_PGSEL_PAGE3 0x0003 #define GMII_PHY_PGSEL_PAGE5 0x0005 =20 +#define AX88179A_SW_REVISION 0xFC +#define AX88179A_SW_VERSION 0xFD + +/* TX Descriptor */ +#define AX179A_TX_DESC_LEN_MASK 0x1FFFFF +#define AX179A_TX_DESC_DROP_PADD BIT(28) +#define AX179A_TX_DESC_VLAN BIT(29) +#define AX179A_TX_DESC_MSS GENMASK(46, 32) +#define AX179A_TX_DESC_VLAN_ID GENMASK(63, 48) + +/* RX Packet Descriptor */ +#define AX179A_RX_PD_L4_ERR BIT(0) +#define AX179A_RX_PD_L3_ERR BIT(1) +#define AX179A_RX_PD_L4_TYPE_MASK 0x1C +#define AX179A_RX_PD_L4_UDP 0x04 +#define AX179A_RX_PD_L4_TCP 0x10 +#define AX179A_RX_PD_L3_TYPE_MASK 0x60 +#define AX179A_RX_PD_L3_IP 0x20 +#define AX179A_RX_PD_L3_IP6 0x40 + +#define AX179A_RX_PD_VLAN BIT(10) +#define AX179A_RX_PD_RX_OK BIT(11) +#define AX179A_RX_PD_DROP BIT(31) +#define AX179A_RX_PD_LEN GENMASK(30, 16) +#define AX179A_RX_PD_VLAN_SHIFT 0x20 + +/* RX Descriptor header */ +#define AX179A_RX_DH_PKT_CNT_MASK 0x1FFF +#define AX179A_RX_DH_DESC_OFFSET GENMASK(31, 13) + +#define AX179A_RX_HW_PAD 0x02 + +#define AX_ADVERTISE_2500 0x1000 + +enum ax_ether_link_speed { + ETHER_LINK_NONE =3D 0, + ETHER_LINK_10 =3D 1, + ETHER_LINK_100 =3D 2, + ETHER_LINK_1000 =3D 3, + ETHER_LINK_2500 =3D 4, +}; + +enum ax_chip_version { + AX_VERSION_INVALID =3D 0x0, + AX_VERSION_AX88179 =3D 0x4, + AX_VERSION_AX88179A =3D 0x6, /* Also AX88772D */ + AX_VERSION_AX88279 =3D 0x7, +}; + struct ax88179_data { u8 eee_enabled; u8 eee_active; @@ -165,6 +298,22 @@ struct ax88179_data { u32 wol_supported; u32 wolopts; u8 disconnecting; + u8 chip_version; + u8 fw_version[4]; + u8 is_ax88772d; + u8 ip_align; + u8 link; + u8 speed; + u8 full_duplex; + u8 rx_checksum; + u8 eeprom_read_cmd; + u8 eeprom_write_cmd; + u8 eeprom_wen; + u16 eeprom_block; + struct mii_bus *mdio; + struct phy_device *phydev; + struct phylink *phylink; + struct phylink_config phylink_config; }; =20 struct ax88179_int_data { @@ -172,6 +321,10 @@ struct ax88179_int_data { __le32 intdata2; }; =20 +struct ax_bulkin_settings { + unsigned char ctrl, timer_l, timer_h, size, ifg; +}; + void ax88179_set_pm_mode(struct usbnet *dev, bool pm_mode); int __ax88179_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index, u= 16 size, void *data); int ax88179_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index, u16= size, void *data); @@ -179,8 +332,11 @@ int ax88179_write_cmd(struct usbnet *dev, u8 cmd, u16 = value, u16 index, u16 size const void *data); void ax88179_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value, u16 in= dex, u16 size, void *data); +int ax88179_write_u16(struct usbnet *dev, u8 cmd, u16 value, u16 index, u1= 6 data); +int ax88179_write_u8(struct usbnet *dev, u8 cmd, u16 value, u16 index, u8 = data); int ax88179_mdio_read(struct net_device *netdev, int phy_id, int loc); void ax88179_mdio_write(struct net_device *netdev, int phy_id, int loc, in= t val); +struct ax88179_data *netdev2data(struct net_device *net); void ax88179_status(struct usbnet *dev, struct urb *urb); void ax88179_get_wol(struct net_device *net, struct ethtool_wolinfo *wolin= fo); int ax88179_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinf= o); @@ -191,4 +347,9 @@ int ax88179_set_features(struct net_device *net, netdev= _features_t features); void ax88179_get_mac_addr(struct usbnet *dev); int ax88179_change_mtu(struct net_device *net, int new_mtu); int ax88179_set_mac_addr(struct net_device *net, void *p); + +extern const struct driver_info ax88179a_info; +extern const struct driver_info ax88772d_info; +extern const struct driver_info ax88279_info; + #endif /*__LINUX_USBNET_AX88179_H */ diff --git a/drivers/net/usb/ax88179a_devices.c b/drivers/net/usb/ax88179a_= devices.c new file mode 100644 index 0000000000000000000000000000000000000000..b15eddb0ebe290fcd6da7653afe= c19918a47717a --- /dev/null +++ b/drivers/net/usb/ax88179a_devices.c @@ -0,0 +1,980 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +#include +#include +#include +#include "ax88179_lib.h" + +#define AX88279_EEPROM_LEN 0x4000 +#define AX88179A_EEPROM_LEN (32 * 20) + +enum ax_bulk_in_speeds { + BULK_IN_SPEED_2G5 =3D 0, + BULK_IN_SPEED_1G_SS =3D 1, + BULK_IN_SPEED_1G_HS =3D 2, + BULK_IN_SPEED_100_FULL_SS =3D 3, + BULK_IN_SPEED_100_HALF_SS =3D 4, + BULK_IN_SPEED_100_FULL_HS =3D 5, + BULK_IN_SPEED_100_HALF_HS =3D 6, + BULK_IN_SPEED_FS =3D 7, +}; + +static const struct ax_bulkin_settings AX88179A_BULKIN_SIZE[] =3D { + [BULK_IN_SPEED_1G_SS] =3D {5, 0x7B, 0x00, 0x17, 0x0F}, + [BULK_IN_SPEED_1G_HS] =3D {5, 0xC0, 0x02, 0x06, 0x0F}, + [BULK_IN_SPEED_100_FULL_SS] =3D {7, 0xF0, 0x00, 0x0C, 0x0F}, + [BULK_IN_SPEED_100_HALF_SS] =3D {6, 0x00, 0x00, 0x06, 0x0F}, + [BULK_IN_SPEED_100_FULL_HS] =3D {5, 0xC0, 0x04, 0x06, 0x0F}, + [BULK_IN_SPEED_100_HALF_HS] =3D {7, 0xC0, 0x04, 0x06, 0x0F}, + [BULK_IN_SPEED_FS] =3D {7, 0x00, 0x00, 0x03, 0x3F}, +}; + +static const struct ax_bulkin_settings AX88772D_BULKIN_SIZE[] =3D { + [BULK_IN_SPEED_100_FULL_HS] =3D {5, 0xC0, 0x04, 0x06, 0x0F}, + [BULK_IN_SPEED_100_HALF_HS] =3D {7, 0xC0, 0x04, 0x06, 0x0F}, + [BULK_IN_SPEED_FS] =3D {7, 0x00, 0x00, 0x03, 0x3F}, +}; + +static const struct ax_bulkin_settings AX88279_BULKIN_SIZE[] =3D { + [BULK_IN_SPEED_2G5] =3D {5, 0x10, 0x01, 0x11, 0x0F}, + [BULK_IN_SPEED_1G_SS] =3D {7, 0xB3, 0x01, 0x11, 0x0F}, + [BULK_IN_SPEED_1G_HS] =3D {7, 0xC0, 0x02, 0x06, 0x0F}, + [BULK_IN_SPEED_100_FULL_SS] =3D {7, 0x80, 0x01, 0x03, 0x0F}, + [BULK_IN_SPEED_100_HALF_SS] =3D {7, 0x80, 0x01, 0x03, 0x0F}, + [BULK_IN_SPEED_100_FULL_HS] =3D {7, 0x80, 0x01, 0x03, 0x0F}, + [BULK_IN_SPEED_100_HALF_HS] =3D {7, 0x80, 0x01, 0x03, 0x0F}, + [BULK_IN_SPEED_FS] =3D {7, 0x00, 0x00, 0x03, 0x3F}, +}; + +static int ax88179_mdiobus_read(struct mii_bus *bus, int phy_id, int regnu= m) +{ + struct usbnet *dev =3D bus->priv; + struct ax88179_data *priv; + u16 res; + int ret; + + priv =3D dev->driver_priv; + /* When reading PHYSID, return unused PHY-IDs from the ASIX vendor range = */ + if (phy_id =3D=3D AX88179_PHY_ID && regnum =3D=3D MII_PHYSID1) + return 0x003b; + if (phy_id =3D=3D AX88179_PHY_ID && regnum =3D=3D MII_PHYSID2) { + if (priv->chip_version =3D=3D AX_VERSION_AX88179A && priv->is_ax88772d) + return 0x772d; + else if (priv->chip_version =3D=3D AX_VERSION_AX88179A) + return 0x179a; + else if (priv->chip_version =3D=3D AX_VERSION_AX88279) + return 0x2790; + } + + ret =3D ax88179_read_cmd(dev, AX_ACCESS_PHY, phy_id, (__u16)regnum, 2, &r= es); + if (ret < 0) + return ret; + return res; +} + +static int ax88179_mdiobus_write(struct mii_bus *bus, int phy_id, int regn= um, u16 val) +{ + struct usbnet *dev =3D bus->priv; + + return ax88179_write_u16(dev, AX_ACCESS_PHY, phy_id, (__u16)regnum, val); +} + +static int ax179a_read_mmd(struct usbnet *dev, u16 dev_addr, u16 reg) +{ + u16 res; + int ret; + + ret =3D ax88179_read_cmd(dev, AX88179A_PHY_CLAUSE45, dev_addr, reg, 2, &r= es); + if (ret < 0) + return ret; + return res; +} + +static int ax179a_write_mmd(struct usbnet *dev, u16 dev_addr, u16 reg, u16= data) +{ + return ax88179_write_cmd(dev, AX88179A_PHY_CLAUSE45, dev_addr, reg, 2, &d= ata); +} + +static int ax88179_mdiobus_read_c45(struct mii_bus *bus, int addr, int dev= num, int regnum) +{ + struct usbnet *dev =3D bus->priv; + + if (addr !=3D AX88179_PHY_ID) + return -EINVAL; + + return ax179a_read_mmd(dev, devnum, regnum); +} + +static int ax88179_mdiobus_write_c45(struct mii_bus *bus, int addr, int de= vnum, + int regnum, u16 val) +{ + struct usbnet *dev =3D bus->priv; + + if (addr !=3D AX88179_PHY_ID) + return -EINVAL; + + return ax179a_write_mmd(dev, devnum, regnum, val); +} + +static void ax88179a_status(struct usbnet *dev, struct urb *urb) +{ + struct ax88179_data *data =3D dev->driver_priv; + + if (urb->actual_length < 8) + return; + + phylink_mac_interrupt(data->phylink); +} + +static int ax88179a_auto_detach(struct usbnet *dev) +{ + u16 tmp16; + + tmp16 =3D AX88179A_AUTODETACH_DELAY; + ax88179_write_cmd(dev, AX88179A_AUTODETACH, tmp16, 0, 0, NULL); + return 0; +} + +static void ax88179a_bulkin_config(struct usbnet *dev, u8 link_sts, u8 spe= ed, bool full_duplex) +{ + struct ax88179_data *ax179_data =3D dev->driver_priv; + const struct ax_bulkin_settings *bulkin_data; + int index =3D 0; + + switch (speed) { + case ETHER_LINK_2500: /* AX88279 only */ + index =3D BULK_IN_SPEED_2G5; + break; + + case ETHER_LINK_1000: /* AX88279 & AX88178A */ + if (link_sts & AX_USB_SS) + index =3D BULK_IN_SPEED_1G_SS; + else if (link_sts & AX_USB_HS) + index =3D BULK_IN_SPEED_1G_HS; + break; + + case ETHER_LINK_100: + if (link_sts & AX_USB_SS) + index =3D BULK_IN_SPEED_100_FULL_SS; + else if (link_sts & AX_USB_HS) + index =3D BULK_IN_SPEED_100_FULL_HS; + if (!full_duplex) + index++; + break; + + case ETHER_LINK_10: + index =3D BULK_IN_SPEED_FS; + break; + + default: /* No link */ + index =3D BULK_IN_SPEED_FS; + } + + if (link_sts & AX_USB_FS) + index =3D BULK_IN_SPEED_FS; + + if (ax179_data->chip_version =3D=3D AX_VERSION_AX88279) { + bulkin_data =3D AX88279_BULKIN_SIZE; + } else { + if (ax179_data->is_ax88772d) + bulkin_data =3D AX88772D_BULKIN_SIZE; + else + bulkin_data =3D AX88179A_BULKIN_SIZE; + } + + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RX_BULKIN_QCTRL, 5, 5, &bulkin_d= ata[index]); +} + +static void ax88179a_get_pauseparam(struct net_device *net, struct ethtool= _pauseparam *pause) +{ + struct ax88179_data *data =3D netdev2data(net); + + phylink_ethtool_get_pauseparam(data->phylink, pause); +} + +static int ax88179a_set_pauseparam(struct net_device *net, struct ethtool_= pauseparam *pause) +{ + struct ax88179_data *data =3D netdev2data(net); + + return phylink_ethtool_set_pauseparam(data->phylink, pause); +} + +static int ax88179a_get_link_ksettings(struct net_device *net, + struct ethtool_link_ksettings *cmd) +{ + struct ax88179_data *data =3D netdev2data(net); + + return phylink_ethtool_ksettings_get(data->phylink, cmd); +} + +static int ax88179a_set_link_ksettings(struct net_device *net, + const struct ethtool_link_ksettings *cmd) +{ + struct ax88179_data *data =3D netdev2data(net); + + return phylink_ethtool_ksettings_set(data->phylink, cmd); +} + +static int ax88179a_get_eeprom_len(struct net_device *net) +{ + struct ax88179_data *ax179_data =3D netdev2data(net); + + if (ax179_data->chip_version >=3D AX_VERSION_AX88279) + return AX88279_EEPROM_LEN; + else + return AX88179A_EEPROM_LEN; +} + +static const struct ethtool_ops ax88179a_ethtool_ops =3D { + .get_link =3D ethtool_op_get_link, + .get_msglevel =3D usbnet_get_msglevel, + .set_msglevel =3D usbnet_set_msglevel, + .get_wol =3D ax88179_get_wol, + .set_wol =3D ax88179_set_wol, + .get_eeprom_len =3D ax88179a_get_eeprom_len, + .get_eeprom =3D ax88179_get_eeprom, + .set_eeprom =3D ax88179_set_eeprom, + .nway_reset =3D phy_ethtool_nway_reset, + .get_link_ksettings =3D ax88179a_get_link_ksettings, + .set_link_ksettings =3D ax88179a_set_link_ksettings, + .get_pauseparam =3D ax88179a_get_pauseparam, + .set_pauseparam =3D ax88179a_set_pauseparam, + .get_ts_info =3D ethtool_op_get_ts_info, +}; + +static void ax88179a_mdio_unregister(struct ax88179_data *data) +{ + mdiobus_unregister(data->mdio); + mdiobus_free(data->mdio); +} + +static int ax88179a_init_phy(struct usbnet *dev) +{ + struct ax88179_data *data =3D dev->driver_priv; + int ret; + + data->phydev =3D mdiobus_get_phy(data->mdio, AX88179_PHY_ID); + if (!data->phydev) { + netdev_err(dev->net, "Could not find PHY\n"); + return -ENODEV; + } + + data->phydev->irq =3D PHY_MAC_INTERRUPT; + ret =3D phylink_connect_phy(data->phylink, data->phydev); + if (ret) { + netdev_err(dev->net, "Could not connect PHY\n"); + return ret; + } + + phy_suspend(data->phydev); + data->phydev->mac_managed_pm =3D true; + + phy_attached_info(data->phydev); + + return 0; +} + +static void ax88179a_mac_config(struct phylink_config *config, unsigned in= t mode, + const struct phylink_link_state *state) +{ + /* Nothing to do */ +} + +static void ax88179a_mac_link_down(struct phylink_config *config, + unsigned int mode, phy_interface_t interface) +{ + /* Nothing to do */ +} + +static void ax88179a_mac_link_up(struct phylink_config *config, + struct phy_device *phy, + unsigned int phy_mode, phy_interface_t interface, + int speed, int duplex, + bool tx_pause, bool rx_pause) +{ + struct usbnet *dev =3D netdev_priv(to_net_dev(config->dev)); + struct ax88179_data *ax179_data =3D dev->driver_priv; + u8 link_sts =3D 0, reg8[3]; + u8 bulk_config_speed =3D 0; + u16 mode; + + /* Stop RX/TX for link configuration */ + ax88179_write_u16(dev, AX_ACCESS_MAC, AX_RX_CTL, 2, AX_RX_CTL_STOP); + ax88179_write_u8(dev, AX_ACCESS_MAC, AX88179A_MAC_PATH, 1, 0); + + ax88179_write_u8(dev, AX_ACCESS_MAC, AX88179A_MAC_CDC_DELAY_TX, 1, 0xa5); + + ax88179_write_u16(dev, AX_ACCESS_MAC, AX_PAUSE_WATERLVL_LOW, 2, 0x0410); + + ax88179_write_u8(dev, AX_ACCESS_MAC, AX88179A_ETH_TX_GAP, 1, 0); + + ax88179_write_u8(dev, AX_ACCESS_MAC, AX88179A_EP5_EHR, 1, 0x07); + + ax88179_write_u8(dev, AX_ACCESS_MAC, AX88179A_NEW_PAUSE_CTRL, 1, + 0x28 | AX_NEW_PAUSE_EN); + + mode =3D AX_MEDIUM_RECEIVE_EN; + if (tx_pause) + mode |=3D AX_MEDIUM_TXFLOW_CTRLEN; + if (rx_pause) + mode |=3D AX_MEDIUM_RXFLOW_CTRLEN; + + switch (speed) { + case SPEED_2500: + reg8[0] =3D 0x00; + reg8[1] =3D 0xF8; + reg8[2] =3D 0x07; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_MAC_TX_PAUSE, 3, 3, reg8); + + reg8[0] =3D 0x78; + reg8[1] =3D (AX_LSOFC_WCNT_7_ACCESS << 5); + reg8[2] =3D 0; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_MAC_RX_STATUS_CDC, 3, 3, = reg8); + + ax88179_write_u8(dev, AX_ACCESS_MAC, AX88179A_MAC_RX_DATA_CDC_CNT, 1, 0x= 40); + ax88179_write_u8(dev, AX_ACCESS_MAC, AX88179A_MAC_RX_DATA_CDC_CNT + 1, 1, + AX_MAC_MIQFFCTRL_FORMAT | AX_MAC_MIQFFCTRL_DROP_CRC | + AX_MAC_LSO_ERR_EN); + + ax88179_write_u8(dev, AX_ACCESS_MAC, AX88179A_BFM_DATA, 1, AX_XGMII_EN); + + ax88179_write_u8(dev, AX_ACCESS_MAC, AX88179A_MAC_LSO_ENHANCE_CTRL, 1, + 0x1C | AX_LSO_ENHANCE_EN); + + mode |=3D AX_MEDIUM_GIGAMODE | AX_MEDIUM_FULL_DUPLEX; + bulk_config_speed =3D ETHER_LINK_2500; + + break; + + case SPEED_1000: + mode |=3D AX_MEDIUM_GIGAMODE; + bulk_config_speed =3D ETHER_LINK_1000; + fallthrough; + + case SPEED_100: + reg8[0] =3D 0x78; + reg8[1] =3D (AX_LSOFC_WCNT_7_ACCESS << 5) | AX_GMII_CRC_APPEND; + reg8[2] =3D 0; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_MAC_RX_STATUS_CDC, 3, 3, = reg8); + + ax88179_write_u8(dev, AX_ACCESS_MAC, AX88179A_MAC_RX_DATA_CDC_CNT, 1, 0x= 40); + if (!bulk_config_speed) + bulk_config_speed =3D ETHER_LINK_100; + break; + + case SPEED_10: + reg8[0] =3D 0xFA; + reg8[1] =3D (AX_LSOFC_WCNT_7_ACCESS << 5) | AX_GMII_CRC_APPEND; + reg8[2] =3D 0xFF; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_MAC_RX_STATUS_CDC, 3, 3, = reg8); + + ax88179_write_u8(dev, AX_ACCESS_MAC, AX88179A_MAC_RX_DATA_CDC_CNT, 1, 0x= FA); + + bulk_config_speed =3D ETHER_LINK_10; + break; + } + + ax88179_read_cmd(dev, AX_ACCESS_MAC, PHYSICAL_LINK_STATUS, 1, 1, &link_st= s); + ax88179a_bulkin_config(dev, link_sts, bulk_config_speed, !!duplex); + + if (speed !=3D SPEED_2500) + ax88179_write_u8(dev, AX_ACCESS_MAC, AX88179A_BFM_DATA, 1, 0); + + if (duplex) + mode |=3D AX_MEDIUM_FULL_DUPLEX; + + rtnl_lock(); + if (dev->net->mtu > 1500) + mode |=3D AX_MEDIUM_JUMBO_EN; + ax88179_write_u16(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE, 2, mode); + + ax88179_write_u16(dev, AX_ACCESS_MAC, AX_RX_CTL, 2, READ_ONCE(ax179_data-= >rxctl)); + rtnl_unlock(); + + ax88179_write_u8(dev, AX_ACCESS_MAC, AX88179A_MAC_PATH, 1, + AX_MAC_RX_PATH_READY | AX_MAC_TX_PATH_READY); +} + +static const struct phylink_mac_ops ax88179a_phylink_mac_ops =3D { + .mac_config =3D ax88179a_mac_config, + .mac_link_down =3D ax88179a_mac_link_down, + .mac_link_up =3D ax88179a_mac_link_up, +}; + +static int ax88179a_phylink_setup(struct usbnet *dev) +{ + struct ax88179_data *data =3D dev->driver_priv; + phy_interface_t phy_if_mode; + struct phylink *phylink; + + data->phylink_config.dev =3D &dev->net->dev; + data->phylink_config.type =3D PHYLINK_NETDEV; + data->phylink_config.mac_capabilities =3D MAC_SYM_PAUSE | MAC_ASYM_PAUSE = | MAC_100; + if (data->is_ax88772d) + data->phylink_config.mac_capabilities |=3D MAC_10; + else if (data->chip_version < AX_VERSION_AX88279) + data->phylink_config.mac_capabilities |=3D MAC_10 | MAC_1000; + else + data->phylink_config.mac_capabilities |=3D MAC_1000 | MAC_2500FD; + + if (!data->is_ax88772d) { + data->phylink_config.lpi_capabilities =3D MAC_100FD | MAC_1000FD; + data->phylink_config.eee_enabled_default =3D false; + } + + if (data->chip_version =3D=3D AX_VERSION_AX88279) { + __set_bit(PHY_INTERFACE_MODE_2500BASEX, + data->phylink_config.supported_interfaces); + __set_bit(PHY_INTERFACE_MODE_SGMII, + data->phylink_config.supported_interfaces); + phy_if_mode =3D PHY_INTERFACE_MODE_2500BASEX; + } else { + __set_bit(PHY_INTERFACE_MODE_SGMII, + data->phylink_config.supported_interfaces); + phy_if_mode =3D PHY_INTERFACE_MODE_SGMII; + } + + phylink =3D phylink_create(&data->phylink_config, dev->net->dev.fwnode, + phy_if_mode, &ax88179a_phylink_mac_ops); + if (IS_ERR(phylink)) + return PTR_ERR(phylink); + + data->phylink =3D phylink; + return 0; +} + +static int ax88179a_init_mdio(struct usbnet *dev) +{ + struct ax88179_data *data =3D dev->driver_priv; + int ret; + + data->mdio =3D mdiobus_alloc(); + if (!data->mdio) + return -ENOMEM; + + data->mdio->priv =3D dev; + data->mdio->read =3D ax88179_mdiobus_read; + data->mdio->write =3D ax88179_mdiobus_write; + data->mdio->read_c45 =3D ax88179_mdiobus_read_c45; + data->mdio->write_c45 =3D ax88179_mdiobus_write_c45; + data->mdio->name =3D "AX88179A MDIO Bus"; + data->mdio->phy_mask =3D ~(1 << AX88179_PHY_ID); + /* mii bus name is usb-- */ + snprintf(data->mdio->id, MII_BUS_ID_SIZE, "usb-%03d:%03d", + dev->udev->bus->busnum, dev->udev->devnum); + + ret =3D mdiobus_register(data->mdio); + if (ret) { + netdev_err(dev->net, "Could not register MDIO bus (err %d)\n", ret); + mdiobus_free(data->mdio); + data->mdio =3D NULL; + } + + return ret; +} + +static int ax88179a_mii_ioctl(struct net_device *net, struct ifreq *rq, in= t cmd) +{ + struct ax88179_data *data =3D netdev2data(net); + + return phylink_mii_ioctl(data->phylink, rq, cmd); +} + +static const struct net_device_ops ax88179a_netdev_ops =3D { + .ndo_open =3D usbnet_open, + .ndo_stop =3D usbnet_stop, + .ndo_start_xmit =3D usbnet_start_xmit, + .ndo_tx_timeout =3D usbnet_tx_timeout, + .ndo_get_stats64 =3D dev_get_tstats64, + .ndo_change_mtu =3D ax88179_change_mtu, + .ndo_set_mac_address =3D ax88179_set_mac_addr, + .ndo_validate_addr =3D eth_validate_addr, + .ndo_eth_ioctl =3D ax88179a_mii_ioctl, +}; + +static int ax88179a_bind(struct usbnet *dev, struct usb_interface *intf) +{ + struct usb_device *udev =3D interface_to_usbdev(intf); + struct ax88179_data *ax179_data; + int ret; + + /* Check if vendor configuration */ + if (udev->actconfig->desc.bConfigurationValue !=3D 1) { + netdev_info(dev->net, "Switching to vendor mode\n"); + usb_driver_set_configuration(udev, 1); + return -ENODEV; + } + + ret =3D usbnet_get_endpoints(dev, intf); + if (ret < 0) + return ret; + + ax179_data =3D kzalloc_obj(*ax179_data); + if (!ax179_data) + return -ENOMEM; + + dev->driver_priv =3D ax179_data; + + ret =3D ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_CHIP_STATUS, + 1, 1, &ax179_data->chip_version); + if (ret < 0) + goto err_nodev; + + ax179_data->chip_version =3D (ax179_data->chip_version & 0xf0) >> 4; + ax179_data->is_ax88772d =3D 0; + if (ax179_data->chip_version =3D=3D AX_VERSION_AX88179A) { + if (le16_to_cpu(udev->descriptor.bcdDevice) =3D=3D 0x300) + ax179_data->is_ax88772d =3D 1; + } + + for (int i =3D 0; i < 3; i++) { + ret =3D ax88179_read_cmd(dev, AX88179A_ACCESS_BL, AX88179A_SW_VERSION + = i, + 1, 1, &ax179_data->fw_version[i]); + if (ret < 0) + ax179_data->fw_version[i] =3D 0xff; + } + ret =3D ax88179_read_cmd(dev, AX88179A_ACCESS_BL, AX88179A_SW_REVISION, + 1, 1, &ax179_data->fw_version[3]); + if (ret < 0) + ax179_data->fw_version[3] =3D 0xff; + + netdev_info(dev->net, "AX88179A/279/772D Chip Version: %x, FW: %d.%d.%d.%= d\n", + ax179_data->chip_version, + ax179_data->fw_version[0], ax179_data->fw_version[1], + ax179_data->fw_version[2], ax179_data->fw_version[3]); + + /* The AX88279 requires both the AX_RX_CTL_IPE and AX_RX_CTL_DROPCRCERR + * bits set in AX_RX_CTL for creating correct RX-URBs. AX_RX_CTL_DROPCRCE= RR + * is anyway set for all chips, make sure AX_RX_CTL_IPE is set via ip_ali= gn. + * Also configure eeprom access parameters. + */ + if (ax179_data->chip_version =3D=3D AX_VERSION_AX88279) { + ax179_data->ip_align =3D 1; + ax179_data->eeprom_read_cmd =3D AX88179A_FLASH_READ; + ax179_data->eeprom_write_cmd =3D AX88179A_FLASH_WRITE; + ax179_data->eeprom_block =3D 256; + ax179_data->eeprom_wen =3D 1; + } else { + ax179_data->ip_align =3D 0; + ax179_data->eeprom_read_cmd =3D AX_ACCESS_EFUS; + ax179_data->eeprom_write_cmd =3D AX_ACCESS_EFUS; + ax179_data->eeprom_block =3D 20; + ax179_data->eeprom_wen =3D 0; + } + + dev->net->netdev_ops =3D &ax88179a_netdev_ops; + dev->net->ethtool_ops =3D &ax88179a_ethtool_ops; + dev->net->needed_headroom =3D 8; + dev->net->needed_tailroom =3D 8; + dev->net->min_mtu =3D ETH_MIN_MTU; + dev->hard_mtu =3D 9 * 1024; + dev->net->max_mtu =3D dev->hard_mtu - dev->net->hard_header_len; + + if (!ax179_data->is_ax88772d) + dev->mii.supports_gmii =3D 1; + + dev->net->features |=3D NETIF_F_SG | NETIF_F_IP_CSUM | + NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM | NETIF_F_TSO; + + dev->net->hw_features |=3D dev->net->features; + + dev->net->vlan_features =3D NETIF_F_SG | NETIF_F_IP_CSUM | + NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM | NETIF_F_TSO; + + netif_set_tso_max_size(dev->net, 16384); + + /* Enable Transmission of Link Speed byte in interrupt URB */ + ax88179_write_cmd(dev, AX_FW_MODE, AX_FW_MODE_179A, 0, 0, NULL); + ax88179_write_cmd(dev, AX_RELOAD_EEPROM_EFUSE, 0, 0, 0, NULL); + + /* Read MAC address from DTB or ASIX chip */ + ax88179_get_mac_addr(dev); + memcpy(dev->net->perm_addr, dev->net->dev_addr, ETH_ALEN); + + /* Power PHY for probing */ + ax88179_write_u8(dev, AX88179A_PHY_POWER, 0, 0, AX_PHY_POWER); + msleep(250); + + ret =3D ax88179a_init_mdio(dev); + if (ret) + goto err_nodev; + + ret =3D ax88179a_phylink_setup(dev); + if (ret) + goto phylink_err; + + ret =3D ax88179a_init_phy(dev); + if (ret) + goto initphy_err; + + return 0; + +initphy_err: + phylink_destroy(ax179_data->phylink); +phylink_err: + ax88179a_mdio_unregister(ax179_data); +err_nodev: + kfree(ax179_data); + ax179_data =3D NULL; + + return ret; +} + +static void ax88179a_unbind(struct usbnet *dev, struct usb_interface *intf) +{ + struct ax88179_data *ax179_data =3D dev->driver_priv; + + /* Configure RX control register =3D> stop operation */ + ax88179_write_u16(dev, AX_ACCESS_MAC, AX_RX_CTL, 2, AX_RX_CTL_STOP); + + rtnl_lock(); + phylink_disconnect_phy(ax179_data->phylink); + rtnl_unlock(); + phylink_destroy(ax179_data->phylink); + ax88179a_mdio_unregister(ax179_data); + + ax88179_write_u8(dev, AX88179A_PHY_POWER, 0, 0, 0); + + kfree(ax179_data); +} + +static void ax88179a_rx_checksum(struct sk_buff *skb, u64 pkt_desc) +{ + u32 pkt_type; + + skb->ip_summed =3D CHECKSUM_NONE; + /* checksum error bit is set */ + if (pkt_desc & AX179A_RX_PD_L4_ERR || pkt_desc & AX179A_RX_PD_L3_ERR) + return; + + pkt_type =3D pkt_desc & AX179A_RX_PD_L4_TYPE_MASK; + /* It must be a TCP or UDP packet with a valid checksum */ + if (pkt_type =3D=3D AX179A_RX_PD_L4_TCP || pkt_type =3D=3D AX179A_RX_PD_L= 4_UDP) + skb->ip_summed =3D CHECKSUM_UNNECESSARY; +} + +static int ax88179a_rx_fixup(struct usbnet *dev, struct sk_buff *skb) +{ + struct ax88179_data *ax179_data =3D dev->driver_priv; + struct sk_buff *ax_skb; + u32 hdr_off, pkt_end; + u64 *pkt_desc_ptr; + u16 vlan_tag; + u16 pkt_cnt; + u64 rx_hdr; + + /* SKB contents for AX179A-based chips: + * + * ... + * + * + * ... + * + * + * + * where: + * contains pkt_len data bytes and padding: + * 2 bytes of IP alignment (optional, depends on AX_RX_CTL_IPE flag) + * packet data received + * optional padding to 8-bytes boundary + * contains 8 bytes: + * pkt_len and fields AX_RXHDR_* + * contains 8 bytes: + * pkt_cnt and hdr_off (offset of ) + * + * pkt_cnt is number of entries in the per-packet metadata array. + */ + + if (!skb || skb->len < sizeof(rx_hdr)) + goto err; + + /* RX Descriptor Header */ + skb_trim(skb, skb->len - sizeof(rx_hdr)); + rx_hdr =3D *(u64 *)skb_tail_pointer(skb); + le64_to_cpus(rx_hdr); + + /* Check these packets */ + hdr_off =3D FIELD_GET(AX179A_RX_DH_DESC_OFFSET, rx_hdr); + pkt_cnt =3D rx_hdr & AX179A_RX_DH_PKT_CNT_MASK; + + /* Consistency check header position */ + if (hdr_off !=3D skb->len - (pkt_cnt * sizeof(rx_hdr))) + goto err; + + /* Make sure that the bounds of the metadata array are inside the SKB + * (and in front of the counter at the end). + */ + if (pkt_cnt * 8 + hdr_off > skb->len) + goto err; + + /* Packets must not overlap the metadata array */ + skb_trim(skb, hdr_off); + + if (!pkt_cnt) + goto err; + + /* Get the first RX packet descriptor */ + pkt_desc_ptr =3D (u64 *)(skb->data + hdr_off); + + pkt_end =3D 0; + while (pkt_cnt--) { + u64 pkt_desc =3D le64_to_cpu(*pkt_desc_ptr); + u32 pkt_len_plus_padd; + u32 pkt_len; + + pkt_len =3D FIELD_GET(AX179A_RX_PD_LEN, pkt_desc); + pkt_len -=3D (ax179_data->ip_align ? 2 : 0); + pkt_len_plus_padd =3D ((pkt_len + 7 + (ax179_data->ip_align ? 2 : 0)) & = 0x7FFF8); + + pkt_end +=3D pkt_len_plus_padd; + if (pkt_end > hdr_off || (pkt_cnt =3D=3D 0 && pkt_end !=3D hdr_off)) + goto err; + + if (pkt_desc & AX179A_RX_PD_DROP || !(pkt_desc & AX179A_RX_PD_RX_OK) || + pkt_len > (dev->hard_mtu + AX179A_RX_HW_PAD) || pkt_len < 2 + ETH_HL= EN) { + skb_pull(skb, pkt_len_plus_padd); + + /* Next RX Packet Descriptor */ + pkt_desc_ptr++; + continue; + } + + ax_skb =3D netdev_alloc_skb_ip_align(dev->net, pkt_len); + if (!ax_skb) + goto err; + + skb_put(ax_skb, pkt_len); + memcpy(ax_skb->data, skb->data + (ax179_data->ip_align ? AX179A_RX_HW_PA= D : 0), + pkt_len); + + if (ax179_data->rx_checksum) + ax88179a_rx_checksum(ax_skb, pkt_desc); + + if (pkt_desc & AX179A_RX_PD_VLAN) { + vlan_tag =3D pkt_desc >> AX179A_RX_PD_VLAN_SHIFT; + __vlan_hwaccel_put_tag(ax_skb, htons(ETH_P_8021Q), vlan_tag); + } + + usbnet_skb_return(dev, ax_skb); + skb_pull(skb, pkt_len_plus_padd); + + /* Next RX Packet Header */ + pkt_desc_ptr++; + } + + return 1; + +err: + return 0; +} + +static struct sk_buff *ax88179a_tx_fixup(struct usbnet *dev, struct sk_buf= f *skb, gfp_t flags) +{ + u64 tx_desc =3D skb->len & AX179A_TX_DESC_LEN_MASK; + int frame_size =3D dev->maxpacket; + struct sk_buff *ax_skb; + u64 *tx_desc_ptr; + int padding_size; + int headroom; + int tailroom; + u16 tci =3D 0; + + /* TSO MSS */ + tx_desc |=3D FIELD_PREP(AX179A_TX_DESC_MSS, (u64)skb_shinfo(skb)->gso_siz= e); + + headroom =3D (skb->len + sizeof(tx_desc)) % 8; + padding_size =3D headroom ? 8 - headroom : 0; + + if (((skb->len + sizeof(tx_desc) + padding_size) % frame_size) =3D=3D 0) { + padding_size +=3D 8; + tx_desc |=3D AX179A_TX_DESC_DROP_PADD; + } + + if ((dev->net->features & NETIF_F_HW_VLAN_CTAG_TX) && (vlan_get_tag(skb, = &tci) >=3D 0)) { + tx_desc |=3D AX179A_TX_DESC_VLAN; + tx_desc |=3D FIELD_PREP(AX179A_TX_DESC_VLAN_ID, (u64)tci); + } + + if (!dev->can_dma_sg && (dev->net->features & NETIF_F_SG) && skb_lineariz= e(skb)) { + dev_kfree_skb_any(skb); + return NULL; + } + + headroom =3D skb_headroom(skb); + tailroom =3D skb_tailroom(skb); + + if (!(headroom >=3D sizeof(tx_desc) && tailroom >=3D padding_size)) { + ax_skb =3D skb_copy_expand(skb, sizeof(tx_desc), padding_size, flags); + dev_kfree_skb_any(skb); + skb =3D ax_skb; + if (!skb) + return NULL; + } + if (padding_size !=3D 0) + skb_put_zero(skb, padding_size); + /* Copy TX header */ + tx_desc_ptr =3D skb_push(skb, sizeof(tx_desc)); + put_unaligned_le64(tx_desc, tx_desc_ptr); + + usbnet_set_skb_tx_stats(skb, 1, 0); + + return skb; +} + +static int ax88179a_reset(struct usbnet *dev) +{ + struct ax88179_data *ax179_data =3D dev->driver_priv; + u16 *tmp16; + u8 buf[5]; + u16 rxctl; + u8 *tmp; + + tmp16 =3D (u16 *)buf; + tmp =3D (u8 *)buf; + + /* Power up ethernet PHY */ + ax88179_write_u8(dev, AX88179A_PHY_POWER, 0, 0, AX_PHY_POWER); + msleep(250); + + /* Ethernet PHY Auto Detach*/ + ax88179a_auto_detach(dev); + + ax88179_write_u8(dev, AX_ACCESS_MAC, AX88179A_MAC_BULK_OUT_CTRL, 1, AX_MA= C_EFF_EN); + + ax88179_write_u16(dev, AX_ACCESS_MAC, AX_RX_CTL, 2, 0); + + ax88179_write_u8(dev, AX_ACCESS_MAC, AX_PAUSE_WATERLVL_LOW, 1, 0x04); + ax88179_write_u8(dev, AX_ACCESS_MAC, AX_PAUSE_WATERLVL_HIGH, 1, 0x10); + + *tmp =3D 0; + if (dev->net->features & NETIF_F_HW_VLAN_CTAG_FILTER) + *tmp |=3D AX_VLAN_CONTROL_VFE; + if (dev->net->features & NETIF_F_HW_VLAN_CTAG_RX) + *tmp |=3D AX_VLAN_CONTROL_VSO; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, 1, 1, tmp= ); + + ax88179_write_u8(dev, AX_ACCESS_MAC, AX88179A_MAC_BM_INT_MASK, 1, 0xff); + + ax88179_write_u8(dev, AX_ACCESS_MAC, AX88179A_MAC_BM_RX_DMA_CTL, 1, 0); + ax88179_write_u8(dev, AX_ACCESS_MAC, AX88179A_MAC_BM_TX_DMA_CTL, 1, 0); + ax88179_write_u8(dev, AX_ACCESS_MAC, AX88179A_MAC_ARC_CTRL, 1, 0); + ax88179_write_u8(dev, AX_ACCESS_MAC, AX88179A_MAC_SWP_CTRL, 1, 0); + ax88179_write_u8(dev, AX_ACCESS_MAC, AX88179A_MAC_TX_HDR_CKSUM, 1, 0); + + /* Read MAC address from DTB or asix chip */ + ax88179_get_mac_addr(dev); + memcpy(dev->net->perm_addr, dev->net->dev_addr, ETH_ALEN); + + /* The Bulk-Register configuration for the AX88179A is done in + * ax88179a_mac_link_up(), once the link is up for a given link and USB-s= peed. + */ + if (ax179_data->is_ax88772d) + dev->rx_urb_size =3D 1024 * 24; + else + dev->rx_urb_size =3D 1024 * 48; + + /* Enable checksum offload */ + if (dev->net->features & NETIF_F_RXCSUM) { + ax88179_write_u8(dev, AX_ACCESS_MAC, AX_RXCOE_CTL, 1, + AX_RXCOE_IP | AX_RXCOE_TCP | AX_RXCOE_UDP | + AX_RXCOE_TCPV6 | AX_RXCOE_UDPV6); + ax179_data->rx_checksum =3D 1; + } else { + ax179_data->rx_checksum =3D 0; + ax88179_write_u8(dev, AX_ACCESS_MAC, AX_RXCOE_CTL, 1, 0); + } + + ax88179_write_u8(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, 1, + AX_TXCOE_IP | AX_TXCOE_TCP | AX_TXCOE_UDP | + AX_TXCOE_TCPV6 | AX_TXCOE_UDPV6); + + /* Configure RX control register =3D> start operation */ + rxctl =3D AX_RX_CTL_DROPCRCERR | AX_RX_CTL_START | AX_RX_CTL_AP | + AX_RX_CTL_AMALL | AX_RX_CTL_AB; + if (ax179_data->ip_align) + rxctl |=3D AX_RX_CTL_IPE; + if (dev->net->flags & IFF_PROMISC) + rxctl |=3D AX_RX_CTL_PRO; + WRITE_ONCE(ax179_data->rxctl, rxctl); + ax88179_write_u16(dev, AX_ACCESS_MAC, AX_RX_CTL, 2, rxctl); + + if (ax179_data->chip_version < AX_VERSION_AX88179A) + *tmp =3D AX_MONITOR_MODE_PMETYPE | AX_MONITOR_MODE_PMEPOL | AX_MONITOR_M= ODE_RWMP; + else + *tmp =3D AX_MONITOR_MODE_RWMP; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MONITOR_MOD, 1, 1, tmp); + + /* Configure default medium type =3D> giga */ + *tmp16 =3D AX_MEDIUM_RECEIVE_EN | AX_MEDIUM_TXFLOW_CTRLEN | + AX_MEDIUM_RXFLOW_CTRLEN | AX_MEDIUM_FULL_DUPLEX; + if (!ax179_data->is_ax88772d) + *tmp16 |=3D AX_MEDIUM_GIGAMODE; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE, 2, 2, tmp16); + + /* Check if WoL is supported */ + ax179_data->wol_supported =3D 0; + if (ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_MONITOR_MOD, + 1, 1, tmp) > 0) + ax179_data->wol_supported =3D WAKE_MAGIC | WAKE_PHY; + + /* Ensure EEE state is off, consistent with phylink setup */ + ax88179_write_cmd(dev, AX_GPHY_CTL, AX_GPHY_EEE_CTRL, false, 0, NULL); + + phylink_start(ax179_data->phylink); + + return 0; +} + +static int ax88179a_stop(struct usbnet *dev) +{ + struct ax88179_data *ax179_data =3D dev->driver_priv; + u16 reg16; + + phylink_stop(ax179_data->phylink); + + ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE, 2, 2, ®16); + reg16 &=3D ~AX_MEDIUM_RECEIVE_EN; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE, 2, 2, ®16= ); + + ax88179_write_u16(dev, AX_ACCESS_MAC, AX_RX_CTL, 2, 0); + + ax88179_write_u8(dev, AX88179A_PHY_POWER, 0, 0, 0); + + return 0; +} + +const struct driver_info ax88179a_info =3D { + .description =3D "ASIX AX88179A USB 3.2 Gigabit Ethernet", + .bind =3D ax88179a_bind, + .unbind =3D ax88179a_unbind, + .status =3D ax88179a_status, + .reset =3D ax88179a_reset, + .stop =3D ax88179a_stop, + .flags =3D FLAG_ETHER | FLAG_FRAMING_AX | FLAG_MULTI_PACKET | FLAG_AVOID_= UNLINK_URBS, + .rx_fixup =3D ax88179a_rx_fixup, + .tx_fixup =3D ax88179a_tx_fixup, +}; + +const struct driver_info ax88772d_info =3D { + .description =3D "ASIX AX88772D/E USB 2.0 Fast Ethernet", + .bind =3D ax88179a_bind, + .unbind =3D ax88179a_unbind, + .status =3D ax88179a_status, + .reset =3D ax88179a_reset, + .stop =3D ax88179a_stop, + .flags =3D FLAG_ETHER | FLAG_FRAMING_AX | FLAG_MULTI_PACKET | FLAG_AVOID_= UNLINK_URBS, + .rx_fixup =3D ax88179a_rx_fixup, + .tx_fixup =3D ax88179a_tx_fixup, +}; + +const struct driver_info ax88279_info =3D { + .description =3D "ASIX AX88279 USB 3.2 2.5Gigabit Ethernet", + .bind =3D ax88179a_bind, + .unbind =3D ax88179a_unbind, + .status =3D ax88179a_status, + .reset =3D ax88179a_reset, + .stop =3D ax88179a_stop, + .flags =3D FLAG_ETHER | FLAG_FRAMING_AX | FLAG_MULTI_PACKET | FLAG_AVOID_= UNLINK_URBS, + .rx_fixup =3D ax88179a_rx_fixup, + .tx_fixup =3D ax88179a_tx_fixup, +}; --=20 2.47.3 From nobody Tue Sep 29 08:26:18 2026 Received: from bkemail.birger-koblitz.de (bkemail.birger-koblitz.de [23.88.97.239]) (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 7EF234D0CD0; Tue, 29 Sep 2026 03:19:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=23.88.97.239 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651974; cv=none; b=kyV3KgvWzklwSVhOqs77jVz4iGobmRos5UVjJhCMPGr00VHNMF6MhdzEYsgSBJFS9W7Td6zcguzmTPXhH8wn7uzV6Rv4C65iRuhVmO+TkQNuiGgSiDsQboarPtV9HU3sszdUgCqtGMSWtmvd5BJYI6C9UpkbHq6p5WnPTwGOSTg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651974; c=relaxed/simple; bh=kO/E0+66Aeswq0UC8BtggpSkLfEi2Vb5MPs3YzxqsDo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KdGBF1geK4EitBoKVYJ2hqKpWgHnNGPTsdXUY8r3+vrbvk61bBBBtQYK2PujODEW6qRZZmDeKEPiLAECfd34DHq8e4vLyu56R6oftQ4qDUAmu4dqK9/NIQgD2cfCi/9D9M1eJ9Uu0jFdHKIaj2BCag9IGyA1VhNs6NjHPGxjWZg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de; spf=pass smtp.mailfrom=birger-koblitz.de; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=2Iw1ddAg; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=FnFyrZ9J; arc=none smtp.client-ip=23.88.97.239 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="2Iw1ddAg"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="FnFyrZ9J" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651954; bh=kO/E0+66Aeswq0UC8BtggpSkLfEi2Vb5MPs3YzxqsDo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=2Iw1ddAgzDDmPCo1HGeVv3l4fmKmaZqyta8wYqzxT6qtKouyBVNaF5rMmg1o3fLn7 6wER0HcdgYPZT21VZb4NK50PpepKX85wKApQTUhtt8AogMCr2tHp87lDePB/oYjWrg cH0PK7bzdLYxapnWpma/GYtgMs/6kMlCGN8JloOLMo1bLDC3aGaTmMTNhOiArkc6iz 7PGUGjZj5r8zUdfHJeXaWOucYs5GrJQ89lzsVl4QbTXQzBwB4ScXARWjm0Wghdkp0j s/bn6NBTbtR3WuKmj4nReBTUtkn2EfTcdiAKwRT3RNkmSy6xJ09mg2eZZ64R8z0zw2 3Kxrry4tRDP9w== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id 33E5742285; Tue, 29 Sep 2026 03:19:14 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651939; bh=kO/E0+66Aeswq0UC8BtggpSkLfEi2Vb5MPs3YzxqsDo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=FnFyrZ9JKvt8EW5ehPP8GWO5vBGB3lje0oacEoQa7Uw3PDi/76TuUv3GqH6DjD78F BSUJ6PgLmy+ov4R9X1pj8qyPEIDh62F9QmLLB2yvUyISPLP3JEgSAFrlzpek1C2Za4 8WOyKPugvnXMKf9L4dl4dabhQQAnsM9ySnsAJK5MomYhA5niVxn6Sa32F1vJJ/Xh0g Q0eeJVjkQtQ/q1dYqVQyrhWmjETYHM2uTZNaNn5GNjpEw7aI7nzrg0E3VdL2s3HeXO mqTjl4itXWJwjSBHHPpgMFEqnmEW8ce5aQQnA9/5MmUczP8yKzyFvFntWU856J18HI /SE81CddUC68A== Received: from AMDDesktop.lan (p5dd1eaf2.dip0.t-ipconnect.de [93.209.234.242]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id 6E0BD4225D; Tue, 29 Sep 2026 03:18:59 +0000 (UTC) From: Birger Koblitz Date: Tue, 29 Sep 2026 05:18:54 +0200 Subject: [PATCH net-next v14 06/14] ax88179_178a: Add EEE configuration support for AX88179A MACs Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260929-ax88179a-v14-6-a1f2249e42ea@birger-koblitz.de> References: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> In-Reply-To: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit , Huacai Chen , WANG Xuerui Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, Jianhui Xu , Birger Koblitz X-Mailer: b4 0.14.2 The AX88179A uses a simple HW configuration for EEE via a single EEE configuration register without LPI timer support Add support for setting this EEE enable/disable register in implementations of mac_enable_tx_lpi/mac_disable_tx_lpi. Signed-off-by: Birger Koblitz Reviewed-by: Andrew Lunn Tested-by: Jianhui Xu --- drivers/net/usb/ax88179a_devices.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/net/usb/ax88179a_devices.c b/drivers/net/usb/ax88179a_= devices.c index b15eddb0ebe290fcd6da7653afec19918a47717a..96748ca49743dcaef71bbf649a5= 43508be01b8e6 100644 --- a/drivers/net/usb/ax88179a_devices.c +++ b/drivers/net/usb/ax88179a_devices.c @@ -395,10 +395,27 @@ static void ax88179a_mac_link_up(struct phylink_confi= g *config, AX_MAC_RX_PATH_READY | AX_MAC_TX_PATH_READY); } =20 +static void ax88179a_mac_disable_tx_lpi(struct phylink_config *config) +{ + struct usbnet *dev =3D netdev_priv(to_net_dev(config->dev)); + + ax88179_write_cmd(dev, AX_GPHY_CTL, AX_GPHY_EEE_CTRL, false, 0, NULL); +} + +static int ax88179a_mac_enable_tx_lpi(struct phylink_config *config, u32 t= imer, bool tx_clk_stop) +{ + struct usbnet *dev =3D netdev_priv(to_net_dev(config->dev)); + + /* AX88179A does not provide LPI timer registers */ + return ax88179_write_cmd(dev, AX_GPHY_CTL, AX_GPHY_EEE_CTRL, true, 0, NUL= L); +} + static const struct phylink_mac_ops ax88179a_phylink_mac_ops =3D { .mac_config =3D ax88179a_mac_config, .mac_link_down =3D ax88179a_mac_link_down, .mac_link_up =3D ax88179a_mac_link_up, + .mac_disable_tx_lpi =3D ax88179a_mac_disable_tx_lpi, + .mac_enable_tx_lpi =3D ax88179a_mac_enable_tx_lpi, }; =20 static int ax88179a_phylink_setup(struct usbnet *dev) --=20 2.47.3 From nobody Tue Sep 29 08:26:18 2026 Received: from bkemail.birger-koblitz.de (bkemail.birger-koblitz.de [23.88.97.239]) (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 7CE304D0A1E; Tue, 29 Sep 2026 03:19:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=23.88.97.239 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651971; cv=none; b=iJvzvMnpcmGbMcVO6iKdkcV2Rg/RYkMDDZ/rmPcd351WOS/NqWU3/vTD3gI+wuLKbSpE1r3aWr2ym0qMyXAdhqZVNpYrsFSBhUjd9cxFUI2gv/xlhCl/HR63h6tY94FJPlJvVZnJRT9VFdM+ME09eGEj4cORJSEVWRRkU/IDJLE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651971; c=relaxed/simple; bh=jBZVvx+tFxcAcqhGb5gfAVEGyHbhwI7uGLasNYH0V/M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=g+9BpygVNX5nbz6zbX6IMPagVbyjxPHzb8aTUJPou/7z5Ca2sWrahV+ms7AkOmTt1qwxug6cnxjoTDFSB+yM3Q26CODn5HX7tPkk8uZPsRz+EIkIiHer2lc4Qfyzsew9eOF7QFpIqxyOvJI5tS7B4I4w/0ypfldYA808cimRW38= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de; spf=pass smtp.mailfrom=birger-koblitz.de; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=oTcdtM+q; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=uCbEtlY1; arc=none smtp.client-ip=23.88.97.239 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="oTcdtM+q"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="uCbEtlY1" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651956; bh=jBZVvx+tFxcAcqhGb5gfAVEGyHbhwI7uGLasNYH0V/M=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=oTcdtM+qAzT5iFjiSCc0cSKQdIGemOLJ9L+iYqXy0uTHis6Zgrh8csIl3J9GZ/jR9 hl2O4F1DBsaE+0/79bfKcOUeanrbotwTSHId8x3u4Tgtq/2tP5N4wwfQyo3mkao79L gcpd2yLSolsUOJLW9IiHeaDvgBbo7ioD4TsNqdgo/5te3EAW8eSRKbl+ldlBV9VP2C wYc16mRTBhAeVaU2v2dGupMSRYHXSqRT0QrY0Byb6ua0JnmAVLL5ip6Z9tLComskIt EuDt+dj9qJQORAw1d/hj+qavuphEvgnhGUdm1Z4YqflggpUESRxAP6cfmkTvCajZ3D 66f71yfIAUyPQ== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id F12A7422CA; Tue, 29 Sep 2026 03:19:16 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651939; bh=jBZVvx+tFxcAcqhGb5gfAVEGyHbhwI7uGLasNYH0V/M=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=uCbEtlY18OCDyRBYl974RpWS6fGfh1Yp7H31b4SWquGN0lM3Kzu/XdmXDw6xJpq9U JdNC23yaIXqWtvV0NtlqTmIebw0A2L46ZDWJhv6nFon3Ow8QGlkjrY6x2Gtq5Jrba9 Q9SSkYxZoeEpmMLfat8Msbe2oSWr69yPbCebapgjNxX6px696lGfB4ra0NXwGiP1Dw My3lBFoMfNjZY0Jmj4kIPqA8I61GyiQmCnBAO3vuc5lNF2CCTPYmasC3r+aa2k1UMQ jHKgpoGr1gxgeXFaHlRpoP2PxrvF6NAUb96U1cJAaoA40CxMujVDg6fmAGlq2R5/F4 ddcvWtqrMzpUg== Received: from AMDDesktop.lan (p5dd1eaf2.dip0.t-ipconnect.de [93.209.234.242]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id AC64B4225E; Tue, 29 Sep 2026 03:18:59 +0000 (UTC) From: Birger Koblitz Date: Tue, 29 Sep 2026 05:18:55 +0200 Subject: [PATCH net-next v14 07/14] ax88179_178a: Add EEE configuration support for AX88179A PHYs Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260929-ax88179a-v14-7-a1f2249e42ea@birger-koblitz.de> References: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> In-Reply-To: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit , Huacai Chen , WANG Xuerui Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, Jianhui Xu , Birger Koblitz , Nicolai Buchwitz X-Mailer: b4 0.14.2 Configure phylink to work with the PHYs in the AX88179A controllers and provide ethtool get/set eee operations calling into phylink. Signed-off-by: Birger Koblitz Reviewed-by: Andrew Lunn Reviewed-by: Nicolai Buchwitz Tested-by: Jianhui Xu --- drivers/net/usb/ax88179a_devices.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/net/usb/ax88179a_devices.c b/drivers/net/usb/ax88179a_= devices.c index 96748ca49743dcaef71bbf649a543508be01b8e6..e2ea9724433929d4cbfba059778= 7ddcb84dacf98 100644 --- a/drivers/net/usb/ax88179a_devices.c +++ b/drivers/net/usb/ax88179a_devices.c @@ -225,6 +225,20 @@ static int ax88179a_get_eeprom_len(struct net_device *= net) return AX88179A_EEPROM_LEN; } =20 +static int ax88179a_get_eee(struct net_device *net, struct ethtool_keee *e= data) +{ + struct ax88179_data *ax179_data =3D netdev2data(net); + + return phylink_ethtool_get_eee(ax179_data->phylink, edata); +} + +static int ax88179a_set_eee(struct net_device *net, struct ethtool_keee *e= data) +{ + struct ax88179_data *ax179_data =3D netdev2data(net); + + return phylink_ethtool_set_eee(ax179_data->phylink, edata); +} + static const struct ethtool_ops ax88179a_ethtool_ops =3D { .get_link =3D ethtool_op_get_link, .get_msglevel =3D usbnet_get_msglevel, @@ -234,6 +248,8 @@ static const struct ethtool_ops ax88179a_ethtool_ops = =3D { .get_eeprom_len =3D ax88179a_get_eeprom_len, .get_eeprom =3D ax88179_get_eeprom, .set_eeprom =3D ax88179_set_eeprom, + .get_eee =3D ax88179a_get_eee, + .set_eee =3D ax88179a_set_eee, .nway_reset =3D phy_ethtool_nway_reset, .get_link_ksettings =3D ax88179a_get_link_ksettings, .set_link_ksettings =3D ax88179a_set_link_ksettings, @@ -451,6 +467,10 @@ static int ax88179a_phylink_setup(struct usbnet *dev) phy_if_mode =3D PHY_INTERFACE_MODE_SGMII; } =20 + memcpy(data->phylink_config.lpi_interfaces, + data->phylink_config.supported_interfaces, + sizeof(data->phylink_config.lpi_interfaces)); + phylink =3D phylink_create(&data->phylink_config, dev->net->dev.fwnode, phy_if_mode, &ax88179a_phylink_mac_ops); if (IS_ERR(phylink)) --=20 2.47.3 From nobody Tue Sep 29 08:26:18 2026 Received: from bkemail.birger-koblitz.de (bkemail.birger-koblitz.de [23.88.97.239]) (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 A925343E09A; Tue, 29 Sep 2026 03:19:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=23.88.97.239 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651971; cv=none; b=FLeKdj8rqAaXarVhDP4UlG42IAa0hLe6j9DdVc3bnMtLx0JwnBUMxNWz7ki/+VwvlDkNZ41Iss2itBnUDRn6kpVi/0w41zQAGhB9s61Yy1OXbzOQ+RTRwgPHLf/qTShzBOLMgQ9NHNO83dAqiF1FIZeyXQfeFJmJq1IRmFE4ZFE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651971; c=relaxed/simple; bh=czvZ5IkrDTQqIInhjHSyPHYhske8wESFBzUsuaxF1b0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RsmU0UK5h5DZW5dkcItU0NxuF6STxuTxJktS9L//emariJO50hL+FHnVA7CVEChbvceMyF/tF6Q5VxQaJ2rv/Ae9GmNSyVU9mo1MeI9cbYIMNhB/ISjeK1mDsCIE1MKy4bmmmEBl+/GI1ovL/d2B1TaZP8YvmqdZDPpvJye49yo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de; spf=pass smtp.mailfrom=birger-koblitz.de; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=Q2PRgfbn; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=SVkTMn3S; arc=none smtp.client-ip=23.88.97.239 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="Q2PRgfbn"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="SVkTMn3S" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651957; bh=czvZ5IkrDTQqIInhjHSyPHYhske8wESFBzUsuaxF1b0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Q2PRgfbnH388IPzMpWicAhSAeJZL5LvDkRGKZm4E5tZBMszvHbmQ6yiHqsVaVUFtg 8beBa5EvdRsMy+caeiG9a8mvTkdphkw6Smal8cQzl6QWc6sR5MdpfazycXnssqPbYw lb4g74uPU3+eDwNS2o7E1g0lJZJPPOncvjJ57Ywcex9pg3EccMKZG2I1Drx1GH9ayo e7s1KuooL8SdfhvhMkE7wKZmEwWfu2ZZPjT19B2d7p2RaqtVKl6IXSPWdww5CVLBSj Ezuegc1XfBrhjIGKOUI7cBzhK/g9aLCVBfOkgIh+vGqqOJ+OpnRcn11juTGujHbZm7 oDenUTjnkaa4A== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id 1F2C3422CD; Tue, 29 Sep 2026 03:19:17 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651940; bh=czvZ5IkrDTQqIInhjHSyPHYhske8wESFBzUsuaxF1b0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=SVkTMn3SdBSxovFrTjcJKmC+FaX/vgms7S/iGslS0pUmZ51D4CL/wXIgZ+mwbjzUu gxAvRxvqsnEdp6WOAjrx+VSCM752UP0BG1PL9THrN4m0YvAVSdAAlh+NFfN0TuQRte dk6MYXXycO789V2JOyYOICvbbcRtsFYisCtKzzLNaNiBW94FRM10DUfCgFeMxlTzw3 lezbGsnJ6W0IzUV9p5QweBxFsuGmnVy06xvgXjN1ubxw8Xo/5oYTVVz69iBlN7pyKJ Ja76zw8WaOdCvx8o5cy7Ebl7WxyWsSbmeDKLljp94Wgjrs/qp0Fb+jarEWM62K3Avh Gfy+55omLlo+g== Received: from AMDDesktop.lan (p5dd1eaf2.dip0.t-ipconnect.de [93.209.234.242]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id EECFE4225F; Tue, 29 Sep 2026 03:18:59 +0000 (UTC) From: Birger Koblitz Date: Tue, 29 Sep 2026 05:18:56 +0200 Subject: [PATCH net-next v14 08/14] ax88179_178a: Add VLAN offload support for AX88179A Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260929-ax88179a-v14-8-a1f2249e42ea@birger-koblitz.de> References: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> In-Reply-To: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit , Huacai Chen , WANG Xuerui Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, Jianhui Xu , Birger Koblitz X-Mailer: b4 0.14.2 The AX88179A-based chips support VLAN offload. Add configuration support in netdev_ops. Features supported are: NETIF_F_HW_VLAN_CTAG_TX, NETIF_F_HW_VLAN_CTAG_RX and NETIF_F_HW_VLAN_CTAG_FILTER. Signed-off-by: Birger Koblitz Reviewed-by: Andrew Lunn Tested-by: Jianhui Xu --- drivers/net/usb/ax88179a_devices.c | 141 +++++++++++++++++++++++++++++++++= +++- 1 file changed, 140 insertions(+), 1 deletion(-) diff --git a/drivers/net/usb/ax88179a_devices.c b/drivers/net/usb/ax88179a_= devices.c index e2ea9724433929d4cbfba0597787ddcb84dacf98..febb4b0ef12895414f9bdea9163= 15d6d48246ab8 100644 --- a/drivers/net/usb/ax88179a_devices.c +++ b/drivers/net/usb/ax88179a_devices.c @@ -258,6 +258,88 @@ static const struct ethtool_ops ax88179a_ethtool_ops = =3D { .get_ts_info =3D ethtool_op_get_ts_info, }; =20 +static int ax88179a_vlan_rx_kill_vid(struct net_device *net, __be16 proto,= u16 vid) +{ + struct usbnet *dev =3D netdev_priv(net); + u8 vlan_ctrl; + int ret =3D 0; + u16 reg16; + u8 reg8; + + ret =3D ax88179_read_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, 1,= 1, ®8); + if (ret < 0) + return ret; + vlan_ctrl =3D reg8; + + /* Address */ + reg8 =3D (vid / 16); + ret =3D ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_ADDRESS, 1= , 1, ®8); + if (ret < 0) + return ret; + + /* Data */ + reg8 =3D vlan_ctrl | AX_VLAN_CONTROL_RD; + ret =3D ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, 1= , 1, ®8); + if (ret < 0) + return ret; + + ret =3D ax88179_read_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_DATA0, 2, 2= , ®16); + if (ret < 0) + return ret; + reg16 &=3D ~(1 << (vid % 16)); + ret =3D ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_DATA0, 2, = 2, ®16); + if (ret < 0) + return ret; + + reg8 =3D vlan_ctrl | AX_VLAN_CONTROL_WE; + ret =3D ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, 1= , 1, ®8); + if (ret < 0) + return ret; + + return 0; +} + +static int ax88179a_vlan_rx_add_vid(struct net_device *net, __be16 proto, = u16 vid) +{ + struct usbnet *dev =3D netdev_priv(net); + u8 vlan_ctrl; + int ret =3D 0; + u16 reg16; + u8 reg8; + + ret =3D ax88179_read_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, 1,= 1, ®8); + if (ret) + return ret; + vlan_ctrl =3D reg8; + + /* Address */ + reg8 =3D (vid / 16); + ret =3D ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_ADDRESS, 1= , 1, ®8); + if (ret < 0) + return ret; + + /* Data */ + reg8 =3D vlan_ctrl | AX_VLAN_CONTROL_RD; + ret =3D ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, 1= , 1, ®8); + if (ret < 0) + return ret; + + ax88179_read_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_DATA0, 2, 2, ®16= ); + if (ret < 0) + return ret; + reg16 |=3D (1 << (vid % 16)); + ret =3D ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_DATA0, 2, = 2, ®16); + if (ret < 0) + return ret; + + reg8 =3D vlan_ctrl | AX_VLAN_CONTROL_WE; + ret =3D ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, 1= , 1, ®8); + if (ret < 0) + return ret; + + return 0; +} + static void ax88179a_mdio_unregister(struct ax88179_data *data) { mdiobus_unregister(data->mdio); @@ -517,6 +599,58 @@ static int ax88179a_mii_ioctl(struct net_device *net, = struct ifreq *rq, int cmd) return phylink_mii_ioctl(data->phylink, rq, cmd); } =20 +static int ax88179a_set_features(struct net_device *net, netdev_features_t= features) +{ + struct usbnet *dev =3D netdev_priv(net); + netdev_features_t changed; + int ret; + u8 tmp; + + changed =3D net->features ^ features; + + ret =3D ax88179_set_features(net, features); + if (ret) + return ret; + + if (changed & NETIF_F_HW_VLAN_CTAG_FILTER) { + if (features & NETIF_F_HW_VLAN_CTAG_FILTER) { + for (int i =3D 0; i < 256; i++) { + /* Address */ + tmp =3D i; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_ADDRESS, + 1, 1, &tmp); + /* Data */ + ax88179_write_u16(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_DATA0, + 2, 0); + ax88179_write_u8(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, + 1, AX_VLAN_CONTROL_WE); + } + ret =3D ax88179_read_cmd(dev, AX_ACCESS_MAC, + AX88179A_VLAN_ID_CONTROL, 1, 1, &tmp); + if (ret < 0) + return ret; + tmp ^=3D AX_VLAN_CONTROL_VFE; + ret =3D ax88179_write_cmd(dev, AX_ACCESS_MAC, + AX88179A_VLAN_ID_CONTROL, 1, 1, &tmp); + if (ret < 0) + return ret; + } + } + + if (changed & NETIF_F_HW_VLAN_CTAG_RX) { + ret =3D ax88179_read_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, + 1, 1, &tmp); + if (ret < 0) + return ret; + tmp ^=3D AX_VLAN_CONTROL_VSO; + ret =3D ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, + 1, 1, &tmp); + if (ret < 0) + return ret; + } + return 0; +} + static const struct net_device_ops ax88179a_netdev_ops =3D { .ndo_open =3D usbnet_open, .ndo_stop =3D usbnet_stop, @@ -527,6 +661,9 @@ static const struct net_device_ops ax88179a_netdev_ops = =3D { .ndo_set_mac_address =3D ax88179_set_mac_addr, .ndo_validate_addr =3D eth_validate_addr, .ndo_eth_ioctl =3D ax88179a_mii_ioctl, + .ndo_set_features =3D ax88179a_set_features, + .ndo_vlan_rx_add_vid =3D ax88179a_vlan_rx_add_vid, + .ndo_vlan_rx_kill_vid =3D ax88179a_vlan_rx_kill_vid, }; =20 static int ax88179a_bind(struct usbnet *dev, struct usb_interface *intf) @@ -611,9 +748,11 @@ static int ax88179a_bind(struct usbnet *dev, struct us= b_interface *intf) dev->mii.supports_gmii =3D 1; =20 dev->net->features |=3D NETIF_F_SG | NETIF_F_IP_CSUM | - NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM | NETIF_F_TSO; + NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM | NETIF_F_TSO | + NETIF_F_HW_VLAN_CTAG_TX; =20 dev->net->hw_features |=3D dev->net->features; + dev->net->hw_features |=3D NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG= _FILTER; =20 dev->net->vlan_features =3D NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM | NETIF_F_TSO; --=20 2.47.3 From nobody Tue Sep 29 08:26:18 2026 Received: from bkemail.birger-koblitz.de (bkemail.birger-koblitz.de [23.88.97.239]) (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 8749143935C; Tue, 29 Sep 2026 03:19:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=23.88.97.239 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651971; cv=none; b=RuzJOR12kDKEqheTamjDWE5xlwrhHsgahOETtILwVlG/U7jd0dKaj8m0IRwKH3hFPdWRRI+A/gsMvbODF3EpNTn8xrmlATPElbcI4+zMxU/EJGsDBH4bWXQC7vnKDKynqP6wPEW/AnZVJY3gkDVUAVcrAjZ/5s/DrYqwQbjxHU0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651971; c=relaxed/simple; bh=u9VXc9S//nuNIIsDhxbeO6zYd6QGTnX0KP6xK7MtocY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=c0yk1nXok47yJ0buyRDRwQ1UUDzWyzKVtarMFrqAU0IUqyd/pxwdMRnz/t8+rTzuynKEJLYz7TMggT2M5zKWHLpW8rHt3enNgznSgsOlyNoNfF1YIzNti2ungVIhpCrlGH8FGJEFlhnebnUuvkos0JuIYFI5YtBl1Eocag+iDQk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de; spf=pass smtp.mailfrom=birger-koblitz.de; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=ImvqYy+M; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=w/ch51bz; arc=none smtp.client-ip=23.88.97.239 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="ImvqYy+M"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="w/ch51bz" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651958; bh=u9VXc9S//nuNIIsDhxbeO6zYd6QGTnX0KP6xK7MtocY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ImvqYy+MwuSKjZL6Zb55jY16rONpMoJYOeYf/kncqBAth7f6wDWZZca8b7mdj1qMu p9o9VUiG4yPvT+4BK3xRF+KEo1OaNo88JXMWdgAg0iv/MzY63UuG2etUgN5K4+S4cD GpMb36dA0O0B2OebdkMZu1JA7bmg/UeDGG4lF024tUSs6wbMXxLyiENOxnrW0ZWZFN ReFPqPOyL6AWB9pXLDn7YOF65ar1gzXwawMwAhKC0KdN479FGFj+MKTsjnkpn3RbJ+ 9H9MDtnneX6DVqv7knkqj63X39MuKgYPvbBdBfJrTxlyvQTnaDATxCs9VoOyVC6uKz bp8veL0fdxzUw== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id C530C4226B; Tue, 29 Sep 2026 03:19:18 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651940; bh=u9VXc9S//nuNIIsDhxbeO6zYd6QGTnX0KP6xK7MtocY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=w/ch51bzugUbLkx5Kdn4G6hw0hOwwTpWI++3fdfIqaMNXF/0dqlP8gDOqe+fW5ynn aWBbTfyPWxMkyxu5pju5BA+SKr61TIKMDbEpkgocYIOjXQ2QrAUGPv8rN4RCsvjx3o MiAiWe/wPnLKU57STu/bbV9/0pydi6AhhRGlR6ECrL93NGcquYShzuhnbRIvUvFDBg 8yzaTsuFwUc5UDNZY9fdtD9MV+yMF8pXzsvleYv+W9GGjQ333FEnm4llumJbCzPL4+ o6mGD52NXcYeqGE3HNa3nacy6Q3OtLfpZKxVBgWSgrFNS/AgBxn/X5yt68XZq/nVoq QxmmlyqB7O4rQ== Received: from AMDDesktop.lan (p5dd1eaf2.dip0.t-ipconnect.de [93.209.234.242]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id 3758342263; Tue, 29 Sep 2026 03:19:00 +0000 (UTC) From: Birger Koblitz Date: Tue, 29 Sep 2026 05:18:57 +0200 Subject: [PATCH net-next v14 09/14] ax88179_178a: Add AX179A/AX279 multicast configuration Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260929-ax88179a-v14-9-a1f2249e42ea@birger-koblitz.de> References: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> In-Reply-To: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit , Huacai Chen , WANG Xuerui Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, Jianhui Xu , Birger Koblitz X-Mailer: b4 0.14.2 Add support for conditionally setting the ip_alignement flag AX_RX_CTL_IPE in AX_RX_CTL and make sure that AX_RX_CTL_DROPCRCERR is also set to be consistent with the initial configuration in ax88179_reset() Signed-off-by: Birger Koblitz Reviewed-by: Andrew Lunn Tested-by: Jianhui Xu --- drivers/net/usb/ax88179_lib.c | 8 ++++++-- drivers/net/usb/ax88179a_devices.c | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/usb/ax88179_lib.c b/drivers/net/usb/ax88179_lib.c index 53ccfc5d56c24eff102fc94f631d50d2d2ec1abd..6ec662780483e94f9606f05f253= 106b8a6856d43 100644 --- a/drivers/net/usb/ax88179_lib.c +++ b/drivers/net/usb/ax88179_lib.c @@ -321,10 +321,14 @@ int ax88179_set_eeprom(struct net_device *net, struct= ethtool_eeprom *eeprom, u8 void ax88179_set_multicast(struct net_device *net) { struct usbnet *dev =3D netdev_priv(net); - struct ax88179_data *data =3D dev->driver_priv; u8 *m_filter =3D ((u8 *)dev->data); + struct ax88179_data *data; + + data =3D dev->driver_priv; =20 - data->rxctl =3D (AX_RX_CTL_START | AX_RX_CTL_AB | AX_RX_CTL_IPE); + data->rxctl =3D (AX_RX_CTL_START | AX_RX_CTL_AB | AX_RX_CTL_DROPCRCERR); + if (data->ip_align) + data->rxctl |=3D AX_RX_CTL_IPE; =20 if (net->flags & IFF_PROMISC) { data->rxctl |=3D AX_RX_CTL_PRO; diff --git a/drivers/net/usb/ax88179a_devices.c b/drivers/net/usb/ax88179a_= devices.c index febb4b0ef12895414f9bdea916315d6d48246ab8..53ae62f2c3b06a613e118a7f05f= f63213c048e3a 100644 --- a/drivers/net/usb/ax88179a_devices.c +++ b/drivers/net/usb/ax88179a_devices.c @@ -661,6 +661,7 @@ static const struct net_device_ops ax88179a_netdev_ops = =3D { .ndo_set_mac_address =3D ax88179_set_mac_addr, .ndo_validate_addr =3D eth_validate_addr, .ndo_eth_ioctl =3D ax88179a_mii_ioctl, + .ndo_set_rx_mode =3D ax88179_set_multicast, .ndo_set_features =3D ax88179a_set_features, .ndo_vlan_rx_add_vid =3D ax88179a_vlan_rx_add_vid, .ndo_vlan_rx_kill_vid =3D ax88179a_vlan_rx_kill_vid, --=20 2.47.3 From nobody Tue Sep 29 08:26:18 2026 Received: from bkemail.birger-koblitz.de (bkemail.birger-koblitz.de [23.88.97.239]) (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 8843343CE42; Tue, 29 Sep 2026 03:19:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=23.88.97.239 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651968; cv=none; b=j190sNaJypUHGes46WO437b/vEpV9EZY3KLVms/kIFMpvnf6/mtDaFU+230PVe7SqUgEw/M5xTXX/B/PvUplNkmzsIaIVky9CsTna3tDJNssma31BdC9y1QXe+C9q8hKA8ULHELVXI3Sy2R+YDIgZodXJWTwcNkF99kg1AdqNpw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651968; c=relaxed/simple; bh=Q6mWZskOdNLI/fuETKexRVfGeFgRIaN4FDnvwvDKQOs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AnQVVHRqSiaNj18P9Yg7gpP2a88gJlISiSL+dVRncciJJueGN5VzQcyrIZI1np5ToR/o+ljPaEFmDPC5XQWbeAgrxXltIbvaVTtcuHmo5KTOua1Izls4HceUfln7tt3N98/bzu07sWyEdxyPw2Y4fAc+Ai9I4Bw640A18L36L38= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de; spf=pass smtp.mailfrom=birger-koblitz.de; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=ifIk2rZ2; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=AhPsbWIp; arc=none smtp.client-ip=23.88.97.239 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="ifIk2rZ2"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="AhPsbWIp" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651960; bh=Q6mWZskOdNLI/fuETKexRVfGeFgRIaN4FDnvwvDKQOs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ifIk2rZ2oDk1TnSmScG4Ci0x57Qfcmd+9LZphEF9O2rJq5yI1SRRfp0r2EPVAe0cy FIVxRADKVgKVRQJ0xUrftK9DklIpN02/K0hfCvfQiSmRjYqqUDtZeNJ9whSsL1Togi 5dhZLZywea2P1sOXfh76Y6XLJf/St0RnqVPlM0v7dQjrlxYUsTJRZ2IiuEDPvQqSNO 9FLkXpMBUYz7aG8akAG147sn5G31mVXf92rRC/CcAtsHXaLuE5OaodJAiURryWnq2j djxU+4rx6bXKwmdkqIMJGgqxKhWIHO5MbxQJSnzWblbfVr0uY8swMTR3j2YcHsL4JE E9A3Ds9d9BAqw== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id B45C442257; Tue, 29 Sep 2026 03:19:20 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651940; bh=Q6mWZskOdNLI/fuETKexRVfGeFgRIaN4FDnvwvDKQOs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=AhPsbWIpIT+qNMQcRwZuDflLWO0jGYgQLNBi5Xc51srtc64kA//FziuGZWrxpntHq 626ZCYVzXUUWWn3mEQIWUfx3TjTR46whZ1hS3VU28Zt8bGJAKwhZan5uzAq8dudW3h qefdPKS/5DQYgR6ZZ/0XI+5r25aJCO1yUil9zwC0jq/eYpnXfp0wyZ1xdeYLGx4de1 YwYaEGV1lLwgQToFRAlKqLBQRRYdt07z/P+RJ+UXNDKv3liLIpZE8KJ6ikbbEmkbyz 9KnICd8HC3emdNg6NCPSZlkhs55KhcUeSdDKzsz18DroOZKfnjETdaylL314GdActJ +6wrsmsYb3BQQ== Received: from AMDDesktop.lan (p5dd1eaf2.dip0.t-ipconnect.de [93.209.234.242]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id 7534642268; Tue, 29 Sep 2026 03:19:00 +0000 (UTC) From: Birger Koblitz Date: Tue, 29 Sep 2026 05:18:58 +0200 Subject: [PATCH net-next v14 10/14] ax88179_178a: Add Suspend/resume support for AX88179A/772D/279 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260929-ax88179a-v14-10-a1f2249e42ea@birger-koblitz.de> References: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> In-Reply-To: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit , Huacai Chen , WANG Xuerui Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, Jianhui Xu , Birger Koblitz X-Mailer: b4 0.14.2 The suspend and resume functions are called via the usb_driver structure, for which the driver has only a single instance. Add wrapper functions for the different implementations for the AX88179 and AX179A architecutres in ax88179_lib which calls the 2 implementations in ax88179_178a and ax88179a_devices, respectively. Signed-off-by: Birger Koblitz Suggested-by: Jianhui Xu Reviewed-by: Andrew Lunn Tested-by: Jianhui Xu --- drivers/net/usb/ax88179_178a.c | 9 ++- drivers/net/usb/ax88179_lib.c | 19 ++++++ drivers/net/usb/ax88179_lib.h | 4 ++ drivers/net/usb/ax88179a_devices.c | 115 +++++++++++++++++++++++++++++++++= +++- 4 files changed, 143 insertions(+), 4 deletions(-) diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c index 5864cf5bd5361469ad23935848a559b6fd66ed45..245ccf6896033922adcef79bd39= 5b347918f57e3 100644 --- a/drivers/net/usb/ax88179_178a.c +++ b/drivers/net/usb/ax88179_178a.c @@ -684,6 +684,9 @@ static int ax88179_bind(struct usbnet *dev, struct usb_= interface *intf) =20 dev->driver_priv =3D ax179_data; =20 + ax179_data->resume =3D ax88179_resume; + ax179_data->suspend =3D ax88179_suspend; + ret =3D ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_CHIP_STATUS, 1, 1, &ax179_data->chip_version); if (ret < 0) @@ -1355,9 +1358,9 @@ static struct usb_driver ax88179_178a_driver =3D { .name =3D "ax88179_178a", .id_table =3D products, .probe =3D usbnet_probe, - .suspend =3D ax88179_suspend, - .resume =3D ax88179_resume, - .reset_resume =3D ax88179_resume, + .suspend =3D ax88179_suspend_wrapper, + .resume =3D ax88179_resume_wrapper, + .reset_resume =3D ax88179_resume_wrapper, .disconnect =3D ax88179_disconnect, .supports_autosuspend =3D 1, .disable_hub_initiated_lpm =3D 1, diff --git a/drivers/net/usb/ax88179_lib.c b/drivers/net/usb/ax88179_lib.c index 6ec662780483e94f9606f05f253106b8a6856d43..6f32d4da601ca11d19cf428ecb7= 9206ab4460f3e 100644 --- a/drivers/net/usb/ax88179_lib.c +++ b/drivers/net/usb/ax88179_lib.c @@ -479,3 +479,22 @@ int ax88179_set_mac_addr(struct net_device *net, void = *p) return 0; } =20 +int ax88179_suspend_wrapper(struct usb_interface *intf, pm_message_t messa= ge) +{ + struct usbnet *dev =3D usb_get_intfdata(intf); + struct ax88179_data *priv; + + priv =3D dev->driver_priv; + + return priv->suspend(intf, message); +} + +int ax88179_resume_wrapper(struct usb_interface *intf) +{ + struct usbnet *dev =3D usb_get_intfdata(intf); + struct ax88179_data *priv; + + priv =3D dev->driver_priv; + return priv->resume(intf); +} + diff --git a/drivers/net/usb/ax88179_lib.h b/drivers/net/usb/ax88179_lib.h index 41d57803491ac6dfa3c896d36b3257fc3d4503db..a9235ada982b87ae570b8d921cf= 22ad7d9255b42 100644 --- a/drivers/net/usb/ax88179_lib.h +++ b/drivers/net/usb/ax88179_lib.h @@ -314,6 +314,8 @@ struct ax88179_data { struct phy_device *phydev; struct phylink *phylink; struct phylink_config phylink_config; + int (*resume)(struct usb_interface *intf); + int (*suspend)(struct usb_interface *intf, pm_message_t message); }; =20 struct ax88179_int_data { @@ -347,6 +349,8 @@ int ax88179_set_features(struct net_device *net, netdev= _features_t features); void ax88179_get_mac_addr(struct usbnet *dev); int ax88179_change_mtu(struct net_device *net, int new_mtu); int ax88179_set_mac_addr(struct net_device *net, void *p); +int ax88179_suspend_wrapper(struct usb_interface *intf, pm_message_t messa= ge); +int ax88179_resume_wrapper(struct usb_interface *intf); =20 extern const struct driver_info ax88179a_info; extern const struct driver_info ax88772d_info; diff --git a/drivers/net/usb/ax88179a_devices.c b/drivers/net/usb/ax88179a_= devices.c index 53ae62f2c3b06a613e118a7f05ff63213c048e3a..baf91ebee9e35a855b1aa902ba0= 99169277330a7 100644 --- a/drivers/net/usb/ax88179a_devices.c +++ b/drivers/net/usb/ax88179a_devices.c @@ -5,6 +5,8 @@ #include #include "ax88179_lib.h" =20 +static int ax88179a_reset(struct usbnet *dev); + #define AX88279_EEPROM_LEN 0x4000 #define AX88179A_EEPROM_LEN (32 * 20) =20 @@ -126,6 +128,62 @@ static void ax88179a_status(struct usbnet *dev, struct= urb *urb) phylink_mac_interrupt(data->phylink); } =20 +static int ax88179a_suspend(struct usb_interface *intf, pm_message_t messa= ge) +{ + struct usbnet *dev =3D usb_get_intfdata(intf); + struct ax88179_data *priv; + u8 tmp8 =3D 0; + u16 tmp16; + int ret; + + priv =3D dev->driver_priv; + ax88179_set_pm_mode(dev, true); + + if (netif_running(dev->net)) { + rtnl_lock(); + phylink_suspend(priv->phylink, !!priv->wolopts); + rtnl_unlock(); + } + + ret =3D usbnet_suspend(intf, message); + if (ret) { + rtnl_lock(); + phylink_resume(priv->phylink); + rtnl_unlock(); + return ret; + } + + /* Enable WoL */ + if (priv->wolopts) { + ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_MONITOR_MOD, 1, 1, &tmp8); + tmp8 &=3D ~(AX_MONITOR_MODE_RWLC | AX_MONITOR_MODE_RWMP); + if (priv->wolopts & WAKE_PHY) + tmp8 |=3D AX_MONITOR_MODE_RWLC; + if (priv->wolopts & WAKE_MAGIC) + tmp8 |=3D AX_MONITOR_MODE_RWMP; + + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MONITOR_MOD, 1, 1, &tmp8); + + ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE, 2, 2, &tmp16= ); + tmp16 |=3D AX_MEDIUM_RECEIVE_EN; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE, 2, 2, &tmp1= 6); + + if (priv->chip_version =3D=3D AX_VERSION_AX88279) + ax88179_write_cmd(dev, AX88179A_WAKEUP_SETTING, 8, + EPHY_LOW_POWER_EN | S5_WOL_EN + | S5_WOL_LOW_POWER | 0x8000, 0, NULL); + else + ax88179_write_cmd(dev, AX88179A_WAKEUP_SETTING, 0, + EPHY_LOW_POWER_EN, 0, NULL); + + } else if (priv->chip_version =3D=3D AX_VERSION_AX88279) { + ax88179_write_cmd(dev, AX88179A_WAKEUP_SETTING, 8, 0x8000, 0, NULL); + } + + ax88179_set_pm_mode(dev, false); + return 0; +} + static int ax88179a_auto_detach(struct usbnet *dev) { u16 tmp16; @@ -135,6 +193,47 @@ static int ax88179a_auto_detach(struct usbnet *dev) return 0; } =20 +static int ax88179a_resume(struct usb_interface *intf) +{ + struct usbnet *dev =3D usb_get_intfdata(intf); + struct ax88179_data *ax179_data; + u8 reg8 =3D 0; + int ret; + + ax179_data =3D dev->driver_priv; + ax88179_set_pm_mode(dev, true); + + ret =3D ax88179_read_cmd(dev, AX88179A_PHY_POWER, 0, 0, 1, ®8); + if (ret < 0) { + ax88179_set_pm_mode(dev, false); + return ret; + } + if (!(reg8 & AX_PHY_POWER)) { + reg8 =3D AX_PHY_POWER; + ax88179_write_cmd(dev, AX88179A_PHY_POWER, 0, 0, 1, ®8); + msleep(250); + } + ax88179_write_cmd(dev, AX_FW_MODE, AX_FW_MODE_179A, 0, 0, NULL); + + /* Now, that AX_FW_MODE_179A is enabled, the PHY needs a power-cycle. + * PHY-power is re-enabled in ax88179a_reset() + */ + ax88179_write_u8(dev, AX88179A_PHY_POWER, 0, 0, 0); + msleep(250); + + ax88179a_reset(dev); + + if (netif_running(dev->net)) { + rtnl_lock(); + phylink_resume(ax179_data->phylink); + rtnl_unlock(); + } + + ax88179_set_pm_mode(dev, false); + + return usbnet_resume(intf); +} + static void ax88179a_bulkin_config(struct usbnet *dev, u8 link_sts, u8 spe= ed, bool full_duplex) { struct ax88179_data *ax179_data =3D dev->driver_priv; @@ -737,6 +836,9 @@ static int ax88179a_bind(struct usbnet *dev, struct usb= _interface *intf) ax179_data->eeprom_wen =3D 0; } =20 + ax179_data->resume =3D ax88179a_resume; + ax179_data->suspend =3D ax88179a_suspend; + dev->net->netdev_ops =3D &ax88179a_netdev_ops; dev->net->ethtool_ops =3D &ax88179a_ethtool_ops; dev->net->needed_headroom =3D 8; @@ -784,6 +886,13 @@ static int ax88179a_bind(struct usbnet *dev, struct us= b_interface *intf) if (ret) goto initphy_err; =20 + /* Keep this interface runtime-PM active by taking a usage ref. + * Prevents runtime suspend while bound and avoids resume paths + * that could deadlock (autoresume under RTNL while USB PM lock + * is held, phylink/MDIO wants RTNL). + */ + pm_runtime_get_noresume(&intf->dev); + return 0; =20 initphy_err: @@ -1097,7 +1206,11 @@ static int ax88179a_reset(struct usbnet *dev) /* Ensure EEE state is off, consistent with phylink setup */ ax88179_write_cmd(dev, AX_GPHY_CTL, AX_GPHY_EEE_CTRL, false, 0, NULL); =20 - phylink_start(ax179_data->phylink); + /* ax88179a_reset() may also be called from resume context, + * phylink_resume() will start phylink, then. + */ + if (!ax179_data->in_pm) + phylink_start(ax179_data->phylink); =20 return 0; } --=20 2.47.3 From nobody Tue Sep 29 08:26:18 2026 Received: from bkemail.birger-koblitz.de (bkemail.birger-koblitz.de [23.88.97.239]) (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 6389243E092; Tue, 29 Sep 2026 03:19:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=23.88.97.239 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651973; cv=none; b=WZVbVfHFCfPBb2qVRvmJCvRl72ij0uBG0YbO3f/Xkx+4YE7QkBR7VK2gQ2ZID9oLU10mAoZjzAETEg0Stqw5uOd8L1DzT1ypby0LJEr0yip5BGdGdg+K/as7vak+KNu6XLmurpggn/dWDiHtBNM7q+mQKm4LLiOkpgxox9tADIc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651973; c=relaxed/simple; bh=DSnWQE7w5FHRTPoFKEEPlTEVr028IIf8Lm3EMd/13Mc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QsDbkixt4YEzQ5YIs/tXm/FCVxhQezac7boOCSTFi3dzVtIsd8QOfI/WHT1O+O6DytuJRc+MCJbdTVj5qthEgdDIhRs4JhIjluF4T0tz4k/SBtZKbyBCp6Z8FmdimVbu9vTm3yHH+mpyeT5zEAi+FfFhfbRKbzv/d/eaM4NdFU4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de; spf=pass smtp.mailfrom=birger-koblitz.de; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=EfRAhlpT; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=fVe49yjz; arc=none smtp.client-ip=23.88.97.239 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="EfRAhlpT"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="fVe49yjz" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651962; bh=DSnWQE7w5FHRTPoFKEEPlTEVr028IIf8Lm3EMd/13Mc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=EfRAhlpTqlEC30VFQHRieyoErE/ib1eXrDHw0wqNTV9ZBlkBNngISC4/7jBO5nDG1 6ILBbjpnqwvnG/zk0chhzU4ycIXM/MdJD4wJCSlPovi8xBqxURflIMHTI++opcEmn9 lZSTaBnbvqqVCIwPxhtG76I5NfQG6UCSG0aefEMusDjLg4xo9MNPasJ88zUf3Wxdww UMzA+pjfkB7Uyd1MCJcIwJvGmkM41wxKYSPYqamYDQy7xKE6gv8bpmH9txbfkui8Dm yFD7uUXAz9gCi9mqvhZjxEB65vKjYxvdcG4vYJjSm42uBdvr+rLbUyMknROxIY/l02 DiMbzV5PTle1w== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id 0D32A4228E; Tue, 29 Sep 2026 03:19:22 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651940; bh=DSnWQE7w5FHRTPoFKEEPlTEVr028IIf8Lm3EMd/13Mc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=fVe49yjzx/kW/7J9MdIoSqyaOJBEv8+dok72EnbS6UngNElvHgk6IMqa+yNC6qvih bkC3/BCeIzMQUFyU0Tu+JrWiPySfF4wKrB2TembnL/q34DtLC4Gt4jUdizN6REU7yD P77TTeXQ257cj3usnQvLaqoKgIWt83VvguiMEiZWXM7aSAREIoRvEQwIAl1xU7RTp4 RQgWIorJmjhsu2erwTnSlz8NwlodRdkfTr3G3DIbDVB9lYs+rPfq0rr1EZKaRWMljr /LLBJISjol/GYN+cy2IDzpdHyZXsgOsN5shyG4m3Av4yuUL0llKzNJqJy9GRGuUqsD 7p9U+kPB4F8Zg== Received: from AMDDesktop.lan (p5dd1eaf2.dip0.t-ipconnect.de [93.209.234.242]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id B190D42269; Tue, 29 Sep 2026 03:19:00 +0000 (UTC) From: Birger Koblitz Date: Tue, 29 Sep 2026 05:18:59 +0200 Subject: [PATCH net-next v14 11/14] ax88179_178a: Add ethtool get_drvinfo Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260929-ax88179a-v14-11-a1f2249e42ea@birger-koblitz.de> References: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> In-Reply-To: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit , Huacai Chen , WANG Xuerui Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, Jianhui Xu , Birger Koblitz , Nicolai Buchwitz X-Mailer: b4 0.14.2 Add ax88179a_get_drvinfo() as implementation of get_drvinfo, in order to provide information about the device firmware. Signed-off-by: Birger Koblitz Reviewed-by: Andrew Lunn Reviewed-by: Nicolai Buchwitz Tested-by: Jianhui Xu --- drivers/net/usb/ax88179a_devices.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/net/usb/ax88179a_devices.c b/drivers/net/usb/ax88179a_= devices.c index baf91ebee9e35a855b1aa902ba099169277330a7..16b441feaf08f739a5991cb2b7e= c8304ec80ec5a 100644 --- a/drivers/net/usb/ax88179a_devices.c +++ b/drivers/net/usb/ax88179a_devices.c @@ -234,6 +234,20 @@ static int ax88179a_resume(struct usb_interface *intf) return usbnet_resume(intf); } =20 +static void ax88179a_get_drvinfo(struct net_device *net, struct ethtool_dr= vinfo *info) +{ + struct ax88179_data *priv =3D netdev2data(net); + + /* Inherit standard device info */ + usbnet_get_drvinfo(net, info); + if (priv->chip_version < AX_VERSION_AX88179A) + return; + + snprintf(info->fw_version, sizeof(info->fw_version), "%d.%d.%d.%d", + priv->fw_version[0], priv->fw_version[1], + priv->fw_version[2], priv->fw_version[3]); +} + static void ax88179a_bulkin_config(struct usbnet *dev, u8 link_sts, u8 spe= ed, bool full_duplex) { struct ax88179_data *ax179_data =3D dev->driver_priv; @@ -339,6 +353,7 @@ static int ax88179a_set_eee(struct net_device *net, str= uct ethtool_keee *edata) } =20 static const struct ethtool_ops ax88179a_ethtool_ops =3D { + .get_drvinfo =3D ax88179a_get_drvinfo, .get_link =3D ethtool_op_get_link, .get_msglevel =3D usbnet_get_msglevel, .set_msglevel =3D usbnet_set_msglevel, --=20 2.47.3 From nobody Tue Sep 29 08:26:18 2026 Received: from bkemail.birger-koblitz.de (bkemail.birger-koblitz.de [23.88.97.239]) (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 A24514D7D5A; Tue, 29 Sep 2026 03:19:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=23.88.97.239 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651978; cv=none; b=bRWzfav5cJqmwgzmWzYKrh0NU5SK7e5mgYXSD4X8iXLhMfl0CyqtSbNMf5l6b/c0o9r4cEooNyIsoF7XBZ5olQnNNJs/gNPysN2O8CflpxUTixcJ00vwB/WIKv8q6yrirhbvCTUi/jMheQKV/IzPq+/I67thxYb0gv5XWUYRKuY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651978; c=relaxed/simple; bh=/A0k3jiBFp19ADWTQBTkvBSWwOOpjiQM/X0B7jSqluA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=W77gyah7Rwl+wHu0fo417cS9SXuVCqdxS54z35msHOGc7SBVCtrTmC2r5G9bYO9mqKEH2wxEt8cn+8oFB+Vms7jv8uVjqg0G7Db5CFNJdHtCjrxuS3SHhJsyHILTh+BjAICwCBIbOZRHAt/itQbXhgUoYNYKEBpCYjsyZ+FshlE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de; spf=pass smtp.mailfrom=birger-koblitz.de; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=pK7OZfip; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=nT8xXVrD; arc=none smtp.client-ip=23.88.97.239 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="pK7OZfip"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="nT8xXVrD" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651963; bh=/A0k3jiBFp19ADWTQBTkvBSWwOOpjiQM/X0B7jSqluA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=pK7OZfip5x638vZjWRtrthrg5UVB8M5IK3VEz6wDIP1O+YEf3hkgw23yng6+N37Ri hZxLMeOwiFa1uUFzA3US0xRof7BGxRKHPnwIgRkn3zGkkH7ls3DN6RQV/6DtiomstE Fz1qTvUCnUDgUQSualkVOXvQ/8M/VFZAXpnuhA8VLrBBTtWVhxi0om4+barB/zI+Dy z5L4e2T/SomU8iAIBBhxHLMyKqRT1Rr4cizA+Yck8Bn/ZpQBPOw8Dp3mX8FyYPi8XX EHQWtP2JpuqxLzaRi7DcqvfczTLrWwOxSvEVnaSfAtURB0dkKwpXx8dbB65yBI5PYo b3HtYZmFZcfww== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id 0C89F422D7; Tue, 29 Sep 2026 03:19:23 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651941; bh=/A0k3jiBFp19ADWTQBTkvBSWwOOpjiQM/X0B7jSqluA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=nT8xXVrDbclYc0uAS7Dtphj8UOr2KLlHSNu15zu4S/jm70Y0/Rl+9tPHjNvdyiTxE 21IQQK1TcKBQHsF/N/c+nN0DfBuFewI7n1VYNC44YIMgMSS7DNvsn50J3DvG/4DPBZ pZeisaiYugGk7s90tFwqZh+I7dG5GHxy7FDxfRTvUmMx2haE24fVwY5JzvGG21MOXd T2egzMYOkVBxqFNOpgw19PhW3aVJ5tTTVvIp91Wx5vNzRXxnobaHG+XuprPHjt9Sg0 RYz6Glu3/8tCteETqibcxWRgoNZOXR+Ep+zfZAHyAE3pmc3XdrS8DCoRELeTRXJSwl dDsnp6GGFKm+Q== Received: from AMDDesktop.lan (p5dd1eaf2.dip0.t-ipconnect.de [93.209.234.242]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id F0F104226C; Tue, 29 Sep 2026 03:19:00 +0000 (UTC) From: Birger Koblitz Date: Tue, 29 Sep 2026 05:19:00 +0200 Subject: [PATCH net-next v14 12/14] ax88179_178a: Update driver name and information Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260929-ax88179a-v14-12-a1f2249e42ea@birger-koblitz.de> References: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> In-Reply-To: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit , Huacai Chen , WANG Xuerui Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, Jianhui Xu , Birger Koblitz , Nicolai Buchwitz X-Mailer: b4 0.14.2 Add additionally supported devices to Kconfig description, add further requirements such as PHYLINK. Update driver name in usb_driver and update MODULE_DESCRIPTION to include the additionally supported chips. Change Kconfig symbol name from USB_NET_AX88179_178A to USB_NET_AX88179 and update loongson32_defconfig/loongson64_defconfig to use that symbol. Signed-off-by: Birger Koblitz Reviewed-by: Andrew Lunn Reviewed-by: Nicolai Buchwitz Tested-by: Jianhui Xu --- arch/loongarch/configs/loongson32_defconfig | 2 +- arch/loongarch/configs/loongson64_defconfig | 2 +- drivers/net/usb/Kconfig | 10 +++++++--- drivers/net/usb/Makefile | 2 +- drivers/net/usb/ax88179_178a.c | 8 ++++---- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/arch/loongarch/configs/loongson32_defconfig b/arch/loongarch/c= onfigs/loongson32_defconfig index e76ea9b629747a8d721d248be3ac1e8d504178fc..9ac643b1a68ec35f944bfec1821= 437c7e61e2d71 100644 --- a/arch/loongarch/configs/loongson32_defconfig +++ b/arch/loongarch/configs/loongson32_defconfig @@ -642,7 +642,7 @@ CONFIG_USB_RTL8150=3Dm CONFIG_USB_RTL8152=3Dm CONFIG_USB_USBNET=3Dm # CONFIG_USB_NET_AX8817X is not set -# CONFIG_USB_NET_AX88179_178A is not set +# CONFIG_USB_NET_AX88179 is not set CONFIG_USB_NET_CDC_EEM=3Dm CONFIG_USB_NET_HUAWEI_CDC_NCM=3Dm CONFIG_USB_NET_CDC_MBIM=3Dm diff --git a/arch/loongarch/configs/loongson64_defconfig b/arch/loongarch/c= onfigs/loongson64_defconfig index 976340d4d51445871274bfd558d217e1640a7756..882b6dadeeb7c998e15f6ba06ac= 48ada1b994dff 100644 --- a/arch/loongarch/configs/loongson64_defconfig +++ b/arch/loongarch/configs/loongson64_defconfig @@ -658,7 +658,7 @@ CONFIG_USB_RTL8150=3Dm CONFIG_USB_RTL8152=3Dm CONFIG_USB_USBNET=3Dm # CONFIG_USB_NET_AX8817X is not set -# CONFIG_USB_NET_AX88179_178A is not set +# CONFIG_USB_NET_AX88179 is not set CONFIG_USB_NET_CDC_EEM=3Dm CONFIG_USB_NET_HUAWEI_CDC_NCM=3Dm CONFIG_USB_NET_CDC_MBIM=3Dm diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig index 115990b0d9537aea2776544c9768b034f32aa7a4..27862e380bdb4a54d184fa8618e= 4c9b348354e84 100644 --- a/drivers/net/usb/Kconfig +++ b/drivers/net/usb/Kconfig @@ -195,11 +195,12 @@ config USB_NET_AX8817X This driver creates an interface named "ethX", where X depends on what other networking devices you have in use. =20 -config USB_NET_AX88179_178A - tristate "ASIX AX88179/178A USB 3.0/2.0 to Gigabit Ethernet" +config USB_NET_AX88179 + tristate "ASIX AX88179/179A/178A USB 2.0/3.0 to 100M/1G/2.5GbE Adapters" depends on USB_USBNET - select CRC32 select PHYLINK + select AX88796B_PHY + select CRC32 default y help This option adds support for ASIX AX88179 based USB 3.0/2.0 @@ -207,6 +208,9 @@ config USB_NET_AX88179_178A =20 This driver should work with at least the following devices: * ASIX AX88179 + * ASIX AX88179A/B + * ASIX AX88279 + * ASIX AX88772D/E * ASIX AX88178A * Sitcomm LN-032 =20 diff --git a/drivers/net/usb/Makefile b/drivers/net/usb/Makefile index 2ecead0181eaf8d66fb6f5dbd6f2905b22b6eb57..4026f19ecb826a6465de38f1d9b= b0e4c0af80421 100644 --- a/drivers/net/usb/Makefile +++ b/drivers/net/usb/Makefile @@ -12,7 +12,7 @@ obj-$(CONFIG_USB_HSO) +=3D hso.o obj-$(CONFIG_USB_LAN78XX) +=3D lan78xx.o obj-$(CONFIG_USB_NET_AX8817X) +=3D asix.o asix-y :=3D asix_devices.o asix_common.o ax88172a.o -obj-$(CONFIG_USB_NET_AX88179_178A) +=3D ax88179.o +obj-$(CONFIG_USB_NET_AX88179) +=3D ax88179.o ax88179-y :=3D ax88179_178a.o ax88179a_devices.o ax88179_lib.o obj-$(CONFIG_USB_NET_CDCETHER) +=3D cdc_ether.o obj-$(CONFIG_USB_NET_CDC_EEM) +=3D cdc_eem.o diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c index 245ccf6896033922adcef79bd395b347918f57e3..8b52994e2a604101b61ec9cc0d6= 98a0ecb520a14 100644 --- a/drivers/net/usb/ax88179_178a.c +++ b/drivers/net/usb/ax88179_178a.c @@ -1354,8 +1354,8 @@ static const struct usb_device_id products[] =3D { }; MODULE_DEVICE_TABLE(usb, products); =20 -static struct usb_driver ax88179_178a_driver =3D { - .name =3D "ax88179_178a", +static struct usb_driver ax88179_driver =3D { + .name =3D "ax88179", .id_table =3D products, .probe =3D usbnet_probe, .suspend =3D ax88179_suspend_wrapper, @@ -1366,8 +1366,8 @@ static struct usb_driver ax88179_178a_driver =3D { .disable_hub_initiated_lpm =3D 1, }; =20 -module_usb_driver(ax88179_178a_driver); +module_usb_driver(ax88179_driver); =20 -MODULE_DESCRIPTION("ASIX AX88179/178A based USB 3.0/2.0 Gigabit Ethernet D= evices"); +MODULE_DESCRIPTION("ASIX AX88179/179A/178A/279 based USB 3.0/2.0 100M/1G/2= .5GbE Controllers"); MODULE_LICENSE("GPL"); MODULE_ALIAS("ax88179_178a"); --=20 2.47.3 From nobody Tue Sep 29 08:26:18 2026 Received: from bkemail.birger-koblitz.de (bkemail.birger-koblitz.de [23.88.97.239]) (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 6FDAB4D6C24; Tue, 29 Sep 2026 03:19:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=23.88.97.239 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651975; cv=none; b=cxguVxrmh31eg2YqY8mfUUHCTUlm5NGJFdysUJ4PRKsg4RFBgp1Ee0WaqkoFAWv8kybNPrK8Xfo+R4afPpDl2W6NmrmoijkaA3iakY7OzNwiEdwAFNmxKEjeaLrNipASp8S5RISRAJ0UYeJBTduH/c3Yao7TPaiSCxU/o8eYXIk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651975; c=relaxed/simple; bh=aIESsd1MIYvyD9ig8en/i82IfOWwWDuZSS5pbC1x0Lg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WZa5DiHmUhmIg8jyVwnCBnq0D72NF6PAXHTbWMNzDXeRx38ieyXwx58tO2G67mHlwXKBj2SGY6RAXLQr6NH4Jg57gZoNIdtdIWVCtsj0o3+9X8LSLeD0ttZlHDhzXN/yQE16LiM7cZ+LIcJ4t9kGar1ZF8mwepdD36+1wrcrYs0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de; spf=pass smtp.mailfrom=birger-koblitz.de; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=eaY7FD6d; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=CuU4lgUV; arc=none smtp.client-ip=23.88.97.239 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="eaY7FD6d"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="CuU4lgUV" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651963; bh=aIESsd1MIYvyD9ig8en/i82IfOWwWDuZSS5pbC1x0Lg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=eaY7FD6dBLK+N1ub0Ud160mF4iVa3wsPRLsWz2fWSrQpZRRwLKkNudP5Wfu4rGvTZ E0sP7qZXQN3I4dQbeqZ3CsaxfP9zZA+ywx5p2c2H47vXGTaxJSVlqQqakHk/7hqva3 1Je/LBHrpuVFbzhkRttHDwhZQV0NvkTcs2SbBil/KEWCfE8QshPYh9DzJFvEwhCbP0 QJvZkm0va02CP7giHT9CeeeABwR9YDKcKDV4JSNML1If6cCh2TCu+ab/SJx+DI76CH 6m9uGfIDRB5dh8HBOhJFtyrGHqvD0qK9mloPDMaoAjALGsT4QRGwVWouv+LbAfb5YP NuNhXNIndr74g== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id 55FD542271; Tue, 29 Sep 2026 03:19:23 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651941; bh=aIESsd1MIYvyD9ig8en/i82IfOWwWDuZSS5pbC1x0Lg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=CuU4lgUVwL5VJb3+7wv2BQgtAf2qZoUVfufAx/ns1gq+g8JWUDY6a/4/ZHMh/syVK wJzo2uziU5gT1og/GsDHIdeg7ikfRMM9p+rbTJwq67ge6OI7GPrFD7KdDJhHHxkB8p YypEgWqNysEQuxGGEF4/+VZNBMOW9v7ngX61bm1i1M03GZJpMhWI+gl6Ay/H/+flXM 1O3LL/zZwTQe/8rKC0RsdaT+T+tb2xe+zMCsh/o+HgvtxvMDZIcC4HunaxEQt8E/Ao 6pxvhtP65NsOD1yYREk463ufsKC504FHg1UT+bCuARdsHZ1qPpSfbJaSEhFE5cH7AE QwaSAM8FaNLkw== Received: from AMDDesktop.lan (p5dd1eaf2.dip0.t-ipconnect.de [93.209.234.242]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id 3EF6542270; Tue, 29 Sep 2026 03:19:01 +0000 (UTC) From: Birger Koblitz Date: Tue, 29 Sep 2026 05:19:01 +0200 Subject: [PATCH net-next v14 13/14] ax88179_178a: Add support for AX88179A/772D/279 EEPROM access Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260929-ax88179a-v14-13-a1f2249e42ea@birger-koblitz.de> References: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> In-Reply-To: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit , Huacai Chen , WANG Xuerui Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, Jianhui Xu , Birger Koblitz X-Mailer: b4 0.14.2 The AX88179A/772D devices have 32 efuses with 20 bytes each, which can be randomly programmed. The AX88279 has 16K FLASH. Provide ethtool read capability for these devices. However, no write access is provided. Signed-off-by: Birger Koblitz Reviewed-by: Andrew Lunn Tested-by: Jianhui Xu --- drivers/net/usb/ax88179_178a.c | 6 +++++ drivers/net/usb/ax88179_lib.c | 56 ++++++++++++++++++++++++++++++++------= ---- 2 files changed, 49 insertions(+), 13 deletions(-) diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c index 8b52994e2a604101b61ec9cc0d698a0ecb520a14..7ec71438054844c7263c82ca911= e42ea5854a682 100644 --- a/drivers/net/usb/ax88179_178a.c +++ b/drivers/net/usb/ax88179_178a.c @@ -724,6 +724,12 @@ static int ax88179_bind(struct usbnet *dev, struct usb= _interface *intf) ax88179_reset(dev); =20 return 0; + +err_nodev: + kfree(ax179_data); + ax179_data =3D NULL; + + return ret; } =20 static void ax88179_unbind(struct usbnet *dev, struct usb_interface *intf) diff --git a/drivers/net/usb/ax88179_lib.c b/drivers/net/usb/ax88179_lib.c index 6f32d4da601ca11d19cf428ecb79206ab4460f3e..de849650f7871022290fc1ba3e3= d463434e42fbe 100644 --- a/drivers/net/usb/ax88179_lib.c +++ b/drivers/net/usb/ax88179_lib.c @@ -210,36 +210,61 @@ int ax88179_set_wol(struct net_device *net, struct et= htool_wolinfo *wolinfo) return 0; } =20 +static void +ax88179_eeprom_access_params(struct ax88179_data *ax179_data, int i, u16 *= value, u16 *idx) +{ + /* AX88179 has a word-addressable EEPROM + * AX88179A uses EFUSES with 20 bytes length + * AX88279 has an EEPROM addressable in 256 byte blocks + */ + if (ax179_data->chip_version < AX_VERSION_AX88179A) { + *value =3D i; + *idx =3D 1; + } else if (ax179_data->chip_version =3D=3D AX_VERSION_AX88279) { + *value =3D (i * ax179_data->eeprom_block) >> 16; + *idx =3D (i * ax179_data->eeprom_block) & 0xffff; + } else { + *value =3D i << 4; + *idx =3D 0; + } +} + int ax88179_get_eeprom(struct net_device *net, struct ethtool_eeprom *eepr= om, u8 *data) { struct usbnet *dev =3D netdev_priv(net); - u16 *eeprom_buff; - int first_word, last_word; - int i, ret; + struct ax88179_data *ax179_data; + int first, last, i, ret; + u8 *eeprom_buff; + + ax179_data =3D dev->driver_priv; =20 if (eeprom->len =3D=3D 0) return -EINVAL; =20 eeprom->magic =3D AX88179_EEPROM_MAGIC; =20 - first_word =3D eeprom->offset >> 1; - last_word =3D (eeprom->offset + eeprom->len - 1) >> 1; - eeprom_buff =3D kmalloc_array(last_word - first_word + 1, sizeof(u16), - GFP_KERNEL); + first =3D eeprom->offset / ax179_data->eeprom_block; + last =3D (eeprom->offset + eeprom->len - 1) / ax179_data->eeprom_block; + + eeprom_buff =3D kzalloc((last - first + 1) * ax179_data->eeprom_block, GF= P_KERNEL); if (!eeprom_buff) return -ENOMEM; =20 - /* ax88179/178A returns 2 bytes from eeprom on read */ - for (i =3D first_word; i <=3D last_word; i++) { - ret =3D __ax88179_read_cmd(dev, AX_ACCESS_EEPROM, i, 1, 2, - &eeprom_buff[i - first_word]); - if (ret < 0) { + for (i =3D first; i <=3D last; i++) { + u16 value, idx; + + ax88179_eeprom_access_params(ax179_data, i, &value, &idx); + ret =3D __ax88179_read_cmd(dev, ax179_data->eeprom_read_cmd, + value, idx, ax179_data->eeprom_block, + eeprom_buff + (i - first) * ax179_data->eeprom_block); + + if (ret !=3D ax179_data->eeprom_block) { kfree(eeprom_buff); return -EIO; } } =20 - memcpy(data, (u8 *)eeprom_buff + (eeprom->offset & 1), eeprom->len); + memcpy(data, eeprom_buff + eeprom->offset % ax179_data->eeprom_block, eep= rom->len); kfree(eeprom_buff); return 0; } @@ -247,12 +272,17 @@ int ax88179_get_eeprom(struct net_device *net, struct= ethtool_eeprom *eeprom, u8 int ax88179_set_eeprom(struct net_device *net, struct ethtool_eeprom *eepr= om, u8 *data) { struct usbnet *dev =3D netdev_priv(net); + struct ax88179_data *ax179_data; u16 *eeprom_buff; int first_word; int last_word; int ret; int i; =20 + ax179_data =3D dev->driver_priv; + if (ax179_data->chip_version >=3D AX_VERSION_AX88179A) + return -EOPNOTSUPP; + netdev_dbg(net, "write EEPROM len %d, offset %d, magic 0x%x\n", eeprom->len, eeprom->offset, eeprom->magic); =20 --=20 2.47.3 From nobody Tue Sep 29 08:26:18 2026 Received: from bkemail.birger-koblitz.de (bkemail.birger-koblitz.de [23.88.97.239]) (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 8834543F8C3; Tue, 29 Sep 2026 03:19:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=23.88.97.239 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651975; cv=none; b=QXtJpLNcbP0h3GF6clSFSPaYTUz2GMbUO96IN3BWs+iCJhUeDARxhDpdPw5gEzOILgmwOjezekVvRO1WawHpGAmcnkOUI3wFUupKwd1ePRAYWvLI64KxJ06xcYRdAv57pan0nuWO/EXq0pzteFCm9GHRr3jHWdAqZkAQp7PhjiI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790651975; c=relaxed/simple; bh=dVNH8RvZnzc2jMzf7FrztAoqHjVZddddl6WmvLgB28Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=c3q8NcSzTQ0U+TBHrlktrBvL8Q7ztDf5FTmSJnkfCnNQCkETPyJnsbYDrsPl3DwzdOaFTTeZHL9utiDMyNay0i3a6y876zwtwYKabXlo8hhOHpVuSYDkAm3dSc4poAXnOMP0HMc5imzEgMLVq1+zKo1M6fgnmLN0G6CXjFDaybg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de; spf=pass smtp.mailfrom=birger-koblitz.de; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=fFDKBiDx; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=lwRp+IvI; arc=none smtp.client-ip=23.88.97.239 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="fFDKBiDx"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="lwRp+IvI" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651964; bh=dVNH8RvZnzc2jMzf7FrztAoqHjVZddddl6WmvLgB28Q=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=fFDKBiDx+lBnX+jV32MiC5KajO0TgZS68yyt7MRKf6yWdE51InVxRBHsrG7jOrwAX J2JWxGnvgnjLXro7QBKIGam4Kk4+5e/kEIxw/z9JJ5/Dh0Jg1JYrhv+CWs27HLx3nQ TAXv/S4ZmouOSFwJb3jc8sE4oCWF3yh0wxacrP6CHX7CPyoOIurdTeXjBDQVYewv/j y2HxlKp+oJUUZ3sCsIUHFMB48tcEQ6FKndTbgltDNnlozeG2CcMT8/V4y4GtbswXBF asxOc6nVVs3c8mVDguMBV+oYbVvjucQK+TwEo3o/JiOwywpQybT0U7yY6Ca+8zj6jN 78k6vAKHMzGNA== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id 3D8F042263; Tue, 29 Sep 2026 03:19:24 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1790651941; bh=dVNH8RvZnzc2jMzf7FrztAoqHjVZddddl6WmvLgB28Q=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=lwRp+IvIp73LE3jk1ticl3vHa8T7Ode88zUZ96GX9TXVSFB7JTSDSlIJAxAcN959e devDqXYpZO9ybyLwJ/aCSoyDXfANio5Sn96rCVh4iaBnj41M7/whZq8Xfq8kFBb4JX BhD+ikSsnUsRtS1wLwIXdGVUNRI/OhyuZ6s9oXdchE9OyjUJceCXq8wmdvEmoXzlIP S/VY1nNpOyYIoNzUEJJMKUbp/uM4NYu01bXI6H7csSMsFudUwNg18LaoSjEme0vHbi R/aTjveRa0sz5BQppMXvNMZgSX4SEMvAyLffXj7TLQxuICblLhn2Oo+E/q+ha8VC1X +bFAzxJ4UhpWA== Received: from AMDDesktop.lan (p5dd1eaf2.dip0.t-ipconnect.de [93.209.234.242]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id 7CBA842276; Tue, 29 Sep 2026 03:19:01 +0000 (UTC) From: Birger Koblitz Date: Tue, 29 Sep 2026 05:19:02 +0200 Subject: [PATCH net-next v14 14/14] ax88796b: Add support for AX88772D, AX88179A and AX88279 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260929-ax88179a-v14-14-a1f2249e42ea@birger-koblitz.de> References: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> In-Reply-To: <20260929-ax88179a-v14-0-a1f2249e42ea@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit , Huacai Chen , WANG Xuerui Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, Jianhui Xu , Birger Koblitz X-Mailer: b4 0.14.2 The AX88772D, AX88179A and AX88279 are 100MBit, 1GBit and respectively 2.5 GBit PHYs that are found in ASIX USB-Ethernet controllers of the same name. Signed-off-by: Birger Koblitz Reviewed-by: Andrew Lunn Tested-by: Jianhui Xu --- drivers/net/phy/ax88796b.c | 167 +++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 167 insertions(+) diff --git a/drivers/net/phy/ax88796b.c b/drivers/net/phy/ax88796b.c index f20ddf64914993f7097070d1f56c1103ec1e40e8..0f1437d1e3e9b4004bdd240df43= c929caf31819c 100644 --- a/drivers/net/phy/ax88796b.c +++ b/drivers/net/phy/ax88796b.c @@ -13,6 +13,19 @@ #define PHY_ID_ASIX_AX88772A 0x003b1861 #define PHY_ID_ASIX_AX88772C 0x003b1881 #define PHY_ID_ASIX_AX88796B 0x003b1841 +#define PHY_ID_ASIX_AX88772D 0x003b772d +#define PHY_ID_ASIX_AX88179A 0x003b179a +#define PHY_ID_ASIX_AX88279 0x003b2790 + +#define AX_ADVERTISE_2500 0x1000 + +/* MII Vendor registers */ +#define AX_CTRL_STATUS 0x1d +#define AX_CTRL_STATUS_SPEED_MASK 0x0c +#define AX_CTRL_STATUS_SPEED_10 0x0 +#define AX_CTRL_STATUS_SPEED_100 0x4 +#define AX_CTRL_STATUS_SPEED_1000 0x8 +#define AX_CTRL_STATUS_SPEED_2500 0xc =20 MODULE_DESCRIPTION("Asix PHY driver"); MODULE_AUTHOR("Michael Schmitz "); @@ -83,6 +96,110 @@ static int asix_ax88772a_read_status(struct phy_device = *phydev) return 0; } =20 +static int asix_ax88279_read_status(struct phy_device *phydev) +{ + int ret, val; + + ret =3D genphy_read_status(phydev); + if (ret) + return ret; + + if (!phydev->link) + return 0; + + /* Read actual speed from vendor register */ + val =3D phy_read(phydev, AX_CTRL_STATUS); + if (val < 0) + return val; + + switch (val & AX_CTRL_STATUS_SPEED_MASK) { + case AX_CTRL_STATUS_SPEED_2500: + phydev->speed =3D SPEED_2500; + break; + case AX_CTRL_STATUS_SPEED_1000: + phydev->speed =3D SPEED_1000; + break; + case AX_CTRL_STATUS_SPEED_100: + phydev->speed =3D SPEED_100; + break; + case AX_CTRL_STATUS_SPEED_10: + phydev->speed =3D SPEED_10; + } + + /* MDIO_AN_10GBT_STAT_LP2_5G is broken, but we can deduce that + * the link-partner advertised 2500M if remotely AN succceded + * for link speed > 1000M and we locally have a link speed of + * 2500M + */ + linkmode_clear_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, phydev->lp_adver= tising); + val =3D phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_STAT); + if (val >=3D 0 && val & MDIO_AN_10GBT_STAT_REMOK) { + linkmode_mod_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, + phydev->lp_advertising, + phydev->speed =3D=3D SPEED_2500); + } + /* Only supports full duplex */ + phydev->duplex =3D DUPLEX_FULL; + + /* PHY switches interface between 2.5GBit and slower modes */ + if (phydev->speed =3D=3D SPEED_2500) + phydev->interface =3D PHY_INTERFACE_MODE_2500BASEX; + else + phydev->interface =3D PHY_INTERFACE_MODE_SGMII; + + return 0; +} + +static int asix_ax88279_config_aneg(struct phy_device *phydev) +{ + bool adv_2500; + int ret; + + if (phydev->autoneg =3D=3D AUTONEG_DISABLE) { + phydev_warn(phydev, "Disabling autoneg is not supported\n"); + return -EOPNOTSUPP; + } + + ret =3D genphy_config_aneg(phydev); + + if (ret < 0) + return ret; + + adv_2500 =3D linkmode_test_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, phyd= ev->advertising); + ret =3D phy_modify(phydev, MII_ADVERTISE, AX_ADVERTISE_2500, + adv_2500 ? AX_ADVERTISE_2500 : 0); + + return ret; +} + +static int asix_ax88279_get_features(struct phy_device *phydev) +{ + int ret; + + /* MDIO_DEVS1/2 empty, so set mmds_present bits to allow reading abilitie= s */ + phydev->c45_ids.mmds_present |=3D MDIO_DEVS_PMAPMD | MDIO_DEVS_AN; + + linkmode_set_bit_array(phy_basic_ports_array, ARRAY_SIZE(phy_basic_ports_= array), + phydev->supported); + + ret =3D genphy_c45_pma_read_abilities(phydev); + if (ret < 0) + return ret; + + /* AX88279 does not support reported 100baseT-half duplex mode */ + linkmode_clear_bit(ETHTOOL_LINK_MODE_100baseT_Half_BIT, phydev->supported= ); + + return 0; +} + +static int asix_ax88279_config_init(struct phy_device *phydev) +{ + __set_bit(PHY_INTERFACE_MODE_2500BASEX, phydev->possible_interfaces); + __set_bit(PHY_INTERFACE_MODE_SGMII, phydev->possible_interfaces); + + return 0; +} + static void asix_ax88772a_link_change_notify(struct phy_device *phydev) { /* Reset PHY, otherwise MII_LPA will provide outdated information. @@ -94,6 +211,24 @@ static void asix_ax88772a_link_change_notify(struct phy= _device *phydev) } } =20 +static int asix_ax88772D_get_features(struct phy_device *phydev) +{ + int ret; + __ETHTOOL_DECLARE_LINK_MODE_MASK(mask) =3D {}; + + /* MDIO_DEVS1/2 empty, so set mmds_present bits to allow reading abilitie= s */ + phydev->c45_ids.mmds_present |=3D MDIO_DEVS_PMAPMD | MDIO_DEVS_AN; + + ret =3D genphy_read_abilities(phydev); + if (ret < 0) + return ret; + + /* AX88772D does not support reported 1000baseT mode */ + linkmode_clear_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, phydev->supporte= d); + + return 0; +} + static struct phy_driver asix_driver[] =3D { { PHY_ID_MATCH_EXACT(PHY_ID_ASIX_AX88772A), @@ -111,6 +246,35 @@ static struct phy_driver asix_driver[] =3D { .suspend =3D genphy_suspend, .resume =3D genphy_resume, .soft_reset =3D asix_soft_reset, +}, { + PHY_ID_MATCH_EXACT(PHY_ID_ASIX_AX88772D), + .name =3D "Asix Electronics AX88772D", + .flags =3D PHY_IS_INTERNAL, + .get_features =3D asix_ax88772D_get_features, + .read_mmd =3D genphy_read_mmd_c45, + .write_mmd =3D genphy_write_mmd_c45, + .suspend =3D genphy_suspend, + .resume =3D genphy_resume, +}, { + PHY_ID_MATCH_EXACT(PHY_ID_ASIX_AX88179A), + .name =3D "Asix Electronics AX88179A", + .flags =3D PHY_IS_INTERNAL, + .suspend =3D genphy_suspend, + .resume =3D genphy_resume, + .read_mmd =3D genphy_read_mmd_c45, + .write_mmd =3D genphy_write_mmd_c45, +}, { + PHY_ID_MATCH_EXACT(PHY_ID_ASIX_AX88279), + .name =3D "Asix Electronics AX88279", + .flags =3D PHY_IS_INTERNAL | PHY_BROKEN_FORCED, + .get_features =3D asix_ax88279_get_features, + .read_status =3D asix_ax88279_read_status, + .config_aneg =3D asix_ax88279_config_aneg, + .config_init =3D asix_ax88279_config_init, + .read_mmd =3D genphy_read_mmd_c45, + .write_mmd =3D genphy_write_mmd_c45, + .suspend =3D genphy_suspend, + .resume =3D genphy_resume, }, { PHY_ID_MATCH_MODEL(PHY_ID_ASIX_AX88796B), .name =3D "Asix Electronics AX88796B", @@ -124,6 +288,9 @@ static const struct mdio_device_id __maybe_unused asix_= tbl[] =3D { { PHY_ID_MATCH_EXACT(PHY_ID_ASIX_AX88772A) }, { PHY_ID_MATCH_EXACT(PHY_ID_ASIX_AX88772C) }, { PHY_ID_MATCH_MODEL(PHY_ID_ASIX_AX88796B) }, + { PHY_ID_MATCH_EXACT(PHY_ID_ASIX_AX88772D) }, + { PHY_ID_MATCH_EXACT(PHY_ID_ASIX_AX88179A) }, + { PHY_ID_MATCH_EXACT(PHY_ID_ASIX_AX88279) }, { } }; =20 --=20 2.47.3