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

Commit fdb72b38 authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Break out mini producer ring handling 



This patch separates the code that sets up the mini producer ring from
the code that sets up the jumbo producer rings.  The 5717 asic rev
devices do not have a mini ring, but do have a jumbo frame
implementation similar to the 5704 and previous devices.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8590a603

drivers/net/tg3.c

+12 −11
Original line number Original line Diff line number Diff line
@@ -6967,19 +6967,16 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) 
	tw32(RCVDBDI_STD_BD + TG3_BDINFO_NIC_ADDR,

	tw32(RCVDBDI_STD_BD + TG3_BDINFO_NIC_ADDR,

	     NIC_SRAM_RX_BUFFER_DESC);

	     NIC_SRAM_RX_BUFFER_DESC);





	/* Don't even try to program the JUMBO/MINI buffer descriptor

	/* Disable the mini ring */

	 * configs on 5705.

	if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS))

	 */

	if (tp->tg3_flags2 & TG3_FLG2_5705_PLUS) {

		tw32(RCVDBDI_STD_BD + TG3_BDINFO_MAXLEN_FLAGS,

		     RX_STD_MAX_SIZE_5705 << BDINFO_FLAGS_MAXLEN_SHIFT);

	} else {

		tw32(RCVDBDI_STD_BD + TG3_BDINFO_MAXLEN_FLAGS,

		     RX_STD_MAX_SIZE << BDINFO_FLAGS_MAXLEN_SHIFT);



		tw32(RCVDBDI_MINI_BD + TG3_BDINFO_MAXLEN_FLAGS,

		tw32(RCVDBDI_MINI_BD + TG3_BDINFO_MAXLEN_FLAGS,

		     BDINFO_FLAGS_DISABLED);

		     BDINFO_FLAGS_DISABLED);





	/* Program the jumbo buffer descriptor ring control

	 * blocks on those devices that have them.

	 */

	if ((tp->tg3_flags2 & TG3_FLG2_JUMBO_CAPABLE) &&

	    !(tp->tg3_flags2 & TG3_FLG2_5780_CLASS)) {

		/* Setup replenish threshold. */

		/* Setup replenish threshold. */

		tw32(RCVBDI_JUMBO_THRESH, tp->rx_jumbo_pending / 8);

		tw32(RCVBDI_JUMBO_THRESH, tp->rx_jumbo_pending / 8);
@@ -6997,7 +6994,11 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) 
			     BDINFO_FLAGS_DISABLED);

			     BDINFO_FLAGS_DISABLED);

		}

		}





	}

		val = RX_STD_MAX_SIZE << BDINFO_FLAGS_MAXLEN_SHIFT;

	} else

		val = RX_STD_MAX_SIZE_5705 << BDINFO_FLAGS_MAXLEN_SHIFT;



	tw32(RCVDBDI_STD_BD + TG3_BDINFO_MAXLEN_FLAGS, val);





	/* There is only one send ring on 5705/5750, no need to explicitly

	/* There is only one send ring on 5705/5750, no need to explicitly

	 * disable the others.

	 * disable the others.