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

Commit a55667e6 authored by Prasad Kanneganti's avatar Prasad Kanneganti Committed by David S. Miller
Browse files

liquidio: fix inaccurate count of napi-processed rx packets reported to Octeon 



lio_enable_irq (called by napi poll) is reporting to Octeon an inaccurate
count of processed rx packets causing Octeon to eventually stop forwarding
packets to the host.  Fix it by using this formula for an accurate count:

    processed rx packets = droq->pkt_count - droq->pkts_pending

Also increase SOFT_COMMAND_BUFFER_SIZE to match what the firmware expects.

Signed-off-by: default avatarPrasad Kanneganti <prasad.kanneganti@cavium.com>
Signed-off-by: default avatarFelix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d5c7d9b9

drivers/net/ethernet/cavium/liquidio/octeon_device.c

+4 −2
Original line number Diff line number Diff line
@@ -1429,13 +1429,15 @@ int lio_get_device_id(void *dev) 
void lio_enable_irq(struct octeon_droq *droq, struct octeon_instr_queue *iq)

{

	u64 instr_cnt;

	u32 pkts_pend;

	struct octeon_device *oct = NULL;



	/* the whole thing needs to be atomic, ideally */

	if (droq) {

		pkts_pend = (u32)atomic_read(&droq->pkts_pending);

		spin_lock_bh(&droq->lock);

		writel(droq->pkt_count, droq->pkts_sent_reg);

		droq->pkt_count = 0;

		writel(droq->pkt_count - pkts_pend, droq->pkts_sent_reg);

		droq->pkt_count = pkts_pend;

		/* this write needs to be flushed before we release the lock */

		mmiowb();

		spin_unlock_bh(&droq->lock);

drivers/net/ethernet/cavium/liquidio/octeon_iq.h

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ union octeon_instr_64B { 


/** The size of each buffer in soft command buffer pool

 */

#define  SOFT_COMMAND_BUFFER_SIZE	1536

#define  SOFT_COMMAND_BUFFER_SIZE	2048



struct octeon_soft_command {

	/** Soft command buffer info. */