Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3bb946c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'TI-Ethernet-driver-warnings-fixes' 



Florian Fainelli says:

====================
TI Ethernet driver warnings fixes

This patch series attempts to fix properly the warnings observed with turning
on COMPILE_TEST and TI Ethernet drivers on 64-bit hosts.

Since I don't have any of this hardware, please review carefully for possible
breakage!
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6f6e434a c79c3850

drivers/net/ethernet/ti/cpsw.c

+2 −2
Original line number Diff line number Diff line
@@ -1281,8 +1281,8 @@ static void cpsw_add_ch_strings(u8 **p, int ch_num, int rx_dir) 
	for (i = 0; i < ch_stats_len; i++) {

		line = i % CPSW_STATS_CH_LEN;

		snprintf(*p, ETH_GSTRING_LEN,

			 "%s DMA chan %d: %s", rx_dir ? "Rx" : "Tx",

			 i / CPSW_STATS_CH_LEN,

			 "%s DMA chan %ld: %s", rx_dir ? "Rx" : "Tx",

			 (long)(i / CPSW_STATS_CH_LEN),

			 cpsw_gstrings_ch_stats[line].stat_string);

		*p += ETH_GSTRING_LEN;

	}

drivers/net/ethernet/ti/cpts.c

+2 −1
Original line number Diff line number Diff line
@@ -294,7 +294,8 @@ static long cpts_overflow_check(struct ptp_clock_info *ptp) 
		delay = CPTS_SKB_TX_WORK_TIMEOUT;

	spin_unlock_irqrestore(&cpts->lock, flags);



	pr_debug("cpts overflow check at %lld.%09lu\n", ts.tv_sec, ts.tv_nsec);

	pr_debug("cpts overflow check at %lld.%09ld\n",

		 (long long)ts.tv_sec, ts.tv_nsec);

	return (long)delay;

}

drivers/net/ethernet/ti/davinci_cpdma.c

+5 −5
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static void cpdma_desc_pool_destroy(struct cpdma_ctlr *ctlr) 
		return;



	WARN(gen_pool_size(pool->gen_pool) != gen_pool_avail(pool->gen_pool),

	     "cpdma_desc_pool size %d != avail %d",

	     "cpdma_desc_pool size %zd != avail %zd",

	     gen_pool_size(pool->gen_pool),

	     gen_pool_avail(pool->gen_pool));

	if (pool->cpumap)
@@ -1080,7 +1080,7 @@ int cpdma_chan_submit(struct cpdma_chan *chan, void *token, void *data, 
	writel_relaxed(buffer, &desc->hw_buffer);

	writel_relaxed(len, &desc->hw_len);

	writel_relaxed(mode | len, &desc->hw_mode);

	writel_relaxed(token, &desc->sw_token);

	writel_relaxed((uintptr_t)token, &desc->sw_token);

	writel_relaxed(buffer, &desc->sw_buffer);

	writel_relaxed(len, &desc->sw_len);

	desc_read(desc, sw_len);
@@ -1121,15 +1121,15 @@ static void __cpdma_chan_free(struct cpdma_chan *chan, 
	struct cpdma_desc_pool		*pool = ctlr->pool;

	dma_addr_t			buff_dma;

	int				origlen;

	void				*token;

	uintptr_t			token;



	token      = (void *)desc_read(desc, sw_token);

	token      = desc_read(desc, sw_token);

	buff_dma   = desc_read(desc, sw_buffer);

	origlen    = desc_read(desc, sw_len);



	dma_unmap_single(ctlr->dev, buff_dma, origlen, chan->dir);

	cpdma_desc_free(pool, desc, 1);

	(*chan->handler)(token, outlen, status);

	(*chan->handler)((void *)token, outlen, status);

}



static int __cpdma_chan_process(struct cpdma_chan *chan)

drivers/net/ethernet/ti/davinci_emac.c

+2 −2
Original line number Diff line number Diff line
@@ -1930,8 +1930,8 @@ static int davinci_emac_probe(struct platform_device *pdev) 


	if (netif_msg_probe(priv)) {

		dev_notice(&pdev->dev, "DaVinci EMAC Probe found device "

			   "(regs: %p, irq: %d)\n",

			   (void *)priv->emac_base_phys, ndev->irq);

			   "(regs: %pa, irq: %d)\n",

			   &priv->emac_base_phys, ndev->irq);

	}

	pm_runtime_put(&pdev->dev);