From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-io0-f173.google.com ([209.85.223.173]:53135 "EHLO mail-io0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751370AbdINRW2 (ORCPT ); Thu, 14 Sep 2017 13:22:28 -0400 Received: by mail-io0-f173.google.com with SMTP id i197so2248635ioe.9 for ; Thu, 14 Sep 2017 10:22:28 -0700 (PDT) Subject: Re: iwlwifi firmware load broken in current -git To: Bjorn Helgaas Cc: Johannes Berg , Luca Coelho , "Grumbach, Emmanuel" , linuxwifi , "linux-wireless@vger.kernel.org" , srinath.mannam@broadcom.com, "linux-pci@vger.kernel.org" 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: (sfid-20170914_192234_365532_0D861417) Date: Thu, 14 Sep 2017 11:22:21 -0600 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Sender: linux-wireless-owner@vger.kernel.org List-ID: On 09/14/2017 11:11 AM, Bjorn Helgaas wrote: > [+cc linux-pci] > > On Thu, Sep 14, 2017 at 12:00 PM, Jens Axboe 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. Booting it right now, I'll send out a proper version in a few minutes. -- Jens Axboe