Author: np
Date: Sun Aug 15 20:52:15 2010
New Revision: 211347
URL: http://svn.freebsd.org/changeset/base/211347
Log:
Fix tx pause quanta and timer calculations.
MFC after: 3 days
Modified:
head/sys/dev/cxgb/common/cxgb_xgmac.c
Modified: head/sys/dev/cxgb/common/cxgb_xgmac.c
==============================================================================
--- head/sys/dev/cxgb/common/cxgb_xgmac.c Sun Aug 15 20:45:16 2010
(r211346)
+++ head/sys/dev/cxgb/common/cxgb_xgmac.c Sun Aug 15 20:52:15 2010
(r211347)
@@ -462,7 +462,7 @@ static int rx_fifo_hwm(int mtu)
*/
int t3_mac_set_mtu(struct cmac *mac, unsigned int mtu)
{
- int hwm, lwm, divisor;
+ int hwm, lwm;
int ipg;
unsigned int thres, v, reg;
adapter_t *adap = mac->adapter;
@@ -541,16 +541,6 @@ int t3_mac_set_mtu(struct cmac *mac, uns
t3_set_reg_field(adap, A_XGM_TXFIFO_CFG + mac->offset,
V_TXFIFOTHRESH(M_TXFIFOTHRESH) | V_TXIPG(M_TXIPG),
V_TXFIFOTHRESH(thres) | V_TXIPG(ipg));
-
- /* Assuming a minimum drain rate of 2.5Gbps...
- */
- if (adap->params.rev > 0) {
- divisor = (adap->params.rev == T3_REV_C) ? 64 : 8;
- t3_write_reg(adap, A_XGM_PAUSE_TIMER + mac->offset,
- (hwm - lwm) * 4 / divisor);
- }
- t3_write_reg(adap, A_XGM_TX_PAUSE_QUANTA + mac->offset,
- MAC_RXFIFO_SIZE * 4 * 8 / 512);
return 0;
}
@@ -570,9 +560,17 @@ int t3_mac_set_speed_duplex_fc(struct cm
u32 val;
adapter_t *adap = mac->adapter;
unsigned int oft = mac->offset;
+ unsigned int pause_bits;
if (duplex >= 0 && duplex != DUPLEX_FULL)
return -EINVAL;
+
+ pause_bits = MAC_RXFIFO_SIZE * 4 * 8;
+ t3_write_reg(adap, A_XGM_TX_PAUSE_QUANTA + mac->offset,
+ pause_bits / 512);
+ t3_write_reg(adap, A_XGM_PAUSE_TIMER + mac->offset,
+ (pause_bits >> (adap->params.rev == T3_REV_C ? 10 : 7)));
+
if (mac->multiport) {
u32 rx_max_pkt_size =
G_RXMAXPKTSIZE(t3_read_reg(adap,
@@ -581,9 +579,9 @@ int t3_mac_set_speed_duplex_fc(struct cm
val &= ~V_RXFIFOPAUSEHWM(M_RXFIFOPAUSEHWM);
val |= V_RXFIFOPAUSEHWM(rx_fifo_hwm(rx_max_pkt_size) / 8);
t3_write_reg(adap, A_XGM_RXFIFO_CFG + oft, val);
-
t3_set_reg_field(adap, A_XGM_TX_CFG + oft, F_TXPAUSEEN,
F_TXPAUSEEN);
+
return t3_vsc7323_set_speed_fc(adap, speed, fc, mac->ext_port);
}
if (speed >= 0) {
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
