From: Michael Brown Date: Tue, 10 Jul 2012 08:32:58 +0000 (+0100) Subject: [intel] Refill receive ring only after enabling receiver X-Git-Tag: v1.20.1~1718 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8391ff3ee00583071def824231539004cc07fecb;p=thirdparty%2Fipxe.git [intel] Refill receive ring only after enabling receiver On 82576 (and probably others), the datasheet states that "the tail register of the queue (RDT[n]) should not be bumped until the queue is enabled". There is some confusion over exactly what constitutes "enabled": the initialisation blurb says that we should "poll the RXDCTL register until the ENABLE bit is set", while the description for the RXDCTL register says that the ENABLE bit is set by default (for queue zero). Empirical evidence suggests that the ENABLE bit reads as set immediately after writing to RCTL.EN, and so polling is not necessary. Signed-off-by: Michael Brown --- diff --git a/src/drivers/net/intel.c b/src/drivers/net/intel.c index 3eb1a3779..8153e0953 100644 --- a/src/drivers/net/intel.c +++ b/src/drivers/net/intel.c @@ -491,9 +491,6 @@ static int intel_open ( struct net_device *netdev ) { if ( ( rc = intel_create_ring ( intel, &intel->rx ) ) != 0 ) goto err_create_rx; - /* Fill receive ring */ - intel_refill_rx ( intel ); - /* Program MAC address */ memset ( &mac, 0, sizeof ( mac ) ); memcpy ( mac.raw, netdev->ll_addr, sizeof ( mac.raw ) ); @@ -515,6 +512,9 @@ static int intel_open ( struct net_device *netdev ) { INTEL_RCTL_BAM | INTEL_RCTL_BSIZE_2048 | INTEL_RCTL_SECRC ); writel ( rctl, intel->regs + INTEL_RCTL ); + /* Fill receive ring */ + intel_refill_rx ( intel ); + /* Update link state */ intel_check_link ( netdev );