From nobody Tue Sep 29 08:26:40 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 C4E3E37DAAD; Mon, 10 Aug 2026 12:33:52 +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=1786365234; cv=none; b=JjWZKPzXFezymGIzspMcNAJuAK6JBHsyM/bT31dqPNlzpCBynIw/N9HtaeGQf8tCd9MLCN18KoQYmJp1254bBrAPv2KzoUQU7kLI+0J0VIhLuVZ76MQ16H5fmnhqYN0xZ9s+SwOkgUd4y+i57VUO6aTELnbxspcIaqoIwfE/DlA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786365234; c=relaxed/simple; bh=rAVODRDhcET/CUSYtvLYeAVApkLFYcWf0htwDO93Yro=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UVD7MltAFCVAQDMAhUFmPeSkjLnmgtx8tvZcYgMXSKLTdRDSBm0ju0JxEyFCuKzCjxbE2tnWb9297dVkFKDqn7MobBCt69qCkENDeYyeJ5HLqckJnNcRo66grJ8qPBQW5NMqtti8h8//rhhDoQA2oPbcGZFChPVjXJJis9UG+ZM= 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=GoW6Kxf8; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=CUxTLSgu; 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="GoW6Kxf8"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="CUxTLSgu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365230; bh=rAVODRDhcET/CUSYtvLYeAVApkLFYcWf0htwDO93Yro=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=GoW6Kxf8BLYguhSeT0VLMzPY4PPCvMsw/c7lKk00nYDVlQ6JendGVKg+ub0BC3eOm EGArXN7QG1QOz6NmlNjlzXPd0zN1E9p6mXOffoPynSdAR11WW0QROnTc7KMoa57OI7 lGLx8P3kfVKrBNC0wfhHKtvmNc+FDL3hIC++5dhkJZZ5d6B8mmDZ3ofRdcLF3tnxlW czOUGLox+T/mC/k60vmggsmhjUYIosUuSSmRG3fJ4HZFbGBj2ocA3hbPGDwNUJB46B 2fvjcd9+69i1K+9yJbiiiq57JhMO1A7iw5f8xtJFSWGVww3oeOFC+awU3xM1QjLBn1 CTYIrFnYdtNTQ== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id A6A1B49781; Mon, 10 Aug 2026 12:33:50 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365216; bh=rAVODRDhcET/CUSYtvLYeAVApkLFYcWf0htwDO93Yro=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=CUxTLSgu3iUq6umLZLISSRGSb1APD4t5UtQKua0xdOzX2/u5YctsHDpIkAb+wBoMe 26J/N3byuhXA2BvhdDjvVlYi5TC6Zd7GvIcjZshZ8gxS/2zrQquRpU7OK+tUtjcH8A YXEmUPcqye+MPj0mZJkwoZ1QopMPdFFkpPSko0bzP4L6p1o9LbLOyahSHub30QDE// P8Q7WxJzjmHmZTZ34HVhe3KDL3ZF5UNn539UJHC63WEurLH+ZK6B8TJ6l9VT949fhY ZHV/Eq3ePsgyn/5rTs7KZ4KV2dX9TLP9zSjxBzmr9GnWbIc/3yP0RPGRirBPxgG2SR QxC1QhpZ08FDg== Received: from DebianDesktop.lan (p200300c69f06340062b039dfa3272a8e.dip0.t-ipconnect.de [IPv6:2003:c6:9f06:3400:62b0:39df:a327:2a8e]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id 263C44976D; Mon, 10 Aug 2026 12:33:36 +0000 (UTC) From: Birger Koblitz Date: Mon, 10 Aug 2026 14:33:26 +0200 Subject: [PATCH net-next v7 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: <20260810-ax88179a-v7-1-da633191c129@birger-koblitz.de> References: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> In-Reply-To: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Birger Koblitz , Jianhui Xu 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 Tested-by: Jianhui Xu --- drivers/net/phy/phylink.c | 16 ++++++++++++++++ include/linux/phylink.h | 1 + 2 files changed, 17 insertions(+) diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 087ac63f9193d790d20bf5739965669a7adf654c..2ba1d76872a235b0d75722e059d= 7fd5e35d3aebe 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -1612,6 +1612,22 @@ 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. + */ +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 2bc0db3d52ac8d51e1180e197e5af9ef61878e06..21f960a827b6fa7786f9e105194= 2988270f12323 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:40 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 05A563DA5AF; Mon, 10 Aug 2026 12:33:53 +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=1786365235; cv=none; b=IPKkZY/CdnjqAdWG0GcS33qNNRfgZMmYTZ21RpPD2oRH80YGceNQdjueOATfcyvdYLpcBpABnnYfaOSz9+BJ/k2eflmYe8qeqmzGti4pruMf+oIgw1xlr05bgMxgOcd41boo6Qj5PDcIo+CmCwTLvQtdgZ4XNvmFSxRMt1PLVz0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786365235; c=relaxed/simple; bh=Xt+4mBtUkIrJ36ZCTKcJkucyLloqg9n7ap1XhHTfnJk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FWL7fAGvUncvn3l9ABWroM1yN56/zVlxLYddCNbzi68kMFO0PHzOuaSbdy/2hmuw49WV5YhuwHtXEcbSMJLA3xpcHuI+AKZJtZ2/cZsGQJat7iUsi+q1LklQXIDajRa6I+3E/tJYMyckq8+Itl/kubmI6bQuvKSY2Ej/unx+ltw= 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=qBLY07XP; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=fG31YjOG; 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="qBLY07XP"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="fG31YjOG" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365232; bh=Xt+4mBtUkIrJ36ZCTKcJkucyLloqg9n7ap1XhHTfnJk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=qBLY07XPN8FKZb+PqRR/0Wx0MsMnBAFVZk5w54BzkL65aUvoQnVCDFUjrnUlrThwN Zp9PfId4luIoawUgCyXkVykxC3pUcDKaig/vOR8n93W3L9KZWFV8lsdXhZWCv7pJN5 6DztY1Fr4vckeDxYqbHNCboQdxMe57k+b0zVwdGls8WYyVLuASH5j6MU2QHx8VcZ9Y WnCvz7+M4ZSvfHccvN+EcFURCJJQyCXyg6g7OIL+oilTrbz4a9ULHKw6I3H79KtYVK NGl0IbCneK1zdSDdNqemGHLc5PxB6urPKTXUMKVMO+uBXVA0ukhbAsAsKe9FfbM2yo RQ0Z+enfrp+Vg== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id 326884978D; Mon, 10 Aug 2026 12:33:52 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365216; bh=Xt+4mBtUkIrJ36ZCTKcJkucyLloqg9n7ap1XhHTfnJk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=fG31YjOGghkQaa/PvdJz2Az+Vknx6E1xUtOzcqx9sjW2aeLVnchGpXBgutwv/Razs 750g8eUNwupzfIlepbQCX88ho1XEzq7q0TcEXzpCK2ts7vdOb66TfLW1CWm8abkjvy wZY/JxP9JL19ciqdE3PiIcHuD2n5cUXaGXO+wzSZRNE5aSf6XWd3+smda7hGr2QUen 68P+hmePXdVkvFFW5o1SRyqFf5OuYxnNaZPUSmb5gy5If08eoKeZhbNv6bb3k96lCI ++Q6/f7Ob9sU8JilTUUhJHMvAAQlhC9Z6GQV8NBAWDrdPiumFbT31BApdvnRADdk0e N1d8vfm5OfPRg== Received: from DebianDesktop.lan (p200300c69f06340062b039dfa3272a8e.dip0.t-ipconnect.de [IPv6:2003:c6:9f06:3400:62b0:39df:a327:2a8e]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id 70EEE4976E; Mon, 10 Aug 2026 12:33:36 +0000 (UTC) From: Birger Koblitz Date: Mon, 10 Aug 2026 14:33:27 +0200 Subject: [PATCH net-next v7 02/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: <20260810-ax88179a-v7-2-da633191c129@birger-koblitz.de> References: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> In-Reply-To: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Birger Koblitz , Jianhui Xu 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 98f899ea2e9462f1ba99281a875385241745458b..945c071dfd1d2f0816c779e1a40= 1ac158adc8d99 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 @@ -1617,11 +1617,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:40 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 629923D9DD8; Mon, 10 Aug 2026 12:33:58 +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=1786365241; cv=none; b=W+b4rIAyGgxz/E63pLlo5iSvHjnwF1g7S8nvJ1gt9EAzaOS8w9nZue5crY82Tw+Ql37ysMJ6Is+3EGIL5JeA/U9sd4ZD0aZptc4lD3cUiheAH3fDG5wsL5uuCM4oO74JU4nYHr37LDOxOiXJxwNvmrZSM62hTtXyvQCCNnG5EN8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786365241; c=relaxed/simple; bh=P27NWOOZedxaaf28y02kii86//5z48CEx/6xlnl3FFY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gX7ORzUEAIDb48vxCxl9H0dhjDLMNrFJCVxW9V1kKBHn0xoqtdSLRWt3KCXXOh+GgKAgF2yxQKzsyB1GBrpK9YkNyacuUxWiQQgcqB9rePScxEpc21Kl2x0ukv5m4xzU43GyoYF/LP3e1jZQMkz6GCViNhmwJgGy4HtbSYk7grs= 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=gIZSCDUK; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=1gunV1QX; 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="gIZSCDUK"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="1gunV1QX" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365236; bh=P27NWOOZedxaaf28y02kii86//5z48CEx/6xlnl3FFY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=gIZSCDUKfYkkar+mDiZ5FSHIvM6PDCMrUDGgix6M3+e/fWQkJoq2zAEtQoo2cmZII 9GHr2/ywUYhAUkCQ7JvoJTe7qSnZ9eKlhmlrXG/5xc1sy1zKUf7OWRRAIP9LNZIvDj aKkOE7fDpHLwgBpdmTJz6Zk0Tii1hvha0FUKTIfvOcS/Dwr+9I0UNsaBICkUaOH1ab czDgnkQRq0FIeTFTSNGWoB9w4NDQJAuyO7Z0L3M0g/UymF0uYI1tSJtd0xq2fPIK7S Xv+lJWmAq7aBmdDNBowjf/VfodBGXwfUaBTsrDu520WWwaGQ+8TSEXpRSqiKrceX83 PyAlY/VVP3uMw== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id 9A33249789; Mon, 10 Aug 2026 12:33:56 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365217; bh=P27NWOOZedxaaf28y02kii86//5z48CEx/6xlnl3FFY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=1gunV1QX+7xREGU7/iZWAnvCPWXhH3zcrZDquls3VQ54ZVMmgulh/TPX7xIadZiZ8 64pOa16EBH3nKPI+67CCacRzTPQO1hYzM1sN19eJR7YyhnkSQnKOiOiDx+so1XVzR7 YnvzvR1mrypLW6sYm6y8IcIHXCUxFo8dJM37V5cMVxEDL/BWHFJ3zopevkEJggOLOz WfB021An1i/V99pccyjYy4vGrRObKIH2zZisrWLWOswJTnGy/l9HajP28Nt+VRjcuF BLHML/X0COYgAHGwTm2ZFGO0vgMgr63SzkHsi4ADEQpsjyl7eS9T5OECbgyYSb//Af FN+34JBgjzQtQ== Received: from DebianDesktop.lan (p200300c69f06340062b039dfa3272a8e.dip0.t-ipconnect.de [IPv6:2003:c6:9f06:3400:62b0:39df:a327:2a8e]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id BBB3C49770; Mon, 10 Aug 2026 12:33:36 +0000 (UTC) From: Birger Koblitz Date: Mon, 10 Aug 2026 14:33:28 +0200 Subject: [PATCH net-next v7 03/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: <20260810-ax88179a-v7-3-da633191c129@birger-koblitz.de> References: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> In-Reply-To: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Birger Koblitz , Jianhui Xu 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. Signed-off-by: Birger Koblitz Tested-by: Jianhui Xu --- drivers/net/usb/Makefile | 3 +- drivers/net/usb/ax88179_178a.c | 611 +------------------------------------= ---- drivers/net/usb/ax88179_lib.c | 453 ++++++++++++++++++++++++++++++ drivers/net/usb/ax88179_lib.h | 194 +++++++++++++ 4 files changed, 650 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 945c071dfd1d2f0816c779e1a401ac158adc8d99..66464a321dbcfe4370dad97d7ef= d5165983de6e4 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; diff --git a/drivers/net/usb/ax88179_lib.c b/drivers/net/usb/ax88179_lib.c new file mode 100644 index 0000000000000000000000000000000000000000..2a9111cead3073aae225def0b5f= 8a5a4f40c8439 --- /dev/null +++ b/drivers/net/usb/ax88179_lib.c @@ -0,0 +1,453 @@ +// 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 "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 ret; + 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; + + if (!dev) { + netdev_err(dev->net, "No net device.\n"); + return -ENODEV; + } + + 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 ret; + 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; + + if (!dev) { + netdev_err(dev->net, "No net device.\n"); + return -ENODEV; + } + + 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 in= dex, 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, u1= 6 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; + + 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; +} + +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:40 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 7B0C33D9DCC; Mon, 10 Aug 2026 12:33:57 +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=1786365238; cv=none; b=RvrvhZh1gqxTzuncATvIYgiL3XxSv2lOum73Rn4p2k6w/PgNJffzHASwES1gzOeW/KHbcm7NUtjZ9JZyewCyrL2E1UPH0cSt1KjpgzxHwB79pNv6ROB9Gnj9s/LPAQUpOvVGgw8d5Z+flbRTDTq0q9L8woT5wueBoxsrI9iM7IU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786365238; c=relaxed/simple; bh=arPauO7pr6LiIFEB02AC20aa7I/MpHlsHswf3y6HSb0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=syMEK6lTvOLhLMBakVu7GhwHtIF7OEG9tR/jVNb3QNAd5Gxc6npE0VPTnqHORgCMEVTJksCRTIoVgZVq4df4GzeKMrr4wRBRkBKGrRhoZXVkLuBJnOZA63BNHARF6lkgu2nkZjiWaBV5/NQ9sWR3qepPERopiu0RN1oBQ6KNhVk= 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=ZTpafRMu; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=Jdzj48CE; 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="ZTpafRMu"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="Jdzj48CE" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365235; bh=arPauO7pr6LiIFEB02AC20aa7I/MpHlsHswf3y6HSb0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ZTpafRMupnCDD0UEg2vGrs2JeP2wstmDitVzecfWAqpCsnWGjP8TDf97Yr780lv1H raDoksQBy9wX6skTrzX1xM2DRkTrsvRlFIBJq9IL1NDBnX3WZQHqxEPIu+9iZKNQ0B qrvqzY7ZB56iyBUy4wpMoWC0W1ShrkARJXvSwAijHoqHfrp0tV4SJsgFaBQ2Mm1uTJ UoYNbk0XJA84ePybeXkA6NjtUqZZY/jy/L5Np7MtjIlLqAb+M9CzupCltWdjW31czK BcKBLGI0BGhABpqk78GSxX2NAS69JqDMhR/ogIZ5Cj66ZFuDZKqzns0NuD1XQaeF6d b77BogL5OV3HA== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id D82904977E; Mon, 10 Aug 2026 12:33:55 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365217; bh=arPauO7pr6LiIFEB02AC20aa7I/MpHlsHswf3y6HSb0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Jdzj48CEEz2Jyhb5gqyEhJ1GhjTwX0QuhVzvbxVzjdTDQWhbygcAx7Qm55u940NX8 KBBqb5KXg3d3YDUx2rqmyDaOoj2VhgIXeNhyJde9Q7qRBwHxXZmhoWHFOkhs28yXhY 43psEuMxgvpR3UBjrUO5nvNHBRKQBbv8hQWCGe+W7cBFVts3ffS0To9H0aROPlFqQS ecpwbgkDEHkEMNgWNOf7ahJdmCGXXdWQca4+JhZWKJgYvIvggeAcdKxDSgquz5PDxi yCzKPUYHTh6nYxhl1YmbhsCRE7WvDBxwZvc3jR43l3pg3UBUw/TEu0SdpMeaP7Fbu9 cmBWMOXG8aYFg== Received: from DebianDesktop.lan (p200300c69f06340062b039dfa3272a8e.dip0.t-ipconnect.de [IPv6:2003:c6:9f06:3400:62b0:39df:a327:2a8e]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id 1880B49771; Mon, 10 Aug 2026 12:33:37 +0000 (UTC) From: Birger Koblitz Date: Mon, 10 Aug 2026 14:33:29 +0200 Subject: [PATCH net-next v7 04/14] ax88179_178a: Add netdev2data() convenience function 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: <20260810-ax88179a-v7-4-da633191c129@birger-koblitz.de> References: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> In-Reply-To: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Birger Koblitz , Jianhui Xu X-Mailer: b4 0.14.2 Add a convenience function for the ethtool ops that use phylink and need to retrieve the ax88179_data structure from net_device. Signed-off-by: Birger Koblitz Reviewed-by: Andrew Lunn Tested-by: Jianhui Xu --- drivers/net/usb/ax88179_lib.c | 7 +++++++ drivers/net/usb/ax88179_lib.h | 1 + 2 files changed, 8 insertions(+) diff --git a/drivers/net/usb/ax88179_lib.c b/drivers/net/usb/ax88179_lib.c index 2a9111cead3073aae225def0b5f8a5a4f40c8439..60888b3fb4fb579b6ddbfdd8033= c9afb2bffa88c 100644 --- a/drivers/net/usb/ax88179_lib.c +++ b/drivers/net/usb/ax88179_lib.c @@ -137,6 +137,13 @@ int ax88179_write_cmd(struct usbnet *dev, u8 cmd, u16 = value, u16 index, u16 size return ret; } =20 +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; diff --git a/drivers/net/usb/ax88179_lib.h b/drivers/net/usb/ax88179_lib.h index b2ee1356727cf4b3fa05f0b0d5fd863ac3f9a87d..9ff2a94a6fb2de4ee85f25e913a= e2fe263bcea7c 100644 --- a/drivers/net/usb/ax88179_lib.h +++ b/drivers/net/usb/ax88179_lib.h @@ -181,6 +181,7 @@ void ax88179_write_cmd_async(struct usbnet *dev, u8 cmd= , u16 value, u16 index, 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); +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); --=20 2.47.3 From nobody Tue Sep 29 08:26:40 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 E034E3DDDCC; Mon, 10 Aug 2026 12:34:02 +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=1786365246; cv=none; b=cyovruImf3KWDAN06yNDcBTGx1bczx5aP0nfHws7Dov2bei02VMXAn6gIvnXquHw2+n8zo8w5vqYHdugyHxavLcSjr7fHUpa+L7ClN5csDONHtuiR39nrh3XcyIzJB8aiak1PMN0aZCPW8gkk6MkP4h16u7gi/Xhow3nOBiJCKM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786365246; c=relaxed/simple; bh=gl+O/l3QuV8u2YbZhRhEx44SHw3j5xlhpBuDYFp0cEU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MuomohHZOcGLnxDMng2dVP310sLxxhBdPqRBThMi4ey3cuZf4ZZvL9U3NmfC1j7TvVDPzow6Lm51ra4goW2d+myHq1PqK1jF2IFLyl1PxxRLBRHB+yd/3hCkIdhn9m1pBMHlXRcve/zNtVONsniVOXccspiukmoOaogWzOFy+z8= 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=lRr4U+Wp; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=Uhv/thIY; 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="lRr4U+Wp"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="Uhv/thIY" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365241; bh=gl+O/l3QuV8u2YbZhRhEx44SHw3j5xlhpBuDYFp0cEU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=lRr4U+Wpvj5nguaSm6oyR2enEBnF3XNSP0yHOpdIAcLBYbp3+jBf5AO/OZg/LHQmH UPQuj3MvCBc0guuY71/hbax396afgk3bAIdFgu9jnPHvKtxT7o3OAEX4YRDhZpmR7b FCP3D27o8MEz5KgkVNEv7GqAl6mM8+uVsHU/CD8Qhw/ozNjxION2ea/jL58hasvWFB 4PMSg2cBuK+r3YjQF4cHslWvJfVXJyqS1SgTZ3FwyfYLX50q6yDn2rlyF31GSYI7xN VnKfL71uVjcfO3XgLfE+FnZhtpKJSUzkbNiW5FVUh22b3jHYFUXgVdW/sWlY02r3AD 7iuscRfYk+QAg== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id 46C0E49787; Mon, 10 Aug 2026 12:34:01 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365217; bh=gl+O/l3QuV8u2YbZhRhEx44SHw3j5xlhpBuDYFp0cEU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Uhv/thIYbWN53yYEi0fI7YJCZg8k4Gp0SPSJh+NG/YmnObJH4lyf/AZtKMdoICY2q TKw2z2X+zbkVeG15q364HJQUdBStNNfAilsoUAL/WB52XoO2b7PZkNdUUZ1TTXdxQ+ lbalzjZ4m93OluEzu7krHqng1R/jBT0YOrEZ/FCSsXRfTdzCU4rb8VrwZyWoIbyHS6 x5lOG4Q/l/9zWjzQvZ2szFNwCSN93ORF22Tx7xUyKUaK/3jRlBFe9RP2V0E1palNCs rg4I/HqlRNKZ+qc7RR4BqqIbpnX4vh1JeFycM9/xGJM9SEsX2wr1vZP8urU12kfpMG fjkXfSz6Mv8lg== Received: from DebianDesktop.lan (p200300c69f06340062b039dfa3272a8e.dip0.t-ipconnect.de [IPv6:2003:c6:9f06:3400:62b0:39df:a327:2a8e]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id 6469D49772; Mon, 10 Aug 2026 12:33:37 +0000 (UTC) From: Birger Koblitz Date: Mon, 10 Aug 2026 14:33:30 +0200 Subject: [PATCH net-next v7 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: <20260810-ax88179a-v7-5-da633191c129@birger-koblitz.de> References: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> In-Reply-To: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Birger Koblitz , Jianhui Xu 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. Signed-off-by: Birger Koblitz Tested-by: Jianhui Xu --- MAINTAINERS | 6 + drivers/net/usb/Kconfig | 2 +- drivers/net/usb/Makefile | 2 +- drivers/net/usb/ax88179_178a.c | 12 + drivers/net/usb/ax88179_lib.h | 159 ++++++ drivers/net/usb/ax88179a_devices.c | 989 +++++++++++++++++++++++++++++++++= ++++ 6 files changed, 1168 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 15011f5752a994cf1b354f490d6c4e411588df88..d43d58b417e5879c77589131ce3= c7c303b1e6ddb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3987,6 +3987,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 66464a321dbcfe4370dad97d7efd5165983de6e4..6bd9704046009d7aad5ee6ddddc= 18faab5b030dc 100644 --- a/drivers/net/usb/ax88179_178a.c +++ b/drivers/net/usb/ax88179_178a.c @@ -1268,6 +1268,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, 0, 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, 0, 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.h b/drivers/net/usb/ax88179_lib.h index 9ff2a94a6fb2de4ee85f25e913ae2fe263bcea7c..2e4d35c74ee8b32cd2916924b85= d5427860bb08c 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,56 @@ #define GMII_PHY_PGSEL_PAGE3 0x0003 #define GMII_PHY_PGSEL_PAGE5 0x0005 =20 +/* 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_MASK 0x7FFF +#define AX179A_TX_DESC_MSS_SHIFT 0x20 +#define AX179A_TX_DESC_VLAN_MASK 0xFFFF +#define AX179A_TX_DESC_VLAN_SHIFT 0x30 + +/* 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_MASK 0x7FFF0000 +#define AX179A_RX_PD_LEN_SHIFT 0x10 +#define AX179A_RX_PD_VLAN_SHIFT 0x20 + +/* RX Descriptor header */ +#define AX179A_RX_DH_PKT_CNT_MASK 0x1FFF +#define AX179A_RX_DH_DESC_OFFSET_MASK 0xFFFFE000 +#define AX179A_RX_DH_DESC_OFFSET_SHIFT 0x0D + +#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 +299,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 +322,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); @@ -192,4 +346,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..2971e883e384535725bf0a09971= befebdacf9ca3 --- /dev/null +++ b/drivers/net/usb/ax88179a_devices.c @@ -0,0 +1,989 @@ +// 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; + + 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; + } + + ax88179_read_cmd(dev, AX_ACCESS_PHY, phy_id, (__u16)regnum, 2, &res); + 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_cmd(dev, AX_ACCESS_PHY, phy_id, (__u16)regnum, 2, &v= al); +} + +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; + 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); + 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 (ax179_data->chip_version =3D=3D AX_VERSION_AX88279 && (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_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 usbnet_nway_reset, + .get_link_ksettings =3D phy_ethtool_get_link_ksettings, + .set_link_ksettings =3D phy_ethtool_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 tmp8, link_sts, reg8[3]; + u8 bulk_config_speed =3D 0; + u16 tmp16, mode; + + /* Stop RX/TX for link configuration */ + tmp16 =3D AX_RX_CTL_STOP; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RX_CTL, 2, 2, &tmp16); + tmp8 =3D 0; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_MAC_PATH, 1, 1, &tmp8); + + tmp8 =3D 0xa5; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_MAC_CDC_DELAY_TX, 1, 1, &t= mp8); + + tmp16 =3D 0x0410; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PAUSE_WATERLVL_LOW, 2, 2, &tmp16= ); + + tmp8 =3D 0; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_ETH_TX_GAP, 1, 1, &tmp8); + + tmp8 =3D 0x07; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_EP5_EHR, 1, 1, &tmp8); + + tmp8 =3D 0x28 | AX_NEW_PAUSE_EN; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_NEW_PAUSE_CTRL, 1, 1, &tmp= 8); + + 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); + + reg8[0] =3D 0x40; + reg8[1] =3D AX_MAC_MIQFFCTRL_FORMAT | AX_MAC_MIQFFCTRL_DROP_CRC | AX_MAC= _LSO_ERR_EN; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_MAC_RX_DATA_CDC_CNT, 2, 2= , reg8); + + tmp8 =3D AX_XGMII_EN; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_BFM_DATA, 1, 1, &tmp8); + + tmp8 =3D 0x1C | AX_LSO_ENHANCE_EN; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_MAC_LSO_ENHANCE_CTRL, 1, = 1, &tmp8); + + 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); + + tmp8 =3D 0x40; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_MAC_RX_DATA_CDC_CNT, 1, 1= , &tmp8); + 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); + + tmp8 =3D 0xFA; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_MAC_RX_DATA_CDC_CNT, 1, 1= , &tmp8); + + 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 (ax179_data->chip_version < AX_VERSION_AX88279) { + tmp8 =3D 0; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_BFM_DATA, 1, 1, &tmp8); + } + + if (duplex) + mode |=3D AX_MEDIUM_FULL_DUPLEX; + + if (dev->net->mtu > 1500) + mode |=3D AX_MEDIUM_JUMBO_EN; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE, 2, 2, &mode); + + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RX_CTL, 2, 2, &ax179_data->rxctl= ); + + tmp8 =3D AX_MAC_RX_PATH_READY | AX_MAC_TX_PATH_READY; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_MAC_PATH, 1, 1, &tmp8); +} + +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, +}; + +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 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 usbnet_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; + u8 reg8; + + /* 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 (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, (0xFD + i), + 1, 1, &ax179_data->fw_version[i]); + if (ret < 0) + ax179_data->fw_version[i] =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 | + NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX | + NETIF_F_HW_VLAN_CTAG_FILTER; + + 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 */ + reg8 =3D AX_PHY_POWER; + ax88179_write_cmd(dev, AX88179A_PHY_POWER, 0, 0, 1, ®8); + 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; + u16 tmp16; + u8 tmp8; + + /* Configure RX control register =3D> stop operation */ + tmp16 =3D AX_RX_CTL_STOP; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RX_CTL, 2, 2, &tmp16); + + rtnl_lock(); + phylink_disconnect_phy(ax179_data->phylink); + rtnl_unlock(); + phylink_destroy(ax179_data->phylink); + ax88179a_mdio_unregister(ax179_data); + + tmp8 =3D 0; + ax88179_write_cmd(dev, AX88179A_PHY_POWER, 0, 0, 1, &tmp8); + + 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 le64_to_cpup((u64 *)skb_tail_pointer(skb)); + + /* Check these packets */ + hdr_off =3D (rx_hdr & AX179A_RX_DH_DESC_OFFSET_MASK) >> AX179A_RX_DH_DESC= _OFFSET_SHIFT; + 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_cpup(pkt_desc_ptr); + u32 pkt_len_plus_padd; + u32 pkt_len; + + pkt_len =3D (u32)((pkt_desc & AX179A_RX_PD_LEN_MASK) >> AX179A_RX_PD_LEN= _SHIFT) + - (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)) { + 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 & VLAN_VID_MASK); + } + + 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 ((u64)(skb_shinfo(skb)->gso_size & AX179A_TX_DESC_MSS_MASK))= << + AX179A_TX_DESC_MSS_SHIFT; + + 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 ((u64)tci & AX179A_TX_DESC_VLAN_MASK) << AX179A_TX_DESC_VLA= N_SHIFT; + } + + if (!dev->can_dma_sg && (dev->net->features & NETIF_F_SG) && skb_lineariz= e(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)); + *tx_desc_ptr =3D cpu_to_le64(tx_desc); + + 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]; + u8 *tmp; + + tmp16 =3D (u16 *)buf; + tmp =3D (u8 *)buf; + + /* Power up ethernet PHY */ + *tmp =3D AX_PHY_POWER; + ax88179_write_cmd(dev, AX88179A_PHY_POWER, 0, 0, 1, tmp); + msleep(250); + + /* Ethernet PHY Auto Detach*/ + ax88179a_auto_detach(dev); + + *tmp =3D AX_MAC_EFF_EN; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_MAC_BULK_OUT_CTRL, 1, 1, t= mp); + + *tmp16 =3D 0; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RX_CTL, 2, 2, tmp16); + + *tmp =3D 0x04; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PAUSE_WATERLVL_LOW, 1, 1, tmp); + *tmp =3D 0x10; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PAUSE_WATERLVL_HIGH, 1, 1, tmp); + + *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= ); + + *tmp =3D 0xff; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_MAC_BM_INT_MASK, 1, 1, tmp= ); + + *tmp =3D 0; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_MAC_BM_RX_DMA_CTL, 1, 1, t= mp); + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_MAC_BM_TX_DMA_CTL, 1, 1, t= mp); + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_MAC_ARC_CTRL, 1, 1, tmp); + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_MAC_SWP_CTRL, 1, 1, tmp); + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_MAC_TX_HDR_CKSUM, 1, 1, tm= p); + + /* 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 */ + *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); + ax179_data->rx_checksum =3D 1; + + *tmp =3D AX_TXCOE_IP | AX_TXCOE_TCP | AX_TXCOE_UDP | + AX_TXCOE_TCPV6 | AX_TXCOE_UDPV6; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, 1, 1, tmp); + + /* Configure RX control register =3D> start operation */ + ax179_data->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) + ax179_data->rxctl |=3D AX_RX_CTL_IPE; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RX_CTL, 2, 2, &ax179_data->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; + + phylink_start(ax179_data->phylink); + + usbnet_link_change(dev, 0, 0); + + return 0; +} + +static int ax88179a_stop(struct usbnet *dev) +{ + struct ax88179_data *ax179_data =3D dev->driver_priv; + u16 reg16; + u8 reg8; + + 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= ); + + reg16 =3D 0; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RX_CTL, 2, 2, ®16); + + reg8 =3D 0; + ax88179_read_cmd(dev, AX88179A_PHY_POWER, 0, 0, 1, ®8); + + phylink_stop(ax179_data->phylink); + + 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:40 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 76C043DEFE2; Mon, 10 Aug 2026 12:34:02 +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=1786365243; cv=none; b=lJg1FV3z/wHvOv89sM3xaonNwQ9YAG0LBjZz5UvCduyg4WGbBik291AcU1Woj8nBYePWdeKteeETKUXfRqwFQgrBBuDmhpc1vusaQOBIA57sEYbTe2iNA9hhC1pXMw1CeMfCStsLS+hvpwJ1IKhPVHz8HZB2WaqoesR11SG4uKY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786365243; c=relaxed/simple; bh=tnGUDgq8nx+A3IPGTIr/8nyJZfxJd9RuYCv2VfVkzj4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kdqi1xv+merPx9KSpN3eaAdNCPYAOMAIfiBLIsrtDytYNFsliR2lpqMHz2fl6FELrb9OGPu/2fo88nDadytk9BMAOKwNvVBX7AgLnSimwFBfsqLdiyAfJ08FXyTjItww1q/Z9y2gcU7IZxeQhgGsobC8ZUqXqYJDOWsP9NIiZeE= 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=z5PtXYyw; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=b6BoaR45; 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="z5PtXYyw"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="b6BoaR45" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365240; bh=tnGUDgq8nx+A3IPGTIr/8nyJZfxJd9RuYCv2VfVkzj4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=z5PtXYywIk1lplk0XHYNsn/8Crfax92SnmRIdALOEgBmjCoMm06wM1a1vv3TD2yQl IByqZqEnmE3pjSP71EIieOOlffKSIE694bpnm+I0E5sJ+HZrJjxV+NF9d8uwJUMxdA 10NgR+O4RaH8ahZe4aPSy2CRDfzSvBwczM2RG4WM36mLfzdZh0K9M/Gdu+kgJBLBRb MyxnRYd22yNCrRouuYh9IvQbJFZfRWCMbUZyR1Rmr0+dK/cH7TjOApWBlKs7wpGWxX qa+NR4FSoJ1a9wMei3/0xNlXI/2ZFoFDpyhTNaIYC4oNcpN36uVWY11bp7ebVYgqxZ 1RI1etyQWZ0SQ== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id A36F349786; Mon, 10 Aug 2026 12:34:00 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365218; bh=tnGUDgq8nx+A3IPGTIr/8nyJZfxJd9RuYCv2VfVkzj4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=b6BoaR45blCJkzDd72elr1/PKVIP8V1rdfASBNKnA9t+hU+tjkK5Nd5rjY91j15eF pv7pYnGJ1RZ5YGb//ccKm2divuW+49GfSzmsL1/PNTch8cd5ccCJQPdTlNLdvKdE/0 1ScqutbGURGQO30efDbAUBYR2v1SduDj1W9XFZztlnnM8zqXnwi8+ipwolm7euOxsJ thWT+DqZj84016btJ5pu+HIxyZYQCvEVqMdAhK6StuJi6o/HSbGnzgcKmvj0/Kvt5V ao44SekRXpNxtU4qIkHaFW5ZylQ05Jk91dsNvLmoBZIApN0Ztn8IwAdTKpv2+tEd2S LXTPY9Wy/JinA== Received: from DebianDesktop.lan (p200300c69f06340062b039dfa3272a8e.dip0.t-ipconnect.de [IPv6:2003:c6:9f06:3400:62b0:39df:a327:2a8e]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id B620D49773; Mon, 10 Aug 2026 12:33:37 +0000 (UTC) From: Birger Koblitz Date: Mon, 10 Aug 2026 14:33:31 +0200 Subject: [PATCH net-next v7 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: <20260810-ax88179a-v7-6-da633191c129@birger-koblitz.de> References: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> In-Reply-To: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Birger Koblitz , Jianhui Xu 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 this EEE enable/disable register and replace the EEE. Signed-off-by: Birger Koblitz Reviewed-by: Andrew Lunn Tested-by: Jianhui Xu --- drivers/net/usb/ax88179a_devices.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/usb/ax88179a_devices.c b/drivers/net/usb/ax88179a_= devices.c index 2971e883e384535725bf0a09971befebdacf9ca3..cf2dc989f230ee47f4bf0b4f42a= b02a511abc19d 100644 --- a/drivers/net/usb/ax88179a_devices.c +++ b/drivers/net/usb/ax88179a_devices.c @@ -413,6 +413,8 @@ static const struct phylink_mac_ops ax88179a_phylink_ma= c_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:40 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 7C7373DA7D7; Mon, 10 Aug 2026 12:34:04 +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=1786365246; cv=none; b=CN2UCIfO6TysyUj1gDPwq5clFwKd6ozE3yVQgpgizwVpBjgaFzrM7k7jD804oeieLsM8BuKKIhi+EkGFt3T5u9f63hEHRxLWrTfH9pLHQ5h0QGIYJJ8OAsVhpxgKlGN96LscfzU1QWqSfn/CHMcNnbr423B/y9+ytiYo2kvG1ps= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786365246; c=relaxed/simple; bh=crUBBjC5YHq9WZfackqIILM6Z5h9qVyPmxGeUb/Uboc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=h5MekTmPmhUpQsSpr8r1QOCmndgZPlkQVmib1Rs+x6zhbF08f77s1boO894PNEG8GiPuG3weiRaV/1pGn1A0WMQxfYwaYoCGXo8NPm2k5vL9KVvJY1/x3H710mazEkDa8P3cTtWRLQAiZuNdDYW+HgD/XufwLoYyzpPwvLxDr/M= 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=QtwKDQia; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=1fhOZaMy; 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="QtwKDQia"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="1fhOZaMy" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365242; bh=crUBBjC5YHq9WZfackqIILM6Z5h9qVyPmxGeUb/Uboc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=QtwKDQiaFhRGpZXdlSzW//fmwNROKIy48+9EPy5p4nVEVtccsYA2fBkPDiYE0461X OwRO7Y/V6da272l8miur8vpWxUY5qVateMNHBY6HacCLlgNBwhTs/N1RwwIoF3exRs ivxiAHgy+OvWJgae8ggHhebXpPeGFYce0xUGo2IT+oJNfH/ubpYLQpuJbp7gQFpEbM gb2A0youa1eMeUkbeQVWf8xWqYKf4Gdr4q6lV8c0eKnTp9njIRKxDrr6bVcTG7SGNR H8tuXfGY7UOOgMpX+jNog0mV6s2z81ouYQbC9RBjXvplJ1dPen7XGtEfGmm41/vh2b QOg1WOtf0NEfg== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id 87F0749792; Mon, 10 Aug 2026 12:34:02 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365218; bh=crUBBjC5YHq9WZfackqIILM6Z5h9qVyPmxGeUb/Uboc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=1fhOZaMy/4Q930keVskGGAY6yJ/o94daHxxXobbz8xM+WmTUGrRxoh5lpkdIQWqDJ 4OHpKsuiMgXLblii7+T84UARcy/Vv1OC6Klu+0wCHSGzE2nH/1Bw8W3wv5QbGFRTDh o2ft8ALYEGef87+clWhQTBis3BRrybO8iwuNd9cjzFWoEZy1LgTqWg3Bux7E4JpI3e HIBTSuDOYITwZVJTJvoCzTLjl1ennKYN9G8QfupPohOBq2H6XPDi1yHFZqRj5eQMhh nqdBN3j48WeQnSveUCE9s9R1zCUuIF4gnmV0nogmHFhXCjAnwRVx5iBwWuQkvNvG/I mRJaBIYD8e3WA== Received: from DebianDesktop.lan (p200300c69f06340062b039dfa3272a8e.dip0.t-ipconnect.de [IPv6:2003:c6:9f06:3400:62b0:39df:a327:2a8e]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id 0DF7349774; Mon, 10 Aug 2026 12:33:38 +0000 (UTC) From: Birger Koblitz Date: Mon, 10 Aug 2026 14:33:32 +0200 Subject: [PATCH net-next v7 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: <20260810-ax88179a-v7-7-da633191c129@birger-koblitz.de> References: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> In-Reply-To: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Birger Koblitz , Jianhui Xu X-Mailer: b4 0.14.2 Configure phylink to work with the PHYs in the AX88197A controllers and provide ethtool get/set eee operations calling into phylink. Signed-off-by: Birger Koblitz Reviewed-by: Andrew Lunn 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 cf2dc989f230ee47f4bf0b4f42ab02a511abc19d..e1c4e5a1e5dc584a471090876bc= b7479cd392708 100644 --- a/drivers/net/usb/ax88179a_devices.c +++ b/drivers/net/usb/ax88179a_devices.c @@ -216,6 +216,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, @@ -225,6 +239,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 usbnet_nway_reset, .get_link_ksettings =3D phy_ethtool_get_link_ksettings, .set_link_ksettings =3D phy_ethtool_set_link_ksettings, @@ -450,6 +466,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:40 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 8B8013E073E; Mon, 10 Aug 2026 12:34:04 +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=1786365246; cv=none; b=W5B609iXqdGi2UrudZAdms1Qa+k7WDIEEWDn0n000Lmt2hDPSGiK+LRFS68KR47A9IRryglt1zguiuAPk9muozrb8U0GK0ycjLVgbUST1JHZjmg2yGGtJAVGaFNOFB/XaiG5yiRzx9Rcp945457wW3CaceKqj2M6f5ZZRdZlXDg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786365246; c=relaxed/simple; bh=aZoA1nuLFLZ+1Esle11mGgMYqrst8R2hMvpOveTwI1c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=I7FMhlFMcITwmvJXQxE7AeAXkiFeMqSbOUwHxh7OKeFY5p8Cpnp8wr9hEFFltQOSw5OnibR4oKQquk4XQ7SD4Bk6vLVsKKvQhyKPnIJbJLuKxJOKtrx7gVjLGRyyiPrejIiZru/OwiD8k8Nmu8ENWk792/A1hEgN4s1EXy5DMyo= 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=uijM9sey; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=P2DSZf1q; 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="uijM9sey"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="P2DSZf1q" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365242; bh=aZoA1nuLFLZ+1Esle11mGgMYqrst8R2hMvpOveTwI1c=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=uijM9sey2+3ez0enpdLOO1HEDqcS3s3+euAwLthfvQzWGnMcDDEzi/pRnBn4R157T cb47UpZmXFdvt5RfI64sc5iKzJEmlJSIZVA4r0IRCRr0KHNhO9rj1hdp4P5x4DLE/L EgbBORmrNydTCRQ5/vu32fsMD4VWDMLnzuVwBBpGkup6yP43U1BAmg6PVeQhfLer2m EDtWVGuJSHcjwDMp4MSHvjKZTS5LUjTfQVJW4amfAig9TjJxSemj1QuzWqT1pFI6A/ vDpJIAeFC0F8WHvrxKvQgxOke7rX90Hv6BKABfW/37He/aUAxEm7ETgu6GUt30yNOw bso79Dg0oFIfw== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id D981149794; Mon, 10 Aug 2026 12:34:02 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365218; bh=aZoA1nuLFLZ+1Esle11mGgMYqrst8R2hMvpOveTwI1c=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=P2DSZf1qeHReSlBNjCcaO6LTStfwTp/rdrrdq8QgYHoVlCgfl1VAW5EFUe+sCXYtb tBcI/ZO5TDmoFkNRwC2+PCnFytrcShw86wBGAxg4gIasuwYfXJotpV4KpgB2THOS8w L9x+MeX5OEw9aVN1z3JNf9MOhElhzUq9MPPOL3L7xY+BJL8yj8XBmHVsPR9Y4y/Rza IdnrASXzKFxn+CNDqSnjUwR74QJe//lnwiAQ25MTCb/SG58OV4bYaokjKog3n4Skfo e5eVXEtfya+MgZf4Mo+7a8fQ5a9CCGv15cctWmaDqqgsV5W1vHLQv24uMiCFRvy3Nr rIbmVFV+rW0dQ== Received: from DebianDesktop.lan (p200300c69f06340062b039dfa3272a8e.dip0.t-ipconnect.de [IPv6:2003:c6:9f06:3400:62b0:39df:a327:2a8e]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id 5AC2249775; Mon, 10 Aug 2026 12:33:38 +0000 (UTC) From: Birger Koblitz Date: Mon, 10 Aug 2026 14:33:33 +0200 Subject: [PATCH net-next v7 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: <20260810-ax88179a-v7-8-da633191c129@birger-koblitz.de> References: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> In-Reply-To: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Birger Koblitz , Jianhui Xu 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/ax88179_lib.c | 2 + drivers/net/usb/ax88179a_devices.c | 102 +++++++++++++++++++++++++++++++++= ++++ 2 files changed, 104 insertions(+) diff --git a/drivers/net/usb/ax88179_lib.c b/drivers/net/usb/ax88179_lib.c index 60888b3fb4fb579b6ddbfdd8033c9afb2bffa88c..4e8823e1c4a15bc8caf788446c8= c030b34039a01 100644 --- a/drivers/net/usb/ax88179_lib.c +++ b/drivers/net/usb/ax88179_lib.c @@ -355,6 +355,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) { @@ -374,6 +375,7 @@ int ax88179_set_features(struct net_device *net, netdev= _features_t features) 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/ax88179a_devices.c b/drivers/net/usb/ax88179a_= devices.c index e1c4e5a1e5dc584a471090876bcb7479cd392708..c9c60425082cba18a32f3692768= 7bbd9c207941a 100644 --- a/drivers/net/usb/ax88179a_devices.c +++ b/drivers/net/usb/ax88179a_devices.c @@ -249,6 +249,62 @@ 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; + u16 reg16; + u8 reg8; + + ax88179_read_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, 1, 1, ®= 8); + vlan_ctrl =3D reg8; + + /* Address */ + reg8 =3D (vid / 16); + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_ADDRESS, 1, 1, &re= g8); + + /* Data */ + reg8 =3D vlan_ctrl | AX_VLAN_CONTROL_RD; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, 1, 1, &re= g8); + + ax88179_read_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_DATA0, 2, 2, ®16= ); + reg16 &=3D ~(1 << (vid % 16)); + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_DATA0, 2, 2, ®1= 6); + + reg8 =3D vlan_ctrl | AX_VLAN_CONTROL_WE; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, 1, 1, &re= g8); + + 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; + u16 reg16; + u8 reg8; + + ax88179_read_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, 1, 1, ®= 8); + vlan_ctrl =3D reg8; + + /* Address */ + reg8 =3D (vid / 16); + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_ADDRESS, 1, 1, &re= g8); + + /* Data */ + reg8 =3D vlan_ctrl | AX_VLAN_CONTROL_RD; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, 1, 1, &re= g8); + + ax88179_read_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_DATA0, 2, 2, ®16= ); + reg16 |=3D (1 << (vid % 16)); + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_DATA0, 2, 2, ®1= 6); + + reg8 =3D vlan_ctrl | AX_VLAN_CONTROL_WE; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, 1, 1, &re= g8); + + return 0; +} + static void ax88179a_mdio_unregister(struct ax88179_data *data) { mdiobus_unregister(data->mdio); @@ -509,6 +565,49 @@ static int ax88179a_init_mdio(struct usbnet *dev) return ret; } =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) { + ax88179_read_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, 1, 1, &tm= p); + tmp ^=3D AX_VLAN_CONTROL_VFE; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, 1, 1, &t= mp); + if (features & NETIF_F_HW_VLAN_CTAG_FILTER) { + for (int i =3D 0; i < 256; i++) { + u16 tmp16 =3D 0; + /* Address */ + tmp =3D i; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_ADDRESS, + 1, 1, &tmp); + /* Data */ + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_DATA0, + 2, 2, &tmp16); + tmp =3D AX_VLAN_CONTROL_WE; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, + 1, 1, &tmp); + } + } + } + + if (changed & NETIF_F_HW_VLAN_CTAG_RX) { + ax88179_read_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, 1, 1, &tm= p); + tmp ^=3D AX_VLAN_CONTROL_VSO; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, 1, 1, &t= mp); + } + + return 0; +} + static const struct net_device_ops ax88179a_netdev_ops =3D { .ndo_open =3D usbnet_open, .ndo_stop =3D usbnet_stop, @@ -519,6 +618,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 usbnet_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) --=20 2.47.3 From nobody Tue Sep 29 08:26:40 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 1998E3E16AE; Mon, 10 Aug 2026 12:34:05 +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=1786365247; cv=none; b=cElnAHSIZQ4DfUB/cQbNlC/7YdqTu+wWvvhYBErGBO35hFhFBYbBHllYUb60AH4MmFkuCJ6bFCq23zlzP91FekZ2sr/m68er1Aai2rdxbgBoTu3mXX5hQQlkBO38um1R/jyA1ZAkDJC1qIsVFUDBCa8A7Hxr/94z9cRtC7RrdJo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786365247; c=relaxed/simple; bh=CiKkG0NPRdaJ/1V4wh/8ckoknQmdNRaqW0rMtaEopvU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iAC/yjOq3x+7Z7CpzVh8e7r6rDpZcZVHiKhcStTOKITuQmikywJlV+70bHylixMiL53k2VVrsEtejpQgtA3a3OtyRE3PVi24wjWncSXDdnLDs+5euYyfpem3yXYaYOc7bGQZcfZFPbTCYeOGJflgbyrq1EAmkHgbo4dBGtVfRd8= 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=UeKCTtbC; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=hIuWUUdk; 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="UeKCTtbC"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="hIuWUUdk" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365244; bh=CiKkG0NPRdaJ/1V4wh/8ckoknQmdNRaqW0rMtaEopvU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=UeKCTtbCT84sPHBYU1Oty1OJb0/353Dtl6oJr+ALYtByVfiYy61PrCvq+IwObBBLx zPPMLj6moKHgjRUYpC2fMVLyAb1SEW8Bw5Mjh5KzsaMUenYAD3nMBZN0+jd8dVnY6y 9okSqXBr0zY12t32rgtCWT1TMuKYAr/yKn34zhUxivgmzUc4ty3Yyrp4jwph6ZqJG2 dZAc0VYAZXOPTZPRS78VIT9wbixH+r9goy9+9/x7vLdqEKnbSuAdCc6mme8CVYVikU OZaAuU/P4669+0bL9itTmGy1HqQ8SYZaHiQe0pvomRpH+VMUfxMx/uYyk0aptZzO/V yFLhrO4LTjFTA== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id 441074979A; Mon, 10 Aug 2026 12:34:04 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365219; bh=CiKkG0NPRdaJ/1V4wh/8ckoknQmdNRaqW0rMtaEopvU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=hIuWUUdkvejcatT/p+sW+u5QDtaVhh+lfvH9cs1RgtkBTXa1C7zYRhU+y9GxZCMyE 8xtNEks7bdsj+fmSkDlYJLRD7S5V6Gl2KvRfUjXAC3IuRd7brs8+3sJHRB9ErPWTd/ EzrDNKn+lMFGVAnc93GvxQDSHOiGGQig1ZCyoHWICh+SfE2MlysdOg80nPEopA8kNG aZlkQN8RvthtevsIBCiuBuwt8WdWNJknmOnKfIpZfrSfISW7uFNGEMDSDsMg5YjR0Z vz4txPydXaDvNtBeAt40vRCvIH+q5vAfweidwY/rtlHvyiyYap+ktT0uU85hOHNLlg 02uBLAs/h1gIw== Received: from DebianDesktop.lan (p200300c69f06340062b039dfa3272a8e.dip0.t-ipconnect.de [IPv6:2003:c6:9f06:3400:62b0:39df:a327:2a8e]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id AE07349776; Mon, 10 Aug 2026 12:33:38 +0000 (UTC) From: Birger Koblitz Date: Mon, 10 Aug 2026 14:33:34 +0200 Subject: [PATCH net-next v7 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: <20260810-ax88179a-v7-9-da633191c129@birger-koblitz.de> References: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> In-Reply-To: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Birger Koblitz , Jianhui Xu 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 4e8823e1c4a15bc8caf788446c8c030b34039a01..7332967a59e16868825bd62a91b= 918aaeecd3500 100644 --- a/drivers/net/usb/ax88179_lib.c +++ b/drivers/net/usb/ax88179_lib.c @@ -314,10 +314,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 c9c60425082cba18a32f36927687bbd9c207941a..5de0f9557ec5cd7fa41b9d828c6= d75dc927e99e3 100644 --- a/drivers/net/usb/ax88179a_devices.c +++ b/drivers/net/usb/ax88179a_devices.c @@ -618,6 +618,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 usbnet_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:40 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 8E8E03E275F; Mon, 10 Aug 2026 12:34:06 +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=1786365248; cv=none; b=jYYA59brSMM/3bEYIjoc7M++UBhzOBFqhGjUhl8FDOAM70bahpdG0iuxp9YO/WxTRo6SH/YTvgrfw0ouBQVL7SuMEhmLh26e/8JKLTTwbdL7pb3UGqB/9U3AHJS/M4qYkaRhNNuoQ8veCHZX8V3q1oSqAFCR7LjNMiU4zIKHi5Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786365248; c=relaxed/simple; bh=yb3tb0E5rZ5pZeBJt6lR4/GW4F7x5Iz5Zdl5RE75PhU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cHBGn8Wmc627BXBohXD1igZ3SvkysJZHfaLNnZzJbksVqwhTY3lTtVlPt0ucQ7Dz/4+r2iP1QgbrcOggRqV+8VysCSrPI1o6+U0F0PAAmlwuGvmbLOx5i72Svs6TnNiZ1c4jZtUPNbvmQnOPdYp6eeZNXqC/mcviVCeCtiUORcE= 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=eZLiOBK1; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=WBjtRO6a; 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="eZLiOBK1"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="WBjtRO6a" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365244; bh=yb3tb0E5rZ5pZeBJt6lR4/GW4F7x5Iz5Zdl5RE75PhU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=eZLiOBK10WU6VAlftu45UdYkrBU9p/Qbw/Rui+zmAceTNdTTQniuaMbGT9sya8kSG O0tYz0SvghkvAxIJ7h9jrjOBFc+A9e1X3yklu9eZQeIB9DvmCQu1fXWg10Anp8cXVF uKQATzOaMtwNDLca3aTvg431/CXYZZ3vnyRAuzy0z0uMjqJCJ3MFJjE/wBK+btTd04 1hEuu9LcvlfkoKweaZPxrLWjOnE1V2aG4AaJpG8fnhcc6p4QAI/Nuc5HWEKjVq5N4y nTNeuDhUl2JmwgOz7vH+4dswnzhO6VakZoz0vmqxrq3mIHExofTtB43vBzI3t9O8MP 4PAMEKfFqsuwg== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id BDAA549782; Mon, 10 Aug 2026 12:34:04 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365219; bh=yb3tb0E5rZ5pZeBJt6lR4/GW4F7x5Iz5Zdl5RE75PhU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=WBjtRO6agU4xM2BO3QkEZbpoB/3zr1G8mYNaUdq6xj1PgryPel30zGgMTmqqs+KHC cgVB/vhhInIz7L/F/1eS87XloBVMsqxlMJ8MvD06a4bpRq/JvDdKf58RTjc892GZIR QhJT2cEd1XPGmv+4q3PEks+vkS/no+xDNvFrPn0dhW6Kr1EttNsdXU4rch8SJmotSY ILsfpw8YQVk4dEF5nzz/XQfUisqO5i6eGY5DsaM1x4CWRQ6MkjLUpZ9h3Qg/wFZZtH 7PkLA4UeY3IW2X7k91Ajad2TZJslWRQzaDwS9TbbOvg1gbI0wIIlRfnCy6G4qBnF/i zBeLiKJqzT6lA== Received: from DebianDesktop.lan (p200300c69f06340062b039dfa3272a8e.dip0.t-ipconnect.de [IPv6:2003:c6:9f06:3400:62b0:39df:a327:2a8e]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id 17F5D49777; Mon, 10 Aug 2026 12:33:39 +0000 (UTC) From: Birger Koblitz Date: Mon, 10 Aug 2026 14:33:35 +0200 Subject: [PATCH net-next v7 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: <20260810-ax88179a-v7-10-da633191c129@birger-koblitz.de> References: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> In-Reply-To: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Birger Koblitz , Jianhui Xu 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 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 | 95 ++++++++++++++++++++++++++++++++++= +++- 4 files changed, 123 insertions(+), 4 deletions(-) diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c index 6bd9704046009d7aad5ee6ddddc18faab5b030dc..8c22c2517cc08249c4e89625f14= 2a76d4edc7d6a 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; + dev->net->netdev_ops =3D &ax88179_netdev_ops; dev->net->ethtool_ops =3D &ax88179_ethtool_ops; dev->net->needed_headroom =3D 8; @@ -1340,9 +1343,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 7332967a59e16868825bd62a91b918aaeecd3500..a4a49a4242db4949874072e67a7= 3693f2f01baad 100644 --- a/drivers/net/usb/ax88179_lib.c +++ b/drivers/net/usb/ax88179_lib.c @@ -464,3 +464,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 2e4d35c74ee8b32cd2916924b85d5427860bb08c..16a6dcbd6e66e37d3da0e57d280= 0c29d8a95a34a 100644 --- a/drivers/net/usb/ax88179_lib.h +++ b/drivers/net/usb/ax88179_lib.h @@ -315,6 +315,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 { @@ -346,6 +348,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 5de0f9557ec5cd7fa41b9d828c6d75dc927e99e3..2acfc8906c9d0abbab18966d904= f6b812a96e584 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 @@ -133,6 +135,53 @@ static void ax88179a_status(struct usbnet *dev, struct= urb *urb) } } =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; + u16 tmp16; + u8 tmp8; + + 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(); + } + + /* Enable WoL */ + if (priv->wolopts) { + ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_MONITOR_MOD, 1, 1, &tmp8); + 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); + } + + usbnet_suspend(intf, message); + ax88179_set_pm_mode(dev, false); + return 0; +} + static int ax88179a_auto_detach(struct usbnet *dev) { u16 tmp16; @@ -142,6 +191,43 @@ 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; + + ax179_data =3D dev->driver_priv; + ax88179_set_pm_mode(dev, true); + + ax88179_read_cmd(dev, AX88179A_PHY_POWER, 0, 0, 1, ®8); + 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 ax88179_reset() + */ + reg8 =3D 0; + ax88179_write_cmd(dev, AX88179A_PHY_POWER, 0, 0, 1, ®8); + msleep(250); + + if (netif_running(dev->net)) { + rtnl_lock(); + phylink_resume(ax179_data->phylink); + rtnl_unlock(); + } + + ax88179a_reset(dev); + + 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; @@ -690,6 +776,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; @@ -1049,7 +1138,11 @@ static int ax88179a_reset(struct usbnet *dev) 1, 1, &tmp) > 0) ax179_data->wol_supported =3D WAKE_MAGIC | WAKE_PHY; =20 - phylink_start(ax179_data->phylink); + /* ax88179a_reset() may also be called from resume context, phylink + * is already started, then. + */ + if (!ax179_data->in_pm) + phylink_start(ax179_data->phylink); =20 usbnet_link_change(dev, 0, 0); =20 --=20 2.47.3 From nobody Tue Sep 29 08:26:40 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 24CD33EC81C; Mon, 10 Aug 2026 12:34: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=1786365255; cv=none; b=p6SYNX2tI90KBmrS57H/2fYJUMAesut4MdFyX5Yz7jMPJvrN++wsBAvWdQv9gUtX1LKOeQfE28g6vD2V88OJS0A4KRdHYkf2k3CoW1hZe6GubzqyjZ7+rlEMCUaLMz9M2gP9aqxr/Eol4PHHRZSW4P/BWL7MbL4eJZiZ207mNRQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786365255; c=relaxed/simple; bh=dOKM8/Y4i7J64IGMeRUEntMUGSGOIEO671WfB+QlScc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XNB5IGGYfpRJXscedYFHFPfkNDFE4kZNCOWwrLcEJw0x2e6WfKqY7s0vp5O5s/ye3h7KunpF/BpVHoShlvreP3pxkXh2Z/Ju5UEzr4Rg2Z2605/zZTeiMJhxpzsvN7xAv5V7q3YzbfE6vcfYXAe0QMS/YxBjgmqjpvjThe2fwK8= 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=x437vfaO; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=1oPspNNY; 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="x437vfaO"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="1oPspNNY" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365250; bh=dOKM8/Y4i7J64IGMeRUEntMUGSGOIEO671WfB+QlScc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=x437vfaOHcRHO9bWs/MM5xDbS1qgL4iq6LjAlaN+zIM5eiGPtpgCPDkvKzby6qZXi ykoTBla6c3bhglYQ8W6UUnO4H6MMqUMQAPULKPE3Vs87qmoyPUia6pwAcmPBW/Z4Cy XYIYelzTaCqRt4jfLIslaHTCP9gfdQNWEHlQEc5B2B1dza0EsgaFT8M2OlywoqkGZL AYS9KH0FOezJWp7JXzz+IgpmtX9EHZjayzN+1h+0Clb504wbdZTExvrrbxxsAmvpie UXrpaRg9qfFWcEs6LnU1ZAaX6fzgkQPLJxQ9Hvf96uBSR0MaZdHfP+Q7AcSAyYwB8U NGZu2yizaFx9Q== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id 983DC49770; Mon, 10 Aug 2026 12:34:10 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365219; bh=dOKM8/Y4i7J64IGMeRUEntMUGSGOIEO671WfB+QlScc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=1oPspNNYNFskAa0P7FoxVY8sxEiDJGs81mMhk2XvBEGHVq5tFF1jeHwl8d+SE/O+M fktsyBCfpCHuz3LUgqK+iO5YS/wUqnl6hvCZuqEbK0zRSvEtFwp5jQPQxwatbu0cx8 HzGUQEtAuenph89tiAn3amL9t3gRpUdDmsKeuqvzhiddP1EAhxsYr2OWSI/4FgULh0 HHxWrkrcc246g8HkqjZ2i9gMCIRe5gWXyGIhvNJP7g9JNuuahmsDfyi9eIPETj8xcT 7lee5crp1L1ceuxD0v8U6lc9CzH5D7qynem4xag50auyw/x8T3/XcZGeH+3FDBmZEw xu4xYoH0Xsrsg== Received: from DebianDesktop.lan (p200300c69f06340062b039dfa3272a8e.dip0.t-ipconnect.de [IPv6:2003:c6:9f06:3400:62b0:39df:a327:2a8e]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id 6610549778; Mon, 10 Aug 2026 12:33:39 +0000 (UTC) From: Birger Koblitz Date: Mon, 10 Aug 2026 14:33:36 +0200 Subject: [PATCH net-next v7 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: <20260810-ax88179a-v7-11-da633191c129@birger-koblitz.de> References: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> In-Reply-To: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Birger Koblitz , Jianhui Xu 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 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 2acfc8906c9d0abbab18966d904f6b812a96e584..6b57111a0e05add3fecc6b8ef90= 78ecf8c301276 100644 --- a/drivers/net/usb/ax88179a_devices.c +++ b/drivers/net/usb/ax88179a_devices.c @@ -228,6 +228,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; @@ -317,6 +331,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:40 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 EC8503EC81A; Mon, 10 Aug 2026 12:34: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=1786365257; cv=none; b=OxFOK6IsPTQNPEUQJFPBmSowk4L2mpeH3NS96rMnFsAOJ0SazCOc2TjMA7TdPfjOSnyurbo369gJoI8YXgCVsNdfw65xaOpK7ihR6wURKsrHtzmcM32um80gzsrJFU3cOIgAHGw1j/0i06bEVF1ri7n4KaKl9rvpEPdxJ5T+/lY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786365257; c=relaxed/simple; bh=5Y3YOI+/Ceht3PgLEUx1RdPmTljsgGdDUQunejb3310=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dsJE1cdO/sXHkMj1NPy39gRG5Bn5gO6Mv4KSp/U6/4Zv+ieh5Xgu13YjtUf8OnBlo6qsZdwAcK0cOXDXmo6wts2LG4P/yFWrvBwDtpPPWm9QLCv4Q4usxNLzhasFki0NWvCIeUbCBlPhrCZBal3h4lfOSSKq8d+kGTT37ELW8UE= 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=SWWRI/ac; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=kdiU+rcl; 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="SWWRI/ac"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="kdiU+rcl" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365252; bh=5Y3YOI+/Ceht3PgLEUx1RdPmTljsgGdDUQunejb3310=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=SWWRI/acwtIb6Zymqy+4poS5JHYHY0v3OyAEJKzSi9oef4rMzXSEUHn1xPBaEhcPo ZCqOdMTBOYRnWsY/epbh46s/OMfpth35sfI4zEZ+lSh0CwFUC6je8p4unV909ZV+XO Ps2M2p7ChNQToRvAr0v1MzXXQATNwAZwQBy8RL3N9y0uY5JrZQma+iDZVxkngrewE0 lvNSVVYKDz3qTTx5RTkbeAVBMsJsXsjfP0PXHdaofsEqmLKsosA38F5c7EJIdYIF/u lfKHCr6ZoLr+kV7XpQ5MLmpJNcUGAVkmk13E/Up6eZXb10O7I+/EUqGV1pcNu/3f0i iCxsdcgl7DYMg== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id 5701E4976D; Mon, 10 Aug 2026 12:34:12 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365219; bh=5Y3YOI+/Ceht3PgLEUx1RdPmTljsgGdDUQunejb3310=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=kdiU+rcl1K1EeOwm9Vl+fu2ADhsNpdVG9Q8oEvYzAtHywAZodUvSw/wWTPWTd9Fk5 duw9cmvNHKgca/Yd3Y12l5ywtEvOFQ67FJzJhDvJjfoPhlmehOAf8JpOWdMLlBiN6y 7lA1NktwNmLBhZ8QgcJxxiRPSdI1sns7dN2RbwI0PzPVY4Sp4zTc9fVg8xuilIvj8Y k3404cmrsauuNQLbtkenCKyNq/qLA3zYHYvzBf2y+QaFAPNRdICYSztL2eRBSAmnqe ocOIXo+Mnb16LQRqe1AB0YIuxpXj4wOZXmfSNW0ELLcHHwDMh01ZU5Guf0XNQ3zCrU mmDf7iaHzZjgw== Received: from DebianDesktop.lan (p200300c69f06340062b039dfa3272a8e.dip0.t-ipconnect.de [IPv6:2003:c6:9f06:3400:62b0:39df:a327:2a8e]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id B2CF449779; Mon, 10 Aug 2026 12:33:39 +0000 (UTC) From: Birger Koblitz Date: Mon, 10 Aug 2026 14:33:37 +0200 Subject: [PATCH net-next v7 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: <20260810-ax88179a-v7-12-da633191c129@birger-koblitz.de> References: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> In-Reply-To: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Birger Koblitz , Jianhui Xu 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. Signed-off-by: Birger Koblitz Reviewed-by: Andrew Lunn Tested-by: Jianhui Xu --- drivers/net/usb/Kconfig | 10 +++++++--- drivers/net/usb/Makefile | 2 +- drivers/net/usb/ax88179_178a.c | 8 ++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig index 115990b0d9537aea2776544c9768b034f32aa7a4..4158455a2da76cd43a9a9d9d0e8= c66028d57b095 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 3.0/2.0 to Gigabit Ethernet" 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 8c22c2517cc08249c4e89625f142a76d4edc7d6a..6d6ee39b342e9b4e008bb2c1ee2= 76dc27279a2f7 100644 --- a/drivers/net/usb/ax88179_178a.c +++ b/drivers/net/usb/ax88179_178a.c @@ -1339,8 +1339,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, @@ -1351,7 +1351,7 @@ 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 based USB 3.0/2.0 Gigabit Ether= net Devices"); MODULE_LICENSE("GPL"); --=20 2.47.3 From nobody Tue Sep 29 08:26:40 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 864783DB96B; Mon, 10 Aug 2026 12:34:17 +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=1786365261; cv=none; b=UKTIyA7t/V4Ad5oY2r29usPLs3aw7HHvF5Y2HV0l4ysjzvkn+aRH3WMrPGSqJYNXS+ey43CGCfue/nYAZv6LERWLDIEiDRfkNKIW4bkcONZprww1h0PO3QXqmKwK2vzMDSqu5Pzqm/auWupcrI/XtIRpZtCaBv59VJfziKsPd3Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786365261; c=relaxed/simple; bh=ENDLOvvZwM3IKyDzVjoDFXlac3oXz1v+rdzdaJcWODA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kHC179GIzhGCXyk0fpgBxBWRWX3bkokN82YTYg66Oxnvu/BBeAM34OeAMz+V62c5HNgEfMqNY7gBP5CRhDeIAdQ6zTjqIAfZ68O0+YcMoBJgQbS3cMfseteQ7kfK0x6jQbAuBWGRd64yeTolCbW8fxt0xN+ea2MDeAqXH+0hPBU= 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=KNMrLZWi; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=WXupIYlb; 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="KNMrLZWi"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="WXupIYlb" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365254; bh=ENDLOvvZwM3IKyDzVjoDFXlac3oXz1v+rdzdaJcWODA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=KNMrLZWi5siBre1VOUvOatYfUfFFZpGvDx/SudB3wXUai3RD8M89mhbsCP6FwDTa9 zTDoaHaZ2xmkfZFG+UPv5s/e7hr2+4vYeyb9wqCvqsruPrqa6/JPbofF2tJjYP0kze rLzZUGZa8ookWem4T2Jt9xN4a9yKupGwUjM2gh94B0LF+zb0dlx2Gx6xwpTrHIzwA7 h8Qsny4jxag7OQAj/hEcp9JWfgTAHmoE/ruehBSyoMx/ClPIt+kOLgGAytVd1wzEIs cDNImOBTp3WjabfGaayx7gzYmi42zPBYLD5JbVuEczy1vlkDCq032iE1Sdvhbccr+7 JWfjQxDy98VKw== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id A3B7949777; Mon, 10 Aug 2026 12:34:14 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365220; bh=ENDLOvvZwM3IKyDzVjoDFXlac3oXz1v+rdzdaJcWODA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=WXupIYlb2i9E1qzmk4iWT/5WabyWaLIyhAG7Nkko8QBEcNNZWwxVBw5XzMm1fisYG rPGet+pb9CzayvLOGpQ9ShG7YezONllE0M2OsQwJ7kvY20fySW0hisCRRFgckaVDU5 OmZFUVditJOlv0UcoPbm2pFA+cfQ6nAlF+q+wrwIdBbOjkQ9ZpP548dxduMAPwGwUP 3+1QcOjegwDTWveyV+pvdT0kcCs3bqdBC/XqUyal62Aw7/sLRU3Ib3+ROOyEXwT8c/ 3KaNyXaXl8DEv49C88KWLZCmUbxVusIq05KBlEKgkSPwh6Mm4u9wq6krWoN1Th1ZhG fTPYRT1pQAr7Q== Received: from DebianDesktop.lan (p200300c69f06340062b039dfa3272a8e.dip0.t-ipconnect.de [IPv6:2003:c6:9f06:3400:62b0:39df:a327:2a8e]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id 0B7294977A; Mon, 10 Aug 2026 12:33:40 +0000 (UTC) From: Birger Koblitz Date: Mon, 10 Aug 2026 14:33:38 +0200 Subject: [PATCH net-next v7 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: <20260810-ax88179a-v7-13-da633191c129@birger-koblitz.de> References: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> In-Reply-To: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Birger Koblitz , Jianhui Xu 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 | 19 +++++++++++++++ drivers/net/usb/ax88179_lib.c | 54 ++++++++++++++++++++++++++++++++------= ---- 2 files changed, 61 insertions(+), 12 deletions(-) diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c index 6d6ee39b342e9b4e008bb2c1ee276dc27279a2f7..be72ed955b6b8b1700d5f3624c5= 9d7dea1b3d1dd 100644 --- a/drivers/net/usb/ax88179_178a.c +++ b/drivers/net/usb/ax88179_178a.c @@ -687,6 +687,19 @@ static int ax88179_bind(struct usbnet *dev, struct usb= _interface *intf) ax179_data->resume =3D ax88179_resume; ax179_data->suspend =3D ax88179_suspend; =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; @@ -711,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 a4a49a4242db4949874072e67a73693f2f01baad..9b91ad831333e14522916dfaa67= 955f4447f66d4 100644 --- a/drivers/net/usb/ax88179_lib.c +++ b/drivers/net/usb/ax88179_lib.c @@ -203,36 +203,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 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]); + 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 < 0) { 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; } @@ -240,12 +265,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:40 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 19BF63EDAA2; Mon, 10 Aug 2026 12:34:15 +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=1786365259; cv=none; b=Eqym2ACrSG4LQOZbrLsNEL5We858I9Uiv5qwPH4HGYACpSRiZnv9J3aEyPAi2D+xlWPyk3l3ZWSQDYNNe7xEzvDEF/6tLkAeD7vv05I6AEZ6fYRMxPMcanwwvI5TZU9arkZ54tsjEkAbZIIL+ebDTNVhM2UZmPf80EsJmJUrxso= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786365259; c=relaxed/simple; bh=aUAbd3OzQIFI3pKZWPRGIdjikal7XA5A/LbWHffLoF0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Gd6ib4L+2n/o6cO5ypnnMWsF54rnhrp3h1W4sf5292oo/O+wisNbCtirZpMUzMV3yithDvYPXQyRo4oX5a0GkxXKq9ncyWoNxn5vyTN81sXiVJkUBCR1MiwFAB4VS4PGwQsayIgyUFEcJdcTfBWeMlOC2ogcQT0FhUyhUwUV+dc= 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=Zgh3tqYu; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=miL/61Qj; 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="Zgh3tqYu"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="miL/61Qj" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365253; bh=aUAbd3OzQIFI3pKZWPRGIdjikal7XA5A/LbWHffLoF0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Zgh3tqYu5NtGHy9j94qYzxMrQxg3+m2SjCizX6cu006OOCf7y5HulUOXAN2D37PKA FfwrBcZVSNghR5H9sCmZyH6CIsFV7CzaJHsMWniwE5kJmbheoH7pDQoYCN5t9BNipn ZIInRb3h3tZMbtuvRexvKDbEhxQAunJGhzA/WGB4UbVCRJp4ANAsayysa2K+K3oXlG c9M4zXbvfNKFVCME0lAfTusWmmLYjD9k3nxl27jcPnRIyaMgKaA8cu6brwSbrQJjwZ NPlFkj635yQepfvu0SqA3nfh5dJfaWJT3tCB0/iGKCRn4M4BBB2IbFQeOr2nR44WwL LZTB8KRnWgCMg== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id C925F49771; Mon, 10 Aug 2026 12:34:13 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1786365220; bh=aUAbd3OzQIFI3pKZWPRGIdjikal7XA5A/LbWHffLoF0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=miL/61QjksgFgz0H5VdS4dA/7PPYk+k0AgZSd4Q08UpLoX/pIfd6UYaAcqNuXNbwA 96wFxNctvgORNWOe8SXdEIfyzgCK/w9RZ+iEpLX1pVd4DxtAInfCunPEgItW4qzy2h AjN+/BdVQ5SqjCuafsZhTQtH/aGWD4KnKGqUTlejg07J/Sr8zmhiuIf+ldqvkIesV+ uNhAG8Go/kcNx5o+5/fgM8l1Ev6+Z+Q0kK2w3kJw+wQOm2dh2R4XLd6f2ruLUOZmFr ugmqs0iCV0X8bDi0KZTJ89/F3fi8lqBXiz+ojd14OTaSYtv62Jyuyk4jUOKebEpFeq 5kuUZU3zRb6cA== Received: from DebianDesktop.lan (p200300c69f06340062b039dfa3272a8e.dip0.t-ipconnect.de [IPv6:2003:c6:9f06:3400:62b0:39df:a327:2a8e]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id 59DC04977B; Mon, 10 Aug 2026 12:33:40 +0000 (UTC) From: Birger Koblitz Date: Mon, 10 Aug 2026 14:33:39 +0200 Subject: [PATCH net-next v7 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: <20260810-ax88179a-v7-14-da633191c129@birger-koblitz.de> References: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> In-Reply-To: <20260810-ax88179a-v7-0-da633191c129@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Birger Koblitz , Jianhui Xu 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 Tested-by: Jianhui Xu --- drivers/net/phy/ax88796b.c | 180 +++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 180 insertions(+) diff --git a/drivers/net/phy/ax88796b.c b/drivers/net/phy/ax88796b.c index f20ddf64914993f7097070d1f56c1103ec1e40e8..1298e46ad9e1609a5907b20dd8f= 1827c8bd221d1 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,122 @@ 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; + + /* Read actual speed from vendor register */ + val =3D phy_read(phydev, AX_CTRL_STATUS); + 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 + */ + 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; +} + +/* AX88179A-based PHYs cannot access MMD registers via MII_MMD_CTRL/MII_MM= D_DATA + * Make sure to use c45 access instead. + */ +static int asix_read_mmd(struct phy_device *phydev, int devnum, u16 reg) +{ + struct mii_bus *bus =3D phydev->mdio.bus; + int addr =3D phydev->mdio.addr; + + return __mdiobus_c45_read(bus, addr, devnum, reg); +} + +static int asix_write_mmd(struct phy_device *phydev, int devnum, u16 reg, = u16 val) +{ + struct mii_bus *bus =3D phydev->mdio.bus; + int addr =3D phydev->mdio.addr; + + return __mdiobus_c45_write(bus, addr, devnum, reg, val); +} + static void asix_ax88772a_link_change_notify(struct phy_device *phydev) { /* Reset PHY, otherwise MII_LPA will provide outdated information. @@ -94,6 +223,25 @@ 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_set_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, mask); + linkmode_andnot(phydev->supported, phydev->supported, mask); + + return 0; +} + static struct phy_driver asix_driver[] =3D { { PHY_ID_MATCH_EXACT(PHY_ID_ASIX_AX88772A), @@ -111,6 +259,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 asix_read_mmd, + .write_mmd =3D asix_write_mmd, + .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 asix_read_mmd, + .write_mmd =3D asix_write_mmd, +}, { + PHY_ID_MATCH_EXACT(PHY_ID_ASIX_AX88279), + .name =3D "Asix Electronics AX88279", + .flags =3D PHY_IS_INTERNAL, + .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 asix_read_mmd, + .write_mmd =3D asix_write_mmd, + .suspend =3D genphy_suspend, + .resume =3D genphy_resume, }, { PHY_ID_MATCH_MODEL(PHY_ID_ASIX_AX88796B), .name =3D "Asix Electronics AX88796B", @@ -124,6 +301,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