From owner-svn-src-all@FreeBSD.ORG Mon Dec 13 17:05:07 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 20CAC1065674; Mon, 13 Dec 2010 17:05:07 +0000 (UTC) (envelope-from c.jayachandran@gmail.com) Received: from mail-ew0-f51.google.com (mail-ew0-f51.google.com [209.85.215.51]) by mx1.freebsd.org (Postfix) with ESMTP id 86CD68FC1A; Mon, 13 Dec 2010 17:05:05 +0000 (UTC) Received: by ewy19 with SMTP id 19so4223786ewy.10 for ; Mon, 13 Dec 2010 09:05:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:sender:received :in-reply-to:references:date:x-google-sender-auth:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=KpWcbJT8oTzg2XK13LoHd7vd0puX7Ve3VQlpESSNoM4=; b=DvoWwLQpQkEhJq0b2dhqnfE71pSAA2cjQnMYQqTkr6AlL6nfRanLoXzQJndL+oY9is L7kYB11Y7XHWC7GXRMg0fwGEY2mzd5wJJ4wvHZ1whwBPhpUpIXb80KyTJHVB0vAI7W2L 5TwE96aysU4R+Nhy+o9jVqgZ8zBkcobhOrhNI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=XiBO3p8i/92hjAyunx8uSt9yrYTX/LGseZfs6czlB58hq8rMTfLd6D5iqAcJJLjgj7 gGP09Qu9PNe/gPYTSi108sayc7O5/YGLAFmVfth5JvBv+qZKQCx72inRFCvecXy9FkjU ghiWlqCBe3cqYNuWbYHiEZCz/2HKqm8jqPzTU= MIME-Version: 1.0 Received: by 10.213.28.144 with SMTP id m16mr4091590ebc.95.1292254253570; Mon, 13 Dec 2010 07:30:53 -0800 (PST) Sender: c.jayachandran@gmail.com Received: by 10.213.14.147 with HTTP; Mon, 13 Dec 2010 07:30:53 -0800 (PST) In-Reply-To: <201012130747.52865.jhb@freebsd.org> References: <201012111021.oBBALcrV004450@svn.freebsd.org> <201012130747.52865.jhb@freebsd.org> Date: Mon, 13 Dec 2010 21:00:53 +0530 X-Google-Sender-Auth: t2I4q-Nkd9IrPzbYB8dKcEtftjs Message-ID: From: "Jayachandran C." To: John Baldwin , Andriy Gapon Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r216375 - head/sys/mips/rmi/dev/xlr X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Dec 2010 17:05:07 -0000 On Mon, Dec 13, 2010 at 6:17 PM, John Baldwin wrote: > On Saturday, December 11, 2010 5:21:38 am Andriy Gapon wrote: >> Author: avg >> Date: Sat Dec 11 10:21:38 2010 >> New Revision: 216375 >> URL: http://svn.freebsd.org/changeset/base/216375 >> >> Log: >> =A0 fix atomic_set_xxx misuse in rge >> >> =A0 It seems that atomic_set_xxx and atomic_store_xxx were confused. >> >> =A0 Reviewed by: =A0 =A0 =A0 =A0jhb (general issue) >> =A0 MFC after: =A03 weeks >> >> Modified: >> =A0 head/sys/mips/rmi/dev/xlr/rge.c >> >> Modified: head/sys/mips/rmi/dev/xlr/rge.c >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/sys/mips/rmi/dev/xlr/rge.c =A0 Sat Dec 11 10:18:05 2010 =A0 =A0= =A0 =A0(r216374) >> +++ head/sys/mips/rmi/dev/xlr/rge.c =A0 Sat Dec 11 10:21:38 2010 =A0 =A0= =A0 =A0(r216375) >> @@ -170,7 +170,7 @@ extern uint32_t cpu_ltop_map[32]; >> =A0static int port_counters[4][8] __aligned(XLR_CACHELINE_SIZE); >> >> =A0#define port_inc_counter(port, counter) =A0 =A0 =A0atomic_add_int(&po= rt_counters[port][(counter)], 1) >> -#define port_set_counter(port, counter, value) =A0 =A0 =A0 atomic_set_i= nt(&port_counters[port][(counter)], (value)) >> +#define port_set_counter(port, counter, value) =A0 =A0 =A0 atomic_store= _int(&port_counters[port][(counter)], (value)) >> =A0#else >> =A0#define port_inc_counter(port, counter) =A0 =A0 =A0/* Nothing */ >> =A0#define port_set_counter(port, counter, value) =A0 =A0 =A0 /* Nothing= */ >> @@ -2281,7 +2281,7 @@ rmi_xlr_mac_open(struct rge_softc *sc) >> =A0 =A0 =A0 mtx_unlock_spin(&priv->lock); >> >> =A0 =A0 =A0 for (i =3D 0; i < 8; i++) { >> - =A0 =A0 =A0 =A0 =A0 =A0 atomic_set_int(&(priv->frin_to_be_sent[i]), 0)= ; >> + =A0 =A0 =A0 =A0 =A0 =A0 atomic_store_int(&(priv->frin_to_be_sent[i]), = 0); > > Err, there is no such op for this. =A0If you don't need a memory barrier = then a > simple assignment to 0 should suffice. This is the deprecated driver for the XLR's on-chip network interface. There is a new driver for this, so you can ignore problems in this file - it should be removed soon. Thanks, JC