From owner-svn-src-head@freebsd.org Tue May 8 23:37:53 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B631AFCDA9B; Tue, 8 May 2018 23:37:53 +0000 (UTC) (envelope-from mmacy@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 62CA77143D; Tue, 8 May 2018 23:37:53 +0000 (UTC) (envelope-from mmacy@freebsd.org) Received: from mail-io0-f169.google.com (mail-io0-f169.google.com [209.85.223.169]) (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)) (Authenticated sender: mmacy) by smtp.freebsd.org (Postfix) with ESMTPSA id 284F224ADE; Tue, 8 May 2018 23:37:53 +0000 (UTC) (envelope-from mmacy@freebsd.org) Received: by mail-io0-f169.google.com with SMTP id c9-v6so34219628iob.12; Tue, 08 May 2018 16:37:53 -0700 (PDT) X-Gm-Message-State: ALQs6tC/8BiDqJ7zGOmkoR9hzNFWBC/eEQZbcSW8J1yvIiWpYRkD4SGW b5f0VAvaYcIaqmY/IU4XNN17inAxyOgnR1brTOE= X-Google-Smtp-Source: AB8JxZrX1OJtBdJQFDYBKqOGFsTY4BSZp3Mp+irWVGoRi+fwKpnkH1UwcJnSF2wjoWsAkPs/lIvB1vvIMPAu536hS6s= X-Received: by 2002:a6b:3b42:: with SMTP id i63-v6mr46792378ioa.133.1525822672655; Tue, 08 May 2018 16:37:52 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a02:b0c3:0:0:0:0:0 with HTTP; Tue, 8 May 2018 16:37:52 -0700 (PDT) In-Reply-To: References: <201805080139.w481djMX062724@repo.freebsd.org> <20180508221025.GA4249@raichu> From: Matthew Macy Date: Tue, 8 May 2018 16:37:52 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r333345 - head/sys/dev/e1000 To: Mark Johnston Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org, Stephen Hurd Content-Type: multipart/mixed; boundary="00000000000064fb6e056bba461c" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 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: Tue, 08 May 2018 23:37:54 -0000 --00000000000064fb6e056bba461c Content-Type: text/plain; charset="UTF-8" Nix that. The panic is incorrect, we simply don't have anything to do in the default case. On Tue, May 8, 2018 at 4:31 PM, Matthew Macy wrote: > Can you please try the attached patch? (Note that gmail may insert > carriage returns) > > -M > > On Tue, May 8, 2018 at 3:10 PM, Mark Johnston wrote: >> On Tue, May 08, 2018 at 01:39:45AM +0000, Matt Macy wrote: >>> Author: mmacy >>> Date: Tue May 8 01:39:45 2018 >>> New Revision: 333345 >>> URL: https://svnweb.freebsd.org/changeset/base/333345 >>> >>> Log: >>> Sleep rather than spin in e1000 when doing long running config operations. >>> >>> With r333218 it is now possible for drivers to use an sx lock and thus sleep while >>> waiting on long running operations rather than DELAY(). >>> >>> Reported by: gallatin >>> Reviewed by: sbruno >>> Approved by: sbruno >>> MFC after: 1 month >>> Sponsored by: Limelight Networks >>> Differential Revision: https://reviews.freebsd.org/D14984 >> >> I'm getting a panic during boot with this change: "unknown mac type d". >> >> It occurs while the driver is attaching to: >> >> em0@pci0:1:0:0: class=0x020000 card=0x7044103c chip=0x105e8086 rev=0x06 hdr=0x00 >> vendor = 'Intel Corporation' >> device = '82571EB Gigabit Ethernet Controller' >> class = network >> subclass = ethernet --00000000000064fb6e056bba461c Content-Type: text/x-patch; charset="US-ASCII"; name="82571_fix.diff" Content-Disposition: attachment; filename="82571_fix.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_jgybf6fv1 ZGlmZiAtLWdpdCBhL3N5cy9kZXYvZTEwMDAvZTEwMDBfODI1NzEuYyBiL3N5cy9kZXYvZTEwMDAv ZTEwMDBfODI1NzEuYwppbmRleCA1N2M0N2E1ZWJkNi4uMzQ4YTNkYWEzYzAgMTAwNjQ0Ci0tLSBh L3N5cy9kZXYvZTEwMDAvZTEwMDBfODI1NzEuYworKysgYi9zeXMvZGV2L2UxMDAwL2UxMDAwXzgy NTcxLmMKQEAgLTEwMDAsNyArMTAwMCw3IEBAIHN0YXRpYyBzMzIgZTEwMDBfcmVzZXRfaHdfODI1 NzEoc3RydWN0IGUxMDAwX2h3ICpodykKIAkJCWUxMDAwX3B1dF9od19zZW1hcGhvcmVfODI1NzQo aHcpOwogCQlicmVhazsKIAlkZWZhdWx0OgotCQlwYW5pYygidW5rbm93biBtYWMgdHlwZSAleFxu IiwgaHctPm1hYy50eXBlKTsKKwkJLyogd2UgZGlkbid0IGdldCB0aGUgc2VtYXBob3JlIG5vIG5l ZWQgdG8gcHV0IGl0ICovCiAJCWJyZWFrOwogCX0KIAo= --00000000000064fb6e056bba461c--