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

Commit 3603bc8d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/tg3-2.6

parents 68ca243d a8b554e7

drivers/net/tg3.c

+9 −4
Original line number Diff line number Diff line
@@ -68,8 +68,8 @@ 


#define DRV_MODULE_NAME		"tg3"

#define PFX DRV_MODULE_NAME	": "

#define DRV_MODULE_VERSION	"3.46"

#define DRV_MODULE_RELDATE	"Dec 19, 2005"

#define DRV_MODULE_VERSION	"3.47"

#define DRV_MODULE_RELDATE	"Dec 28, 2005"



#define TG3_DEF_MAC_MODE	0

#define TG3_DEF_RX_MODE		0
@@ -7151,8 +7151,13 @@ do { p = (u32 *)(orig_p + (reg)); \ 
	GET_REG32_LOOP(BUFMGR_MODE, 0x58);

	GET_REG32_LOOP(RDMAC_MODE, 0x08);

	GET_REG32_LOOP(WDMAC_MODE, 0x08);

	GET_REG32_LOOP(RX_CPU_BASE, 0x280);

	GET_REG32_LOOP(TX_CPU_BASE, 0x280);

	GET_REG32_1(RX_CPU_MODE);

	GET_REG32_1(RX_CPU_STATE);

	GET_REG32_1(RX_CPU_PGMCTR);

	GET_REG32_1(RX_CPU_HWBKPT);

	GET_REG32_1(TX_CPU_MODE);

	GET_REG32_1(TX_CPU_STATE);

	GET_REG32_1(TX_CPU_PGMCTR);

	GET_REG32_LOOP(GRCMBOX_INTERRUPT_0, 0x110);

	GET_REG32_LOOP(FTQ_RESET, 0x120);

	GET_REG32_LOOP(MSGINT_MODE, 0x0c);

drivers/net/tg3.h

+7 −0
Original line number Diff line number Diff line
@@ -1124,7 +1124,14 @@ 
/* 0x280 --> 0x400 unused */



#define RX_CPU_BASE			0x00005000

#define RX_CPU_MODE			0x00005000

#define RX_CPU_STATE			0x00005004

#define RX_CPU_PGMCTR			0x0000501c

#define RX_CPU_HWBKPT			0x00005034

#define TX_CPU_BASE			0x00005400

#define TX_CPU_MODE			0x00005400

#define TX_CPU_STATE			0x00005404

#define TX_CPU_PGMCTR			0x0000541c



/* Mailboxes */

#define GRCMBOX_INTERRUPT_0		0x00005800 /* 64-bit */