Date: Tue, 8 May 2018 16:37:52 -0700 From: Matthew Macy <mmacy@freebsd.org> To: Mark Johnston <markj@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org, Stephen Hurd <shurd@freebsd.org> Subject: Re: svn commit: r333345 - head/sys/dev/e1000 Message-ID: <CAPrugNqveae2HLzfPSjZbD7yUwxxQSHjmtM2qGuH7%2B%2B-t%2BMnPg@mail.gmail.com> In-Reply-To: <CAPrugNpu6XuR3sg3r1cjLGROmAh57%2BBmNVE0GkiG2Esk0rv_aA@mail.gmail.com> References: <201805080139.w481djMX062724@repo.freebsd.org> <20180508221025.GA4249@raichu> <CAPrugNpu6XuR3sg3r1cjLGROmAh57%2BBmNVE0GkiG2Esk0rv_aA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] 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 <mmacy@freebsd.org> 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 <markj@freebsd.org> 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 [-- Attachment #2 --] diff --git a/sys/dev/e1000/e1000_82571.c b/sys/dev/e1000/e1000_82571.c index 57c47a5ebd6..348a3daa3c0 100644 --- a/sys/dev/e1000/e1000_82571.c +++ b/sys/dev/e1000/e1000_82571.c @@ -1000,7 +1000,7 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw) e1000_put_hw_semaphore_82574(hw); break; default: - panic("unknown mac type %x\n", hw->mac.type); + /* we didn't get the semaphore no need to put it */ break; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPrugNqveae2HLzfPSjZbD7yUwxxQSHjmtM2qGuH7%2B%2B-t%2BMnPg>