DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9A17320835
MIME-Version: 1.0
References: <20181003071513.13004-3-kai.heng.feng@canonical.com>
 <2787bccf20b6f647de9f4cafae5fd223e771b167.camel@intel.com> <81B978A9-270E-4C0B-BE67-D05899B1BC3B@canonical.com>
In-Reply-To: <81B978A9-270E-4C0B-BE67-D05899B1BC3B@canonical.com>
From:   Matt Chen <mattsled@gmail.com>
Date:   Wed, 3 Oct 2018 15:29:52 +0800
Message-ID: <CALx5=V_0fyTcpTdYh=ZOLWL79cop1F=5GyMuK6S9QnP5qHKouQ@mail.gmail.com>
Subject: Re: [PATCH 3/3] iwlwifi: Load firmware exclusively for Intel WiFi
To:     kai.heng.feng@canonical.com
Cc:     luciano.coelho@intel.com, LKML <linux-kernel@vger.kernel.org>,
        johannes.berg@intel.com,
        "Grumbach, Emmanuel" <emmanuel.grumbach@intel.com>,
        linuxwifi@intel.com, Kalle Valo <kvalo@codeaurora.org>,
        David Miller <davem@davemloft.net>,
        linux-wireless <linux-wireless@vger.kernel.org>,
        netdev@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk

I think Canonical were facing some wifi fw load error from some 8260
earlier module during the BT still loading the fw.
I believe we had later 8260 sku that fixed this issue.

Hi Kai-Heng,

Can you check with OEM for which SKU they are reporting the issue ?
Kai Heng Feng <kai.heng.feng@canonical.com> =E6=96=BC 2018=E5=B9=B410=E6=9C=
=883=E6=97=A5 =E9=80=B1=E4=B8=89 =E4=B8=8B=E5=8D=883:28=E5=AF=AB=E9=81=93=
=EF=BC=9A
>
>
>
> > On Oct 3, 2018, at 3:24 PM, Luciano Coelho <luciano.coelho@intel.com> w=
rote:
> >
> > On Wed, 2018-10-03 at 15:15 +0800, Kai-Heng Feng wrote:
> >> To avoid the firmware loading race between Bluetooth and WiFi on Intel
> >> 8260, load firmware exclusively when BT_INTEL is enabled.
> >>
> >> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
> >> ---
> >
> > Where is this coming from? Can you explain what "the firmware loading
> > race" is?
>
> Looks like the patch is not correctly threaded. I=E2=80=99ll resend the s=
eries.
>
> >
> >
> >> .../net/wireless/intel/iwlwifi/pcie/trans.c   | 37 ++++++++++++++++++-
> >> 1 file changed, 36 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers=
/net/wireless/intel/iwlwifi/pcie/trans.c
> >> index cc8c53dc0ab6..c30d3989e2a8 100644
> >> --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
> >> +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
> >> @@ -71,6 +71,7 @@
> >> #include <linux/vmalloc.h>
> >> #include <linux/pm_runtime.h>
> >> #include <linux/module.h>
> >> +#include <linux/intel-wifi-bt.h>
> >
> > I don't see this upstream.  Is it something that was recently added?
> > Looks odd...
> >
> > Regardless, this should also be protected on CONFIG_BT_INTEL.
>
> Thanks, I=E2=80=99ll update this one.
>
> >
> >
> >> #include "iwl-drv.h"
> >> #include "iwl-trans.h"
> >> @@ -1335,6 +1336,10 @@ static int iwl_trans_pcie_start_fw(struct iwl_t=
rans *trans,
> >>      bool hw_rfkill;
> >>      int ret;
> >>
> >> +#if IS_ENABLED(CONFIG_BT_INTEL)
> >> +    void (*firmware_lock_func)(void);
> >> +    void (*firmware_unlock_func)(void);
> >> +#endif
> >>      /* This may fail if AMT took ownership of the device */
> >>      if (iwl_pcie_prepare_card_hw(trans)) {
> >>              IWL_WARN(trans, "Exit HW not ready\n");
> >> @@ -1394,6 +1399,7 @@ static int iwl_trans_pcie_start_fw(struct iwl_tr=
ans *trans,
> >>       * RF-Kill switch is toggled, we will find out after having loade=
d
> >>       * the firmware and return the proper value to the caller.
> >>       */
> >> +
> >
> > Stray empty line.
> >
> >>      iwl_enable_fw_load_int(trans);
> >>
> >>      /* really make sure rfkill handshake bits are cleared */
> >> @@ -1401,8 +1407,37 @@ static int iwl_trans_pcie_start_fw(struct iwl_t=
rans *trans,
> >>      iwl_write32(trans, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL=
);
> >>
> >>      /* Load the given image to the HW */
> >> -    if (trans->cfg->device_family >=3D IWL_DEVICE_FAMILY_8000)
> >> +    if (trans->cfg->device_family >=3D IWL_DEVICE_FAMILY_8000) {
> >> +#if IS_ENABLED(CONFIG_BT_INTEL)
> >> +            firmware_lock_func =3D symbol_request(btintel_firmware_lo=
ck);
> >> +            firmware_unlock_func =3D symbol_request(btintel_firmware_=
unlock);
> >> +            if (!firmware_lock_func || !firmware_unlock_func) {
> >> +                    if (firmware_lock_func) {
> >> +                            symbol_put(btintel_firmware_lock);
> >> +                            firmware_lock_func =3D NULL;
> >> +                    }
> >> +
> >> +                    if (firmware_unlock_func) {
> >> +                            symbol_put(btintel_firmware_unlock);
> >> +                            firmware_unlock_func =3D NULL;
> >> +                    }
> >> +            }
> >> +
> >> +            if (firmware_lock_func)
> >> +                    firmware_lock_func();
> >> +#endif
> >>              ret =3D iwl_pcie_load_given_ucode_8000(trans, fw);
> >> +
> >> +#if IS_ENABLED(CONFIG_BT_INTEL)
> >> +            if (firmware_unlock_func) {
> >> +                    firmware_unlock_func();
> >> +                    symbol_put(btintel_firmware_lock);
> >> +                    firmware_lock_func =3D NULL;
> >> +                    symbol_put(btintel_firmware_unlock);
> >> +                    firmware_unlock_func =3D NULL;
> >> +            }
> >> +#endif
> >> +    }
> >>      else
> >>              ret =3D iwl_pcie_load_given_ucode(trans, fw);
> >>
> >
> > I'm not sure I like adding this BT-specific stuff here, especially not
> > without a detailed explanation.
> >
> > Did you also send the other patches in this series to linux-wireless? I
> > can't see them=E2=80=A6
>
> I=E2=80=99ll resend one soon.
>
> Thanks!
>
> Kai-Heng
>
> >
> > --
> > Cheers,
> > Luca.
>