From patchwork Sat Mar 8 21:19:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 872143 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9CBB91F9F5C for ; Sat, 8 Mar 2025 21:19:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468790; cv=none; b=YAv3G0oPNnjzndW9gO0R5ojTencySglfaoxvfxE88FHBYVMxb9+yWd7V5GeNc8bozrfLR33+Hb2nOcM47iUa9jdSDJ81k0xjwKPnK6Z8y9dW2m4TTXF/970W9qRODPpK9xMap+IQ+4NTIQMW5clxMLqygdj/76lmoRoiLNWWlhY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468790; c=relaxed/simple; bh=sa7vOZzSkawInADUnsvelr4iWp2BgINI7uEkWPmoFzE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=DN33p4jdx7I1mN1tYDwtfK0tSOALcQoc3z+u5y6iduQ51ZLyoU/oFIRxiOSqcUExjTzrky6J6qQ+tStUF1f1obGXvyU0W0MgtOYDzjrM/LyTjzeE+XzChnvsqQHKAmxHwPQ7UzVo/ZtKpxnelSmVUumv1U4XWS7G/UjYghj5ItM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=WGpCBr8Q; arc=none smtp.client-ip=192.198.163.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="WGpCBr8Q" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741468789; x=1773004789; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sa7vOZzSkawInADUnsvelr4iWp2BgINI7uEkWPmoFzE=; b=WGpCBr8Q0swEZLHiZ+ExL/ztDxALOM+pR8F0I0HkNVb54szixJU7J6ps 7NIOdGHWTWWenLDUrF3uI0gulpHMUaCs1nIQ7QxFm9fNjKT0sqndJJn9i 3sk31igujsgw3btg+UTZQsPXFR+Y1Sp61pcP3tgZ5Czum43MlK9kUmg/Y wqTRmXlFEZKhHiVjTa3GDlj6q2CD5wHUCEofthQQh9U086OczbU3yKq68 fRVyp+CMBxs6vaygITXNSy5CnwTtR3f/uhr6wH0TTky6OBZMyu/W/XBf+ Olz0Q1uRuo65K7pkrZO8wCCQlvdd/LNY37Uhwo/P0+khuG9ykIEiw3cTp Q==; X-CSE-ConnectionGUID: IBiJIzVURAGfZX7ZCyp26w== X-CSE-MsgGUID: 3qP3VblrTF+z3jyqONOa3Q== X-IronPort-AV: E=McAfee;i="6700,10204,11367"; a="60052375" X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="60052375" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:49 -0800 X-CSE-ConnectionGUID: RuPR0SaWQEi7ieIV9ku5dA== X-CSE-MsgGUID: qscUSTSSTRun8eep1ReGag== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="142859926" Received: from weis0040.iil.intel.com ([10.12.217.108]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:47 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Johannes Berg Subject: [PATCH v3 wireless-next 07/14] wifi: iwlwifi: fix debug actions order Date: Sat, 8 Mar 2025 23:19:18 +0200 Message-Id: <20250308231427.6de7fa8e63ed.I40632c48e2a67a8aca05def572a934b88ce7934b@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250308211925.2332313-1-miriam.rachel.korenblit@intel.com> References: <20250308211925.2332313-1-miriam.rachel.korenblit@intel.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Israel (74) Limited From: Johannes Berg The order of actions taken for debug was implemented incorrectly. Now we implemented the dump split and do the FW reset only in the middle of the dump (rather than the FW killing itself on error.) As a result, some of the actions taken when applying the config will now crash the device, so we need to fix the order. Signed-off-by: Johannes Berg Signed-off-by: Miri Korenblit --- drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c index 08d990ba8a79..ce787326aa69 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* - * Copyright (C) 2018-2024 Intel Corporation + * Copyright (C) 2018-2025 Intel Corporation */ #include #include "iwl-drv.h" @@ -1372,15 +1372,15 @@ void _iwl_dbg_tlv_time_point(struct iwl_fw_runtime *fwrt, switch (tp_id) { case IWL_FW_INI_TIME_POINT_EARLY: iwl_dbg_tlv_init_cfg(fwrt); - iwl_dbg_tlv_apply_config(fwrt, conf_list); iwl_dbg_tlv_update_drams(fwrt); iwl_dbg_tlv_tp_trigger(fwrt, sync, trig_list, tp_data, NULL); + iwl_dbg_tlv_apply_config(fwrt, conf_list); break; case IWL_FW_INI_TIME_POINT_AFTER_ALIVE: iwl_dbg_tlv_apply_buffers(fwrt); iwl_dbg_tlv_send_hcmds(fwrt, hcmd_list); - iwl_dbg_tlv_apply_config(fwrt, conf_list); iwl_dbg_tlv_tp_trigger(fwrt, sync, trig_list, tp_data, NULL); + iwl_dbg_tlv_apply_config(fwrt, conf_list); break; case IWL_FW_INI_TIME_POINT_PERIODIC: iwl_dbg_tlv_set_periodic_trigs(fwrt); @@ -1390,14 +1390,14 @@ void _iwl_dbg_tlv_time_point(struct iwl_fw_runtime *fwrt, case IWL_FW_INI_TIME_POINT_MISSED_BEACONS: case IWL_FW_INI_TIME_POINT_FW_DHC_NOTIFICATION: iwl_dbg_tlv_send_hcmds(fwrt, hcmd_list); - iwl_dbg_tlv_apply_config(fwrt, conf_list); iwl_dbg_tlv_tp_trigger(fwrt, sync, trig_list, tp_data, iwl_dbg_tlv_check_fw_pkt); + iwl_dbg_tlv_apply_config(fwrt, conf_list); break; default: iwl_dbg_tlv_send_hcmds(fwrt, hcmd_list); - iwl_dbg_tlv_apply_config(fwrt, conf_list); iwl_dbg_tlv_tp_trigger(fwrt, sync, trig_list, tp_data, NULL); + iwl_dbg_tlv_apply_config(fwrt, conf_list); break; } }