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

Commit 28fbef78 authored by Michael Chan's avatar Michael Chan Committed by Jeff Garzik
Browse files

[PATCH] tg3: fix ASF heartbeat 



Change the ASF heart beat to 5 seconds for faster detection of system
crash. The driver sends the heartbeat every 2 seconds and the ASF
firmware will timeout and reset the device if no heartbeat is received
after 5 seconds. The old scheme of 2 minutes is ineffective.

tg3_write_mem_fast() is added to speed up the IO to send the heartbeat.
When no workaround is needed, it will use direct MMIO to memory space
to write to memory.

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent a4e2b347

drivers/net/tg3.c

+16 −5
Original line number Original line Diff line number Diff line
@@ -470,6 +470,15 @@ static void tg3_write_mem(struct tg3 *tp, u32 off, u32 val) 
	spin_unlock_irqrestore(&tp->indirect_lock, flags);

	spin_unlock_irqrestore(&tp->indirect_lock, flags);

}

}





static void tg3_write_mem_fast(struct tg3 *tp, u32 off, u32 val)

{

	/* If no workaround is needed, write to mem space directly */

	if (tp->write32 != tg3_write_indirect_reg32)

		tw32(NIC_SRAM_WIN_BASE + off, val);

	else

		tg3_write_mem(tp, off, val);

}



static void tg3_read_mem(struct tg3 *tp, u32 off, u32 *val)

static void tg3_read_mem(struct tg3 *tp, u32 off, u32 *val)

{

{

	unsigned long flags;

	unsigned long flags;
@@ -6195,14 +6204,16 @@ static void tg3_timer(unsigned long __opaque) 
		tp->timer_counter = tp->timer_multiplier;

		tp->timer_counter = tp->timer_multiplier;

	}

	}





	/* Heartbeat is only sent once every 120 seconds.  */

	/* Heartbeat is only sent once every 2 seconds.  */

	if (!--tp->asf_counter) {

	if (!--tp->asf_counter) {

		if (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) {

		if (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) {

			u32 val;

			u32 val;





			tg3_write_mem(tp, NIC_SRAM_FW_CMD_MBOX, FWCMD_NICDRV_ALIVE);

			tg3_write_mem_fast(tp, NIC_SRAM_FW_CMD_MBOX,

			tg3_write_mem(tp, NIC_SRAM_FW_CMD_LEN_MBOX, 4);

					   FWCMD_NICDRV_ALIVE2);

			tg3_write_mem(tp, NIC_SRAM_FW_CMD_DATA_MBOX, 3);

			tg3_write_mem_fast(tp, NIC_SRAM_FW_CMD_LEN_MBOX, 4);

			/* 5 seconds timeout */

			tg3_write_mem_fast(tp, NIC_SRAM_FW_CMD_DATA_MBOX, 5);

			val = tr32(GRC_RX_CPU_EVENT);

			val = tr32(GRC_RX_CPU_EVENT);

			val |= (1 << 14);

			val |= (1 << 14);

			tw32(GRC_RX_CPU_EVENT, val);

			tw32(GRC_RX_CPU_EVENT, val);
@@ -6413,7 +6424,7 @@ static int tg3_open(struct net_device *dev) 
		tp->timer_counter = tp->timer_multiplier =

		tp->timer_counter = tp->timer_multiplier =

			(HZ / tp->timer_offset);

			(HZ / tp->timer_offset);

		tp->asf_counter = tp->asf_multiplier =

		tp->asf_counter = tp->asf_multiplier =

			((HZ / tp->timer_offset) * 120);

			((HZ / tp->timer_offset) * 2);





		init_timer(&tp->timer);

		init_timer(&tp->timer);

		tp->timer.expires = jiffies + tp->timer_offset;

		tp->timer.expires = jiffies + tp->timer_offset;

drivers/net/tg3.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -1512,6 +1512,7 @@ 
#define  FWCMD_NICDRV_IPV6ADDR_CHG	 0x00000004

#define  FWCMD_NICDRV_IPV6ADDR_CHG	 0x00000004

#define  FWCMD_NICDRV_FIX_DMAR		 0x00000005

#define  FWCMD_NICDRV_FIX_DMAR		 0x00000005

#define  FWCMD_NICDRV_FIX_DMAW		 0x00000006

#define  FWCMD_NICDRV_FIX_DMAW		 0x00000006

#define  FWCMD_NICDRV_ALIVE2		 0x0000000d

#define NIC_SRAM_FW_CMD_LEN_MBOX	0x00000b7c

#define NIC_SRAM_FW_CMD_LEN_MBOX	0x00000b7c

#define NIC_SRAM_FW_CMD_DATA_MBOX	0x00000b80

#define NIC_SRAM_FW_CMD_DATA_MBOX	0x00000b80

#define NIC_SRAM_FW_ASF_STATUS_MBOX	0x00000c00

#define NIC_SRAM_FW_ASF_STATUS_MBOX	0x00000c00