From owner-svn-src-all@FreeBSD.ORG Thu May 28 21:31:48 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EB4946BC; Thu, 28 May 2015 21:31:48 +0000 (UTC) (envelope-from ricera10@gmail.com) Received: from mail-ig0-f179.google.com (mail-ig0-f179.google.com [209.85.213.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B6D23C87; Thu, 28 May 2015 21:31:48 +0000 (UTC) (envelope-from ricera10@gmail.com) Received: by igbpi8 with SMTP id pi8so148505igb.1; Thu, 28 May 2015 14:31:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-type; bh=Wvj9ytgNa+uVg71vxSDQpPvH110dVJUxbBdnY2+BJQE=; b=aq2fYGzs/yCgb0FqJpN16gCVJ9qQWlro476QHjSyYMt+mpDaStc9AKQmS/Iuh9OE8X gQCZMDkG7txjUXqOm7MpPEAjZP10pBcwmeP45MiZi6KYw/RI1wYU3upjW/I1yMrv/UZ1 wtTQQU5waFzBBe2F8ieHBwKgySevDtXOmOctinTpccMZyhtyEsOMRW9tpSFS8FKHlAdR e9DM0I0LtIij1FnVOFLK5wlXN5KievJi594nGztgjYwdhPHvcpPKv2whuRmLh28sC1tu zOe2jtl33g32SYzifGq+Mi4dC2YTJXvMgBZ3gC6FIzm66bRCVzyv+FpKxzflJKNDWxeo PnNA== X-Received: by 10.50.103.97 with SMTP id fv1mr14033482igb.27.1432846982715; Thu, 28 May 2015 14:03:02 -0700 (PDT) Received: from mail-ie0-f176.google.com (mail-ie0-f176.google.com. [209.85.223.176]) by mx.google.com with ESMTPSA id x10sm2987708igl.0.2015.05.28.14.03.02 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2015 14:03:02 -0700 (PDT) Received: by iesa3 with SMTP id a3so48410060ies.2; Thu, 28 May 2015 14:03:02 -0700 (PDT) X-Received: by 10.50.36.72 with SMTP id o8mr13896562igj.16.1432846982287; Thu, 28 May 2015 14:03:02 -0700 (PDT) MIME-Version: 1.0 References: <201505271744.t4RHiC04024525@svn.freebsd.org> <1987595.JGalSDZ3Rh@ralph.baldwin.cx> <4977499.IGj0rLHqPU@ralph.baldwin.cx> In-Reply-To: <4977499.IGj0rLHqPU@ralph.baldwin.cx> From: Eric Joyner Date: Thu, 28 May 2015 21:03:01 +0000 Message-ID: Subject: Re: svn commit: r283620 - in stable/10/sys: amd64/conf conf dev/ixgbe modules modules/ix modules/ixv To: John Baldwin Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 28 May 2015 21:31:49 -0000 On Thu, May 28, 2015 at 9:27 AM John Baldwin wrote: > On Thursday, May 28, 2015 04:23:49 PM Eric Joyner wrote: > > Ok; I'm working on it now. I've implemented your recommendation for an > > ixgbe stub that loads both if_ix and if_ixv, but Jack offered an > > alternative of just letting sys/dev/ixgbe/Makefile make an if_ixgbe > module > > that combines if_ix and if_ixv. Looking at conf files for other > > architectures, it sounds like it would be a better idea to just do that > for > > stable/10, and completely remove the ix and ixv Makefiles and module > > directories. I don't think anyone really cares to have a separate if_ix > and > > if_ixv modules over just one if_ixgbe module. > > I probably prefer that you do actually have if_ix and if_ixv. There's > always > the ifconfig hack for NIC drivers that wants to autoload if_.ko to > consider. I think it is also more friendly to users if 10 supports both > the > old and new models as it gives them more time to transition. However, > reverting back to a single if_ixgbe.ko is also ok. > > > On Thu, May 28, 2015 at 8:49 AM John Baldwin wrote: > > > > > On Wednesday, May 27, 2015 05:44:12 PM Eric Joyner wrote: > > > > Author: erj > > > > Date: Wed May 27 17:44:11 2015 > > > > New Revision: 283620 > > > > URL: https://svnweb.freebsd.org/changeset/base/283620 > > > > > > > > Log: > > > > MFC ixgbe commits for 10.2: > > > > > > > > - r280182 - Split the driver into independent pf/vf loadables > > > > - r280197 - Resolve build issues > > > > - r280204 - Fix multiple same-name devclasses > > > > - r280228 - Fix i386 LINT build issues / remove unused variable > > > > - r280252 - Fix building ixgbe with gcc > > > > - r280962 - Make changes to busdma code similar to r257541 > > > > - r281772 & r281773 - Remove unused variable > > > > - partial r282280 - stats counter update (ix-only) > > > > - r282289 - Add X550 support > > > > - r282290 - Add X550 makefile updates > > > > - r282293 - Add ixgbe_x550.c to conf/files > > > > - r282299 - Fix gcc compile (extraneous extern declaration) > > > > > > > > Finally, add ix_txrx.c to conf/files because it's required for > compile > > > in stable/10. > > > > > > FYI, this has broken 'make tinderbox' for all 32-bit kernels that > include > > > ix or ixgbe: > > > > > > /usr/home/john/work/freebsd/stable/10/sys/dev/ixgbe/if_ix.c:2494:21: > > > error: impl > > > icit conversion from 'unsigned long long' to 'u_long' (aka 'unsigned > > > long') chan > > > ges value from 10000000000 to 1410065408 > [-Werror,-Wconstant-conversion] > > > ifp->if_baudrate = IF_Gbps(10); > > > ~ ^~~~~~~~~~~ > > > /usr/home/john/work/freebsd/stable/10/sys/net/if.h:187:21: note: > expanded > > > from m > > > acro 'IF_Gbps' > > > #define IF_Gbps(x) (IF_Mbps((x) * 1000)) /* gigabits/sec. */ > > > ^~~~~~~~~~~~~~~~~~~ > > > /usr/home/john/work/freebsd/stable/10/sys/net/if.h:186:21: note: > expanded > > > from m > > > acro 'IF_Mbps' > > > #define IF_Mbps(x) (IF_Kbps((x) * 1000)) /* megabits/sec. */ > > > ^~~~~~~~~~~~~~~~~~~ > > > /usr/home/john/work/freebsd/stable/10/sys/net/if.h:185:36: note: > expanded > > > from macro 'IF_Kbps' > > > #define IF_Kbps(x) ((uintmax_t)(x) * 1000) /* kilobits/sec. */ > > > ~~~~~~~~~~~~~~~^~~~~~ > > > 1 error generated. > > > *** [if_ix.o] Error code 1 > > > > > > On 10.x you need to use if_initbaudrate() instead of setting > if_baudrate > > > directly. > > > > > > -- > > > John Baldwin > > > > > > > -- > John Baldwin > I put the stub module in and removed the direct if_baudrate assignment in r283668.