diff options
author | Yaniv Rosner <yanivr@broadcom.com> | 2011-06-13 21:34:07 -0400 |
---|---|---|
committer | David S. Miller <davem@conan.davemloft.net> | 2011-06-15 10:56:56 -0400 |
commit | 9380bb9e88831bd3d85636b3e4fec30e330d5266 (patch) | |
tree | 890b8b2e9bbed5622acd4d7dbff88c402e4dc76d /drivers/net/bnx2x/bnx2x_link.h | |
parent | 754a2f5220ac7d597454df3104cfce9c83d68df0 (diff) |
bnx2x: Add new MAC support for 578xx
Signed-off-by: Yaniv Rosner <yanivr@broadcom.com>
Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@conan.davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x/bnx2x_link.h')
-rw-r--r-- | drivers/net/bnx2x/bnx2x_link.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/net/bnx2x/bnx2x_link.h b/drivers/net/bnx2x/bnx2x_link.h index 3fef7782490a..12602f18fae8 100644 --- a/drivers/net/bnx2x/bnx2x_link.h +++ b/drivers/net/bnx2x/bnx2x_link.h | |||
@@ -66,17 +66,6 @@ | |||
66 | #define FW_PARAM_SET(phy_addr, phy_type, mdio_access) \ | 66 | #define FW_PARAM_SET(phy_addr, phy_type, mdio_access) \ |
67 | (phy_addr | phy_type | mdio_access << FW_PARAM_MDIO_CTRL_OFFSET) | 67 | (phy_addr | phy_type | mdio_access << FW_PARAM_MDIO_CTRL_OFFSET) |
68 | 68 | ||
69 | #define PFC_BRB_MAC_PAUSE_XOFF_THRESHOLD_PAUSEABLE 170 | ||
70 | #define PFC_BRB_MAC_PAUSE_XOFF_THRESHOLD_NON_PAUSEABLE 0 | ||
71 | |||
72 | #define PFC_BRB_MAC_PAUSE_XON_THRESHOLD_PAUSEABLE 250 | ||
73 | #define PFC_BRB_MAC_PAUSE_XON_THRESHOLD_NON_PAUSEABLE 0 | ||
74 | |||
75 | #define PFC_BRB_MAC_FULL_XOFF_THRESHOLD_PAUSEABLE 10 | ||
76 | #define PFC_BRB_MAC_FULL_XOFF_THRESHOLD_NON_PAUSEABLE 90 | ||
77 | |||
78 | #define PFC_BRB_MAC_FULL_XON_THRESHOLD_PAUSEABLE 50 | ||
79 | #define PFC_BRB_MAC_FULL_XON_THRESHOLD_NON_PAUSEABLE 250 | ||
80 | 69 | ||
81 | #define PFC_BRB_FULL_LB_XOFF_THRESHOLD 170 | 70 | #define PFC_BRB_FULL_LB_XOFF_THRESHOLD 170 |
82 | #define PFC_BRB_FULL_LB_XON_THRESHOLD 250 | 71 | #define PFC_BRB_FULL_LB_XON_THRESHOLD 250 |
@@ -132,6 +121,7 @@ struct bnx2x_phy { | |||
132 | #define FLAGS_FAN_FAILURE_DET_REQ (1<<2) | 121 | #define FLAGS_FAN_FAILURE_DET_REQ (1<<2) |
133 | /* Initialize first the XGXS and only then the phy itself */ | 122 | /* Initialize first the XGXS and only then the phy itself */ |
134 | #define FLAGS_INIT_XGXS_FIRST (1<<3) | 123 | #define FLAGS_INIT_XGXS_FIRST (1<<3) |
124 | #define FLAGS_4_PORT_MODE (1<<5) | ||
135 | #define FLAGS_REARM_LATCH_SIGNAL (1<<6) | 125 | #define FLAGS_REARM_LATCH_SIGNAL (1<<6) |
136 | #define FLAGS_SFP_NOT_APPROVED (1<<7) | 126 | #define FLAGS_SFP_NOT_APPROVED (1<<7) |
137 | 127 | ||
@@ -366,6 +356,8 @@ int bnx2x_phy_probe(struct link_params *params); | |||
366 | u8 bnx2x_fan_failure_det_req(struct bnx2x *bp, u32 shmem_base, | 356 | u8 bnx2x_fan_failure_det_req(struct bnx2x *bp, u32 shmem_base, |
367 | u32 shmem2_base, u8 port); | 357 | u32 shmem2_base, u8 port); |
368 | 358 | ||
359 | |||
360 | |||
369 | /* DCBX structs */ | 361 | /* DCBX structs */ |
370 | 362 | ||
371 | /* Number of maximum COS per chip */ | 363 | /* Number of maximum COS per chip */ |
@@ -400,7 +392,7 @@ struct bnx2x_nig_brb_pfc_port_params { | |||
400 | * Used to update the PFC attributes in EMAC, BMAC, NIG and BRB | 392 | * Used to update the PFC attributes in EMAC, BMAC, NIG and BRB |
401 | * when link is already up | 393 | * when link is already up |
402 | */ | 394 | */ |
403 | void bnx2x_update_pfc(struct link_params *params, | 395 | int bnx2x_update_pfc(struct link_params *params, |
404 | struct link_vars *vars, | 396 | struct link_vars *vars, |
405 | struct bnx2x_nig_brb_pfc_port_params *pfc_params); | 397 | struct bnx2x_nig_brb_pfc_port_params *pfc_params); |
406 | 398 | ||