Consolidate all code taking care on CSR offset differences for i210 chips into a single place in the driver and integrate that funcionality into E1000_{READ,WRITE}_REG macros. This way we can get rid of all those if (hw->mac_type == e1000_igb) { .... } else { .... } snippets sprinkled all across the driver code. Signed-off-by: Andrey Smirnov <andrew.smirnov@xxxxxxxxx> --- drivers/net/e1000/eeprom.c | 10 +++------- drivers/net/e1000/main.c | 17 +++++------------ drivers/net/e1000/regio.c | 26 ++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 19 deletions(-) diff --git a/drivers/net/e1000/eeprom.c b/drivers/net/e1000/eeprom.c index 497fb7b..c2dfad5 100644 --- a/drivers/net/e1000/eeprom.c +++ b/drivers/net/e1000/eeprom.c @@ -451,14 +451,10 @@ static int32_t e1000_poll_eerd_eewr_done(struct e1000_hw *hw, int eerd) int32_t done = E1000_ERR_EEPROM; for (i = 0; i < attempts; i++) { - if (eerd == E1000_EEPROM_POLL_READ) { + if (eerd == E1000_EEPROM_POLL_READ) reg = e1000_read_reg(hw, E1000_EERD); - } else { - if (hw->mac_type == e1000_igb) - reg = e1000_read_reg(hw, E1000_I210_EEWR); - else - reg = e1000_read_reg(hw, E1000_EEWR); - } + else + reg = e1000_read_reg(hw, E1000_EEWR); if (reg & E1000_EEPROM_RW_REG_DONE) { done = E1000_SUCCESS; diff --git a/drivers/net/e1000/main.c b/drivers/net/e1000/main.c index f1055ea..4a527a3 100644 --- a/drivers/net/e1000/main.c +++ b/drivers/net/e1000/main.c @@ -1184,14 +1184,11 @@ static int32_t e1000_set_d0_lplu_state_off(struct e1000_hw *hw) if (hw->mac_type <= e1000_82547_rev_2) return E1000_SUCCESS; - if (hw->mac_type == e1000_ich8lan) { + if (hw->mac_type == e1000_ich8lan || + hw->mac_type == e1000_igb) { phy_ctrl = e1000_read_reg(hw, E1000_PHY_CTRL); phy_ctrl &= ~E1000_PHY_CTRL_D0A_LPLU; e1000_write_reg(hw, E1000_PHY_CTRL, phy_ctrl); - } else if (hw->mac_type == e1000_igb) { - phy_ctrl = e1000_read_reg(hw, E1000_I210_PHY_CTRL); - phy_ctrl &= ~E1000_PHY_CTRL_D0A_LPLU; - e1000_write_reg(hw, E1000_I210_PHY_CTRL, phy_ctrl); } else { ret_val = e1000_read_phy_reg(hw, IGP02E1000_PHY_POWER_MGMT, &phy_data); @@ -2745,13 +2742,9 @@ static int32_t e1000_get_phy_cfg_done(struct e1000_hw *hw) case e1000_82572: case e1000_igb: while (timeout) { - if (hw->mac_type == e1000_igb) { - if (e1000_read_reg(hw, E1000_I210_EEMNGCTL) & cfg_mask) - break; - } else { - if (e1000_read_reg(hw, E1000_EEMNGCTL) & cfg_mask) - break; - } + if (e1000_read_reg(hw, E1000_EEMNGCTL) & cfg_mask) + break; + mdelay(1); timeout--; } diff --git a/drivers/net/e1000/regio.c b/drivers/net/e1000/regio.c index 8c529f1..33012be 100644 --- a/drivers/net/e1000/regio.c +++ b/drivers/net/e1000/regio.c @@ -2,13 +2,39 @@ #include "e1000.h" +struct e1000_fixup_table { + uint32_t orig, fixed; +}; + +static inline uint32_t e1000_true_offset(struct e1000_hw *hw, uint32_t reg) +{ + if (hw->mac_type == e1000_igb) { + unsigned int i; + + const struct e1000_fixup_table fixup_table[] = { + { E1000_EEWR, E1000_I210_EEWR }, + { E1000_PHY_CTRL, E1000_I210_PHY_CTRL }, + { E1000_EEMNGCTL, E1000_I210_EEMNGCTL }, + }; + + for (i = 0; i < ARRAY_SIZE(fixup_table); i++) { + if (fixup_table[i].orig == reg) + return fixup_table[i].fixed; + } + } + + return reg; +} + void e1000_write_reg(struct e1000_hw *hw, uint32_t reg, uint32_t value) { + reg = e1000_true_offset(hw, reg); writel(value, hw->hw_addr + reg); } uint32_t e1000_read_reg(struct e1000_hw *hw, uint32_t reg) { + reg = e1000_true_offset(hw, reg); return readl(hw->hw_addr + reg); } -- 2.5.5 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox