Attachment 149285 Details for Bug 228825 – es2kick.patch

[patch] es2kick.patch

es2kick.patch (text/plain), 1.99 KB, created by Andy Gospodarek on 2007-03-05 20:18:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andy Gospodarek

Created: 2007-03-05 20:18:12 UTC

Size: 1.99 KB

patch

obsolete

>commit bb8e3311ef9de8e72f45f910e4a977c313c7009c
>Author: Jeff Garzik <jeff@garzik.org>
>Date:   Fri Dec 15 11:06:17 2006 -0500
>
>    e1000: workaround for the ESB2 NIC RX unit issue
>    
>    In rare occasions, ESB2 systems would end up started without the RX
>    unit being turned on. Add a check that runs post-init to work around
>    this issue.
>    
>    Originally from Jesse Brandeburg <jesse.brandeburg@intel.com>,
>    rewritten to use feature flags by me.
>    
>    Signed-off-by: Jeff Garzik <jeff@garzik.org>
>
>diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
>index 1ea556e..ea7b371 100644
>--- a/drivers/net/e1000/e1000_hw.c
>+++ b/drivers/net/e1000/e1000_hw.c
>@@ -452,6 +452,12 @@ e1000_set_mac_type(struct e1000_hw *hw)
> 	if (hw->mac_type >= e1000_82571)
> 		hw->has_manc2h = TRUE;
> 
>+	/* In rare occasions, ESB2 systems would end up started without
>+	 * the RX unit being turned on.
>+	 */
>+	if (hw->mac_type == e1000_80003es2lan)
>+		hw->rx_needs_kicking = TRUE;
>+
> 	return E1000_SUCCESS;
> }
> 
>diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h
>index 18a4ae4..f4d01e1 100644
>--- a/drivers/net/e1000/e1000_hw.h
>+++ b/drivers/net/e1000/e1000_hw.h
>@@ -1463,6 +1463,7 @@ struct e1000_hw {
> 	boolean_t		kmrn_lock_loss_workaround_disabled;
> 	boolean_t		bad_tx_carr_stats_fd;
> 	boolean_t		has_manc2h;
>+	boolean_t		rx_needs_kicking;
> };
> 
> 
>diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
>index 9c24949..343eb68 100644
>--- a/drivers/net/e1000/e1000_main.c
>+++ b/drivers/net/e1000/e1000_main.c
>@@ -2579,6 +2579,13 @@ e1000_watchdog(unsigned long data)
> 			netif_wake_queue(netdev);
> 			mod_timer(&adapter->phy_info_timer, jiffies + 2 * HZ);
> 			adapter->smartspeed = 0;
>+		} else {
>+			/* make sure the receive unit is started */
>+			if (adapter->hw.rx_needs_kicking) {
>+				struct e1000_hw *hw = &adapter->hw;
>+				uint32_t rctl = E1000_READ_REG(hw, RCTL);
>+				E1000_WRITE_REG(hw, RCTL, rctl | E1000_RCTL_EN);
>+			}
> 		}
> 	} else {
> 		if (netif_carrier_ok(netdev)) {

Actions: View | Diff

Attachments on bug 228825: 148108 | 149285 | 149828