[PATCH v2] Add support for 10G Base-R IP core version to xilinx_axi_enet driver

[Michal Simek]

Hi,

still please fix the subject.
The best is to run git log drivers/net/xilinx_axi_emac.c
and you will see that some tags are used.
net: xilinx: axi_emac:

Then your subject can be just
net: xilinx: axi_emac: Add support for 10G Base-R IP


On 15. 12. 20 19:27, Alessandro Temil wrote:
> From: Alessandro Temil <atemil at waymo.com>

Here should be commit message to describe what it is. You can also put
there HW IP version and some generic features.

Below are just small things.

> 
> Signed-off-by: Alessandro Temil <atemil at waymo.com>
> ---
>  drivers/net/xilinx_axi_emac.c | 139 ++++++++++++++++++++++++++++------
>  1 file changed, 116 insertions(+), 23 deletions(-)
> 
> diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c
> index 8af3711204..b2f48324ed 100644
> --- a/drivers/net/xilinx_axi_emac.c
> +++ b/drivers/net/xilinx_axi_emac.c
> @@ -1,5 +1,6 @@
>  // SPDX-License-Identifier: GPL-2.0+
>  /*
> + * Copyright (C) 2020 Waymo LLC
>   * Copyright (C) 2011 Michal Simek <monstr at monstr.eu>
>   * Copyright (C) 2011 PetaLogix
>   * Copyright (C) 2010 Xilinx, Inc. All rights reserved.
> @@ -72,10 +73,25 @@ DECLARE_GLOBAL_DATA_PTR;
>  #define XAXIDMA_BD_CTRL_TXSOF_MASK	0x08000000 /* First tx packet */
>  #define XAXIDMA_BD_CTRL_TXEOF_MASK	0x04000000 /* Last tx packet */
>  
> +/* Bitmasks for the XXV Ethernet MAC */
> +#define XXV_TC_TX_MASK		BIT(0)
> +#define XXV_TC_FCS_MASK		BIT(1)
> +#define XXV_RCW1_RX_MASK	BIT(0)
> +#define XXV_RCW1_FCS_MASK	BIT(1)
> +
>  #define DMAALIGN	128
>  
> +#define XXV_MIN_PKT_SIZE 60
> +
>  static u8 rxframe[PKTSIZE_ALIGN] __attribute((aligned(DMAALIGN)));
>  
> +static u8 txminframe[XXV_MIN_PKT_SIZE] __attribute((aligned(DMAALIGN)));
> +
> +enum emac_variant {
> +	EMAC_1G = 0,
> +	EMAC_10G_25G = 1,
> +};
> +
>  /* Reflect dma offsets */
>  struct axidma_reg {
>  	u32 control; /* DMACR */
> @@ -97,6 +113,7 @@ struct axidma_priv {
>  	struct mii_dev *bus;
>  	u8 eth_hasnobuf;
>  	int phy_of_handle;
> +	enum emac_variant mactype;
>  };
>  
>  /* BD descriptors */
> @@ -143,6 +160,14 @@ struct axi_regs {
>  	u32 uaw1; /* 0x704: Unicast address word 1 */
>  };
>  
> +struct xxv_axi_regs {
> +	u32 gt_reset; /* 0x0 */
> +	u32 reserved[2];
> +	u32 tc;       /* 0xC: Tx Configuration */
> +	u32 reserved2;
> +	u32 rcw1;     /* 0x14: Rx Configuration Word 1 */
> +};
> +
>  /* Use MII register 1 (MII status register) to detect PHY */
>  #define PHY_DETECT_REG  1
>  
> @@ -191,6 +216,9 @@ static inline void axienet_dma_write(struct axidma_bd *bd, u32 *desc)
>  static u32 phyread(struct axidma_priv *priv, u32 phyaddress, u32 registernum,
>  		   u16 *val)
>  {
> +	if (priv->mactype == EMAC_10G_25G)
> +		return 0;
> +
>  	struct axi_regs *regs = priv->iobase;
>  	u32 mdioctrlreg = 0;
>  
> @@ -217,6 +245,9 @@ static u32 phyread(struct axidma_priv *priv, u32 phyaddress, u32 registernum,
>  static u32 phywrite(struct axidma_priv *priv, u32 phyaddress, u32 registernum,
>  		    u32 data)
>  {
> +	if (priv->mactype == EMAC_10G_25G)
> +		return 0;
> +
>  	struct axi_regs *regs = priv->iobase;
>  	u32 mdioctrlreg = 0;
>  
> @@ -374,6 +405,31 @@ static void axiemac_stop(struct udevice *dev)
>  	debug("axiemac: Halted\n");
>  }
>  
> +static int xxv_axi_ethernet_init(struct axidma_priv *priv)
> +{
> +	struct xxv_axi_regs *regs = priv->iobase;
> +

remove this newline here.

> +	int val;
> +
> +	val = readl(&regs->rcw1) & ~XXV_RCW1_FCS_MASK;
> +	val |= XXV_RCW1_FCS_MASK;
> +	writel(val, &regs->rcw1);
> +
> +	val = readl(&regs->tc) & ~XXV_TC_FCS_MASK;
> +	val |= XXV_TC_FCS_MASK;
> +	writel(val, &regs->tc);
> +
> +	val = readl(&regs->tc) & ~XXV_TC_TX_MASK;
> +	val |= XXV_TC_TX_MASK;
> +	writel(val, &regs->tc);
> +
> +	val = readl(&regs->rcw1) & ~XXV_RCW1_RX_MASK;
> +	val |= XXV_RCW1_RX_MASK;
> +	writel(val, &regs->rcw1);
> +
> +	return 0;
> +}
> +
>  static int axi_ethernet_init(struct axidma_priv *priv)
>  {
>  	struct axi_regs *regs = priv->iobase;
> @@ -427,6 +483,10 @@ static int axiemac_write_hwaddr(struct udevice *dev)
>  {
>  	struct eth_pdata *pdata = dev_get_platdata(dev);
>  	struct axidma_priv *priv = dev_get_priv(dev);
> +
> +	if (priv->mactype == EMAC_10G_25G)
> +		return 0;
> +
>  	struct axi_regs *regs = priv->iobase;
>  
>  	/* Set the MAC address */
> @@ -466,7 +526,6 @@ static void axi_dma_init(struct axidma_priv *priv)
>  static int axiemac_start(struct udevice *dev)
>  {
>  	struct axidma_priv *priv = dev_get_priv(dev);
> -	struct axi_regs *regs = priv->iobase;
>  	u32 temp;
>  
>  	debug("axiemac: Init started\n");
> @@ -479,8 +538,13 @@ static int axiemac_start(struct udevice *dev)
>  	axi_dma_init(priv);
>  
>  	/* Initialize AxiEthernet hardware. */
> -	if (axi_ethernet_init(priv))
> -		return -1;
> +	if (priv->mactype == EMAC_1G) {
> +		if (axi_ethernet_init(priv))
> +			return -1;
> +	} else {
> +		if (xxv_axi_ethernet_init(priv))
> +			return -1;
> +	}
>  
>  	/* Disable all RX interrupts before RxBD space setup */
>  	temp = readl(&priv->dmarx->control);
> @@ -514,15 +578,28 @@ static int axiemac_start(struct udevice *dev)
>  	/* Rx BD is ready - start */
>  	axienet_dma_write(&rx_bd, &priv->dmarx->tail);
>  
> -	/* Enable TX */
> -	writel(XAE_TC_TX_MASK, &regs->tc);
> -	/* Enable RX */
> -	writel(XAE_RCW1_RX_MASK, &regs->rcw1);
> -
> -	/* PHY setup */
> -	if (!setup_phy(dev)) {
> -		axiemac_stop(dev);
> -		return -1;
> +	if (priv->mactype == EMAC_1G) {
> +		struct axi_regs *regs = priv->iobase;

newline

> +		/* Enable TX */
> +		writel(XAE_TC_TX_MASK, &regs->tc);
> +		/* Enable RX */
> +		writel(XAE_RCW1_RX_MASK, &regs->rcw1);
> +
> +		/* PHY setup */
> +		if (!setup_phy(dev)) {
> +			axiemac_stop(dev);
> +			return -1;
> +		}
> +	} else {
> +		struct xxv_axi_regs *regs = priv->iobase;

newline

> +		/* Enable TX */
> +		temp = readl(&regs->tc) & ~XXV_TC_TX_MASK;
> +		temp |= XXV_TC_TX_MASK;
> +		writel(temp, &regs->tc);
> +		/* Enable RX */
> +		temp = readl(&regs->rcw1) & ~XXV_RCW1_RX_MASK;
> +		temp |= XXV_RCW1_RX_MASK;
> +		writel(temp, &regs->rcw1);
>  	}
>  
>  	debug("axiemac: Init complete\n");
> @@ -537,6 +614,14 @@ static int axiemac_send(struct udevice *dev, void *ptr, int len)
>  	if (len > PKTSIZE_ALIGN)
>  		len = PKTSIZE_ALIGN;
>  
> +	/* If size is less than min packet size, pad to min size */
> +	if (priv->mactype == EMAC_10G_25G && len < XXV_MIN_PKT_SIZE) {
> +		memset(txminframe, 0, XXV_MIN_PKT_SIZE);
> +		memcpy(txminframe, ptr, len);
> +		len = XXV_MIN_PKT_SIZE;
> +		ptr = txminframe;
> +	}
> +
>  	/* Flush packet to main memory to be trasfered by DMA */
>  	flush_cache((phys_addr_t)ptr, len);
>  
> @@ -621,7 +706,7 @@ static int axiemac_recv(struct udevice *dev, int flags, uchar **packetp)
>  	temp = readl(&priv->dmarx->control);
>  	temp &= ~XAXIDMA_IRQ_ALL_MASK;
>  	writel(temp, &priv->dmarx->control);
> -	if (!priv->eth_hasnobuf)
> +	if (!priv->eth_hasnobuf && priv->mactype == EMAC_1G)
>  		length = rx_bd.app4 & 0xFFFF; /* max length mask */
>  	else
>  		length = rx_bd.status & XAXIDMA_BD_STS_ACTUAL_LEN_MASK;
> @@ -701,7 +786,8 @@ static int axi_emac_probe(struct udevice *dev)
>  	if (ret)
>  		return ret;
>  
> -	axiemac_phy_init(dev);
> +	if (priv->interface != -1)
> +		axiemac_phy_init(dev);
>  
>  	return 0;
>  }
> @@ -732,10 +818,10 @@ static int axi_emac_ofdata_to_platdata(struct udevice *dev)
>  	struct axidma_priv *priv = dev_get_priv(dev);
>  	int node = dev_of_offset(dev);
>  	int offset = 0;
> -	const char *phy_mode;
>  
>  	pdata->iobase = dev_read_addr(dev);
>  	priv->iobase = (struct axi_regs *)pdata->iobase;
> +	priv->mactype = dev_get_driver_data(dev);
>  
>  	offset = fdtdec_lookup_phandle(gd->fdt_blob, node,
>  				       "axistream-connected");
> @@ -760,14 +846,20 @@ static int axi_emac_ofdata_to_platdata(struct udevice *dev)
>  		priv->phy_of_handle = offset;
>  	}
>  
> -	phy_mode = fdt_getprop(gd->fdt_blob, node, "phy-mode", NULL);
> -	if (phy_mode)
> -		pdata->phy_interface = phy_get_interface_by_name(phy_mode);
> -	if (pdata->phy_interface == -1) {
> -		printf("%s: Invalid PHY interface '%s'\n", __func__, phy_mode);
> -		return -EINVAL;
> +	if (priv->mactype == EMAC_1G) {
> +		const char *phy_mode;
> +
> +		phy_mode = fdt_getprop(gd->fdt_blob, node, "phy-mode", NULL);
> +		if (phy_mode)
> +			pdata->phy_interface = phy_get_interface_by_name(phy_mode);
> +		if (pdata->phy_interface == -1) {
> +			printf("%s: Invalid PHY interface '%s'\n", __func__, phy_mode);
> +			return -EINVAL;
> +		}
> +		priv->interface = pdata->phy_interface;
> +	} else {
> +		priv->interface = -1;

nit: Better to init before this code by default to avoid this else.

>  	}
> -	priv->interface = pdata->phy_interface;
>  
>  	priv->eth_hasnobuf = fdtdec_get_bool(gd->fdt_blob, node,
>  					     "xlnx,eth-hasnobuf");
> @@ -779,7 +871,8 @@ static int axi_emac_ofdata_to_platdata(struct udevice *dev)
>  }
>  
>  static const struct udevice_id axi_emac_ids[] = {
> -	{ .compatible = "xlnx,axi-ethernet-1.00.a" },
> +	{ .compatible = "xlnx,axi-ethernet-1.00.a", .data = (uintptr_t)EMAC_1G },
> +	{ .compatible = "xlnx,xxv-ethernet-1.0", .data = (uintptr_t)EMAC_10G_25G },
>  	{ }
>  };
>  
> 

Ashok: Please prepare HW design and please test it and let us know.

Thanks,
Michal