From patchwork Wed Mar 12 06:24:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Swiatkowski X-Patchwork-Id: 14012904 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) (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 CABC01E571A for ; Wed, 12 Mar 2025 06:24:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741760689; cv=none; b=N2Ms7mA38KwOfD+XxIyUua8RVOyBzPODjUedLxIAHQkU5nHo77F06pYfHa0NHFxtcAKhRclfw/iS6Xm67M3j7z0QDPx5mxx0t+sXPYrGU7vz4+XCSCxSIQu4wQWDs6Kvp/97GqnbZO/FWhU6RPQlUfqwAyRPzy2Lkrww6Yt4cL8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741760689; c=relaxed/simple; bh=f7jVrCQKvaDwmfFBLWA7ybCVdKelIvpRJlfqSeslQos=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c27MsD2T0LNZcKqLbVMpIFxprsIoWlnPLF7N2w+O8zuXzKJAyBKC+tZWHnBM+9NzMzPN154WesmXdKahihfXSDfCyw5ODtHJYKc/0yJB6irXjhlUjAEYCBnx36l03lXbRHT9EPFDqc+PXpvqjmmuWFD0ZusypSSLqi4xt+wZkHQ= 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=eAAcRGhj; arc=none smtp.client-ip=198.175.65.18 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="eAAcRGhj" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741760688; x=1773296688; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=f7jVrCQKvaDwmfFBLWA7ybCVdKelIvpRJlfqSeslQos=; b=eAAcRGhjnOkS86TLQ5GI4sMiuwR/uqW5V6w9Vvykf8qYkxBHZFdmfmZ1 yis56oIliWpCXa1bGbrk2UnverKjpR6MDl0dDnLvhMg2VWEvOIGl23KAo bhK6LWgEDlTil29bojEcm+PS3Mu7m1iNyAFBUvVkFmwmKJ6wA1qwQu1Su 89bq1m23dn4F5N3H2aCOEDWi0XaYcCK6Z6c76LT5NuyX2U5bgO1K/u+Al tg+rHc7/DcywCNKQye64D92jFx7y1NNMfxjT0J3biVJUCr9kPsGkEuWna 2UEQuTnpzwMp6SRD2HphJ3K7G9XeHQVrBrDDyB0BlCfUx1sOUw+9FIJes g==; X-CSE-ConnectionGUID: U9S3kBiYQfewu1P9rCMN4g== X-CSE-MsgGUID: d0GRmzNYQQ23oVHRR8aOGg== X-IronPort-AV: E=McAfee;i="6700,10204,11370"; a="43005576" X-IronPort-AV: E=Sophos;i="6.14,240,1736841600"; d="scan'208";a="43005576" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2025 23:24:48 -0700 X-CSE-ConnectionGUID: OnRR4v9jQguJaiVB+pswtQ== X-CSE-MsgGUID: Bl1nWDZHTwyZItAOnZP0Zw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,240,1736841600"; d="scan'208";a="120569570" Received: from gk3153-dr2-r750-36946.igk.intel.com ([10.102.20.192]) by fmviesa007.fm.intel.com with ESMTP; 11 Mar 2025 23:24:45 -0700 From: Michal Swiatkowski To: intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org, aleksander.lobakin@intel.com, przemyslaw.kitszel@intel.com, piotr.kwapulinski@intel.com, aleksandr.loktionov@intel.com, jedrzej.jagielski@intel.com, larysa.zaremba@intel.com Subject: [iwl-next v1 7/8] iavf: use libie_aq_str Date: Wed, 12 Mar 2025 07:24:25 +0100 Message-ID: <20250312062426.2544608-8-michal.swiatkowski@linux.intel.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20250312062426.2544608-1-michal.swiatkowski@linux.intel.com> References: <20250312062426.2544608-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 X-Patchwork-Delegate: kuba@kernel.org There is no need to store the err string in hw->err_str. Simplify it and use common helper. hw->err_str is still used for other purpouse. It should be marked that previously for unknown error the numeric value was passed as a string. Now the "LIBIE_AQ_RC_UNKNOWN" is used for such cases. Add libie_aminq module in iavf Kconfig. Reviewed-by: Przemek Kitszel Reviewed-by: Larysa Zaremba Signed-off-by: Michal Swiatkowski --- drivers/net/ethernet/intel/Kconfig | 1 + .../net/ethernet/intel/iavf/iavf_prototype.h | 1 - drivers/net/ethernet/intel/iavf/iavf_common.c | 52 ------------------- drivers/net/ethernet/intel/iavf/iavf_main.c | 5 +- .../net/ethernet/intel/iavf/iavf_virtchnl.c | 2 +- 5 files changed, 5 insertions(+), 56 deletions(-) diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig index a8fa67fe9336..bf9408a2606a 100644 --- a/drivers/net/ethernet/intel/Kconfig +++ b/drivers/net/ethernet/intel/Kconfig @@ -260,6 +260,7 @@ config I40E_DCB config IAVF tristate select LIBIE + select LIBIE_ADMINQ select NET_SHAPER config I40EVF diff --git a/drivers/net/ethernet/intel/iavf/iavf_prototype.h b/drivers/net/ethernet/intel/iavf/iavf_prototype.h index 34b5ed87a9aa..7f9f9dbf959a 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_prototype.h +++ b/drivers/net/ethernet/intel/iavf/iavf_prototype.h @@ -34,7 +34,6 @@ void iavf_debug_aq(struct iavf_hw *hw, enum iavf_debug_mask mask, bool iavf_check_asq_alive(struct iavf_hw *hw); enum iavf_status iavf_aq_queue_shutdown(struct iavf_hw *hw, bool unloading); -const char *iavf_aq_str(struct iavf_hw *hw, enum libie_aq_err aq_err); const char *iavf_stat_str(struct iavf_hw *hw, enum iavf_status stat_err); enum iavf_status iavf_aq_set_rss_lut(struct iavf_hw *hw, u16 seid, diff --git a/drivers/net/ethernet/intel/iavf/iavf_common.c b/drivers/net/ethernet/intel/iavf/iavf_common.c index cc71e48b5689..614a886bca99 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_common.c +++ b/drivers/net/ethernet/intel/iavf/iavf_common.c @@ -7,58 +7,6 @@ #include "iavf_adminq.h" #include "iavf_prototype.h" -/** - * iavf_aq_str - convert AQ err code to a string - * @hw: pointer to the HW structure - * @aq_err: the AQ error code to convert - **/ -const char *iavf_aq_str(struct iavf_hw *hw, enum libie_aq_err aq_err) -{ - switch (aq_err) { - case LIBIE_AQ_RC_OK: - return "OK"; - case LIBIE_AQ_RC_EPERM: - return "LIBIE_AQ_RC_EPERM"; - case LIBIE_AQ_RC_ENOENT: - return "LIBIE_AQ_RC_ENOENT"; - case LIBIE_AQ_RC_ESRCH: - return "LIBIE_AQ_RC_ESRCH"; - case LIBIE_AQ_RC_EIO: - return "LIBIE_AQ_RC_EIO"; - case LIBIE_AQ_RC_EAGAIN: - return "LIBIE_AQ_RC_EAGAIN"; - case LIBIE_AQ_RC_ENOMEM: - return "LIBIE_AQ_RC_ENOMEM"; - case LIBIE_AQ_RC_EACCES: - return "LIBIE_AQ_RC_EACCES"; - case LIBIE_AQ_RC_EBUSY: - return "LIBIE_AQ_RC_EBUSY"; - case LIBIE_AQ_RC_EEXIST: - return "LIBIE_AQ_RC_EEXIST"; - case LIBIE_AQ_RC_EINVAL: - return "LIBIE_AQ_RC_EINVAL"; - case LIBIE_AQ_RC_ENOSPC: - return "LIBIE_AQ_RC_ENOSPC"; - case LIBIE_AQ_RC_ENOSYS: - return "LIBIE_AQ_RC_ENOSYS"; - case LIBIE_AQ_RC_EMODE: - return "LIBIE_AQ_RC_EMODE"; - case LIBIE_AQ_RC_ENOSEC: - return "LIBIE_AQ_RC_ENOSEC"; - case LIBIE_AQ_RC_EBADSIG: - return "LIBIE_AQ_RC_EBADSIG"; - case LIBIE_AQ_RC_ESVN: - return "LIBIE_AQ_RC_ESVN"; - case LIBIE_AQ_RC_EBADMAN: - return "LIBIE_AQ_RC_EBADMAN"; - case LIBIE_AQ_RC_EBADBUF: - return "LIBIE_AQ_RC_EBADBUF"; - } - - snprintf(hw->err_str, sizeof(hw->err_str), "%d", aq_err); - return hw->err_str; -} - /** * iavf_stat_str - convert status err code to a string * @hw: pointer to the HW structure diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c index 6d7ba4d67a19..9d825ba4e656 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_main.c +++ b/drivers/net/ethernet/intel/iavf/iavf_main.c @@ -50,6 +50,7 @@ MODULE_ALIAS("i40evf"); MODULE_DESCRIPTION("Intel(R) Ethernet Adaptive Virtual Function Network Driver"); MODULE_IMPORT_NS("LIBETH"); MODULE_IMPORT_NS("LIBIE"); +MODULE_IMPORT_NS("LIBIE_ADMINQ"); MODULE_LICENSE("GPL v2"); static const struct net_device_ops iavf_netdev_ops; @@ -1734,7 +1735,7 @@ static int iavf_config_rss_aq(struct iavf_adapter *adapter) if (status) { dev_err(&adapter->pdev->dev, "Cannot set RSS key, err %s aq_err %s\n", iavf_stat_str(hw, status), - iavf_aq_str(hw, hw->aq.asq_last_status)); + libie_aq_str(hw->aq.asq_last_status)); return iavf_status_to_errno(status); } @@ -1744,7 +1745,7 @@ static int iavf_config_rss_aq(struct iavf_adapter *adapter) if (status) { dev_err(&adapter->pdev->dev, "Cannot set RSS lut, err %s aq_err %s\n", iavf_stat_str(hw, status), - iavf_aq_str(hw, hw->aq.asq_last_status)); + libie_aq_str(hw->aq.asq_last_status)); return iavf_status_to_errno(status); } diff --git a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c index a6f0e5990be2..65340ba0b152 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c +++ b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c @@ -29,7 +29,7 @@ static int iavf_send_pf_msg(struct iavf_adapter *adapter, if (status) dev_dbg(&adapter->pdev->dev, "Unable to send opcode %d to PF, status %s, aq_err %s\n", op, iavf_stat_str(hw, status), - iavf_aq_str(hw, hw->aq.asq_last_status)); + libie_aq_str(hw->aq.asq_last_status)); return iavf_status_to_errno(status); }