--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -1299,7 +1299,8 @@ static int stmmac_phy_setup(struct stmma
+@@ -1300,7 +1300,8 @@ static int stmmac_phy_setup(struct stmma
return 0;
}
{
u32 rx_cnt = priv->plat->rx_queues_to_use;
unsigned int desc_size;
-@@ -1308,7 +1309,7 @@ static void stmmac_display_rx_rings(stru
+@@ -1309,7 +1310,7 @@ static void stmmac_display_rx_rings(stru
/* Display RX rings */
for (queue = 0; queue < rx_cnt; queue++) {
pr_info("\tRX Queue %u rings\n", queue);
-@@ -1321,12 +1322,13 @@ static void stmmac_display_rx_rings(stru
+@@ -1322,12 +1323,13 @@ static void stmmac_display_rx_rings(stru
}
/* Display RX ring */
{
u32 tx_cnt = priv->plat->tx_queues_to_use;
unsigned int desc_size;
-@@ -1335,7 +1337,7 @@ static void stmmac_display_tx_rings(stru
+@@ -1336,7 +1338,7 @@ static void stmmac_display_tx_rings(stru
/* Display TX rings */
for (queue = 0; queue < tx_cnt; queue++) {
pr_info("\tTX Queue %d rings\n", queue);
-@@ -1350,18 +1352,19 @@ static void stmmac_display_tx_rings(stru
+@@ -1351,18 +1353,19 @@ static void stmmac_display_tx_rings(stru
desc_size = sizeof(struct dma_desc);
}
}
static int stmmac_set_bfsize(int mtu, int bufsize)
-@@ -1385,44 +1388,50 @@ static int stmmac_set_bfsize(int mtu, in
+@@ -1386,44 +1389,50 @@ static int stmmac_set_bfsize(int mtu, in
/**
* stmmac_clear_rx_descriptors - clear RX descriptors
* @priv: driver private structure
struct dma_desc *p;
if (priv->extend_desc)
-@@ -1439,10 +1448,12 @@ static void stmmac_clear_tx_descriptors(
+@@ -1440,10 +1449,12 @@ static void stmmac_clear_tx_descriptors(
/**
* stmmac_clear_descriptors - clear descriptors
* @priv: driver private structure
{
u32 rx_queue_cnt = priv->plat->rx_queues_to_use;
u32 tx_queue_cnt = priv->plat->tx_queues_to_use;
-@@ -1450,16 +1461,17 @@ static void stmmac_clear_descriptors(str
+@@ -1451,16 +1462,17 @@ static void stmmac_clear_descriptors(str
/* Clear the RX descriptors */
for (queue = 0; queue < rx_queue_cnt; queue++)
* @p: descriptor pointer
* @i: descriptor index
* @flags: gfp flag
-@@ -1467,10 +1479,12 @@ static void stmmac_clear_descriptors(str
+@@ -1468,10 +1480,12 @@ static void stmmac_clear_descriptors(str
* Description: this function is called to allocate a receive buffer, perform
* the DMA mapping and init the descriptor.
*/
struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
if (!buf->page) {
-@@ -1495,7 +1509,7 @@ static int stmmac_init_rx_buffers(struct
+@@ -1496,7 +1510,7 @@ static int stmmac_init_rx_buffers(struct
buf->addr = page_pool_get_dma_addr(buf->page) + buf->page_offset;
stmmac_set_desc_addr(priv, p, buf->addr);
stmmac_init_desc3(priv, p);
return 0;
-@@ -1504,12 +1518,13 @@ static int stmmac_init_rx_buffers(struct
+@@ -1505,12 +1519,13 @@ static int stmmac_init_rx_buffers(struct
/**
* stmmac_free_rx_buffer - free RX dma buffers
* @priv: private structure
struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
if (buf->page)
-@@ -1524,12 +1539,15 @@ static void stmmac_free_rx_buffer(struct
+@@ -1525,12 +1540,15 @@ static void stmmac_free_rx_buffer(struct
/**
* stmmac_free_tx_buffer - free RX dma buffers
* @priv: private structure
if (tx_q->tx_skbuff_dma[i].buf &&
tx_q->tx_skbuff_dma[i].buf_type != STMMAC_TXBUF_T_XDP_TX) {
-@@ -1568,23 +1586,28 @@ static void stmmac_free_tx_buffer(struct
+@@ -1569,23 +1587,28 @@ static void stmmac_free_tx_buffer(struct
/**
* dma_free_rx_skbufs - free RX dma buffers
* @priv: private structure
struct dma_desc *p;
int ret;
-@@ -1593,7 +1616,7 @@ static int stmmac_alloc_rx_buffers(struc
+@@ -1594,7 +1617,7 @@ static int stmmac_alloc_rx_buffers(struc
else
p = rx_q->dma_rx + i;
queue);
if (ret)
return ret;
-@@ -1607,14 +1630,17 @@ static int stmmac_alloc_rx_buffers(struc
+@@ -1608,14 +1631,17 @@ static int stmmac_alloc_rx_buffers(struc
/**
* dma_free_rx_xskbufs - free RX dma buffers from XSK pool
* @priv: private structure
struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
if (!buf->xdp)
-@@ -1625,12 +1651,14 @@ static void dma_free_rx_xskbufs(struct s
+@@ -1626,12 +1652,14 @@ static void dma_free_rx_xskbufs(struct s
}
}
struct stmmac_rx_buffer *buf;
dma_addr_t dma_addr;
struct dma_desc *p;
-@@ -1665,22 +1693,25 @@ static struct xsk_buff_pool *stmmac_get_
+@@ -1666,22 +1694,25 @@ static struct xsk_buff_pool *stmmac_get_
/**
* __init_dma_rx_desc_rings - init the RX descriptor ring (per queue)
* @priv: driver private structure
xdp_rxq_info_unreg_mem_model(&rx_q->xdp_rxq);
-@@ -1707,9 +1738,9 @@ static int __init_dma_rx_desc_rings(stru
+@@ -1708,9 +1739,9 @@ static int __init_dma_rx_desc_rings(stru
/* RX XDP ZC buffer pool may not be populated, e.g.
* xdpsock TX-only.
*/
if (ret < 0)
return -ENOMEM;
}
-@@ -1719,17 +1750,19 @@ static int __init_dma_rx_desc_rings(stru
+@@ -1720,17 +1751,19 @@ static int __init_dma_rx_desc_rings(stru
if (priv->extend_desc)
stmmac_mode_init(priv, rx_q->dma_erx,
rx_q->dma_rx_phy,
{
struct stmmac_priv *priv = netdev_priv(dev);
u32 rx_count = priv->plat->rx_queues_to_use;
-@@ -1741,7 +1774,7 @@ static int init_dma_rx_desc_rings(struct
+@@ -1742,7 +1775,7 @@ static int init_dma_rx_desc_rings(struct
"SKB addresses:\nskb\t\tskb data\tdma data\n");
for (queue = 0; queue < rx_count; queue++) {
if (ret)
goto err_init_rx_buffers;
}
-@@ -1750,12 +1783,12 @@ static int init_dma_rx_desc_rings(struct
+@@ -1751,12 +1784,12 @@ static int init_dma_rx_desc_rings(struct
err_init_rx_buffers:
while (queue >= 0) {
rx_q->buf_alloc_num = 0;
rx_q->xsk_pool = NULL;
-@@ -1772,14 +1805,17 @@ err_init_rx_buffers:
+@@ -1773,14 +1806,17 @@ err_init_rx_buffers:
/**
* __init_dma_tx_desc_rings - init the TX descriptor ring (per queue)
* @priv: driver private structure
int i;
netif_dbg(priv, probe, priv->dev,
-@@ -1791,16 +1827,16 @@ static int __init_dma_tx_desc_rings(stru
+@@ -1792,16 +1828,16 @@ static int __init_dma_tx_desc_rings(stru
if (priv->extend_desc)
stmmac_mode_init(priv, tx_q->dma_etx,
tx_q->dma_tx_phy,
struct dma_desc *p;
if (priv->extend_desc)
-@@ -1822,7 +1858,8 @@ static int __init_dma_tx_desc_rings(stru
+@@ -1823,7 +1859,8 @@ static int __init_dma_tx_desc_rings(stru
return 0;
}
{
struct stmmac_priv *priv = netdev_priv(dev);
u32 tx_queue_cnt;
-@@ -1831,7 +1868,7 @@ static int init_dma_tx_desc_rings(struct
+@@ -1832,7 +1869,7 @@ static int init_dma_tx_desc_rings(struct
tx_queue_cnt = priv->plat->tx_queues_to_use;
for (queue = 0; queue < tx_queue_cnt; queue++)
return 0;
}
-@@ -1839,26 +1876,29 @@ static int init_dma_tx_desc_rings(struct
+@@ -1840,26 +1877,29 @@ static int init_dma_tx_desc_rings(struct
/**
* init_dma_desc_rings - init the RX/TX descriptor rings
* @dev: net device structure
return ret;
}
-@@ -1866,17 +1906,20 @@ static int init_dma_desc_rings(struct ne
+@@ -1867,17 +1907,20 @@ static int init_dma_desc_rings(struct ne
/**
* dma_free_tx_skbufs - free TX dma buffers
* @priv: private structure
if (tx_q->xsk_pool && tx_q->xsk_frames_done) {
xsk_tx_completed(tx_q->xsk_pool, tx_q->xsk_frames_done);
-@@ -1895,34 +1938,37 @@ static void stmmac_free_tx_skbufs(struct
+@@ -1896,34 +1939,37 @@ static void stmmac_free_tx_skbufs(struct
u32 queue;
for (queue = 0; queue < tx_queue_cnt; queue++)
sizeof(struct dma_extended_desc),
rx_q->dma_erx, rx_q->dma_rx_phy);
-@@ -1934,29 +1980,33 @@ static void __free_dma_rx_desc_resources
+@@ -1935,29 +1981,33 @@ static void __free_dma_rx_desc_resources
page_pool_destroy(rx_q->page_pool);
}
if (priv->extend_desc) {
size = sizeof(struct dma_extended_desc);
-@@ -1969,7 +2019,7 @@ static void __free_dma_tx_desc_resources
+@@ -1970,7 +2020,7 @@ static void __free_dma_tx_desc_resources
addr = tx_q->dma_tx;
}
dma_free_coherent(priv->device, size, addr, tx_q->dma_tx_phy);
-@@ -1977,28 +2027,32 @@ static void __free_dma_tx_desc_resources
+@@ -1978,28 +2028,32 @@ static void __free_dma_tx_desc_resources
kfree(tx_q->tx_skbuff);
}
struct stmmac_channel *ch = &priv->channel[queue];
bool xdp_prog = stmmac_xdp_is_enabled(priv);
struct page_pool_params pp_params = { 0 };
-@@ -2010,8 +2064,8 @@ static int __alloc_dma_rx_desc_resources
+@@ -2011,8 +2065,8 @@ static int __alloc_dma_rx_desc_resources
rx_q->priv_data = priv;
pp_params.flags = PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV;
pp_params.order = ilog2(num_pages);
pp_params.nid = dev_to_node(priv->device);
pp_params.dev = priv->device;
-@@ -2026,7 +2080,7 @@ static int __alloc_dma_rx_desc_resources
+@@ -2027,7 +2081,7 @@ static int __alloc_dma_rx_desc_resources
return ret;
}
sizeof(*rx_q->buf_pool),
GFP_KERNEL);
if (!rx_q->buf_pool)
-@@ -2034,7 +2088,7 @@ static int __alloc_dma_rx_desc_resources
+@@ -2035,7 +2089,7 @@ static int __alloc_dma_rx_desc_resources
if (priv->extend_desc) {
rx_q->dma_erx = dma_alloc_coherent(priv->device,
sizeof(struct dma_extended_desc),
&rx_q->dma_rx_phy,
GFP_KERNEL);
-@@ -2043,7 +2097,7 @@ static int __alloc_dma_rx_desc_resources
+@@ -2044,7 +2098,7 @@ static int __alloc_dma_rx_desc_resources
} else {
rx_q->dma_rx = dma_alloc_coherent(priv->device,
sizeof(struct dma_desc),
&rx_q->dma_rx_phy,
GFP_KERNEL);
-@@ -2068,7 +2122,8 @@ static int __alloc_dma_rx_desc_resources
+@@ -2069,7 +2123,8 @@ static int __alloc_dma_rx_desc_resources
return 0;
}
{
u32 rx_count = priv->plat->rx_queues_to_use;
u32 queue;
-@@ -2076,7 +2131,7 @@ static int alloc_dma_rx_desc_resources(s
+@@ -2077,7 +2132,7 @@ static int alloc_dma_rx_desc_resources(s
/* RX queues buffers and DMA */
for (queue = 0; queue < rx_count; queue++) {
if (ret)
goto err_dma;
}
-@@ -2084,7 +2139,7 @@ static int alloc_dma_rx_desc_resources(s
+@@ -2085,7 +2140,7 @@ static int alloc_dma_rx_desc_resources(s
return 0;
err_dma:
return ret;
}
-@@ -2092,28 +2147,31 @@ err_dma:
+@@ -2093,28 +2148,31 @@ err_dma:
/**
* __alloc_dma_tx_desc_resources - alloc TX resources (per queue).
* @priv: private structure
sizeof(struct sk_buff *),
GFP_KERNEL);
if (!tx_q->tx_skbuff)
-@@ -2126,7 +2184,7 @@ static int __alloc_dma_tx_desc_resources
+@@ -2127,7 +2185,7 @@ static int __alloc_dma_tx_desc_resources
else
size = sizeof(struct dma_desc);
addr = dma_alloc_coherent(priv->device, size,
&tx_q->dma_tx_phy, GFP_KERNEL);
-@@ -2143,7 +2201,8 @@ static int __alloc_dma_tx_desc_resources
+@@ -2144,7 +2202,8 @@ static int __alloc_dma_tx_desc_resources
return 0;
}
{
u32 tx_count = priv->plat->tx_queues_to_use;
u32 queue;
-@@ -2151,7 +2210,7 @@ static int alloc_dma_tx_desc_resources(s
+@@ -2152,7 +2211,7 @@ static int alloc_dma_tx_desc_resources(s
/* TX queues buffers and DMA */
for (queue = 0; queue < tx_count; queue++) {
if (ret)
goto err_dma;
}
-@@ -2159,27 +2218,29 @@ static int alloc_dma_tx_desc_resources(s
+@@ -2160,27 +2219,29 @@ static int alloc_dma_tx_desc_resources(s
return 0;
err_dma:
return ret;
}
-@@ -2187,16 +2248,18 @@ static int alloc_dma_desc_resources(stru
+@@ -2188,16 +2249,18 @@ static int alloc_dma_desc_resources(stru
/**
* free_dma_desc_resources - free dma desc resources
* @priv: private structure
}
/**
-@@ -2685,8 +2748,8 @@ static void stmmac_tx_err(struct stmmac_
+@@ -2686,8 +2749,8 @@ static void stmmac_tx_err(struct stmmac_
netif_tx_stop_queue(netdev_get_tx_queue(priv->dev, chan));
stmmac_stop_tx_dma(priv, chan);
stmmac_reset_tx_queue(priv, chan);
stmmac_init_tx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
tx_q->dma_tx_phy, chan);
-@@ -3683,19 +3746,93 @@ static int stmmac_request_irq(struct net
+@@ -3684,19 +3747,93 @@ static int stmmac_request_irq(struct net
}
/**
u32 chan;
int ret;
-@@ -3722,45 +3859,10 @@ static int stmmac_open(struct net_device
+@@ -3723,45 +3860,10 @@ static int stmmac_open(struct net_device
memset(&priv->xstats, 0, sizeof(struct stmmac_extra_stats));
priv->xstats.threshold = tc;
if (priv->plat->serdes_powerup) {
ret = priv->plat->serdes_powerup(dev, priv->plat->bsp_priv);
-@@ -3803,14 +3905,28 @@ irq_error:
+@@ -3804,14 +3906,28 @@ irq_error:
stmmac_hw_teardown(dev);
init_error:
static void stmmac_fpe_stop_wq(struct stmmac_priv *priv)
{
set_bit(__FPE_REMOVING, &priv->fpe_task_state);
-@@ -3857,7 +3973,7 @@ static int stmmac_release(struct net_dev
+@@ -3858,7 +3974,7 @@ static int stmmac_release(struct net_dev
stmmac_stop_all_dma(priv);
/* Release and free the Rx/Tx resources */
/* Disable the MAC Rx/Tx */
stmmac_mac_set(priv, priv->ioaddr, false);
-@@ -6396,7 +6512,7 @@ void stmmac_disable_rx_queue(struct stmm
+@@ -6397,7 +6513,7 @@ void stmmac_disable_rx_queue(struct stmm
spin_unlock_irqrestore(&ch->lock, flags);
stmmac_stop_rx_dma(priv, queue);
}
void stmmac_enable_rx_queue(struct stmmac_priv *priv, u32 queue)
-@@ -6407,21 +6523,21 @@ void stmmac_enable_rx_queue(struct stmma
+@@ -6408,21 +6524,21 @@ void stmmac_enable_rx_queue(struct stmma
u32 buf_size;
int ret;
stmmac_init_rx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
rx_q->dma_rx_phy, rx_q->queue_index);
-@@ -6459,7 +6575,7 @@ void stmmac_disable_tx_queue(struct stmm
+@@ -6460,7 +6576,7 @@ void stmmac_disable_tx_queue(struct stmm
spin_unlock_irqrestore(&ch->lock, flags);
stmmac_stop_tx_dma(priv, queue);
}
void stmmac_enable_tx_queue(struct stmmac_priv *priv, u32 queue)
-@@ -6469,21 +6585,21 @@ void stmmac_enable_tx_queue(struct stmma
+@@ -6470,21 +6586,21 @@ void stmmac_enable_tx_queue(struct stmma
unsigned long flags;
int ret;
stmmac_init_tx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
tx_q->dma_tx_phy, tx_q->queue_index);
-@@ -6523,7 +6639,7 @@ void stmmac_xdp_release(struct net_devic
+@@ -6524,7 +6640,7 @@ void stmmac_xdp_release(struct net_devic
stmmac_stop_all_dma(priv);
/* Release and free the Rx/Tx resources */
/* Disable the MAC Rx/Tx */
stmmac_mac_set(priv, priv->ioaddr, false);
-@@ -6548,14 +6664,14 @@ int stmmac_xdp_open(struct net_device *d
+@@ -6549,14 +6665,14 @@ int stmmac_xdp_open(struct net_device *d
u32 chan;
int ret;
if (ret < 0) {
netdev_err(dev, "%s: DMA descriptors initialization failed\n",
__func__);
-@@ -6637,7 +6753,7 @@ irq_error:
+@@ -6638,7 +6754,7 @@ irq_error:
stmmac_hw_teardown(dev);
init_error:
dma_desc_error:
return ret;
}
-@@ -7498,7 +7614,7 @@ int stmmac_resume(struct device *dev)
+@@ -7499,7 +7615,7 @@ int stmmac_resume(struct device *dev)
stmmac_reset_queues_param(priv);
stmmac_free_tx_skbufs(priv);
projects / openwrt / staging / nbd.git / blobdiff