From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.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 D0B5B3672BD for ; Tue, 18 Aug 2026 21:50:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787089854; cv=none; b=TDlk4lhbykJB3cPlvP1y2BmIpbvK5HsBENQ147LAviLMosqm6CE9LZxyUQ6AecbFgoywr6Em8u0rbnHCtbYU6MnSj0y+djdY5sbX3k9iSt8kSUDwRJbCiFgKYHU/a7tjjTqM25tP3U5QKncsTN9LybjZN5ruzoHGplcLR6gdc20= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787089854; c=relaxed/simple; bh=uFxMqukVO5YlvxV5/cy9Ia3Ua//bTQISjjvkMZCr2V8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To; b=l4LCPa1PXaU16ZZFwN+x4O/uKH5G30D/++KzoXbPkL4T3Her8vGf/9zFS2YdtZvKGQw0II8jBk51Q1+490d/25ule/uIC9dMwzx4Y9MlYtqdiq0a6FoxnFosRAOwggQNg9jtStcBvMOAC2DL4SSyYnO+wjU4BOhBlOr5sH0iQMc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Dl/qm53z; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Dl/qm53z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2190B1F00A3A; Tue, 18 Aug 2026 21:50:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1787089852; bh=Ry4QZbPnuEQxe4p4XNnGXWIIPWtSeHiaHlSEC8uvgLk=; h=From:Date:Subject:References:In-Reply-To:To; b=Dl/qm53zHh9GF6FcJ34/tRkRdaoW1NLKNFoa8THIN4RjHxLLQa6a/uT4vP3ITndfI zrvgnBOGOWwNH98twJ2eJEdd6q4VMjC7J2MCO/F1gVW8IM8keqT2alJSgnOB229F7g H/OVTNseU4q43EgVMQ1VHgPRsxXffp//XS5zMlW43aYLQk1IIjmqGf/xGPTG1PcIpb wwXDhLMIIdrH8sKLajI3tpljy5AZnnKnA2iLnFzC7nWhogbZc15ZzwlvGpO0kGnuqq kzvmEk1DMU+pEI3iE9VrMVSJwbUmbTgy8kNa3raHuiqCQqMl2ix3E+byzQN6L0Z+Eq Pml1lfh90pdbQ== From: Mark Brown Date: Tue, 18 Aug 2026 22:50:44 +0100 Subject: [PATCH 1/2] regmap: Allow a base register to be specified for the RAM regmap Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260818-regmap-kunit-cache-high-bit-v1-1-7e790676dea3@kernel.org> References: <20260818-regmap-kunit-cache-high-bit-v1-0-7e790676dea3@kernel.org> In-Reply-To: <20260818-regmap-kunit-cache-high-bit-v1-0-7e790676dea3@kernel.org> To: linux-kernel@vger.kernel.org, Mark Brown X-Mailer: b4 0.17-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=4888; i=broonie@kernel.org; h=from:subject:message-id; bh=uFxMqukVO5YlvxV5/cy9Ia3Ua//bTQISjjvkMZCr2V8=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBqhNO3LQ5hdmuEk+POYy5sg/Q6MzKCjie8NK5Bz /9KHsB2NmGJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCaoTTtwAKCRAk1otyXVSH 0OVqB/wJPdJaQh9l8sMC2lef4p2a8/9OuflwUXzERQtfz+n9CQl/OZEGcRDH7+x7ORK3IxqMG+7 mDypjwig1t/C2PseXakqpKfvrMw97qAYsraXB+UI+FieaQEVS8GYvHaG31/38RxHD4lI5rOaXPW CwpKAdJ3LXNsRBf3ZMawijLvPVHPw+BRsJANzduqJHp9G53+4Asbc0bX/FyupwpBKQTlucAGpx0 6U1S3Rjj/WwFUsYqDch5qXElyqUK+9KckHrARyTFkzt9VbdQ6y0dlH/SgbJbMII5GNjxKiLTfNp GtBFCGHIX6asYu6wwDHzRcDIcKcvHKjDWdfnILRU5F1yeRuE X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB To allow testing of register maps with very large register values add support for specifying base address to the RAM regmap. Since the config struct is shared with the raw RAM regmap also update that, though we will not use it. Signed-off-by: Mark Brown --- drivers/base/regmap/internal.h | 1 + drivers/base/regmap/regmap-ram.c | 26 ++++++++++++++++++++------ drivers/base/regmap/regmap-raw-ram.c | 21 +++++++++++++-------- 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h index 55273a6178f8..8176d91aacd1 100644 --- a/drivers/base/regmap/internal.h +++ b/drivers/base/regmap/internal.h @@ -322,6 +322,7 @@ static inline unsigned int regcache_get_index_by_order(const struct regmap *map, } struct regmap_ram_data { + unsigned int base_reg; unsigned int *vals; /* Allocatd by caller */ bool *read; bool *written; diff --git a/drivers/base/regmap/regmap-ram.c b/drivers/base/regmap/regmap-ram.c index c7356b0d8c83..a666bfb4d667 100644 --- a/drivers/base/regmap/regmap-ram.c +++ b/drivers/base/regmap/regmap-ram.c @@ -20,8 +20,11 @@ static int regmap_ram_write(void *context, unsigned int reg, unsigned int val) { struct regmap_ram_data *data = context; - data->vals[reg] = val; - data->written[reg] = true; + if (reg < data->base_reg) + return -EINVAL; + + data->vals[reg - data->base_reg] = val; + data->written[reg - data->base_reg] = true; return 0; } @@ -30,8 +33,11 @@ static int regmap_ram_read(void *context, unsigned int reg, unsigned int *val) { struct regmap_ram_data *data = context; - *val = data->vals[reg]; - data->read[reg] = true; + if (reg < data->base_reg) + return -EINVAL; + + *val = data->vals[reg - data->base_reg]; + data->read[reg - data->base_reg] = true; return 0; } @@ -60,17 +66,25 @@ struct regmap *__regmap_init_ram(struct device *dev, const char *lock_name) { struct regmap *map; + unsigned int num_regs; if (!config->max_register) { pr_crit("No max_register specified for RAM regmap\n"); return ERR_PTR(-EINVAL); } - data->read = kzalloc_objs(bool, config->max_register + 1); + if (data->base_reg > config->max_register) { + pr_crit("base_reg above max_register for RAM regmap\n"); + return ERR_PTR(-EINVAL); + } + + num_regs = config->max_register - data->base_reg + 1; + + data->read = kzalloc_objs(bool, num_regs); if (!data->read) return ERR_PTR(-ENOMEM); - data->written = kzalloc_objs(bool, config->max_register + 1); + data->written = kzalloc_objs(bool, num_regs); if (!data->written) { kfree(data->read); return ERR_PTR(-ENOMEM); diff --git a/drivers/base/regmap/regmap-raw-ram.c b/drivers/base/regmap/regmap-raw-ram.c index 60d6e95cdd1b..c63c464549f9 100644 --- a/drivers/base/regmap/regmap-raw-ram.c +++ b/drivers/base/regmap/regmap-raw-ram.c @@ -16,14 +16,17 @@ #include "internal.h" -static unsigned int decode_reg(enum regmap_endian endian, const void *reg) +static unsigned int decode_reg(struct regmap_ram_data *data, const void *reg) { const u16 *r = reg; + unsigned int decode; - if (endian == REGMAP_ENDIAN_BIG) - return be16_to_cpu(*r); + if (data->reg_endian == REGMAP_ENDIAN_BIG) + decode = be16_to_cpu(*r); else - return le16_to_cpu(*r); + decode = le16_to_cpu(*r); + + return decode - data->base_reg; } static int regmap_raw_ram_gather_write(void *context, @@ -40,7 +43,7 @@ static int regmap_raw_ram_gather_write(void *context, if (val_len % 2) return -EINVAL; - r = decode_reg(data->reg_endian, reg); + r = decode_reg(data, reg); if (data->noinc_reg && data->noinc_reg(data, r)) { memcpy(&our_buf[r], val + val_len - 2, 2); data->written[r] = true; @@ -74,7 +77,7 @@ static int regmap_raw_ram_read(void *context, if (val_len % 2) return -EINVAL; - r = decode_reg(data->reg_endian, reg); + r = decode_reg(data, reg); if (data->noinc_reg && data->noinc_reg(data, r)) { for (i = 0; i < val_len; i += 2) memcpy(val + i, &our_buf[r], 2); @@ -114,6 +117,7 @@ struct regmap *__regmap_init_raw_ram(struct device *dev, const char *lock_name) { struct regmap *map; + unsigned int regs; if (config->reg_bits != 16) return ERR_PTR(-EINVAL); @@ -123,11 +127,12 @@ struct regmap *__regmap_init_raw_ram(struct device *dev, return ERR_PTR(-EINVAL); } - data->read = kzalloc_objs(bool, config->max_register + 1); + regs = config->max_register - data->base_reg + 1; + data->read = kzalloc_objs(bool, regs); if (!data->read) return ERR_PTR(-ENOMEM); - data->written = kzalloc_objs(bool, config->max_register + 1); + data->written = kzalloc_objs(bool, regs); if (!data->written) return ERR_PTR(-ENOMEM); -- 2.47.3