Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f64306b authored by Divy Le Ray's avatar Divy Le Ray Committed by Jeff Garzik
Browse files

cxgb3 - eeprom read fixes 



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

Signed-off-by: default avatarDivy Le Ray <divy@chelsio.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 8c2f5fa5

drivers/net/cxgb3/t3_hw.c

+7 −1
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ struct t3_vpd { 
	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 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]];

		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,

				    ai->mdio_ops);

		if (ret)