lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cxgb3 - eeprom read fixes

Browse Source 
Protect against invalid phy entries in the eeprom.
Extend eeprom access timeout.

Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Divy Le Ray
2008-11-09 00:55:28 -08:00
committed by Jeff Garzik
parent 8c2f5fa51e
commit 9f64306b8a
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/cxgb3/t3_hw.c
View File

@@ -572,7 +572,7 @@ struct t3_vpd {
u32 pad; /* for multiple-of-4 sizing and alignment */ u32 pad; /* for multiple-of-4 sizing and alignment */
}; };
#define EEPROM_MAX_POLL 4 #define EEPROM_MAX_POLL 40
#define EEPROM_STAT_ADDR 0x4000 #define EEPROM_STAT_ADDR 0x4000
#define VPD_BASE 0xc00 #define VPD_BASE 0xc00
@@ -3690,6 +3690,12 @@ int t3_prep_adapter(struct adapter *adapter, const struct adapter_info *ai,
; ;
pti = &port_types[adapter->params.vpd.port_type[j]]; pti = &port_types[adapter->params.vpd.port_type[j]];
if (!pti->phy_prep) {
CH_ALERT(adapter, "Invalid port type index %d\n",
adapter->params.vpd.port_type[j]);
return -EINVAL;
}
ret = pti->phy_prep(&p->phy, adapter, ai->phy_base_addr + j, ret = pti->phy_prep(&p->phy, adapter, ai->phy_base_addr + j,
ai->mdio_ops); ai->mdio_ops);
if (ret) if (ret)