Received: by 2002:a05:7412:8d1c:b0:fa:4c10:6cad with SMTP id bj28csp35154rdb; Tue, 16 Jan 2024 14:06:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IHdMDlnl5EDIWj97ax/9BVKOFw4/tDDoBeC2NpC4Qx7y19g98MDCXBl0+hXxEnUj3Sop3qv X-Received: by 2002:ac2:4da3:0:b0:50e:7bf5:5424 with SMTP id h3-20020ac24da3000000b0050e7bf55424mr3378863lfe.47.1705442807313; Tue, 16 Jan 2024 14:06:47 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705442807; cv=pass; d=google.com; s=arc-20160816; b=P8HUZtdNcgg/IyghYerSfbIyRRGZPpqy88UM4tqfJV4LCBU9ZJ2hDSUOyA4Gx46eii yS4O0nPUXxklJtMFrRC37SYT1LWEZYdH7oz6RtCEUcJEbJn49xD1ma8cuCmukI/Ie1n1 NJM2eRWou27HZHXJZp3BKwBBhI/5B7+Sw2YlugPK3lglSxlq1HyC+/+1sdp8JEiYBVqr 4ZlZ13ZaE5XYWz7OOvUUOgyVxdNWr+Ehc08U0fCbjq+LRFM7QSGEZ5gjI4JqkdF7rA1P BIsDzjjXmR2JoBgOYTRvp/rgf7Iyf8YEzeH3d86TzbC4hgN0LqReUyGxinopcCJ3i+tb mkog== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=Sv/73Q/DqbpoXZkFrzXDbMgpsc2k1jQAxrwHwWN6d58=; fh=Ac+NwqQJuwR/DDoRa0E8YA/WQ/6Hf1LcmtoQVVetZMc=; b=ZhARgvpnOGqasZmioluzsJvAn4QQGaKEpHIJxF0GeFR3c6ZO+yviQl68PoUlvxn3vX xiPO427wiXAChX3y1hF8qXirT/92zEABwM5qLTwX5dtlBx6t7uJOWXks4/Ucp/x8XlYt OMHkYVkBpLSnW+e7GFCWDGD/EWiFOBWVy0pXM7cYhNwqlDx7ly4+xzH5TlgH6At1TNhT lMy3TK+Vfv/bEpSUWoQfrCOULWfsF+WBVormGiWFkDY38UEim0SqfL/nAY6EHNP1Xkkh INTZFz2nYkZOH4kRMhcMzYkCkyTubfIH9eJV0hNf5vFjhgMhD545CVgKpueQGFiCx0ao WwhA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="qlB1/zzT"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-28231-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-28231-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id n21-20020a170906089500b00a27d15c911fsi5231361eje.755.2024.01.16.14.06.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jan 2024 14:06:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-28231-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="qlB1/zzT"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-28231-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-28231-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org 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 am.mirrors.kernel.org (Postfix) with ESMTPS id 092131F27E25 for ; Tue, 16 Jan 2024 22:06:47 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 230B016D219; Tue, 16 Jan 2024 20:05:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="qlB1/zzT" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 48A9E16D1FE; Tue, 16 Jan 2024 20:05:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705435508; cv=none; b=FQdVMcOin/WndAIpJzwoGUb5EnKLkhVFkc6Tf0dQiSZJfDSHTdXpaxhquA7VwRSNie3g5pGgyH+WTvgrbRYG4L3GwyWnp95DYXyn6IB3/KXBfDJzoe2TEq3oGILaDobp87bdB1XiqsiaDL0N5a9F1nMfoBfzFY4GGo7690V5W2M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705435508; c=relaxed/simple; bh=+YVms0AUFGvQO41yF5POmdSd8sSLh3fVoVZVNMsQxBk=; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:MIME-Version:X-stable: X-Patchwork-Hint:X-stable-base:Content-Transfer-Encoding; b=R82mGrBsiekwgeKwa+voTguFByWtiL78c8Wha0bv4KFTZ9HE9fm3BedABpKOiimSWzqM6WyRB/8y2A5UyFORHvcdDMJd2/N9EahQhAFQYTvzm+IEnc7hUhA4s9dpaF3jHTg+2j0Ek4PexhVYXZOxY9ogeJv86qMmixLufAq5Z0Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qlB1/zzT; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5CB5DC43394; Tue, 16 Jan 2024 20:05:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705435508; bh=+YVms0AUFGvQO41yF5POmdSd8sSLh3fVoVZVNMsQxBk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qlB1/zzTx/CpDhvCNCJ2V29Shc8xrNx8sNoR0vt9+/9qfgqcwquCo7l62a0YuNgr8 IJ1g3fzalkooXUSwidqyL/CRwbjm7hIMTX8QC4Y8Q7S+yL3talGjJYraRfpBU4cVgI TK1Nt1noE4p63ZuctQ30+mhmzYbbMjOXv8cO7UEP1MYvXdDwy6np6OsXwrGiNMjW8h w4kCTQ9cjbcthKkeqi/3jNfvybRrVttZkAZ7hNJkr0p0vTQ+TbZOAyXFGt3pYIUEwz 72T8BI4WOZd+X0DmLRxiR7EVQCVECjTupUA5rgksM/aBFPhwIPRk+hZhAa039xZfsr YhJqIsU77tLRQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Su Hui , Ping-Ke Shih , Kalle Valo , Sasha Levin , linux-wireless@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 20/22] wifi: rtlwifi: add calculate_bit_shift() Date: Tue, 16 Jan 2024 15:04:14 -0500 Message-ID: <20240116200432.260016-20-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240116200432.260016-1-sashal@kernel.org> References: <20240116200432.260016-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 4.19.305 Content-Transfer-Encoding: 8bit From: Su Hui [ Upstream commit 52221dfddbbfb5b4e029bb2efe9bb7da33ec1e46 ] There are many same functions like _rtl88e_phy_calculate_bit_shift(), _rtl92c_phy_calculate_bit_shift() and so on. And these functions can cause undefined bitwise shift behavior. Add calculate_bit_shift() to replace them and fix undefined behavior in subsequent patches. Signed-off-by: Su Hui Acked-by: Ping-Ke Shih Signed-off-by: Kalle Valo Link: https://msgid.link/20231219065739.1895666-2-suhui@nfschina.com Signed-off-by: Sasha Levin --- drivers/net/wireless/realtek/rtlwifi/wifi.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h index 0f3b98c5227f..0287cbb9a719 100644 --- a/drivers/net/wireless/realtek/rtlwifi/wifi.h +++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h @@ -3251,4 +3251,11 @@ static inline struct ieee80211_sta *rtl_find_sta(struct ieee80211_hw *hw, return ieee80211_find_sta(mac->vif, mac_addr); } +static inline u32 calculate_bit_shift(u32 bitmask) +{ + if (WARN_ON_ONCE(!bitmask)) + return 0; + + return __ffs(bitmask); +} #endif -- 2.43.0