# HG changeset patch # User Patrick Bruenn # Date 1404281727 -7200 # Node ID f6a5b3bb05945debf86af8b19c9cc34b2b54d712 # Parent bf5a90b3dd05dc0215ca8d3961c43c4c5022bcb0 Refactoring: - convert next_tx/rx counter into dma_fifo member fifo->next - use POLL_TIME define instead of magic number 100 - remove obsolete tx_fifo_full() diff -r bf5a90b3dd05 -r f6a5b3bb0594 devices/ccat/module.h --- a/devices/ccat/module.h Thu Jun 05 18:12:30 2014 +0200 +++ b/devices/ccat/module.h Wed Jul 02 08:15:27 2014 +0200 @@ -91,14 +91,14 @@ * @data: the bytes of the ethernet frame */ struct ccat_eth_frame { - u32 reserved1; - u32 received:1; - u32 reserved2:31; - u16 length; - u16 reserved3; - u32 sent:1; - u32 reserved4:31; - u64 timestamp; + __le32 reserved1; + __le32 rx_flags; +#define CCAT_FRAME_RECEIVED 0x1 + __le16 length; + __le16 reserved3; + __le32 tx_flags; +#define CCAT_FRAME_SENT 0x1 + __le64 timestamp; u8 data[0x800 - 3 * sizeof(u64)]; #define CCAT_ETH_FRAME_HEAD_LEN offsetof(struct ccat_eth_frame, data) }; @@ -130,8 +130,10 @@ * @dma: information about the associated DMA memory */ struct ccat_eth_dma_fifo { - void (*add) (struct ccat_eth_frame *, struct ccat_eth_dma_fifo *); + void (*add) (struct ccat_eth_dma_fifo *, struct ccat_eth_frame *); void __iomem *reg; + const struct ccat_eth_frame *end; + struct ccat_eth_frame *next; struct ccat_dma dma; }; @@ -174,7 +176,6 @@ * struct ccat_eth_priv - CCAT Ethernet/EtherCAT Master function (netdev) * @ccatdev: pointer to the parent struct ccat_device * @netdev: the net_device structure used by the kernel networking stack - * @next_tx_frame: pointer to the next TX DMA descriptor, which the tx_thread should check for availablity * @info: holds a copy of the CCAT Ethernet/EtherCAT Master function information block (read from PCI config space) * @reg: register addresses in PCI config space of the Ethernet/EtherCAT Master function * @rx_fifo: DMA fifo used for RX DMA descriptors @@ -188,7 +189,6 @@ struct ccat_eth_priv { const struct ccat_device *ccatdev; struct net_device *netdev; - const struct ccat_eth_frame *next_tx_frame; struct ccat_info_block info; struct ccat_eth_register reg; struct ccat_eth_dma_fifo rx_fifo; @@ -205,8 +205,6 @@ void (*kfree_skb_any) (struct sk_buff * skb); void (*start_queue) (struct net_device * netdev); void (*stop_queue) (struct net_device * netdev); - void (*tx_fifo_full) (struct ccat_eth_priv * priv, - const struct ccat_eth_frame * frame); void (*unregister) (struct net_device * netdev); }; diff -r bf5a90b3dd05 -r f6a5b3bb0594 devices/ccat/netdev.c --- a/devices/ccat/netdev.c Thu Jun 05 18:12:30 2014 +0200 +++ b/devices/ccat/netdev.c Wed Jul 02 08:15:27 2014 +0200 @@ -19,11 +19,9 @@ */ #include -#include #include #include #include -#include #include "module.h" #include "netdev.h" @@ -46,6 +44,24 @@ }; #define FIFO_LENGTH 64 +#define POLL_TIME ktime_set(0, 100 * NSEC_PER_USEC) + +/** + * Helper to check if frame in tx dma memory was already marked as sent by CCAT + */ +static inline bool ccat_eth_frame_sent(const struct ccat_eth_frame *const frame) +{ + return le32_to_cpu(frame->tx_flags) & CCAT_FRAME_SENT; +} + +/** + * Helper to check if frame in tx dma memory was already marked as sent by CCAT + */ +static inline bool ccat_eth_frame_received(const struct ccat_eth_frame *const + frame) +{ + return le32_to_cpu(frame->rx_flags) & CCAT_FRAME_RECEIVED; +} static void ecdev_kfree_skb_any(struct sk_buff *skb) { @@ -75,12 +91,6 @@ /* dummy called if nothing has to be done in EtherCAT operation mode */ } -static void ecdev_tx_fifo_full(struct ccat_eth_priv *const priv, - const struct ccat_eth_frame *const frame) -{ - /* we are polled -> there is nothing we can do in EtherCAT mode */ -} - static void unregister_ecdev(struct net_device *const netdev) { struct ccat_eth_priv *const priv = netdev_priv(netdev); @@ -88,47 +98,44 @@ ecdev_withdraw(priv->ecdev); } -typedef void (*fifo_add_function) (struct ccat_eth_frame *, - struct ccat_eth_dma_fifo *); - -static void ccat_eth_rx_fifo_add(struct ccat_eth_frame *frame, - struct ccat_eth_dma_fifo *fifo) +static void ccat_eth_fifo_inc(struct ccat_eth_dma_fifo *fifo) +{ + if (++fifo->next >= fifo->end) + fifo->next = fifo->dma.virt; +} + +typedef void (*fifo_add_function) (struct ccat_eth_dma_fifo *, + struct ccat_eth_frame *); + +static void ccat_eth_rx_fifo_add(struct ccat_eth_dma_fifo *fifo, + struct ccat_eth_frame *frame) { const size_t offset = ((void *)(frame) - fifo->dma.virt); const u32 addr_and_length = (1 << 31) | offset; - frame->received = 0; + frame->rx_flags = cpu_to_le32(0); iowrite32(addr_and_length, fifo->reg); } -static void ccat_eth_tx_fifo_add_free(struct ccat_eth_frame *frame, - struct ccat_eth_dma_fifo *fifo) +static void ccat_eth_tx_fifo_add_free(struct ccat_eth_dma_fifo *fifo, + struct ccat_eth_frame *frame) { /* mark frame as ready to use for tx */ - frame->sent = 1; -} - -static void ccat_eth_tx_fifo_full(struct ccat_eth_priv *const priv, - const struct ccat_eth_frame *const frame) -{ - priv->stop_queue(priv->netdev); - priv->next_tx_frame = frame; + frame->tx_flags = cpu_to_le32(CCAT_FRAME_SENT); } static void ccat_eth_dma_fifo_reset(struct ccat_eth_dma_fifo *fifo) { - struct ccat_eth_frame *frame = fifo->dma.virt; - const struct ccat_eth_frame *const end = frame + FIFO_LENGTH; - /* reset hw fifo */ iowrite32(0, fifo->reg + 0x8); wmb(); if (fifo->add) { - while (frame < end) { - fifo->add(frame, fifo); - ++frame; - } + fifo->next = fifo->dma.virt; + do { + fifo->add(fifo, fifo->next); + ccat_eth_fifo_inc(fifo); + } while (fifo->next != fifo->dma.virt); } } @@ -144,6 +151,7 @@ return -1; } fifo->add = add; + fifo->end = ((struct ccat_eth_frame *)fifo->dma.virt) + FIFO_LENGTH; fifo->reg = fifo_reg; return 0; } @@ -212,10 +220,8 @@ static netdev_tx_t ccat_eth_start_xmit(struct sk_buff *skb, struct net_device *dev) { - static size_t next = 0; - struct ccat_eth_priv *const priv = netdev_priv(dev); - struct ccat_eth_frame *const frame = - ((struct ccat_eth_frame *)priv->tx_fifo.dma.virt); + struct ccat_eth_priv *const priv = netdev_priv(dev); + struct ccat_eth_dma_fifo *const fifo = &priv->tx_fifo; u32 addr_and_length; if (skb_is_nonlinear(skb)) { @@ -225,37 +231,40 @@ return NETDEV_TX_OK; } - if (skb->len > sizeof(frame->data)) { + if (skb->len > sizeof(fifo->next->data)) { pr_warn("skb.len %llu exceeds dma buffer %llu -> drop frame.\n", - (u64) skb->len, (u64) sizeof(frame->data)); + (u64) skb->len, (u64) sizeof(fifo->next->data)); atomic64_inc(&priv->tx_dropped); priv->kfree_skb_any(skb); return NETDEV_TX_OK; } - if (!frame[next].sent) { + if (!ccat_eth_frame_sent(fifo->next)) { netdev_err(dev, "BUG! Tx Ring full when queue awake!\n"); - ccat_eth_tx_fifo_full(priv, &frame[next]); + priv->stop_queue(priv->netdev); return NETDEV_TX_BUSY; } /* prepare frame in DMA memory */ - frame[next].sent = 0; - frame[next].length = skb->len; - memcpy(frame[next].data, skb->data, skb->len); + fifo->next->tx_flags = cpu_to_le32(0); + fifo->next->length = cpu_to_le16(skb->len); + memcpy(fifo->next->data, skb->data, skb->len); + + /* Queue frame into CCAT TX-FIFO, CCAT ignores the first 8 bytes of the tx descriptor */ + addr_and_length = offsetof(struct ccat_eth_frame, length); + addr_and_length += ((void*)fifo->next - fifo->dma.virt); + addr_and_length += ((skb->len + CCAT_ETH_FRAME_HEAD_LEN) / 8) << 24; + iowrite32(addr_and_length, priv->reg.tx_fifo); + + /* update stats */ + atomic64_add(skb->len, &priv->tx_bytes); priv->kfree_skb_any(skb); - addr_and_length = 8 + (next * sizeof(*frame)); - addr_and_length += - ((frame[next].length + CCAT_ETH_FRAME_HEAD_LEN) / 8) << 24; - iowrite32(addr_and_length, priv->reg.tx_fifo); /* add to DMA fifo */ - atomic64_add(frame[next].length, &priv->tx_bytes); /* update stats */ - - next = (next + 1) % FIFO_LENGTH; + ccat_eth_fifo_inc(fifo); /* stop queue if tx ring is full */ - if (!frame[next].sent) { - ccat_eth_tx_fifo_full(priv, &frame[next]); + if (!ccat_eth_frame_sent(fifo->next)) { + priv->stop_queue(priv->netdev); } return NETDEV_TX_OK; } @@ -277,13 +286,11 @@ ccat_eth_start_xmit(skb, dev); } -static const size_t CCATRXDESC_HEADER_LEN = 20; static void ccat_eth_receive(struct net_device *const dev, - const struct ccat_eth_frame *const frame) -{ - struct ccat_eth_priv *const priv = netdev_priv(dev); - const size_t len = frame->length - CCATRXDESC_HEADER_LEN; - struct sk_buff *skb = dev_alloc_skb(len + NET_IP_ALIGN); + const void *const data, const size_t len) +{ + struct sk_buff *const skb = dev_alloc_skb(len + NET_IP_ALIGN); + struct ccat_eth_priv *const priv = netdev_priv(dev); if (!skb) { pr_info("%s() out of memory :-(\n", __FUNCTION__); @@ -292,7 +299,7 @@ } skb->dev = dev; skb_reserve(skb, NET_IP_ALIGN); - skb_copy_to_linear_data(skb, frame->data, len); + skb_copy_to_linear_data(skb, data, len); skb_put(skb, len); skb->protocol = eth_type_trans(skb, dev); skb->ip_summed = CHECKSUM_UNNECESSARY; @@ -300,7 +307,7 @@ netif_rx(skb); } -static void ccat_eth_link_down(struct net_device *dev) +static void ccat_eth_link_down(struct net_device *const dev) { struct ccat_eth_priv *const priv = netdev_priv(dev); @@ -355,41 +362,30 @@ } /** - * Rx handler in EtherCAT operation mode - * priv->ecdev should always be valid! - */ + * Poll for available rx dma descriptors in ethernet operating mode + */ +static void poll_rx(struct ccat_eth_priv *const priv) +{ + static const size_t overhead = CCAT_ETH_FRAME_HEAD_LEN - 4; + struct ccat_eth_dma_fifo *const fifo = &priv->rx_fifo; + + /* TODO omit possible deadlock in situations with heavy traffic */ + while (ccat_eth_frame_received(fifo->next)) { + const size_t len = le16_to_cpu(fifo->next->length) - overhead; + if (priv->ecdev) { + ecdev_receive(priv->ecdev, fifo->next->data, len); + } else { + ccat_eth_receive(priv->netdev, fifo->next->data, len); + } + ccat_eth_rx_fifo_add(fifo, fifo->next); + ccat_eth_fifo_inc(fifo); + } +} + static void ec_poll_rx(struct net_device *dev) { - static size_t next = 0; - struct ccat_eth_priv *const priv = netdev_priv(dev); - struct ccat_eth_frame *frame = - ((struct ccat_eth_frame *)priv->rx_fifo.dma.virt) + next; - if (frame->received) { - ecdev_receive(priv->ecdev, frame->data, - frame->length - CCATRXDESC_HEADER_LEN); - frame->received = 0; - ccat_eth_rx_fifo_add(frame, &priv->rx_fifo); - next = (next + 1) % FIFO_LENGTH; - } else { - //TODO dev_warn(&dev->dev, "%s(): frame was not ready\n", __FUNCTION__); - } -} - -/** - * Poll for available rx dma descriptors in ethernet operating mode - */ -static void poll_rx(struct ccat_eth_priv *const priv) -{ - struct ccat_eth_frame *const frame = priv->rx_fifo.dma.virt; - static size_t next = 0; - - /* TODO omit possible deadlock in situations with heavy traffic */ - while (frame[next].received) { - ccat_eth_receive(priv->netdev, frame + next); - frame[next].received = 0; - ccat_eth_rx_fifo_add(frame + next, &priv->rx_fifo); - next = (next + 1) % FIFO_LENGTH; - } + struct ccat_eth_priv *const priv = netdev_priv(dev); + poll_rx(priv); } /** @@ -397,8 +393,7 @@ */ static void poll_tx(struct ccat_eth_priv *const priv) { - if (priv->next_tx_frame && priv->next_tx_frame->sent) { - priv->next_tx_frame = NULL; + if (ccat_eth_frame_sent(priv->tx_fifo.next)) { netif_wake_queue(priv->netdev); } } @@ -409,14 +404,15 @@ */ static enum hrtimer_restart poll_timer_callback(struct hrtimer *timer) { - struct ccat_eth_priv *priv = container_of(timer, struct ccat_eth_priv, - poll_timer); + struct ccat_eth_priv *const priv = + container_of(timer, struct ccat_eth_priv, poll_timer); poll_link(priv); - if(!priv->ecdev) + if(!priv->ecdev) { poll_rx(priv); - poll_tx(priv); - hrtimer_forward_now(timer, ktime_set(0, 100 * NSEC_PER_USEC)); + poll_tx(priv); + } + hrtimer_forward_now(timer, POLL_TIME); return HRTIMER_RESTART; } @@ -464,8 +460,7 @@ hrtimer_init(&priv->poll_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); priv->poll_timer.function = poll_timer_callback; - hrtimer_start(&priv->poll_timer, ktime_set(0, 100000), - HRTIMER_MODE_REL); + hrtimer_start(&priv->poll_timer, POLL_TIME, HRTIMER_MODE_REL); return 0; } @@ -475,7 +470,6 @@ priv->stop_queue(dev); hrtimer_cancel(&priv->poll_timer); - netdev_info(dev, "stopped.\n"); return 0; } @@ -519,7 +513,6 @@ priv->kfree_skb_any = ecdev_kfree_skb_any; priv->start_queue = ecdev_nop; priv->stop_queue = ecdev_nop; - priv->tx_fifo_full = ecdev_tx_fifo_full; priv->unregister = unregister_ecdev; priv->carrier_off(netdev); @@ -540,7 +533,6 @@ priv->kfree_skb_any = dev_kfree_skb_any; priv->start_queue = netif_start_queue; priv->stop_queue = netif_stop_queue; - priv->tx_fifo_full = ccat_eth_tx_fifo_full; priv->unregister = unregister_netdev; priv->carrier_off(netdev); @@ -559,5 +551,4 @@ priv->unregister(priv->netdev); ccat_eth_priv_free_dma(priv); free_netdev(priv->netdev); - pr_debug("%s(): done\n", __FUNCTION__); -} +}