From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) (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 DC9652E498A for ; Tue, 22 Jul 2025 11:07:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.15 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753182441; cv=none; b=AIsjigs18DbCIS9BYENWl2lTKZMFKjHE5YTA5fJntxmp7zyQCaKmvTXUmVzRIQa6FK/6IYJCDQ3KFDvO4PFq16n0u2QY/TUSdbrqtSY9QA2AalV0rEp6Os3pQp70pfwfHNVKwZWgETDXGV/ZdPi1HCPG4h49eygNfnK4Ag6vlKc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753182441; c=relaxed/simple; bh=UaUPbdCMu84U9XA3Acq479SpwOPQHptEGSZ2V1MPSHk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HkN1gDvGtA1Ffeg5a1sWoIVz8XtKLA+defQf2O7KgF/t5ySeqgZe89nu/3wYheUfAmO/ieaAfY22fqeIJ3yYL2m6/rs1KCOjt5/qr1gQxW4l3bxNHvcsCFdmq6C6vhrKNvKEqlBnd+AkkANWopOg4lxe9AWVuz5d1Y393lbXxfo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Xf+sCMhf; arc=none smtp.client-ip=198.175.65.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Xf+sCMhf" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1753182440; x=1784718440; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UaUPbdCMu84U9XA3Acq479SpwOPQHptEGSZ2V1MPSHk=; b=Xf+sCMhfeu76uFBkcQCqh0rx8HoRyN3O2+5HzxxAQY6k21QcBQOirQBY PfSiS2ad5DP/P+rJA+LAXXNhByy09W/yL9DTIZe9gS95MLJgz6M1kQ1XT AEPdAA2zPX+we72QVYlJgsS9qWKvr2kMEwvqXB4wt50Yr8vdIIgPWJu2C re624IINjzbEbHl+7Bv8PCOAau2u+kM2JD0qzpDasDEScAdkgivdBRMZh UpEZtuu/tzdJTguwwdx/OnpEYjlRWx8PTsfRvyZJlrV6RFt8G+NDfmBeN t1RBvYEBgT7PcXgXNV3TbgemrqH2km0uDw60ieF+vYLgNIFX6y+38u23H w==; X-CSE-ConnectionGUID: woU1j9mORYqU9yALkmVlaQ== X-CSE-MsgGUID: K/m4mx8lQN6jI7ULdY++/Q== X-IronPort-AV: E=McAfee;i="6800,10657,11499"; a="59083627" X-IronPort-AV: E=Sophos;i="6.16,331,1744095600"; d="scan'208";a="59083627" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jul 2025 04:07:20 -0700 X-CSE-ConnectionGUID: psUPYx6ETTOhJSpvXRJcbA== X-CSE-MsgGUID: 8LdxDishTt6XPQ/+3H2dnA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,331,1744095600"; d="scan'208";a="163154006" Received: from os-delivery.igk.intel.com ([10.102.21.165]) by fmviesa003.fm.intel.com with ESMTP; 22 Jul 2025 04:07:18 -0700 From: Michal Swiatkowski To: intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org, przemyslaw.kitszel@intel.com, dawid.osuchowski@linux.intel.com, Michal Swiatkowski Subject: [PATCH iwl-next v1 13/15] ice: reregister fwlog after driver reinit Date: Tue, 22 Jul 2025 12:45:58 +0200 Message-ID: <20250722104600.10141-14-michal.swiatkowski@linux.intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250722104600.10141-1-michal.swiatkowski@linux.intel.com> References: <20250722104600.10141-1-michal.swiatkowski@linux.intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Wrap libie_fwlog_register() by libie_fwlog_reregister(), which checks first if the registration is needed. This simplifies the code and makes the former function static. Reviewed-by: Przemek Kitszel Signed-off-by: Michal Swiatkowski --- drivers/net/ethernet/intel/ice/ice_fwlog.c | 11 ++++++++++- drivers/net/ethernet/intel/ice/ice_fwlog.h | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_fwlog.c b/drivers/net/ethernet/intel/ice/ice_fwlog.c index 775581163e04..e76397ade68b 100644 --- a/drivers/net/ethernet/intel/ice/ice_fwlog.c +++ b/drivers/net/ethernet/intel/ice/ice_fwlog.c @@ -290,7 +290,7 @@ static int libie_aq_fwlog_register(struct libie_fwlog *fwlog, bool reg) * After this call the PF will start to receive firmware logging based on the * configuration set in libie_fwlog_set. */ -int libie_fwlog_register(struct libie_fwlog *fwlog) +static int libie_fwlog_register(struct libie_fwlog *fwlog) { int status; @@ -1096,3 +1096,12 @@ void libie_get_fwlog_data(struct libie_fwlog *fwlog, u8 *buf, u16 len) libie_fwlog_ring_increment(&fwlog->ring.head, fwlog->ring.size); } } + +void libie_fwlog_reregister(struct libie_fwlog *fwlog) +{ + if (!(fwlog->cfg.options & LIBIE_FWLOG_OPTION_IS_REGISTERED)) + return; + + if (libie_fwlog_register(fwlog)) + fwlog->cfg.options &= ~LIBIE_FWLOG_OPTION_IS_REGISTERED; +} diff --git a/drivers/net/ethernet/intel/ice/ice_fwlog.h b/drivers/net/ethernet/intel/ice/ice_fwlog.h index 3698759c8ebb..e534205a2d04 100644 --- a/drivers/net/ethernet/intel/ice/ice_fwlog.h +++ b/drivers/net/ethernet/intel/ice/ice_fwlog.h @@ -79,6 +79,6 @@ struct libie_fwlog { int libie_fwlog_init(struct libie_fwlog *fwlog, struct libie_fwlog_api *api); void libie_fwlog_deinit(struct libie_fwlog *fwlog); -int libie_fwlog_register(struct libie_fwlog *fwlog); +void libie_fwlog_reregister(struct libie_fwlog *fwlog); void libie_get_fwlog_data(struct libie_fwlog *fwlog, u8 *buf, u16 len); #endif /* _LIBIE_FWLOG_H_ */ -- 2.49.0