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

Commit 165f4d1c authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

tg3: Fix the setting of the APE_HAS_NCSI flag 



The driver currently skips setting this flag if the VPD contains the
firmware version string.  We fix this by separating the probing of NCSI
from the reading of the NCSI version string.  The APE_HAS_NCSI flag is
needed to properly read sensor data.

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5a308f40

drivers/net/ethernet/broadcom/tg3.c

+21 −21
Original line number Diff line number Diff line
@@ -13858,14 +13858,9 @@ static void __devinit tg3_read_mgmtfw_ver(struct tg3 *tp) 
	}

}



static void __devinit tg3_read_dash_ver(struct tg3 *tp)

static void __devinit tg3_probe_ncsi(struct tg3 *tp)

{

	int vlen;

	u32 apedata;

	char *fwtype;



	if (!tg3_flag(tp, ENABLE_APE) || !tg3_flag(tp, ENABLE_ASF))

		return;



	apedata = tg3_ape_read32(tp, TG3_APE_SEG_SIG);

	if (apedata != APE_SEG_SIG_MAGIC)
@@ -13875,14 +13870,22 @@ static void __devinit tg3_read_dash_ver(struct tg3 *tp) 
	if (!(apedata & APE_FW_STATUS_READY))

		return;



	if (tg3_ape_read32(tp, TG3_APE_FW_FEATURES) & TG3_APE_FW_FEATURE_NCSI)

		tg3_flag_set(tp, APE_HAS_NCSI);

}



static void __devinit tg3_read_dash_ver(struct tg3 *tp)

{

	int vlen;

	u32 apedata;

	char *fwtype;



	apedata = tg3_ape_read32(tp, TG3_APE_FW_VERSION);



	if (tg3_ape_read32(tp, TG3_APE_FW_FEATURES) & TG3_APE_FW_FEATURE_NCSI) {

		tg3_flag_set(tp, APE_HAS_NCSI);

	if (tg3_flag(tp, APE_HAS_NCSI))

		fwtype = "NCSI";

	} else {

	else

		fwtype = "DASH";

	}



	vlen = strlen(tp->fw_ver);
@@ -13916,20 +13919,17 @@ static void __devinit tg3_read_fw_ver(struct tg3 *tp) 
		tg3_read_sb_ver(tp, val);

	else if ((val & TG3_EEPROM_MAGIC_HW_MSK) == TG3_EEPROM_MAGIC_HW)

		tg3_read_hwsb_ver(tp);

	else

		return;



	if (vpd_vers)

		goto done;



	if (tg3_flag(tp, ENABLE_ASF)) {

		if (tg3_flag(tp, ENABLE_APE)) {

		if (tg3_flag(tp, ENABLE_ASF))

			tg3_probe_ncsi(tp);

			if (!vpd_vers)

				tg3_read_dash_ver(tp);

	} else if (tg3_flag(tp, ENABLE_ASF)) {

		} else if (!vpd_vers) {

			tg3_read_mgmtfw_ver(tp);

		}

	}



done:

	tp->fw_ver[TG3_VER_SIZE - 1] = 0;

}