diff options
Diffstat (limited to 'drivers/net/sfc/net_driver.h')
-rw-r--r-- | drivers/net/sfc/net_driver.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h index cdb11fad6050..e596c9a6a4c4 100644 --- a/drivers/net/sfc/net_driver.h +++ b/drivers/net/sfc/net_driver.h | |||
@@ -414,6 +414,7 @@ struct efx_blinker { | |||
414 | * @init_leds: Sets up board LEDs | 414 | * @init_leds: Sets up board LEDs |
415 | * @set_fault_led: Turns the fault LED on or off | 415 | * @set_fault_led: Turns the fault LED on or off |
416 | * @blink: Starts/stops blinking | 416 | * @blink: Starts/stops blinking |
417 | * @monitor: Board-specific health check function | ||
417 | * @fini: Cleanup function | 418 | * @fini: Cleanup function |
418 | * @blinker: used to blink LEDs in software | 419 | * @blinker: used to blink LEDs in software |
419 | * @hwmon_client: I2C client for hardware monitor | 420 | * @hwmon_client: I2C client for hardware monitor |
@@ -428,6 +429,7 @@ struct efx_board { | |||
428 | * have a separate init callback that happens later than | 429 | * have a separate init callback that happens later than |
429 | * board init. */ | 430 | * board init. */ |
430 | int (*init_leds)(struct efx_nic *efx); | 431 | int (*init_leds)(struct efx_nic *efx); |
432 | int (*monitor) (struct efx_nic *nic); | ||
431 | void (*set_fault_led) (struct efx_nic *efx, bool state); | 433 | void (*set_fault_led) (struct efx_nic *efx, bool state); |
432 | void (*blink) (struct efx_nic *efx, bool start); | 434 | void (*blink) (struct efx_nic *efx, bool start); |
433 | void (*fini) (struct efx_nic *nic); | 435 | void (*fini) (struct efx_nic *nic); |
@@ -525,11 +527,15 @@ struct efx_phy_operations { | |||
525 | * @enum efx_phy_mode - PHY operating mode flags | 527 | * @enum efx_phy_mode - PHY operating mode flags |
526 | * @PHY_MODE_NORMAL: on and should pass traffic | 528 | * @PHY_MODE_NORMAL: on and should pass traffic |
527 | * @PHY_MODE_TX_DISABLED: on with TX disabled | 529 | * @PHY_MODE_TX_DISABLED: on with TX disabled |
530 | * @PHY_MODE_LOW_POWER: set to low power through MDIO | ||
531 | * @PHY_MODE_OFF: switched off through external control | ||
528 | * @PHY_MODE_SPECIAL: on but will not pass traffic | 532 | * @PHY_MODE_SPECIAL: on but will not pass traffic |
529 | */ | 533 | */ |
530 | enum efx_phy_mode { | 534 | enum efx_phy_mode { |
531 | PHY_MODE_NORMAL = 0, | 535 | PHY_MODE_NORMAL = 0, |
532 | PHY_MODE_TX_DISABLED = 1, | 536 | PHY_MODE_TX_DISABLED = 1, |
537 | PHY_MODE_LOW_POWER = 2, | ||
538 | PHY_MODE_OFF = 4, | ||
533 | PHY_MODE_SPECIAL = 8, | 539 | PHY_MODE_SPECIAL = 8, |
534 | }; | 540 | }; |
535 | 541 | ||
@@ -655,6 +661,7 @@ union efx_multicast_hash { | |||
655 | * This field will be %NULL if no flash device is present. | 661 | * This field will be %NULL if no flash device is present. |
656 | * @spi_eeprom: SPI EEPROM device | 662 | * @spi_eeprom: SPI EEPROM device |
657 | * This field will be %NULL if no EEPROM device is present. | 663 | * This field will be %NULL if no EEPROM device is present. |
664 | * @spi_lock: SPI bus lock | ||
658 | * @n_rx_nodesc_drop_cnt: RX no descriptor drop count | 665 | * @n_rx_nodesc_drop_cnt: RX no descriptor drop count |
659 | * @nic_data: Hardware dependant state | 666 | * @nic_data: Hardware dependant state |
660 | * @mac_lock: MAC access lock. Protects @port_enabled, @phy_mode, | 667 | * @mac_lock: MAC access lock. Protects @port_enabled, @phy_mode, |
@@ -731,6 +738,7 @@ struct efx_nic { | |||
731 | 738 | ||
732 | struct efx_spi_device *spi_flash; | 739 | struct efx_spi_device *spi_flash; |
733 | struct efx_spi_device *spi_eeprom; | 740 | struct efx_spi_device *spi_eeprom; |
741 | struct mutex spi_lock; | ||
734 | 742 | ||
735 | unsigned n_rx_nodesc_drop_cnt; | 743 | unsigned n_rx_nodesc_drop_cnt; |
736 | 744 | ||