From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id ED45545FCC; Thu, 2 Jan 2025 23:33:12 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 88BD740395; Thu, 2 Jan 2025 23:32:59 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id AB666402D8 for ; Thu, 2 Jan 2025 23:32:54 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1213) id 08CA72041A8E; Thu, 2 Jan 2025 14:32:54 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 08CA72041A8E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1735857174; bh=93/vq+UZud7DTY/pYdJ1D1l1xzwRqWkaJWvuz+OOtsc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pewGWj/wlyvAM1X3s0nS9CKW81ilHEvw5YOfoNpzWszJYxOu8j77sUlqaJVRzk40a 1uFc/x2jtRdNIpGAUJF4bYSErTuCXkrqF/7D5FAJ6ARcLD3T+SR4XaalmNHABfYp9m +JBueIB2GVJu/SwhCLPMTN/1OJjjKsjBI/HXCRew= From: Andre Muezerie To: Bruce Richardson , Anatoly Burakov Cc: dev@dpdk.org, Andre Muezerie Subject: [PATCH 4/5] drivers/net: use portable version of __builtin_add_overflow Date: Thu, 2 Jan 2025 14:32:47 -0800 Message-Id: <1735857169-19131-5-git-send-email-andremue@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1735857169-19131-1-git-send-email-andremue@linux.microsoft.com> References: <1735857169-19131-1-git-send-email-andremue@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org __builtin_add_overflow is gcc specific. It should be replaced with a portable version that can also be used with other compilers. Signed-off-by: Andre Muezerie --- drivers/net/ice/base/ice_nvm.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/ice/base/ice_nvm.c b/drivers/net/ice/base/ice_nvm.c index 56c6c96a95..1fc64b502c 100644 --- a/drivers/net/ice/base/ice_nvm.c +++ b/drivers/net/ice/base/ice_nvm.c @@ -3,6 +3,7 @@ */ #include "ice_common.h" +#include #define GL_MNG_DEF_DEVID 0x000B611C @@ -469,8 +470,6 @@ int ice_read_sr_word(struct ice_hw *hw, u16 offset, u16 *data) return status; } -#define check_add_overflow __builtin_add_overflow - /** * ice_get_pfa_module_tlv - Reads sub module TLV from NVM PFA * @hw: pointer to hardware structure @@ -500,7 +499,7 @@ ice_get_pfa_module_tlv(struct ice_hw *hw, u16 *module_tlv, u16 *module_tlv_len, return status; } - if (check_add_overflow(pfa_ptr, (u16)(pfa_len - 1), &max_tlv)) { + if (__rte_add_overflow_u16(pfa_ptr, (u16)(pfa_len - 1), &max_tlv)) { ice_debug(hw, ICE_DBG_INIT, "PFA starts at offset %u. PFA length of %u caused 16-bit arithmetic overflow.\n", pfa_ptr, pfa_len); return ICE_ERR_INVAL_SIZE; @@ -541,8 +540,8 @@ ice_get_pfa_module_tlv(struct ice_hw *hw, u16 *module_tlv, u16 *module_tlv_len, return ICE_ERR_INVAL_SIZE; } - if (check_add_overflow(next_tlv, (u16)2, &next_tlv) || - check_add_overflow(next_tlv, tlv_len, &next_tlv)) { + if (__rte_add_overflow_u16(next_tlv, (u16)2, &next_tlv) || + __rte_add_overflow_u16(next_tlv, tlv_len, &next_tlv)) { ice_debug(hw, ICE_DBG_INIT, "TLV of type %u and length 0x%04x caused 16-bit arithmetic overflow. The PFA starts at 0x%04x and has length of 0x%04x\n", tlv_sub_module_type, tlv_len, pfa_ptr, pfa_len); return ICE_ERR_INVAL_SIZE; -- 2.47.0.vfs.0.3