Hello. On 04/14/2015 03:49 AM, Lino Sanfilippo wrote:
+struct ravb_desc { +#ifdef __LITTLE_ENDIAN + u32 ds: 12; /* Descriptor size */ + u32 cc: 12; /* Content control */ + u32 die: 4; /* Descriptor interrupt enable */ + /* 0: disable, other: enable */ + u32 dt: 4; /* Descriptor type */ +#else + u32 dt: 4; /* Descriptor type */ + u32 die: 4; /* Descriptor interrupt enable */ + /* 0: disable, other: enable */ + u32 cc: 12; /* Content control */ + u32 ds: 12; /* Descriptor size */ +#endif + u32 dptr; /* Descriptor pointer */ +}; + +struct ravb_rx_desc { +#ifdef __LITTLE_ENDIAN + u32 ds: 12; /* Descriptor size */ + u32 ei: 1; /* Error indication */ + u32 ps: 2; /* Padding selection */ + u32 tr: 1; /* Truncation indication */ + u32 msc: 8; /* MAC status code */ + u32 die: 4; /* Descriptor interrupt enable */ + /* 0: disable, other: enable */ + u32 dt: 4; /* Descriptor type */ +#else + u32 dt: 4; /* Descriptor type */ + u32 die: 4; /* Descriptor interrupt enable */ + /* 0: disable, other: enable */ + u32 msc: 8; /* MAC status code */ + u32 ps: 2; /* Padding selection */ + u32 ei: 1; /* Error indication */ + u32 tr: 1; /* Truncation indication */ + u32 ds: 12; /* Descriptor size */ +#endif + u32 dptr; /* Descpriptor pointer */ +}; + +struct ravb_ex_rx_desc { +#ifdef __LITTLE_ENDIAN + u32 ds: 12; /* Descriptor size */ + u32 ei: 1; /* Error indication */ + u32 ps: 2; /* Padding selection */ + u32 tr: 1; /* Truncation indication */ + u32 msc: 8; /* MAC status code */ + u32 die: 4; /* Descriptor interrupt enable */ + /* 0: disable, other: enable */ + u32 dt: 4; /* Descriptor type */ +#else + u32 dt: 4; /* Descriptor type */ + u32 die: 4; /* Descriptor interrupt enable */ + /* 0: disable, other: enable */ + u32 msc: 8; /* MAC status code */ + u32 ps: 2; /* Padding selection */ + u32 ei: 1; /* Error indication */ + u32 tr: 1; /* Truncation indication */ + u32 ds: 12; /* Descriptor size */ +#endif + u32 dptr; /* Descpriptor pointer */ + u32 ts_n; /* Timestampe nsec */ + u32 ts_sl; /* Timestamp low */ +#ifdef __LITTLE_ENDIAN + u32 res: 16; /* Reserved bits */ + u32 ts_sh: 16; /* Timestamp high */ +#else + u32 ts_sh: 16; /* Timestamp high */ + u32 res: 16; /* Reserved bits */ +#endif +};
I recall a thread in which the use of bitfields for structs that are shared with the hardware was considered a bad idea (because the compiler is free to reorder the fields). Shift operations are probably a better choice here.
Well, it looks as the compiler is not free to reorder bit fields, and the order is determined by the ABI. Will look into getting rid of them anyway...
[...]
+/* Network device open function for Ethernet AVB */ +static int ravb_open(struct net_device *ndev) +{ + struct ravb_private *priv = netdev_priv(ndev); + int error; + + napi_enable(&priv->napi); + + error = request_irq(ndev->irq, ravb_interrupt, IRQF_SHARED, ndev->name, + ndev); + if (error) { + netdev_err(ndev, "cannot request IRQ\n"); + goto out_napi_off; + } + + /* Descriptor set */ + /* +26 gets the maximum ethernet encapsulation, +7 & ~7 because the + * card needs room to do 8 byte alignment, +2 so we can reserve + * the first 2 bytes, and +16 gets room for the status word from the + * card. + */ + priv->rx_buffer_size = (ndev->mtu <= 1492 ? PKT_BUF_SZ : + (((ndev->mtu + 26 + 7) & ~7) + 2 + 16)); + + error = ravb_ring_init(ndev, RAVB_BE); + if (error) + goto out_free_irq; + error = ravb_ring_init(ndev, RAVB_NC); + if (error) + goto out_free_irq; + + /* Device init */ + error = ravb_dmac_init(ndev); + if (error) + goto out_free_irq; + ravb_emac_init(ndev); + + netif_start_queue(ndev); + + /* PHY control start */ + error = ravb_phy_start(ndev); + if (error) + goto out_free_irq; + + return 0; + +out_free_irq: + free_irq(ndev->irq, ndev);
freeing all the memory allocated in the former avb_ring_init calls is missing.
OK, fixed. The same bug as in sh_eth.c which also needs fixing [...]
+/* Timeout function for Ethernet AVB */ +static void ravb_tx_timeout(struct net_device *ndev) +{ + struct ravb_private *priv = netdev_priv(ndev); + int i, q; + + netif_stop_queue(ndev); + + netif_err(priv, tx_err, ndev, + "transmit timed out, status %8.8x, resetting...\n", + ravb_read(ndev, ISS)); + + /* tx_errors count up */ + ndev->stats.tx_errors++; + + /* Free all the skbuffs */ + for (q = RAVB_BE; q < NUM_RX_QUEUE; q++) { + for (i = 0; i < priv->num_rx_ring[q]; i++) { + dev_kfree_skb(priv->rx_skb[q][i]); + priv->rx_skb[q][i] = NULL; + } + } + for (q = RAVB_BE; q < NUM_TX_QUEUE; q++) { + for (i = 0; i < priv->num_tx_ring[q]; i++) { + dev_kfree_skb(priv->tx_skb[q][i]); + priv->tx_skb[q][i] = NULL; + kfree(priv->tx_buffers[q][i]); + priv->tx_buffers[q][i] = NULL;
Grr, this is just suicidal. :-(
+ } + } + + /* Device init */ + ravb_dmac_init(ndev); + ravb_emac_init(ndev); + netif_start_queue(ndev); +}
Does this really work?
Hardly, especially since the driver wouldn't be able to continue with the aligned TX buffers freed. :-)
At least the hardware should be shut down before the queues are freed, shouldn't it?
The approach was copied from sh_eth.c which also needs fixing. :-(
+/* Packet transmit function for Ethernet AVB */ +static int ravb_start_xmit(struct sk_buff *skb, struct net_device *ndev) +{ + struct ravb_private *priv = netdev_priv(ndev); + struct ravb_tstamp_skb *ts_skb = NULL; + struct ravb_tx_desc *desc; + unsigned long flags; + void *buffer; + u32 entry; + u32 tccr; + int q; + + /* If skb needs TX timestamp, it is handled in network control queue */ + q = (skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) ? RAVB_NC : RAVB_BE; + + spin_lock_irqsave(&priv->lock, flags); + if (priv->cur_tx[q] - priv->dirty_tx[q] >= priv->num_tx_ring[q] - 4) { + if (!ravb_tx_free(ndev, q)) { + netif_warn(priv, tx_queued, ndev, "TX FD exhausted.\n"); + netif_stop_queue(ndev); + spin_unlock_irqrestore(&priv->lock, flags); + return NETDEV_TX_BUSY; + } + } + entry = priv->cur_tx[q] % priv->num_tx_ring[q]; + priv->cur_tx[q]++; + spin_unlock_irqrestore(&priv->lock, flags); + + if (skb_put_padto(skb, ETH_ZLEN)) + return NETDEV_TX_OK; + + priv->tx_skb[q][entry] = skb; + buffer = PTR_ALIGN(priv->tx_buffers[q][entry], RAVB_ALIGN); + memcpy(buffer, skb->data, skb->len); + desc = &priv->tx_ring[q][entry]; + desc->ds = skb->len; + desc->dptr = dma_map_single(&ndev->dev, buffer, skb->len, + DMA_TO_DEVICE); + if (dma_mapping_error(&ndev->dev, desc->dptr)) { + dev_kfree_skb_any(skb); + priv->tx_skb[q][entry] = NULL; + return NETDEV_TX_OK; + } + + /* TX timestamp required */ + if (q == RAVB_NC) { + ts_skb = kmalloc(sizeof(*ts_skb), GFP_ATOMIC); + if (!ts_skb) + return -ENOMEM;
Dma mapping has to be undone.
OK, fixed. Not sure what we should return in this case: error code or NETDEV_TX_OK... [...]
+ /* Descriptor type must be set after all the above writes */ + dma_wmb(); + desc->dt = DT_FSINGLE; + + spin_lock_irqsave(&priv->lock, flags); + tccr = ravb_read(ndev, TCCR); + if (!(tccr & (TCCR_TSRQ0 << q))) + ravb_write(ndev, tccr | (TCCR_TSRQ0 << q), TCCR); + spin_unlock_irqrestore(&priv->lock, flags);
According to memory-barriers.txt this needs a mmiowb prior to unlock (there are still a lot more of those candidates in this driver).
OK, added where it's needed (or not :-)... [...]
+static int ravb_probe(struct platform_device *pdev) +{
[...]
+ ndev->netdev_ops = &ravb_netdev_ops; + + priv->rx_over_errors = 0; + priv->rx_fifo_errors = 0; + for (q = RAVB_BE; q < NUM_RX_QUEUE; q++) { + struct net_device_stats *stats = &priv->stats[q]; + + stats->rx_packets = 0; + stats->tx_packets = 0; + stats->rx_bytes = 0; + stats->tx_bytes = 0; + stats->multicast = 0; + stats->rx_errors = 0; + stats->rx_crc_errors = 0; + stats->rx_frame_errors = 0; + stats->rx_length_errors = 0; + stats->rx_missed_errors = 0; + stats->rx_over_errors = 0; + }
The memory returned by alloc_etherdev is already zeroed so this is not necessary.
OK, fixed (along with duplicate setting of 'ndev->netdev_ops'.
Also maybe it would be better to split the driver into more source files.
Contratrywise, I've merged 3 files (Ethernet driver, PTP driver, and header) into 1.
The result would be much easier to understand and to review. For example all ptp related code could be put into its own file.
OK, will try to split the driver back... Perhaps I should also split the patch accordingly?
Regards, Lino
WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
