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

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

tg3: Add support for 2 new selfboot formats 



This patch adds new offsets to the bootcode version extraction code to
support NVRAM format versions 4 and 5.

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 d1101142

drivers/net/tg3.c

+6 −0
Original line number Diff line number Diff line
@@ -12753,6 +12753,12 @@ static void __devinit tg3_read_sb_ver(struct tg3 *tp, u32 val) 
	case TG3_EEPROM_SB_REVISION_3:

		offset = TG3_EEPROM_SB_F1R3_EDH_OFF;

		break;

	case TG3_EEPROM_SB_REVISION_4:

		offset = TG3_EEPROM_SB_F1R4_EDH_OFF;

		break;

	case TG3_EEPROM_SB_REVISION_5:

		offset = TG3_EEPROM_SB_F1R5_EDH_OFF;

		break;

	default:

		return;

	}

drivers/net/tg3.h

+4 −0
Original line number Diff line number Diff line
@@ -1864,6 +1864,8 @@ 
#define TG3_EEPROM_SB_REVISION_0	0x00000000

#define TG3_EEPROM_SB_REVISION_2	0x00020000

#define TG3_EEPROM_SB_REVISION_3	0x00030000

#define TG3_EEPROM_SB_REVISION_4	0x00040000

#define TG3_EEPROM_SB_REVISION_5	0x00050000

#define TG3_EEPROM_MAGIC_HW		0xabcd

#define TG3_EEPROM_MAGIC_HW_MSK		0xffff
@@ -1881,6 +1883,8 @@ 
#define TG3_EEPROM_SB_F1R2_EDH_OFF	0x14

#define TG3_EEPROM_SB_F1R2_MBA_OFF	0x10

#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_EDH_MAJ_MASK	0x00000700

#define TG3_EEPROM_SB_EDH_MAJ_SHFT	8

#define TG3_EEPROM_SB_EDH_MIN_MASK	0x000000ff