Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp2196714iof; Tue, 7 Jun 2022 22:54:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyWjamW0NWT1zEZf/3b4emrH+VeK7RJwcyO943Dktl40gKnEJ3vIt4XyEmoQzSPaUv+nGBc X-Received: by 2002:a63:8043:0:b0:3fc:d9e7:2357 with SMTP id j64-20020a638043000000b003fcd9e72357mr27281502pgd.405.1654667695739; Tue, 07 Jun 2022 22:54:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654667695; cv=none; d=google.com; s=arc-20160816; b=nRuYvfREyXx7VsBWNN2vlj28xbCagR4wVh20magI4nMI02Ch8KsI4s0kDudurmjdZR 9zwNVcxJP8hFtxsvjMRvzwWCbu7pfqCXmsOvRSBcdcVVwakqfxzPO7yVYUFSJFhYHQVv YdX/1UqSeN0S6OsaRWJrfxjhG02ft3lL8vs5kjWKd3+wk6olCyACNn5Nt1ta5/O+ryE9 mvmtsq4NC8l3Rds5EJtjnHNGPMP3hMe7Hdy1XxS3mE3HdpYzbviUQGMO0Xfk5bRgtQ7O z9xRXY3cvy8Ywi9KZ8wsd6lu4C13QkmDxr/wTeT2fG5JRR7rXX6eHcQzWSPigxc1XTq/ VQhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Pzse/QB9aRC+EUWbIgHVaI6DLhpr1tk8pZ76WVb8I8w=; b=b4YnKTTDYsXhZMsm08E16WokKsCN6Lb6Vl69g0K2+VBaNegmKLhDe7xARbvpZv45GX fJbji8JiQ3UjsHaDncoEGYgciIsrMVs4WKDv3HO34vGG08R1uJJNbsUgGOVrJZLTlxXI dNgJWphwA1aFzkNjOs9bbNH1a6BJ7NY6Dl2Yc1AKeRkXI3+mrvOv/FWQ613/DAtgckkc imaYQHdkCXqgvJUOKOSQ0R2uEnMC0RkYGcvC3lA3nBkMHQfezea7EDxu0yYc9Iczcank SJBqWD5X7YJXJ+/k9bA5tswBprpNgcpBX9OPBBokWrH+SHHXOoUqkTxb8dfr2a+gDnyF PAHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=TrwDFTpY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id b9-20020a170902d50900b00164179afee4si18679192plg.376.2022.06.07.22.54.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 22:54:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=TrwDFTpY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id CA1102B2B8C; Tue, 7 Jun 2022 22:21:16 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442844AbiFHA5L (ORCPT + 99 others); Tue, 7 Jun 2022 20:57:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1383926AbiFGWUJ (ORCPT ); Tue, 7 Jun 2022 18:20:09 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44CFC197F69; Tue, 7 Jun 2022 12:20:39 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 08FC2608CD; Tue, 7 Jun 2022 19:20:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 131C5C385A2; Tue, 7 Jun 2022 19:20:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1654629624; bh=z16glOCFgiD3g2TkfWOUF6DAFKVA0fXskdcPq/Fr26U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TrwDFTpYDvoVWq8Q/9TRMtWIhm20PA9l7+NUqTFdNJUkvg+x3oQ+pMOQmHD6r+JoP tL0IFBkWYiBCXP5KxryEn8vrrlhMPUYsYxa0B9uXzCuNZNzkfEmd3dOdQI95J5VFgO hJ3cXH1WYy75YIo3VLYiXntv3XTJ8MOv3wNLksSs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Emmanuel Grumbach , Gregory Greenman , Johannes Berg Subject: [PATCH 5.18 721/879] iwlwifi: mvm: fix assert 1F04 upon reconfig Date: Tue, 7 Jun 2022 19:03:59 +0200 Message-Id: <20220607165023.782667509@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607165002.659942637@linuxfoundation.org> References: <20220607165002.659942637@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Emmanuel Grumbach commit 9d096e3d3061dbf4ee10e2b59fc2c06e05bdb997 upstream. When we reconfig we must not send the MAC_POWER command that relates to a MAC that was not yet added to the firmware. Ignore those in the iterator. Cc: stable@vger.kernel.org Signed-off-by: Emmanuel Grumbach Signed-off-by: Gregory Greenman Link: https://lore.kernel.org/r/20220517120044.ed2ffc8ce732.If786e19512d0da4334a6382ea6148703422c7d7b@changeid Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/intel/iwlwifi/mvm/power.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/net/wireless/intel/iwlwifi/mvm/power.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/power.c @@ -563,6 +563,9 @@ static void iwl_mvm_power_get_vifs_itera struct iwl_power_vifs *power_iterator = _data; bool active = mvmvif->phy_ctxt && mvmvif->phy_ctxt->id < NUM_PHY_CTX; + if (!mvmvif->uploaded) + return; + switch (ieee80211_vif_type_p2p(vif)) { case NL80211_IFTYPE_P2P_DEVICE: break;