Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <CAJvTdKm9PQrnyEG=b-8DbdnOHup8Ec6VqoKp3ZCQXwmvXU3FbA@mail.gmail.com>
 <0bb2a3b794c19514ad30ecc0ca60d1d6e9e438b0.camel@sipsolutions.net>
In-Reply-To: <0bb2a3b794c19514ad30ecc0ca60d1d6e9e438b0.camel@sipsolutions.net>
From:   Len Brown <lenb@kernel.org>
Date:   Wed, 12 Jan 2022 13:49:30 -0500
Message-ID: <CAJvTdKmKPA_W_tXVjFOQEb5nX+sE+PmBeyVcf35=8WbLXuZapA@mail.gmail.com>
Subject: Re: iwlwifi 0000:3a:00.0: Microcode SW error detected. Restarting 0x2000000.
To:     Johannes Berg <johannes@sipsolutions.net>
Cc:     Luca Coelho <luciano.coelho@intel.com>,
        linux-wireless@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Wed, Jan 12, 2022 at 3:34 AM Johannes Berg <johannes@sipsolutions.net> wrote:

> Something like this might help?

Yes!
I have confirmed that this patch allows wifi to work, when applied to
Linux-5.16.

Let me know when you'd like me to test a production patch.

thanks!
Len Brown, Intel Open Source Technology Center

> diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
> index 7ee4802a5ef1..56b9363a9111 100644
> --- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
> +++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
> @@ -1026,7 +1026,9 @@ static int iwl_mvm_sar_geo_init(struct iwl_mvm *mvm)
>         /* the ops field is at the same spot for all versions, so set in v1 */
>         cmd.v1.ops = cpu_to_le32(IWL_PER_CHAIN_OFFSET_SET_TABLES);
>
> -       if (cmd_ver == 5) {
> +       if (cmd_ver == IWL_FW_CMD_VER_UNKNOWN) {
> +               return 0;
> +       } else if (cmd_ver == 5) {
>                 len = sizeof(cmd.v5);
>                 n_bands = ARRAY_SIZE(cmd.v5.table[0]);
>                 n_profiles = ACPI_NUM_GEO_PROFILES_REV3;