From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08AA8EB64D9 for ; Thu, 15 Jun 2023 11:40:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344131AbjFOLkd (ORCPT ); Thu, 15 Jun 2023 07:40:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343988AbjFOLjB (ORCPT ); Thu, 15 Jun 2023 07:39:01 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3477358D; Thu, 15 Jun 2023 04:38:19 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5330B6391A; Thu, 15 Jun 2023 11:38:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2476BC433CB; Thu, 15 Jun 2023 11:38:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686829098; bh=44+CWWT8rfsec06AFFRF0CQ3ypck0n6NqlYkpddrr8U=; h=From:To:Cc:Subject:Date:From; b=A6GkOATK6lJWqcdfGo2CafGLBKLyma/KWY0idtLqg5B76Ri6VA8yvqoQav2KIBrSh iUIPa0+mMJh5G3uTmw6JjtABMpkvjShbkOnR20RBeKvwJqdJjwL9DCFo1HKbVPfBBB P6iP/afIiz8y+kSAoCefTmtpbqMea5LolzTL8RQ0mSlRugKyP2JgSmr2+QLykrM5CR CDOgNWnWO0Ij/KogsvtP5kekWoVXIFDc9KI6wkN5Kwhl7Dt8Y8PKNZhAiJFQ7vidsN iKCWzjutf6eK1vxoq9fxgnhQnkzyK0Et+24VIek3gOMv0CDrWU1tewABHfhrZmsmow 3B0G5JVXHRjiQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jim Wylder , Sasha Levin , broonie@kernel.org, gregkh@linuxfoundation.org Subject: [PATCH AUTOSEL 6.1 01/16] regmap: Account for register length when chunking Date: Thu, 15 Jun 2023 07:38:01 -0400 Message-Id: <20230615113816.649135-1-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.34 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jim Wylder [ Upstream commit 3981514180c987a79ea98f0ae06a7cbf58a9ac0f ] Currently, when regmap_raw_write() splits the data, it uses the max_raw_write value defined for the bus. For any bus that includes the target register address in the max_raw_write value, the chunked transmission will always exceed the maximum transmission length. To avoid this problem, subtract the length of the register and the padding from the maximum transmission. Signed-off-by: Jim Wylder --- drivers/base/regmap/regmap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 7de1f27d0323d..8359164bff903 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -2064,6 +2064,8 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg, size_t val_count = val_len / val_bytes; size_t chunk_count, chunk_bytes; size_t chunk_regs = val_count; + size_t max_data = map->max_raw_write - map->format.reg_bytes - + map->format.pad_bytes; int ret, i; if (!val_count) @@ -2071,8 +2073,8 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg, if (map->use_single_write) chunk_regs = 1; - else if (map->max_raw_write && val_len > map->max_raw_write) - chunk_regs = map->max_raw_write / val_bytes; + else if (map->max_raw_write && val_len > max_data) + chunk_regs = max_data / val_bytes; chunk_count = val_count / chunk_regs; chunk_bytes = chunk_regs * val_bytes; -- 2.39.2