perf_counter: Simplify context cleanup

[safe/jmp/linux-2.6] / drivers / net / bnx2x_link.h

diff --git a/drivers/net/bnx2x_link.h b/drivers/net/bnx2x_link.h
index b222552..19a866d 100644 (file)
--- a/drivers/net/bnx2x_link.h
+++ b/drivers/net/bnx2x_link.h
@@ -1,4 +1,4 @@
-/* Copyright 2008 Broadcom Corporation
+/* Copyright 2008-2009 Broadcom Corporation
  *
  * Unless you and Broadcom execute a separate written software license
  * agreement governing use of this software, this software is licensed to you
@@ -26,11 +26,11 @@
 
 
 
-#define FLOW_CTRL_AUTO         PORT_FEATURE_FLOW_CONTROL_AUTO
-#define FLOW_CTRL_TX           PORT_FEATURE_FLOW_CONTROL_TX
-#define FLOW_CTRL_RX           PORT_FEATURE_FLOW_CONTROL_RX
-#define FLOW_CTRL_BOTH         PORT_FEATURE_FLOW_CONTROL_BOTH
-#define FLOW_CTRL_NONE         PORT_FEATURE_FLOW_CONTROL_NONE
+#define BNX2X_FLOW_CTRL_AUTO           PORT_FEATURE_FLOW_CONTROL_AUTO
+#define BNX2X_FLOW_CTRL_TX             PORT_FEATURE_FLOW_CONTROL_TX
+#define BNX2X_FLOW_CTRL_RX             PORT_FEATURE_FLOW_CONTROL_RX
+#define BNX2X_FLOW_CTRL_BOTH           PORT_FEATURE_FLOW_CONTROL_BOTH
+#define BNX2X_FLOW_CTRL_NONE           PORT_FEATURE_FLOW_CONTROL_NONE
 
 #define SPEED_AUTO_NEG     0
 #define SPEED_12000            12000
@@ -55,6 +55,7 @@ struct link_params {
 #define LOOPBACK_BMAC  2
 #define LOOPBACK_XGXS_10       3
 #define LOOPBACK_EXT_PHY       4
+#define LOOPBACK_EXT   5
 
        u16 req_duplex;
        u16 req_flow_ctrl;
@@ -65,8 +66,6 @@ struct link_params {
        /* Device parameters */
        u8 mac_addr[6];
 
-
-
        /* shmem parameters */
        u32 shmem_base;
        u32 speed_cap_mask;
@@ -76,7 +75,6 @@ struct link_params {
 #define SWITCH_CFG_AUTO_DETECT PORT_FEATURE_CON_SWITCH_AUTO_DETECT
 
        u16 hw_led_mode; /* part of the hw_config read from the shmem */
-       u32 serdes_config;
        u32 lane_config;
        u32 ext_phy_config;
 #define XGXS_EXT_PHY_TYPE(ext_phy_config)      (ext_phy_config & \
@@ -88,6 +86,12 @@ struct link_params {
 
        /* phy_addr populated by the CLC */
        u8 phy_addr;
+       u16 xgxs_config_rx[4]; /* preemphasis values for the rx side */
+
+       u16 xgxs_config_tx[4]; /* preemphasis values for the tx side */
+       u32 feature_config_flags;
+#define FEATURE_CONFIG_OVERRIDE_PREEMPHASIS_ENABLED (1<<0)
+#define FEATURE_CONFIG_MODULE_ENFORCMENT_ENABLED       (2<<0)
        /* Device pointer passed to all callback functions */
        struct bnx2x *bp;
 };
@@ -124,8 +128,11 @@ struct link_vars {
 /* Initialize the phy */
 u8 bnx2x_phy_init(struct link_params *input, struct link_vars *output);
 
-/* Reset the link. Should be called when driver or interface goes down */
-u8 bnx2x_link_reset(struct link_params *params, struct link_vars *vars);
+/* Reset the link. Should be called when driver or interface goes down
+   Before calling phy firmware upgrade, the reset_ext_phy should be set
+   to 0 */
+u8 bnx2x_link_reset(struct link_params *params, struct link_vars *vars,
+                 u8 reset_ext_phy);
 
 /* bnx2x_link_update should be called upon link interrupt */
 u8 bnx2x_link_update(struct link_params *input, struct link_vars *output);
@@ -142,7 +149,7 @@ u8 bnx2x_cl45_write(struct bnx2x *bp, u8 port, u32 ext_phy_type,
                  u8 phy_addr, u8 devad, u16 reg, u16 val);
 
 /* Reads the link_status from the shmem,
-   and update the link vars accordinaly */
+   and update the link vars accordingly */
 void bnx2x_link_status_update(struct link_params *input,
                            struct link_vars *output);
 /* returns string representing the fw_version of the external phy */
@@ -151,7 +158,7 @@ u8 bnx2x_get_ext_phy_fw_version(struct link_params *params, u8 driver_loaded,
 
 /* Set/Unset the led
    Basically, the CLC takes care of the led for the link, but in case one needs
-   to set/unset the led unnatually, set the "mode" to LED_MODE_OPER to
+   to set/unset the led unnaturally, set the "mode" to LED_MODE_OPER to
    blink the led, and LED_MODE_OFF to set the led off.*/
 u8 bnx2x_set_led(struct bnx2x *bp, u8 port, u8 mode, u32 speed,
               u16 hw_led_mode, u32 chip_id);
@@ -162,9 +169,16 @@ u8 bnx2x_override_led_value(struct bnx2x *bp, u8 port, u32 led_idx, u32 value);
 
 u8 bnx2x_flash_download(struct bnx2x *bp, u8 port, u32 ext_phy_config,
                      u8 driver_loaded, char data[], u32 size);
+/* bnx2x_handle_module_detect_int should be called upon module detection
+   interrupt */
+void bnx2x_handle_module_detect_int(struct link_params *params);
+
 /* Get the actual link status. In case it returns 0, link is up,
        otherwise link is down*/
 u8 bnx2x_test_link(struct link_params *input, struct link_vars *vars);
 
+/* One-time initialization for external phy after power up */
+u8 bnx2x_common_init_phy(struct bnx2x *bp, u32 shmem_base);
+
 
 #endif /* BNX2X_LINK_H */