Received: by 2002:ab2:69cc:0:b0:1f4:be93:e15a with SMTP id n12csp1297024lqp; Mon, 15 Apr 2024 01:55:14 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWY/bXHOhZRRH37hXUarAQQZOBH/PpZpHr5Lu/eppBK4KvwiD+IdlnAC8Qr/Bup7mXeyirgKjuQO6dllGtNgYHqWhFNEsYYo4rhjESgVg== X-Google-Smtp-Source: AGHT+IFPCJdjvCyJnNqvhg+YWYwlGJ/1fd+C0PTO0W6RAI6+IS5B0eDiHB0PxARGQA2hMVwa7V5D X-Received: by 2002:ad4:57a8:0:b0:69b:38be:bf89 with SMTP id g8-20020ad457a8000000b0069b38bebf89mr8113436qvx.16.1713171313979; Mon, 15 Apr 2024 01:55:13 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713171313; cv=pass; d=google.com; s=arc-20160816; b=s6t1vA0lk58V08kDHWacyCRvH4MEVMQm5zeMOwlY7m54TMLX/lz6f4XRVrTm1jm0QE LF07WFx02ZIsMFb6BuibAO12omqPJjzIKULK4m6jSMoeQkqRRKo7H8kMZho1Nc/lrwjP 0wzt4ceup5ItcUnDnvVm3U2uHyxobD1f/vnvYQ/zwAm0Qpi7pwGIZ4wSRVlYbFUAXFDd JRCm8BvvOmKUFkcSkroA6FWGSBxFlnU+SzGf8QyUGRKmdhvU0WECwPwn2wQWKZtTHREB g4PA3z4c5nu+a0Uii0bEVRihcVIXHALlrJS8/CIeWwiVs5rKh3njYY9d/IdP3rAOChNc iJ/g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:organization:mime-version :list-unsubscribe:list-subscribe:list-id:precedence:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=mcMkaSI3q/rscQCO4eunWA7Y9xpSWT2OKSADYpTuhl0=; fh=TquNsOiV+zNY1csTpltVB6A9QFW5SbuNs6JlqcKCQkw=; b=UE6WXC5OXvgc3EJmzKAmEESyI+osdmGb9l7oSaj+4Cz6UdDtlUAA01GjDAM3/J1WGy GOlSHMCrXD1HtOZoxBN5n/5AsUQks53LlFxA0/qMzYCZvypuPNv7rwNqpR+ULJpXNqbn LQQVi7oWpQRf4lnRwQW80jiq7PBwZStH3e9uCum6KSg2YH5OYB3+CG5O7SsIJfFN/XDW vOnpxIp5rCeerLLVUUEdOGyHVULy1Z4GFwr03wevncVwWafkKbMDddcYa2ct/iw4+n1x spEUTRbSYwNhEgaZku8ngzbs8P75rdjhmeROBxL4oVuQclmkQZzrUj/W/sOI5NilMpfH oe2A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Az6W55+S; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-wireless+bounces-6312-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-wireless+bounces-6312-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id bp17-20020a05621407f100b0069932ba59e7si9170186qvb.409.2024.04.15.01.55.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Apr 2024 01:55:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless+bounces-6312-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Az6W55+S; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-wireless+bounces-6312-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-wireless+bounces-6312-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id B36EA1C2111B for ; Mon, 15 Apr 2024 08:55:13 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B7EDC45BE2; Mon, 15 Apr 2024 08:55:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Az6W55+S" X-Original-To: linux-wireless@vger.kernel.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) (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 D573044C61 for ; Mon, 15 Apr 2024 08:55:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.16 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713171303; cv=none; b=QzhdCO8Ls59jlPCVt8VyxujZm8mwT9fQ7zVjD8mjNT7UjL5+jz1FXSlAMfhFPCPvl3dwGCrZfWVa6a+Dt4ylao7n5nwgkhF5sST4DclviVjrXFLd/xsQRsz7QWS/j3olpnFEjYBfTUoyFtA5MxojZ9+jjmJ1WvOESV4D/UFQ7KA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713171303; c=relaxed/simple; bh=laNcgBko/kq0PUqo16sDtE+GZa1L0Bo1YoTnJFTMTeg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QATYcEQEhLOqLu7QHcGQWnHg+/LRGxiJ8Gt+KEqRE+ep1dnHQAE9UGtAaHeRxtO5YhLMzRR35BnlHoz959xp98nfTn8Q9d4uiQKx8TWtZxwfXzlMLm+XKn3RWqraK7/GqEiCNWl+Lkpb4TWinme6ggsxqnOdrHJO3CAayTkk7OY= 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=Az6W55+S; arc=none smtp.client-ip=192.198.163.16 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713171302; x=1744707302; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=laNcgBko/kq0PUqo16sDtE+GZa1L0Bo1YoTnJFTMTeg=; b=Az6W55+S/dN0d4iWJSloGi4lMeeJm/7Hro/4+Y4SopeuQIjm3ofGqYru JLhgFnaaL0oL8Wx6Gpsys9IzCBFdkDozn4Ng3rVZpaMHtqahdNsJW1srU eBqJYyA1wc9gmyq/9U72gFz24ZiwFv7B08C7JX9DsPj0QEIzl/iLKXA0o q/uHRc0OuXzVFdXl8Fgw1xfXh41JbkDG9T6gwEdjQmwrfcUduy+Gs0Eyk eGIq+ZBRx0hXPUW6yvB1DFl85hooCCiwurWAxUik6mujSkeKpEQUFfuKf beYR+YPgLLWuMXc+frvcQajKqLspQe8km8++3vmAEXyTfAG6k/7lIe93g Q==; X-CSE-ConnectionGUID: ocJjUKWVQU2TRg2mKI0T9w== X-CSE-MsgGUID: 6B4GwsHSTjqVrbzkhA3Xcw== X-IronPort-AV: E=McAfee;i="6600,9927,11044"; a="9100589" X-IronPort-AV: E=Sophos;i="6.07,202,1708416000"; d="scan'208";a="9100589" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Apr 2024 01:55:02 -0700 X-CSE-ConnectionGUID: GSsWIk3jSqmNDRWJOWdJGw== X-CSE-MsgGUID: 487nD/OITv2qPzSEfS+aZA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,202,1708416000"; d="scan'208";a="21767981" Received: from unknown (HELO WEIS0040.iil.intel.com) ([10.12.217.108]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Apr 2024 01:55:01 -0700 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Johannes Berg Subject: [PATCH 04/11] wifi: iwlwifi: mvm: extend STEP URM workaround for new devices Date: Mon, 15 Apr 2024 11:54:37 +0300 Message-Id: <20240415114847.db62bba6b2fa.Ie7fdc75c0b8759574a8744f0a316065cb791dd82@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240415085444.3840884-1-miriam.rachel.korenblit@intel.com> References: <20240415085444.3840884-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 Content-Transfer-Encoding: 8bit From: Johannes Berg The same applies for newer devices (currently SC), so just change the condition here. Signed-off-by: Johannes Berg Signed-off-by: Miri Korenblit --- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c index 1f8d4723512f..5958e48d812b 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c @@ -666,7 +666,7 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm) iwl_dbg_tlv_time_point(&mvm->fwrt, IWL_FW_INI_TIME_POINT_AFTER_ALIVE, NULL); - if (mvm->trans->trans_cfg->device_family == IWL_DEVICE_FAMILY_BZ) + if (mvm->trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_BZ) mvm->trans->step_urm = !!(iwl_read_umac_prph(mvm->trans, CNVI_PMU_STEP_FLOW) & CNVI_PMU_STEP_FLOW_FORCE_URM); -- 2.34.1