diff options
| author | Michael Chan <mchan@broadcom.com> | 2012-12-06 05:33:10 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-12-07 12:44:02 -0500 |
| commit | 4ce45e02469c382699f4c5f6df727aea9dd2e1ca (patch) | |
| tree | 17276f106990c8cb4caa1b6298f0f3f0841bff0e /drivers/net/ethernet/broadcom/bnx2.h | |
| parent | 2bc4078e92b28375a762d7236c1c9619eecab315 (diff) | |
bnx2: Add BNX2 prefix to CHIP ID and name macros
for namespace consistency.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2.h')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2.h | 48 |
1 files changed, 23 insertions, 25 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2.h b/drivers/net/ethernet/broadcom/bnx2.h index 58caa2266772..38a640df58f7 100644 --- a/drivers/net/ethernet/broadcom/bnx2.h +++ b/drivers/net/ethernet/broadcom/bnx2.h | |||
| @@ -6854,33 +6854,31 @@ struct bnx2 { | |||
| 6854 | 6854 | ||
| 6855 | u32 chip_id; | 6855 | u32 chip_id; |
| 6856 | /* chip num:16-31, rev:12-15, metal:4-11, bond_id:0-3 */ | 6856 | /* chip num:16-31, rev:12-15, metal:4-11, bond_id:0-3 */ |
| 6857 | #define CHIP_NUM(bp) (((bp)->chip_id) & 0xffff0000) | 6857 | #define BNX2_CHIP(bp) (((bp)->chip_id) & 0xffff0000) |
| 6858 | #define CHIP_NUM_5706 0x57060000 | 6858 | #define BNX2_CHIP_5706 0x57060000 |
| 6859 | #define CHIP_NUM_5708 0x57080000 | 6859 | #define BNX2_CHIP_5708 0x57080000 |
| 6860 | #define CHIP_NUM_5709 0x57090000 | 6860 | #define BNX2_CHIP_5709 0x57090000 |
| 6861 | 6861 | ||
| 6862 | #define CHIP_REV(bp) (((bp)->chip_id) & 0x0000f000) | 6862 | #define BNX2_CHIP_REV(bp) (((bp)->chip_id) & 0x0000f000) |
| 6863 | #define CHIP_REV_Ax 0x00000000 | 6863 | #define BNX2_CHIP_REV_Ax 0x00000000 |
| 6864 | #define CHIP_REV_Bx 0x00001000 | 6864 | #define BNX2_CHIP_REV_Bx 0x00001000 |
| 6865 | #define CHIP_REV_Cx 0x00002000 | 6865 | #define BNX2_CHIP_REV_Cx 0x00002000 |
| 6866 | 6866 | ||
| 6867 | #define CHIP_METAL(bp) (((bp)->chip_id) & 0x00000ff0) | 6867 | #define BNX2_CHIP_METAL(bp) (((bp)->chip_id) & 0x00000ff0) |
| 6868 | #define CHIP_BONDING(bp) (((bp)->chip_id) & 0x0000000f) | 6868 | #define BNX2_CHIP_BOND(bp) (((bp)->chip_id) & 0x0000000f) |
| 6869 | 6869 | ||
| 6870 | #define CHIP_ID(bp) (((bp)->chip_id) & 0xfffffff0) | 6870 | #define BNX2_CHIP_ID(bp) (((bp)->chip_id) & 0xfffffff0) |
| 6871 | #define CHIP_ID_5706_A0 0x57060000 | 6871 | #define BNX2_CHIP_ID_5706_A0 0x57060000 |
| 6872 | #define CHIP_ID_5706_A1 0x57060010 | 6872 | #define BNX2_CHIP_ID_5706_A1 0x57060010 |
| 6873 | #define CHIP_ID_5706_A2 0x57060020 | 6873 | #define BNX2_CHIP_ID_5706_A2 0x57060020 |
| 6874 | #define CHIP_ID_5708_A0 0x57080000 | 6874 | #define BNX2_CHIP_ID_5708_A0 0x57080000 |
| 6875 | #define CHIP_ID_5708_B0 0x57081000 | 6875 | #define BNX2_CHIP_ID_5708_B0 0x57081000 |
| 6876 | #define CHIP_ID_5708_B1 0x57081010 | 6876 | #define BNX2_CHIP_ID_5708_B1 0x57081010 |
| 6877 | #define CHIP_ID_5709_A0 0x57090000 | 6877 | #define BNX2_CHIP_ID_5709_A0 0x57090000 |
| 6878 | #define CHIP_ID_5709_A1 0x57090010 | 6878 | #define BNX2_CHIP_ID_5709_A1 0x57090010 |
| 6879 | |||
| 6880 | #define CHIP_BOND_ID(bp) (((bp)->chip_id) & 0xf) | ||
| 6881 | 6879 | ||
| 6882 | /* A serdes chip will have the first bit of the bond id set. */ | 6880 | /* A serdes chip will have the first bit of the bond id set. */ |
| 6883 | #define CHIP_BOND_ID_SERDES_BIT 0x01 | 6881 | #define BNX2_CHIP_BOND_SERDES_BIT 0x01 |
| 6884 | 6882 | ||
| 6885 | u32 phy_addr; | 6883 | u32 phy_addr; |
| 6886 | u32 phy_id; | 6884 | u32 phy_id; |