From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=23.88.97.239 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794653497; b=1gKrRKcWJbDdkHyibzJRpRWmfn5XBpqyTES5vWPDjdALo2e2GhgZ6vf9/1Gt+xL2bx5v HMSCTOG/ifCQ9dfYjNVplsQ38KBIsoHUGci+mGXhOZe8ttmHn0DQsywCKGen3SFMoo18d bsRwkWb7MvIEWu0esHPymWwHeXUYLAkVvEeqdBIk4SXKa8G4nntDiwb5+qm5LkAReSuic AV60DuD3TtYnmqZLoN8JFomx+rWkHZPXXC92nCrKV05Yel6FNcHpF8NNDvocqLlubIez9 Gk4/6H4Khr/fe8rxqZ5Xi1WJRvQriARALNUaV3htbfWz3z3D9e1UnNGjVep3kk81lIQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794653497; h=DMARC-Filter:DKIM-Signature:Received:X-Spam-Checker-Version: X-Spam-Level:X-Spam-Status:DKIM-Signature:Received:From:Date:Subject: MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id: References:In-Reply-To:To:Cc:X-Mailer; bh=77bya39SSJtJCPguHOcv1gkK3CCNc10PFT2SuwqP3X4=; b=tosXBunnHY/uNwixtUVFqbLvLXupEEwMcltfk1A7iD6Z2HnvSyseu1MH2WBhX4r/S7N/ kx8rP/9prSFD3EZaave+IBcQJ2EKPv1GV1LjH6UKX5ddTXqTq9qQc3O2RXH9QeSNxObWm 2CITHG5gdQ7m0BMBAsJHCFM24LGotcRimGVGF7sASV//DDry8tTJfx/+jj486u5dV5hjh pge511FCeHnR66ZSlzNpAwGhl0dfweCHVUZDAKoVBYux9u0r6250+G8wjNi620erjfDRF n/0kwnflQw2yxx6925pgnIiI0/QjdXznCreBr7KDNtmPleyCPK05Fpy2vhw3XVV622w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none header.from=birger-koblitz.de; spf=pass smtp.mailfrom=birger-koblitz.de; dkim=pass header.d=birger-koblitz.de header.i=@birger-koblitz.de header.a=rsa-sha256 header.s=default header.b=U7KskPoX; dkim=pass header.d=birger-koblitz.de header.i=@birger-koblitz.de header.a=rsa-sha256 header.s=default header.b=kF+Dtywj; arc=none smtp.remote-ip=23.88.97.239 Received: from bkemail.birger-koblitz.de (bkemail.birger-koblitz.de [23.88.97.239]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1F895606A887; Sat, 14 Nov 2026 10:51:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 1F895606A887 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.a=rsa-sha256 header.s=default header.b=U7KskPoX; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.a=rsa-sha256 header.s=default header.b=kF+Dtywj DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1794653494; bh=hM3oF5K1hZslFyqDR7TTdamJtF9O4stBo/mf2SjKeiE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=U7KskPoXTAOseTinWzsTU/YVQoxMZtmSf3ToGlgypP5rngeJGb45qcomYzCEuflAl JRH3kboO2FdtP1EYWRx9jo71q8/NPOIm1oajIrfwdqymSuoI7EQWAtDnSOkv/3DeCv o7YtaNOFQvMZ6SEPbS+a28RaPCDxG4wiThC6+rr8YjJ4hWyTLSrBP0v+n9ZtPFkiNF fBgGZGY0v8RTOTFFVnPuinaGkPm3hgdulFTrpzjTjVI24V44J2KhJtto7KIERWvSTA Q0ayj9hUT4XY6yaLSgahQHNXr8DrF9irZmdvtdd0PJi/GHDZIHCcHxpK1rkL0Lc6b0 jJtrK917sYkLw== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id 8C4C9489E4; Sat, 14 Nov 2026 10:51:34 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1794653483; bh=hM3oF5K1hZslFyqDR7TTdamJtF9O4stBo/mf2SjKeiE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=kF+DtywjZLO7YrQsUag6ggBqTeBmRA3/0wdoZW19YVXzgCTbnj3x410i42XvxI9yW LinTE0R1GGXLMHuGjnyzyrXsIl4oNpx5S98SRHZBs0vcpMSArLGrX0Z3FJhfsFV3S0 5HaDNnz5H/VmEOiYvfuSR1rz8P0vvSnSPbQtWzx5Q34pXh3i19/1PGg2SCtGOQG7hy Q6X9zzqLkSKGuBuyyaKj3Vj8F9w4G6EC5V7JBKyHvGCfRoWnM+VewWPMEI5BhsOs9l Acv07GsLg3RpcA9V9PvHdvYsGi3GRi8B/jW8lU8qyJMnDoAwNdQ8FK1vLhYP53ikBU UJsfAWORzc4QQ== Received: from AMDDesktop.lan (unknown [IPv6:2a00:6020:47a3:e800:271c:c6c5:9fde:77cb]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id EAFC1489D9; Sat, 14 Nov 2026 10:51:22 +0000 (UTC) From: Birger Koblitz Date: Sat, 14 Nov 2026 11:51:03 +0100 Subject: [PATCH net-next v21 07/13] ax88179_178a: Add VLAN offload support for AX88179A X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261114-ax88179a-v21-7-c2d34410bcbe@birger-koblitz.de> References: <20261114-ax88179a-v21-0-c2d34410bcbe@birger-koblitz.de> In-Reply-To: <20261114-ax88179a-v21-0-c2d34410bcbe@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Jakub Kicinski , Paolo Abeni , Russell King , Andrew Lunn , Heiner Kallweit , Huacai Chen , WANG Xuerui , Eric Dumazet , Eric Dumazet Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, Jianhui Xu , Emir Beganovic , Birger Koblitz X-Mailer: b4 0.14.2 The AX88179A-based chips support VLAN offload. Add configuration support in netdev_ops. Features supported are: NETIF_F_HW_VLAN_CTAG_TX, NETIF_F_HW_VLAN_CTAG_RX and NETIF_F_HW_VLAN_CTAG_FILTER. Signed-off-by: Birger Koblitz Reviewed-by: Andrew Lunn Error-checking fixes Suggested-by: Jianhui Xu --- drivers/net/usb/ax88179a_devices.c | 158 ++++++++++++++++++++++++++++++++++++- 1 file changed, 157 insertions(+), 1 deletion(-) diff --git a/drivers/net/usb/ax88179a_devices.c b/drivers/net/usb/ax88179a_devices.c index 272e92365683247b42a5fd25013c728a9c1af711..4207d2cc2b865e5780b3c7f5ba2645a6242df477 100644 --- a/drivers/net/usb/ax88179a_devices.c +++ b/drivers/net/usb/ax88179a_devices.c @@ -258,6 +258,88 @@ static const struct ethtool_ops ax88179a_ethtool_ops = { .get_ts_info = ethtool_op_get_ts_info, }; +static int ax88179a_vlan_rx_kill_vid(struct net_device *net, __be16 proto, u16 vid) +{ + struct usbnet *dev = netdev_priv(net); + u16 reg16 = 0; + u8 vlan_ctrl; + int ret = 0; + u8 reg8 = 0; + + ret = ax88179_read_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, 1, 1, ®8); + if (ret < 0) + return ret; + vlan_ctrl = reg8; + + /* Address */ + reg8 = (vid / 16); + ret = ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_ADDRESS, 1, 1, ®8); + if (ret < 0) + return ret; + + /* Data */ + reg8 = vlan_ctrl | AX_VLAN_CONTROL_RD; + ret = ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, 1, 1, ®8); + if (ret < 0) + return ret; + + ret = ax88179_read_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_DATA0, 2, 2, ®16); + if (ret < 0) + return ret; + reg16 &= ~(1 << (vid % 16)); + ret = ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_DATA0, 2, 2, ®16); + if (ret < 0) + return ret; + + reg8 = vlan_ctrl | AX_VLAN_CONTROL_WE; + ret = ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, 1, 1, ®8); + if (ret < 0) + return ret; + + return 0; +} + +static int ax88179a_vlan_rx_add_vid(struct net_device *net, __be16 proto, u16 vid) +{ + struct usbnet *dev = netdev_priv(net); + u8 vlan_ctrl; + int ret = 0; + u16 reg16; + u8 reg8; + + ret = ax88179_read_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, 1, 1, ®8); + if (ret < 0) + return ret; + vlan_ctrl = reg8; + + /* Address */ + reg8 = (vid / 16); + ret = ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_ADDRESS, 1, 1, ®8); + if (ret < 0) + return ret; + + /* Data */ + reg8 = vlan_ctrl | AX_VLAN_CONTROL_RD; + ret = ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, 1, 1, ®8); + if (ret < 0) + return ret; + + ret = ax88179_read_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_DATA0, 2, 2, ®16); + if (ret < 0) + return ret; + reg16 |= (1 << (vid % 16)); + ret = ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_DATA0, 2, 2, ®16); + if (ret < 0) + return ret; + + reg8 = vlan_ctrl | AX_VLAN_CONTROL_WE; + ret = ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, 1, 1, ®8); + if (ret < 0) + return ret; + + return 0; +} + static void ax88179a_mdio_unregister(struct ax88179_data *data) { mdiobus_unregister(data->mdio); @@ -517,6 +599,75 @@ static int ax88179a_mii_ioctl(struct net_device *net, struct ifreq *rq, int cmd) return phylink_mii_ioctl(data->phylink, rq, cmd); } +static int ax88179a_set_features(struct net_device *net, netdev_features_t features) +{ + struct usbnet *dev = netdev_priv(net); + netdev_features_t changed; + int ret; + u8 tmp; + + changed = net->features ^ features; + + ret = ax88179_set_features(net, features); + if (ret) + return ret; + + if (changed & NETIF_F_HW_VLAN_CTAG_FILTER) { + if (features & NETIF_F_HW_VLAN_CTAG_FILTER) { + u8 vlan_state = 0; + + ret = ax88179_read_cmd(dev, AX_ACCESS_MAC, + AX88179A_VLAN_ID_CONTROL, 1, 1, &vlan_state); + if (ret < 0) + return ret; + + for (int i = 0; i < 256; i++) { + /* Address */ + tmp = i; + ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_ADDRESS, + 1, 1, &tmp); + /* Data */ + ax88179_write_u16(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_DATA0, + 2, 0); + /* Write-Execute */ + ax88179_write_u8(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, + 1, vlan_state | AX_VLAN_CONTROL_WE); + } + vlan_state |= AX_VLAN_CONTROL_VFE; + ret = ax88179_write_cmd(dev, AX_ACCESS_MAC, + AX88179A_VLAN_ID_CONTROL, 1, 1, &vlan_state); + if (ret < 0) + return ret; + } else { + ret = ax88179_read_cmd(dev, AX_ACCESS_MAC, + AX88179A_VLAN_ID_CONTROL, 1, 1, &tmp); + if (ret < 0) + return ret; + tmp &= ~AX_VLAN_CONTROL_VFE; + ret = ax88179_write_cmd(dev, AX_ACCESS_MAC, + AX88179A_VLAN_ID_CONTROL, 1, 1, &tmp); + if (ret < 0) + return ret; + } + } + + if (changed & NETIF_F_HW_VLAN_CTAG_RX) { + ret = ax88179_read_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, + 1, 1, &tmp); + if (ret < 0) + return ret; + if (features & NETIF_F_HW_VLAN_CTAG_RX) + tmp |= AX_VLAN_CONTROL_VSO; + else + tmp &= ~AX_VLAN_CONTROL_VSO; + ret = ax88179_write_cmd(dev, AX_ACCESS_MAC, AX88179A_VLAN_ID_CONTROL, + 1, 1, &tmp); + if (ret < 0) + return ret; + } + return 0; +} + static const struct net_device_ops ax88179a_netdev_ops = { .ndo_open = usbnet_open, .ndo_stop = usbnet_stop, @@ -527,6 +678,9 @@ static const struct net_device_ops ax88179a_netdev_ops = { .ndo_set_mac_address = ax88179_set_mac_addr, .ndo_validate_addr = eth_validate_addr, .ndo_eth_ioctl = ax88179a_mii_ioctl, + .ndo_set_features = ax88179a_set_features, + .ndo_vlan_rx_add_vid = ax88179a_vlan_rx_add_vid, + .ndo_vlan_rx_kill_vid = ax88179a_vlan_rx_kill_vid, }; static int ax88179a_bind(struct usbnet *dev, struct usb_interface *intf) @@ -612,9 +766,11 @@ static int ax88179a_bind(struct usbnet *dev, struct usb_interface *intf) dev->mii.supports_gmii = 1; dev->net->features |= NETIF_F_SG | NETIF_F_IP_CSUM | - NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM | NETIF_F_TSO; + NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM | NETIF_F_TSO | + NETIF_F_HW_VLAN_CTAG_TX; dev->net->hw_features |= dev->net->features; + dev->net->hw_features |= NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_FILTER; dev->net->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM | NETIF_F_TSO; -- 2.47.3