From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6370547208C for ; Tue, 1 Sep 2026 08:30:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788251450; cv=none; b=iY15MQy+ZolK9Eo6askpIlJZYBN9TIyvLAuFvJTxrf5Y8pcwHpGM4hmtNk4ejyfPnKAprb2hV+5ks3Jen7EHOtYaX02kzkWxJxVdwdatZdVhzBtk/z4blfnESVBt+KvSdRE4Yx/MIFMSMt18o32rR/4tZCalOOR1WZgUton5Z4c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788251450; c=relaxed/simple; bh=1H2gh4N34JGclhfnudJ+lMU2aFBG3EaWcj6BA+jNZag=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=psPV8O/NpiQmihVRgfv+c3sYo7Zo4egrgd7TD8oez8NdeoeLJ4cOfzzJ/F4Fl+TN2qocHVDu3M7EglO6l5umnOwaMhtARL7MF5Rq/mi7h6yj/spQVIvwbJ6tCM7CTTV6ekGlG90AxinTj0g3kTZKLOT5lx3hAikCS3bHUEJyiB8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=HoBm9R4L; arc=none smtp.client-ip=209.85.128.48 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.b="HoBm9R4L" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-499b2981a7bso51130465e9.3 for ; Tue, 01 Sep 2026 01:30:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788251446; x=1788856246; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to:content-type; bh=Ux55P/eUqyNIOwazmon9Wlp3z9i89MIzAhLzSAAm5IY=; b=HoBm9R4LUbbr6MNLz95Cv+6VAYgxVptTUfXShk553UsfmMX9glvgZyC1aA7aWLdfwN Bpb2RWLFx/vjoJ/GbSbUc2TTQBPcMkqCUOr55KEcnQIIJdQ/bhWzXhz7mWwgxE59LaYF 0TRuwFBzq5eM5tMqozRCMdzAVDlpEa3ESJ5U8V/d/E0rY+1p0tfEKiF0VCZK87iogRDP oTTxLLXxmQHx6r6Ks8YkN4kvPlB3l2y4yfpbGIlEFM4+D27/ea7ZRaf8k37Ut1kwsZ4s 4MVeHKs+5vUm9iFKcn3Q53d3eeg3j5Ii4QnEXoX2jZjCbK+v1gRXX76ttikbJxLHxKWY Rbeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788251446; x=1788856246; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to:content-type; bh=Ux55P/eUqyNIOwazmon9Wlp3z9i89MIzAhLzSAAm5IY=; b=lIm2z/lQr1dzfKDl2ALmLi7t9f+N7TNxcikmEqaDKB2qd7+lIdqXvubFrntEQnqWUi bv1mnYznfR2xmvUYpVs2G98voTcNoa0594WH4w5y3rMVbEv3KDQ5xOiZlHR+6x6rRpFe JLEP2Kjdc2jSO0PTOCTNb847YeJEjM7sV5uxfCrLCzn/zySLuLU0DwTgzIc8B6CFIuz1 HPgdX6d+ziYrgzWUrjHiyj9D2b0MxiaGdJqW3hmoBqlDnv8+uhp9a9Rx0UOVCpUUp82X mLK8NFQLgnOXlJFQ75Ry9RHOkhWdt2IdlkzAylQ3Nc5AypubdGd9BakPuMV7zlExyGtH Iwjw== X-Forwarded-Encrypted: i=1; AHgh+RrIMwylI8gypZSOAXXzsXa0nDjUj4OC/teThCcILoVztNrvs37f2MP2EJ7R1dYZTnrvWj0xiioobyI=@vger.kernel.org X-Gm-Message-State: AFuF++mPGXrW3IhvVsqbmo1NCV013jTg5eyZ66WzS+9Ny/3iP8NwYRPn XUJvp6MzZfuf4FdQvpwivNen2rzzbUHIWCBD2+k3djEzGfwTQrkCHNFN X-Gm-Gg: AR+sD11VrS8Ei67fGeRxUG/VOCrYA5m21s0mhYpfdhmad/uo+s+jjFFOMSR7cOnuMgz jDgBth9BRUsoM0sRPxPoW4s9zsxq/36blH9inrANitDa7O0oOga9DWafCYOWMDR7qVwMzNaOCSA 6ExTjiPrBsBjw04ewRl02jxzGzN+c5JQ7YfsfybSpDqvnZjP5wB2vkrgsU3e5QVtLgfSikwOUwF eKed6TN3D9aCdxCckTG6Uy6vsjgPTKzv+WvkyxSMmn/vTCfj2RlJY1cFprEe65+luA1pLzczhgX kpU0v61nu+EN1NaRn5XxxQkzoxcmEdQD7Z+em6ncH69s5a9TJDg/tGphvDrkGberlVHB/220LTh lHHJ0JSXYYRiUusKTZ5hdzAm8b8ZCV9y9+8URaC0mCix5Tw0rA+DZlPa7eCJa6scgtyjGP65I5c qeIG7dheaLh2lEkWPaVZu/eNTZiOy7JM6qZRlHF4DMOHMa+ZfOhjfwizTqXXvjYi6m6qlgfw/0m PGRUf0N+imI23BVSiO5apdVNWYmegnP5FmzMgCAmtouon1ecQ6f X-Received: by 2002:a05:600c:34ce:b0:49b:9205:45b3 with SMTP id 5b1f17b1804b1-49cdc572c7dmr124020605e9.15.1788251445310; Tue, 01 Sep 2026 01:30:45 -0700 (PDT) Received: from Ansuel-XPS24.localdomain (host-79-26-252-140.retail.telecomitalia.it. [79.26.252.140]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-49cdce08862sm51459635e9.1.2026.09.01.01.30.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2026 01:30:44 -0700 (PDT) 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 Subject: [PATCH net-next v15 12/12] net: airoha: add phylink support Date: Tue, 1 Sep 2026 10:29:27 +0200 Message-ID: <20260901083001.8044-13-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260901083001.8044-1-ansuelsmth@gmail.com> References: <20260901083001.8044-1-ansuelsmth@gmail.com> Precedence: bulk X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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. Signed-off-by: Christian Marangi --- drivers/net/ethernet/airoha/Kconfig | 2 + drivers/net/ethernet/airoha/airoha_eth.c | 199 +++++++++++++++++++++- drivers/net/ethernet/airoha/airoha_eth.h | 5 + drivers/net/ethernet/airoha/airoha_regs.h | 12 ++ 4 files changed, 215 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 64619e9a704d..c3827bf9791b 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 @@ -1915,10 +1916,18 @@ static int airoha_dev_open(struct net_device *netdev) struct airoha_qdma *qdma; int err; + 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; qdma = airoha_qdma_deref(dev); if (netdev_uses_dsa(netdev)) @@ -1938,6 +1947,13 @@ static int airoha_dev_open(struct net_device *netdev) pse_port); return 0; + +err_phy_stop: + netif_tx_stop_all_queues(netdev); + phylink_stop(dev->phylink); + phylink_disconnect_phy(dev->phylink); + + return err; } static int airoha_dev_stop(struct net_device *netdev) @@ -1945,6 +1961,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); @@ -1954,6 +1972,9 @@ static int airoha_dev_stop(struct net_device *netdev) airoha_set_gdm_port_fwd_cfg(dev->eth, REG_GDM_FWD_CFG(port->id), FE_PSE_PORT_DROP); + + phylink_disconnect_phy(dev->phylink); + return 0; } @@ -2509,6 +2530,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) @@ -3353,7 +3392,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, }; @@ -3409,6 +3449,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) @@ -3474,7 +3663,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, @@ -3510,6 +3699,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); @@ -3706,6 +3896,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); @@ -3744,6 +3936,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 fa9a8edce22f..83daec003257 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.h +++ b/drivers/net/ethernet/airoha/airoha_eth.h @@ -595,6 +595,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 { @@ -604,6 +607,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 442b48c9b991..4ea89057b560 100644 --- a/drivers/net/ethernet/airoha/airoha_regs.h +++ b/drivers/net/ethernet/airoha/airoha_regs.h @@ -357,6 +357,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.53.0