From owner-svn-src-stable-7@FreeBSD.ORG  Mon Nov  8 20:16:42 2010
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EDA18106566C;
	Mon,  8 Nov 2010 20:16:42 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DB6A78FC22;
	Mon,  8 Nov 2010 20:16:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oA8KGgsI051027;
	Mon, 8 Nov 2010 20:16:42 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oA8KGgGG051025;
	Mon, 8 Nov 2010 20:16:42 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201011082016.oA8KGgGG051025@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Mon, 8 Nov 2010 20:16:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215004 - stable/7/sys/dev/alc
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Nov 2010 20:16:43 -0000

Author: yongari
Date: Mon Nov  8 20:16:42 2010
New Revision: 215004
URL: http://svn.freebsd.org/changeset/base/215004

Log:
  MFC r214542:
    Don't bother to enable ASPM L1 to save more power. Even though I am
    not able to trigger the issue with sample boards, some users seems
    to suffer from freeze/lockup when system is booted without UTP cable
    plugged in. I'm not sure whether this is BIOS issue or controller
    bug. This change fixes AR8132 lockup issue seen on EEE PC.
  
    Reported by:	kmoore
    Tested by:	kmoore

Modified:
  stable/7/sys/dev/alc/if_alc.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/alc/if_alc.c
==============================================================================
--- stable/7/sys/dev/alc/if_alc.c	Mon Nov  8 20:14:38 2010	(r215003)
+++ stable/7/sys/dev/alc/if_alc.c	Mon Nov  8 20:16:42 2010	(r215004)
@@ -331,8 +331,8 @@ alc_miibus_statchg(device_t dev)
 		reg = CSR_READ_4(sc, ALC_MAC_CFG);
 		reg |= MAC_CFG_TX_ENB | MAC_CFG_RX_ENB;
 		CSR_WRITE_4(sc, ALC_MAC_CFG, reg);
+		alc_aspm(sc, IFM_SUBTYPE(mii->mii_media_active));
 	}
-	alc_aspm(sc, IFM_SUBTYPE(mii->mii_media_active));
 }
 
 static void