Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2627569lqp; Mon, 25 Mar 2024 05:03:00 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXFiPKqUtcng26v3UFHLfU5N++9dGNzUCsQkyjOATZeD0JDCW0sG3b94l88J+CBh7IO2c97T3x2puETf490l2gu9mMTM6aqAGNoQZi9NQ== X-Google-Smtp-Source: AGHT+IHLccoGXah8P5E9tRdTmcfJ6lrDOuOf7apXu5YCc5U9T6emwwjcKp11P7KgdhcBfdhg7zO4 X-Received: by 2002:a17:903:41c1:b0:1e0:b699:8da6 with SMTP id u1-20020a17090341c100b001e0b6998da6mr5547971ple.9.1711368180305; Mon, 25 Mar 2024 05:03:00 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711368180; cv=pass; d=google.com; s=arc-20160816; b=UoTnDnHfNBbmojhxb4F6804KzKIPFroUADg4goxVaYfscilyAeNXjMHRJ0y2K9P+K5 O1R7qxs+ppE8JMODHWEJKE8nSXs/CicxyJfhisZpJQyV0b/woLiqPAvsgCffJRqNUgab 7jSFfsMJgY5w+DaVZp05uBTRZPVPM6tQHFJeiC8Tprc/gWeRqm1uW24+FsuNJ2Jw6msP TFF4zq8fajtVZfuHvW9Ga2hbBblLZXl02WgsTu/3rwBmW91hfJUEaAhdqWZH+iw7W+Lk RtkkaxSl1bXeO9Y7h/oClKkvvtZgYG/UexM8ruxTzSIloLUIUTH7YgXqkGbhLlX7wdMb 34Dw== 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=uvHmpRK54bnJfWBThXCBLt8kZ96xgyJO4SN8qDeuPVo=; fh=Kvb0olXaAAKlc1b4q4QuEhiFsF5niCoATAbE1CGZMjA=; b=uncO0VjVVe+krVlXD21nYhQjCEsiQiwx4pvrExfq8V7Qlgf5ifPdxEwogNNCWPEAAz z1CrDr2nOOk+OUBmn/LfIPDq8CjJpQz4Zu5x5F0MDyvGrKjTKznVoLne9US8Oji3hpB/ T9o4PnNtsEnUpiorcB+faDh3OmJq5MFJgRJWfRU4y/nfbjR5Mskt18ZVwjFJx20kyqFt yp5PBjiB0Bl4MneFtGAtPfg8iJmo+d5yp0a26ck7YSF2K5kVLGirtzcJDa6DKkiUQJtP 06GB2JYkm3noOt65BIosbOR/nwZf30qMMZt+253ud3PRSb7F9TuuNXdS4WHz2DJd+qCM 8iDA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="DM8/10Ho"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115502-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115502-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id u2-20020a170902e5c200b001dddb014623si5261738plf.211.2024.03.25.05.02.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 05:03:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-115502-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="DM8/10Ho"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115502-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115502-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 0F20FB203DA for ; Mon, 25 Mar 2024 11:06:36 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DAFA423453A; Mon, 25 Mar 2024 02:41:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="DM8/10Ho" 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 0CC481EC62F; Sun, 24 Mar 2024 22:55:45 +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=1711320945; cv=none; b=g0JQweE5xq+mnnNIm/T196l+vYNVsOBH+BhabcppI+iGMOuCLgetcf/DAtyrCtlAT6agOqtZiPMzfFNSTsSZ8PorgcWcAu1y1x77TQhChF13FSvCMFzKyzj+nQbxXcKnUjCXNOXaCWTWXXgFHhD++bQ3gjNBdZcaJVkn88P36Bc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320945; c=relaxed/simple; bh=sWyVu6d3FCExpe2I4sev1PhrNYX3DKWSnHtNndgvNy0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=avBuT7Ph1GPh7uLEpvMBRFOMQk0VvWxb4ziTXM4f4ks0yRf3SE5kmrbWA7Wu3N3sQdB7R9JBoBLBgP3+w40OW2PkwW2q+DU4By9I3zO3AbOLCDiSH5ojmPN43yVAjr2a9kDV7N6sXwlbhaJwa4x20Ra/SLNuOdtZrqiRXnRPjKU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DM8/10Ho; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 43B1AC433F1; Sun, 24 Mar 2024 22:55:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711320944; bh=sWyVu6d3FCExpe2I4sev1PhrNYX3DKWSnHtNndgvNy0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DM8/10HoZZL43wB7eFXLL4kEWlhDq8xzTTnG/YCu4x8j6tvqhJn9zwHKnvThPlomV Yk5YAcx3Qnjon6Sts/wPQVbWZgt0ow69nq+5Veg23R9V49q3ybGxKQiQ6U0bqzv0n/ oJir2TLedZW5VEPMDp33rtF7/ARaCs/1y2TjOz480+boPD04LOK4u7L/6Io9UB9GM2 AlB81Xc0YnC4WyNivlpOmMN7srI+uDKwhqY+ierrHd5bc7ZNXrAHZrC5fXZvBfAo3w S3xNumNnsOqUF+ogqihw6qzLMSNr+0QKe1WRm2to1Mi1fdf7G/JK1p8xsammG0cjx1 BOpYbaSFFxZYw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Baruch Siach , Miquel Raynal , Sasha Levin Subject: [PATCH 6.7 508/713] mtd: maps: physmap-core: fix flash size larger than 32-bit Date: Sun, 24 Mar 2024 18:43:54 -0400 Message-ID: <20240324224720.1345309-509-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324224720.1345309-1-sashal@kernel.org> References: <20240324224720.1345309-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: 8bit 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-core.c") Signed-off-by: Baruch Siach Signed-off-by: Miquel Raynal Link: https://lore.kernel.org/linux-mtd/9fbf3664ce00f8b07867f1011834015f21d162a5.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-core.c index 746a27d15d440..96eb2e782c382 100644 --- a/drivers/mtd/maps/physmap-core.c +++ b/drivers/mtd/maps/physmap-core.c @@ -518,7 +518,7 @@ static int physmap_flash_probe(struct platform_device *dev) if (!info->maps[i].phys) info->maps[i].phys = res->start; - info->win_order = get_bitmask_order(resource_size(res)) - 1; + info->win_order = fls64(resource_size(res)) - 1; info->maps[i].size = BIT(info->win_order + (info->gpios ? info->gpios->ndescs : 0)); -- 2.43.0