From owner-svn-src-head@FreeBSD.ORG Wed May 20 05:28:08 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9091D1065679; Wed, 20 May 2009 05:28:08 +0000 (UTC) (envelope-from pyunyh@gmail.com) Received: from rv-out-0506.google.com (rv-out-0506.google.com [209.85.198.238]) by mx1.freebsd.org (Postfix) with ESMTP id 482AC8FC13; Wed, 20 May 2009 05:28:08 +0000 (UTC) (envelope-from pyunyh@gmail.com) Received: by rv-out-0506.google.com with SMTP id k40so91579rvb.43 for ; Tue, 19 May 2009 22:28:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:from:date:to:cc :subject:message-id:reply-to:references:mime-version:content-type :content-disposition:in-reply-to:user-agent; bh=qsvtSvU8hTQXvMrdSHdQmaS4UaZ3UfSZM3Df19t+6+M=; b=cZ5rht1vSGq50cf4b1s06qpI+pOAUjL9Zsk4cAy5CIhklUTW6+HwvYNCQW3h6z5/3E RF+gFfNfs2cznEFFM/BeP/YjQsCUuyLJiR9XNZsCy2RrI8nF8ePQnaIWFy24fP0bkmwZ JEs4G7kogvBUaLZMtBxapDXycRWi+Va2c4QwI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:date:to:cc:subject:message-id:reply-to:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=OyodRXyZF+LBCjXmWAOKOb6Dj7cD1QFyn5lFynjUjlq3KzI/lvq7HlyXeSh3GxFNh1 NRqEEmKGvCn3Jao7a4iWN3/NNlNRk2OGnI3PqPOaZ43NuBNWGW0e0n37hhvYuRRbQfZN OO/W3N0/lcp6Yegw72Gb1Z5ZDBNVG2oOyF04Q= Received: by 10.140.126.19 with SMTP id y19mr340558rvc.75.1242797287984; Tue, 19 May 2009 22:28:07 -0700 (PDT) Received: from michelle.cdnetworks.co.kr ([114.111.62.249]) by mx.google.com with ESMTPS id k41sm2251618rvb.57.2009.05.19.22.28.05 (version=SSLv3 cipher=RC4-MD5); Tue, 19 May 2009 22:28:07 -0700 (PDT) Received: by michelle.cdnetworks.co.kr (sSMTP sendmail emulation); Wed, 20 May 2009 14:38:02 +0900 From: Pyun YongHyeon Date: Wed, 20 May 2009 14:38:02 +0900 To: Andrew Thompson Message-ID: <20090520053801.GG9043@michelle.cdnetworks.co.kr> References: <200905200333.n4K3XRKj017947@svn.freebsd.org> <20090520052401.GL78829@citylink.fud.org.nz> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090520052401.GL78829@citylink.fud.org.nz> User-Agent: Mutt/1.4.2.3i Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Pyun YongHyeon Subject: Re: svn commit: r192418 - head/sys/dev/age X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: pyunyh@gmail.com List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 May 2009 05:28:09 -0000 On Tue, May 19, 2009 at 10:24:01PM -0700, Andrew Thompson wrote: > On Wed, May 20, 2009 at 03:33:27AM +0000, Pyun YongHyeon wrote: > > Author: yongari > > Date: Wed May 20 03:33:27 2009 > > New Revision: 192418 > > URL: http://svn.freebsd.org/changeset/base/192418 > > > > Log: > > pci(4) handles PCIM_CMD_INTxDIS so there is no need to poke this > > bit in driver. > > > > Modified: > > head/sys/dev/age/if_age.c > > > > Modified: head/sys/dev/age/if_age.c > > ============================================================================== > > --- head/sys/dev/age/if_age.c Wed May 20 03:28:35 2009 (r192417) > > +++ head/sys/dev/age/if_age.c Wed May 20 03:33:27 2009 (r192418) > > @@ -1477,23 +1477,11 @@ age_resume(device_t dev) > > { > > struct age_softc *sc; > > struct ifnet *ifp; > > - uint16_t cmd; > > > > sc = device_get_softc(dev); > > > > AGE_LOCK(sc); > > - /* > > - * Clear INTx emulation disable for hardwares that > > - * is set in resume event. From Linux. > > - */ > > - cmd = pci_read_config(sc->age_dev, PCIR_COMMAND, 2); > > - if ((cmd & 0x0400) != 0) { > > - cmd &= ~0x0400; > > - pci_write_config(sc->age_dev, PCIR_COMMAND, cmd, 2); > > - } > > - AGE_UNLOCK(sc); > > age_phy_reset(sc); > > - AGE_LOCK(sc); > > ifp = sc->age_ifp; > > age_phy_reset() was previously called unlocked and is now the opposite, > is this intended? > Yes, age_phy_reset() used to call pause(9) but the call was removed.