Skip to content

L
linux
Commit 0ee69c6a authored by David S. Miller's avatar David S. Miller
Browse files
Options

[TG3]: Always check tg3_readphy() return value. 

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 547b39b5
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 54 deletions
drivers/net/tg3.c
View file @ 0ee69c6a
...@@ -591,9 +591,10 @@ static void tg3_phy_set_wirespeed(struct tg3 *tp) ...@@ -591,9 +591,10 @@ static void tg3_phy_set_wirespeed(struct tg3 *tp)
if (tp->tg3_flags2 & TG3_FLG2_NO_ETH_WIRE_SPEED) if (tp->tg3_flags2 & TG3_FLG2_NO_ETH_WIRE_SPEED)
return; return;
tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x7007); if (!tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x7007) &&
tg3_readphy(tp, MII_TG3_AUX_CTRL, &val); !tg3_readphy(tp, MII_TG3_AUX_CTRL, &val))
tg3_writephy(tp, MII_TG3_AUX_CTRL, (val | (1 << 15) | (1 << 4))); tg3_writephy(tp, MII_TG3_AUX_CTRL,
(val | (1 << 15) | (1 << 4)));
} }
static int tg3_bmcr_reset(struct tg3 *tp) static int tg3_bmcr_reset(struct tg3 *tp)
...@@ -634,9 +635,10 @@ static int tg3_wait_macro_done(struct tg3 *tp) ...@@ -634,9 +635,10 @@ static int tg3_wait_macro_done(struct tg3 *tp)
while (limit--) { while (limit--) {
u32 tmp32; u32 tmp32;
tg3_readphy(tp, 0x16, &tmp32); if (!tg3_readphy(tp, 0x16, &tmp32)) {
if ((tmp32 & 0x1000) == 0) if ((tmp32 & 0x1000) == 0)
break; break;
}
} }
if (limit <= 0) if (limit <= 0)
return -EBUSY; return -EBUSY;
...@@ -688,9 +690,9 @@ static int tg3_phy_write_and_check_testpat(struct tg3 *tp, int *resetp) ...@@ -688,9 +690,9 @@ static int tg3_phy_write_and_check_testpat(struct tg3 *tp, int *resetp)
for (i = 0; i < 6; i += 2) { for (i = 0; i < 6; i += 2) {
u32 low, high; u32 low, high;
tg3_readphy(tp, MII_TG3_DSP_RW_PORT, &low); if (tg3_readphy(tp, MII_TG3_DSP_RW_PORT, &low) ||
tg3_readphy(tp, MII_TG3_DSP_RW_PORT, &high); tg3_readphy(tp, MII_TG3_DSP_RW_PORT, &high) ||
if (tg3_wait_macro_done(tp)) { tg3_wait_macro_done(tp)) {
*resetp = 1; *resetp = 1;
return -EBUSY; return -EBUSY;
} }
...@@ -746,7 +748,9 @@ static int tg3_phy_reset_5703_4_5(struct tg3 *tp) ...@@ -746,7 +748,9 @@ static int tg3_phy_reset_5703_4_5(struct tg3 *tp)
} }
/* Disable transmitter and interrupt. */ /* Disable transmitter and interrupt. */
tg3_readphy(tp, MII_TG3_EXT_CTRL, &reg32); if (tg3_readphy(tp, MII_TG3_EXT_CTRL, &reg32))
continue;
reg32 |= 0x3000; reg32 |= 0x3000;
tg3_writephy(tp, MII_TG3_EXT_CTRL, reg32); tg3_writephy(tp, MII_TG3_EXT_CTRL, reg32);
...@@ -755,7 +759,9 @@ static int tg3_phy_reset_5703_4_5(struct tg3 *tp) ...@@ -755,7 +759,9 @@ static int tg3_phy_reset_5703_4_5(struct tg3 *tp)
BMCR_FULLDPLX | TG3_BMCR_SPEED1000); BMCR_FULLDPLX | TG3_BMCR_SPEED1000);
/* Set to master mode. */ /* Set to master mode. */
tg3_readphy(tp, MII_TG3_CTRL, &phy9_orig); if (tg3_readphy(tp, MII_TG3_CTRL, &phy9_orig))
continue;
tg3_writephy(tp, MII_TG3_CTRL, tg3_writephy(tp, MII_TG3_CTRL,
(MII_TG3_CTRL_AS_MASTER | (MII_TG3_CTRL_AS_MASTER |
MII_TG3_CTRL_ENABLE_AS_MASTER)); MII_TG3_CTRL_ENABLE_AS_MASTER));
...@@ -793,9 +799,11 @@ static int tg3_phy_reset_5703_4_5(struct tg3 *tp) ...@@ -793,9 +799,11 @@ static int tg3_phy_reset_5703_4_5(struct tg3 *tp)
tg3_writephy(tp, MII_TG3_CTRL, phy9_orig); tg3_writephy(tp, MII_TG3_CTRL, phy9_orig);
tg3_readphy(tp, MII_TG3_EXT_CTRL, &reg32); if (!tg3_readphy(tp, MII_TG3_EXT_CTRL, &reg32)) {
reg32 &= ~0x3000; reg32 &= ~0x3000;
tg3_writephy(tp, MII_TG3_EXT_CTRL, reg32); tg3_writephy(tp, MII_TG3_EXT_CTRL, reg32);
} else if (!err)
err = -EBUSY;
return err; return err;
} }
...@@ -859,9 +867,9 @@ static int tg3_phy_reset(struct tg3 *tp) ...@@ -859,9 +867,9 @@ static int tg3_phy_reset(struct tg3 *tp)
u32 phy_reg; u32 phy_reg;
/* Set bit 14 with read-modify-write to preserve other bits */ /* Set bit 14 with read-modify-write to preserve other bits */
tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0007); if (!tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0007) &&
tg3_readphy(tp, MII_TG3_AUX_CTRL, &phy_reg); !tg3_readphy(tp, MII_TG3_AUX_CTRL, &phy_reg))
tg3_writephy(tp, MII_TG3_AUX_CTRL, phy_reg | 0x4000); tg3_writephy(tp, MII_TG3_AUX_CTRL, phy_reg | 0x4000);
} }
tg3_phy_set_wirespeed(tp); tg3_phy_set_wirespeed(tp);
return 0; return 0;
...@@ -1244,7 +1252,7 @@ static void tg3_aux_stat_to_speed_duplex(struct tg3 *tp, u32 val, u16 *speed, u8 ...@@ -1244,7 +1252,7 @@ static void tg3_aux_stat_to_speed_duplex(struct tg3 *tp, u32 val, u16 *speed, u8
}; };
} }
static int tg3_phy_copper_begin(struct tg3 *tp) static void tg3_phy_copper_begin(struct tg3 *tp)
{ {
u32 new_adv; u32 new_adv;
int i; int i;
...@@ -1359,15 +1367,16 @@ static int tg3_phy_copper_begin(struct tg3 *tp) ...@@ -1359,15 +1367,16 @@ static int tg3_phy_copper_begin(struct tg3 *tp)
if (tp->link_config.duplex == DUPLEX_FULL) if (tp->link_config.duplex == DUPLEX_FULL)
bmcr |= BMCR_FULLDPLX; bmcr |= BMCR_FULLDPLX;
tg3_readphy(tp, MII_BMCR, &orig_bmcr); if (!tg3_readphy(tp, MII_BMCR, &orig_bmcr) &&
if (bmcr != orig_bmcr) { (bmcr != orig_bmcr)) {
tg3_writephy(tp, MII_BMCR, BMCR_LOOPBACK); tg3_writephy(tp, MII_BMCR, BMCR_LOOPBACK);
for (i = 0; i < 1500; i++) { for (i = 0; i < 1500; i++) {
u32 tmp; u32 tmp;
udelay(10); udelay(10);
tg3_readphy(tp, MII_BMSR, &tmp); if (tg3_readphy(tp, MII_BMSR, &tmp) ||
tg3_readphy(tp, MII_BMSR, &tmp); tg3_readphy(tp, MII_BMSR, &tmp))
continue;
if (!(tmp & BMSR_LSTATUS)) { if (!(tmp & BMSR_LSTATUS)) {
udelay(40); udelay(40);
break; break;
...@@ -1380,8 +1389,6 @@ static int tg3_phy_copper_begin(struct tg3 *tp) ...@@ -1380,8 +1389,6 @@ static int tg3_phy_copper_begin(struct tg3 *tp)
tg3_writephy(tp, MII_BMCR, tg3_writephy(tp, MII_BMCR,
BMCR_ANENABLE | BMCR_ANRESTART); BMCR_ANENABLE | BMCR_ANRESTART);
} }
return 0;
} }
static int tg3_init_5401phy_dsp(struct tg3 *tp) static int tg3_init_5401phy_dsp(struct tg3 *tp)
...@@ -1416,7 +1423,9 @@ static int tg3_copper_is_advertising_all(struct tg3 *tp) ...@@ -1416,7 +1423,9 @@ static int tg3_copper_is_advertising_all(struct tg3 *tp)
{ {
u32 adv_reg, all_mask; u32 adv_reg, all_mask;
tg3_readphy(tp, MII_ADVERTISE, &adv_reg); if (tg3_readphy(tp, MII_ADVERTISE, &adv_reg))
return 0;
all_mask = (ADVERTISE_10HALF | ADVERTISE_10FULL | all_mask = (ADVERTISE_10HALF | ADVERTISE_10FULL |
ADVERTISE_100HALF | ADVERTISE_100FULL); ADVERTISE_100HALF | ADVERTISE_100FULL);
if ((adv_reg & all_mask) != all_mask) if ((adv_reg & all_mask) != all_mask)
...@@ -1424,7 +1433,9 @@ static int tg3_copper_is_advertising_all(struct tg3 *tp) ...@@ -1424,7 +1433,9 @@ static int tg3_copper_is_advertising_all(struct tg3 *tp)
if (!(tp->tg3_flags & TG3_FLAG_10_100_ONLY)) { if (!(tp->tg3_flags & TG3_FLAG_10_100_ONLY)) {
u32 tg3_ctrl; u32 tg3_ctrl;
tg3_readphy(tp, MII_TG3_CTRL, &tg3_ctrl); if (tg3_readphy(tp, MII_TG3_CTRL, &tg3_ctrl))
return 0;
all_mask = (MII_TG3_CTRL_ADV_1000_HALF | all_mask = (MII_TG3_CTRL_ADV_1000_HALF |
MII_TG3_CTRL_ADV_1000_FULL); MII_TG3_CTRL_ADV_1000_FULL);
if ((tg3_ctrl & all_mask) != all_mask) if ((tg3_ctrl & all_mask) != all_mask)
...@@ -1464,8 +1475,8 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset) ...@@ -1464,8 +1475,8 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset)
GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) && GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) &&
netif_carrier_ok(tp->dev)) { netif_carrier_ok(tp->dev)) {
tg3_readphy(tp, MII_BMSR, &bmsr); tg3_readphy(tp, MII_BMSR, &bmsr);
tg3_readphy(tp, MII_BMSR, &bmsr); if (!tg3_readphy(tp, MII_BMSR, &bmsr) &&
if (!(bmsr & BMSR_LSTATUS)) !(bmsr & BMSR_LSTATUS))
force_reset = 1; force_reset = 1;
} }
if (force_reset) if (force_reset)
...@@ -1473,9 +1484,8 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset) ...@@ -1473,9 +1484,8 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset)
if ((tp->phy_id & PHY_ID_MASK) == PHY_ID_BCM5401) { if ((tp->phy_id & PHY_ID_MASK) == PHY_ID_BCM5401) {
tg3_readphy(tp, MII_BMSR, &bmsr); tg3_readphy(tp, MII_BMSR, &bmsr);
tg3_readphy(tp, MII_BMSR, &bmsr); if (tg3_readphy(tp, MII_BMSR, &bmsr) ||
!(tp->tg3_flags & TG3_FLAG_INIT_COMPLETE))
if (!(tp->tg3_flags & TG3_FLAG_INIT_COMPLETE))
bmsr = 0; bmsr = 0;
if (!(bmsr & BMSR_LSTATUS)) { if (!(bmsr & BMSR_LSTATUS)) {
...@@ -1486,8 +1496,8 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset) ...@@ -1486,8 +1496,8 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset)
tg3_readphy(tp, MII_BMSR, &bmsr); tg3_readphy(tp, MII_BMSR, &bmsr);
for (i = 0; i < 1000; i++) { for (i = 0; i < 1000; i++) {
udelay(10); udelay(10);
tg3_readphy(tp, MII_BMSR, &bmsr); if (!tg3_readphy(tp, MII_BMSR, &bmsr) &&
if (bmsr & BMSR_LSTATUS) { (bmsr & BMSR_LSTATUS)) {
udelay(40); udelay(40);
break; break;
} }
...@@ -1549,8 +1559,8 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset) ...@@ -1549,8 +1559,8 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset)
bmsr = 0; bmsr = 0;
for (i = 0; i < 100; i++) { for (i = 0; i < 100; i++) {
tg3_readphy(tp, MII_BMSR, &bmsr); tg3_readphy(tp, MII_BMSR, &bmsr);
tg3_readphy(tp, MII_BMSR, &bmsr); if (!tg3_readphy(tp, MII_BMSR, &bmsr) &&
if (bmsr & BMSR_LSTATUS) (bmsr & BMSR_LSTATUS))
break; break;
udelay(40); udelay(40);
} }
...@@ -1561,8 +1571,8 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset) ...@@ -1561,8 +1571,8 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset)
tg3_readphy(tp, MII_TG3_AUX_STAT, &aux_stat); tg3_readphy(tp, MII_TG3_AUX_STAT, &aux_stat);
for (i = 0; i < 2000; i++) { for (i = 0; i < 2000; i++) {
udelay(10); udelay(10);
tg3_readphy(tp, MII_TG3_AUX_STAT, &aux_stat); if (!tg3_readphy(tp, MII_TG3_AUX_STAT, &aux_stat) &&
if (aux_stat) aux_stat)
break; break;
} }
...@@ -1573,7 +1583,8 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset) ...@@ -1573,7 +1583,8 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset)
bmcr = 0; bmcr = 0;
for (i = 0; i < 200; i++) { for (i = 0; i < 200; i++) {
tg3_readphy(tp, MII_BMCR, &bmcr); tg3_readphy(tp, MII_BMCR, &bmcr);
tg3_readphy(tp, MII_BMCR, &bmcr); if (tg3_readphy(tp, MII_BMCR, &bmcr))
continue;
if (bmcr && bmcr != 0x7fff) if (bmcr && bmcr != 0x7fff)
break; break;
udelay(10); udelay(10);
...@@ -1610,10 +1621,13 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset) ...@@ -1610,10 +1621,13 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset)
(tp->link_config.autoneg == AUTONEG_ENABLE)) { (tp->link_config.autoneg == AUTONEG_ENABLE)) {
u32 local_adv, remote_adv; u32 local_adv, remote_adv;
tg3_readphy(tp, MII_ADVERTISE, &local_adv); if (tg3_readphy(tp, MII_ADVERTISE, &local_adv))
local_adv = 0;
local_adv &= (ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM); local_adv &= (ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM);
tg3_readphy(tp, MII_LPA, &remote_adv); if (tg3_readphy(tp, MII_LPA, &remote_adv))
remote_adv = 0;
remote_adv &= (LPA_PAUSE_CAP | LPA_PAUSE_ASYM); remote_adv &= (LPA_PAUSE_CAP | LPA_PAUSE_ASYM);
/* If we are not advertising full pause capability, /* If we are not advertising full pause capability,
...@@ -1632,8 +1646,8 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset) ...@@ -1632,8 +1646,8 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset)
tg3_phy_copper_begin(tp); tg3_phy_copper_begin(tp);
tg3_readphy(tp, MII_BMSR, &tmp); tg3_readphy(tp, MII_BMSR, &tmp);
tg3_readphy(tp, MII_BMSR, &tmp); if (!tg3_readphy(tp, MII_BMSR, &tmp) &&
if (tmp & BMSR_LSTATUS) (tmp & BMSR_LSTATUS))
current_link_up = 1; current_link_up = 1;
} }
...@@ -5441,9 +5455,10 @@ static int tg3_reset_hw(struct tg3 *tp) ...@@ -5441,9 +5455,10 @@ static int tg3_reset_hw(struct tg3 *tp)
u32 tmp; u32 tmp;
/* Clear CRC stats. */ /* Clear CRC stats. */
tg3_readphy(tp, 0x1e, &tmp); if (!tg3_readphy(tp, 0x1e, &tmp)) {
tg3_writephy(tp, 0x1e, tmp | 0x8000); tg3_writephy(tp, 0x1e, tmp | 0x8000);
tg3_readphy(tp, 0x14, &tmp); tg3_readphy(tp, 0x14, &tmp);
}
} }
__tg3_set_rx_mode(tp->dev); __tg3_set_rx_mode(tp->dev);
...@@ -6033,9 +6048,11 @@ static unsigned long calc_crc_errors(struct tg3 *tp) ...@@ -6033,9 +6048,11 @@ static unsigned long calc_crc_errors(struct tg3 *tp)
u32 val; u32 val;
spin_lock_irqsave(&tp->lock, flags); spin_lock_irqsave(&tp->lock, flags);
tg3_readphy(tp, 0x1e, &val); if (!tg3_readphy(tp, 0x1e, &val)) {
tg3_writephy(tp, 0x1e, val | 0x8000); tg3_writephy(tp, 0x1e, val | 0x8000);
tg3_readphy(tp, 0x14, &val); tg3_readphy(tp, 0x14, &val);
} else
val = 0;
spin_unlock_irqrestore(&tp->lock, flags); spin_unlock_irqrestore(&tp->lock, flags);
tp->phy_crc_errors += val; tp->phy_crc_errors += val;
...@@ -6651,10 +6668,10 @@ static int tg3_nway_reset(struct net_device *dev) ...@@ -6651,10 +6668,10 @@ static int tg3_nway_reset(struct net_device *dev)
int r; int r;
spin_lock_irq(&tp->lock); spin_lock_irq(&tp->lock);
tg3_readphy(tp, MII_BMCR, &bmcr);
tg3_readphy(tp, MII_BMCR, &bmcr);
r = -EINVAL; r = -EINVAL;
if (bmcr & BMCR_ANENABLE) { tg3_readphy(tp, MII_BMCR, &bmcr);
if (!tg3_readphy(tp, MII_BMCR, &bmcr) &&
(bmcr & BMCR_ANENABLE)) {
tg3_writephy(tp, MII_BMCR, bmcr | BMCR_ANRESTART); tg3_writephy(tp, MII_BMCR, bmcr | BMCR_ANRESTART);
r = 0; r = 0;
} }
...@@ -7654,9 +7671,8 @@ static int __devinit tg3_phy_probe(struct tg3 *tp) ...@@ -7654,9 +7671,8 @@ static int __devinit tg3_phy_probe(struct tg3 *tp)
u32 bmsr, adv_reg, tg3_ctrl; u32 bmsr, adv_reg, tg3_ctrl;
tg3_readphy(tp, MII_BMSR, &bmsr); tg3_readphy(tp, MII_BMSR, &bmsr);
tg3_readphy(tp, MII_BMSR, &bmsr); if (!tg3_readphy(tp, MII_BMSR, &bmsr) &&
(bmsr & BMSR_LSTATUS))
if (bmsr & BMSR_LSTATUS)
goto skip_phy_reset; goto skip_phy_reset;
err = tg3_phy_reset(tp); err = tg3_phy_reset(tp);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7