From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6B4E7C55165 for ; Thu, 30 Jul 2026 11:56:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=SFkpULLeEhql1GOwtkE0tVUFKEV4LMzwilUZyMTV9ek=; b=pekmrPeh2yfWTstfQ1bxBW7VR8 v6juFw+KpU96dPEhtML89c4onhDnsGeo3KePwPkCV61Pf1x+DtbrHPdV3Y8BEVng2rTzjYFPn1qcx 7RpjPcBeykJfNHqjGztzZXHTRSzckER7UjKUPmFvLayrWr5+fwLzUwV03CegDpFPFhTkFzvhdFD9o +DargsIxD6U/yOSTbSgIBH3/uedaSAxh3b7FHBEOFDpSGT4nSagU5fU75NR6WCRhYbog46w7AiJWK gnIaBNZ1QJ9qAOVMO+x/QIFn0joNGUp4VOyRJaILuAUatPQOP9gDwX1GkhBEXzN1ghUlP+pgd4SUk eBfnsYlA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wpPN2-0000000AOrd-0FwC; Thu, 30 Jul 2026 11:56:16 +0000 Received: from sea.source.kernel.org ([172.234.252.31]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wpPMz-0000000AOrL-3tCi; Thu, 30 Jul 2026 11:56:13 +0000 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id 5CB0E40423; Thu, 30 Jul 2026 11:56:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B84E11F00A3A; Thu, 30 Jul 2026 11:56:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785412573; bh=SFkpULLeEhql1GOwtkE0tVUFKEV4LMzwilUZyMTV9ek=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=YH//EQZAn+jF5TJda2xTLG2D5MSpiy1x5ZiczyxiUGrPHFw9NhHHIMyUOpSdEhODj ssq+SPMM5vr++rFFyZ4x9Ut2L20z2BR1LhEQuYiNoSJsSi2l2Q18focNZn/uTHkhbE tJaJTOzteCTzZPrcS9JVblJqBGuHu7sd83nCqMekkbwtAOKT8+tDhMoa9FZ3LFmYFN oYp5s1fP1r/8Jr5UoqUVWPrmyylWDdDkM3A13Sihy7uFjoQAnTWTb8PoIVcZLR05cW aZc9pdUPJ/LLb3hXWpiYNU0YnKGhxk3TYxMHkBoUx9K3IuQdeCOE4SkkcwK0U9mnuB YMDyQBYgFI3Ig== Date: Thu, 30 Jul 2026 13:56:11 +0200 From: Lorenzo Bianconi To: Christian Marangi Cc: 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 , 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: Re: [PATCH net-next v10 11/11] net: airoha: add phylink support Message-ID: References: <20260730102444.1967900-1-ansuelsmth@gmail.com> <20260730102444.1967900-12-ansuelsmth@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="YV0bq4ezW6l3+6wa" Content-Disposition: inline In-Reply-To: <20260730102444.1967900-12-ansuelsmth@gmail.com> X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org --YV0bq4ezW6l3+6wa Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable > 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. >=20 > These needs to be defined in the GDM port node using the pcs-handle > property. >=20 > Update and provide a .get/set_link_ksettings function that use phylink > for ethtool OPs now that we fully support phylink. >=20 > Signed-off-by: Christian Marangi Hi Christian, just some nits inline. Fixing them: Acked-by: Lorenzo Bianconi Regards, Lorenzo > --- > drivers/net/ethernet/airoha/Kconfig | 1 + > drivers/net/ethernet/airoha/airoha_eth.c | 189 +++++++++++++++++++++- > drivers/net/ethernet/airoha/airoha_eth.h | 5 + > drivers/net/ethernet/airoha/airoha_regs.h | 12 ++ > 4 files changed, 205 insertions(+), 2 deletions(-) >=20 > diff --git a/drivers/net/ethernet/airoha/Kconfig b/drivers/net/ethernet/a= iroha/Kconfig > index 1f6640a15fc9..789906516bf8 100644 > --- a/drivers/net/ethernet/airoha/Kconfig > +++ b/drivers/net/ethernet/airoha/Kconfig > @@ -20,6 +20,7 @@ config NET_AIROHA > depends on NET_DSA || !NET_DSA > select NET_AIROHA_NPU > select PAGE_POOL > + 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/ether= net/airoha/airoha_eth.c > index dba7c52c0896..5065d6583b9f 100644 > --- a/drivers/net/ethernet/airoha/airoha_eth.c > +++ b/drivers/net/ethernet/airoha/airoha_eth.c > @@ -8,6 +8,7 @@ > #include > #include > #include > +#include nit: alphabetic order. > #include > #include > #include > @@ -1915,6 +1916,14 @@ static int airoha_dev_open(struct net_device *netd= ev) > struct airoha_qdma *qdma; > int err; > =20 > + err =3D 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); Should it be last operation in airoha_dev_open()? > + > netif_tx_start_all_queues(netdev); > err =3D airoha_set_vip_for_gdm_port(dev, true); > if (err) > @@ -1954,6 +1963,10 @@ static int airoha_dev_stop(struct net_device *netd= ev) > airoha_set_gdm_port_fwd_cfg(dev->eth, > REG_GDM_FWD_CFG(port->id), > FE_PSE_PORT_DROP); > + > + phylink_stop(dev->phylink); Should it be the first one? (reverse order of airoha_dev_open()). > + phylink_disconnect_phy(dev->phylink); > + > return 0; > } > =20 > @@ -2509,6 +2522,24 @@ airoha_ethtool_get_rmon_stats(struct net_device *n= etdev, > } while (u64_stats_fetch_retry(&dev->stats.syncp, start)); > } > =20 > +static int > +airoha_ethtool_get_link_ksettings(struct net_device *netdev, > + struct ethtool_link_ksettings *cmd) > +{ > + struct airoha_gdm_dev *dev =3D 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 =3D 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 +3384,8 @@ static const struct ethtool_ops airoha_ethtool_ops = =3D { > .get_drvinfo =3D airoha_ethtool_get_drvinfo, > .get_eth_mac_stats =3D airoha_ethtool_get_mac_stats, > .get_rmon_stats =3D airoha_ethtool_get_rmon_stats, > - .get_link_ksettings =3D phy_ethtool_get_link_ksettings, > + .get_link_ksettings =3D airoha_ethtool_get_link_ksettings, > + .set_link_ksettings =3D airoha_ethtool_set_link_ksettings, > .get_link =3D ethtool_op_get_link, > }; > =20 > @@ -3409,6 +3441,155 @@ bool airoha_is_valid_gdm_dev(struct airoha_eth *e= th, > return false; > } > =20 > +/* Nothing to do in MAC, everything is handled in PCS */ > +static void airoha_mac_config(struct phylink_config *config, unsigned in= t 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 =3D container_of(config, struct airoha_gdm_d= ev, > + phylink_config); > + struct airoha_gdm_port *port =3D dev->port; > + struct airoha_eth *eth =3D dev->eth; > + u32 frag_size_tx, frag_size_rx; > + u32 mask, val; > + > + /* TX/RX frag is configured only for GDM4 */ > + if (port->id !=3D AIROHA_GDM4_IDX) > + return; > + > + switch (speed) { > + case SPEED_10000: > + case SPEED_5000: > + frag_size_tx =3D 8; > + frag_size_rx =3D 8; > + break; > + case SPEED_2500: > + frag_size_tx =3D 2; > + frag_size_rx =3D 1; > + break; > + default: > + frag_size_tx =3D 1; > + frag_size_rx =3D 0; Missing break here. > + } > + > + mutex_lock(&port->reg_lock); > + > + /* Configure TX/RX frag based on speed */ > + if (dev->nbq =3D=3D 1) { > + mask =3D GDM4_SGMII1_TX_FRAG_SIZE_MASK; > + val =3D FIELD_PREP(GDM4_SGMII1_TX_FRAG_SIZE_MASK, > + frag_size_tx); > + } else { > + mask =3D GDM4_SGMII0_TX_FRAG_SIZE_MASK; > + val =3D FIELD_PREP(GDM4_SGMII0_TX_FRAG_SIZE_MASK, > + frag_size_tx); > + } > + airoha_fe_rmw(eth, REG_FE_GDM4_TMBI_FRAG, mask, val); > + > + if (dev->nbq =3D=3D 1) { > + mask =3D GDM4_SGMII1_RX_FRAG_SIZE_MASK; > + val =3D FIELD_PREP(GDM4_SGMII1_RX_FRAG_SIZE_MASK, > + frag_size_rx); > + } else { > + mask =3D GDM4_SGMII0_RX_FRAG_SIZE_MASK; > + val =3D FIELD_PREP(GDM4_SGMII0_RX_FRAG_SIZE_MASK, > + frag_size_rx); > + } > + airoha_fe_rmw(eth, REG_FE_GDM4_RMBI_FRAG, mask, val); nit: I guess you can have just one if/else block here running airoha_fe_rmw= () inside the block and getting rid of val/mask. > + > + mutex_unlock(&port->reg_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 =3D { > + .mac_config =3D airoha_mac_config, > + .mac_link_up =3D airoha_mac_link_up, > + .mac_link_down =3D 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 =3D 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 =3D netdev_priv(netdev); > + struct device_node *np =3D netdev->dev.of_node; > + struct airoha_gdm_port *port =3D dev->port; > + struct phylink_config *config; > + phy_interface_t phy_mode; > + struct phylink *phylink; > + int err; > + > + err =3D of_get_phy_mode(np, &phy_mode); > + if (err) { > + dev_err(&netdev->dev, "incorrect phy-mode\n"); > + return err; > + } > + > + config =3D &dev->phylink_config; > + config->dev =3D &netdev->dev; > + config->type =3D PHYLINK_NETDEV; > + > + /* > + * GDM1 only supports internal for Embedded Switch > + * and doesn't require a PCS. > + */ > + if (port->id =3D=3D AIROHA_GDM1_IDX) { > + config->mac_capabilities =3D MAC_ASYM_PAUSE | MAC_SYM_PAUSE | > + MAC_10000FD; > + > + __set_bit(PHY_INTERFACE_MODE_INTERNAL, > + config->supported_interfaces); > + } else { > + config->mac_capabilities =3D MAC_ASYM_PAUSE | MAC_SYM_PAUSE | > + MAC_10 | MAC_100 | MAC_1000 | > + MAC_2500FD | MAC_5000FD | MAC_10000FD; > + > + config->num_possible_pcs =3D fwnode_phylink_pcs_count(dev_fwnode(confi= g->dev)); > + config->fill_available_pcs =3D 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 =3D phylink_create(config, of_fwnode_handle(np), > + phy_mode, &airoha_phylink_ops); > + if (IS_ERR(phylink)) > + return PTR_ERR(phylink); > + > + dev->phylink =3D 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 +3655,7 @@ static int airoha_alloc_gdm_device(struct airoha_et= h *eth, > dev->nbq =3D nbq; > port->devs[index] =3D dev; > =20 > - return 0; > + return airoha_setup_phylink(netdev); > } > =20 > static int airoha_alloc_gdm_port(struct airoha_eth *eth, > @@ -3510,6 +3691,7 @@ static int airoha_alloc_gdm_port(struct airoha_eth = *eth, > =20 > port->id =3D id; > spin_lock_init(&port->stats_lock); > + mutex_init(&port->reg_lock); > eth->ports[p] =3D port; > =20 > err =3D airoha_metadata_dst_alloc(port); > @@ -3706,6 +3888,8 @@ static int airoha_probe(struct platform_device *pde= v) > netdev =3D netdev_from_priv(dev); > if (netdev->reg_state =3D=3D 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 +3928,7 @@ static void airoha_remove(struct platform_device *p= dev) > =20 > netdev =3D 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/ether= net/airoha/airoha_eth.h > index fa9a8edce22f..6396a5aec384 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; > }; > =20 > struct airoha_gdm_port { > @@ -604,6 +607,8 @@ struct airoha_gdm_port { > =20 > /* protect concurrent hw_stats accesses */ > spinlock_t stats_lock; > + /* protect concurrent GDM4 register access */ > + struct mutex reg_lock; nit: naming is always hard, maybe link_lock? > =20 > struct metadata_dst *dsa_meta[AIROHA_MAX_DSA_PORTS]; > }; > diff --git a/drivers/net/ethernet/airoha/airoha_regs.h b/drivers/net/ethe= rnet/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) > =20 > +#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) > =20 > --=20 > 2.53.0 >=20 --YV0bq4ezW6l3+6wa Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQTquNwa3Txd3rGGn7Y6cBh0uS2trAUCams72wAKCRA6cBh0uS2t rBsYAP9JVfpcG3iZ/fFIRDfuejgd6YEy15OWk6ya0hjQqN3D1QD+Jlplr8Il1Kjl n5Uuyl3jQ5fKeNkajMjtNeXSxELTogE= =+NVb -----END PGP SIGNATURE----- --YV0bq4ezW6l3+6wa--