Re: [RFC PATCH net-next v2 11/11] net: airoha: add phylink support for GDM2/3/4

[Lorenzo Bianconi <lorenzo@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 14796 bytes --]

> Add phylink support for GDM2/3/4 port that require 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.
> 
> Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

Hi Christian,

the patch looks fine to me, just few nits inline.

Regards,
Lorenzo

> ---
>  drivers/net/ethernet/airoha/airoha_eth.c  | 266 +++++++++++++++++++++-
>  drivers/net/ethernet/airoha/airoha_eth.h  |   4 +
>  drivers/net/ethernet/airoha/airoha_regs.h |  12 +
>  include/linux/pcs/pcs-airoha.h            |  15 ++
>  4 files changed, 296 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/airoha/airoha_eth.c b/drivers/net/ethernet/airoha/airoha_eth.c
> index c0a642568ac1..40d5d7cb1410 100644
> --- a/drivers/net/ethernet/airoha/airoha_eth.c
> +++ b/drivers/net/ethernet/airoha/airoha_eth.c
> @@ -5,9 +5,13 @@
>   */
>  #include <linux/of.h>
>  #include <linux/of_net.h>
> +#include <linux/of_platform.h>
>  #include <linux/platform_device.h>
>  #include <linux/tcp.h>
> +#include <linux/pcs/pcs.h>
> +#include <linux/pcs/pcs-airoha.h>

can you please put includes in alphabetical order?

>  #include <linux/u64_stats_sync.h>
> +#include <linux/regmap.h>
>  #include <net/dst_metadata.h>
>  #include <net/page_pool/helpers.h>
>  #include <net/pkt_cls.h>
> @@ -76,6 +80,11 @@ static bool airhoa_is_lan_gdm_port(struct airoha_gdm_port *port)
>  	return port->id == 1;
>  }
>  
> +static bool airhoa_is_phy_external(struct airoha_gdm_port *port)
> +{

I guess you can add a comment here.

> +	return port->id != 1;
> +}
> +
>  static void airoha_set_macaddr(struct airoha_gdm_port *port, const u8 *addr)
>  {
>  	struct airoha_eth *eth = port->qdma->eth;
> @@ -1535,6 +1544,17 @@ static int airoha_dev_open(struct net_device *dev)
>  	struct airoha_gdm_port *port = netdev_priv(dev);
>  	struct airoha_qdma *qdma = port->qdma;
>  
> +	if (airhoa_is_phy_external(port)) {
> +		err = phylink_of_phy_connect(port->phylink, dev->dev.of_node, 0);
> +		if (err) {
> +			netdev_err(dev, "%s: could not attach PHY: %d\n", __func__,
> +				   err);
> +			return err;
> +		}
> +
> +		phylink_start(port->phylink);
> +	}
> +
>  	netif_tx_start_all_queues(dev);
>  	err = airoha_set_vip_for_gdm_port(port, true);
>  	if (err)
> @@ -1587,19 +1607,36 @@ static int airoha_dev_stop(struct net_device *dev)
>  		}
>  	}
>  
> +	if (airhoa_is_phy_external(port)) {
> +		phylink_stop(port->phylink);
> +		phylink_disconnect_phy(port->phylink);
> +	}
> +
>  	return 0;
>  }
>  
>  static int airoha_dev_set_macaddr(struct net_device *dev, void *p)
>  {
>  	struct airoha_gdm_port *port = netdev_priv(dev);
> +	const u8 *mac_addr = dev->dev_addr;
>  	int err;
>  
>  	err = eth_mac_addr(dev, p);
>  	if (err)
>  		return err;
>  
> -	airoha_set_macaddr(port, dev->dev_addr);
> +	airoha_set_macaddr(port, mac_addr);

this is not required.

> +
> +	/* Update XFI mac address */
> +	if (airhoa_is_phy_external(port)) {
> +		regmap_write(port->xfi_mac, AIROHA_PCS_XFI_MAC_XFI_MACADDRL,
> +			     FIELD_PREP(AIROHA_PCS_XFI_MAC_MACADDRL,
> +					mac_addr[0] << 24 | mac_addr[1] << 16 |
> +					mac_addr[2] << 8 | mac_addr[3]));
> +		regmap_write(port->xfi_mac, AIROHA_PCS_XFI_MAC_XFI_MACADDRH,
> +			     FIELD_PREP(AIROHA_PCS_XFI_MAC_MACADDRH,
> +					mac_addr[4] << 8 | mac_addr[5]));
> +	}
>  
>  	return 0;
>  }
> @@ -2454,6 +2491,210 @@ static void airoha_metadata_dst_free(struct airoha_gdm_port *port)
>  	}
>  }
>  
> +static void airoha_mac_config(struct phylink_config *config, unsigned int mode,
> +			      const struct phylink_link_state *state)
> +{
> +	struct airoha_gdm_port *port = container_of(config, struct airoha_gdm_port,
> +						    phylink_config);
> +
> +	/* Frag disable */
> +	regmap_update_bits(port->xfi_mac, AIROHA_PCS_XFI_MAC_XFI_GIB_CFG,
> +			   AIROHA_PCS_XFI_RX_FRAG_LEN,
> +			   FIELD_PREP(AIROHA_PCS_XFI_RX_FRAG_LEN, 31));
> +	regmap_update_bits(port->xfi_mac, AIROHA_PCS_XFI_MAC_XFI_GIB_CFG,
> +			   AIROHA_PCS_XFI_TX_FRAG_LEN,
> +			   FIELD_PREP(AIROHA_PCS_XFI_TX_FRAG_LEN, 31));
> +
> +	/* IPG NUM */
> +	regmap_update_bits(port->xfi_mac, AIROHA_PCS_XFI_MAC_XFI_GIB_CFG,
> +			   AIROHA_PCS_XFI_IPG_NUM,
> +			   FIELD_PREP(AIROHA_PCS_XFI_IPG_NUM, 10));
> +
> +	/* Enable TX/RX flow control */
> +	regmap_set_bits(port->xfi_mac, AIROHA_PCS_XFI_MAC_XFI_GIB_CFG,
> +			AIROHA_PCS_XFI_TX_FC_EN);
> +	regmap_set_bits(port->xfi_mac, AIROHA_PCS_XFI_MAC_XFI_GIB_CFG,
> +			AIROHA_PCS_XFI_RX_FC_EN);

I guess you can squash all the regmap_update_bits here.

> +}
> +
> +static int airoha_mac_prepare(struct phylink_config *config, unsigned int mode,
> +			      phy_interface_t iface)
> +{
> +	struct airoha_gdm_port *port = container_of(config, struct airoha_gdm_port,
> +						    phylink_config);
> +
> +	/* MPI MBI disable */
> +	regmap_set_bits(port->xfi_mac, AIROHA_PCS_XFI_MAC_XFI_GIB_CFG,
> +			AIROHA_PCS_XFI_RXMPI_STOP |
> +			AIROHA_PCS_XFI_RXMBI_STOP |
> +			AIROHA_PCS_XFI_TXMPI_STOP |
> +			AIROHA_PCS_XFI_TXMBI_STOP);
> +
> +	/* Write 1 to trigger reset and clear */
> +	regmap_clear_bits(port->xfi_mac, AIROHA_PCS_XFI_MAC_XFI_LOGIC_RST,
> +			  AIROHA_PCS_XFI_MAC_LOGIC_RST);
> +	regmap_set_bits(port->xfi_mac, AIROHA_PCS_XFI_MAC_XFI_LOGIC_RST,
> +			AIROHA_PCS_XFI_MAC_LOGIC_RST);
> +
> +	usleep_range(1000, 2000);
> +
> +	/* Clear XFI MAC counter */
> +	regmap_set_bits(port->xfi_mac, AIROHA_PCS_XFI_MAC_XFI_CNT_CLR,
> +			AIROHA_PCS_XFI_GLB_CNT_CLR);
> +
> +	return 0;
> +}
> +
> +static void airoha_mac_link_down(struct phylink_config *config, unsigned int mode,
> +				 phy_interface_t interface)
> +{
> +	struct airoha_gdm_port *port = container_of(config, struct airoha_gdm_port,
> +						    phylink_config);
> +
> +	/* MPI MBI disable */
> +	regmap_set_bits(port->xfi_mac, AIROHA_PCS_XFI_MAC_XFI_GIB_CFG,
> +			AIROHA_PCS_XFI_RXMPI_STOP |
> +			AIROHA_PCS_XFI_RXMBI_STOP |
> +			AIROHA_PCS_XFI_TXMPI_STOP |
> +			AIROHA_PCS_XFI_TXMBI_STOP);
> +}
> +
> +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_port *port = container_of(config, struct airoha_gdm_port,
> +						    phylink_config);
> +	struct airoha_qdma *qdma = port->qdma;
> +	struct airoha_eth *eth = qdma->eth;
> +	u32 frag_size_tx, frag_size_rx;
> +
> +	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;

missing break

> +	}
> +
> +	/* Configure TX/RX frag based on speed */
> +	if (port->id == 4) {
> +		airoha_fe_rmw(eth, REG_GDMA4_TMBI_FRAG, GDMA4_SGMII0_TX_FRAG_SIZE,
> +			      FIELD_PREP(GDMA4_SGMII0_TX_FRAG_SIZE, frag_size_tx));
> +
> +		airoha_fe_rmw(eth, REG_GDMA4_RMBI_FRAG, GDMA4_SGMII0_RX_FRAG_SIZE,
> +			      FIELD_PREP(GDMA4_SGMII0_RX_FRAG_SIZE, frag_size_rx));
> +	}
> +
> +	/* BPI BMI enable */
> +	regmap_clear_bits(port->xfi_mac, AIROHA_PCS_XFI_MAC_XFI_GIB_CFG,
> +			  AIROHA_PCS_XFI_RXMPI_STOP |
> +			  AIROHA_PCS_XFI_RXMBI_STOP |
> +			  AIROHA_PCS_XFI_TXMPI_STOP |
> +			  AIROHA_PCS_XFI_TXMBI_STOP);
> +}
> +
> +static const struct phylink_mac_ops airoha_phylink_ops = {
> +	.mac_config = airoha_mac_config,
> +	.mac_prepare = airoha_mac_prepare,
> +	.mac_link_down = airoha_mac_link_down,
> +	.mac_link_up = airoha_mac_link_up,
> +};
> +
> +static int airoha_setup_phylink(struct net_device *dev)
> +{
> +	struct device_node *pcs_np, *np = dev->dev.of_node;
> +	struct airoha_gdm_port *port = netdev_priv(dev);
> +	struct phylink_pcs **available_pcs;
> +	struct platform_device *pdev;
> +	phy_interface_t phy_mode;
> +	struct phylink *phylink;
> +	unsigned int num_pcs;
> +	int err;
> +
> +	err = of_get_phy_mode(np, &phy_mode);
> +	if (err) {
> +		dev_err(&dev->dev, "incorrect phy-mode\n");
> +		return err;
> +	}
> +
> +	pcs_np = of_parse_phandle(np, "pcs-handle", 0);

I guess you need to update airoha,en7581-eth.yaml, don't you?

> +	if (!pcs_np)
> +		return -ENODEV;
> +
> +	if (!of_device_is_available(pcs_np)) {
> +		of_node_put(pcs_np);
> +		return -ENODEV;
> +	}
> +
> +	pdev = of_find_device_by_node(pcs_np);
> +	of_node_put(pcs_np);
> +	if (!pdev || !platform_get_drvdata(pdev)) {
> +		if (pdev)
> +			put_device(&pdev->dev);
> +		return -EPROBE_DEFER;
> +	}
> +
> +	port->xfi_mac = dev_get_regmap(&pdev->dev, "xfi_mac");
> +	if (IS_ERR(port->xfi_mac))
> +		return PTR_ERR(port->xfi_mac);
> +
> +	port->phylink_config.dev = &dev->dev;
> +	port->phylink_config.type = PHYLINK_NETDEV;
> +	port->phylink_config.mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
> +						MAC_10 | MAC_100 | MAC_1000 | MAC_2500FD |
> +						MAC_5000FD | MAC_10000FD;
> +
> +	err = fwnode_phylink_pcs_parse(dev_fwnode(&dev->dev), NULL, &num_pcs);
> +	if (err)
> +		return err;
> +
> +	available_pcs = kcalloc(num_pcs, sizeof(*available_pcs), GFP_KERNEL);

you can use devm_kcalloc() here.

> +	if (!available_pcs)
> +		return -ENOMEM;
> +
> +	err = fwnode_phylink_pcs_parse(dev_fwnode(&dev->dev), available_pcs,
> +				       &num_pcs);
> +	if (err)
> +		goto out;
> +
> +	port->phylink_config.available_pcs = available_pcs;
> +	port->phylink_config.num_available_pcs = num_pcs;
> +
> +	__set_bit(PHY_INTERFACE_MODE_SGMII,
> +		  port->phylink_config.supported_interfaces);
> +	__set_bit(PHY_INTERFACE_MODE_1000BASEX,
> +		  port->phylink_config.supported_interfaces);
> +	__set_bit(PHY_INTERFACE_MODE_2500BASEX,
> +		  port->phylink_config.supported_interfaces);
> +	__set_bit(PHY_INTERFACE_MODE_USXGMII,
> +		  port->phylink_config.supported_interfaces);
> +
> +	phy_interface_copy(port->phylink_config.pcs_interfaces,
> +			   port->phylink_config.supported_interfaces);
> +
> +	phylink = phylink_create(&port->phylink_config,
> +				 of_fwnode_handle(np),
> +				 phy_mode, &airoha_phylink_ops);
> +	if (IS_ERR(phylink)) {
> +		err = PTR_ERR(phylink);
> +		goto out;
> +	}
> +
> +	port->phylink = phylink;
> +out:
> +	kfree(available_pcs);
> +
> +	return err;
> +}
> +
>  static int airoha_alloc_gdm_port(struct airoha_eth *eth,
>  				 struct device_node *np, int index)
>  {
> @@ -2532,6 +2773,23 @@ static int airoha_alloc_gdm_port(struct airoha_eth *eth,
>  	if (err)
>  		return err;
>  
> +	if (airhoa_is_phy_external(port)) {
> +		const u8 *mac_addr = dev->dev_addr;
> +
> +		err = airoha_setup_phylink(dev);
> +		if (err)
> +			return err;
> +
> +		/* Setup XFI mac address */
> +		regmap_write(port->xfi_mac, AIROHA_PCS_XFI_MAC_XFI_MACADDRL,
> +			     FIELD_PREP(AIROHA_PCS_XFI_MAC_MACADDRL,
> +					mac_addr[0] << 24 | mac_addr[1] << 16 |
> +					mac_addr[2] << 8 | mac_addr[3]));
> +		regmap_write(port->xfi_mac, AIROHA_PCS_XFI_MAC_XFI_MACADDRH,
> +			     FIELD_PREP(AIROHA_PCS_XFI_MAC_MACADDRH,
> +					mac_addr[4] << 8 | mac_addr[5]));
> +	}
> +
>  	return register_netdev(dev);
>  }
>  
> @@ -2626,6 +2884,9 @@ static int airoha_probe(struct platform_device *pdev)
>  		struct airoha_gdm_port *port = eth->ports[i];
>  
>  		if (port && port->dev->reg_state == NETREG_REGISTERED) {
> +			if (airhoa_is_phy_external(port))
> +				phylink_destroy(port->phylink);
> +
>  			unregister_netdev(port->dev);
>  			airoha_metadata_dst_free(port);
>  		}
> @@ -2653,6 +2914,9 @@ static void airoha_remove(struct platform_device *pdev)
>  			continue;
>  
>  		airoha_dev_stop(port->dev);
> +		if (airhoa_is_phy_external(port))
> +			phylink_destroy(port->phylink);
> +
>  		unregister_netdev(port->dev);
>  		airoha_metadata_dst_free(port);
>  	}
> diff --git a/drivers/net/ethernet/airoha/airoha_eth.h b/drivers/net/ethernet/airoha/airoha_eth.h
> index 60690b685710..bc0cbeb6bd6d 100644
> --- a/drivers/net/ethernet/airoha/airoha_eth.h
> +++ b/drivers/net/ethernet/airoha/airoha_eth.h
> @@ -460,6 +460,10 @@ struct airoha_gdm_port {
>  	struct net_device *dev;
>  	int id;
>  
> +	struct phylink *phylink;
> +	struct phylink_config phylink_config;
> +	struct regmap *xfi_mac;
> +
>  	struct airoha_hw_stats stats;
>  
>  	DECLARE_BITMAP(qos_sq_bmap, AIROHA_NUM_QOS_CHANNELS);
> diff --git a/drivers/net/ethernet/airoha/airoha_regs.h b/drivers/net/ethernet/airoha/airoha_regs.h
> index 8146cde4e8ba..72f7824fcc2e 100644
> --- a/drivers/net/ethernet/airoha/airoha_regs.h
> +++ b/drivers/net/ethernet/airoha/airoha_regs.h
> @@ -356,6 +356,18 @@
>  #define IP_FRAGMENT_PORT_MASK		GENMASK(8, 5)
>  #define IP_FRAGMENT_NBQ_MASK		GENMASK(4, 0)
>  
> +#define REG_GDMA4_TMBI_FRAG		0x2028
> +#define GDMA4_SGMII1_TX_WEIGHT		GENMASK(31, 26)
> +#define GDMA4_SGMII1_TX_FRAG_SIZE	GENMASK(25, 16)
> +#define GDMA4_SGMII0_TX_WEIGHT		GENMASK(15, 10)
> +#define GDMA4_SGMII0_TX_FRAG_SIZE	GENMASK(9, 0)
> +
> +#define REG_GDMA4_RMBI_FRAG		0x202c
> +#define GDMA4_SGMII1_RX_WEIGHT		GENMASK(31, 26)
> +#define GDMA4_SGMII1_RX_FRAG_SIZE	GENMASK(25, 16)
> +#define GDMA4_SGMII0_RX_WEIGHT		GENMASK(15, 10)
> +#define GDMA4_SGMII0_RX_FRAG_SIZE	GENMASK(9, 0)
> +
>  #define REG_MC_VLAN_EN			0x2100
>  #define MC_VLAN_EN_MASK			BIT(0)
>  
> diff --git a/include/linux/pcs/pcs-airoha.h b/include/linux/pcs/pcs-airoha.h
> index 07797645ff15..947dbcbc5206 100644
> --- a/include/linux/pcs/pcs-airoha.h
> +++ b/include/linux/pcs/pcs-airoha.h
> @@ -5,7 +5,22 @@
>  
>  /* XFI_MAC */
>  #define AIROHA_PCS_XFI_MAC_XFI_GIB_CFG		0x0
> +#define   AIROHA_PCS_XFI_RX_FRAG_LEN		GENMASK(26, 22)
> +#define   AIROHA_PCS_XFI_TX_FRAG_LEN		GENMASK(21, 17)
> +#define   AIROHA_PCS_XFI_IPG_NUM		GENMASK(15, 10)
>  #define   AIROHA_PCS_XFI_TX_FC_EN		BIT(5)
>  #define   AIROHA_PCS_XFI_RX_FC_EN		BIT(4)
> +#define   AIROHA_PCS_XFI_RXMPI_STOP		BIT(3)
> +#define   AIROHA_PCS_XFI_RXMBI_STOP		BIT(2)
> +#define   AIROHA_PCS_XFI_TXMPI_STOP		BIT(1)
> +#define   AIROHA_PCS_XFI_TXMBI_STOP		BIT(0)
> +#define AIROHA_PCS_XFI_MAC_XFI_LOGIC_RST	0x10
> +#define   AIROHA_PCS_XFI_MAC_LOGIC_RST		BIT(0)
> +#define AIROHA_PCS_XFI_MAC_XFI_MACADDRH		0x60
> +#define   AIROHA_PCS_XFI_MAC_MACADDRH		GENMASK(15, 0)
> +#define AIROHA_PCS_XFI_MAC_XFI_MACADDRL		0x64
> +#define   AIROHA_PCS_XFI_MAC_MACADDRL		GENMASK(31, 0)
> +#define AIROHA_PCS_XFI_MAC_XFI_CNT_CLR		0x100
> +#define   AIROHA_PCS_XFI_GLB_CNT_CLR		BIT(0)
>  
>  #endif /* __LINUX_PCS_AIROHA_H */
> -- 
> 2.48.1
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]