From nobody Fri Dec 19 20:14:46 2025 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 34B50229BFC; Sun, 24 Mar 2024 23:48:52 +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=1711324133; cv=none; b=tyR5zJv28SAyOsyCeBaRqbT1E1yZRMzwKuPmEaWfa9SXoXCEglYqA0Wfg3mQKTCbvHY0zs3vGBFedRjE+lIzDL8vtiEpF+6YjEbOZFdiXT6V/uWn9C7xKy5UGHNBuK56yNMrrPF17rJP4xApG2np67u5iOF6QV8nCpSn/qZsNZU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711324133; c=relaxed/simple; bh=MA3h5jTrsIKATIHVkASldqtCcIv3oJwBvd1pfRey8s0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ts+5B8F2vllQDzBtbHuP+Zq7zOJH40GC0AgLInN6QOKRewF+QK9PXw5IXgN6RDJdFyYQfE7bgjdoGZQBVjNLEOc++mwAoe1OnFelrFBo6wjxGqc3PHz8w+MAFWdnM/wbnDotObcV1fcca/ekwq/iHNAxBvJmP6WuO2dFToQ5uiY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=l/lySQEG; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="l/lySQEG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 71D64C43390; Sun, 24 Mar 2024 23:48:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711324132; bh=MA3h5jTrsIKATIHVkASldqtCcIv3oJwBvd1pfRey8s0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l/lySQEGZy0gl2AWmPbVC26yWzvj+Vt4tXnRFEQhMRLJNU8OCb5Xs2yXGR8K+QcdF Oy159PfHUStgDa8X0IPYiDKfFKK0j3YUtG7g+ITJgutyaVuVp97f0QTWfiDKKU70r6 rgW0HYc0FooRgpbStAlZCmwBvTIgiIHfNKKHISUpZL9/flhKoFhlGcdz8P7e2F+6XE Yed1J2REg838nUQd+0xPWamXJFpn5rcJSMbXPiEKoUpkldngNMWq0+bgqPlSHsFUxq 6FkASqixQg/Sva7sS7Hi7dyLNOYmqSnN4v87mqnIq4fhJxyiwvW7Hrm1ih46G5b2/K YnyN21R+TuGiw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Baruch Siach , Miquel Raynal , Sasha Levin Subject: [PATCH 5.4 129/183] mtd: maps: physmap-core: fix flash size larger than 32-bit Date: Sun, 24 Mar 2024 19:45:42 -0400 Message-ID: <20240324234638.1355609-130-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324234638.1355609-1-sashal@kernel.org> References: <20240324234638.1355609-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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Baruch Siach [ Upstream commit 3884f03edd34887514a0865a80769cd5362d5c3b ] mtd-ram can potentially be larger than 4GB. get_bitmask_order() uses fls() that is not guaranteed to work with values larger than 32-bit. Specifically on aarch64 fls() returns 0 when all 32 LSB bits are clear. Use fls64() instead. Fixes: ba32ce95cbd987 ("mtd: maps: Merge gpio-addr-flash.c into physmap-cor= e.c") Signed-off-by: Baruch Siach Signed-off-by: Miquel Raynal Link: https://lore.kernel.org/linux-mtd/9fbf3664ce00f8b07867f1011834015f21d= 162a5.1707388458.git.baruch@tkos.co.il Signed-off-by: Sasha Levin --- drivers/mtd/maps/physmap-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/maps/physmap-core.c b/drivers/mtd/maps/physmap-cor= e.c index e4f72b2df8039..fa7e1c0b70c64 100644 --- a/drivers/mtd/maps/physmap-core.c +++ b/drivers/mtd/maps/physmap-core.c @@ -505,7 +505,7 @@ static int physmap_flash_probe(struct platform_device *= dev) if (!info->maps[i].phys) info->maps[i].phys =3D res->start; =20 - info->win_order =3D get_bitmask_order(resource_size(res)) - 1; + info->win_order =3D fls64(resource_size(res)) - 1; info->maps[i].size =3D BIT(info->win_order + (info->gpios ? info->gpios->ndescs : 0)); --=20 2.43.0