* [PATCH v2 net-next 0/3] net: stmmac: adding multiple buffers and routing
@ 2017-03-17 16:11 Joao Pinto
2017-03-17 16:11 ` [PATCH v2 net-next 1/3] net: stmmac: enable multiple buffers Joao Pinto
` (3 more replies)
0 siblings, 4 replies; 21+ messages in thread
From: Joao Pinto @ 2017-03-17 16:11 UTC (permalink / raw)
To: davem; +Cc: peppe.cavallaro, alexandre.torgue, f.fainelli, netdev, Joao Pinto
As agreed with David Miller, this patch-set is the third and last to enable
multiple queues in stmmac.
This third one focuses on:
a) Enable multiple buffering to the driver and queue independent data
b) Configuration of RX and TX queues' priority
c) Configuration of RX queues' routing
Joao Pinto (3):
net: stmmac: enable multiple buffers
net: stmmac: TX and RX queue priority configuration
net: stmmac: RX queue routing configuration
Documentation/devicetree/bindings/net/stmmac.txt | 11 +
drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 45 +-
drivers/net/ethernet/stmicro/stmmac/common.h | 21 +
drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 29 +
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 71 +
drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 46 +-
drivers/net/ethernet/stmicro/stmmac/stmmac.h | 49 +-
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1379 ++++++++++++++------
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 7 +
.../net/ethernet/stmicro/stmmac/stmmac_platform.c | 30 +
include/linux/stmmac.h | 5 +
11 files changed, 1220 insertions(+), 473 deletions(-)
--
2.9.3
^ permalink raw reply [flat|nested] 21+ messages in thread* [PATCH v2 net-next 1/3] net: stmmac: enable multiple buffers 2017-03-17 16:11 [PATCH v2 net-next 0/3] net: stmmac: adding multiple buffers and routing Joao Pinto @ 2017-03-17 16:11 ` Joao Pinto 2017-03-23 17:17 ` [v2,net-next,1/3] " Thierry Reding 2017-03-17 16:11 ` [PATCH v2 net-next 2/3] net: stmmac: TX and RX queue priority configuration Joao Pinto ` (2 subsequent siblings) 3 siblings, 1 reply; 21+ messages in thread From: Joao Pinto @ 2017-03-17 16:11 UTC (permalink / raw) To: davem; +Cc: peppe.cavallaro, alexandre.torgue, f.fainelli, netdev, Joao Pinto This patch creates 2 new structures (stmmac_tx_queue and stmmac_rx_queue) in include/linux/stmmac.h, enabling that each RX and TX queue has its own buffers and data. Signed-off-by: Joao Pinto <jpinto@synopsys.com> --- changes v1->v2: - just to keep up version drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 45 +- drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 46 +- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 49 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1306 ++++++++++++++------- 4 files changed, 973 insertions(+), 473 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/chain_mode.c b/drivers/net/ethernet/stmicro/stmmac/chain_mode.c index 01a8c02..37881f8 100644 --- a/drivers/net/ethernet/stmicro/stmmac/chain_mode.c +++ b/drivers/net/ethernet/stmicro/stmmac/chain_mode.c @@ -26,12 +26,15 @@ static int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum) { - struct stmmac_priv *priv = (struct stmmac_priv *)p; - unsigned int entry = priv->cur_tx; - struct dma_desc *desc = priv->dma_tx + entry; + struct stmmac_tx_queue *tx_q = (struct stmmac_tx_queue *)p; unsigned int nopaged_len = skb_headlen(skb); + struct stmmac_priv *priv = tx_q->priv_data; + unsigned int entry = tx_q->cur_tx; unsigned int bmax, des2; unsigned int i = 1, len; + struct dma_desc *desc; + + desc = tx_q->dma_tx + entry; if (priv->plat->enh_desc) bmax = BUF_SIZE_8KiB; @@ -45,16 +48,16 @@ static int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum) desc->des2 = cpu_to_le32(des2); if (dma_mapping_error(priv->device, des2)) return -1; - priv->tx_skbuff_dma[entry].buf = des2; - priv->tx_skbuff_dma[entry].len = bmax; + tx_q->tx_skbuff_dma[entry].buf = des2; + tx_q->tx_skbuff_dma[entry].len = bmax; /* do not close the descriptor and do not set own bit */ priv->hw->desc->prepare_tx_desc(desc, 1, bmax, csum, STMMAC_CHAIN_MODE, 0, false); while (len != 0) { - priv->tx_skbuff[entry] = NULL; + tx_q->tx_skbuff[entry] = NULL; entry = STMMAC_GET_ENTRY(entry, DMA_TX_SIZE); - desc = priv->dma_tx + entry; + desc = tx_q->dma_tx + entry; if (len > bmax) { des2 = dma_map_single(priv->device, @@ -63,8 +66,8 @@ static int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum) desc->des2 = cpu_to_le32(des2); if (dma_mapping_error(priv->device, des2)) return -1; - priv->tx_skbuff_dma[entry].buf = des2; - priv->tx_skbuff_dma[entry].len = bmax; + tx_q->tx_skbuff_dma[entry].buf = des2; + tx_q->tx_skbuff_dma[entry].len = bmax; priv->hw->desc->prepare_tx_desc(desc, 0, bmax, csum, STMMAC_CHAIN_MODE, 1, false); @@ -77,8 +80,8 @@ static int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum) desc->des2 = cpu_to_le32(des2); if (dma_mapping_error(priv->device, des2)) return -1; - priv->tx_skbuff_dma[entry].buf = des2; - priv->tx_skbuff_dma[entry].len = len; + tx_q->tx_skbuff_dma[entry].buf = des2; + tx_q->tx_skbuff_dma[entry].len = len; /* last descriptor can be set now */ priv->hw->desc->prepare_tx_desc(desc, 0, len, csum, STMMAC_CHAIN_MODE, 1, @@ -87,7 +90,7 @@ static int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum) } } - priv->cur_tx = entry; + tx_q->cur_tx = entry; return entry; } @@ -136,32 +139,34 @@ static void stmmac_init_dma_chain(void *des, dma_addr_t phy_addr, static void stmmac_refill_desc3(void *priv_ptr, struct dma_desc *p) { - struct stmmac_priv *priv = (struct stmmac_priv *)priv_ptr; + struct stmmac_rx_queue *rx_q = (struct stmmac_rx_queue *)priv_ptr; + struct stmmac_priv *priv = rx_q->priv_data; if (priv->hwts_rx_en && !priv->extend_desc) /* NOTE: Device will overwrite des3 with timestamp value if * 1588-2002 time stamping is enabled, hence reinitialize it * to keep explicit chaining in the descriptor. */ - p->des3 = cpu_to_le32((unsigned int)(priv->dma_rx_phy + - (((priv->dirty_rx) + 1) % + p->des3 = cpu_to_le32((unsigned int)(rx_q->dma_rx_phy + + (((rx_q->dirty_rx) + 1) % DMA_RX_SIZE) * sizeof(struct dma_desc))); } static void stmmac_clean_desc3(void *priv_ptr, struct dma_desc *p) { - struct stmmac_priv *priv = (struct stmmac_priv *)priv_ptr; - unsigned int entry = priv->dirty_tx; + struct stmmac_tx_queue *tx_q = (struct stmmac_tx_queue *)priv_ptr; + struct stmmac_priv *priv = tx_q->priv_data; + unsigned int entry = tx_q->dirty_tx; - if (priv->tx_skbuff_dma[entry].last_segment && !priv->extend_desc && + if (tx_q->tx_skbuff_dma[entry].last_segment && !priv->extend_desc && priv->hwts_tx_en) /* NOTE: Device will overwrite des3 with timestamp value if * 1588-2002 time stamping is enabled, hence reinitialize it * to keep explicit chaining in the descriptor. */ - p->des3 = cpu_to_le32((unsigned int)((priv->dma_tx_phy + - ((priv->dirty_tx + 1) % DMA_TX_SIZE)) + p->des3 = cpu_to_le32((unsigned int)((tx_q->dma_tx_phy + + ((tx_q->dirty_tx + 1) % DMA_TX_SIZE)) * sizeof(struct dma_desc))); } diff --git a/drivers/net/ethernet/stmicro/stmmac/ring_mode.c b/drivers/net/ethernet/stmicro/stmmac/ring_mode.c index 452f256..31213e6 100644 --- a/drivers/net/ethernet/stmicro/stmmac/ring_mode.c +++ b/drivers/net/ethernet/stmicro/stmmac/ring_mode.c @@ -26,16 +26,17 @@ static int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum) { - struct stmmac_priv *priv = (struct stmmac_priv *)p; - unsigned int entry = priv->cur_tx; - struct dma_desc *desc; + struct stmmac_tx_queue *tx_q = (struct stmmac_tx_queue *)p; unsigned int nopaged_len = skb_headlen(skb); + struct stmmac_priv *priv = tx_q->priv_data; + unsigned int entry = tx_q->cur_tx; unsigned int bmax, len, des2; + struct dma_desc *desc; if (priv->extend_desc) - desc = (struct dma_desc *)(priv->dma_etx + entry); + desc = (struct dma_desc *)(tx_q->dma_etx + entry); else - desc = priv->dma_tx + entry; + desc = tx_q->dma_tx + entry; if (priv->plat->enh_desc) bmax = BUF_SIZE_8KiB; @@ -52,29 +53,29 @@ static int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum) if (dma_mapping_error(priv->device, des2)) return -1; - priv->tx_skbuff_dma[entry].buf = des2; - priv->tx_skbuff_dma[entry].len = bmax; - priv->tx_skbuff_dma[entry].is_jumbo = true; + tx_q->tx_skbuff_dma[entry].buf = des2; + tx_q->tx_skbuff_dma[entry].len = bmax; + tx_q->tx_skbuff_dma[entry].is_jumbo = true; desc->des3 = cpu_to_le32(des2 + BUF_SIZE_4KiB); priv->hw->desc->prepare_tx_desc(desc, 1, bmax, csum, STMMAC_RING_MODE, 0, false); - priv->tx_skbuff[entry] = NULL; + tx_q->tx_skbuff[entry] = NULL; entry = STMMAC_GET_ENTRY(entry, DMA_TX_SIZE); if (priv->extend_desc) - desc = (struct dma_desc *)(priv->dma_etx + entry); + desc = (struct dma_desc *)(tx_q->dma_etx + entry); else - desc = priv->dma_tx + entry; + desc = tx_q->dma_tx + entry; des2 = dma_map_single(priv->device, skb->data + bmax, len, DMA_TO_DEVICE); desc->des2 = cpu_to_le32(des2); if (dma_mapping_error(priv->device, des2)) return -1; - priv->tx_skbuff_dma[entry].buf = des2; - priv->tx_skbuff_dma[entry].len = len; - priv->tx_skbuff_dma[entry].is_jumbo = true; + tx_q->tx_skbuff_dma[entry].buf = des2; + tx_q->tx_skbuff_dma[entry].len = len; + tx_q->tx_skbuff_dma[entry].is_jumbo = true; desc->des3 = cpu_to_le32(des2 + BUF_SIZE_4KiB); priv->hw->desc->prepare_tx_desc(desc, 0, len, csum, @@ -85,15 +86,15 @@ static int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum) desc->des2 = cpu_to_le32(des2); if (dma_mapping_error(priv->device, des2)) return -1; - priv->tx_skbuff_dma[entry].buf = des2; - priv->tx_skbuff_dma[entry].len = nopaged_len; - priv->tx_skbuff_dma[entry].is_jumbo = true; + tx_q->tx_skbuff_dma[entry].buf = des2; + tx_q->tx_skbuff_dma[entry].len = nopaged_len; + tx_q->tx_skbuff_dma[entry].is_jumbo = true; desc->des3 = cpu_to_le32(des2 + BUF_SIZE_4KiB); priv->hw->desc->prepare_tx_desc(desc, 1, nopaged_len, csum, STMMAC_RING_MODE, 0, true); } - priv->cur_tx = entry; + tx_q->cur_tx = entry; return entry; } @@ -125,12 +126,13 @@ static void stmmac_init_desc3(struct dma_desc *p) static void stmmac_clean_desc3(void *priv_ptr, struct dma_desc *p) { - struct stmmac_priv *priv = (struct stmmac_priv *)priv_ptr; - unsigned int entry = priv->dirty_tx; + struct stmmac_tx_queue *tx_q = (struct stmmac_tx_queue *)priv_ptr; + struct stmmac_priv *priv = tx_q->priv_data; + unsigned int entry = tx_q->dirty_tx; /* des3 is only used for jumbo frames tx or time stamping */ - if (unlikely(priv->tx_skbuff_dma[entry].is_jumbo || - (priv->tx_skbuff_dma[entry].last_segment && + if (unlikely(tx_q->tx_skbuff_dma[entry].is_jumbo || + (tx_q->tx_skbuff_dma[entry].last_segment && !priv->extend_desc && priv->hwts_tx_en))) p->des3 = 0; } diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h index cd8fb61..6ec671c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h @@ -46,6 +46,35 @@ struct stmmac_tx_info { bool is_jumbo; }; +/* Frequently used values are kept adjacent for cache effect */ +struct stmmac_tx_queue { + u32 queue_index; + struct stmmac_priv *priv_data; + struct dma_extended_desc *dma_etx ____cacheline_aligned_in_smp; + struct dma_desc *dma_tx; + struct sk_buff **tx_skbuff; + struct stmmac_tx_info *tx_skbuff_dma; + unsigned int cur_tx; + unsigned int dirty_tx; + dma_addr_t dma_tx_phy; + u32 tx_tail_addr; +}; + +struct stmmac_rx_queue { + u32 queue_index; + struct stmmac_priv *priv_data; + struct dma_extended_desc *dma_erx; + struct dma_desc *dma_rx ____cacheline_aligned_in_smp; + struct sk_buff **rx_skbuff; + dma_addr_t *rx_skbuff_dma; + struct napi_struct napi ____cacheline_aligned_in_smp; + unsigned int cur_rx; + unsigned int dirty_rx; + u32 rx_zeroc_thresh; + dma_addr_t dma_rx_phy; + u32 rx_tail_addr; +}; + struct stmmac_priv { /* Frequently used values are kept adjacent for cache effect */ struct dma_extended_desc *dma_etx ____cacheline_aligned_in_smp; @@ -56,28 +85,22 @@ struct stmmac_priv { u32 tx_count_frames; u32 tx_coal_frames; u32 tx_coal_timer; - struct stmmac_tx_info *tx_skbuff_dma; - dma_addr_t dma_tx_phy; int tx_coalesce; int hwts_tx_en; bool tx_path_in_lpi_mode; struct timer_list txtimer; bool tso; - struct dma_desc *dma_rx ____cacheline_aligned_in_smp; - struct dma_extended_desc *dma_erx; - struct sk_buff **rx_skbuff; - unsigned int cur_rx; - unsigned int dirty_rx; + /* TX Queue */ + struct stmmac_tx_queue *tx_queue; + + /* RX Queue */ + struct stmmac_rx_queue *rx_queue; + unsigned int dma_buf_sz; unsigned int rx_copybreak; - unsigned int rx_zeroc_thresh; u32 rx_riwt; int hwts_rx_en; - dma_addr_t *rx_skbuff_dma; - dma_addr_t dma_rx_phy; - - struct napi_struct napi ____cacheline_aligned_in_smp; void __iomem *ioaddr; struct net_device *dev; @@ -119,8 +142,6 @@ struct stmmac_priv { spinlock_t ptp_lock; void __iomem *mmcaddr; void __iomem *ptpaddr; - u32 rx_tail_addr; - u32 tx_tail_addr; u32 mss; #ifdef CONFIG_DEBUG_FS diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index d3a2151..a389dfb 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -185,26 +185,38 @@ static void print_pkt(unsigned char *buf, int len) print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, buf, len); } -static inline u32 stmmac_tx_avail(struct stmmac_priv *priv) +/** + * stmmac_tx_avail - Get tx queue availability + * @priv: driver private structure + * @queue: TX queue index + */ +static inline u32 stmmac_tx_avail(struct stmmac_priv *priv, u32 queue) { + struct stmmac_tx_queue *tx_q = &priv->tx_queue[queue]; u32 avail; - if (priv->dirty_tx > priv->cur_tx) - avail = priv->dirty_tx - priv->cur_tx - 1; + if (tx_q->dirty_tx > tx_q->cur_tx) + avail = tx_q->dirty_tx - tx_q->cur_tx - 1; else - avail = DMA_TX_SIZE - priv->cur_tx + priv->dirty_tx - 1; + avail = DMA_TX_SIZE - tx_q->cur_tx + tx_q->dirty_tx - 1; return avail; } -static inline u32 stmmac_rx_dirty(struct stmmac_priv *priv) +/** + * stmmac_rx_dirty - Get RX queue dirty + * @priv: driver private structure + * @queue: RX queue index + */ +static inline u32 stmmac_rx_dirty(struct stmmac_priv *priv, u32 queue) { + struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue]; u32 dirty; - if (priv->dirty_rx <= priv->cur_rx) - dirty = priv->cur_rx - priv->dirty_rx; + if (rx_q->dirty_rx <= rx_q->cur_rx) + dirty = rx_q->cur_rx - rx_q->dirty_rx; else - dirty = DMA_RX_SIZE - priv->dirty_rx + priv->cur_rx; + dirty = DMA_RX_SIZE - rx_q->dirty_rx + rx_q->cur_rx; return dirty; } @@ -232,9 +244,19 @@ static inline void stmmac_hw_fix_mac_speed(struct stmmac_priv *priv) */ static void stmmac_enable_eee_mode(struct stmmac_priv *priv) { + u32 tx_cnt = priv->plat->tx_queues_to_use; + u32 queue; + + /* check if all TX queues have the work finished */ + for (queue = 0; queue < tx_cnt; queue++) { + struct stmmac_tx_queue *tx_q = &priv->tx_queue[queue]; + + if (tx_q->dirty_tx != tx_q->cur_tx) + return; /* still unfinished work */ + } + /* Check and enter in LPI mode */ - if ((priv->dirty_tx == priv->cur_tx) && - (priv->tx_path_in_lpi_mode == false)) + if (!priv->tx_path_in_lpi_mode) priv->hw->mac->set_eee_mode(priv->hw, priv->plat->en_tx_lpi_clockgating); } @@ -891,20 +913,40 @@ static int stmmac_init_phy(struct net_device *dev) static void stmmac_display_rings(struct stmmac_priv *priv) { + u32 rx_cnt = priv->plat->rx_queues_to_use; + u32 tx_cnt = priv->plat->tx_queues_to_use; void *head_rx, *head_tx; + u32 queue; - if (priv->extend_desc) { - head_rx = (void *)priv->dma_erx; - head_tx = (void *)priv->dma_etx; - } else { - head_rx = (void *)priv->dma_rx; - head_tx = (void *)priv->dma_tx; + /* Display RX rings */ + for (queue = 0; queue < rx_cnt; queue++) { + struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue]; + + pr_info("\tRX Queue %d rings\n", queue); + + if (priv->extend_desc) + head_rx = (void *)rx_q->dma_erx; + else + head_rx = (void *)rx_q->dma_rx; + + /* Display Rx ring */ + priv->hw->desc->display_ring(head_rx, DMA_RX_SIZE, true); } - /* Display Rx ring */ - priv->hw->desc->display_ring(head_rx, DMA_RX_SIZE, true); - /* Display Tx ring */ - priv->hw->desc->display_ring(head_tx, DMA_TX_SIZE, false); + /* Display TX rings */ + for (queue = 0; queue < tx_cnt; queue++) { + struct stmmac_tx_queue *tx_q = &priv->tx_queue[queue]; + + pr_info("\tTX Queue %d rings\n", queue); + + if (priv->extend_desc) + head_tx = (void *)tx_q->dma_etx; + else + head_tx = (void *)tx_q->dma_tx; + + /* Display Tx ring */ + priv->hw->desc->display_ring(head_tx, DMA_TX_SIZE, false); + } } static int stmmac_set_bfsize(int mtu, int bufsize) @@ -924,48 +966,86 @@ static int stmmac_set_bfsize(int mtu, int bufsize) } /** - * stmmac_clear_descriptors - clear descriptors + * stmmac_clear_rx_descriptors - clear the descriptors of a RX queue * @priv: driver private structure - * Description: this function is called to clear the tx and rx descriptors + * @queue: RX queue index + * Description: this function is called to clear the RX descriptors * in case of both basic and extended descriptors are used. */ -static void stmmac_clear_descriptors(struct stmmac_priv *priv) +static void stmmac_clear_rx_descriptors(struct stmmac_priv *priv, u32 queue) { - int i; + struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue]; + u32 i = 0; - /* Clear the Rx/Tx descriptors */ + /* Clear the RX descriptors */ for (i = 0; i < DMA_RX_SIZE; i++) if (priv->extend_desc) - priv->hw->desc->init_rx_desc(&priv->dma_erx[i].basic, + priv->hw->desc->init_rx_desc(&rx_q->dma_erx[i].basic, priv->use_riwt, priv->mode, (i == DMA_RX_SIZE - 1)); else - priv->hw->desc->init_rx_desc(&priv->dma_rx[i], + priv->hw->desc->init_rx_desc(&rx_q->dma_rx[i], priv->use_riwt, priv->mode, (i == DMA_RX_SIZE - 1)); +} + +/** + * stmmac_clear_tx_descriptors - clear the descriptors of a TX queue + * @priv: driver private structure + * @queue: TX queue index + * Description: this function is called to clear the TX descriptors + * in case of both basic and extended descriptors are used. + */ +static void stmmac_clear_tx_descriptors(struct stmmac_priv *priv, u32 queue) +{ + struct stmmac_tx_queue *tx_q = &priv->tx_queue[queue]; + u32 i = 0; + + /* Clear the TX descriptors */ for (i = 0; i < DMA_TX_SIZE; i++) if (priv->extend_desc) - priv->hw->desc->init_tx_desc(&priv->dma_etx[i].basic, + priv->hw->desc->init_tx_desc(&tx_q->dma_etx[i].basic, priv->mode, (i == DMA_TX_SIZE - 1)); else - priv->hw->desc->init_tx_desc(&priv->dma_tx[i], + priv->hw->desc->init_tx_desc(&tx_q->dma_tx[i], priv->mode, (i == DMA_TX_SIZE - 1)); } /** + * stmmac_clear_descriptors - clear descriptors + * @priv: driver private structure + * Description: this function is called to clear the tx and rx descriptors + * in case of both basic and extended descriptors are used. + */ +static void stmmac_clear_descriptors(struct stmmac_priv *priv) +{ + u32 rx_queue_cnt = priv->plat->rx_queues_to_use; + u32 tx_queue_cnt = priv->plat->tx_queues_to_use; + u32 queue; + + for (queue = 0; queue < rx_queue_cnt; queue++) + stmmac_clear_rx_descriptors(priv, queue); + + for (queue = 0; queue < tx_queue_cnt; queue++) + stmmac_clear_tx_descriptors(priv, queue); +} + +/** * stmmac_init_rx_buffers - init the RX descriptor buffer. * @priv: driver private structure * @p: descriptor pointer * @i: descriptor index * @flags: gfp flag. + * @queue: RX queue index * Description: this function is called to allocate a receive buffer, perform * the DMA mapping and init the descriptor. */ static int stmmac_init_rx_buffers(struct stmmac_priv *priv, struct dma_desc *p, - int i, gfp_t flags) + int i, gfp_t flags, u32 queue) { + struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue]; struct sk_buff *skb; skb = __netdev_alloc_skb_ip_align(priv->dev, priv->dma_buf_sz, flags); @@ -974,20 +1054,20 @@ static int stmmac_init_rx_buffers(struct stmmac_priv *priv, struct dma_desc *p, "%s: Rx init fails; skb is NULL\n", __func__); return -ENOMEM; } - priv->rx_skbuff[i] = skb; - priv->rx_skbuff_dma[i] = dma_map_single(priv->device, skb->data, + rx_q->rx_skbuff[i] = skb; + rx_q->rx_skbuff_dma[i] = dma_map_single(priv->device, skb->data, priv->dma_buf_sz, DMA_FROM_DEVICE); - if (dma_mapping_error(priv->device, priv->rx_skbuff_dma[i])) { + if (dma_mapping_error(priv->device, rx_q->rx_skbuff_dma[i])) { netdev_err(priv->dev, "%s: DMA mapping error\n", __func__); dev_kfree_skb_any(skb); return -EINVAL; } if (priv->synopsys_id >= DWMAC_CORE_4_00) - p->des0 = cpu_to_le32(priv->rx_skbuff_dma[i]); + p->des0 = cpu_to_le32(rx_q->rx_skbuff_dma[i]); else - p->des2 = cpu_to_le32(priv->rx_skbuff_dma[i]); + p->des2 = cpu_to_le32(rx_q->rx_skbuff_dma[i]); if ((priv->hw->mode->init_desc3) && (priv->dma_buf_sz == BUF_SIZE_16KiB)) @@ -996,30 +1076,136 @@ static int stmmac_init_rx_buffers(struct stmmac_priv *priv, struct dma_desc *p, return 0; } -static void stmmac_free_rx_buffers(struct stmmac_priv *priv, int i) +/** + * stmmac_free_rx_buffers - free RX buffers. + * @priv: driver private structure + * @queue: RX queue index + * @i: buffer index + */ +static void stmmac_free_rx_buffers(struct stmmac_priv *priv, u32 queue, int i) { - if (priv->rx_skbuff[i]) { - dma_unmap_single(priv->device, priv->rx_skbuff_dma[i], + struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue]; + + if (rx_q->rx_skbuff[i]) { + dma_unmap_single(priv->device, rx_q->rx_skbuff_dma[i], priv->dma_buf_sz, DMA_FROM_DEVICE); - dev_kfree_skb_any(priv->rx_skbuff[i]); + dev_kfree_skb_any(rx_q->rx_skbuff[i]); } - priv->rx_skbuff[i] = NULL; + rx_q->rx_skbuff[i] = NULL; } /** - * init_dma_desc_rings - init the RX/TX descriptor rings + * stmmac_free_tx_buffers - free RX buffers. + * @priv: driver private structure + * @queue: RX queue index + * @i: buffer index + */ +static void stmmac_free_tx_buffers(struct stmmac_priv *priv, u32 queue, u32 i) +{ + struct stmmac_tx_queue *tx_q = &priv->tx_queue[queue]; + + if (tx_q->tx_skbuff_dma[i].buf) { + if (tx_q->tx_skbuff_dma[i].map_as_page) + dma_unmap_page(priv->device, + tx_q->tx_skbuff_dma[i].buf, + tx_q->tx_skbuff_dma[i].len, + DMA_TO_DEVICE); + else + dma_unmap_single(priv->device, + tx_q->tx_skbuff_dma[i].buf, + tx_q->tx_skbuff_dma[i].len, + DMA_TO_DEVICE); + } + + if (tx_q->tx_skbuff[i]) { + dev_kfree_skb_any(tx_q->tx_skbuff[i]); + tx_q->tx_skbuff[i] = NULL; + tx_q->tx_skbuff_dma[i].buf = 0; + tx_q->tx_skbuff_dma[i].map_as_page = false; + } +} + +/** + * init_tx_dma_desc_rings - init the TX descriptor rings + * @dev: net device structure + * Description: this function initializes the DMA TX descriptors + * and allocates the socket buffers. It suppors the chained and ring + * modes. + */ +static int init_tx_dma_desc_rings(struct net_device *dev) +{ + struct stmmac_priv *priv = netdev_priv(dev); + u32 tx_queue_cnt = priv->plat->tx_queues_to_use; + u32 queue; + int i = 0; + + for (queue = 0; queue < tx_queue_cnt; queue++) { + struct stmmac_tx_queue *tx_q = &priv->tx_queue[queue]; + + netif_dbg(priv, probe, priv->dev, + "(%s) dma_tx_phy=0x%08x\n", __func__, + (u32)tx_q->dma_tx_phy); + + /* Setup the chained descriptor addresses */ + if (priv->mode == STMMAC_CHAIN_MODE) { + if (priv->extend_desc) + priv->hw->mode->init(tx_q->dma_etx, + tx_q->dma_tx_phy, + DMA_TX_SIZE, 1); + else + priv->hw->mode->init(tx_q->dma_tx, + tx_q->dma_tx_phy, + DMA_TX_SIZE, 0); + } + + for (i = 0; i < DMA_TX_SIZE; i++) { + struct dma_desc *p; + + if (priv->extend_desc) + p = &((tx_q->dma_etx + i)->basic); + else + p = tx_q->dma_tx + i; + + if (priv->synopsys_id >= DWMAC_CORE_4_00) { + p->des0 = 0; + p->des1 = 0; + p->des2 = 0; + p->des3 = 0; + } else { + p->des2 = 0; + } + + tx_q->tx_skbuff_dma[i].buf = 0; + tx_q->tx_skbuff_dma[i].map_as_page = false; + tx_q->tx_skbuff_dma[i].len = 0; + tx_q->tx_skbuff_dma[i].last_segment = false; + tx_q->tx_skbuff[i] = NULL; + } + + tx_q->dirty_tx = 0; + tx_q->cur_tx = 0; + netdev_tx_reset_queue(netdev_get_tx_queue(priv->dev, queue)); + } + + return 0; +} + +/** + * init_rx_dma_desc_rings - init the RX descriptor rings * @dev: net device structure * @flags: gfp flag. - * Description: this function initializes the DMA RX/TX descriptors - * and allocates the socket buffers. It supports the chained and ring + * Description: this function initializes the DMA RX descriptors + * and allocates the socket buffers. It suppors the chained and ring * modes. */ -static int init_dma_desc_rings(struct net_device *dev, gfp_t flags) +static int init_rx_dma_desc_rings(struct net_device *dev, gfp_t flags) { - int i; struct stmmac_priv *priv = netdev_priv(dev); + u32 rx_count = priv->plat->rx_queues_to_use; unsigned int bfsize = 0; int ret = -ENOMEM; + u32 queue; + int i; if (priv->hw->mode->set_16kib_bfsize) bfsize = priv->hw->mode->set_16kib_bfsize(dev->mtu); @@ -1029,235 +1215,350 @@ static int init_dma_desc_rings(struct net_device *dev, gfp_t flags) priv->dma_buf_sz = bfsize; - netif_dbg(priv, probe, priv->dev, - "(%s) dma_rx_phy=0x%08x dma_tx_phy=0x%08x\n", - __func__, (u32)priv->dma_rx_phy, (u32)priv->dma_tx_phy); - /* RX INITIALIZATION */ netif_dbg(priv, probe, priv->dev, "SKB addresses:\nskb\t\tskb data\tdma data\n"); - for (i = 0; i < DMA_RX_SIZE; i++) { - struct dma_desc *p; - if (priv->extend_desc) - p = &((priv->dma_erx + i)->basic); - else - p = priv->dma_rx + i; + for (queue = 0; queue < rx_count; queue++) { + struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue]; - ret = stmmac_init_rx_buffers(priv, p, i, flags); - if (ret) - goto err_init_rx_buffers; + netif_dbg(priv, probe, priv->dev, + "(%s) dma_rx_phy=0x%08x\n", __func__, + (u32)rx_q->dma_rx_phy); - netif_dbg(priv, probe, priv->dev, "[%p]\t[%p]\t[%x]\n", - priv->rx_skbuff[i], priv->rx_skbuff[i]->data, - (unsigned int)priv->rx_skbuff_dma[i]); - } - priv->cur_rx = 0; - priv->dirty_rx = (unsigned int)(i - DMA_RX_SIZE); - buf_sz = bfsize; + for (i = 0; i < DMA_RX_SIZE; i++) { + struct dma_desc *p; - /* Setup the chained descriptor addresses */ - if (priv->mode == STMMAC_CHAIN_MODE) { - if (priv->extend_desc) { - priv->hw->mode->init(priv->dma_erx, priv->dma_rx_phy, - DMA_RX_SIZE, 1); - priv->hw->mode->init(priv->dma_etx, priv->dma_tx_phy, - DMA_TX_SIZE, 1); - } else { - priv->hw->mode->init(priv->dma_rx, priv->dma_rx_phy, - DMA_RX_SIZE, 0); - priv->hw->mode->init(priv->dma_tx, priv->dma_tx_phy, - DMA_TX_SIZE, 0); + if (priv->extend_desc) + p = &((rx_q->dma_erx + i)->basic); + else + p = rx_q->dma_rx + i; + + ret = stmmac_init_rx_buffers(priv, p, i, flags, queue); + if (ret) + goto err_init_rx_buffers; + + netif_dbg(priv, probe, priv->dev, "[%p]\t[%p]\t[%x]\n", + rx_q->rx_skbuff[i], + rx_q->rx_skbuff[i]->data, + (unsigned int)rx_q->rx_skbuff_dma[i]); } - } - /* TX INITIALIZATION */ - for (i = 0; i < DMA_TX_SIZE; i++) { - struct dma_desc *p; - if (priv->extend_desc) - p = &((priv->dma_etx + i)->basic); - else - p = priv->dma_tx + i; + rx_q->cur_rx = 0; + rx_q->dirty_rx = (unsigned int)(i - DMA_RX_SIZE); - if (priv->synopsys_id >= DWMAC_CORE_4_00) { - p->des0 = 0; - p->des1 = 0; - p->des2 = 0; - p->des3 = 0; - } else { - p->des2 = 0; + stmmac_clear_rx_descriptors(priv, queue); + + if (priv->mode == STMMAC_CHAIN_MODE) { + if (priv->extend_desc) + priv->hw->mode->init(rx_q->dma_erx, + rx_q->dma_rx_phy, + DMA_RX_SIZE, 1); + else + priv->hw->mode->init(rx_q->dma_rx, + rx_q->dma_rx_phy, + DMA_RX_SIZE, 0); } + } - priv->tx_skbuff_dma[i].buf = 0; - priv->tx_skbuff_dma[i].map_as_page = false; - priv->tx_skbuff_dma[i].len = 0; - priv->tx_skbuff_dma[i].last_segment = false; - priv->tx_skbuff[i] = NULL; + buf_sz = bfsize; + + return 0; + +err_init_rx_buffers: + while (queue-- >= 0) { + while (--i >= 0) + stmmac_free_rx_buffers(priv, queue, i); + + i = DMA_RX_SIZE; } - priv->dirty_tx = 0; - priv->cur_tx = 0; - netdev_reset_queue(priv->dev); + return ret; +} - stmmac_clear_descriptors(priv); +/** + * init_dma_desc_rings - init the RX/TX descriptor rings + * @dev: net device structure + * @flags: gfp flag. + * Description: this function initializes the DMA RX/TX descriptors + * and allocates the socket buffers. It suppors the chained and ring + * modes. + */ +static int init_dma_desc_rings(struct net_device *dev, gfp_t flags) +{ + struct stmmac_priv *priv = netdev_priv(dev); + int ret = init_rx_dma_desc_rings(dev, flags); + + if (ret) + return ret; + + ret = init_tx_dma_desc_rings(dev); if (netif_msg_hw(priv)) stmmac_display_rings(priv); - return 0; -err_init_rx_buffers: - while (--i >= 0) - stmmac_free_rx_buffers(priv, i); return ret; } -static void dma_free_rx_skbufs(struct stmmac_priv *priv) +static void dma_free_rx_skbufs(struct stmmac_priv *priv, u32 queue) { int i; for (i = 0; i < DMA_RX_SIZE; i++) - stmmac_free_rx_buffers(priv, i); + stmmac_free_rx_buffers(priv, queue, i); } -static void dma_free_tx_skbufs(struct stmmac_priv *priv) +static void dma_free_tx_skbufs(struct stmmac_priv *priv, u32 queue) { int i; - for (i = 0; i < DMA_TX_SIZE; i++) { - if (priv->tx_skbuff_dma[i].buf) { - if (priv->tx_skbuff_dma[i].map_as_page) - dma_unmap_page(priv->device, - priv->tx_skbuff_dma[i].buf, - priv->tx_skbuff_dma[i].len, - DMA_TO_DEVICE); - else - dma_unmap_single(priv->device, - priv->tx_skbuff_dma[i].buf, - priv->tx_skbuff_dma[i].len, - DMA_TO_DEVICE); - } + for (i = 0; i < DMA_TX_SIZE; i++) + stmmac_free_tx_buffers(priv, queue, i); +} + +/** + * free_rx_dma_desc_resources - free RX DMA resources + * @priv: driver private structure + */ +static void free_rx_dma_desc_resources(struct stmmac_priv *priv) +{ + u32 rx_count = priv->plat->rx_queues_to_use; + u32 queue = 0; + + if (!priv->rx_queue) + return; + + /* Free RX queue resources */ + for (queue = 0; queue < rx_count; queue++) { + struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue]; + + if (!rx_q) + break; + + /* Release the DMA RX socket buffers */ + dma_free_rx_skbufs(priv, queue); + + kfree(rx_q->rx_skbuff); + + kfree(rx_q->rx_skbuff_dma); + + if (!priv->extend_desc) + dma_free_coherent(priv->device, + DMA_RX_SIZE * sizeof(struct dma_desc), + rx_q->dma_rx, + rx_q->dma_rx_phy); + else + dma_free_coherent(priv->device, DMA_RX_SIZE * + sizeof(struct dma_extended_desc), + rx_q->dma_erx, + rx_q->dma_rx_phy); + } + + kfree(priv->rx_queue); +} + +/** + * free_tx_dma_desc_resources - free TX DMA resources + * @priv: driver private structure + */ +static void free_tx_dma_desc_resources(struct stmmac_priv *priv) +{ + u32 tx_count = priv->plat->tx_queues_to_use; + u32 queue = 0; + + if (!priv->tx_queue) + return; + + /* Free TX queue resources */ + for (queue = 0; queue < tx_count; queue++) { + struct stmmac_tx_queue *tx_q = &priv->tx_queue[queue]; + + if (!tx_q) + break; + + /* Release the DMA TX socket buffers */ + dma_free_tx_skbufs(priv, queue); + + kfree(tx_q->tx_skbuff); + + kfree(tx_q->tx_skbuff_dma); + + if (!priv->extend_desc) + dma_free_coherent(priv->device, + DMA_TX_SIZE * sizeof(struct dma_desc), + tx_q->dma_tx, + tx_q->dma_tx_phy); + else + dma_free_coherent(priv->device, DMA_TX_SIZE * + sizeof(struct dma_extended_desc), + tx_q->dma_etx, + tx_q->dma_tx_phy); + } + + kfree(priv->tx_queue); +} - if (priv->tx_skbuff[i]) { - dev_kfree_skb_any(priv->tx_skbuff[i]); - priv->tx_skbuff[i] = NULL; - priv->tx_skbuff_dma[i].buf = 0; - priv->tx_skbuff_dma[i].map_as_page = false; +/** + * free_dma_desc_resources - free All DMA resources + * @priv: driver private structure + */ +static void free_dma_desc_resources(struct stmmac_priv *priv) +{ + free_rx_dma_desc_resources(priv); + free_tx_dma_desc_resources(priv); +} + +/** + * alloc_rx_dma_desc_resources - alloc RX resources. + * @priv: private structure + * Description: according to which descriptor can be used (extend or basic) + * this function allocates the resources for RX paths. It pre-allocates the + * RX socket buffer in order to allow zero-copy mechanism. + */ +static int alloc_rx_dma_desc_resources(struct stmmac_priv *priv) +{ + u32 rx_count = priv->plat->rx_queues_to_use; + int ret = -ENOMEM; + u32 queue = 0; + + /* Allocate RX queues array */ + priv->rx_queue = kmalloc_array(rx_count, + sizeof(struct stmmac_rx_queue), + GFP_KERNEL); + if (!priv->rx_queue) { + kfree(priv->rx_queue); + return -ENOMEM; + } + + /* RX queues buffers and DMA */ + for (queue = 0; queue < rx_count; queue++) { + struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue]; + + rx_q->queue_index = queue; + rx_q->priv_data = priv; + + rx_q->rx_skbuff_dma = kmalloc_array(DMA_RX_SIZE, + sizeof(dma_addr_t), + GFP_KERNEL); + if (!rx_q->rx_skbuff_dma) + goto err_dma_buffers; + + rx_q->rx_skbuff = kmalloc_array(DMA_RX_SIZE, + sizeof(struct sk_buff *), + GFP_KERNEL); + if (!rx_q->rx_skbuff) + goto err_dma_buffers; + + if (priv->extend_desc) { + rx_q->dma_erx = dma_zalloc_coherent(priv->device, + (DMA_RX_SIZE * sizeof(struct dma_extended_desc)), + &rx_q->dma_rx_phy, GFP_KERNEL); + + if (!rx_q->dma_erx) + goto err_dma_buffers; + } else { + rx_q->dma_rx = dma_zalloc_coherent(priv->device, + (DMA_RX_SIZE * sizeof(struct dma_desc)), + &rx_q->dma_rx_phy, GFP_KERNEL); + + if (!rx_q->dma_rx) + goto err_dma_buffers; } } + + return 0; + +err_dma_buffers: + free_rx_dma_desc_resources(priv); + + return ret; } /** - * alloc_dma_desc_resources - alloc TX/RX resources. + * alloc_tx_dma_desc_resources - alloc TX resources. * @priv: private structure * Description: according to which descriptor can be used (extend or basic) - * this function allocates the resources for TX and RX paths. In case of - * reception, for example, it pre-allocated the RX socket buffer in order to - * allow zero-copy mechanism. + * this function allocates the resources for TX paths. */ -static int alloc_dma_desc_resources(struct stmmac_priv *priv) +static int alloc_tx_dma_desc_resources(struct stmmac_priv *priv) { + u32 tx_count = priv->plat->tx_queues_to_use; int ret = -ENOMEM; + u32 queue = 0; - priv->rx_skbuff_dma = kmalloc_array(DMA_RX_SIZE, sizeof(dma_addr_t), - GFP_KERNEL); - if (!priv->rx_skbuff_dma) + /* Allocate TX queues array */ + priv->tx_queue = kmalloc_array(tx_count, + sizeof(struct stmmac_tx_queue), + GFP_KERNEL); + if (!priv->tx_queue) return -ENOMEM; - priv->rx_skbuff = kmalloc_array(DMA_RX_SIZE, sizeof(struct sk_buff *), - GFP_KERNEL); - if (!priv->rx_skbuff) - goto err_rx_skbuff; - - priv->tx_skbuff_dma = kmalloc_array(DMA_TX_SIZE, - sizeof(*priv->tx_skbuff_dma), - GFP_KERNEL); - if (!priv->tx_skbuff_dma) - goto err_tx_skbuff_dma; - - priv->tx_skbuff = kmalloc_array(DMA_TX_SIZE, sizeof(struct sk_buff *), - GFP_KERNEL); - if (!priv->tx_skbuff) - goto err_tx_skbuff; - - if (priv->extend_desc) { - priv->dma_erx = dma_zalloc_coherent(priv->device, DMA_RX_SIZE * - sizeof(struct - dma_extended_desc), - &priv->dma_rx_phy, - GFP_KERNEL); - if (!priv->dma_erx) - goto err_dma; + /* TX queues buffers and DMA */ + for (queue = 0; queue < tx_count; queue++) { + struct stmmac_tx_queue *tx_q = &priv->tx_queue[queue]; + + tx_q->queue_index = queue; + tx_q->priv_data = priv; - priv->dma_etx = dma_zalloc_coherent(priv->device, DMA_TX_SIZE * - sizeof(struct - dma_extended_desc), - &priv->dma_tx_phy, + tx_q->tx_skbuff_dma = kmalloc_array(DMA_TX_SIZE, + sizeof(struct stmmac_tx_info), + GFP_KERNEL); + + if (!tx_q->tx_skbuff_dma) + goto err_dma_buffers; + + tx_q->tx_skbuff = kmalloc_array(DMA_TX_SIZE, + sizeof(struct sk_buff *), GFP_KERNEL); - if (!priv->dma_etx) { - dma_free_coherent(priv->device, DMA_RX_SIZE * - sizeof(struct dma_extended_desc), - priv->dma_erx, priv->dma_rx_phy); - goto err_dma; - } - } else { - priv->dma_rx = dma_zalloc_coherent(priv->device, DMA_RX_SIZE * - sizeof(struct dma_desc), - &priv->dma_rx_phy, - GFP_KERNEL); - if (!priv->dma_rx) - goto err_dma; - - priv->dma_tx = dma_zalloc_coherent(priv->device, DMA_TX_SIZE * - sizeof(struct dma_desc), - &priv->dma_tx_phy, - GFP_KERNEL); - if (!priv->dma_tx) { - dma_free_coherent(priv->device, DMA_RX_SIZE * - sizeof(struct dma_desc), - priv->dma_rx, priv->dma_rx_phy); - goto err_dma; + if (!tx_q->tx_skbuff) + goto err_dma_buffers; + + if (priv->extend_desc) { + tx_q->dma_etx = + dma_zalloc_coherent(priv->device, + (DMA_TX_SIZE * sizeof(struct dma_extended_desc)), + &tx_q->dma_tx_phy, GFP_KERNEL); + + if (!tx_q->dma_etx) + goto err_dma_buffers; + } else { + tx_q->dma_tx = + dma_zalloc_coherent(priv->device, + (DMA_TX_SIZE * sizeof(struct dma_desc)), + &tx_q->dma_tx_phy, GFP_KERNEL); + + if (!tx_q->dma_tx) + goto err_dma_buffers; } } return 0; -err_dma: - kfree(priv->tx_skbuff); -err_tx_skbuff: - kfree(priv->tx_skbuff_dma); -err_tx_skbuff_dma: - kfree(priv->rx_skbuff); -err_rx_skbuff: - kfree(priv->rx_skbuff_dma); +err_dma_buffers: + free_tx_dma_desc_resources(priv); + return ret; } -static void free_dma_desc_resources(struct stmmac_priv *priv) +/** + * alloc_dma_desc_resources - alloc TX/RX resources. + * @priv: private structure + * Description: according to which descriptor can be used (extend or basic) + * this function allocates the resources for TX and RX paths. In case of + * reception, for example, it pre-allocated the RX socket buffer in order to + * allow zero-copy mechanism. + */ +static int alloc_dma_desc_resources(struct stmmac_priv *priv) { - /* Release the DMA TX/RX socket buffers */ - dma_free_rx_skbufs(priv); - dma_free_tx_skbufs(priv); - - /* Free DMA regions of consistent memory previously allocated */ - if (!priv->extend_desc) { - dma_free_coherent(priv->device, - DMA_TX_SIZE * sizeof(struct dma_desc), - priv->dma_tx, priv->dma_tx_phy); - dma_free_coherent(priv->device, - DMA_RX_SIZE * sizeof(struct dma_desc), - priv->dma_rx, priv->dma_rx_phy); - } else { - dma_free_coherent(priv->device, DMA_TX_SIZE * - sizeof(struct dma_extended_desc), - priv->dma_etx, priv->dma_tx_phy); - dma_free_coherent(priv->device, DMA_RX_SIZE * - sizeof(struct dma_extended_desc), - priv->dma_erx, priv->dma_rx_phy); - } - kfree(priv->rx_skbuff_dma); - kfree(priv->rx_skbuff); - kfree(priv->tx_skbuff_dma); - kfree(priv->tx_skbuff); + int ret = 0; + + ret = alloc_tx_dma_desc_resources(priv); + if (ret) + return ret; + + ret = alloc_rx_dma_desc_resources(priv); + + return ret; } /** @@ -1421,26 +1722,28 @@ static void stmmac_dma_operation_mode(struct stmmac_priv *priv) /** * stmmac_tx_clean - to manage the transmission completion * @priv: driver private structure + * @queue: TX queue index * Description: it reclaims the transmit resources after transmission completes. */ -static void stmmac_tx_clean(struct stmmac_priv *priv) +static void stmmac_tx_clean(struct stmmac_priv *priv, u32 queue) { + struct stmmac_tx_queue *tx_q = &priv->tx_queue[queue]; unsigned int bytes_compl = 0, pkts_compl = 0; - unsigned int entry = priv->dirty_tx; + unsigned int entry = tx_q->dirty_tx; netif_tx_lock(priv->dev); priv->xstats.tx_clean++; - while (entry != priv->cur_tx) { - struct sk_buff *skb = priv->tx_skbuff[entry]; + while (entry != tx_q->cur_tx) { + struct sk_buff *skb = tx_q->tx_skbuff[entry]; struct dma_desc *p; int status; if (priv->extend_desc) - p = (struct dma_desc *)(priv->dma_etx + entry); + p = (struct dma_desc *)(tx_q->dma_etx + entry); else - p = priv->dma_tx + entry; + p = tx_q->dma_tx + entry; status = priv->hw->desc->tx_status(&priv->dev->stats, &priv->xstats, p, @@ -1461,48 +1764,50 @@ static void stmmac_tx_clean(struct stmmac_priv *priv) stmmac_get_tx_hwtstamp(priv, p, skb); } - if (likely(priv->tx_skbuff_dma[entry].buf)) { - if (priv->tx_skbuff_dma[entry].map_as_page) + if (likely(tx_q->tx_skbuff_dma[entry].buf)) { + if (tx_q->tx_skbuff_dma[entry].map_as_page) dma_unmap_page(priv->device, - priv->tx_skbuff_dma[entry].buf, - priv->tx_skbuff_dma[entry].len, + tx_q->tx_skbuff_dma[entry].buf, + tx_q->tx_skbuff_dma[entry].len, DMA_TO_DEVICE); else dma_unmap_single(priv->device, - priv->tx_skbuff_dma[entry].buf, - priv->tx_skbuff_dma[entry].len, + tx_q->tx_skbuff_dma[entry].buf, + tx_q->tx_skbuff_dma[entry].len, DMA_TO_DEVICE); - priv->tx_skbuff_dma[entry].buf = 0; - priv->tx_skbuff_dma[entry].len = 0; - priv->tx_skbuff_dma[entry].map_as_page = false; + tx_q->tx_skbuff_dma[entry].buf = 0; + tx_q->tx_skbuff_dma[entry].len = 0; + tx_q->tx_skbuff_dma[entry].map_as_page = false; } if (priv->hw->mode->clean_desc3) - priv->hw->mode->clean_desc3(priv, p); + priv->hw->mode->clean_desc3(tx_q, p); - priv->tx_skbuff_dma[entry].last_segment = false; - priv->tx_skbuff_dma[entry].is_jumbo = false; + tx_q->tx_skbuff_dma[entry].last_segment = false; + tx_q->tx_skbuff_dma[entry].is_jumbo = false; if (likely(skb != NULL)) { pkts_compl++; bytes_compl += skb->len; dev_consume_skb_any(skb); - priv->tx_skbuff[entry] = NULL; + tx_q->tx_skbuff[entry] = NULL; } priv->hw->desc->release_tx_desc(p, priv->mode); entry = STMMAC_GET_ENTRY(entry, DMA_TX_SIZE); } - priv->dirty_tx = entry; + tx_q->dirty_tx = entry; - netdev_completed_queue(priv->dev, pkts_compl, bytes_compl); + netdev_tx_completed_queue(netdev_get_tx_queue(priv->dev, queue), + pkts_compl, bytes_compl); - if (unlikely(netif_queue_stopped(priv->dev) && - stmmac_tx_avail(priv) > STMMAC_TX_THRESH)) { + if (unlikely(netif_tx_queue_stopped(netdev_get_tx_queue(priv->dev, + queue))) && + stmmac_tx_avail(priv, queue) > STMMAC_TX_THRESH) { netif_dbg(priv, tx_done, priv->dev, "%s: restart transmit\n", __func__); - netif_wake_queue(priv->dev); + netif_tx_wake_queue(netdev_get_tx_queue(priv->dev, queue)); } if ((priv->eee_enabled) && (!priv->tx_path_in_lpi_mode)) { @@ -1525,33 +1830,36 @@ static inline void stmmac_disable_dma_irq(struct stmmac_priv *priv, u32 chan) /** * stmmac_tx_err - to manage the tx error * @priv: driver private structure - * @chan: channel index + * @queue: queue index * Description: it cleans the descriptors and restarts the transmission * in case of transmission errors. */ -static void stmmac_tx_err(struct stmmac_priv *priv, u32 chan) +static void stmmac_tx_err(struct stmmac_priv *priv, u32 queue) { + struct stmmac_tx_queue *tx_q = &priv->tx_queue[queue]; + u32 chan = queue; int i; - netif_stop_queue(priv->dev); + + netif_tx_stop_queue(netdev_get_tx_queue(priv->dev, queue)); stmmac_stop_tx_dma(priv, chan); - dma_free_tx_skbufs(priv); + dma_free_tx_skbufs(priv, queue); for (i = 0; i < DMA_TX_SIZE; i++) if (priv->extend_desc) - priv->hw->desc->init_tx_desc(&priv->dma_etx[i].basic, + priv->hw->desc->init_tx_desc(&tx_q->dma_etx[i].basic, priv->mode, (i == DMA_TX_SIZE - 1)); else - priv->hw->desc->init_tx_desc(&priv->dma_tx[i], + priv->hw->desc->init_tx_desc(&tx_q->dma_tx[i], priv->mode, (i == DMA_TX_SIZE - 1)); - priv->dirty_tx = 0; - priv->cur_tx = 0; - netdev_reset_queue(priv->dev); + tx_q->dirty_tx = 0; + tx_q->cur_tx = 0; + netdev_tx_reset_queue(netdev_get_tx_queue(priv->dev, queue)); stmmac_start_tx_dma(priv, chan); priv->dev->stats.tx_errors++; - netif_wake_queue(priv->dev); + netif_tx_wake_queue(netdev_get_tx_queue(priv->dev, queue)); } /** @@ -1596,12 +1904,14 @@ static void stmmac_dma_interrupt(struct stmmac_priv *priv) u32 chan; for (chan = 0; chan < tx_channel_count; chan++) { + struct stmmac_rx_queue *rx_q = &priv->rx_queue[chan]; + status = priv->hw->dma->dma_interrupt(priv->ioaddr, &priv->xstats, chan); if (likely((status & handle_rx)) || (status & handle_tx)) { - if (likely(napi_schedule_prep(&priv->napi))) { + if (likely(napi_schedule_prep(&rx_q->napi))) { stmmac_disable_dma_irq(priv, chan); - __napi_schedule(&priv->napi); + __napi_schedule(&rx_q->napi); } } @@ -1734,6 +2044,8 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv) { u32 rx_channels_count = priv->plat->rx_queues_to_use; u32 tx_channels_count = priv->plat->tx_queues_to_use; + struct stmmac_rx_queue *rx_q; + struct stmmac_tx_queue *tx_q; u32 dummy_dma_rx_phy = 0; u32 dummy_dma_tx_phy = 0; u32 chan = 0; @@ -1761,36 +2073,43 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv) /* DMA RX Channel Configuration */ for (chan = 0; chan < rx_channels_count; chan++) { + rx_q = &priv->rx_queue[chan]; + priv->hw->dma->init_rx_chan(priv->ioaddr, priv->plat->dma_cfg, - priv->dma_rx_phy, chan); + rx_q->dma_rx_phy, chan); - priv->rx_tail_addr = priv->dma_rx_phy + + rx_q->rx_tail_addr = rx_q->dma_rx_phy + (DMA_RX_SIZE * sizeof(struct dma_desc)); priv->hw->dma->set_rx_tail_ptr(priv->ioaddr, - priv->rx_tail_addr, + rx_q->rx_tail_addr, chan); } /* DMA TX Channel Configuration */ for (chan = 0; chan < tx_channels_count; chan++) { + tx_q = &priv->tx_queue[chan]; + priv->hw->dma->init_chan(priv->ioaddr, - priv->plat->dma_cfg, - chan); + priv->plat->dma_cfg, + chan); priv->hw->dma->init_tx_chan(priv->ioaddr, priv->plat->dma_cfg, - priv->dma_tx_phy, chan); + tx_q->dma_tx_phy, chan); - priv->tx_tail_addr = priv->dma_tx_phy + + tx_q->tx_tail_addr = tx_q->dma_tx_phy + (DMA_TX_SIZE * sizeof(struct dma_desc)); priv->hw->dma->set_tx_tail_ptr(priv->ioaddr, - priv->tx_tail_addr, + tx_q->tx_tail_addr, chan); } } else { + rx_q = &priv->rx_queue[chan]; + tx_q = &priv->tx_queue[chan]; + priv->hw->dma->init(priv->ioaddr, priv->plat->dma_cfg, - priv->dma_tx_phy, priv->dma_rx_phy, atds); + tx_q->dma_tx_phy, rx_q->dma_rx_phy, atds); } if (priv->plat->axi && priv->hw->dma->axi) @@ -1808,8 +2127,70 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv) static void stmmac_tx_timer(unsigned long data) { struct stmmac_priv *priv = (struct stmmac_priv *)data; + u32 tx_queues_count = priv->plat->tx_queues_to_use; + u32 queue; + + /* let's scan all the tx queues */ + for (queue = 0; queue < tx_queues_count; queue++) + stmmac_tx_clean(priv, queue); +} + +/** + * stmmac_stop_all_queues - Stop all queues + * @priv: driver private structure + */ +static void stmmac_stop_all_queues(struct stmmac_priv *priv) +{ + u32 tx_queues_cnt = priv->plat->tx_queues_to_use; + u32 queue; + + for (queue = 0; queue < tx_queues_cnt; queue++) + netif_tx_stop_queue(netdev_get_tx_queue(priv->dev, queue)); +} + +/** + * stmmac_start_all_queues - Start all queues + * @priv: driver private structure + */ +static void stmmac_start_all_queues(struct stmmac_priv *priv) +{ + u32 tx_queues_cnt = priv->plat->tx_queues_to_use; + u32 queue; - stmmac_tx_clean(priv); + for (queue = 0; queue < tx_queues_cnt; queue++) + netif_tx_start_queue(netdev_get_tx_queue(priv->dev, queue)); +} + +/** + * stmmac_disable_all_queues - Disable all queues + * @priv: driver private structure + */ +static void stmmac_disable_all_queues(struct stmmac_priv *priv) +{ + u32 rx_queues_cnt = priv->plat->rx_queues_to_use; + u32 queue; + + for (queue = 0; queue < rx_queues_cnt; queue++) { + struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue]; + + napi_disable(&rx_q->napi); + } +} + +/** + * stmmac_enable_all_queues - Enable all queues + * @priv: driver private structure + */ +static void stmmac_enable_all_queues(struct stmmac_priv *priv) +{ + u32 rx_queues_cnt = priv->plat->rx_queues_to_use; + u32 queue; + + for (queue = 0; queue < rx_queues_cnt; queue++) { + struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue]; + + napi_enable(&rx_q->napi); + } } /** @@ -2098,23 +2479,8 @@ static int stmmac_open(struct net_device *dev) memset(&priv->xstats, 0, sizeof(struct stmmac_extra_stats)); priv->xstats.threshold = tc; - priv->dma_buf_sz = STMMAC_ALIGN(buf_sz); priv->rx_copybreak = STMMAC_RX_COPYBREAK; - ret = alloc_dma_desc_resources(priv); - if (ret < 0) { - netdev_err(priv->dev, "%s: DMA descriptors allocation failed\n", - __func__); - goto dma_desc_error; - } - - ret = init_dma_desc_rings(dev, GFP_KERNEL); - if (ret < 0) { - netdev_err(priv->dev, "%s: DMA descriptors initialization failed\n", - __func__); - goto init_error; - } - ret = stmmac_hw_setup(dev, true); if (ret < 0) { netdev_err(priv->dev, "%s: Hw setup failed\n", __func__); @@ -2160,8 +2526,8 @@ static int stmmac_open(struct net_device *dev) } } - napi_enable(&priv->napi); - netif_start_queue(dev); + stmmac_enable_all_queues(priv); + stmmac_start_all_queues(priv); return 0; @@ -2178,7 +2544,7 @@ static int stmmac_open(struct net_device *dev) stmmac_hw_teardown(dev); init_error: free_dma_desc_resources(priv); -dma_desc_error: + if (dev->phydev) phy_disconnect(dev->phydev); @@ -2204,9 +2570,9 @@ static int stmmac_release(struct net_device *dev) phy_disconnect(dev->phydev); } - netif_stop_queue(dev); + stmmac_stop_all_queues(priv); - napi_disable(&priv->napi); + stmmac_disable_all_queues(priv); del_timer_sync(&priv->txtimer); @@ -2243,22 +2609,24 @@ static int stmmac_release(struct net_device *dev) * @des: buffer start address * @total_len: total length to fill in descriptors * @last_segmant: condition for the last descriptor + * @queue: TX queue index * Description: * This function fills descriptor and request new descriptors according to * buffer length to fill */ static void stmmac_tso_allocator(struct stmmac_priv *priv, unsigned int des, - int total_len, bool last_segment) + int total_len, bool last_segment, u32 queue) { + struct stmmac_tx_queue *tx_q = &priv->tx_queue[queue]; struct dma_desc *desc; - int tmp_len; u32 buff_size; + int tmp_len; tmp_len = total_len; while (tmp_len > 0) { - priv->cur_tx = STMMAC_GET_ENTRY(priv->cur_tx, DMA_TX_SIZE); - desc = priv->dma_tx + priv->cur_tx; + tx_q->cur_tx = STMMAC_GET_ENTRY(tx_q->cur_tx, DMA_TX_SIZE); + desc = tx_q->dma_tx + tx_q->cur_tx; desc->des0 = cpu_to_le32(des + (total_len - tmp_len)); buff_size = tmp_len >= TSO_MAX_BUFF_SIZE ? @@ -2302,23 +2670,27 @@ static void stmmac_tso_allocator(struct stmmac_priv *priv, unsigned int des, */ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev) { - u32 pay_len, mss; - int tmp_pay_len = 0; + struct dma_desc *desc, *first, *mss_desc = NULL; struct stmmac_priv *priv = netdev_priv(dev); + u32 queue = skb_get_queue_mapping(skb); int nfrags = skb_shinfo(skb)->nr_frags; unsigned int first_entry, des; - struct dma_desc *desc, *first, *mss_desc = NULL; + struct stmmac_tx_queue *tx_q; + int tmp_pay_len = 0; + u32 pay_len, mss; u8 proto_hdr_len; int i; + tx_q = &priv->tx_queue[queue]; + /* Compute header lengths */ proto_hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb); /* Desc availability based on threshold should be enough safe */ - if (unlikely(stmmac_tx_avail(priv) < + if (unlikely(stmmac_tx_avail(priv, queue) < (((skb->len - proto_hdr_len) / TSO_MAX_BUFF_SIZE + 1)))) { - if (!netif_queue_stopped(dev)) { - netif_stop_queue(dev); + if (!netif_tx_queue_stopped(netdev_get_tx_queue(dev, queue))) { + netif_tx_stop_queue(netdev_get_tx_queue(dev, queue)); /* This is a hard error, log it. */ netdev_err(priv->dev, "%s: Tx Ring full when queue awake\n", @@ -2333,10 +2705,10 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev) /* set new MSS value if needed */ if (mss != priv->mss) { - mss_desc = priv->dma_tx + priv->cur_tx; + mss_desc = tx_q->dma_tx + tx_q->cur_tx; priv->hw->desc->set_mss(mss_desc, mss); priv->mss = mss; - priv->cur_tx = STMMAC_GET_ENTRY(priv->cur_tx, DMA_TX_SIZE); + tx_q->cur_tx = STMMAC_GET_ENTRY(tx_q->cur_tx, DMA_TX_SIZE); } if (netif_msg_tx_queued(priv)) { @@ -2346,9 +2718,9 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev) skb->data_len); } - first_entry = priv->cur_tx; + first_entry = tx_q->cur_tx; - desc = priv->dma_tx + first_entry; + desc = tx_q->dma_tx + first_entry; first = desc; /* first descriptor: fill Headers on Buf1 */ @@ -2357,9 +2729,9 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev) if (dma_mapping_error(priv->device, des)) goto dma_map_err; - priv->tx_skbuff_dma[first_entry].buf = des; - priv->tx_skbuff_dma[first_entry].len = skb_headlen(skb); - priv->tx_skbuff[first_entry] = skb; + tx_q->tx_skbuff_dma[first_entry].buf = des; + tx_q->tx_skbuff_dma[first_entry].len = skb_headlen(skb); + tx_q->tx_skbuff[first_entry] = skb; first->des0 = cpu_to_le32(des); @@ -2370,7 +2742,7 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev) /* If needed take extra descriptors to fill the remaining payload */ tmp_pay_len = pay_len - TSO_MAX_BUFF_SIZE; - stmmac_tso_allocator(priv, des, tmp_pay_len, (nfrags == 0)); + stmmac_tso_allocator(priv, des, tmp_pay_len, (nfrags == 0), queue); /* Prepare fragments */ for (i = 0; i < nfrags; i++) { @@ -2383,22 +2755,22 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev) goto dma_map_err; stmmac_tso_allocator(priv, des, skb_frag_size(frag), - (i == nfrags - 1)); + (i == nfrags - 1), queue); - priv->tx_skbuff_dma[priv->cur_tx].buf = des; - priv->tx_skbuff_dma[priv->cur_tx].len = skb_frag_size(frag); - priv->tx_skbuff[priv->cur_tx] = NULL; - priv->tx_skbuff_dma[priv->cur_tx].map_as_page = true; + tx_q->tx_skbuff_dma[tx_q->cur_tx].buf = des; + tx_q->tx_skbuff_dma[tx_q->cur_tx].len = skb_frag_size(frag); + tx_q->tx_skbuff[tx_q->cur_tx] = NULL; + tx_q->tx_skbuff_dma[tx_q->cur_tx].map_as_page = true; } - priv->tx_skbuff_dma[priv->cur_tx].last_segment = true; + tx_q->tx_skbuff_dma[tx_q->cur_tx].last_segment = true; - priv->cur_tx = STMMAC_GET_ENTRY(priv->cur_tx, DMA_TX_SIZE); + tx_q->cur_tx = STMMAC_GET_ENTRY(tx_q->cur_tx, DMA_TX_SIZE); - if (unlikely(stmmac_tx_avail(priv) <= (MAX_SKB_FRAGS + 1))) { + if (unlikely(stmmac_tx_avail(priv, queue) <= (MAX_SKB_FRAGS + 1))) { netif_dbg(priv, hw, priv->dev, "%s: stop transmitted packets\n", __func__); - netif_stop_queue(dev); + netif_tx_stop_queue(netdev_get_tx_queue(dev, queue)); } dev->stats.tx_bytes += skb->len; @@ -2430,7 +2802,7 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev) priv->hw->desc->prepare_tso_tx_desc(first, 1, proto_hdr_len, pay_len, - 1, priv->tx_skbuff_dma[first_entry].last_segment, + 1, tx_q->tx_skbuff_dma[first_entry].last_segment, tcp_hdrlen(skb) / 4, (skb->len - proto_hdr_len)); /* If context desc is used to change MSS */ @@ -2445,20 +2817,20 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev) if (netif_msg_pktdata(priv)) { pr_info("%s: curr=%d dirty=%d f=%d, e=%d, f_p=%p, nfrags %d\n", - __func__, priv->cur_tx, priv->dirty_tx, first_entry, - priv->cur_tx, first, nfrags); + __func__, tx_q->cur_tx, tx_q->dirty_tx, first_entry, + tx_q->cur_tx, first, nfrags); - priv->hw->desc->display_ring((void *)priv->dma_tx, DMA_TX_SIZE, + priv->hw->desc->display_ring((void *)tx_q->dma_tx, DMA_TX_SIZE, 0); pr_info(">>> frame to be transmitted: "); print_pkt(skb->data, skb_headlen(skb)); } - netdev_sent_queue(dev, skb->len); + netdev_tx_sent_queue(netdev_get_tx_queue(dev, queue), skb->len); - priv->hw->dma->set_tx_tail_ptr(priv->ioaddr, priv->tx_tail_addr, - STMMAC_CHAN0); + priv->hw->dma->set_tx_tail_ptr(priv->ioaddr, tx_q->tx_tail_addr, + queue); return NETDEV_TX_OK; @@ -2482,21 +2854,25 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) struct stmmac_priv *priv = netdev_priv(dev); unsigned int nopaged_len = skb_headlen(skb); int i, csum_insertion = 0, is_jumbo = 0; + u32 queue = skb_get_queue_mapping(skb); int nfrags = skb_shinfo(skb)->nr_frags; unsigned int entry, first_entry; struct dma_desc *desc, *first; + struct stmmac_tx_queue *tx_q; unsigned int enh_desc; unsigned int des; + tx_q = &priv->tx_queue[queue]; + /* Manage oversized TCP frames for GMAC4 device */ if (skb_is_gso(skb) && priv->tso) { if (ip_hdr(skb)->protocol == IPPROTO_TCP) return stmmac_tso_xmit(skb, dev); } - if (unlikely(stmmac_tx_avail(priv) < nfrags + 1)) { - if (!netif_queue_stopped(dev)) { - netif_stop_queue(dev); + if (unlikely(stmmac_tx_avail(priv, queue) < nfrags + 1)) { + if (!netif_tx_queue_stopped(netdev_get_tx_queue(dev, queue))) { + netif_tx_stop_queue(netdev_get_tx_queue(dev, queue)); /* This is a hard error, log it. */ netdev_err(priv->dev, "%s: Tx Ring full when queue awake\n", @@ -2508,19 +2884,19 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) if (priv->tx_path_in_lpi_mode) stmmac_disable_eee_mode(priv); - entry = priv->cur_tx; + entry = tx_q->cur_tx; first_entry = entry; csum_insertion = (skb->ip_summed == CHECKSUM_PARTIAL); if (likely(priv->extend_desc)) - desc = (struct dma_desc *)(priv->dma_etx + entry); + desc = (struct dma_desc *)(tx_q->dma_etx + entry); else - desc = priv->dma_tx + entry; + desc = tx_q->dma_tx + entry; first = desc; - priv->tx_skbuff[first_entry] = skb; + tx_q->tx_skbuff[first_entry] = skb; enh_desc = priv->plat->enh_desc; /* To program the descriptors according to the size of the frame */ @@ -2529,7 +2905,7 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) if (unlikely(is_jumbo) && likely(priv->synopsys_id < DWMAC_CORE_4_00)) { - entry = priv->hw->mode->jumbo_frm(priv, skb, csum_insertion); + entry = priv->hw->mode->jumbo_frm(tx_q, skb, csum_insertion); if (unlikely(entry < 0)) goto dma_map_err; } @@ -2542,26 +2918,26 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) entry = STMMAC_GET_ENTRY(entry, DMA_TX_SIZE); if (likely(priv->extend_desc)) - desc = (struct dma_desc *)(priv->dma_etx + entry); + desc = (struct dma_desc *)(tx_q->dma_etx + entry); else - desc = priv->dma_tx + entry; + desc = tx_q->dma_tx + entry; des = skb_frag_dma_map(priv->device, frag, 0, len, DMA_TO_DEVICE); if (dma_mapping_error(priv->device, des)) goto dma_map_err; /* should reuse desc w/o issues */ - priv->tx_skbuff[entry] = NULL; + tx_q->tx_skbuff[entry] = NULL; - priv->tx_skbuff_dma[entry].buf = des; + tx_q->tx_skbuff_dma[entry].buf = des; if (unlikely(priv->synopsys_id >= DWMAC_CORE_4_00)) desc->des0 = cpu_to_le32(des); else desc->des2 = cpu_to_le32(des); - priv->tx_skbuff_dma[entry].map_as_page = true; - priv->tx_skbuff_dma[entry].len = len; - priv->tx_skbuff_dma[entry].last_segment = last_segment; + tx_q->tx_skbuff_dma[entry].map_as_page = true; + tx_q->tx_skbuff_dma[entry].len = len; + tx_q->tx_skbuff_dma[entry].last_segment = last_segment; /* Prepare the descriptor and set the own bit too */ priv->hw->desc->prepare_tx_desc(desc, 0, len, csum_insertion, @@ -2570,20 +2946,20 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) entry = STMMAC_GET_ENTRY(entry, DMA_TX_SIZE); - priv->cur_tx = entry; + tx_q->cur_tx = entry; if (netif_msg_pktdata(priv)) { void *tx_head; netdev_dbg(priv->dev, "%s: curr=%d dirty=%d f=%d, e=%d, first=%p, nfrags=%d", - __func__, priv->cur_tx, priv->dirty_tx, first_entry, + __func__, tx_q->cur_tx, tx_q->dirty_tx, first_entry, entry, first, nfrags); if (priv->extend_desc) - tx_head = (void *)priv->dma_etx; + tx_head = (void *)tx_q->dma_etx; else - tx_head = (void *)priv->dma_tx; + tx_head = (void *)tx_q->dma_tx; priv->hw->desc->display_ring(tx_head, DMA_TX_SIZE, false); @@ -2591,10 +2967,10 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) print_pkt(skb->data, skb->len); } - if (unlikely(stmmac_tx_avail(priv) <= (MAX_SKB_FRAGS + 1))) { + if (unlikely(stmmac_tx_avail(priv, queue) <= (MAX_SKB_FRAGS + 1))) { netif_dbg(priv, hw, priv->dev, "%s: stop transmitted packets\n", __func__); - netif_stop_queue(dev); + netif_tx_stop_queue(netdev_get_tx_queue(dev, queue)); } dev->stats.tx_bytes += skb->len; @@ -2629,14 +3005,14 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) if (dma_mapping_error(priv->device, des)) goto dma_map_err; - priv->tx_skbuff_dma[first_entry].buf = des; + tx_q->tx_skbuff_dma[first_entry].buf = des; if (unlikely(priv->synopsys_id >= DWMAC_CORE_4_00)) first->des0 = cpu_to_le32(des); else first->des2 = cpu_to_le32(des); - priv->tx_skbuff_dma[first_entry].len = nopaged_len; - priv->tx_skbuff_dma[first_entry].last_segment = last_segment; + tx_q->tx_skbuff_dma[first_entry].len = nopaged_len; + tx_q->tx_skbuff_dma[first_entry].last_segment = last_segment; if (unlikely((skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) && priv->hwts_tx_en)) { @@ -2657,13 +3033,13 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) dma_wmb(); } - netdev_sent_queue(dev, skb->len); + netdev_tx_sent_queue(netdev_get_tx_queue(dev, queue), skb->len); if (priv->synopsys_id < DWMAC_CORE_4_00) priv->hw->dma->enable_dma_transmission(priv->ioaddr); else - priv->hw->dma->set_tx_tail_ptr(priv->ioaddr, priv->tx_tail_addr, - STMMAC_CHAN0); + priv->hw->dma->set_tx_tail_ptr(priv->ioaddr, tx_q->tx_tail_addr, + queue); return NETDEV_TX_OK; @@ -2691,9 +3067,9 @@ static void stmmac_rx_vlan(struct net_device *dev, struct sk_buff *skb) } -static inline int stmmac_rx_threshold_count(struct stmmac_priv *priv) +static inline int stmmac_rx_threshold_count(struct stmmac_rx_queue *rx_q) { - if (priv->rx_zeroc_thresh < STMMAC_RX_THRESH) + if (rx_q->rx_zeroc_thresh < STMMAC_RX_THRESH) return 0; return 1; @@ -2702,30 +3078,32 @@ static inline int stmmac_rx_threshold_count(struct stmmac_priv *priv) /** * stmmac_rx_refill - refill used skb preallocated buffers * @priv: driver private structure + * @queue: RX queue index * Description : this is to reallocate the skb for the reception process * that is based on zero-copy. */ -static inline void stmmac_rx_refill(struct stmmac_priv *priv) +static inline void stmmac_rx_refill(struct stmmac_priv *priv, u32 queue) { + struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue]; + int dirty = stmmac_rx_dirty(priv, queue); + unsigned int entry = rx_q->dirty_rx; int bfsize = priv->dma_buf_sz; - unsigned int entry = priv->dirty_rx; - int dirty = stmmac_rx_dirty(priv); while (dirty-- > 0) { struct dma_desc *p; if (priv->extend_desc) - p = (struct dma_desc *)(priv->dma_erx + entry); + p = (struct dma_desc *)(rx_q->dma_erx + entry); else - p = priv->dma_rx + entry; + p = rx_q->dma_rx + entry; - if (likely(priv->rx_skbuff[entry] == NULL)) { + if (!rx_q->rx_skbuff[entry]) { struct sk_buff *skb; skb = netdev_alloc_skb_ip_align(priv->dev, bfsize); if (unlikely(!skb)) { /* so for a while no zero-copy! */ - priv->rx_zeroc_thresh = STMMAC_RX_THRESH; + rx_q->rx_zeroc_thresh = STMMAC_RX_THRESH; if (unlikely(net_ratelimit())) dev_err(priv->device, "fail to alloc skb entry %d\n", @@ -2733,28 +3111,28 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv) break; } - priv->rx_skbuff[entry] = skb; - priv->rx_skbuff_dma[entry] = + rx_q->rx_skbuff[entry] = skb; + rx_q->rx_skbuff_dma[entry] = dma_map_single(priv->device, skb->data, bfsize, DMA_FROM_DEVICE); if (dma_mapping_error(priv->device, - priv->rx_skbuff_dma[entry])) { + rx_q->rx_skbuff_dma[entry])) { netdev_err(priv->dev, "Rx DMA map failed\n"); dev_kfree_skb(skb); break; } if (unlikely(priv->synopsys_id >= DWMAC_CORE_4_00)) { - p->des0 = cpu_to_le32(priv->rx_skbuff_dma[entry]); + p->des0 = cpu_to_le32(rx_q->rx_skbuff_dma[entry]); p->des1 = 0; } else { - p->des2 = cpu_to_le32(priv->rx_skbuff_dma[entry]); + p->des2 = cpu_to_le32(rx_q->rx_skbuff_dma[entry]); } if (priv->hw->mode->refill_desc3) - priv->hw->mode->refill_desc3(priv, p); + priv->hw->mode->refill_desc3(rx_q, p); - if (priv->rx_zeroc_thresh > 0) - priv->rx_zeroc_thresh--; + if (rx_q->rx_zeroc_thresh > 0) + rx_q->rx_zeroc_thresh--; netif_dbg(priv, rx_status, priv->dev, "refill entry #%d\n", entry); @@ -2770,7 +3148,7 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv) entry = STMMAC_GET_ENTRY(entry, DMA_RX_SIZE); } - priv->dirty_rx = entry; + rx_q->dirty_rx = entry; } /** @@ -2780,21 +3158,22 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv) * Description : this the function called by the napi poll method. * It gets all the frames inside the ring. */ -static int stmmac_rx(struct stmmac_priv *priv, int limit) +static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) { - unsigned int entry = priv->cur_rx; + struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue]; + unsigned int entry = rx_q->cur_rx; + int coe = priv->hw->rx_csum; unsigned int next_entry; unsigned int count = 0; - int coe = priv->hw->rx_csum; if (netif_msg_rx_status(priv)) { void *rx_head; netdev_dbg(priv->dev, "%s: descriptor ring:\n", __func__); if (priv->extend_desc) - rx_head = (void *)priv->dma_erx; + rx_head = (void *)rx_q->dma_erx; else - rx_head = (void *)priv->dma_rx; + rx_head = (void *)rx_q->dma_rx; priv->hw->desc->display_ring(rx_head, DMA_RX_SIZE, true); } @@ -2804,9 +3183,9 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit) struct dma_desc *np; if (priv->extend_desc) - p = (struct dma_desc *)(priv->dma_erx + entry); + p = (struct dma_desc *)(rx_q->dma_erx + entry); else - p = priv->dma_rx + entry; + p = rx_q->dma_rx + entry; /* read the status of the incoming frame */ status = priv->hw->desc->rx_status(&priv->dev->stats, @@ -2817,20 +3196,20 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit) count++; - priv->cur_rx = STMMAC_GET_ENTRY(priv->cur_rx, DMA_RX_SIZE); - next_entry = priv->cur_rx; + rx_q->cur_rx = STMMAC_GET_ENTRY(rx_q->cur_rx, DMA_RX_SIZE); + next_entry = rx_q->cur_rx; if (priv->extend_desc) - np = (struct dma_desc *)(priv->dma_erx + next_entry); + np = (struct dma_desc *)(rx_q->dma_erx + next_entry); else - np = priv->dma_rx + next_entry; + np = rx_q->dma_rx + next_entry; prefetch(np); if ((priv->extend_desc) && (priv->hw->desc->rx_extended_status)) priv->hw->desc->rx_extended_status(&priv->dev->stats, &priv->xstats, - priv->dma_erx + + rx_q->dma_erx + entry); if (unlikely(status == discard_frame)) { priv->dev->stats.rx_errors++; @@ -2840,9 +3219,9 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit) * them in stmmac_rx_refill() function so that * device can reuse it. */ - priv->rx_skbuff[entry] = NULL; + rx_q->rx_skbuff[entry] = NULL; dma_unmap_single(priv->device, - priv->rx_skbuff_dma[entry], + rx_q->rx_skbuff_dma[entry], priv->dma_buf_sz, DMA_FROM_DEVICE); } @@ -2890,7 +3269,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit) */ if (unlikely(!priv->plat->has_gmac4 && ((frame_len < priv->rx_copybreak) || - stmmac_rx_threshold_count(priv)))) { + stmmac_rx_threshold_count(rx_q)))) { skb = netdev_alloc_skb_ip_align(priv->dev, frame_len); if (unlikely(!skb)) { @@ -2902,21 +3281,21 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit) } dma_sync_single_for_cpu(priv->device, - priv->rx_skbuff_dma + rx_q->rx_skbuff_dma [entry], frame_len, DMA_FROM_DEVICE); skb_copy_to_linear_data(skb, - priv-> + rx_q-> rx_skbuff[entry]->data, frame_len); skb_put(skb, frame_len); dma_sync_single_for_device(priv->device, - priv->rx_skbuff_dma + rx_q->rx_skbuff_dma [entry], frame_len, DMA_FROM_DEVICE); } else { - skb = priv->rx_skbuff[entry]; + skb = rx_q->rx_skbuff[entry]; if (unlikely(!skb)) { netdev_err(priv->dev, "%s: Inconsistent Rx chain\n", @@ -2925,12 +3304,12 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit) break; } prefetch(skb->data - NET_IP_ALIGN); - priv->rx_skbuff[entry] = NULL; - priv->rx_zeroc_thresh++; + rx_q->rx_skbuff[entry] = NULL; + rx_q->rx_zeroc_thresh++; skb_put(skb, frame_len); dma_unmap_single(priv->device, - priv->rx_skbuff_dma[entry], + rx_q->rx_skbuff_dma[entry], priv->dma_buf_sz, DMA_FROM_DEVICE); } @@ -2952,7 +3331,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit) else skb->ip_summed = CHECKSUM_UNNECESSARY; - napi_gro_receive(&priv->napi, skb); + napi_gro_receive(&rx_q->napi, skb); priv->dev->stats.rx_packets++; priv->dev->stats.rx_bytes += frame_len; @@ -2960,7 +3339,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit) entry = next_entry; } - stmmac_rx_refill(priv); + stmmac_rx_refill(priv, queue); priv->xstats.rx_pkt_n += count; @@ -2977,14 +3356,22 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit) */ static int stmmac_poll(struct napi_struct *napi, int budget) { - struct stmmac_priv *priv = container_of(napi, struct stmmac_priv, napi); - int work_done = 0; - u32 chan = STMMAC_CHAN0; + struct stmmac_rx_queue *rx_q = + container_of(napi, struct stmmac_rx_queue, napi); + struct stmmac_priv *priv = rx_q->priv_data; + u32 tx_count = priv->dma_cap.number_tx_queues; + u32 chan = rx_q->queue_index; + u32 work_done = 0; + u32 queue = 0; priv->xstats.napi_poll++; - stmmac_tx_clean(priv); + /* check all the queues */ + for (queue = 0; queue < tx_count; queue++) + stmmac_tx_clean(priv, queue); + + /* Process RX packets from this queue */ + work_done = stmmac_rx(priv, budget, rx_q->queue_index); - work_done = stmmac_rx(priv, budget); if (work_done < budget) { napi_complete_done(napi, work_done); stmmac_enable_dma_irq(priv, chan); @@ -3003,10 +3390,12 @@ static int stmmac_poll(struct napi_struct *napi, int budget) static void stmmac_tx_timeout(struct net_device *dev) { struct stmmac_priv *priv = netdev_priv(dev); - u32 chan = STMMAC_CHAN0; + u32 tx_count = priv->plat->tx_queues_to_use; + u32 chan; /* Clear Tx resources and restart transmitting again */ - stmmac_tx_err(priv, chan); + for (chan = 0; chan < tx_count; chan++) + stmmac_tx_err(priv, chan); } /** @@ -3145,6 +3534,9 @@ static irqreturn_t stmmac_interrupt(int irq, void *dev_id) if (priv->synopsys_id >= DWMAC_CORE_4_00) { for (queue = 0; queue < queues_count; queue++) { + struct stmmac_rx_queue *rx_q = + &priv->rx_queue[queue]; + status |= priv->hw->mac->host_mtl_irq_status(priv->hw, queue); @@ -3152,7 +3544,7 @@ static irqreturn_t stmmac_interrupt(int irq, void *dev_id) if (status & CORE_IRQ_MTL_RX_OVERFLOW && priv->hw->dma->set_rx_tail_ptr) priv->hw->dma->set_rx_tail_ptr(priv->ioaddr, - priv->rx_tail_addr, + rx_q->rx_tail_addr, queue); } } @@ -3252,17 +3644,40 @@ static int stmmac_sysfs_ring_read(struct seq_file *seq, void *v) { struct net_device *dev = seq->private; struct stmmac_priv *priv = netdev_priv(dev); + u32 rx_count = priv->plat->rx_queues_to_use; + u32 tx_count = priv->plat->tx_queues_to_use; + u32 queue; - if (priv->extend_desc) { - seq_printf(seq, "Extended RX descriptor ring:\n"); - sysfs_display_ring((void *)priv->dma_erx, DMA_RX_SIZE, 1, seq); - seq_printf(seq, "Extended TX descriptor ring:\n"); - sysfs_display_ring((void *)priv->dma_etx, DMA_TX_SIZE, 1, seq); - } else { - seq_printf(seq, "RX descriptor ring:\n"); - sysfs_display_ring((void *)priv->dma_rx, DMA_RX_SIZE, 0, seq); - seq_printf(seq, "TX descriptor ring:\n"); - sysfs_display_ring((void *)priv->dma_tx, DMA_TX_SIZE, 0, seq); + for (queue = 0; queue < rx_count; queue++) { + struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue]; + + seq_printf(seq, "RX Queue %d:\n", queue); + + if (priv->extend_desc) { + seq_printf(seq, "Extended descriptor ring:\n"); + sysfs_display_ring((void *)rx_q->dma_erx, + DMA_RX_SIZE, 1, seq); + } else { + seq_printf(seq, "Descriptor ring:\n"); + sysfs_display_ring((void *)rx_q->dma_rx, + DMA_RX_SIZE, 0, seq); + } + } + + for (queue = 0; queue < tx_count; queue++) { + struct stmmac_tx_queue *tx_q = &priv->tx_queue[queue]; + + seq_printf(seq, "TX Queue %d:\n", queue); + + if (priv->extend_desc) { + seq_printf(seq, "Extended descriptor ring:\n"); + sysfs_display_ring((void *)tx_q->dma_etx, + DMA_TX_SIZE, 1, seq); + } else { + seq_printf(seq, "Descriptor ring:\n"); + sysfs_display_ring((void *)tx_q->dma_tx, + DMA_TX_SIZE, 0, seq); + } } return 0; @@ -3545,11 +3960,14 @@ int stmmac_dvr_probe(struct device *device, struct plat_stmmacenet_data *plat_dat, struct stmmac_resources *res) { - int ret = 0; struct net_device *ndev = NULL; struct stmmac_priv *priv; + int ret = 0; + u32 queue; - ndev = alloc_etherdev(sizeof(struct stmmac_priv)); + ndev = alloc_etherdev_mqs(sizeof(struct stmmac_priv), + MTL_MAX_TX_QUEUES, + MTL_MAX_RX_QUEUES); if (!ndev) return -ENOMEM; @@ -3591,6 +4009,12 @@ int stmmac_dvr_probe(struct device *device, if (ret) goto error_hw_init; + /* Configure real RX and TX queues */ + ndev->real_num_rx_queues = priv->plat->rx_queues_to_use; + ndev->real_num_tx_queues = priv->plat->tx_queues_to_use; + + priv->dma_buf_sz = STMMAC_ALIGN(buf_sz); + ndev->netdev_ops = &stmmac_netdev_ops; ndev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | @@ -3640,7 +4064,26 @@ int stmmac_dvr_probe(struct device *device, "Enable RX Mitigation via HW Watchdog Timer\n"); } - netif_napi_add(ndev, &priv->napi, stmmac_poll, 64); + ret = alloc_dma_desc_resources(priv); + if (ret < 0) { + netdev_err(priv->dev, "%s: DMA descriptors allocation failed\n", + __func__); + goto init_dma_error; + } + + ret = init_dma_desc_rings(priv->dev, GFP_KERNEL); + if (ret < 0) { + netdev_err(priv->dev, "%s: DMA descriptors initialization failed\n", + __func__); + goto init_dma_error; + } + + for (queue = 0; queue < priv->plat->rx_queues_to_use; queue++) { + struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue]; + + netif_napi_add(ndev, &rx_q->napi, stmmac_poll, + (64 * priv->plat->rx_queues_to_use)); + } spin_lock_init(&priv->lock); @@ -3685,7 +4128,13 @@ int stmmac_dvr_probe(struct device *device, priv->hw->pcs != STMMAC_PCS_RTBI) stmmac_mdio_unregister(ndev); error_mdio_register: - netif_napi_del(&priv->napi); + for (queue = 0; queue < priv->plat->rx_queues_to_use; queue++) { + struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue]; + + netif_napi_del(&rx_q->napi); + } +init_dma_error: + free_dma_desc_resources(priv); error_hw_init: free_netdev(ndev); @@ -3747,9 +4196,9 @@ int stmmac_suspend(struct device *dev) spin_lock_irqsave(&priv->lock, flags); netif_device_detach(ndev); - netif_stop_queue(ndev); + stmmac_stop_all_queues(priv); - napi_disable(&priv->napi); + stmmac_disable_all_queues(priv); /* Stop TX/RX DMA */ stmmac_stop_all_dma(priv); @@ -3775,6 +4224,31 @@ int stmmac_suspend(struct device *dev) EXPORT_SYMBOL_GPL(stmmac_suspend); /** + * stmmac_reset_queues_param - reset queue parameters + * @dev: device pointer + */ +static void stmmac_reset_queues_param(struct stmmac_priv *priv) +{ + u32 rx_cnt = priv->plat->rx_queues_to_use; + u32 tx_cnt = priv->plat->tx_queues_to_use; + u32 queue; + + for (queue = 0; queue < rx_cnt; queue++) { + struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue]; + + rx_q->cur_rx = 0; + rx_q->dirty_rx = 0; + } + + for (queue = 0; queue < tx_cnt; queue++) { + struct stmmac_tx_queue *tx_q = &priv->tx_queue[queue]; + + tx_q->cur_tx = 0; + tx_q->dirty_tx = 0; + } +} + +/** * stmmac_resume - resume callback * @dev: device pointer * Description: when resume this function is invoked to setup the DMA and CORE @@ -3814,10 +4288,8 @@ int stmmac_resume(struct device *dev) spin_lock_irqsave(&priv->lock, flags); - priv->cur_rx = 0; - priv->dirty_rx = 0; - priv->dirty_tx = 0; - priv->cur_tx = 0; + stmmac_reset_queues_param(priv); + /* reset private mss value to force mss context settings at * next tso xmit (only used for gmac4). */ @@ -3829,9 +4301,9 @@ int stmmac_resume(struct device *dev) stmmac_init_tx_coalesce(priv); stmmac_set_rx_mode(ndev); - napi_enable(&priv->napi); + stmmac_enable_all_queues(priv); - netif_start_queue(ndev); + stmmac_start_all_queues(priv); spin_unlock_irqrestore(&priv->lock, flags); -- 2.9.3 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [v2,net-next,1/3] net: stmmac: enable multiple buffers 2017-03-17 16:11 ` [PATCH v2 net-next 1/3] net: stmmac: enable multiple buffers Joao Pinto @ 2017-03-23 17:17 ` Thierry Reding 2017-03-23 17:27 ` Joao Pinto 0 siblings, 1 reply; 21+ messages in thread From: Thierry Reding @ 2017-03-23 17:17 UTC (permalink / raw) To: Joao Pinto; +Cc: davem, peppe.cavallaro, alexandre.torgue, f.fainelli, netdev [-- Attachment #1: Type: text/plain, Size: 12420 bytes --] On Fri, Mar 17, 2017 at 04:11:05PM +0000, Joao Pinto wrote: > This patch creates 2 new structures (stmmac_tx_queue and stmmac_rx_queue) > in include/linux/stmmac.h, enabling that each RX and TX queue has its > own buffers and data. > > Signed-off-by: Joao Pinto <jpinto@synopsys.com> > --- > changes v1->v2: > - just to keep up version > > drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 45 +- > drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 46 +- > drivers/net/ethernet/stmicro/stmmac/stmmac.h | 49 +- > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1306 ++++++++++++++------- > 4 files changed, 973 insertions(+), 473 deletions(-) Hi Joao, This seems to break support on Tegra186 again. I've gone through this patch multiple times and I can't figure out what could be causing it. Any ideas? What I'm seeing is that the transmit queue 0 times out: [ 101.121774] Sending DHCP requests ... [ 111.841763] NETDEV WATCHDOG: eth0 (dwc-eth-dwmac): transmit queue 0 timed out and then I also see this: [ 112.252024] dwc-eth-dwmac 2490000.ethernet: DMA-API: device driver tries to free DMA memory it has not allocated [device address=0x0000000057ac6e9d] [size=0 bytes] [ 112.266606] ------------[ cut here ]------------ [ 112.271220] WARNING: CPU: 0 PID: 0 at /home/thierry.reding/src/kernel/linux-tegra.git/lib/dma-debug.c:1106 check_unmap+0x7b0/0x930 [ 112.282934] Modules linked in: [ 112.285985] [ 112.287474] CPU: 0 PID: 0 Comm: swapper/0 Tainted: G S W 4.11.0-rc3-next-20170323-00060-g2eab4557749b-dirty #400 [ 112.298581] Hardware name: NVIDIA Tegra186 P2771-0000 Development Board (DT) [ 112.305615] task: ffff000008f87b00 task.stack: ffff000008f70000 [ 112.311523] PC is at check_unmap+0x7b0/0x930 [ 112.315785] LR is at check_unmap+0x7b0/0x930 [ 112.320046] pc : [<ffff0000083d75f0>] lr : [<ffff0000083d75f0>] pstate: 60000145 [ 112.327426] sp : ffff8001f5e50c50 [ 112.330733] x29: ffff8001f5e50c50 x28: ffff000008f75180 [ 112.336042] x27: ffff000008f87b00 x26: 0000000000000020 [ 112.341351] x25: 0000000000000140 x24: ffff000008f81000 [ 112.346660] x23: ffff8001ec4b0810 x22: 0000000057ac6e9d [ 112.351969] x21: 0000000057ac6e9d x20: ffff8001f5e50cb0 [ 112.357277] x19: ffff8001ec4b0810 x18: 0000000000000010 [ 112.362586] x17: 00000000262ea01f x16: 000000000f48bf67 [ 112.367895] x15: 0000000000000006 x14: 5d64396536636137 [ 112.373203] x13: 3530303030303030 x12: 3078303d73736572 [ 112.378511] x11: 6464612065636976 x10: 65645b2064657461 [ 112.383819] x9 : ffff00000852c238 x8 : 00000000000001fb [ 112.389126] x7 : 0000000000000000 x6 : ffff00000810ad58 [ 112.394434] x5 : 0000000000000000 x4 : 0000000000000000 [ 112.399743] x3 : ffffffffffffffff x2 : ffff000008f99258 [ 112.405050] x1 : ffff000008f87b00 x0 : 0000000000000097 [ 112.410358] [ 112.411846] ---[ end trace 48028f96a0e990fb ]--- [ 112.416453] Call trace: [ 112.418895] Exception stack(0xffff8001f5e50a80 to 0xffff8001f5e50bb0) [ 112.425324] 0a80: ffff8001ec4b0810 0001000000000000 ffff8001f5e50c50 ffff0000083d75f0 [ 112.433139] 0aa0: 00000000000001c0 0000000000000000 0000000000000000 ffff000008d1c0c0 [ 112.440954] 0ac0: ffff8001f5e50c50 ffff8001f5e50c50 ffff8001f5e50c10 00000000ffffffc8 [ 112.448769] 0ae0: ffff8001f5e50b10 ffff00000810c3a8 ffff8001f5e50c50 ffff8001f5e50c50 [ 112.456585] 0b00: ffff8001f5e50c10 00000000ffffffc8 ffff8001f5e50bc0 ffff000008178388 [ 112.464399] 0b20: 0000000000000097 ffff000008f87b00 ffff000008f99258 ffffffffffffffff [ 112.472215] 0b40: 0000000000000000 0000000000000000 ffff00000810ad58 0000000000000000 [ 112.480030] 0b60: 00000000000001fb ffff00000852c238 65645b2064657461 6464612065636976 [ 112.487845] 0b80: 3078303d73736572 3530303030303030 5d64396536636137 0000000000000006 [ 112.495659] 0ba0: 000000000f48bf67 00000000262ea01f [ 112.500528] [<ffff0000083d75f0>] check_unmap+0x7b0/0x930 [ 112.505830] [<ffff0000083d77d8>] debug_dma_unmap_page+0x68/0x70 [ 112.511744] [<ffff0000086a9654>] stmmac_free_tx_buffers.isra.1+0x114/0x198 [ 112.518604] [<ffff0000086a9754>] stmmac_tx_err+0x7c/0x160 [ 112.523993] [<ffff0000086a986c>] stmmac_tx_timeout+0x34/0x50 [ 112.529642] [<ffff0000088a1938>] dev_watchdog+0x270/0x2a8 [ 112.535032] [<ffff000008120774>] call_timer_fn+0x64/0xd0 [ 112.540334] [<ffff000008120890>] expire_timers+0xb0/0xc0 [ 112.545636] [<ffff0000081209f8>] run_timer_softirq+0x80/0xc0 [ 112.551284] [<ffff0000080c517c>] __do_softirq+0x10c/0x218 [ 112.556673] [<ffff0000080c55b0>] irq_exit+0xc8/0x118 [ 112.561629] [<ffff00000810cc50>] __handle_domain_irq+0x60/0xb8 [ 112.567450] [<ffff00000808154c>] gic_handle_irq+0x54/0xa8 [ 112.572837] Exception stack(0xffff000008f73dd0 to 0xffff000008f73f00) [ 112.579264] 3dc0: 0000000000000000 0000000000000000 [ 112.587079] 3de0: 0000000000000001 0000000000000000 ffffffffffffea60 ffff000008f73f00 [ 112.594894] 3e00: 00000000000000c0 0000000000000000 0000000000000028 ffff000008f73e40 [ 112.602709] 3e20: 0000000000001130 00000000fa83b2da ffff000008a313a0 0000000000000001 [ 112.610524] 3e40: 0000000000000000 00000019ebd06fc0 000000000f48bf67 00000000262ea01f [ 112.618338] 3e60: 0000000000000010 ffff000008f2b000 ffff000008f7eb58 ffff000008f7e000 [ 112.626152] 3e80: ffff000008f371a0 0000000000000000 0000000000000000 ffff000008f87b00 [ 112.633967] 3ea0: 00000000eff9cf10 0000000000000000 0000000080e60018 ffff000008f73f00 [ 112.641782] 3ec0: ffff00000808524c ffff000008f73f00 ffff000008085250 0000000000000045 [ 112.649597] 3ee0: ffff000008f73f00 00000000ffff47c0 ffffffffffffffff 7fffffffffffffff [ 112.657411] [<ffff0000080827f4>] el1_irq+0xb4/0x128 [ 112.662280] [<ffff000008085250>] arch_cpu_idle+0x10/0x18 [ 112.667581] [<ffff0000080fbbdc>] do_idle+0x10c/0x1f0 [ 112.672537] [<ffff0000080fbeb8>] cpu_startup_entry+0x20/0x28 [ 112.678185] [<ffff000008a0aa64>] rest_init+0xbc/0xc8 [ 112.683140] [<ffff000008e60b4c>] start_kernel+0x384/0x398 [ 112.688528] [<ffff000008e601e0>] __primary_switched+0x64/0x6c And finally this: [ 112.694283] Unable to handle kernel paging request at virtual address ffff000008061000 [ 112.702184] pgd = ffff000009ae2000 [ 112.705577] [ffff000008061000] *pgd=0000000275f0e003, *pud=0000000275f0d003, *pmd=0000000275f0c003, *pte=0000000000000000 [ 112.716532] Internal error: Oops: 96000047 [#1] PREEMPT SMP [ 112.722092] Modules linked in: [ 112.725143] CPU: 0 PID: 0 Comm: swapper/0 Tainted: G S W 4.11.0-rc3-next-20170323-00060-g2eab4557749b-dirty #400 [ 112.736248] Hardware name: NVIDIA Tegra186 P2771-0000 Development Board (DT) [ 112.743281] task: ffff000008f87b00 task.stack: ffff000008f70000 [ 112.749189] PC is at dwmac4_rd_init_tx_desc+0x0/0x10 [ 112.754142] LR is at stmmac_tx_err+0xe4/0x160 [ 112.758488] pc : [<ffff0000086b4790>] lr : [<ffff0000086a97bc>] pstate: 80000145 [ 112.765866] sp : ffff8001f5e50d80 [ 112.769171] x29: ffff8001f5e50d80 x28: ffff000008f75180 [ 112.774476] x27: ffff000008f87b00 x26: 0000000000000020 [ 112.779780] x25: 00000000ffffffff x24: 0000000000000000 [ 112.785086] x23: ffff8001eccbaac0 x22: 0000000000000000 [ 112.790389] x21: ffff8001e946a900 x20: ffff8001eccbaa00 [ 112.795694] x19: 0000000000000001 x18: 0000000000000010 [ 112.800998] x17: 00000000262ea01f x16: 000000000f48bf67 [ 112.806303] x15: 0000000000000006 x14: 5d64396536636137 [ 112.811608] x13: 3530303030303030 x12: 3078303d73736572 [ 112.816913] x11: 6464612065636976 x10: 65645b2064657461 [ 112.822218] x9 : ffff00000852c238 x8 : 0000000040000000 [ 112.827523] x7 : 0000000000210d00 x6 : ffff0000083d7038 [ 112.832828] x5 : ffff000008865ed8 x4 : 0000000000000080 [ 112.838133] x3 : ffff0000086b4790 x2 : 0000000000000000 [ 112.843438] x1 : 0000000000000000 x0 : ffff000008061000 [ 112.848743] [ 112.850229] Process swapper/0 (pid: 0, stack limit = 0xffff000008f70000) [ 112.856916] Stack: (0xffff8001f5e50d80 to 0xffff000008f74000) [ 112.862647] Call trace: [ 112.865087] Exception stack(0xffff8001f5e50bb0 to 0xffff8001f5e50ce0) [ 112.871513] 0ba0: 0000000000000001 0001000000000000 [ 112.879326] 0bc0: ffff8001f5e50d80 ffff0000086b4790 ffff000008f87b00 000000000001bbc0 [ 112.887139] 0be0: ffff000008f87b00 0000000000000020 ffff000008f87b00 ffff000008f75180 [ 112.894952] 0c00: ffff000008fb8000 ffff000008f87b00 ffff000008f87b00 ffff000008a117fc [ 112.902766] 0c20: ffff8001e9721f00 ffff0000081d8684 ffff7e0007b12300 ffff8001ec48d800 [ 112.910579] 0c40: ffff000008866308 000000018010000e ffff000008061000 0000000000000000 [ 112.918392] 0c60: 0000000000000000 ffff0000086b4790 0000000000000080 ffff000008865ed8 [ 112.926206] 0c80: ffff0000083d7038 0000000000210d00 0000000040000000 ffff00000852c238 [ 112.934018] 0ca0: 65645b2064657461 6464612065636976 3078303d73736572 3530303030303030 [ 112.941831] 0cc0: 5d64396536636137 0000000000000006 000000000f48bf67 00000000262ea01f [ 112.949645] [<ffff0000086b4790>] dwmac4_rd_init_tx_desc+0x0/0x10 [ 112.955638] [<ffff0000086a986c>] stmmac_tx_timeout+0x34/0x50 [ 112.961285] [<ffff0000088a1938>] dev_watchdog+0x270/0x2a8 [ 112.966672] [<ffff000008120774>] call_timer_fn+0x64/0xd0 [ 112.971973] [<ffff000008120890>] expire_timers+0xb0/0xc0 [ 112.977274] [<ffff0000081209f8>] run_timer_softirq+0x80/0xc0 [ 112.982920] [<ffff0000080c517c>] __do_softirq+0x10c/0x218 [ 112.988307] [<ffff0000080c55b0>] irq_exit+0xc8/0x118 [ 112.993262] [<ffff00000810cc50>] __handle_domain_irq+0x60/0xb8 [ 112.999081] [<ffff00000808154c>] gic_handle_irq+0x54/0xa8 [ 113.004468] Exception stack(0xffff000008f73dd0 to 0xffff000008f73f00) [ 113.010893] 3dc0: 0000000000000000 0000000000000000 [ 113.018706] 3de0: 0000000000000001 0000000000000000 ffffffffffffea60 ffff000008f73f00 [ 113.026520] 3e00: 00000000000000c0 0000000000000000 0000000000000028 ffff000008f73e40 [ 113.034335] 3e20: 0000000000001130 00000000fa83b2da ffff000008a313a0 0000000000000001 [ 113.042148] 3e40: 0000000000000000 00000019ebd06fc0 000000000f48bf67 00000000262ea01f [ 113.049961] 3e60: 0000000000000010 ffff000008f2b000 ffff000008f7eb58 ffff000008f7e000 [ 113.057775] 3e80: ffff000008f371a0 0000000000000000 0000000000000000 ffff000008f87b00 [ 113.065590] 3ea0: 00000000eff9cf10 0000000000000000 0000000080e60018 ffff000008f73f00 [ 113.073404] 3ec0: ffff00000808524c ffff000008f73f00 ffff000008085250 0000000000000045 [ 113.081217] 3ee0: ffff000008f73f00 00000000ffff47c0 ffffffffffffffff 7fffffffffffffff [ 113.089030] [<ffff0000080827f4>] el1_irq+0xb4/0x128 [ 113.093897] [<ffff000008085250>] arch_cpu_idle+0x10/0x18 [ 113.099197] [<ffff0000080fbbdc>] do_idle+0x10c/0x1f0 [ 113.104150] [<ffff0000080fbeb8>] cpu_startup_entry+0x20/0x28 [ 113.109798] [<ffff000008a0aa64>] rest_init+0xbc/0xc8 [ 113.114751] [<ffff000008e60b4c>] start_kernel+0x384/0x398 [ 113.120139] [<ffff000008e601e0>] __primary_switched+0x64/0x6c [ 113.125874] Code: 7100003f 1a831042 b9000c02 d65f03c0 (29007c1f) [ 113.131962] ---[ end trace 48028f96a0e990fc ]--- The above is with one small change already applied, which seemed like it would be significant, but it didn't have much effect. See below... > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c [...] > @@ -2977,14 +3356,22 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit) > */ > static int stmmac_poll(struct napi_struct *napi, int budget) > { > - struct stmmac_priv *priv = container_of(napi, struct stmmac_priv, napi); > - int work_done = 0; > - u32 chan = STMMAC_CHAN0; > + struct stmmac_rx_queue *rx_q = > + container_of(napi, struct stmmac_rx_queue, napi); > + struct stmmac_priv *priv = rx_q->priv_data; > + u32 tx_count = priv->dma_cap.number_tx_queues; I changed this to priv->plat->tx_queues_to_use as used elsewhere to make sure we don't try to clean up non-initialized TX queues. This seems to solve an issue that would occasionally happen after the TX queue timed out, but the fundamental issue is still there. Thierry [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [v2,net-next,1/3] net: stmmac: enable multiple buffers 2017-03-23 17:17 ` [v2,net-next,1/3] " Thierry Reding @ 2017-03-23 17:27 ` Joao Pinto 2017-03-23 18:10 ` Thierry Reding 2017-03-24 7:42 ` Andrew Lunn 0 siblings, 2 replies; 21+ messages in thread From: Joao Pinto @ 2017-03-23 17:27 UTC (permalink / raw) To: Thierry Reding, Joao Pinto Cc: davem, peppe.cavallaro, alexandre.torgue, f.fainelli, netdev Hi Thierry, Às 5:17 PM de 3/23/2017, Thierry Reding escreveu: > On Fri, Mar 17, 2017 at 04:11:05PM +0000, Joao Pinto wrote: >> This patch creates 2 new structures (stmmac_tx_queue and stmmac_rx_queue) >> in include/linux/stmmac.h, enabling that each RX and TX queue has its >> own buffers and data. >> >> Signed-off-by: Joao Pinto <jpinto@synopsys.com> >> --- >> changes v1->v2: >> - just to keep up version >> >> drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 45 +- >> drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 46 +- >> drivers/net/ethernet/stmicro/stmmac/stmmac.h | 49 +- >> drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1306 ++++++++++++++------- >> 4 files changed, 973 insertions(+), 473 deletions(-) > > Hi Joao, > > This seems to break support on Tegra186 again. I've gone through this > patch multiple times and I can't figure out what could be causing it. > Any ideas? > > What I'm seeing is that the transmit queue 0 times out: > > [ 101.121774] Sending DHCP requests ... > [ 111.841763] NETDEV WATCHDOG: eth0 (dwc-eth-dwmac): transmit queue 0 timed out You are using a GMAC or GMAC4 aka QoS? > > and then I also see this: > > [ 112.252024] dwc-eth-dwmac 2490000.ethernet: DMA-API: device driver tries to free DMA memory it has not allocated [device address=0x0000000057ac6e9d] [size=0 bytes] Humm... Something in stmmac_free_tx_buffers... I'll need to check. > [ 112.266606] ------------[ cut here ]------------ > [ 112.271220] WARNING: CPU: 0 PID: 0 at /home/thierry.reding/src/kernel/linux-tegra.git/lib/dma-debug.c:1106 check_unmap+0x7b0/0x930 > [ 112.282934] Modules linked in: > [ 112.285985] > [ 112.287474] CPU: 0 PID: 0 Comm: swapper/0 Tainted: G S W 4.11.0-rc3-next-20170323-00060-g2eab4557749b-dirty #400 > [ 112.298581] Hardware name: NVIDIA Tegra186 P2771-0000 Development Board (DT) > [ 112.305615] task: ffff000008f87b00 task.stack: ffff000008f70000 > [ 112.311523] PC is at check_unmap+0x7b0/0x930 > [ 112.315785] LR is at check_unmap+0x7b0/0x930 > [ 112.320046] pc : [<ffff0000083d75f0>] lr : [<ffff0000083d75f0>] pstate: 60000145 > [ 112.327426] sp : ffff8001f5e50c50 > [ 112.330733] x29: ffff8001f5e50c50 x28: ffff000008f75180 > [ 112.336042] x27: ffff000008f87b00 x26: 0000000000000020 > [ 112.341351] x25: 0000000000000140 x24: ffff000008f81000 > [ 112.346660] x23: ffff8001ec4b0810 x22: 0000000057ac6e9d > [ 112.351969] x21: 0000000057ac6e9d x20: ffff8001f5e50cb0 > [ 112.357277] x19: ffff8001ec4b0810 x18: 0000000000000010 > [ 112.362586] x17: 00000000262ea01f x16: 000000000f48bf67 > [ 112.367895] x15: 0000000000000006 x14: 5d64396536636137 > [ 112.373203] x13: 3530303030303030 x12: 3078303d73736572 > [ 112.378511] x11: 6464612065636976 x10: 65645b2064657461 > [ 112.383819] x9 : ffff00000852c238 x8 : 00000000000001fb > [ 112.389126] x7 : 0000000000000000 x6 : ffff00000810ad58 > [ 112.394434] x5 : 0000000000000000 x4 : 0000000000000000 > [ 112.399743] x3 : ffffffffffffffff x2 : ffff000008f99258 > [ 112.405050] x1 : ffff000008f87b00 x0 : 0000000000000097 > [ 112.410358] > [ 112.411846] ---[ end trace 48028f96a0e990fb ]--- > [ 112.416453] Call trace: > [ 112.418895] Exception stack(0xffff8001f5e50a80 to 0xffff8001f5e50bb0) > [ 112.425324] 0a80: ffff8001ec4b0810 0001000000000000 ffff8001f5e50c50 ffff0000083d75f0 > [ 112.433139] 0aa0: 00000000000001c0 0000000000000000 0000000000000000 ffff000008d1c0c0 > [ 112.440954] 0ac0: ffff8001f5e50c50 ffff8001f5e50c50 ffff8001f5e50c10 00000000ffffffc8 > [ 112.448769] 0ae0: ffff8001f5e50b10 ffff00000810c3a8 ffff8001f5e50c50 ffff8001f5e50c50 > [ 112.456585] 0b00: ffff8001f5e50c10 00000000ffffffc8 ffff8001f5e50bc0 ffff000008178388 > [ 112.464399] 0b20: 0000000000000097 ffff000008f87b00 ffff000008f99258 ffffffffffffffff > [ 112.472215] 0b40: 0000000000000000 0000000000000000 ffff00000810ad58 0000000000000000 > [ 112.480030] 0b60: 00000000000001fb ffff00000852c238 65645b2064657461 6464612065636976 > [ 112.487845] 0b80: 3078303d73736572 3530303030303030 5d64396536636137 0000000000000006 > [ 112.495659] 0ba0: 000000000f48bf67 00000000262ea01f > [ 112.500528] [<ffff0000083d75f0>] check_unmap+0x7b0/0x930 > [ 112.505830] [<ffff0000083d77d8>] debug_dma_unmap_page+0x68/0x70 > [ 112.511744] [<ffff0000086a9654>] stmmac_free_tx_buffers.isra.1+0x114/0x198 > [ 112.518604] [<ffff0000086a9754>] stmmac_tx_err+0x7c/0x160 > [ 112.523993] [<ffff0000086a986c>] stmmac_tx_timeout+0x34/0x50 > [ 112.529642] [<ffff0000088a1938>] dev_watchdog+0x270/0x2a8 > [ 112.535032] [<ffff000008120774>] call_timer_fn+0x64/0xd0 > [ 112.540334] [<ffff000008120890>] expire_timers+0xb0/0xc0 > [ 112.545636] [<ffff0000081209f8>] run_timer_softirq+0x80/0xc0 > [ 112.551284] [<ffff0000080c517c>] __do_softirq+0x10c/0x218 > [ 112.556673] [<ffff0000080c55b0>] irq_exit+0xc8/0x118 > [ 112.561629] [<ffff00000810cc50>] __handle_domain_irq+0x60/0xb8 > [ 112.567450] [<ffff00000808154c>] gic_handle_irq+0x54/0xa8 > [ 112.572837] Exception stack(0xffff000008f73dd0 to 0xffff000008f73f00) > [ 112.579264] 3dc0: 0000000000000000 0000000000000000 > [ 112.587079] 3de0: 0000000000000001 0000000000000000 ffffffffffffea60 ffff000008f73f00 > [ 112.594894] 3e00: 00000000000000c0 0000000000000000 0000000000000028 ffff000008f73e40 > [ 112.602709] 3e20: 0000000000001130 00000000fa83b2da ffff000008a313a0 0000000000000001 > [ 112.610524] 3e40: 0000000000000000 00000019ebd06fc0 000000000f48bf67 00000000262ea01f > [ 112.618338] 3e60: 0000000000000010 ffff000008f2b000 ffff000008f7eb58 ffff000008f7e000 > [ 112.626152] 3e80: ffff000008f371a0 0000000000000000 0000000000000000 ffff000008f87b00 > [ 112.633967] 3ea0: 00000000eff9cf10 0000000000000000 0000000080e60018 ffff000008f73f00 > [ 112.641782] 3ec0: ffff00000808524c ffff000008f73f00 ffff000008085250 0000000000000045 > [ 112.649597] 3ee0: ffff000008f73f00 00000000ffff47c0 ffffffffffffffff 7fffffffffffffff > [ 112.657411] [<ffff0000080827f4>] el1_irq+0xb4/0x128 > [ 112.662280] [<ffff000008085250>] arch_cpu_idle+0x10/0x18 > [ 112.667581] [<ffff0000080fbbdc>] do_idle+0x10c/0x1f0 > [ 112.672537] [<ffff0000080fbeb8>] cpu_startup_entry+0x20/0x28 > [ 112.678185] [<ffff000008a0aa64>] rest_init+0xbc/0xc8 > [ 112.683140] [<ffff000008e60b4c>] start_kernel+0x384/0x398 > [ 112.688528] [<ffff000008e601e0>] __primary_switched+0x64/0x6c > > And finally this: Here it tries to access the descriptors when apparently they don't exist anymore. > > [ 112.843438] x1 : 0000000000000000 x0 : ffff000008061000 > [ 112.848743] > [ 112.850229] Process swapper/0 (pid: 0, stack limit = 0xffff000008f70000) > [ 112.856916] Stack: (0xffff8001f5e50d80 to 0xffff000008f74000) > [ 112.862647] Call trace: > [ 112.918392] 0c60: 0000000000000000 ffff0000086b4790 0000000000000080 ffff000008865ed8 > [ 112.926206] 0c80: ffff0000083d7038 0000000000210d00 0000000040000000 ffff00000852c238 > [ 112.934018] 0ca0: 65645b2064657461 6464612065636976 3078303d73736572 3530303030303030 > [ 112.941831] 0cc0: 5d64396536636137 0000000000000006 000000000f48bf67 00000000262ea01f > [ 112.949645] [<ffff0000086b4790>] dwmac4_rd_init_tx_desc+0x0/0x10 > [ 112.955638] [<ffff0000086a986c>] stmmac_tx_timeout+0x34/0x50 > [ 112.961285] [<ffff0000088a1938>] dev_watchdog+0x270/0x2a8 > [ 112.966672] [<ffff000008120774>] call_timer_fn+0x64/0xd0 > [ 112.971973] [<ffff000008120890>] expire_timers+0xb0/0xc0 > [ 112.977274] [<ffff0000081209f8>] run_timer_softirq+0x80/0xc0 > [ 112.982920] [<ffff0000080c517c>] __do_softirq+0x10c/0x218 > [ 112.988307] [<ffff0000080c55b0>] irq_exit+0xc8/0x118 > > The above is with one small change already applied, which seemed like it > would be significant, but it didn't have much effect. See below... > >> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > [...] >> @@ -2977,14 +3356,22 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit) >> */ >> static int stmmac_poll(struct napi_struct *napi, int budget) >> { >> - struct stmmac_priv *priv = container_of(napi, struct stmmac_priv, napi); >> - int work_done = 0; >> - u32 chan = STMMAC_CHAN0; >> + struct stmmac_rx_queue *rx_q = >> + container_of(napi, struct stmmac_rx_queue, napi); >> + struct stmmac_priv *priv = rx_q->priv_data; >> + u32 tx_count = priv->dma_cap.number_tx_queues; > > I changed this to priv->plat->tx_queues_to_use as used elsewhere to make > sure we don't try to clean up non-initialized TX queues. This seems to > solve an issue that would occasionally happen after the TX queue timed > out, but the fundamental issue is still there. Yes, you are correct. It should be priv->plat->tx_queues_to_use instead of "u32 tx_count = priv->dma_cap.number_tx_queues;"... sorry for that, but in my setup is the same value. Could you please make a patch for it? Tahnks! > > Thierry > ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [v2,net-next,1/3] net: stmmac: enable multiple buffers 2017-03-23 17:27 ` Joao Pinto @ 2017-03-23 18:10 ` Thierry Reding 2017-03-24 14:09 ` Corentin Labbe 2017-03-24 7:42 ` Andrew Lunn 1 sibling, 1 reply; 21+ messages in thread From: Thierry Reding @ 2017-03-23 18:10 UTC (permalink / raw) To: Joao Pinto; +Cc: davem, peppe.cavallaro, alexandre.torgue, f.fainelli, netdev [-- Attachment #1: Type: text/plain, Size: 10300 bytes --] On Thu, Mar 23, 2017 at 05:27:08PM +0000, Joao Pinto wrote: > Hi Thierry, > > Às 5:17 PM de 3/23/2017, Thierry Reding escreveu: > > On Fri, Mar 17, 2017 at 04:11:05PM +0000, Joao Pinto wrote: > >> This patch creates 2 new structures (stmmac_tx_queue and stmmac_rx_queue) > >> in include/linux/stmmac.h, enabling that each RX and TX queue has its > >> own buffers and data. > >> > >> Signed-off-by: Joao Pinto <jpinto@synopsys.com> > >> --- > >> changes v1->v2: > >> - just to keep up version > >> > >> drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 45 +- > >> drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 46 +- > >> drivers/net/ethernet/stmicro/stmmac/stmmac.h | 49 +- > >> drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1306 ++++++++++++++------- > >> 4 files changed, 973 insertions(+), 473 deletions(-) > > > > Hi Joao, > > > > This seems to break support on Tegra186 again. I've gone through this > > patch multiple times and I can't figure out what could be causing it. > > Any ideas? > > > > What I'm seeing is that the transmit queue 0 times out: > > > > [ 101.121774] Sending DHCP requests ... > > [ 111.841763] NETDEV WATCHDOG: eth0 (dwc-eth-dwmac): transmit queue 0 timed out > > You are using a GMAC or GMAC4 aka QoS? Yes. It's called EQOS (or EAVB) on Tegra186. > > and then I also see this: > > > > [ 112.252024] dwc-eth-dwmac 2490000.ethernet: DMA-API: device driver tries to free DMA memory it has not allocated [device address=0x0000000057ac6e9d] [size=0 bytes] > > Humm... Something in stmmac_free_tx_buffers... I'll need to check. > > > [ 112.266606] ------------[ cut here ]------------ > > [ 112.271220] WARNING: CPU: 0 PID: 0 at /home/thierry.reding/src/kernel/linux-tegra.git/lib/dma-debug.c:1106 check_unmap+0x7b0/0x930 > > [ 112.282934] Modules linked in: > > [ 112.285985] > > [ 112.287474] CPU: 0 PID: 0 Comm: swapper/0 Tainted: G S W 4.11.0-rc3-next-20170323-00060-g2eab4557749b-dirty #400 > > [ 112.298581] Hardware name: NVIDIA Tegra186 P2771-0000 Development Board (DT) > > [ 112.305615] task: ffff000008f87b00 task.stack: ffff000008f70000 > > [ 112.311523] PC is at check_unmap+0x7b0/0x930 > > [ 112.315785] LR is at check_unmap+0x7b0/0x930 > > [ 112.320046] pc : [<ffff0000083d75f0>] lr : [<ffff0000083d75f0>] pstate: 60000145 > > [ 112.327426] sp : ffff8001f5e50c50 > > [ 112.330733] x29: ffff8001f5e50c50 x28: ffff000008f75180 > > [ 112.336042] x27: ffff000008f87b00 x26: 0000000000000020 > > [ 112.341351] x25: 0000000000000140 x24: ffff000008f81000 > > [ 112.346660] x23: ffff8001ec4b0810 x22: 0000000057ac6e9d > > [ 112.351969] x21: 0000000057ac6e9d x20: ffff8001f5e50cb0 > > [ 112.357277] x19: ffff8001ec4b0810 x18: 0000000000000010 > > [ 112.362586] x17: 00000000262ea01f x16: 000000000f48bf67 > > [ 112.367895] x15: 0000000000000006 x14: 5d64396536636137 > > [ 112.373203] x13: 3530303030303030 x12: 3078303d73736572 > > [ 112.378511] x11: 6464612065636976 x10: 65645b2064657461 > > [ 112.383819] x9 : ffff00000852c238 x8 : 00000000000001fb > > [ 112.389126] x7 : 0000000000000000 x6 : ffff00000810ad58 > > [ 112.394434] x5 : 0000000000000000 x4 : 0000000000000000 > > [ 112.399743] x3 : ffffffffffffffff x2 : ffff000008f99258 > > [ 112.405050] x1 : ffff000008f87b00 x0 : 0000000000000097 > > [ 112.410358] > > [ 112.411846] ---[ end trace 48028f96a0e990fb ]--- > > [ 112.416453] Call trace: > > [ 112.418895] Exception stack(0xffff8001f5e50a80 to 0xffff8001f5e50bb0) > > [ 112.425324] 0a80: ffff8001ec4b0810 0001000000000000 ffff8001f5e50c50 ffff0000083d75f0 > > [ 112.433139] 0aa0: 00000000000001c0 0000000000000000 0000000000000000 ffff000008d1c0c0 > > [ 112.440954] 0ac0: ffff8001f5e50c50 ffff8001f5e50c50 ffff8001f5e50c10 00000000ffffffc8 > > [ 112.448769] 0ae0: ffff8001f5e50b10 ffff00000810c3a8 ffff8001f5e50c50 ffff8001f5e50c50 > > [ 112.456585] 0b00: ffff8001f5e50c10 00000000ffffffc8 ffff8001f5e50bc0 ffff000008178388 > > [ 112.464399] 0b20: 0000000000000097 ffff000008f87b00 ffff000008f99258 ffffffffffffffff > > [ 112.472215] 0b40: 0000000000000000 0000000000000000 ffff00000810ad58 0000000000000000 > > [ 112.480030] 0b60: 00000000000001fb ffff00000852c238 65645b2064657461 6464612065636976 > > [ 112.487845] 0b80: 3078303d73736572 3530303030303030 5d64396536636137 0000000000000006 > > [ 112.495659] 0ba0: 000000000f48bf67 00000000262ea01f > > [ 112.500528] [<ffff0000083d75f0>] check_unmap+0x7b0/0x930 > > [ 112.505830] [<ffff0000083d77d8>] debug_dma_unmap_page+0x68/0x70 > > [ 112.511744] [<ffff0000086a9654>] stmmac_free_tx_buffers.isra.1+0x114/0x198 > > [ 112.518604] [<ffff0000086a9754>] stmmac_tx_err+0x7c/0x160 > > [ 112.523993] [<ffff0000086a986c>] stmmac_tx_timeout+0x34/0x50 > > [ 112.529642] [<ffff0000088a1938>] dev_watchdog+0x270/0x2a8 > > [ 112.535032] [<ffff000008120774>] call_timer_fn+0x64/0xd0 > > [ 112.540334] [<ffff000008120890>] expire_timers+0xb0/0xc0 > > [ 112.545636] [<ffff0000081209f8>] run_timer_softirq+0x80/0xc0 > > [ 112.551284] [<ffff0000080c517c>] __do_softirq+0x10c/0x218 > > [ 112.556673] [<ffff0000080c55b0>] irq_exit+0xc8/0x118 > > [ 112.561629] [<ffff00000810cc50>] __handle_domain_irq+0x60/0xb8 > > [ 112.567450] [<ffff00000808154c>] gic_handle_irq+0x54/0xa8 > > [ 112.572837] Exception stack(0xffff000008f73dd0 to 0xffff000008f73f00) > > [ 112.579264] 3dc0: 0000000000000000 0000000000000000 > > [ 112.587079] 3de0: 0000000000000001 0000000000000000 ffffffffffffea60 ffff000008f73f00 > > [ 112.594894] 3e00: 00000000000000c0 0000000000000000 0000000000000028 ffff000008f73e40 > > [ 112.602709] 3e20: 0000000000001130 00000000fa83b2da ffff000008a313a0 0000000000000001 > > [ 112.610524] 3e40: 0000000000000000 00000019ebd06fc0 000000000f48bf67 00000000262ea01f > > [ 112.618338] 3e60: 0000000000000010 ffff000008f2b000 ffff000008f7eb58 ffff000008f7e000 > > [ 112.626152] 3e80: ffff000008f371a0 0000000000000000 0000000000000000 ffff000008f87b00 > > [ 112.633967] 3ea0: 00000000eff9cf10 0000000000000000 0000000080e60018 ffff000008f73f00 > > [ 112.641782] 3ec0: ffff00000808524c ffff000008f73f00 ffff000008085250 0000000000000045 > > [ 112.649597] 3ee0: ffff000008f73f00 00000000ffff47c0 ffffffffffffffff 7fffffffffffffff > > [ 112.657411] [<ffff0000080827f4>] el1_irq+0xb4/0x128 > > [ 112.662280] [<ffff000008085250>] arch_cpu_idle+0x10/0x18 > > [ 112.667581] [<ffff0000080fbbdc>] do_idle+0x10c/0x1f0 > > [ 112.672537] [<ffff0000080fbeb8>] cpu_startup_entry+0x20/0x28 > > [ 112.678185] [<ffff000008a0aa64>] rest_init+0xbc/0xc8 > > [ 112.683140] [<ffff000008e60b4c>] start_kernel+0x384/0x398 > > [ 112.688528] [<ffff000008e601e0>] __primary_switched+0x64/0x6c > > > > And finally this: > > Here it tries to access the descriptors when apparently they don't exist anymore. > > > > > [ 112.843438] x1 : 0000000000000000 x0 : ffff000008061000 > > [ 112.848743] > > [ 112.850229] Process swapper/0 (pid: 0, stack limit = 0xffff000008f70000) > > [ 112.856916] Stack: (0xffff8001f5e50d80 to 0xffff000008f74000) > > [ 112.862647] Call trace: > > [ 112.918392] 0c60: 0000000000000000 ffff0000086b4790 0000000000000080 ffff000008865ed8 > > [ 112.926206] 0c80: ffff0000083d7038 0000000000210d00 0000000040000000 ffff00000852c238 > > [ 112.934018] 0ca0: 65645b2064657461 6464612065636976 3078303d73736572 3530303030303030 > > [ 112.941831] 0cc0: 5d64396536636137 0000000000000006 000000000f48bf67 00000000262ea01f > > [ 112.949645] [<ffff0000086b4790>] dwmac4_rd_init_tx_desc+0x0/0x10 > > [ 112.955638] [<ffff0000086a986c>] stmmac_tx_timeout+0x34/0x50 > > [ 112.961285] [<ffff0000088a1938>] dev_watchdog+0x270/0x2a8 > > [ 112.966672] [<ffff000008120774>] call_timer_fn+0x64/0xd0 > > [ 112.971973] [<ffff000008120890>] expire_timers+0xb0/0xc0 > > [ 112.977274] [<ffff0000081209f8>] run_timer_softirq+0x80/0xc0 > > [ 112.982920] [<ffff0000080c517c>] __do_softirq+0x10c/0x218 > > [ 112.988307] [<ffff0000080c55b0>] irq_exit+0xc8/0x118 > > > > The above is with one small change already applied, which seemed like it > > would be significant, but it didn't have much effect. See below... > > > >> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > > [...] > >> @@ -2977,14 +3356,22 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit) > >> */ > >> static int stmmac_poll(struct napi_struct *napi, int budget) > >> { > >> - struct stmmac_priv *priv = container_of(napi, struct stmmac_priv, napi); > >> - int work_done = 0; > >> - u32 chan = STMMAC_CHAN0; > >> + struct stmmac_rx_queue *rx_q = > >> + container_of(napi, struct stmmac_rx_queue, napi); > >> + struct stmmac_priv *priv = rx_q->priv_data; > >> + u32 tx_count = priv->dma_cap.number_tx_queues; > > > > I changed this to priv->plat->tx_queues_to_use as used elsewhere to make > > sure we don't try to clean up non-initialized TX queues. This seems to > > solve an issue that would occasionally happen after the TX queue timed > > out, but the fundamental issue is still there. > > Yes, you are correct. It should be priv->plat->tx_queues_to_use instead of "u32 > tx_count = priv->dma_cap.number_tx_queues;"... sorry for that, but in my setup > is the same value. Could you please make a patch for it? Yes, I can submit a patch for that. After some more testing I did get a couple (roughly 2 out of 10) successful boots (I'm booting over NFS using the EQOS), and given that this pointed towards something related to uninitialized data, I changed all occurrences of kmalloc_array() with kcalloc() and that I've gotten 10 successful reboots out of 10. I still can't pinpoint why this is now necessary since previously the kmalloc_array() was working just fine. The only thing I can think of is that we're not properly initializing all fields of the new queue structures, since that's the only thing that's changed with this commit. I haven't investigated in detail yet, but from nothing so far has jumped out at me. Thierry [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [v2,net-next,1/3] net: stmmac: enable multiple buffers 2017-03-23 18:10 ` Thierry Reding @ 2017-03-24 14:09 ` Corentin Labbe 2017-03-24 14:59 ` Joao Pinto 0 siblings, 1 reply; 21+ messages in thread From: Corentin Labbe @ 2017-03-24 14:09 UTC (permalink / raw) To: Thierry Reding, Joao.Pinto Cc: davem, peppe.cavallaro, alexandre.torgue, f.fainelli, netdev On Thu, Mar 23, 2017 at 07:10:59PM +0100, Thierry Reding wrote: > On Thu, Mar 23, 2017 at 05:27:08PM +0000, Joao Pinto wrote: > > Hi Thierry, > > > > Às 5:17 PM de 3/23/2017, Thierry Reding escreveu: > > > On Fri, Mar 17, 2017 at 04:11:05PM +0000, Joao Pinto wrote: > > >> This patch creates 2 new structures (stmmac_tx_queue and stmmac_rx_queue) > > >> in include/linux/stmmac.h, enabling that each RX and TX queue has its > > >> own buffers and data. > > >> > > >> Signed-off-by: Joao Pinto <jpinto@synopsys.com> > > >> --- > > >> changes v1->v2: > > >> - just to keep up version > > >> > > >> drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 45 +- > > >> drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 46 +- > > >> drivers/net/ethernet/stmicro/stmmac/stmmac.h | 49 +- > > >> drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1306 ++++++++++++++------- > > >> 4 files changed, 973 insertions(+), 473 deletions(-) > > > > > > Hi Joao, > > > > > > This seems to break support on Tegra186 again. I've gone through this > > > patch multiple times and I can't figure out what could be causing it. > > > Any ideas? > > > > > > What I'm seeing is that the transmit queue 0 times out: > > > > > > [ 101.121774] Sending DHCP requests ... > > > [ 111.841763] NETDEV WATCHDOG: eth0 (dwc-eth-dwmac): transmit queue 0 timed out > > > > You are using a GMAC or GMAC4 aka QoS? > > Yes. It's called EQOS (or EAVB) on Tegra186. > > > > and then I also see this: > > > > > > [ 112.252024] dwc-eth-dwmac 2490000.ethernet: DMA-API: device driver tries to free DMA memory it has not allocated [device address=0x0000000057ac6e9d] [size=0 bytes] > > > > Humm... Something in stmmac_free_tx_buffers... I'll need to check. > > > > > [ 112.266606] ------------[ cut here ]------------ > > > [ 112.271220] WARNING: CPU: 0 PID: 0 at /home/thierry.reding/src/kernel/linux-tegra.git/lib/dma-debug.c:1106 check_unmap+0x7b0/0x930 > > > [ 112.282934] Modules linked in: > > > [ 112.285985] > > > [ 112.287474] CPU: 0 PID: 0 Comm: swapper/0 Tainted: G S W 4.11.0-rc3-next-20170323-00060-g2eab4557749b-dirty #400 > > > [ 112.298581] Hardware name: NVIDIA Tegra186 P2771-0000 Development Board (DT) > > > [ 112.305615] task: ffff000008f87b00 task.stack: ffff000008f70000 > > > [ 112.311523] PC is at check_unmap+0x7b0/0x930 > > > [ 112.315785] LR is at check_unmap+0x7b0/0x930 > > > [ 112.320046] pc : [<ffff0000083d75f0>] lr : [<ffff0000083d75f0>] pstate: 60000145 > > > [ 112.327426] sp : ffff8001f5e50c50 > > > [ 112.330733] x29: ffff8001f5e50c50 x28: ffff000008f75180 > > > [ 112.336042] x27: ffff000008f87b00 x26: 0000000000000020 > > > [ 112.341351] x25: 0000000000000140 x24: ffff000008f81000 > > > [ 112.346660] x23: ffff8001ec4b0810 x22: 0000000057ac6e9d > > > [ 112.351969] x21: 0000000057ac6e9d x20: ffff8001f5e50cb0 > > > [ 112.357277] x19: ffff8001ec4b0810 x18: 0000000000000010 > > > [ 112.362586] x17: 00000000262ea01f x16: 000000000f48bf67 > > > [ 112.367895] x15: 0000000000000006 x14: 5d64396536636137 > > > [ 112.373203] x13: 3530303030303030 x12: 3078303d73736572 > > > [ 112.378511] x11: 6464612065636976 x10: 65645b2064657461 > > > [ 112.383819] x9 : ffff00000852c238 x8 : 00000000000001fb > > > [ 112.389126] x7 : 0000000000000000 x6 : ffff00000810ad58 > > > [ 112.394434] x5 : 0000000000000000 x4 : 0000000000000000 > > > [ 112.399743] x3 : ffffffffffffffff x2 : ffff000008f99258 > > > [ 112.405050] x1 : ffff000008f87b00 x0 : 0000000000000097 > > > [ 112.410358] > > > [ 112.411846] ---[ end trace 48028f96a0e990fb ]--- > > > [ 112.416453] Call trace: > > > [ 112.418895] Exception stack(0xffff8001f5e50a80 to 0xffff8001f5e50bb0) > > > [ 112.425324] 0a80: ffff8001ec4b0810 0001000000000000 ffff8001f5e50c50 ffff0000083d75f0 > > > [ 112.433139] 0aa0: 00000000000001c0 0000000000000000 0000000000000000 ffff000008d1c0c0 > > > [ 112.440954] 0ac0: ffff8001f5e50c50 ffff8001f5e50c50 ffff8001f5e50c10 00000000ffffffc8 > > > [ 112.448769] 0ae0: ffff8001f5e50b10 ffff00000810c3a8 ffff8001f5e50c50 ffff8001f5e50c50 > > > [ 112.456585] 0b00: ffff8001f5e50c10 00000000ffffffc8 ffff8001f5e50bc0 ffff000008178388 > > > [ 112.464399] 0b20: 0000000000000097 ffff000008f87b00 ffff000008f99258 ffffffffffffffff > > > [ 112.472215] 0b40: 0000000000000000 0000000000000000 ffff00000810ad58 0000000000000000 > > > [ 112.480030] 0b60: 00000000000001fb ffff00000852c238 65645b2064657461 6464612065636976 > > > [ 112.487845] 0b80: 3078303d73736572 3530303030303030 5d64396536636137 0000000000000006 > > > [ 112.495659] 0ba0: 000000000f48bf67 00000000262ea01f > > > [ 112.500528] [<ffff0000083d75f0>] check_unmap+0x7b0/0x930 > > > [ 112.505830] [<ffff0000083d77d8>] debug_dma_unmap_page+0x68/0x70 > > > [ 112.511744] [<ffff0000086a9654>] stmmac_free_tx_buffers.isra.1+0x114/0x198 > > > [ 112.518604] [<ffff0000086a9754>] stmmac_tx_err+0x7c/0x160 > > > [ 112.523993] [<ffff0000086a986c>] stmmac_tx_timeout+0x34/0x50 > > > [ 112.529642] [<ffff0000088a1938>] dev_watchdog+0x270/0x2a8 > > > [ 112.535032] [<ffff000008120774>] call_timer_fn+0x64/0xd0 > > > [ 112.540334] [<ffff000008120890>] expire_timers+0xb0/0xc0 > > > [ 112.545636] [<ffff0000081209f8>] run_timer_softirq+0x80/0xc0 > > > [ 112.551284] [<ffff0000080c517c>] __do_softirq+0x10c/0x218 > > > [ 112.556673] [<ffff0000080c55b0>] irq_exit+0xc8/0x118 > > > [ 112.561629] [<ffff00000810cc50>] __handle_domain_irq+0x60/0xb8 > > > [ 112.567450] [<ffff00000808154c>] gic_handle_irq+0x54/0xa8 > > > [ 112.572837] Exception stack(0xffff000008f73dd0 to 0xffff000008f73f00) > > > [ 112.579264] 3dc0: 0000000000000000 0000000000000000 > > > [ 112.587079] 3de0: 0000000000000001 0000000000000000 ffffffffffffea60 ffff000008f73f00 > > > [ 112.594894] 3e00: 00000000000000c0 0000000000000000 0000000000000028 ffff000008f73e40 > > > [ 112.602709] 3e20: 0000000000001130 00000000fa83b2da ffff000008a313a0 0000000000000001 > > > [ 112.610524] 3e40: 0000000000000000 00000019ebd06fc0 000000000f48bf67 00000000262ea01f > > > [ 112.618338] 3e60: 0000000000000010 ffff000008f2b000 ffff000008f7eb58 ffff000008f7e000 > > > [ 112.626152] 3e80: ffff000008f371a0 0000000000000000 0000000000000000 ffff000008f87b00 > > > [ 112.633967] 3ea0: 00000000eff9cf10 0000000000000000 0000000080e60018 ffff000008f73f00 > > > [ 112.641782] 3ec0: ffff00000808524c ffff000008f73f00 ffff000008085250 0000000000000045 > > > [ 112.649597] 3ee0: ffff000008f73f00 00000000ffff47c0 ffffffffffffffff 7fffffffffffffff > > > [ 112.657411] [<ffff0000080827f4>] el1_irq+0xb4/0x128 > > > [ 112.662280] [<ffff000008085250>] arch_cpu_idle+0x10/0x18 > > > [ 112.667581] [<ffff0000080fbbdc>] do_idle+0x10c/0x1f0 > > > [ 112.672537] [<ffff0000080fbeb8>] cpu_startup_entry+0x20/0x28 > > > [ 112.678185] [<ffff000008a0aa64>] rest_init+0xbc/0xc8 > > > [ 112.683140] [<ffff000008e60b4c>] start_kernel+0x384/0x398 > > > [ 112.688528] [<ffff000008e601e0>] __primary_switched+0x64/0x6c > > > > > > And finally this: > > > > Here it tries to access the descriptors when apparently they don't exist anymore. > > > > > > > > [ 112.843438] x1 : 0000000000000000 x0 : ffff000008061000 > > > [ 112.848743] > > > [ 112.850229] Process swapper/0 (pid: 0, stack limit = 0xffff000008f70000) > > > [ 112.856916] Stack: (0xffff8001f5e50d80 to 0xffff000008f74000) > > > [ 112.862647] Call trace: > > > [ 112.918392] 0c60: 0000000000000000 ffff0000086b4790 0000000000000080 ffff000008865ed8 > > > [ 112.926206] 0c80: ffff0000083d7038 0000000000210d00 0000000040000000 ffff00000852c238 > > > [ 112.934018] 0ca0: 65645b2064657461 6464612065636976 3078303d73736572 3530303030303030 > > > [ 112.941831] 0cc0: 5d64396536636137 0000000000000006 000000000f48bf67 00000000262ea01f > > > [ 112.949645] [<ffff0000086b4790>] dwmac4_rd_init_tx_desc+0x0/0x10 > > > [ 112.955638] [<ffff0000086a986c>] stmmac_tx_timeout+0x34/0x50 > > > [ 112.961285] [<ffff0000088a1938>] dev_watchdog+0x270/0x2a8 > > > [ 112.966672] [<ffff000008120774>] call_timer_fn+0x64/0xd0 > > > [ 112.971973] [<ffff000008120890>] expire_timers+0xb0/0xc0 > > > [ 112.977274] [<ffff0000081209f8>] run_timer_softirq+0x80/0xc0 > > > [ 112.982920] [<ffff0000080c517c>] __do_softirq+0x10c/0x218 > > > [ 112.988307] [<ffff0000080c55b0>] irq_exit+0xc8/0x118 > > > > > > The above is with one small change already applied, which seemed like it > > > would be significant, but it didn't have much effect. See below... > > > > > >> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > > > [...] > > >> @@ -2977,14 +3356,22 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit) > > >> */ > > >> static int stmmac_poll(struct napi_struct *napi, int budget) > > >> { > > >> - struct stmmac_priv *priv = container_of(napi, struct stmmac_priv, napi); > > >> - int work_done = 0; > > >> - u32 chan = STMMAC_CHAN0; > > >> + struct stmmac_rx_queue *rx_q = > > >> + container_of(napi, struct stmmac_rx_queue, napi); > > >> + struct stmmac_priv *priv = rx_q->priv_data; > > >> + u32 tx_count = priv->dma_cap.number_tx_queues; > > > > > > I changed this to priv->plat->tx_queues_to_use as used elsewhere to make > > > sure we don't try to clean up non-initialized TX queues. This seems to > > > solve an issue that would occasionally happen after the TX queue timed > > > out, but the fundamental issue is still there. > > > > Yes, you are correct. It should be priv->plat->tx_queues_to_use instead of "u32 > > tx_count = priv->dma_cap.number_tx_queues;"... sorry for that, but in my setup > > is the same value. Could you please make a patch for it? > > Yes, I can submit a patch for that. > > After some more testing I did get a couple (roughly 2 out of 10) > successful boots (I'm booting over NFS using the EQOS), and given that > this pointed towards something related to uninitialized data, I changed > all occurrences of kmalloc_array() with kcalloc() and that I've gotten > 10 successful reboots out of 10. > > I still can't pinpoint why this is now necessary since previously the > kmalloc_array() was working just fine. The only thing I can think of is > that we're not properly initializing all fields of the new queue > structures, since that's the only thing that's changed with this commit. > > I haven't investigated in detail yet, but from nothing so far has jumped > out at me. > > Thierry I have tried this change, but it made the situation worse on dwmac-sunxi (no network at all). Joao, perhaps it's time to revert the faulty (and very huge) patch and rework it by splitting at least in two: - adding RX queue / adding TX queue And more if possible (like just adding an unused queue parameter) or a patch just for adding stmmac_free_tx_buffers() for example. I think it will help to find where the problem is. And this time I will test them before applying:) Regards Corentin Labbe ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [v2,net-next,1/3] net: stmmac: enable multiple buffers 2017-03-24 14:09 ` Corentin Labbe @ 2017-03-24 14:59 ` Joao Pinto 2017-03-24 15:02 ` Fwd: " Joao Pinto 0 siblings, 1 reply; 21+ messages in thread From: Joao Pinto @ 2017-03-24 14:59 UTC (permalink / raw) To: Corentin Labbe, Thierry Reding, Joao.Pinto Cc: davem, peppe.cavallaro, alexandre.torgue, f.fainelli, netdev Às 2:09 PM de 3/24/2017, Corentin Labbe escreveu: > On Thu, Mar 23, 2017 at 07:10:59PM +0100, Thierry Reding wrote: >> On Thu, Mar 23, 2017 at 05:27:08PM +0000, Joao Pinto wrote: >>> Hi Thierry, >>> >> >> Yes, I can submit a patch for that. >> >> After some more testing I did get a couple (roughly 2 out of 10) >> successful boots (I'm booting over NFS using the EQOS), and given that >> this pointed towards something related to uninitialized data, I changed >> all occurrences of kmalloc_array() with kcalloc() and that I've gotten >> 10 successful reboots out of 10. >> >> I still can't pinpoint why this is now necessary since previously the >> kmalloc_array() was working just fine. The only thing I can think of is >> that we're not properly initializing all fields of the new queue >> structures, since that's the only thing that's changed with this commit. >> >> I haven't investigated in detail yet, but from nothing so far has jumped >> out at me. >> >> Thierry > > I have tried this change, but it made the situation worse on dwmac-sunxi (no network at all). > > Joao, perhaps it's time to revert the faulty (and very huge) patch and rework it by splitting at least in two: > - adding RX queue / adding TX queue > And more if possible (like just adding an unused queue parameter) or a patch just for adding stmmac_free_tx_buffers() for example. > I think it will help to find where the problem is. > > And this time I will test them before applying:) > > Regards > Corentin Labbe > Yes, I agree, it is better to revert and leave the tree functional for all. @David Miller: The multiple-buffer patch introduced some problems in some setups that are being hard to debug, so Corentin gave the idea of reverting the until commit 7bac4e1ec3ca2342929a39638d615c6b672c27a0 (net: stmmac: stmmac interrupt treatment prepared for multiple queues), which I fully agree. In my setup is ok, but the idea is to have everyone's setup working :), so lets break them into smaller pieces, and let's only apply them when everyone confirms that is working ok in your setups, agree? What is the typical mechanism for this? I send a patch reverting them? Thanks, Joao ^ permalink raw reply [flat|nested] 21+ messages in thread
* Fwd: Re: [v2,net-next,1/3] net: stmmac: enable multiple buffers 2017-03-24 14:59 ` Joao Pinto @ 2017-03-24 15:02 ` Joao Pinto 2017-03-24 17:17 ` David Miller 0 siblings, 1 reply; 21+ messages in thread From: Joao Pinto @ 2017-03-24 15:02 UTC (permalink / raw) To: clabbe.montjoie, thierry.reding, Joao.Pinto, davem Cc: peppe.cavallaro, alexandre.torgue, f.fainelli, netdev Sorry, sending again with David Miller in TO: instead of CC. Às 2:09 PM de 3/24/2017, Corentin Labbe escreveu: > On Thu, Mar 23, 2017 at 07:10:59PM +0100, Thierry Reding wrote: >> On Thu, Mar 23, 2017 at 05:27:08PM +0000, Joao Pinto wrote: >>> Hi Thierry, >>> >> >> Yes, I can submit a patch for that. >> >> After some more testing I did get a couple (roughly 2 out of 10) >> successful boots (I'm booting over NFS using the EQOS), and given that >> this pointed towards something related to uninitialized data, I changed >> all occurrences of kmalloc_array() with kcalloc() and that I've gotten >> 10 successful reboots out of 10. >> >> I still can't pinpoint why this is now necessary since previously the >> kmalloc_array() was working just fine. The only thing I can think of is >> that we're not properly initializing all fields of the new queue >> structures, since that's the only thing that's changed with this commit. >> >> I haven't investigated in detail yet, but from nothing so far has jumped >> out at me. >> >> Thierry > > I have tried this change, but it made the situation worse on dwmac-sunxi (no network at all). > > Joao, perhaps it's time to revert the faulty (and very huge) patch and rework it by splitting at least in two: > - adding RX queue / adding TX queue > And more if possible (like just adding an unused queue parameter) or a patch just for adding stmmac_free_tx_buffers() for example. > I think it will help to find where the problem is. > > And this time I will test them before applying:) > > Regards > Corentin Labbe > Yes, I agree, it is better to revert and leave the tree functional for all. @David Miller: The multiple-buffer patch introduced some problems in some setups that are being hard to debug, so Corentin gave the idea of reverting the until commit 7bac4e1ec3ca2342929a39638d615c6b672c27a0 (net: stmmac: stmmac interrupt treatment prepared for multiple queues), which I fully agree. In my setup is ok, but the idea is to have everyone's setup working :), so lets break them into smaller pieces, and let's only apply them when everyone confirms that is working ok in your setups, agree? What is the typical mechanism for this? I send a patch reverting them? Thanks, Joao ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [v2,net-next,1/3] net: stmmac: enable multiple buffers 2017-03-24 15:02 ` Fwd: " Joao Pinto @ 2017-03-24 17:17 ` David Miller 2017-03-24 17:19 ` Joao Pinto 0 siblings, 1 reply; 21+ messages in thread From: David Miller @ 2017-03-24 17:17 UTC (permalink / raw) To: Joao.Pinto Cc: clabbe.montjoie, thierry.reding, peppe.cavallaro, alexandre.torgue, f.fainelli, netdev From: Joao Pinto <Joao.Pinto@synopsys.com> Date: Fri, 24 Mar 2017 15:02:27 +0000 > Yes, I agree, it is better to revert and leave the tree functional for all. > > @David Miller: > The multiple-buffer patch introduced some problems in some setups that are being > hard to debug, so Corentin gave the idea of reverting the until > commit 7bac4e1ec3ca2342929a39638d615c6b672c27a0 (net: stmmac: stmmac interrupt > treatment prepared for multiple queues), which I fully agree. > > In my setup is ok, but the idea is to have everyone's setup working :), so lets > break them into smaller pieces, and let's only apply them when everyone confirms > that is working ok in your setups, agree? > > What is the typical mechanism for this? I send a patch reverting them? If you can compose a single "git revert" command to achieve this, just tell me what it is and I'll do it. Otherwise send a patch that does the revert. Thanks. ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [v2,net-next,1/3] net: stmmac: enable multiple buffers 2017-03-24 17:17 ` David Miller @ 2017-03-24 17:19 ` Joao Pinto 0 siblings, 0 replies; 21+ messages in thread From: Joao Pinto @ 2017-03-24 17:19 UTC (permalink / raw) To: David Miller, Joao.Pinto Cc: clabbe.montjoie, thierry.reding, peppe.cavallaro, alexandre.torgue, f.fainelli, netdev Às 5:17 PM de 3/24/2017, David Miller escreveu: > From: Joao Pinto <Joao.Pinto@synopsys.com> > Date: Fri, 24 Mar 2017 15:02:27 +0000 > >> Yes, I agree, it is better to revert and leave the tree functional for all. >> >> @David Miller: >> The multiple-buffer patch introduced some problems in some setups that are being >> hard to debug, so Corentin gave the idea of reverting the until >> commit 7bac4e1ec3ca2342929a39638d615c6b672c27a0 (net: stmmac: stmmac interrupt >> treatment prepared for multiple queues), which I fully agree. >> >> In my setup is ok, but the idea is to have everyone's setup working :), so lets >> break them into smaller pieces, and let's only apply them when everyone confirms >> that is working ok in your setups, agree? >> >> What is the typical mechanism for this? I send a patch reverting them? > > If you can compose a single "git revert" command to achieve this, just > tell me what it is and I'll do it. > > Otherwise send a patch that does the revert. Ok, I sent 2 patches with fixes. Let's see if you get some happy clients. If not, I will inform the commit id to revert. Thanks David. > > Thanks. > ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [v2,net-next,1/3] net: stmmac: enable multiple buffers 2017-03-23 17:27 ` Joao Pinto 2017-03-23 18:10 ` Thierry Reding @ 2017-03-24 7:42 ` Andrew Lunn 2017-03-24 10:47 ` Joao Pinto 1 sibling, 1 reply; 21+ messages in thread From: Andrew Lunn @ 2017-03-24 7:42 UTC (permalink / raw) To: Joao Pinto Cc: Thierry Reding, davem, peppe.cavallaro, alexandre.torgue, f.fainelli, netdev On Thu, Mar 23, 2017 at 05:27:08PM +0000, Joao Pinto wrote: > Yes, you are correct. It should be priv->plat->tx_queues_to_use instead of "u32 > tx_count = priv->dma_cap.number_tx_queues;"... sorry for that, but in my setup > is the same value. Could you please make a patch for it? Hi Joao As the new maintainer, don't you think you should be testing on multiple systems? There are SoC vendor reference design boards you can buy, and set up a test farm. You can then ensure your new features don't break stuff, or add performance regressions. Andrew ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [v2,net-next,1/3] net: stmmac: enable multiple buffers 2017-03-24 7:42 ` Andrew Lunn @ 2017-03-24 10:47 ` Joao Pinto 2017-03-24 11:17 ` Andrew Lunn 0 siblings, 1 reply; 21+ messages in thread From: Joao Pinto @ 2017-03-24 10:47 UTC (permalink / raw) To: Andrew Lunn, Joao Pinto Cc: Thierry Reding, davem, peppe.cavallaro, alexandre.torgue, f.fainelli, netdev Hi Andrew, Às 7:42 AM de 3/24/2017, Andrew Lunn escreveu: > On Thu, Mar 23, 2017 at 05:27:08PM +0000, Joao Pinto wrote: > >> Yes, you are correct. It should be priv->plat->tx_queues_to_use instead of "u32 >> tx_count = priv->dma_cap.number_tx_queues;"... sorry for that, but in my setup >> is the same value. Could you please make a patch for it? > > Hi Joao > > As the new maintainer, don't you think you should be testing on > multiple systems? There are SoC vendor reference design boards you can > buy, and set up a test farm. You can then ensure your new features > don't break stuff, or add performance regressions. > > Andrew > I am not the maintainer of stmmac :), I am just developing on it like everyone else, just glad to help improving it and adding new features to it. Of course if the current maintainers invite me to be, I will honored to do so. Yes it would be fantastic to have a set of boards, but I rarely see this in any maintainer :). I think it would be nice to have a farm like Linaro has with a farm of boards donated by each company, enabling tests for everyone in the project. I have talked with the Prototyping team and I will have an AXI based design, which will emulate the SoC environment making possible to test the platform driver scope. I try as hard as I can to network with people and try to minimize this situations, but when there is so many different setups using a driver with diff configurations, situations like this can happen, but I am here to help debugging and solving them. Joao ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [v2,net-next,1/3] net: stmmac: enable multiple buffers 2017-03-24 10:47 ` Joao Pinto @ 2017-03-24 11:17 ` Andrew Lunn 2017-03-24 11:21 ` Joao Pinto 2017-03-24 17:05 ` David Miller 0 siblings, 2 replies; 21+ messages in thread From: Andrew Lunn @ 2017-03-24 11:17 UTC (permalink / raw) To: Joao Pinto Cc: Thierry Reding, davem, peppe.cavallaro, alexandre.torgue, f.fainelli, netdev > Yes it would be fantastic to have a set of boards, but I rarely see this in any > maintainer :). Being a Marvell SoC and switch maintainer, i have around a dozen boards. Some i got some simply by asking the manufacture, others i purchased. I don't think i'm in the minority here. Without having access to a number of different hardwares, i don't feel i would be doing my work properly. > I try as hard as I can to network with people and try to minimize this > situations, but when there is so many different setups using a driver with diff > configurations, situations like this can happen, but I am here to help debugging > and solving them. You made a move to rename stmmac to synopsys not long ago. It gave the impression that synopsis wants to take over this driver. If there are a number of different configurations, who better than synopsys to actually properly test these configurations? If you ask around, i'm sure people will send you hardware. Andrew ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [v2,net-next,1/3] net: stmmac: enable multiple buffers 2017-03-24 11:17 ` Andrew Lunn @ 2017-03-24 11:21 ` Joao Pinto 2017-03-24 17:05 ` David Miller 1 sibling, 0 replies; 21+ messages in thread From: Joao Pinto @ 2017-03-24 11:21 UTC (permalink / raw) To: Andrew Lunn, Joao Pinto Cc: Thierry Reding, davem, peppe.cavallaro, alexandre.torgue, f.fainelli, netdev Às 11:17 AM de 3/24/2017, Andrew Lunn escreveu: >> Yes it would be fantastic to have a set of boards, but I rarely see this in any >> maintainer :). > > Being a Marvell SoC and switch maintainer, i have around a dozen > boards. Some i got some simply by asking the manufacture, others i > purchased. I don't think i'm in the minority here. Without having > access to a number of different hardwares, i don't feel i would be > doing my work properly. > >> I try as hard as I can to network with people and try to minimize this >> situations, but when there is so many different setups using a driver with diff >> configurations, situations like this can happen, but I am here to help debugging >> and solving them. > > You made a move to rename stmmac to synopsys not long ago. It gave the > impression that synopsis wants to take over this driver. If there are > a number of different configurations, who better than synopsys to > actually properly test these configurations? If you ask around, i'm > sure people will send you hardware. If the stmmac community wishes that I become the maintainer and are available to send me their ref hardware, I am available and I can build a farm in my site to make all necessary tests to all the patches made by me and the ones that I receive. > > Andrew > Joao ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [v2,net-next,1/3] net: stmmac: enable multiple buffers 2017-03-24 11:17 ` Andrew Lunn 2017-03-24 11:21 ` Joao Pinto @ 2017-03-24 17:05 ` David Miller 2017-03-24 17:09 ` Joao Pinto 1 sibling, 1 reply; 21+ messages in thread From: David Miller @ 2017-03-24 17:05 UTC (permalink / raw) To: andrew Cc: Joao.Pinto, thierry.reding, peppe.cavallaro, alexandre.torgue, f.fainelli, netdev From: Andrew Lunn <andrew@lunn.ch> Date: Fri, 24 Mar 2017 12:17:36 +0100 >> Yes it would be fantastic to have a set of boards, but I rarely see this in any >> maintainer :). > > Being a Marvell SoC and switch maintainer, i have around a dozen > boards. Some i got some simply by asking the manufacture, others i > purchased. I don't think i'm in the minority here. Without having > access to a number of different hardwares, i don't feel i would be > doing my work properly. > >> I try as hard as I can to network with people and try to minimize this >> situations, but when there is so many different setups using a driver with diff >> configurations, situations like this can happen, but I am here to help debugging >> and solving them. > > You made a move to rename stmmac to synopsys not long ago. It gave the > impression that synopsis wants to take over this driver. If there are > a number of different configurations, who better than synopsys to > actually properly test these configurations? If you ask around, i'm > sure people will send you hardware. I completely agree with everything Andrew is saying here. ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [v2,net-next,1/3] net: stmmac: enable multiple buffers 2017-03-24 17:05 ` David Miller @ 2017-03-24 17:09 ` Joao Pinto 2017-03-27 9:28 ` Alexandre Torgue 0 siblings, 1 reply; 21+ messages in thread From: Joao Pinto @ 2017-03-24 17:09 UTC (permalink / raw) To: David Miller, andrew Cc: Joao.Pinto, thierry.reding, peppe.cavallaro, alexandre.torgue, f.fainelli, netdev Hello David, Às 5:05 PM de 3/24/2017, David Miller escreveu: > From: Andrew Lunn <andrew@lunn.ch> > Date: Fri, 24 Mar 2017 12:17:36 +0100 > >>> Yes it would be fantastic to have a set of boards, but I rarely see this in any >>> maintainer :). >> >> Being a Marvell SoC and switch maintainer, i have around a dozen >> boards. Some i got some simply by asking the manufacture, others i >> purchased. I don't think i'm in the minority here. Without having >> access to a number of different hardwares, i don't feel i would be >> doing my work properly. >> >>> I try as hard as I can to network with people and try to minimize this >>> situations, but when there is so many different setups using a driver with diff >>> configurations, situations like this can happen, but I am here to help debugging >>> and solving them. >> >> You made a move to rename stmmac to synopsys not long ago. It gave the >> impression that synopsis wants to take over this driver. If there are >> a number of different configurations, who better than synopsys to >> actually properly test these configurations? If you ask around, i'm >> sure people will send you hardware. > > I completely agree with everything Andrew is saying here. > I'll maintain the driver if everyone agrees with it, no problem, mas I would like to hear from Peppe and Alex, since they are the current maintainers. HW testing would be nice, but hard to justify investing in one shot, so it would be great to receive hardware to make tests if the companies wish it. About the problems in the last patch I am going to send a 2 patch set with 2 fixes, lets see if stuff gets better. Thnaks Joao ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [v2,net-next,1/3] net: stmmac: enable multiple buffers 2017-03-24 17:09 ` Joao Pinto @ 2017-03-27 9:28 ` Alexandre Torgue 2017-03-27 9:34 ` Joao Pinto 0 siblings, 1 reply; 21+ messages in thread From: Alexandre Torgue @ 2017-03-27 9:28 UTC (permalink / raw) To: Joao Pinto, David Miller, andrew Cc: thierry.reding, peppe.cavallaro, f.fainelli, netdev Hi Joao On 03/24/2017 06:09 PM, Joao Pinto wrote: > > Hello David, > > Às 5:05 PM de 3/24/2017, David Miller escreveu: >> From: Andrew Lunn <andrew@lunn.ch> >> Date: Fri, 24 Mar 2017 12:17:36 +0100 >> >>>> Yes it would be fantastic to have a set of boards, but I rarely see this in any >>>> maintainer :). >>> >>> Being a Marvell SoC and switch maintainer, i have around a dozen >>> boards. Some i got some simply by asking the manufacture, others i >>> purchased. I don't think i'm in the minority here. Without having >>> access to a number of different hardwares, i don't feel i would be >>> doing my work properly. >>> >>>> I try as hard as I can to network with people and try to minimize this >>>> situations, but when there is so many different setups using a driver with diff >>>> configurations, situations like this can happen, but I am here to help debugging >>>> and solving them. >>> >>> You made a move to rename stmmac to synopsys not long ago. It gave the >>> impression that synopsis wants to take over this driver. If there are >>> a number of different configurations, who better than synopsys to >>> actually properly test these configurations? If you ask around, i'm >>> sure people will send you hardware. >> >> I completely agree with everything Andrew is saying here. >> > > I'll maintain the driver if everyone agrees with it, no problem, mas I would > like to hear from Peppe and Alex, since they are the current maintainers. I agree with this proposition. As you can see (and unfortunately) I have currently no time for reviewing (I'm busy on another subsystem). You are close to new GMAC evolution and very active (I hope for a long time). For sure you need boards with old GMAC Ips. I will send you an STM32 with GMAC IP 3.5. Don't hesitate to contact us if you have question about historic content of stmmac driver. Thanks! Alex > > HW testing would be nice, but hard to justify investing in one shot, so it would > be great to receive hardware to make tests if the companies wish it. > > About the problems in the last patch I am going to send a 2 patch set with 2 > fixes, lets see if stuff gets better. > > Thnaks > Joao > ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [v2,net-next,1/3] net: stmmac: enable multiple buffers 2017-03-27 9:28 ` Alexandre Torgue @ 2017-03-27 9:34 ` Joao Pinto 0 siblings, 0 replies; 21+ messages in thread From: Joao Pinto @ 2017-03-27 9:34 UTC (permalink / raw) To: Alexandre Torgue, Joao Pinto, peppe.cavallaro Cc: David Miller, andrew, thierry.reding, f.fainelli, netdev Às 10:28 AM de 3/27/2017, Alexandre Torgue escreveu: > Hi Joao > > On 03/24/2017 06:09 PM, Joao Pinto wrote: >> >> Hello David, >> >> Às 5:05 PM de 3/24/2017, David Miller escreveu: >>> From: Andrew Lunn <andrew@lunn.ch> >>> Date: Fri, 24 Mar 2017 12:17:36 +0100 >>> >>>>> Yes it would be fantastic to have a set of boards, but I rarely see this in >>>>> any >>>>> maintainer :). >>>> >>>> Being a Marvell SoC and switch maintainer, i have around a dozen >>>> boards. Some i got some simply by asking the manufacture, others i >>>> purchased. I don't think i'm in the minority here. Without having >>>> access to a number of different hardwares, i don't feel i would be >>>> doing my work properly. >>>> >>>>> I try as hard as I can to network with people and try to minimize this >>>>> situations, but when there is so many different setups using a driver with >>>>> diff >>>>> configurations, situations like this can happen, but I am here to help >>>>> debugging >>>>> and solving them. >>>> >>>> You made a move to rename stmmac to synopsys not long ago. It gave the >>>> impression that synopsis wants to take over this driver. If there are >>>> a number of different configurations, who better than synopsys to >>>> actually properly test these configurations? If you ask around, i'm >>>> sure people will send you hardware. >>> >>> I completely agree with everything Andrew is saying here. >>> >> >> I'll maintain the driver if everyone agrees with it, no problem, mas I would >> like to hear from Peppe and Alex, since they are the current maintainers. > > I agree with this proposition. As you can see (and unfortunately) I have > currently no time for reviewing (I'm busy on another subsystem). You are close > to new GMAC evolution and very active (I hope for a long time). > For sure you need boards with old GMAC Ips. I will send you an STM32 with GMAC > IP 3.5. Don't hesitate to contact us if you have question about historic content > of stmmac driver. Thanks Alex, I will do my best to maintain it! That would be great to have a board with an older IP to test. I will send you my office address soon. Thanks! @ Peppe: Are you ok with it? Thanks. > > Thanks! > > Alex > > > >> >> HW testing would be nice, but hard to justify investing in one shot, so it would >> be great to receive hardware to make tests if the companies wish it. >> >> About the problems in the last patch I am going to send a 2 patch set with 2 >> fixes, lets see if stuff gets better. >> >> Thnaks >> Joao >> ^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH v2 net-next 2/3] net: stmmac: TX and RX queue priority configuration 2017-03-17 16:11 [PATCH v2 net-next 0/3] net: stmmac: adding multiple buffers and routing Joao Pinto 2017-03-17 16:11 ` [PATCH v2 net-next 1/3] net: stmmac: enable multiple buffers Joao Pinto @ 2017-03-17 16:11 ` Joao Pinto 2017-03-17 16:11 ` [PATCH v2 net-next 3/3] net: stmmac: RX queue routing configuration Joao Pinto 2017-03-22 0:24 ` [PATCH v2 net-next 0/3] net: stmmac: adding multiple buffers and routing David Miller 3 siblings, 0 replies; 21+ messages in thread From: Joao Pinto @ 2017-03-17 16:11 UTC (permalink / raw) To: davem; +Cc: peppe.cavallaro, alexandre.torgue, f.fainelli, netdev, Joao Pinto This patch adds the configuration of RX and TX queues' priority. Signed-off-by: Joao Pinto <jpinto@synopsys.com> --- changes v1->v2: - added range value info in the DT bindings Documentation/devicetree/bindings/net/stmmac.txt | 5 +++ drivers/net/ethernet/stmicro/stmmac/common.h | 4 ++ drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 13 ++++++ drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 37 +++++++++++++++++ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 48 ++++++++++++++++++++++ drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 4 ++ .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 16 ++++++++ include/linux/stmmac.h | 4 ++ 8 files changed, 131 insertions(+) diff --git a/Documentation/devicetree/bindings/net/stmmac.txt b/Documentation/devicetree/bindings/net/stmmac.txt index a7b0e41..d11bd09 100644 --- a/Documentation/devicetree/bindings/net/stmmac.txt +++ b/Documentation/devicetree/bindings/net/stmmac.txt @@ -83,6 +83,7 @@ Optional properties: - snps,dcb-algorithm: Queue to be enabled as DCB - snps,avb-algorithm: Queue to be enabled as AVB - snps,map-to-dma-channel: Channel to map + - snps,priority: RX queue priority (Range: 0x0 to 0xF) - Multiple TX Queues parameters: below the list of all the parameters to configure the multiple TX queues: - snps,tx-queues-to-use: number of TX queues to be used in the driver @@ -101,6 +102,7 @@ Optional properties: - snps,idle_slope: unlock on WoL - snps,high_credit: max write outstanding req. limit - snps,low_credit: max read outstanding req. limit + - snps,priority: TX queue priority (Range: 0x0 to 0xF) Examples: stmmac_axi_setup: stmmac-axi-config { @@ -115,6 +117,7 @@ Examples: queue0 { snps,dcb-algorithm; snps,map-to-dma-channel = <0x0>; + snps,priority = <0x0>; }; }; @@ -124,6 +127,7 @@ Examples: queue0 { snps,weight = <0x10>; snps,dcb-algorithm; + snps,priority = <0x0>; }; queue1 { @@ -132,6 +136,7 @@ Examples: snps,idle_slope = <0x1000>; snps,high_credit = <0x3E800>; snps,low_credit = <0xFFC18000>; + snps,priority = <0x1>; }; }; diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h index badc441..e0b31e7 100644 --- a/drivers/net/ethernet/stmicro/stmmac/common.h +++ b/drivers/net/ethernet/stmicro/stmmac/common.h @@ -469,6 +469,10 @@ struct stmmac_ops { int (*rx_ipc)(struct mac_device_info *hw); /* Enable RX Queues */ void (*rx_queue_enable)(struct mac_device_info *hw, u8 mode, u32 queue); + /* RX Queues Priority */ + void (*rx_queue_prio)(struct mac_device_info *hw, u32 prio, u32 queue); + /* TX Queues Priority */ + void (*tx_queue_prio)(struct mac_device_info *hw, u32 prio, u32 queue); /* Program RX Algorithms */ void (*prog_mtl_rx_algorithms)(struct mac_device_info *hw, u32 rx_alg); /* Program TX Algorithms */ diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4.h b/drivers/net/ethernet/stmicro/stmmac/dwmac4.h index 54bcdb4..a6c382d 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4.h +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4.h @@ -22,7 +22,12 @@ #define GMAC_HASH_TAB_32_63 0x00000014 #define GMAC_RX_FLOW_CTRL 0x00000090 #define GMAC_QX_TX_FLOW_CTRL(x) (0x70 + x * 4) +#define GMAC_TXQ_PRTY_MAP0 0x98 +#define GMAC_TXQ_PRTY_MAP1 0x9C #define GMAC_RXQ_CTRL0 0x000000a0 +#define GMAC_RXQ_CTRL1 0x000000a4 +#define GMAC_RXQ_CTRL2 0x000000a8 +#define GMAC_RXQ_CTRL3 0x000000ac #define GMAC_INT_STATUS 0x000000b0 #define GMAC_INT_EN 0x000000b4 #define GMAC_1US_TIC_COUNTER 0x000000dc @@ -54,6 +59,14 @@ /* MAC Flow Control RX */ #define GMAC_RX_FLOW_CTRL_RFE BIT(0) +/* RX Queues Priorities */ +#define GMAC_RXQCTRL_PSRQX_MASK(x) GENMASK(7 + ((x) * 8), 0 + ((x) * 8)) +#define GMAC_RXQCTRL_PSRQX_SHIFT(x) ((x) * 8) + +/* TX Queues Priorities */ +#define GMAC_TXQCTRL_PSTQX_MASK(x) GENMASK(7 + ((x) * 8), 0 + ((x) * 8)) +#define GMAC_TXQCTRL_PSTQX_SHIFT(x) ((x) * 8) + /* MAC Flow Control TX */ #define GMAC_TX_FLOW_CTRL_TFE BIT(1) #define GMAC_TX_FLOW_CTRL_PT_SHIFT 16 diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c index 10599db..342f62a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c @@ -74,6 +74,41 @@ static void dwmac4_rx_queue_enable(struct mac_device_info *hw, writel(value, ioaddr + GMAC_RXQ_CTRL0); } +static void dwmac4_rx_queue_priority(struct mac_device_info *hw, + u32 prio, u32 queue) +{ + void __iomem *ioaddr = hw->pcsr; + u32 base_register; + u32 value; + + base_register = (queue < 4) ? GMAC_RXQ_CTRL2 : GMAC_RXQ_CTRL3; + + value = readl(ioaddr + base_register); + + value &= ~GMAC_RXQCTRL_PSRQX_MASK(queue); + value |= (prio << GMAC_RXQCTRL_PSRQX_SHIFT(queue)) & + GMAC_RXQCTRL_PSRQX_MASK(queue); + writel(value, ioaddr + base_register); +} + +static void dwmac4_tx_queue_priority(struct mac_device_info *hw, + u32 prio, u32 queue) +{ + void __iomem *ioaddr = hw->pcsr; + u32 base_register; + u32 value; + + base_register = (queue < 4) ? GMAC_TXQ_PRTY_MAP0 : GMAC_TXQ_PRTY_MAP1; + + value = readl(ioaddr + base_register); + + value &= ~GMAC_TXQCTRL_PSTQX_MASK(queue); + value |= (prio << GMAC_TXQCTRL_PSTQX_SHIFT(queue)) & + GMAC_TXQCTRL_PSTQX_MASK(queue); + + writel(value, ioaddr + base_register); +} + static void dwmac4_prog_mtl_rx_algorithms(struct mac_device_info *hw, u32 rx_alg) { @@ -603,6 +638,8 @@ static const struct stmmac_ops dwmac4_ops = { .core_init = dwmac4_core_init, .rx_ipc = dwmac4_rx_ipc_enable, .rx_queue_enable = dwmac4_rx_queue_enable, + .rx_queue_prio = dwmac4_rx_queue_priority, + .tx_queue_prio = dwmac4_tx_queue_priority, .prog_mtl_rx_algorithms = dwmac4_prog_mtl_rx_algorithms, .prog_mtl_tx_algorithms = dwmac4_prog_mtl_tx_algorithms, .set_mtl_tx_queue_weight = dwmac4_set_mtl_tx_queue_weight, diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index a389dfb..0f2c0d7 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2293,6 +2293,46 @@ static void stmmac_rx_queue_dma_chan_map(struct stmmac_priv *priv) } /** + * stmmac_mac_config_rx_queues_prio - Configure RX Queue priority + * @priv: driver private structure + * Description: It is used for configuring the RX Queue Priority + */ +static void stmmac_mac_config_rx_queues_prio(struct stmmac_priv *priv) +{ + u32 rx_queues_count = priv->plat->rx_queues_to_use; + u32 queue; + u32 prio; + + for (queue = 0; queue < rx_queues_count; queue++) { + if (!priv->plat->rx_queues_cfg[queue].use_prio) + continue; + + prio = priv->plat->rx_queues_cfg[queue].prio; + priv->hw->mac->rx_queue_prio(priv->hw, prio, queue); + } +} + +/** + * stmmac_mac_config_tx_queues_prio - Configure TX Queue priority + * @priv: driver private structure + * Description: It is used for configuring the TX Queue Priority + */ +static void stmmac_mac_config_tx_queues_prio(struct stmmac_priv *priv) +{ + u32 tx_queues_count = priv->plat->tx_queues_to_use; + u32 queue; + u32 prio; + + for (queue = 0; queue < tx_queues_count; queue++) { + if (!priv->plat->tx_queues_cfg[queue].use_prio) + continue; + + prio = priv->plat->tx_queues_cfg[queue].prio; + priv->hw->mac->tx_queue_prio(priv->hw, prio, queue); + } +} + +/** * stmmac_mtl_configuration - Configure MTL * @priv: driver private structure * Description: It is used for configurring MTL @@ -2329,6 +2369,14 @@ static void stmmac_mtl_configuration(struct stmmac_priv *priv) /* Set the HW DMA mode and the COE */ stmmac_dma_operation_mode(priv); + + /* Set RX priorities */ + if (rx_queues_count > 1 && priv->hw->mac->rx_queue_prio) + stmmac_mac_config_rx_queues_prio(priv); + + /* Set TX priorities */ + if (tx_queues_count > 1 && priv->hw->mac->tx_queue_prio) + stmmac_mac_config_tx_queues_prio(priv); } /** diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c index cea472a..ffe4fac 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c @@ -92,6 +92,10 @@ static void stmmac_default_data(struct plat_stmmacenet_data *plat) /* Set default number of RX and TX queues to use */ plat->tx_queues_to_use = 1; plat->rx_queues_to_use = 1; + + /* Disable Priority config by default */ + plat->tx_queues_cfg[0].use_prio = false; + plat->rx_queues_cfg[0].use_prio = false; } static int quark_default_data(struct plat_stmmacenet_data *plat, diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index 37f550a..77b0468 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -182,6 +182,14 @@ static void stmmac_mtl_setup(struct platform_device *pdev, plat->rx_queues_cfg[queue].chan = queue; /* TODO: Dynamic mapping to be included in the future */ + if (of_property_read_u32(q_node, "snps,priority", + &plat->rx_queues_cfg[queue].prio)) { + plat->rx_queues_cfg[queue].prio = 0; + plat->rx_queues_cfg[queue].use_prio = false; + } else { + plat->rx_queues_cfg[queue].use_prio = true; + } + queue++; } @@ -235,6 +243,14 @@ static void stmmac_mtl_setup(struct platform_device *pdev, plat->tx_queues_cfg[queue].mode_to_use = MTL_QUEUE_DCB; } + if (of_property_read_u32(q_node, "snps,priority", + &plat->tx_queues_cfg[queue].prio)) { + plat->tx_queues_cfg[queue].prio = 0; + plat->tx_queues_cfg[queue].use_prio = false; + } else { + plat->tx_queues_cfg[queue].use_prio = true; + } + queue++; } diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index be47b85..b7d5e7a 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -127,6 +127,8 @@ struct stmmac_axi { struct stmmac_rxq_cfg { u8 mode_to_use; u8 chan; + bool use_prio; + u32 prio; }; struct stmmac_txq_cfg { @@ -137,6 +139,8 @@ struct stmmac_txq_cfg { u32 idle_slope; u32 high_credit; u32 low_credit; + bool use_prio; + u32 prio; }; struct plat_stmmacenet_data { -- 2.9.3 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v2 net-next 3/3] net: stmmac: RX queue routing configuration 2017-03-17 16:11 [PATCH v2 net-next 0/3] net: stmmac: adding multiple buffers and routing Joao Pinto 2017-03-17 16:11 ` [PATCH v2 net-next 1/3] net: stmmac: enable multiple buffers Joao Pinto 2017-03-17 16:11 ` [PATCH v2 net-next 2/3] net: stmmac: TX and RX queue priority configuration Joao Pinto @ 2017-03-17 16:11 ` Joao Pinto 2017-03-22 0:24 ` [PATCH v2 net-next 0/3] net: stmmac: adding multiple buffers and routing David Miller 3 siblings, 0 replies; 21+ messages in thread From: Joao Pinto @ 2017-03-17 16:11 UTC (permalink / raw) To: davem; +Cc: peppe.cavallaro, alexandre.torgue, f.fainelli, netdev, Joao Pinto This patch adds the configuration of RX queues' routing. Signed-off-by: Joao Pinto <jpinto@synopsys.com> --- changes v1->v2: - DT bindings were changed to bool - DT parsing was simplified, improving routing parameter scalability Documentation/devicetree/bindings/net/stmmac.txt | 6 ++++ drivers/net/ethernet/stmicro/stmmac/common.h | 17 +++++++++++ drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 16 ++++++++++ drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 34 ++++++++++++++++++++++ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 25 ++++++++++++++++ drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 3 ++ .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 14 +++++++++ include/linux/stmmac.h | 1 + 8 files changed, 116 insertions(+) diff --git a/Documentation/devicetree/bindings/net/stmmac.txt b/Documentation/devicetree/bindings/net/stmmac.txt index d11bd09..784d988 100644 --- a/Documentation/devicetree/bindings/net/stmmac.txt +++ b/Documentation/devicetree/bindings/net/stmmac.txt @@ -83,6 +83,12 @@ Optional properties: - snps,dcb-algorithm: Queue to be enabled as DCB - snps,avb-algorithm: Queue to be enabled as AVB - snps,map-to-dma-channel: Channel to map + - Specifiy specific packet routing: + - snps,route-avcp: AV Untagged Control packets + - snps,route-ptp: PTP Packets + - snps,route-dcbcp: DCB Control Packets + - snps,route-up: Untagged Packets + - snps,route-multi-broad: Multicast & Broadcast Packets - snps,priority: RX queue priority (Range: 0x0 to 0xF) - Multiple TX Queues parameters: below the list of all the parameters to configure the multiple TX queues: diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h index e0b31e7..572cf8b 100644 --- a/drivers/net/ethernet/stmicro/stmmac/common.h +++ b/drivers/net/ethernet/stmicro/stmmac/common.h @@ -246,6 +246,15 @@ struct stmmac_extra_stats { #define STMMAC_TX_MAX_FRAMES 256 #define STMMAC_TX_FRAMES 64 +/* Packets types */ +enum packets_types { + PACKET_AVCPQ = 0x1, /* AV Untagged Control packets */ + PACKET_PTPQ = 0x2, /* PTP Packets */ + PACKET_DCBCPQ = 0x3, /* DCB Control Packets */ + PACKET_UPQ = 0x4, /* Untagged Packets */ + PACKET_MCBCQ = 0x5, /* Multicast & Broadcast Packets */ +}; + /* Rx IPC status */ enum rx_frame_status { good_frame = 0x0, @@ -473,6 +482,9 @@ struct stmmac_ops { void (*rx_queue_prio)(struct mac_device_info *hw, u32 prio, u32 queue); /* TX Queues Priority */ void (*tx_queue_prio)(struct mac_device_info *hw, u32 prio, u32 queue); + /* RX Queues Routing */ + void (*rx_queue_routing)(struct mac_device_info *hw, u8 packet, + u32 queue); /* Program RX Algorithms */ void (*prog_mtl_rx_algorithms)(struct mac_device_info *hw, u32 rx_alg); /* Program TX Algorithms */ @@ -581,6 +593,11 @@ struct mac_device_info { unsigned int ps; }; +struct stmmac_rx_routing { + u32 reg_mask; + u32 reg_shift; +}; + struct mac_device_info *dwmac1000_setup(void __iomem *ioaddr, int mcbins, int perfect_uc_entries, int *synopsys_id); diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4.h b/drivers/net/ethernet/stmicro/stmmac/dwmac4.h index a6c382d..d74cedf 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4.h +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4.h @@ -44,6 +44,22 @@ #define GMAC_ADDR_HIGH(reg) (0x300 + reg * 8) #define GMAC_ADDR_LOW(reg) (0x304 + reg * 8) +/* RX Queues Routing */ +#define GMAC_RXQCTRL_AVCPQ_MASK GENMASK(2, 0) +#define GMAC_RXQCTRL_AVCPQ_SHIFT 0 +#define GMAC_RXQCTRL_PTPQ_MASK GENMASK(6, 4) +#define GMAC_RXQCTRL_PTPQ_SHIFT 4 +#define GMAC_RXQCTRL_DCBCPQ_MASK GENMASK(10, 8) +#define GMAC_RXQCTRL_DCBCPQ_SHIFT 8 +#define GMAC_RXQCTRL_UPQ_MASK GENMASK(14, 12) +#define GMAC_RXQCTRL_UPQ_SHIFT 12 +#define GMAC_RXQCTRL_MCBCQ_MASK GENMASK(18, 16) +#define GMAC_RXQCTRL_MCBCQ_SHIFT 16 +#define GMAC_RXQCTRL_MCBCQEN BIT(20) +#define GMAC_RXQCTRL_MCBCQEN_SHIFT 20 +#define GMAC_RXQCTRL_TACPQE BIT(21) +#define GMAC_RXQCTRL_TACPQE_SHIFT 21 + /* MAC Packet Filtering */ #define GMAC_PACKET_FILTER_PR BIT(0) #define GMAC_PACKET_FILTER_HMC BIT(2) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c index 342f62a..40ce202 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c @@ -109,6 +109,39 @@ static void dwmac4_tx_queue_priority(struct mac_device_info *hw, writel(value, ioaddr + base_register); } +static void dwmac4_tx_queue_routing(struct mac_device_info *hw, + u8 packet, u32 queue) +{ + void __iomem *ioaddr = hw->pcsr; + u32 value; + + const struct stmmac_rx_routing route_possibilities[] = { + { GMAC_RXQCTRL_AVCPQ_MASK, GMAC_RXQCTRL_AVCPQ_SHIFT }, + { GMAC_RXQCTRL_PTPQ_MASK, GMAC_RXQCTRL_PTPQ_SHIFT }, + { GMAC_RXQCTRL_DCBCPQ_MASK, GMAC_RXQCTRL_DCBCPQ_SHIFT }, + { GMAC_RXQCTRL_UPQ_MASK, GMAC_RXQCTRL_UPQ_SHIFT }, + { GMAC_RXQCTRL_MCBCQ_MASK, GMAC_RXQCTRL_MCBCQ_SHIFT }, + }; + + value = readl(ioaddr + GMAC_RXQ_CTRL1); + + /* routing configuration */ + value &= ~route_possibilities[packet - 1].reg_mask; + value |= (queue << route_possibilities[packet-1].reg_shift) & + route_possibilities[packet - 1].reg_mask; + + /* some packets require extra ops */ + if (packet == PACKET_AVCPQ) { + value &= ~GMAC_RXQCTRL_TACPQE; + value |= 0x1 << GMAC_RXQCTRL_TACPQE_SHIFT; + } else if (packet == PACKET_MCBCQ) { + value &= ~GMAC_RXQCTRL_MCBCQEN; + value |= 0x1 << GMAC_RXQCTRL_MCBCQEN_SHIFT; + } + + writel(value, ioaddr + GMAC_RXQ_CTRL1); +} + static void dwmac4_prog_mtl_rx_algorithms(struct mac_device_info *hw, u32 rx_alg) { @@ -640,6 +673,7 @@ static const struct stmmac_ops dwmac4_ops = { .rx_queue_enable = dwmac4_rx_queue_enable, .rx_queue_prio = dwmac4_rx_queue_priority, .tx_queue_prio = dwmac4_tx_queue_priority, + .rx_queue_routing = dwmac4_tx_queue_routing, .prog_mtl_rx_algorithms = dwmac4_prog_mtl_rx_algorithms, .prog_mtl_tx_algorithms = dwmac4_prog_mtl_tx_algorithms, .set_mtl_tx_queue_weight = dwmac4_set_mtl_tx_queue_weight, diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 0f2c0d7..531bf1d 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2333,6 +2333,27 @@ static void stmmac_mac_config_tx_queues_prio(struct stmmac_priv *priv) } /** + * stmmac_mac_config_rx_queues_routing - Configure RX Queue Routing + * @priv: driver private structure + * Description: It is used for configuring the RX queue routing + */ +static void stmmac_mac_config_rx_queues_routing(struct stmmac_priv *priv) +{ + u32 rx_queues_count = priv->plat->rx_queues_to_use; + u32 queue; + u8 packet; + + for (queue = 0; queue < rx_queues_count; queue++) { + /* no specific packet type routing specified for the queue */ + if (priv->plat->rx_queues_cfg[queue].pkt_route == 0x0) + continue; + + packet = priv->plat->rx_queues_cfg[queue].pkt_route; + priv->hw->mac->rx_queue_prio(priv->hw, packet, queue); + } +} + +/** * stmmac_mtl_configuration - Configure MTL * @priv: driver private structure * Description: It is used for configurring MTL @@ -2377,6 +2398,10 @@ static void stmmac_mtl_configuration(struct stmmac_priv *priv) /* Set TX priorities */ if (tx_queues_count > 1 && priv->hw->mac->tx_queue_prio) stmmac_mac_config_tx_queues_prio(priv); + + /* Set RX routing */ + if (rx_queues_count > 1 && priv->hw->mac->rx_queue_routing) + stmmac_mac_config_rx_queues_routing(priv); } /** diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c index ffe4fac..a224d7b 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c @@ -96,6 +96,9 @@ static void stmmac_default_data(struct plat_stmmacenet_data *plat) /* Disable Priority config by default */ plat->tx_queues_cfg[0].use_prio = false; plat->rx_queues_cfg[0].use_prio = false; + + /* Disable RX queues routing by default */ + plat->rx_queues_cfg[0].pkt_route = 0x0; } static int quark_default_data(struct plat_stmmacenet_data *plat, diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index 77b0468..f5c8b1b 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -190,6 +190,20 @@ static void stmmac_mtl_setup(struct platform_device *pdev, plat->rx_queues_cfg[queue].use_prio = true; } + /* RX queue specific packet type routing */ + if (of_property_read_bool(q_node, "snps,route-avcp")) + plat->rx_queues_cfg[queue].pkt_route = PACKET_AVCPQ; + else if (of_property_read_bool(q_node, "snps,route-ptp")) + plat->rx_queues_cfg[queue].pkt_route = PACKET_PTPQ; + else if (of_property_read_bool(q_node, "snps,route-dcbcp")) + plat->rx_queues_cfg[queue].pkt_route = PACKET_DCBCPQ; + else if (of_property_read_bool(q_node, "snps,route-up")) + plat->rx_queues_cfg[queue].pkt_route = PACKET_UPQ; + else if (of_property_read_bool(q_node, "snps,route-multi-broad")) + plat->rx_queues_cfg[queue].pkt_route = PACKET_MCBCQ; + else + plat->rx_queues_cfg[queue].pkt_route = 0x0; + queue++; } diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index b7d5e7a..cd98ee2 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -127,6 +127,7 @@ struct stmmac_axi { struct stmmac_rxq_cfg { u8 mode_to_use; u8 chan; + u8 pkt_route; bool use_prio; u32 prio; }; -- 2.9.3 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [PATCH v2 net-next 0/3] net: stmmac: adding multiple buffers and routing 2017-03-17 16:11 [PATCH v2 net-next 0/3] net: stmmac: adding multiple buffers and routing Joao Pinto ` (2 preceding siblings ...) 2017-03-17 16:11 ` [PATCH v2 net-next 3/3] net: stmmac: RX queue routing configuration Joao Pinto @ 2017-03-22 0:24 ` David Miller 3 siblings, 0 replies; 21+ messages in thread From: David Miller @ 2017-03-22 0:24 UTC (permalink / raw) To: Joao.Pinto; +Cc: peppe.cavallaro, alexandre.torgue, f.fainelli, netdev From: Joao Pinto <Joao.Pinto@synopsys.com> Date: Fri, 17 Mar 2017 16:11:04 +0000 > As agreed with David Miller, this patch-set is the third and last to enable > multiple queues in stmmac. > > This third one focuses on: > > a) Enable multiple buffering to the driver and queue independent data > b) Configuration of RX and TX queues' priority > c) Configuration of RX queues' routing Series applied, thanks. ^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2017-03-27 9:54 UTC | newest] Thread overview: 21+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-03-17 16:11 [PATCH v2 net-next 0/3] net: stmmac: adding multiple buffers and routing Joao Pinto 2017-03-17 16:11 ` [PATCH v2 net-next 1/3] net: stmmac: enable multiple buffers Joao Pinto 2017-03-23 17:17 ` [v2,net-next,1/3] " Thierry Reding 2017-03-23 17:27 ` Joao Pinto 2017-03-23 18:10 ` Thierry Reding 2017-03-24 14:09 ` Corentin Labbe 2017-03-24 14:59 ` Joao Pinto 2017-03-24 15:02 ` Fwd: " Joao Pinto 2017-03-24 17:17 ` David Miller 2017-03-24 17:19 ` Joao Pinto 2017-03-24 7:42 ` Andrew Lunn 2017-03-24 10:47 ` Joao Pinto 2017-03-24 11:17 ` Andrew Lunn 2017-03-24 11:21 ` Joao Pinto 2017-03-24 17:05 ` David Miller 2017-03-24 17:09 ` Joao Pinto 2017-03-27 9:28 ` Alexandre Torgue 2017-03-27 9:34 ` Joao Pinto 2017-03-17 16:11 ` [PATCH v2 net-next 2/3] net: stmmac: TX and RX queue priority configuration Joao Pinto 2017-03-17 16:11 ` [PATCH v2 net-next 3/3] net: stmmac: RX queue routing configuration Joao Pinto 2017-03-22 0:24 ` [PATCH v2 net-next 0/3] net: stmmac: adding multiple buffers and routing David Miller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).