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

Commit 28912902 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnx2x: Refactor bnx2x_sp_post(). 



Some of the SPQ (slow-path queue) operations will be used
by the cnic code in later patches.

Signed-off-by: default avatarShmulik Ravid - Rabinovitz <shmulikr@broadcom.com>
Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Acked-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6abd2346

drivers/net/bnx2x_main.c

+38 −24
Original line number Original line Diff line number Diff line
@@ -2638,11 +2638,40 @@ static void bnx2x_dcc_event(struct bnx2x *bp, u32 dcc_event) 
		bnx2x_fw_command(bp, DRV_MSG_CODE_DCC_OK);

		bnx2x_fw_command(bp, DRV_MSG_CODE_DCC_OK);

}

}





/* must be called under the spq lock */

static inline struct eth_spe *bnx2x_sp_get_next(struct bnx2x *bp)

{

	struct eth_spe *next_spe = bp->spq_prod_bd;



	if (bp->spq_prod_bd == bp->spq_last_bd) {

		bp->spq_prod_bd = bp->spq;

		bp->spq_prod_idx = 0;

		DP(NETIF_MSG_TIMER, "end of spq\n");

	} else {

		bp->spq_prod_bd++;

		bp->spq_prod_idx++;

	}

	return next_spe;

}



/* must be called under the spq lock */

static inline void bnx2x_sp_prod_update(struct bnx2x *bp)

{

	int func = BP_FUNC(bp);



	/* Make sure that BD data is updated before writing the producer */

	wmb();



	REG_WR(bp, BAR_XSTRORM_INTMEM + XSTORM_SPQ_PROD_OFFSET(func),

	       bp->spq_prod_idx);

	mmiowb();

}



/* the slow path queue is odd since completions arrive on the fastpath ring */

/* the slow path queue is odd since completions arrive on the fastpath ring */

static int bnx2x_sp_post(struct bnx2x *bp, int command, int cid,

static int bnx2x_sp_post(struct bnx2x *bp, int command, int cid,

			 u32 data_hi, u32 data_lo, int common)

			 u32 data_hi, u32 data_lo, int common)

{

{

	int func = BP_FUNC(bp);

	struct eth_spe *spe;





	DP(BNX2X_MSG_SP/*NETIF_MSG_TIMER*/,

	DP(BNX2X_MSG_SP/*NETIF_MSG_TIMER*/,

	   "SPQE (%x:%x)  command %d  hw_cid %x  data (%x:%x)  left %x\n",

	   "SPQE (%x:%x)  command %d  hw_cid %x  data (%x:%x)  left %x\n",
@@ -2664,38 +2693,23 @@ static int bnx2x_sp_post(struct bnx2x *bp, int command, int cid, 
		return -EBUSY;

		return -EBUSY;

	}

	}





	spe = bnx2x_sp_get_next(bp);



	/* CID needs port number to be encoded int it */

	/* CID needs port number to be encoded int it */

	bp->spq_prod_bd->hdr.conn_and_cmd_data =

	spe->hdr.conn_and_cmd_data =

			cpu_to_le32(((command << SPE_HDR_CMD_ID_SHIFT) |

			cpu_to_le32(((command << SPE_HDR_CMD_ID_SHIFT) |

				     HW_CID(bp, cid)));

				     HW_CID(bp, cid)));

	bp->spq_prod_bd->hdr.type = cpu_to_le16(ETH_CONNECTION_TYPE);

	spe->hdr.type = cpu_to_le16(ETH_CONNECTION_TYPE);

	if (common)

	if (common)

		bp->spq_prod_bd->hdr.type |=

		spe->hdr.type |=

			cpu_to_le16((1 << SPE_HDR_COMMON_RAMROD_SHIFT));

			cpu_to_le16((1 << SPE_HDR_COMMON_RAMROD_SHIFT));





	bp->spq_prod_bd->data.mac_config_addr.hi = cpu_to_le32(data_hi);

	spe->data.mac_config_addr.hi = cpu_to_le32(data_hi);

	bp->spq_prod_bd->data.mac_config_addr.lo = cpu_to_le32(data_lo);

	spe->data.mac_config_addr.lo = cpu_to_le32(data_lo);





	bp->spq_left--;

	bp->spq_left--;





	if (bp->spq_prod_bd == bp->spq_last_bd) {

	bnx2x_sp_prod_update(bp);

		bp->spq_prod_bd = bp->spq;

		bp->spq_prod_idx = 0;

		DP(NETIF_MSG_TIMER, "end of spq\n");



	} else {

		bp->spq_prod_bd++;

		bp->spq_prod_idx++;

	}



	/* Make sure that BD data is updated before writing the producer */

	wmb();



	REG_WR(bp, BAR_XSTRORM_INTMEM + XSTORM_SPQ_PROD_OFFSET(func),

	       bp->spq_prod_idx);



	mmiowb();



	spin_unlock_bh(&bp->spq_lock);

	spin_unlock_bh(&bp->spq_lock);

	return 0;

	return 0;

}

}