From patchwork Thu Sep 14 17:00:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 9953579 X-Patchwork-Delegate: luca@coelho.fi Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8CE20602C9 for ; Thu, 14 Sep 2017 17:00:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 80ADA2914F for ; Thu, 14 Sep 2017 17:00:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7500529175; Thu, 14 Sep 2017 17:00:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC87F2914F for ; Thu, 14 Sep 2017 17:00:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751562AbdINRA1 (ORCPT ); Thu, 14 Sep 2017 13:00:27 -0400 Received: from mail-it0-f49.google.com ([209.85.214.49]:51324 "EHLO mail-it0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751370AbdINRA0 (ORCPT ); Thu, 14 Sep 2017 13:00:26 -0400 Received: by mail-it0-f49.google.com with SMTP id o200so948170itg.0 for ; Thu, 14 Sep 2017 10:00:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=Uvju+Y9xSkFIqI/QIRWL1z3/QO7p2q7YYAndQ8zzps4=; b=08A+4SZCHgSy5N3BWdpJEQhcLCV7VOBLTeqaIwQ1N9OcZmcvC0SWwUXiThhWQ0ZGpC Vs2f2A8aQEy7mTDtbUC5reCYDNTbSu20MDgFUVqvRwpIZPlt2v7CQpHliTl3xPxRToXy kAeFgfI9XwVkO5kFHd40tQYCinCy83QDBCzya/TzoVmCSWlojJMHlLjB6SuDsFsEQAk2 wXFORFtc7PzrNjIzjP2LzfgSqkW9mTQDwMQxYVMqbtEsL2S3m5mUrXzmKuTD4/Gvjwlu g5hBeAWe8PA2Ojmk60rFd06KuBRXIlLnPWnDEUdCQYxBu2egs1e7ZbD7xlDnhmumsG+s MxPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Uvju+Y9xSkFIqI/QIRWL1z3/QO7p2q7YYAndQ8zzps4=; b=F0aivI9IPeW8UcgkR3WqReA9F3U7uDXzOu6EMDzX8uVx/O9FUkY964O2LU+iFMjalt ok2CtisQapmZ4RQKPjRERjyVm7Q2kvs8Bo8UcMp2XWRkMV9B8eSt+B/lK/RAYfLL/BYq /wHtvaDKqvTnvbsWZov2pNNevpJtuFBrAGL+md0nAtOVAzwFARkQ+uGbWmxeHsiWVxCG KPH9/eJPM2z41uXqCAEn4eoIo8VXzr5pSZB0cgEHIUDQwg3ANkhW8x6BvMunatxr3ers cB5iMboeO+Gs7QaWGFU/1gSNXYwz2+zH7w8QMugAyn/yYCrJh6nzEGu/C5XihqVhrpw3 JTWw== X-Gm-Message-State: AHPjjUhnD3kGIXa3zU1DnVvQ5kQGBcvzLciNYrWQ/n6GJmjMSXpGF4Jt v4ZTAssHgVX+H8Yw/PiAeDFhi+VZOIg= X-Google-Smtp-Source: AOwi7QCv0FbWYX6beEVlypg3rbwG/BWSi5aRC7nKTxFdYweMkQlRh+zTWMmz+ruqwRA7DtpU3bgBQA== X-Received: by 10.36.117.79 with SMTP id y76mr1063091itc.16.1505408425665; Thu, 14 Sep 2017 10:00:25 -0700 (PDT) Received: from [192.168.1.154] ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id n142sm221963itn.12.2017.09.14.10.00.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Sep 2017 10:00:24 -0700 (PDT) Subject: Re: iwlwifi firmware load broken in current -git To: Johannes Berg , Luca Coelho , "Grumbach, Emmanuel" Cc: linuxwifi , "linux-wireless@vger.kernel.org" , srinath.mannam@broadcom.com, Bjorn Helgaas References: <04c9b578-693c-1dc6-9f0f-904580231b21@kernel.dk> <1505232673.5400.243.camel@intel.com> <1505234187.5400.249.camel@coelho.fi> <4bcbcbc1-7c79-09f0-5071-bc2f53bf6574@kernel.dk> <1505246657.1974.11.camel@sipsolutions.net> From: Jens Axboe Message-ID: Date: Thu, 14 Sep 2017 11:00:23 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <1505246657.1974.11.camel@sipsolutions.net> Content-Language: en-US Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 09/12/2017 02:04 PM, Johannes Berg wrote: > On Tue, 2017-09-12 at 13:43 -0600, Jens Axboe wrote: > >> CC'ing the guilty part and Bjorn. I'm assuming it's the >> pci_is_enabled() check, since the rest of the patch shouldn't have >> functional changes. > > and pci_enable_bridge() already checks if it's already enabled, but > still enables mastering in that case if it isn't: > > static void pci_enable_bridge(struct pci_dev *dev) > { > [...] > if (pci_is_enabled(dev)) { > if (!dev->is_busmaster) > pci_set_master(dev); > return; > } > > so I guess due to the new check we end up with mastering disabled, and > thus the firmware can't load since that's a DMA thing? Bjorn/Srinath, any input here? This is a regression that prevents wifi from working on a pretty standard laptop. It'd suck to have this be in -rc1. Seems like the trivial fix would be: diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index b0002daa50f3..ffbe11dbdd61 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -1394,7 +1394,7 @@ static int pci_enable_device_flags(struct pci_dev *dev, unsigned long flags) return 0; /* already enabled */ bridge = pci_upstream_bridge(dev); - if (bridge && !pci_is_enabled(bridge)) + if (bridge) pci_enable_bridge(bridge); /* only skip sriov related */