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

Commit bba226ac authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Add support for selfboot format 1 v6 



5718 B0 and 5719 devices will use a new selfboot firmware format.  This
patch adds code to detect the new format so that bootcode versions get
reported correctly.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Reviewed-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 19f57256

drivers/net/tg3.c

+3 −0
Original line number Diff line number Diff line
@@ -12702,6 +12702,9 @@ static void __devinit tg3_read_sb_ver(struct tg3 *tp, u32 val) 
	case TG3_EEPROM_SB_REVISION_5:

		offset = TG3_EEPROM_SB_F1R5_EDH_OFF;

		break;

	case TG3_EEPROM_SB_REVISION_6:

		offset = TG3_EEPROM_SB_F1R6_EDH_OFF;

		break;

	default:

		return;

	}

drivers/net/tg3.h

+2 −0
Original line number Diff line number Diff line
@@ -1915,6 +1915,7 @@ 
#define TG3_EEPROM_SB_REVISION_3	0x00030000

#define TG3_EEPROM_SB_REVISION_4	0x00040000

#define TG3_EEPROM_SB_REVISION_5	0x00050000

#define TG3_EEPROM_SB_REVISION_6	0x00060000

#define TG3_EEPROM_MAGIC_HW		0xabcd

#define TG3_EEPROM_MAGIC_HW_MSK		0xffff
@@ -1934,6 +1935,7 @@ 
#define TG3_EEPROM_SB_F1R3_EDH_OFF	0x18

#define TG3_EEPROM_SB_F1R4_EDH_OFF	0x1c

#define TG3_EEPROM_SB_F1R5_EDH_OFF	0x20

#define TG3_EEPROM_SB_F1R6_EDH_OFF	0x4c

#define TG3_EEPROM_SB_EDH_MAJ_MASK	0x00000700

#define TG3_EEPROM_SB_EDH_MAJ_SHFT	8

#define TG3_EEPROM_SB_EDH_MIN_MASK	0x000000ff