aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/sunxi/patches-4.9/0050-stmmac-form-4-10.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/sunxi/patches-4.9/0050-stmmac-form-4-10.patch')
-rw-r--r--target/linux/sunxi/patches-4.9/0050-stmmac-form-4-10.patch150
1 files changed, 75 insertions, 75 deletions
diff --git a/target/linux/sunxi/patches-4.9/0050-stmmac-form-4-10.patch b/target/linux/sunxi/patches-4.9/0050-stmmac-form-4-10.patch
index ca2eb3ac8f..69bbb411d8 100644
--- a/target/linux/sunxi/patches-4.9/0050-stmmac-form-4-10.patch
+++ b/target/linux/sunxi/patches-4.9/0050-stmmac-form-4-10.patch
@@ -2131,9 +2131,9 @@
{
+ struct net_device *ndev = priv->dev;
unsigned long flags;
+ int interface = priv->plat->interface;
bool ret = false;
-
-@@ -295,7 +297,7 @@ bool stmmac_eee_init(struct stmmac_priv
+@@ -301,7 +303,7 @@ bool stmmac_eee_init(struct stmmac_priv
int tx_lpi_timer = priv->tx_lpi_timer;
/* Check if the PHY supports EEE */
@@ -2142,7 +2142,7 @@
/* To manage at run-time if the EEE cannot be supported
* anymore (for example because the lp caps have been
* changed).
-@@ -303,7 +305,7 @@ bool stmmac_eee_init(struct stmmac_priv
+@@ -309,7 +311,7 @@ bool stmmac_eee_init(struct stmmac_priv
*/
spin_lock_irqsave(&priv->lock, flags);
if (priv->eee_active) {
@@ -2151,7 +2151,7 @@
del_timer_sync(&priv->eee_ctrl_timer);
priv->hw->mac->set_eee_timer(priv->hw, 0,
tx_lpi_timer);
-@@ -327,12 +329,12 @@ bool stmmac_eee_init(struct stmmac_priv
+@@ -333,12 +335,12 @@ bool stmmac_eee_init(struct stmmac_priv
tx_lpi_timer);
}
/* Set HW EEE according to the speed */
@@ -2166,7 +2166,7 @@
}
out:
return ret;
-@@ -450,8 +452,8 @@ static int stmmac_hwtstamp_ioctl(struct
+@@ -456,8 +458,8 @@ static int stmmac_hwtstamp_ioctl(struct
sizeof(struct hwtstamp_config)))
return -EFAULT;
@@ -2177,7 +2177,7 @@
/* reserved for future extensions */
if (config.flags)
-@@ -697,7 +699,7 @@ static void stmmac_release_ptp(struct st
+@@ -703,7 +705,7 @@ static void stmmac_release_ptp(struct st
static void stmmac_adjust_link(struct net_device *dev)
{
struct stmmac_priv *priv = netdev_priv(dev);
@@ -2186,7 +2186,7 @@
unsigned long flags;
int new_state = 0;
unsigned int fc = priv->flow_ctrl, pause_time = priv->pause;
-@@ -750,9 +752,9 @@ static void stmmac_adjust_link(struct ne
+@@ -756,9 +758,9 @@ static void stmmac_adjust_link(struct ne
stmmac_hw_fix_mac_speed(priv);
break;
default:
@@ -2199,7 +2199,7 @@
break;
}
-@@ -805,10 +807,10 @@ static void stmmac_check_pcs_mode(struct
+@@ -811,10 +813,10 @@ static void stmmac_check_pcs_mode(struct
(interface == PHY_INTERFACE_MODE_RGMII_ID) ||
(interface == PHY_INTERFACE_MODE_RGMII_RXID) ||
(interface == PHY_INTERFACE_MODE_RGMII_TXID)) {
@@ -2212,7 +2212,7 @@
priv->hw->pcs = STMMAC_PCS_SGMII;
}
}
-@@ -843,15 +845,15 @@ static int stmmac_init_phy(struct net_de
+@@ -849,15 +851,15 @@ static int stmmac_init_phy(struct net_de
snprintf(phy_id_fmt, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, bus_id,
priv->plat->phy_addr);
@@ -2231,7 +2231,7 @@
if (!phydev)
return -ENODEV;
-@@ -884,10 +886,8 @@ static int stmmac_init_phy(struct net_de
+@@ -890,10 +892,8 @@ static int stmmac_init_phy(struct net_de
if (phydev->is_pseudo_fixed_link)
phydev->irq = PHY_POLL;
@@ -2244,7 +2244,7 @@
return 0;
}
-@@ -973,7 +973,8 @@ static int stmmac_init_rx_buffers(struct
+@@ -979,7 +979,8 @@ static int stmmac_init_rx_buffers(struct
skb = __netdev_alloc_skb_ip_align(priv->dev, priv->dma_buf_sz, flags);
if (!skb) {
@@ -2254,7 +2254,7 @@
return -ENOMEM;
}
priv->rx_skbuff[i] = skb;
-@@ -981,15 +982,15 @@ static int stmmac_init_rx_buffers(struct
+@@ -987,15 +988,15 @@ static int stmmac_init_rx_buffers(struct
priv->dma_buf_sz,
DMA_FROM_DEVICE);
if (dma_mapping_error(priv->device, priv->rx_skbuff_dma[i])) {
@@ -2273,7 +2273,7 @@
if ((priv->hw->mode->init_desc3) &&
(priv->dma_buf_sz == BUF_SIZE_16KiB))
-@@ -1031,13 +1032,14 @@ static int init_dma_desc_rings(struct ne
+@@ -1037,13 +1038,14 @@ static int init_dma_desc_rings(struct ne
priv->dma_buf_sz = bfsize;
@@ -2294,7 +2294,7 @@
for (i = 0; i < DMA_RX_SIZE; i++) {
struct dma_desc *p;
if (priv->extend_desc)
-@@ -1049,10 +1051,9 @@ static int init_dma_desc_rings(struct ne
+@@ -1055,10 +1057,9 @@ static int init_dma_desc_rings(struct ne
if (ret)
goto err_init_rx_buffers;
@@ -2308,7 +2308,7 @@
}
priv->cur_rx = 0;
priv->dirty_rx = (unsigned int)(i - DMA_RX_SIZE);
-@@ -1307,7 +1308,7 @@ static void stmmac_tx_clean(struct stmma
+@@ -1313,7 +1314,7 @@ static void stmmac_tx_clean(struct stmma
unsigned int bytes_compl = 0, pkts_compl = 0;
unsigned int entry = priv->dirty_tx;
@@ -2317,7 +2317,7 @@
priv->xstats.tx_clean++;
-@@ -1378,22 +1379,17 @@ static void stmmac_tx_clean(struct stmma
+@@ -1384,22 +1385,17 @@ static void stmmac_tx_clean(struct stmma
netdev_completed_queue(priv->dev, pkts_compl, bytes_compl);
if (unlikely(netif_queue_stopped(priv->dev) &&
@@ -2345,7 +2345,7 @@
}
static inline void stmmac_enable_dma_irq(struct stmmac_priv *priv)
-@@ -1497,7 +1493,7 @@ static void stmmac_mmc_setup(struct stmm
+@@ -1503,7 +1499,7 @@ static void stmmac_mmc_setup(struct stmm
dwmac_mmc_ctrl(priv->mmcaddr, mode);
memset(&priv->mmc, 0, sizeof(struct stmmac_counters));
} else
@@ -2354,7 +2354,7 @@
}
/**
-@@ -1510,18 +1506,18 @@ static void stmmac_mmc_setup(struct stmm
+@@ -1516,18 +1512,18 @@ static void stmmac_mmc_setup(struct stmm
static void stmmac_selec_desc_mode(struct stmmac_priv *priv)
{
if (priv->plat->enh_desc) {
@@ -2377,7 +2377,7 @@
priv->hw->desc = &ndesc_ops;
}
}
-@@ -1562,8 +1558,8 @@ static void stmmac_check_ether_addr(stru
+@@ -1568,8 +1564,8 @@ static void stmmac_check_ether_addr(stru
priv->dev->dev_addr, 0);
if (!is_valid_ether_addr(priv->dev->dev_addr))
eth_hw_addr_random(priv->dev);
@@ -2388,7 +2388,7 @@
}
}
-@@ -1577,16 +1573,12 @@ static void stmmac_check_ether_addr(stru
+@@ -1583,16 +1579,12 @@ static void stmmac_check_ether_addr(stru
*/
static int stmmac_init_dma_engine(struct stmmac_priv *priv)
{
@@ -2408,7 +2408,7 @@
}
if (priv->extend_desc && (priv->mode == STMMAC_RING_MODE))
-@@ -1598,8 +1590,8 @@ static int stmmac_init_dma_engine(struct
+@@ -1604,8 +1596,8 @@ static int stmmac_init_dma_engine(struct
return ret;
}
@@ -2419,7 +2419,7 @@
if (priv->synopsys_id >= DWMAC_CORE_4_00) {
priv->rx_tail_addr = priv->dma_rx_phy +
-@@ -1671,7 +1663,8 @@ static int stmmac_hw_setup(struct net_de
+@@ -1677,7 +1669,8 @@ static int stmmac_hw_setup(struct net_de
/* DMA initialization and SW reset */
ret = stmmac_init_dma_engine(priv);
if (ret < 0) {
@@ -2429,7 +2429,7 @@
return ret;
}
-@@ -1700,7 +1693,7 @@ static int stmmac_hw_setup(struct net_de
+@@ -1706,7 +1699,7 @@ static int stmmac_hw_setup(struct net_de
ret = priv->hw->mac->rx_ipc(priv->hw);
if (!ret) {
@@ -2438,7 +2438,7 @@
priv->plat->rx_coe = STMMAC_RX_COE_NONE;
priv->hw->rx_csum = 0;
}
-@@ -1725,10 +1718,11 @@ static int stmmac_hw_setup(struct net_de
+@@ -1731,10 +1724,11 @@ static int stmmac_hw_setup(struct net_de
#ifdef CONFIG_DEBUG_FS
ret = stmmac_init_fs(dev);
if (ret < 0)
@@ -2452,7 +2452,7 @@
priv->hw->dma->start_tx(priv->ioaddr);
priv->hw->dma->start_rx(priv->ioaddr);
-@@ -1783,8 +1777,9 @@ static int stmmac_open(struct net_device
+@@ -1789,8 +1783,9 @@ static int stmmac_open(struct net_device
priv->hw->pcs != STMMAC_PCS_RTBI) {
ret = stmmac_init_phy(dev);
if (ret) {
@@ -2464,7 +2464,7 @@
return ret;
}
}
-@@ -1799,33 +1794,36 @@ static int stmmac_open(struct net_device
+@@ -1805,33 +1800,36 @@ static int stmmac_open(struct net_device
ret = alloc_dma_desc_resources(priv);
if (ret < 0) {
@@ -2508,7 +2508,7 @@
goto init_error;
}
-@@ -1834,8 +1832,9 @@ static int stmmac_open(struct net_device
+@@ -1840,8 +1838,9 @@ static int stmmac_open(struct net_device
ret = request_irq(priv->wol_irq, stmmac_interrupt,
IRQF_SHARED, dev->name, dev);
if (unlikely(ret < 0)) {
@@ -2520,7 +2520,7 @@
goto wolirq_error;
}
}
-@@ -1845,8 +1844,9 @@ static int stmmac_open(struct net_device
+@@ -1851,8 +1850,9 @@ static int stmmac_open(struct net_device
ret = request_irq(priv->lpi_irq, stmmac_interrupt, IRQF_SHARED,
dev->name, dev);
if (unlikely(ret < 0)) {
@@ -2532,7 +2532,7 @@
goto lpiirq_error;
}
}
-@@ -1865,8 +1865,8 @@ wolirq_error:
+@@ -1871,8 +1871,8 @@ wolirq_error:
init_error:
free_dma_desc_resources(priv);
dma_desc_error:
@@ -2543,7 +2543,7 @@
return ret;
}
-@@ -1885,10 +1885,9 @@ static int stmmac_release(struct net_dev
+@@ -1891,10 +1891,9 @@ static int stmmac_release(struct net_dev
del_timer_sync(&priv->eee_ctrl_timer);
/* Stop and disconnect the PHY */
@@ -2557,7 +2557,7 @@
}
netif_stop_queue(dev);
-@@ -1948,13 +1947,13 @@ static void stmmac_tso_allocator(struct
+@@ -1954,13 +1953,13 @@ static void stmmac_tso_allocator(struct
priv->cur_tx = STMMAC_GET_ENTRY(priv->cur_tx, DMA_TX_SIZE);
desc = priv->dma_tx + priv->cur_tx;
@@ -2573,7 +2573,7 @@
0, 0);
tmp_len -= TSO_MAX_BUFF_SIZE;
-@@ -1999,8 +1998,6 @@ static netdev_tx_t stmmac_tso_xmit(struc
+@@ -2005,8 +2004,6 @@ static netdev_tx_t stmmac_tso_xmit(struc
u8 proto_hdr_len;
int i;
@@ -2582,7 +2582,7 @@
/* Compute header lengths */
proto_hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
-@@ -2010,9 +2007,10 @@ static netdev_tx_t stmmac_tso_xmit(struc
+@@ -2016,9 +2013,10 @@ static netdev_tx_t stmmac_tso_xmit(struc
if (!netif_queue_stopped(dev)) {
netif_stop_queue(dev);
/* This is a hard error, log it. */
@@ -2595,7 +2595,7 @@
return NETDEV_TX_BUSY;
}
-@@ -2050,11 +2048,11 @@ static netdev_tx_t stmmac_tso_xmit(struc
+@@ -2056,11 +2054,11 @@ static netdev_tx_t stmmac_tso_xmit(struc
priv->tx_skbuff_dma[first_entry].len = skb_headlen(skb);
priv->tx_skbuff[first_entry] = skb;
@@ -2609,7 +2609,7 @@
/* If needed take extra descriptors to fill the remaining payload */
tmp_pay_len = pay_len - TSO_MAX_BUFF_SIZE;
-@@ -2083,8 +2081,8 @@ static netdev_tx_t stmmac_tso_xmit(struc
+@@ -2089,8 +2087,8 @@ static netdev_tx_t stmmac_tso_xmit(struc
priv->cur_tx = STMMAC_GET_ENTRY(priv->cur_tx, DMA_TX_SIZE);
if (unlikely(stmmac_tx_avail(priv) <= (MAX_SKB_FRAGS + 1))) {
@@ -2620,7 +2620,7 @@
netif_stop_queue(dev);
}
-@@ -2128,7 +2126,7 @@ static netdev_tx_t stmmac_tso_xmit(struc
+@@ -2134,7 +2132,7 @@ static netdev_tx_t stmmac_tso_xmit(struc
* descriptor and then barrier is needed to make sure that
* all is coherent before granting the DMA engine.
*/
@@ -2629,7 +2629,7 @@
if (netif_msg_pktdata(priv)) {
pr_info("%s: curr=%d dirty=%d f=%d, e=%d, f_p=%p, nfrags %d\n",
-@@ -2147,11 +2145,9 @@ static netdev_tx_t stmmac_tso_xmit(struc
+@@ -2153,11 +2151,9 @@ static netdev_tx_t stmmac_tso_xmit(struc
priv->hw->dma->set_tx_tail_ptr(priv->ioaddr, priv->tx_tail_addr,
STMMAC_CHAN0);
@@ -2641,7 +2641,7 @@
dev_err(priv->device, "Tx dma map failed\n");
dev_kfree_skb(skb);
priv->dev->stats.tx_dropped++;
-@@ -2183,14 +2179,13 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -2189,14 +2185,13 @@ static netdev_tx_t stmmac_xmit(struct sk
return stmmac_tso_xmit(skb, dev);
}
@@ -2659,7 +2659,7 @@
}
return NETDEV_TX_BUSY;
}
-@@ -2243,13 +2238,11 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -2249,13 +2244,11 @@ static netdev_tx_t stmmac_xmit(struct sk
priv->tx_skbuff[entry] = NULL;
@@ -2678,7 +2678,7 @@
priv->tx_skbuff_dma[entry].map_as_page = true;
priv->tx_skbuff_dma[entry].len = len;
-@@ -2267,9 +2260,10 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -2273,9 +2266,10 @@ static netdev_tx_t stmmac_xmit(struct sk
if (netif_msg_pktdata(priv)) {
void *tx_head;
@@ -2692,7 +2692,7 @@
if (priv->extend_desc)
tx_head = (void *)priv->dma_etx;
-@@ -2278,13 +2272,13 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -2284,13 +2278,13 @@ static netdev_tx_t stmmac_xmit(struct sk
priv->hw->desc->display_ring(tx_head, DMA_TX_SIZE, false);
@@ -2709,7 +2709,7 @@
netif_stop_queue(dev);
}
-@@ -2320,13 +2314,11 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -2326,13 +2320,11 @@ static netdev_tx_t stmmac_xmit(struct sk
if (dma_mapping_error(priv->device, des))
goto dma_map_err;
@@ -2728,7 +2728,7 @@
priv->tx_skbuff_dma[first_entry].len = nopaged_len;
priv->tx_skbuff_dma[first_entry].last_segment = last_segment;
-@@ -2347,7 +2339,7 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -2353,7 +2345,7 @@ static netdev_tx_t stmmac_xmit(struct sk
* descriptor and then barrier is needed to make sure that
* all is coherent before granting the DMA engine.
*/
@@ -2737,7 +2737,7 @@
}
netdev_sent_queue(dev, skb->len);
-@@ -2358,12 +2350,10 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -2364,12 +2356,10 @@ static netdev_tx_t stmmac_xmit(struct sk
priv->hw->dma->set_tx_tail_ptr(priv->ioaddr, priv->tx_tail_addr,
STMMAC_CHAN0);
@@ -2751,7 +2751,7 @@
dev_kfree_skb(skb);
priv->dev->stats.tx_dropped++;
return NETDEV_TX_OK;
-@@ -2434,16 +2424,16 @@ static inline void stmmac_rx_refill(stru
+@@ -2440,16 +2430,16 @@ static inline void stmmac_rx_refill(stru
DMA_FROM_DEVICE);
if (dma_mapping_error(priv->device,
priv->rx_skbuff_dma[entry])) {
@@ -2771,7 +2771,7 @@
}
if (priv->hw->mode->refill_desc3)
priv->hw->mode->refill_desc3(priv, p);
-@@ -2451,17 +2441,17 @@ static inline void stmmac_rx_refill(stru
+@@ -2457,17 +2447,17 @@ static inline void stmmac_rx_refill(stru
if (priv->rx_zeroc_thresh > 0)
priv->rx_zeroc_thresh--;
@@ -2793,7 +2793,7 @@
entry = STMMAC_GET_ENTRY(entry, DMA_RX_SIZE);
}
-@@ -2485,7 +2475,7 @@ static int stmmac_rx(struct stmmac_priv
+@@ -2491,7 +2481,7 @@ static int stmmac_rx(struct stmmac_priv
if (netif_msg_rx_status(priv)) {
void *rx_head;
@@ -2802,7 +2802,7 @@
if (priv->extend_desc)
rx_head = (void *)priv->dma_erx;
else
-@@ -2547,9 +2537,9 @@ static int stmmac_rx(struct stmmac_priv
+@@ -2553,9 +2543,9 @@ static int stmmac_rx(struct stmmac_priv
unsigned int des;
if (unlikely(priv->synopsys_id >= DWMAC_CORE_4_00))
@@ -2814,7 +2814,7 @@
frame_len = priv->hw->desc->get_rx_frame_len(p, coe);
-@@ -2558,9 +2548,9 @@ static int stmmac_rx(struct stmmac_priv
+@@ -2564,9 +2554,9 @@ static int stmmac_rx(struct stmmac_priv
* ignored
*/
if (frame_len > priv->dma_buf_sz) {
@@ -2827,7 +2827,7 @@
priv->dev->stats.rx_length_errors++;
break;
}
-@@ -2572,11 +2562,11 @@ static int stmmac_rx(struct stmmac_priv
+@@ -2578,11 +2568,11 @@ static int stmmac_rx(struct stmmac_priv
frame_len -= ETH_FCS_LEN;
if (netif_msg_rx_status(priv)) {
@@ -2843,7 +2843,7 @@
}
/* The zero-copy is always used for all the sizes
-@@ -2613,8 +2603,9 @@ static int stmmac_rx(struct stmmac_priv
+@@ -2619,8 +2609,9 @@ static int stmmac_rx(struct stmmac_priv
} else {
skb = priv->rx_skbuff[entry];
if (unlikely(!skb)) {
@@ -2855,7 +2855,7 @@
priv->dev->stats.rx_dropped++;
break;
}
-@@ -2630,7 +2621,8 @@ static int stmmac_rx(struct stmmac_priv
+@@ -2636,7 +2627,8 @@ static int stmmac_rx(struct stmmac_priv
}
if (netif_msg_pktdata(priv)) {
@@ -2865,7 +2865,7 @@
print_pkt(skb->data, frame_len);
}
-@@ -2733,7 +2725,7 @@ static int stmmac_change_mtu(struct net_
+@@ -2739,7 +2731,7 @@ static int stmmac_change_mtu(struct net_
int max_mtu;
if (netif_running(dev)) {
@@ -2874,7 +2874,7 @@
return -EBUSY;
}
-@@ -2825,7 +2817,7 @@ static irqreturn_t stmmac_interrupt(int
+@@ -2831,7 +2823,7 @@ static irqreturn_t stmmac_interrupt(int
pm_wakeup_event(priv->device, 0);
if (unlikely(!dev)) {
@@ -2883,7 +2883,7 @@
return IRQ_NONE;
}
-@@ -2883,7 +2875,6 @@ static void stmmac_poll_controller(struc
+@@ -2889,7 +2881,6 @@ static void stmmac_poll_controller(struc
*/
static int stmmac_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{
@@ -2891,7 +2891,7 @@
int ret = -EOPNOTSUPP;
if (!netif_running(dev))
-@@ -2893,9 +2884,9 @@ static int stmmac_ioctl(struct net_devic
+@@ -2899,9 +2890,9 @@ static int stmmac_ioctl(struct net_devic
case SIOCGMIIPHY:
case SIOCGMIIREG:
case SIOCSMIIREG:
@@ -2903,7 +2903,7 @@
break;
case SIOCSHWTSTAMP:
ret = stmmac_hwtstamp_ioctl(dev, rq);
-@@ -2923,14 +2914,17 @@ static void sysfs_display_ring(void *hea
+@@ -2929,14 +2920,17 @@ static void sysfs_display_ring(void *hea
x = *(u64 *) ep;
seq_printf(seq, "%d [0x%x]: 0x%x 0x%x 0x%x 0x%x\n",
i, (unsigned int)virt_to_phys(ep),
@@ -2924,7 +2924,7 @@
p++;
}
seq_printf(seq, "\n");
-@@ -2962,6 +2956,8 @@ static int stmmac_sysfs_ring_open(struct
+@@ -2968,6 +2962,8 @@ static int stmmac_sysfs_ring_open(struct
return single_open(file, stmmac_sysfs_ring_read, inode->i_private);
}
@@ -2933,7 +2933,7 @@
static const struct file_operations stmmac_rings_status_fops = {
.owner = THIS_MODULE,
.open = stmmac_sysfs_ring_open,
-@@ -2984,11 +2980,11 @@ static int stmmac_sysfs_dma_cap_read(str
+@@ -2990,11 +2986,11 @@ static int stmmac_sysfs_dma_cap_read(str
seq_printf(seq, "\tDMA HW features\n");
seq_printf(seq, "==============================\n");
@@ -2948,7 +2948,7 @@
(priv->dma_cap.half_duplex) ? "Y" : "N");
seq_printf(seq, "\tHash Filter: %s\n",
(priv->dma_cap.hash_filter) ? "Y" : "N");
-@@ -3006,9 +3002,9 @@ static int stmmac_sysfs_dma_cap_read(str
+@@ -3012,9 +3008,9 @@ static int stmmac_sysfs_dma_cap_read(str
(priv->dma_cap.rmon) ? "Y" : "N");
seq_printf(seq, "\tIEEE 1588-2002 Time Stamp: %s\n",
(priv->dma_cap.time_stamp) ? "Y" : "N");
@@ -2960,7 +2960,7 @@
(priv->dma_cap.eee) ? "Y" : "N");
seq_printf(seq, "\tAV features: %s\n", (priv->dma_cap.av) ? "Y" : "N");
seq_printf(seq, "\tChecksum Offload in TX: %s\n",
-@@ -3055,8 +3051,7 @@ static int stmmac_init_fs(struct net_dev
+@@ -3061,8 +3057,7 @@ static int stmmac_init_fs(struct net_dev
priv->dbgfs_dir = debugfs_create_dir(dev->name, stmmac_fs_dir);
if (!priv->dbgfs_dir || IS_ERR(priv->dbgfs_dir)) {
@@ -2970,7 +2970,7 @@
return -ENOMEM;
}
-@@ -3068,7 +3063,7 @@ static int stmmac_init_fs(struct net_dev
+@@ -3074,7 +3069,7 @@ static int stmmac_init_fs(struct net_dev
&stmmac_rings_status_fops);
if (!priv->dbgfs_rings_status || IS_ERR(priv->dbgfs_rings_status)) {
@@ -2979,7 +2979,7 @@
debugfs_remove_recursive(priv->dbgfs_dir);
return -ENOMEM;
-@@ -3080,7 +3075,7 @@ static int stmmac_init_fs(struct net_dev
+@@ -3086,7 +3081,7 @@ static int stmmac_init_fs(struct net_dev
dev, &stmmac_dma_cap_fops);
if (!priv->dbgfs_dma_cap || IS_ERR(priv->dbgfs_dma_cap)) {
@@ -2988,7 +2988,7 @@
debugfs_remove_recursive(priv->dbgfs_dir);
return -ENOMEM;
-@@ -3152,11 +3147,11 @@ static int stmmac_hw_init(struct stmmac_
+@@ -3158,11 +3153,11 @@ static int stmmac_hw_init(struct stmmac_
} else {
if (chain_mode) {
priv->hw->mode = &chain_mode_ops;
@@ -3002,7 +3002,7 @@
priv->mode = STMMAC_RING_MODE;
}
}
-@@ -3164,7 +3159,7 @@ static int stmmac_hw_init(struct stmmac_
+@@ -3170,7 +3165,7 @@ static int stmmac_hw_init(struct stmmac_
/* Get the HW capability (new GMAC newer than 3.50a) */
priv->hw_cap_support = stmmac_get_hw_features(priv);
if (priv->hw_cap_support) {
@@ -3011,7 +3011,7 @@
/* We can override some gmac/dma configuration fields: e.g.
* enh_desc, tx_coe (e.g. that are passed through the
-@@ -3189,8 +3184,9 @@ static int stmmac_hw_init(struct stmmac_
+@@ -3195,8 +3190,9 @@ static int stmmac_hw_init(struct stmmac_
else if (priv->dma_cap.rx_coe_type1)
priv->plat->rx_coe = STMMAC_RX_COE_TYPE1;
@@ -3023,7 +3023,7 @@
/* To use alternate (extended), normal or GMAC4 descriptor structures */
if (priv->synopsys_id >= DWMAC_CORE_4_00)
-@@ -3200,20 +3196,20 @@ static int stmmac_hw_init(struct stmmac_
+@@ -3206,20 +3202,20 @@ static int stmmac_hw_init(struct stmmac_
if (priv->plat->rx_coe) {
priv->hw->rx_csum = priv->plat->rx_coe;
@@ -3049,7 +3049,7 @@
return 0;
}
-@@ -3272,8 +3268,8 @@ int stmmac_dvr_probe(struct device *devi
+@@ -3278,8 +3274,8 @@ int stmmac_dvr_probe(struct device *devi
priv->stmmac_clk = devm_clk_get(priv->device, STMMAC_RESOURCE_NAME);
if (IS_ERR(priv->stmmac_clk)) {
@@ -3060,7 +3060,7 @@
/* If failed to obtain stmmac_clk and specific clk_csr value
* is NOT passed from the platform, probe fail.
*/
-@@ -3322,7 +3318,7 @@ int stmmac_dvr_probe(struct device *devi
+@@ -3328,7 +3324,7 @@ int stmmac_dvr_probe(struct device *devi
if ((priv->plat->tso_en) && (priv->dma_cap.tsoen)) {
ndev->hw_features |= NETIF_F_TSO;
priv->tso = true;
@@ -3069,7 +3069,7 @@
}
ndev->features |= ndev->hw_features | NETIF_F_HIGHDMA;
ndev->watchdog_timeo = msecs_to_jiffies(watchdog);
-@@ -3342,13 +3338,13 @@ int stmmac_dvr_probe(struct device *devi
+@@ -3348,13 +3344,13 @@ int stmmac_dvr_probe(struct device *devi
*/
if ((priv->synopsys_id >= DWMAC_CORE_3_50) && (!priv->plat->riwt_off)) {
priv->use_riwt = 1;
@@ -3085,7 +3085,7 @@
/* If a specific clk_csr value is passed from the platform
* this means that the CSR Clock Range selection cannot be
-@@ -3369,15 +3365,17 @@ int stmmac_dvr_probe(struct device *devi
+@@ -3375,15 +3371,17 @@ int stmmac_dvr_probe(struct device *devi
/* MDIO bus Registration */
ret = stmmac_mdio_register(ndev);
if (ret < 0) {
@@ -3107,7 +3107,7 @@
goto error_netdev_register;
}
-@@ -3388,7 +3386,7 @@ error_netdev_register:
+@@ -3394,7 +3392,7 @@ error_netdev_register:
priv->hw->pcs != STMMAC_PCS_TBI &&
priv->hw->pcs != STMMAC_PCS_RTBI)
stmmac_mdio_unregister(ndev);
@@ -3116,7 +3116,7 @@
netif_napi_del(&priv->napi);
error_hw_init:
clk_disable_unprepare(priv->pclk);
-@@ -3412,7 +3410,7 @@ int stmmac_dvr_remove(struct device *dev
+@@ -3418,7 +3416,7 @@ int stmmac_dvr_remove(struct device *dev
struct net_device *ndev = dev_get_drvdata(dev);
struct stmmac_priv *priv = netdev_priv(ndev);
@@ -3125,7 +3125,7 @@
priv->hw->dma->stop_rx(priv->ioaddr);
priv->hw->dma->stop_tx(priv->ioaddr);
-@@ -3450,8 +3448,8 @@ int stmmac_suspend(struct device *dev)
+@@ -3456,8 +3454,8 @@ int stmmac_suspend(struct device *dev)
if (!ndev || !netif_running(ndev))
return 0;
@@ -3136,7 +3136,7 @@
spin_lock_irqsave(&priv->lock, flags);
-@@ -3545,8 +3543,8 @@ int stmmac_resume(struct device *dev)
+@@ -3551,8 +3549,8 @@ int stmmac_resume(struct device *dev)
spin_unlock_irqrestore(&priv->lock, flags);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 14:21:50 +0000