From: Bjorn Helgaas <bhelgaas@google.com>
To: Jens Axboe <axboe@kernel.dk>
Cc: Johannes Berg <johannes@sipsolutions.net>,
Luca Coelho <luca@coelho.fi>,
"Grumbach, Emmanuel" <emmanuel.grumbach@intel.com>,
linuxwifi <linuxwifi@intel.com>,
"linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>,
srinath.mannam@broadcom.com,
"linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>
Subject: Re: iwlwifi firmware load broken in current -git
Date: Thu, 14 Sep 2017 12:11:28 -0500 [thread overview]
Message-ID: <CAErSpo777jq9FVRtmoHXVbzE-ZOc7mnT+eRJ_PhP_Dd=MbKv4g@mail.gmail.com> (raw)
In-Reply-To: <feabbc25-eb85-ffa2-0fd6-254c07e3574b@kernel.dk>
[+cc linux-pci]
On Thu, Sep 14, 2017 at 12:00 PM, Jens Axboe <axboe@kernel.dk> wrote:
> 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 */
>
>
Looks like a reasonable fix. I assume it works for you? I don't have
a way to test it, so if you can verify that it works and supply a
Signed-off-by, I can merge it.
Bjorn
next prev parent reply other threads:[~2017-09-14 17:11 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-12 15:48 iwlwifi firmware load broken in current -git Jens Axboe
2017-09-12 16:11 ` Coelho, Luciano
2017-09-12 16:35 ` Jens Axboe
2017-09-12 16:36 ` Luca Coelho
2017-09-12 16:59 ` Jens Axboe
2017-09-12 19:43 ` Jens Axboe
2017-09-12 19:51 ` Luca Coelho
2017-09-12 20:04 ` Johannes Berg
2017-09-14 17:00 ` Jens Axboe
2017-09-14 17:11 ` Bjorn Helgaas [this message]
2017-09-14 17:22 ` Jens Axboe
2017-09-14 17:28 ` Srinath Mannam
2017-09-14 17:35 ` Jens Axboe
2017-09-14 17:44 ` Srinath Mannam
2017-09-14 17:45 ` Jens Axboe
2017-09-14 17:50 ` Johannes Berg
2017-09-14 17:44 ` Jens Axboe
2017-09-14 20:04 ` Srinath Mannam
2017-09-14 20:36 ` Jens Axboe
2017-09-15 19:32 ` Jens Axboe
2017-09-15 19:36 ` Luca Coelho
2017-09-15 19:46 ` Jens Axboe
2017-09-15 19:38 ` Linus Torvalds
2017-09-15 19:43 ` Luca Coelho
2017-09-15 19:51 ` Linus Torvalds
2017-09-15 19:57 ` Jens Axboe
2017-09-15 19:48 ` Jens Axboe
2017-09-15 19:51 ` Luca Coelho
2017-09-15 19:55 ` Jens Axboe
2017-09-16 3:03 ` Bjorn Helgaas
2017-09-16 18:53 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAErSpo777jq9FVRtmoHXVbzE-ZOc7mnT+eRJ_PhP_Dd=MbKv4g@mail.gmail.com' \
--to=bhelgaas@google.com \
--cc=axboe@kernel.dk \
--cc=emmanuel.grumbach@intel.com \
--cc=johannes@sipsolutions.net \
--cc=linux-pci@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linuxwifi@intel.com \
--cc=luca@coelho.fi \
--cc=srinath.mannam@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).