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

Commit 58f4c4cf authored by Eilon Greenstein's avatar Eilon Greenstein Committed by David S. Miller
Browse files

bnx2x: Missing memory barriers 



While working on IA64, it became clear that the following memory
barriers are missing

Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1cf167f2

drivers/net/bnx2x_main.c

+26 −2
Original line number Diff line number Diff line
@@ -1357,11 +1357,23 @@ static inline void bnx2x_update_rx_prod(struct bnx2x *bp, 
	rx_prods.cqe_prod = rx_comp_prod;

	rx_prods.sge_prod = rx_sge_prod;



	/*

	 * Make sure that the BD and SGE data is updated before updating the

	 * producers since FW might read the BD/SGE right after the producer

	 * is updated.

	 * This is only applicable for weak-ordered memory model archs such

	 * as IA-64. The following barrier is also mandatory since FW will

	 * assumes BDs must have buffers.

	 */

	wmb();



	for (i = 0; i < sizeof(struct tstorm_eth_rx_producers)/4; i++)

		REG_WR(bp, BAR_TSTRORM_INTMEM +

		       TSTORM_RX_PRODS_OFFSET(BP_PORT(bp), FP_CL_ID(fp)) + i*4,

		       ((u32 *)&rx_prods)[i]);



	mmiowb(); /* keep prod updates ordered */



	DP(NETIF_MSG_RX_STATUS,

	   "Wrote: bd_prod %u  cqe_prod %u  sge_prod %u\n",

	   bd_prod, rx_comp_prod, rx_sge_prod);
@@ -1582,7 +1594,6 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget) 
	/* Update producers */

	bnx2x_update_rx_prod(bp, fp, bd_prod_fw, sw_comp_prod,

			     fp->rx_sge_prod);

	mmiowb(); /* keep prod updates ordered */



	fp->rx_pkt += rx_pkt;

	fp->rx_calls++;
@@ -8729,6 +8740,8 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode, u8 link_up) 
	tx_bd->general_data = ((UNICAST_ADDRESS <<

				ETH_TX_BD_ETH_ADDR_TYPE_SHIFT) | 1);



	wmb();



	fp->hw_tx_prods->bds_prod =

		cpu_to_le16(le16_to_cpu(fp->hw_tx_prods->bds_prod) + 1);

	mb(); /* FW restriction: must not reorder writing nbd and packets */
@@ -8780,7 +8793,6 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode, u8 link_up) 
	/* Update producers */

	bnx2x_update_rx_prod(bp, fp, fp->rx_bd_prod, fp->rx_comp_prod,

			     fp->rx_sge_prod);

	mmiowb(); /* keep prod updates ordered */



test_loopback_exit:

	bp->link_params.loopback_mode = LOOPBACK_NONE;
@@ -9707,6 +9719,15 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev) 


	DP(NETIF_MSG_TX_QUEUED, "doorbell: nbd %d  bd %u\n", nbd, bd_prod);



	/*

	 * Make sure that the BD data is updated before updating the producer

	 * since FW might read the BD right after the producer is updated.

	 * This is only applicable for weak-ordered memory model archs such

	 * as IA-64. The following barrier is also mandatory since FW will

	 * assumes packets must have BDs.

	 */

	wmb();



	fp->hw_tx_prods->bds_prod =

		cpu_to_le16(le16_to_cpu(fp->hw_tx_prods->bds_prod) + nbd);

	mb(); /* FW restriction: must not reorder writing nbd and packets */
@@ -9720,6 +9741,9 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	dev->trans_start = jiffies;



	if (unlikely(bnx2x_tx_avail(fp) < MAX_SKB_FRAGS + 3)) {

		/* We want bnx2x_tx_int to "see" the updated tx_bd_prod

		   if we put Tx into XOFF state. */

		smp_mb();

		netif_stop_queue(dev);

		bp->eth_stats.driver_xoff++;

		if (bnx2x_tx_avail(fp) >= MAX_SKB_FRAGS + 3)