recent bge(4) changes causing problems

[Pyun YongHyeon]

On Mon, Oct 11, 2010 at 05:26:21PM -0700, Steve Kargl wrote:
> On Mon, Oct 11, 2010 at 05:15:10PM -0700, Steve Kargl wrote:
> > On Mon, Oct 11, 2010 at 05:09:27PM -0700, Pyun YongHyeon wrote:
> > > On Mon, Oct 11, 2010 at 05:02:16PM -0700, Steve Kargl wrote:
> > > > 
> > > > troutmask:sgk[204] ping hpc
> > > > PING hpc.apl.washington.edu (10.208.78.111): 56 data bytes
> > > > ping: sendto: No buffer space available
> > > > ping: sendto: No buffer space available
> > > > ping: sendto: No buffer space available
> > > > ping: sendto: No buffer space available
> > > > 
> > > 
> > > Would you show me the revision number of if_bge.c/if_bgereg.h?
> > > %cd /usr/src/sys/dev/bge
> > > %ident if_bge.c if_bgereg.h
> > > 
> > 
> > if_bge.c:
> >  $FreeBSD: head/sys/dev/bge/if_bge.c 213587 2010-10-08 17:58:07Z yongari $
> > 
> > if_bgereg.h:
> >  $FreeBSD: head/sys/dev/bge/if_bgereg.h 213486 2010-10-06 17:47:13Z yongari 
> 
> Note, my old kernel which works fine shows
> 
> troutmask:kargl[202] ident /boot/sgk/kernel | grep bge
>    $FreeBSD: head/sys/dev/bge/if_bge.c 211596 2010-08-22 01:39:09Z yongari $
> 

Thanks for the info. I still suspect r213495 might break BCM5704.
Due to lack of BCM5704 I still couldn't test it except guessing.
How about attached one?
-------------- next part --------------
Index: sys/dev/bge/if_bge.c
===================================================================
--- sys/dev/bge/if_bge.c	(revision 213711)
+++ sys/dev/bge/if_bge.c	(working copy)
@@ -1736,7 +1736,8 @@
 		RCB_WRITE_4(sc, vrcb, bge_hostaddr.bge_addr_hi, 0);
 		RCB_WRITE_4(sc, vrcb, bge_hostaddr.bge_addr_lo, 0);
 		RCB_WRITE_4(sc, vrcb, bge_maxlen_flags,
-		    BGE_RCB_FLAG_RING_DISABLED);
+		    BGE_RCB_MAXLEN_FLAGS(sc->bge_return_ring_cnt,
+		    BGE_RCB_FLAG_RING_DISABLED));
 		RCB_WRITE_4(sc, vrcb, bge_nicaddr, 0);
 		bge_writembx(sc, BGE_MBX_RX_CONS0_LO +
 		    (i * (sizeof(uint64_t))), 0);