From owner-svn-src-head@freebsd.org Wed May 9 01:21:22 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 46E9EFD0B58; Wed, 9 May 2018 01:21:22 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-pl0-x22d.google.com (mail-pl0-x22d.google.com [IPv6:2607:f8b0:400e:c01::22d]) (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 A88C185CC0; Wed, 9 May 2018 01:21:21 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mail-pl0-x22d.google.com with SMTP id bi12-v6so3266407plb.12; Tue, 08 May 2018 18:21:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=OfmpuAhRzSEOsaYUTVFUxBjBB1fppdQUc8Vske3g0tY=; b=QO603y+ZtMBL8mmrFhcF5ojEQKsSEwXMKSxSZg8xAVkf0wGSmg7QgEfongGvCoGl4M nCUkyPkHpUuwIFYbMIdbayYwAi/A3eSOGHc7OJSBL1fhON7aZDELfhBcIGzS/RdK5WcQ xoWjJXuPozSP2Pk9YFDpevSjeHO7ULWMl6r/KYhVYkI09Z7Cwz67KUjk5zndA5SlLxff fqzAG8Fe9d8P9QqpGxfaXkOKeuM/iUZ/MBB1gjx9Ax6uWldWMXZ1bmx2Ohqel66LALnU KVyJ9LLwHWnxNokflxWAsdsmYefZm48nGvLrTK4sZ6pWp0qN8cP1qtwJ2wNoR3igWg3b HBug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=OfmpuAhRzSEOsaYUTVFUxBjBB1fppdQUc8Vske3g0tY=; b=F0iQk3cbukeQWu2Mi9QmKLu8OOSll4FjjX9xCznsGlQgVYjbEjDToYZQdxsOinIZev xV83ppGpb887Cvk9z4PyoKAVkWUytS05POiruG0DTFFQnuPoyN4ZUf4LxFKuYbcWXSV0 VLvmL1Dc41UY5d2bh4DlimGTrU0q/m37DCvlGPPAhLsg9RQmjOmsCtrHRP26Mko6hUlL CMQFIB/WJbe5kzROdNzEI04XCMaFes/0Uw/rbLjrDW+/crVKzpSrXC8vo5iGm/I1SmID vGz3OdPi0TGCdSMxAkUKUziUU01K6zhmF/sCweX8y3p+vq2eiaOAtV2m61Y+oxsQFwRP 2Rhw== X-Gm-Message-State: ALQs6tBWVWrtCEYwIjgLjhTCm2kXlOp3y+wIqVgzaDSU3ftmEbFQARCt AguBp8RFoGUxVyrrRyzmbWkalQxd X-Google-Smtp-Source: AB8JxZoTrrebvuD90GDpB4Z83Mu0WINd8hMP4uVA3scHtx+sIzDCfE0SL584l4y/ev9a4AYTfIE7sw== X-Received: by 2002:a17:902:9344:: with SMTP id g4-v6mr22648783plp.10.1525828880301; Tue, 08 May 2018 18:21:20 -0700 (PDT) Received: from raichu (toroon0560w-lp130-04-184-145-252-229.dsl.bell.ca. [184.145.252.229]) by smtp.gmail.com with ESMTPSA id 67-v6sm7258289pgg.91.2018.05.08.18.21.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 May 2018 18:21:19 -0700 (PDT) Sender: Mark Johnston Date: Tue, 8 May 2018 21:21:14 -0400 From: Mark Johnston To: Matthew Macy Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org, Stephen Hurd Subject: Re: svn commit: r333345 - head/sys/dev/e1000 Message-ID: <20180509012114.GA2261@raichu> References: <201805080139.w481djMX062724@repo.freebsd.org> <20180508221025.GA4249@raichu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.5 (2018-04-13) 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: Wed, 09 May 2018 01:21:22 -0000 On Tue, May 08, 2018 at 04:37:52PM -0700, Matthew Macy wrote: > Nix that. The panic is incorrect, we simply don't have anything to do > in the default case. Indeed, getting rid of the panic allows my workstation to boot. > 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 > 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; > } >