From owner-svn-src-head@freebsd.org Wed Aug 30 00:50:00 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4E0E6DEA286; Wed, 30 Aug 2017 00:50:00 +0000 (UTC) (envelope-from rlibby@gmail.com) Received: from mail-pg0-x229.google.com (mail-pg0-x229.google.com [IPv6:2607:f8b0:400e:c05::229]) (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 210AB7C10B; Wed, 30 Aug 2017 00:50:00 +0000 (UTC) (envelope-from rlibby@gmail.com) Received: by mail-pg0-x229.google.com with SMTP id r133so15391215pgr.3; Tue, 29 Aug 2017 17:50:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=keUOX19VTa0McEByx7POGx02l8nW960gimcHsV12SwU=; b=k4mt5bmxdU48v3HnRulnWhnXQofdYEztvLbaS0jDOUHsDJS9D57eH0t9Sm5GyweDZo zvgl2ZcO0tM/8nnlFsRDvrJmXNDCGFtygU1lGE1YN/CL0ocLhzVf4UAKknCnPS8mzaeF A9W+TJsJ8GZqWFBrFhwnXjnqkGn2rehVtggibBiYvNYNdC/lcmZev0O2lBsacl39v/Bt +IQsOxlZ0PVH8dxGLe4/iQ+ZRX3dd4zu1lVdB1aUlprkZ75ZjHfKqA3b6F6vn3HrNQfu R3Eoz8K1u0s/PJh4bN6Z6W+XQLpa0gvxS3WlRSVuYTAePPeLbt7nYMWZYNODsp11b2Yl 8Tyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=keUOX19VTa0McEByx7POGx02l8nW960gimcHsV12SwU=; b=exSJ5b20PfWHVVLTHRhWmWvji3E7bHJ1UwFT3HH/Z2f1o3Lpm1yr/f25HbqAtRiK52 e+LmDdS2aCICX6zRYsnNTpf65q3719RsJXzHNslATVothtnpy/PMYO4Ma4/ZNcYiiNag qQUh6NZwaX3nuvXaVX7GT920167+mT2HzhhXlUEvpSMncljlnkeSetbkWTYKAo28uGG1 WOsSsJOseVHDhJam2MgfQEoknfJxmcR9LXHzM4IT4zREj4KPQ/Gjxxs0Cv2ulF+O4I8J rSLqADIy8/b7gMT5mz9ri6BK4Qh7Yd6tH91UoUDdi7KEjC7c1C2k3+UvCOwc4KnZtWzL OZTQ== X-Gm-Message-State: AHYfb5g770tiiXCUhxMw6Q8CwqkXOjF0dG3YFQn/yZ74QNXIeiywdguD SOFjvJ4jhRuIK3I8jmOJTV4MJruXasxhb7U= X-Received: by 10.84.217.204 with SMTP id d12mr2597303plj.261.1504054199218; Tue, 29 Aug 2017 17:49:59 -0700 (PDT) MIME-Version: 1.0 Received: by 10.100.207.193 with HTTP; Tue, 29 Aug 2017 17:49:58 -0700 (PDT) In-Reply-To: <201708300020.v7U0KhOG013900@repo.freebsd.org> References: <201708300020.v7U0KhOG013900@repo.freebsd.org> From: Ryan Libby Date: Tue, 29 Aug 2017 17:49:58 -0700 Message-ID: Subject: Re: svn commit: r323008 - in head/sys: dev/e1000 net To: Sean Bruno Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list 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, 30 Aug 2017 00:50:00 -0000 On Tue, Aug 29, 2017 at 5:20 PM, Sean Bruno wrote: > Author: sbruno > Date: Wed Aug 30 00:20:43 2017 > New Revision: 323008 > URL: https://svnweb.freebsd.org/changeset/base/323008 > > Log: > Continuation of lock cleanup in e1000. > > Post-cold sleep instead of DELAY when waiting for firmware. > > Convert softc mutex to an SX lock. Change all waits to sleeps > once interrupts are enabled (and it is safe to sleep). > > Submitted by: Matt Macy > Sponsored by: Limelight Networks > Differential Revision: https://reviews.freebsd.org/D12101 > > Modified: > head/sys/dev/e1000/e1000_80003es2lan.c > head/sys/dev/e1000/e1000_82571.c > head/sys/dev/e1000/e1000_82575.c > head/sys/dev/e1000/e1000_hw.h > head/sys/dev/e1000/e1000_i210.c > head/sys/dev/e1000/e1000_i210.h > head/sys/dev/e1000/e1000_ich8lan.c > head/sys/dev/e1000/e1000_mac.c > head/sys/dev/e1000/e1000_mac.h > head/sys/dev/e1000/e1000_osdep.h > head/sys/dev/e1000/if_em.c > head/sys/net/iflib.c > head/sys/net/iflib.h > This broke the sparc64 [1] and other gcc builds with a -Wredundant-decls: > /usr/src/sys/dev/e1000/e1000_osdep.h:81: warning: redundant redeclaration of 'cold' [-Wredundant-decls] > /usr/src/sys/sys/systm.h:50: warning: previous declaration of 'cold' was here e1000_osdep.h already #includes so I think the extra extern int cold; can just be deleted. [1] https://ci.freebsd.org/job/FreeBSD-head-sparc64-build/2801/