Skip to content

Commit

Permalink
net: axienet: Introduce dmaengine support
Browse files Browse the repository at this point in the history
Add dmaengine framework to communicate with the xilinx DMAengine
driver(AXIDMA).

Axi ethernet driver uses separate channels for transmit and receive.
Add support for these channels to handle TX and RX with skb and
appropriate callbacks. Also add axi ethernet core interrupt for
dmaengine framework support.

The dmaengine framework was extended for metadata API support.
However it still needs further enhancements to make it well suited for
ethernet usecases. The ethernet features i.e ethtool set/get of DMA IP
properties, ndo_poll_controller,(mentioned in TODO) are not supported
and it requires follow-up discussions.

dmaengine support has a dependency on xilinx_dma as it uses
xilinx_vdma_channel_set_config() API to reset the DMA IP
which internally reset MAC prior to accessing MDIO.

Benchmark with netperf:

xilinx-zcu102-20232:~$ netperf -H 192.168.10.20 -t TCP_STREAM
MIGRATED TCP STREAM TEST from 0.0.0.0 (0.0.0.0) port 0 AF_INET
to 192.168.10.20 () port 0 AF_INET
Recv   Send    Send
Socket Socket  Message  Elapsed
Size   Size    Size     Time     Throughput
bytes  bytes   bytes    secs.    10^6bits/sec

131072  16384  16384    10.02     886.69

xilinx-zcu102-20232:~$ netperf -H 192.168.10.20 -t UDP_STREAM
MIGRATED UDP STREAM TEST from 0.0.0.0 (0.0.0.0) port 0 AF_INET
to 192.168.10.20 () port 0 AF_INET
Socket  Message  Elapsed      Messages
Size    Size     Time         Okay Errors   Throughput
bytes   bytes    secs            #      #   10^6bits/sec

212992   65507   10.00       15851      0     830.66
212992           10.00       15851            830.66

Signed-off-by: Radhey Shyam Pandey <radhey.shyam.pandey@amd.com>
Link: https://lore.kernel.org/r/1700074613-1977070-4-git-send-email-radhey.shyam.pandey@amd.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Radhey Shyam Pandey authored and kuba-moo committed Nov 21, 2023
1 parent 6b1b40f commit 6a91b84
Show file tree
Hide file tree
Showing 3 changed files with 425 additions and 2 deletions.
1 change: 1 addition & 0 deletions drivers/net/ethernet/xilinx/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ config XILINX_EMACLITE
config XILINX_AXI_EMAC
tristate "Xilinx 10/100/1000 AXI Ethernet support"
depends on HAS_IOMEM
depends on XILINX_DMA
select PHYLINK
help
This driver supports the 10/100/1000 Ethernet from Xilinx for the
Expand Down
33 changes: 33 additions & 0 deletions drivers/net/ethernet/xilinx/xilinx_axienet.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <linux/interrupt.h>
#include <linux/if_vlan.h>
#include <linux/phylink.h>
#include <linux/skbuff.h>

/* Packet size info */
#define XAE_HDR_SIZE 14 /* Size of Ethernet header */
Expand Down Expand Up @@ -378,6 +379,22 @@ struct axidma_bd {

#define XAE_NUM_MISC_CLOCKS 3

/**
* struct skbuf_dma_descriptor - skb for each dma descriptor
* @sgl: Pointer for sglist.
* @desc: Pointer to dma descriptor.
* @dma_address: dma address of sglist.
* @skb: Pointer to SKB transferred using DMA
* @sg_len: number of entries in the sglist.
*/
struct skbuf_dma_descriptor {
struct scatterlist sgl[MAX_SKB_FRAGS + 1];
struct dma_async_tx_descriptor *desc;
dma_addr_t dma_address;
struct sk_buff *skb;
int sg_len;
};

/**
* struct axienet_local - axienet private per device data
* @ndev: Pointer for net_device to which it will be attached.
Expand Down Expand Up @@ -436,6 +453,14 @@ struct axidma_bd {
* @coalesce_count_tx: Store the irq coalesce on TX side.
* @coalesce_usec_tx: IRQ coalesce delay for TX
* @use_dmaengine: flag to check dmaengine framework usage.
* @tx_chan: TX DMA channel.
* @rx_chan: RX DMA channel.
* @tx_skb_ring: Pointer to TX skb ring buffer array.
* @rx_skb_ring: Pointer to RX skb ring buffer array.
* @tx_ring_head: TX skb ring buffer head index.
* @tx_ring_tail: TX skb ring buffer tail index.
* @rx_ring_head: RX skb ring buffer head index.
* @rx_ring_tail: RX skb ring buffer tail index.
*/
struct axienet_local {
struct net_device *ndev;
Expand Down Expand Up @@ -501,6 +526,14 @@ struct axienet_local {
u32 coalesce_count_tx;
u32 coalesce_usec_tx;
u8 use_dmaengine;
struct dma_chan *tx_chan;
struct dma_chan *rx_chan;
struct skbuf_dma_descriptor **tx_skb_ring;
struct skbuf_dma_descriptor **rx_skb_ring;
int tx_ring_head;
int tx_ring_tail;
int rx_ring_head;
int rx_ring_tail;
};

/**
Expand Down
Loading

0 comments on commit 6a91b84

Please sign in to comment.