From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.128.41 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794653107; b=d0Eag2qi/j5yXLadxwlEsh51p+7w8BR5zlEG24vGGXDEIRrUPxs5/crDhBoDWh4m+FM6 DBdsAZexC09YQjqcxXVRXj0i4TgT154CHNSOdUzRyb1Cg7PxQ43Zurir6PBda2RoNP4Ri PEi3qnta/fPJuRJ9/Z4slICua639MMlaLOVNcUmKzmVtFTl4tDccziR5JyhXLWYioVkrN MaRvmowlrsH/sW0JbLJ+GL9oEL6GiPvGZh6nJt9gwVl60LJDI9cR/JFx4FgbN6Q8tvBO6 JWaZMgAHEPvQZcbdcLj6n8gS74RTxf/lDW+633PepJny10xp/xDxU+TUfqMdPm2ol+g== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794653107; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=1Qx/w97/Ge0dQ9t4hQAOOBki4nWw7shLdPCI1PWwoSs=; b=ATSzTmN3oyJW7QReS+Lnq3ODxqV+8DCrX17wazln0pB79KEfcoTAXmW+Qe2SpOx2vQpR m1z4Uw/LrRZUSGowEH1y3q9uNlHumM8a+DGETGupjYSz+VWHH5I0wgyi/N7hkMcHHp0le ySfdBW/k8xzquqENwaJqGEoJQ8dPxueakKpprSWa9iEyxX9pYem7jqAj5pAyDwsa5S689 lHRfIhBxnX+gGHLuDgRWHceHxF7qv3wdCbcdlat81h7Ti9UvQk/Z3lvMh69Qj+Iqn+Ip7 UjoaztdDMs95KWaxKNLmFO0BiBuRKeZd9ZO4iSLT5uQvwgN+iFmvh0SbXqjfMS1Az5A== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=D+wUDSBh; arc=none smtp.remote-ip=209.85.128.41 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 01D2A606C259 for ; Sat, 14 Nov 2026 10:45:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 01D2A606C259 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=D+wUDSBh Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4a2153c8525so11414585e9.3 for ; Sat, 14 Nov 2026 02:45:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794653104; x=1795257904; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=1Qx/w97/Ge0dQ9t4hQAOOBki4nWw7shLdPCI1PWwoSs=; b=D+wUDSBhnGnekXDkYCEDg1nVbzjPhOPk2wTmG0uEOa+3JovxaCT7Uxky+49o9kloZF oynBhraNASYvofiUVbKnuIS234RO/pjpMEGnUdKaCpxjBEN1hlaeGEr/MR++IZiIWjmD xvDV5FJ+4HteP943b13eBGlUMD60ukkreU8OsnmAwY8KstzJL/EPYIlcx+Uberm0AmdR EheXnAmLGwtYL8t5aGJ9fLC2LMeL5Hd+NCCYtFfU2SSs+hnB24yMS5EFbGfHSp0zDqEY U17xoqvLosMIgooW2v9EX8xoMDPeTE2sCCULqzk5UasKz24WVHrc0HswCAOGdS37kNCK hD1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794653104; x=1795257904; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=1Qx/w97/Ge0dQ9t4hQAOOBki4nWw7shLdPCI1PWwoSs=; b=GIM1vQMh4jXmJTBqlUTVnfE72yQk9LTLmKme5DPcOUEDRgSljH56ndOjJxl4Qye1qK i/dxFj/o0NR8EASOLHQwbxrUiWzovWoKEL0zu1oYvmM62fqzZ3o6KjtUAU3q3ZEVMlfZ E7QNoGz0AL4qeOBDTJEVvt0kKfcjJwFZAWX8i1n9EZwzaZwk6ZDkn8hlpXheDpmYhGw7 9t1vFncBEwFlV/3Ii6XtWDB0McBwUpodtaiYNRQxKTjwjGOEjXYr26z9kYhX2DI06DKw ov8Vm0pfDhAn9Y7eANzOk8emBSg/4Fvlemx2tl0xUZ+/q5/pYr4boZtm6btBn8SlXABh YGgg== X-Forwarded-Encrypted: i=1; AL+hErGD7gECJsOiIegPU97AuAAvxpLiW/nU/ZOyc2srOsDAbXUBPGUIEDImSVA9rfthifH3jXbS9K5Vss8=@vger.kernel.org X-Gm-Message-State: APuU4Z9jAX3j+RfJA/zU7NCzIJGQlW+TNgqwMtxO9gFH7ZycG8cJ+bkY eYT2uvM/i3obOn9r7qIL86+lluHQRX3x79Rd3oKmqJDjET+4k8/N4MzU X-Gm-Gg: AYBFou1eeXq0RBrKCwFsbctyYPmIdDXDtHmFKtOco/zbK9KDRnV/1+bsiDMerUztWIE NNnYRaCwiyGOwaLolg/d82O3PWw5MpfSpaIHVfJ2bwf+shcvTYvbkqeLMRFa9F2eBIoAKCzaYGH 3534+Yh24NfqoJCAWDFpHoYVwxLGW/cEsJffLF8Guq3shtaYmRQvXAqQawLGMfNIkpRf4ZU62Qi VUKbxghFnsTGRS0UGCYXvoz49K6DlBoV1nRh+3UwN54zViOs0ZnOtOKwNAqAvvehpwqIf36gddm +5u/FBf2yx0IpCJTgF1LmDF1JVaJfUcted6+6MZFfFBykzIj5z9M+qjM0j6eMzPFtIlVCl+H6pF GFinhChVBjVei3xS35arL3pnmQL2ZvHOCDEhjnS3l81wXnEcD/9lmfTc2kMtvcXct5EgCZp/s0/ IRHU9Qy3KVZ3CY8FNpzD29Uwg+3YbyaksjyKu5O3h3TW8nw9UZIZp21e2yKcjagpYK2Eb1zWtBd D4o8TofKHwTXyW4T+EAVi7gyOuSyYep9NVHgzRvMdMRkoaNQXHZXYi6YWszW9LXAFr4YtIed2Kq G9oNL+8bdu3T//axJvyTOHU4cPavM1Ql/7p5EPYAAMBNNGHC4Y5UumiiXawwsO+T2zV3NWnErdo GuJddAUS7h++Vse0S+rGnwxEsH8YEuU61TjZcyYcnLgieLdv5vdaprmc= X-Received: by 2002:a05:600c:34d2:b0:4a1:fa27:df7c with SMTP id 5b1f17b1804b1-4bb55ac6cabmr104943615e9.34.1794653104327; Sat, 14 Nov 2026 02:45:04 -0800 (PST) Received: from Ansuel-XPS24.localdomain (93-34-92-103.ip49.fastwebnet.it. [93.34.92.103]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-4bb56719391sm52858285e9.1.2026.11.14.02.45.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Nov 2026 02:45:03 -0800 (PST) From: Christian Marangi To: Maxime Chevallier , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Simon Horman , Jonathan Corbet , Shuah Khan , Randy Dunlap , Christian Marangi , Lorenzo Bianconi , Heiner Kallweit , Russell King , Philipp Zabel , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, llvm@lists.linux.dev Cc: Zhengping Zhang Subject: [PATCH net-next v20 15/15] net: airoha: add phylink support Date: Sat, 14 Nov 2026 11:43:54 +0100 Message-ID: <20261114104426.235620-16-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261114104426.235620-1-ansuelsmth@gmail.com> References: <20261114104426.235620-1-ansuelsmth@gmail.com> X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add phylink support for each GDM port. For GDM1 add the internal interface mode as the only supported mode. For GDM2/3/4 add the required configuration of the PCS to make the external PHY or attached SFP cage work. These needs to be defined in the GDM port node using the pcs-handle property. Update and provide a .get/set_link_ksettings function that use phylink for ethtool OPs now that we fully support phylink. Tested-by: Zhengping Zhang Acked-by: Lorenzo Bianconi Signed-off-by: Christian Marangi --- drivers/net/ethernet/airoha/Kconfig | 2 + drivers/net/ethernet/airoha/airoha_eth.c | 197 +++++++++++++++++++++- drivers/net/ethernet/airoha/airoha_eth.h | 5 + drivers/net/ethernet/airoha/airoha_regs.h | 12 ++ 4 files changed, 213 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/airoha/Kconfig b/drivers/net/ethernet/airoha/Kconfig index 1f6640a15fc9..5c54a07d2a76 100644 --- a/drivers/net/ethernet/airoha/Kconfig +++ b/drivers/net/ethernet/airoha/Kconfig @@ -20,6 +20,8 @@ config NET_AIROHA depends on NET_DSA || !NET_DSA select NET_AIROHA_NPU select PAGE_POOL + select PCS_AIROHA + select PHYLINK help This driver supports the gigabit ethernet MACs in the Airoha SoC family. diff --git a/drivers/net/ethernet/airoha/airoha_eth.c b/drivers/net/ethernet/airoha/airoha_eth.c index b164a78ddac9..81a8da721c13 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.c +++ b/drivers/net/ethernet/airoha/airoha_eth.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -2194,10 +2195,18 @@ static int airoha_dev_open(struct net_device *netdev) return -EBUSY; } + err = phylink_of_phy_connect(dev->phylink, netdev->dev.of_node, 0); + if (err) { + netdev_err(netdev, "could not attach PHY: %d\n", err); + return err; + } + + phylink_start(dev->phylink); + netif_tx_start_all_queues(netdev); err = airoha_set_vip_for_gdm_port(dev, true); if (err) - return err; + goto err_phy_stop; if (netdev_uses_dsa(netdev)) airoha_fe_set(qdma->eth, REG_GDM_INGRESS_CFG(port->id), @@ -2219,6 +2228,12 @@ static int airoha_dev_open(struct net_device *netdev) airoha_dev_lro_enable(dev); return 0; + +err_phy_stop: + phylink_stop(dev->phylink); + phylink_disconnect_phy(dev->phylink); + + return err; } static int airoha_dev_stop(struct net_device *netdev) @@ -2226,6 +2241,8 @@ static int airoha_dev_stop(struct net_device *netdev) struct airoha_gdm_dev *dev = netdev_priv(netdev); struct airoha_gdm_port *port = dev->port; + phylink_stop(dev->phylink); + netif_tx_disable(netdev); airoha_set_vip_for_gdm_port(dev, false); @@ -2239,6 +2256,8 @@ static int airoha_dev_stop(struct net_device *netdev) if (netdev->features & NETIF_F_LRO) airoha_dev_lro_disable(dev); + phylink_disconnect_phy(dev->phylink); + return 0; } @@ -2829,6 +2848,24 @@ airoha_ethtool_get_rmon_stats(struct net_device *netdev, } while (u64_stats_fetch_retry(&dev->stats.syncp, start)); } +static int +airoha_ethtool_get_link_ksettings(struct net_device *netdev, + struct ethtool_link_ksettings *cmd) +{ + struct airoha_gdm_dev *dev = netdev_priv(netdev); + + return phylink_ethtool_ksettings_get(dev->phylink, cmd); +} + +static int +airoha_ethtool_set_link_ksettings(struct net_device *netdev, + const struct ethtool_link_ksettings *cmd) +{ + struct airoha_gdm_dev *dev = netdev_priv(netdev); + + return phylink_ethtool_ksettings_set(dev->phylink, cmd); +} + static int airoha_qdma_set_chan_tx_sched(struct net_device *netdev, int channel, enum tx_sched_mode mode, const u16 *weights, u8 n_weights) @@ -3696,7 +3733,8 @@ static const struct ethtool_ops airoha_ethtool_ops = { .get_drvinfo = airoha_ethtool_get_drvinfo, .get_eth_mac_stats = airoha_ethtool_get_mac_stats, .get_rmon_stats = airoha_ethtool_get_rmon_stats, - .get_link_ksettings = phy_ethtool_get_link_ksettings, + .get_link_ksettings = airoha_ethtool_get_link_ksettings, + .set_link_ksettings = airoha_ethtool_set_link_ksettings, .get_link = ethtool_op_get_link, }; @@ -3752,6 +3790,155 @@ bool airoha_is_valid_gdm_dev(struct airoha_eth *eth, return false; } +/* Nothing to do in MAC, everything is handled in PCS */ +static void airoha_mac_config(struct phylink_config *config, unsigned int mode, + const struct phylink_link_state *state) +{ +} + +static void airoha_mac_link_up(struct phylink_config *config, struct phy_device *phy, + unsigned int mode, phy_interface_t interface, + int speed, int duplex, bool tx_pause, bool rx_pause) +{ + struct airoha_gdm_dev *dev = container_of(config, struct airoha_gdm_dev, + phylink_config); + struct airoha_gdm_port *port = dev->port; + struct airoha_eth *eth = dev->eth; + u32 frag_size_tx, frag_size_rx; + + /* TX/RX frag is configured only for GDM4 */ + if (port->id != AIROHA_GDM4_IDX) + return; + + switch (speed) { + case SPEED_10000: + case SPEED_5000: + frag_size_tx = 8; + frag_size_rx = 8; + break; + case SPEED_2500: + frag_size_tx = 2; + frag_size_rx = 1; + break; + default: + frag_size_tx = 1; + frag_size_rx = 0; + break; + } + + mutex_lock(&port->link_lock); + + /* Configure TX/RX frag based on speed */ + if (dev->nbq == 1) { + airoha_fe_rmw(eth, REG_FE_GDM4_TMBI_FRAG, + GDM4_SGMII1_TX_FRAG_SIZE_MASK, + FIELD_PREP(GDM4_SGMII1_TX_FRAG_SIZE_MASK, + frag_size_tx)); + + airoha_fe_rmw(eth, REG_FE_GDM4_RMBI_FRAG, + GDM4_SGMII1_RX_FRAG_SIZE_MASK, + FIELD_PREP(GDM4_SGMII1_RX_FRAG_SIZE_MASK, + frag_size_rx)); + } else { + airoha_fe_rmw(eth, REG_FE_GDM4_TMBI_FRAG, + GDM4_SGMII0_TX_FRAG_SIZE_MASK, + FIELD_PREP(GDM4_SGMII0_TX_FRAG_SIZE_MASK, + frag_size_tx)); + + airoha_fe_rmw(eth, REG_FE_GDM4_RMBI_FRAG, + GDM4_SGMII0_RX_FRAG_SIZE_MASK, + FIELD_PREP(GDM4_SGMII0_RX_FRAG_SIZE_MASK, + frag_size_rx)); + } + + mutex_unlock(&port->link_lock); +} + +/* Nothing to do in MAC, everything is handled in PCS */ +static void airoha_mac_link_down(struct phylink_config *config, unsigned int mode, + phy_interface_t interface) +{ +} + +static const struct phylink_mac_ops airoha_phylink_ops = { + .mac_config = airoha_mac_config, + .mac_link_up = airoha_mac_link_up, + .mac_link_down = airoha_mac_link_down, +}; + +static int airoha_fill_available_pcs(struct phylink_config *config, + struct phylink_pcs **available_pcs, + unsigned int num_possible_pcs) +{ + struct device *dev = config->dev; + + return fwnode_phylink_pcs_parse(dev_fwnode(dev), available_pcs, + num_possible_pcs); +} + +static int airoha_setup_phylink(struct net_device *netdev) +{ + struct airoha_gdm_dev *dev = netdev_priv(netdev); + struct device_node *np = netdev->dev.of_node; + struct airoha_gdm_port *port = dev->port; + struct phylink_config *config; + phy_interface_t phy_mode; + struct phylink *phylink; + int err; + + err = of_get_phy_mode(np, &phy_mode); + if (err) { + dev_err(&netdev->dev, "incorrect phy-mode\n"); + return err; + } + + config = &dev->phylink_config; + config->dev = &netdev->dev; + config->type = PHYLINK_NETDEV; + + /* + * GDM1 only supports internal for Embedded Switch + * and doesn't require a PCS. + */ + if (port->id == AIROHA_GDM1_IDX) { + config->mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE | + MAC_10000FD; + + __set_bit(PHY_INTERFACE_MODE_INTERNAL, + config->supported_interfaces); + } else { + config->mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE | + MAC_10 | MAC_100 | MAC_1000 | + MAC_2500FD | MAC_5000FD | MAC_10000FD; + + config->num_possible_pcs = fwnode_phylink_pcs_count(dev_fwnode(config->dev)); + config->fill_available_pcs = airoha_fill_available_pcs; + + __set_bit(PHY_INTERFACE_MODE_SGMII, + config->supported_interfaces); + __set_bit(PHY_INTERFACE_MODE_1000BASEX, + config->supported_interfaces); + __set_bit(PHY_INTERFACE_MODE_2500BASEX, + config->supported_interfaces); + __set_bit(PHY_INTERFACE_MODE_10GBASER, + config->supported_interfaces); + __set_bit(PHY_INTERFACE_MODE_USXGMII, + config->supported_interfaces); + + phy_interface_copy(config->pcs_interfaces, + config->supported_interfaces); + } + + phylink = phylink_create(config, of_fwnode_handle(np), + phy_mode, &airoha_phylink_ops); + if (IS_ERR(phylink)) + return PTR_ERR(phylink); + + dev->phylink = phylink; + + return 0; +} + static int airoha_alloc_gdm_device(struct airoha_eth *eth, struct airoha_gdm_port *port, int nbq, struct device_node *np) @@ -3815,7 +4002,7 @@ static int airoha_alloc_gdm_device(struct airoha_eth *eth, dev->nbq = nbq; port->devs[index] = dev; - return 0; + return airoha_setup_phylink(netdev); } static int airoha_alloc_gdm_port(struct airoha_eth *eth, @@ -3851,6 +4038,7 @@ static int airoha_alloc_gdm_port(struct airoha_eth *eth, port->id = id; spin_lock_init(&port->stats_lock); + mutex_init(&port->link_lock); eth->ports[p] = port; err = airoha_metadata_dst_alloc(port); @@ -4047,6 +4235,8 @@ static int airoha_probe(struct platform_device *pdev) netdev = netdev_from_priv(dev); if (netdev->reg_state == NETREG_REGISTERED) unregister_netdev(netdev); + if (dev->phylink) + phylink_destroy(dev->phylink); of_node_put(netdev->dev.of_node); } airoha_metadata_dst_free(port); @@ -4085,6 +4275,7 @@ static void airoha_remove(struct platform_device *pdev) netdev = netdev_from_priv(dev); unregister_netdev(netdev); + phylink_destroy(dev->phylink); of_node_put(netdev->dev.of_node); } airoha_metadata_dst_free(port); diff --git a/drivers/net/ethernet/airoha/airoha_eth.h b/drivers/net/ethernet/airoha/airoha_eth.h index d270729e22ff..909e75fec279 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.h +++ b/drivers/net/ethernet/airoha/airoha_eth.h @@ -612,6 +612,9 @@ struct airoha_gdm_dev { * QDMA migration. */ spinlock_t txq_lock[AIROHA_NUM_NETDEV_TX_RINGS]; + + struct phylink *phylink; + struct phylink_config phylink_config; }; struct airoha_gdm_port { @@ -621,6 +624,8 @@ struct airoha_gdm_port { /* protect concurrent hw_stats accesses */ spinlock_t stats_lock; + /* protect concurrent GDM4 register access */ + struct mutex link_lock; struct metadata_dst *dsa_meta[AIROHA_MAX_DSA_PORTS]; }; diff --git a/drivers/net/ethernet/airoha/airoha_regs.h b/drivers/net/ethernet/airoha/airoha_regs.h index 07dd04859fde..94d53d4c3ab7 100644 --- a/drivers/net/ethernet/airoha/airoha_regs.h +++ b/drivers/net/ethernet/airoha/airoha_regs.h @@ -371,6 +371,18 @@ #define IP_FRAGMENT_PORT_MASK GENMASK(8, 5) #define IP_FRAGMENT_NBQ_MASK GENMASK(4, 0) +#define REG_FE_GDM4_TMBI_FRAG 0x2028 +#define GDM4_SGMII1_TX_WEIGHT_MASK GENMASK(31, 26) +#define GDM4_SGMII1_TX_FRAG_SIZE_MASK GENMASK(25, 16) +#define GDM4_SGMII0_TX_WEIGHT_MASK GENMASK(15, 10) +#define GDM4_SGMII0_TX_FRAG_SIZE_MASK GENMASK(9, 0) + +#define REG_FE_GDM4_RMBI_FRAG 0x202c +#define GDM4_SGMII1_RX_WEIGHT_MASK GENMASK(31, 26) +#define GDM4_SGMII1_RX_FRAG_SIZE_MASK GENMASK(25, 16) +#define GDM4_SGMII0_RX_WEIGHT_MASK GENMASK(15, 10) +#define GDM4_SGMII0_RX_FRAG_SIZE_MASK GENMASK(9, 0) + #define REG_MC_VLAN_EN 0x2100 #define MC_VLAN_EN_MASK BIT(0) -- 2.55.0