tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

cxgb3 - MAC watchdog update

The MAC watchdog was failing if the peer interface was brought down.

Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

authored by Divy Le Ray and committed by Jeff Garzik 59cf8107 f2d961c9

+91 -37
unified split
+5 -2
drivers/net/cxgb3/common.h
··· 478 478 struct adapter *adapter; 479 479 unsigned int offset; 480 480 unsigned int nucast; /* # of address filters for unicast MACs */ 481 - unsigned int tcnt; 482 - unsigned int xcnt; 481 + unsigned int tx_tcnt; 482 + unsigned int tx_xcnt; 483 + u64 tx_mcnt; 484 + unsigned int rx_xcnt; 485 + u64 rx_mcnt; 483 486 unsigned int toggle_cnt; 484 487 unsigned int txen; 485 488 struct mac_stats stats;
+4 -6
drivers/net/cxgb3/cxgb3_main.c
··· 194 194 195 195 if (link_stat != netif_carrier_ok(dev)) { 196 196 if (link_stat) { 197 - t3_set_reg_field(adapter, 198 - A_XGM_TXFIFO_CFG + mac->offset, 199 - F_ENDROPPKT, 0); 197 + t3_mac_enable(mac, MAC_DIRECTION_RX); 200 198 netif_carrier_on(dev); 201 199 } else { 202 200 netif_carrier_off(dev); 203 - t3_set_reg_field(adapter, 204 - A_XGM_TXFIFO_CFG + mac->offset, 205 - F_ENDROPPKT, F_ENDROPPKT); 201 + pi->phy.ops->power_down(&pi->phy, 1); 202 + t3_mac_disable(mac, MAC_DIRECTION_RX); 203 + t3_link_start(&pi->phy, mac, &pi->link_config); 206 204 } 207 205 208 206 link_report(dev);
+82 -29
drivers/net/cxgb3/xgmac.c
··· 367 367 int idx = macidx(mac); 368 368 struct adapter *adap = mac->adapter; 369 369 unsigned int oft = mac->offset; 370 - 370 + struct mac_stats *s = &mac->stats; 371 + 371 372 if (which & MAC_DIRECTION_TX) { 372 373 t3_write_reg(adap, A_XGM_TX_CTRL + oft, F_TXEN); 373 374 t3_write_reg(adap, A_TP_PIO_ADDR, A_TP_TX_DROP_CFG_CH0 + idx); ··· 377 376 t3_set_reg_field(adap, A_TP_PIO_DATA, 1 << idx, 1 << idx); 378 377 379 378 t3_write_reg(adap, A_TP_PIO_ADDR, A_TP_TX_DROP_CNT_CH0 + idx); 380 - mac->tcnt = (G_TXDROPCNTCH0RCVD(t3_read_reg(adap, 381 - A_TP_PIO_DATA))); 382 - mac->xcnt = (G_TXSPI4SOPCNT(t3_read_reg(adap, 383 - A_XGM_TX_SPI4_SOP_EOP_CNT))); 379 + mac->tx_mcnt = s->tx_frames; 380 + mac->tx_tcnt = (G_TXDROPCNTCH0RCVD(t3_read_reg(adap, 381 + A_TP_PIO_DATA))); 382 + mac->tx_xcnt = (G_TXSPI4SOPCNT(t3_read_reg(adap, 383 + A_XGM_TX_SPI4_SOP_EOP_CNT + 384 + oft))); 385 + mac->rx_mcnt = s->rx_frames; 386 + mac->rx_xcnt = (G_TXSPI4SOPCNT(t3_read_reg(adap, 387 + A_XGM_RX_SPI4_SOP_EOP_CNT + 388 + oft))); 384 389 mac->txen = F_TXEN; 385 390 mac->toggle_cnt = 0; 386 391 } ··· 399 392 { 400 393 int idx = macidx(mac); 401 394 struct adapter *adap = mac->adapter; 395 + int val; 402 396 403 397 if (which & MAC_DIRECTION_TX) { 404 398 t3_write_reg(adap, A_XGM_TX_CTRL + mac->offset, 0); ··· 409 401 t3_set_reg_field(adap, A_TP_PIO_DATA, 1 << idx, 1 << idx); 410 402 mac->txen = 0; 411 403 } 412 - if (which & MAC_DIRECTION_RX) 404 + if (which & MAC_DIRECTION_RX) { 405 + t3_set_reg_field(mac->adapter, A_XGM_RESET_CTRL + mac->offset, 406 + F_PCS_RESET_, 0); 407 + msleep(100); 413 408 t3_write_reg(adap, A_XGM_RX_CTRL + mac->offset, 0); 409 + val = F_MAC_RESET_; 410 + if (is_10G(adap)) 411 + val |= F_PCS_RESET_; 412 + else if (uses_xaui(adap)) 413 + val |= F_PCS_RESET_ | F_XG2G_RESET_; 414 + else 415 + val |= F_RGMII_RESET_ | F_XG2G_RESET_; 416 + t3_write_reg(mac->adapter, A_XGM_RESET_CTRL + mac->offset, val); 417 + } 414 418 return 0; 415 419 } 416 420 417 421 int t3b2_mac_watchdog_task(struct cmac *mac) 418 422 { 419 423 struct adapter *adap = mac->adapter; 420 - unsigned int tcnt, xcnt; 424 + struct mac_stats *s = &mac->stats; 425 + unsigned int tx_tcnt, tx_xcnt; 426 + unsigned int tx_mcnt = s->tx_frames; 427 + unsigned int rx_mcnt = s->rx_frames; 428 + unsigned int rx_xcnt; 421 429 int status; 422 430 423 - t3_write_reg(adap, A_TP_PIO_ADDR, A_TP_TX_DROP_CNT_CH0 + macidx(mac)); 424 - tcnt = (G_TXDROPCNTCH0RCVD(t3_read_reg(adap, A_TP_PIO_DATA))); 425 - xcnt = (G_TXSPI4SOPCNT(t3_read_reg(adap, 426 - A_XGM_TX_SPI4_SOP_EOP_CNT + 427 - mac->offset))); 428 - 429 - if (tcnt != mac->tcnt && xcnt == 0 && mac->xcnt == 0) { 430 - if (mac->toggle_cnt > 4) { 431 - t3b2_mac_reset(mac); 432 - mac->toggle_cnt = 0; 433 - status = 2; 431 + if (tx_mcnt == mac->tx_mcnt) { 432 + tx_xcnt = (G_TXSPI4SOPCNT(t3_read_reg(adap, 433 + A_XGM_TX_SPI4_SOP_EOP_CNT + 434 + mac->offset))); 435 + if (tx_xcnt == 0) { 436 + t3_write_reg(adap, A_TP_PIO_ADDR, 437 + A_TP_TX_DROP_CNT_CH0 + macidx(mac)); 438 + tx_tcnt = (G_TXDROPCNTCH0RCVD(t3_read_reg(adap, 439 + A_TP_PIO_DATA))); 434 440 } else { 435 - t3_write_reg(adap, A_XGM_TX_CTRL + mac->offset, 0); 436 - t3_read_reg(adap, A_XGM_TX_CTRL + mac->offset); 437 - t3_write_reg(adap, A_XGM_TX_CTRL + mac->offset, 438 - mac->txen); 439 - t3_read_reg(adap, A_XGM_TX_CTRL + mac->offset); 440 - mac->toggle_cnt++; 441 - status = 1; 442 - } 441 + mac->toggle_cnt = 0; 442 + return 0; 443 + } 443 444 } else { 444 445 mac->toggle_cnt = 0; 445 - status = 0; 446 + return 0; 446 447 } 447 - mac->tcnt = tcnt; 448 - mac->xcnt = xcnt; 449 448 449 + if (((tx_tcnt != mac->tx_tcnt) && 450 + (tx_xcnt == 0) && (mac->tx_xcnt == 0)) || 451 + ((mac->tx_mcnt == tx_mcnt) && 452 + (tx_xcnt != 0) && (mac->tx_xcnt != 0))) { 453 + if (mac->toggle_cnt > 4) 454 + status = 2; 455 + else 456 + status = 1; 457 + } else { 458 + mac->toggle_cnt = 0; 459 + return 0; 460 + } 461 + 462 + if (rx_mcnt != mac->rx_mcnt) 463 + rx_xcnt = (G_TXSPI4SOPCNT(t3_read_reg(adap, 464 + A_XGM_RX_SPI4_SOP_EOP_CNT + 465 + mac->offset))); 466 + else 467 + return 0; 468 + 469 + if (mac->rx_mcnt != s->rx_frames && rx_xcnt == 0 && mac->rx_xcnt == 0) 470 + status = 2; 471 + 472 + mac->tx_tcnt = tx_tcnt; 473 + mac->tx_xcnt = tx_xcnt; 474 + mac->tx_mcnt = s->tx_frames; 475 + mac->rx_xcnt = rx_xcnt; 476 + mac->rx_mcnt = s->rx_frames; 477 + if (status == 1) { 478 + t3_write_reg(adap, A_XGM_TX_CTRL + mac->offset, 0); 479 + t3_read_reg(adap, A_XGM_TX_CTRL + mac->offset); /* flush */ 480 + t3_write_reg(adap, A_XGM_TX_CTRL + mac->offset, mac->txen); 481 + t3_read_reg(adap, A_XGM_TX_CTRL + mac->offset); /* flush */ 482 + mac->toggle_cnt++; 483 + } else if (status == 2) { 484 + t3b2_mac_reset(mac); 485 + mac->toggle_cnt = 0; 486 + } 450 487 return status; 451 488 } 452 489