From patchwork Sun Mar 26 13:42:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 75063 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp949068vqo; Sun, 26 Mar 2023 06:53:35 -0700 (PDT) X-Google-Smtp-Source: AKy350ZLng9SiE6+CbN0Y6Hn2UDEh1NLIUM1xYDEEXorSMc1kPHoLItk6vGx4W4ZZiiNoGOFayGW X-Received: by 2002:aa7:9f82:0:b0:626:658:c998 with SMTP id z2-20020aa79f82000000b006260658c998mr7789358pfr.10.1679838814855; Sun, 26 Mar 2023 06:53:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679838814; cv=none; d=google.com; s=arc-20160816; b=zybtJtvLpnxsJs7rz9xW9G+gUlnl40rNn1850d5fe+HQ4zro+6dIdmbzpzibrQuJQA RKgUgKfYkkAz4035e2Il+8Qp2IHCzrXiNpAsmd8JDNZOaW2Y4qdHq7agLWvE3H62BoeB 7P2yWn4Vs1/umW4Tcvu1MT2g+AITTp1zmtYDJOdPvyw0ndlnJIN6Q2hrDTi8PuRpxjSs aHTyF2Sa2OHMj2rDwISPiqHXvMbNgr2y5KmMWqrHR6YKdOP8jPwuEBDIXsWhjZvSQQQ4 oCNkvl7AIUtSgM54VzQHTMH2fEUvIz3UFpHH7PW4BdBq/o8qXMeS+ujQ5SKx4cd/9MMu 2YQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=nQnSNejNxO3/mijX3W3id9G7IlXi3raY3edSBW2FUuc=; b=tQ5/XbMvIXepLIYYZ+8ZQafnhnoRJRwXXzk/SinrFDXpg0mtI++2povdV+LkkdJItN z6PAAAYCfsZz7imuvYlVD31QpuMB3363lMLUfbmDH7flMqbprBQ9aLCbAqve7rLJ3GOa fXVIJzPeT+RgtGOZCO3UMLFCkYIeCntsJLxi1gsTPXGIDsaufSzm8PFDXjgVIYySdWQ6 /MYmWw1mn3TjmdXyNTWtCOTpM1ScJ0lVZSHg1qhWe8WMuVI8sckEtJx7+qUc1bVXjSzy M0mG4WF7fmlm/n0vhqV4OItV6k/vhQTQ6ze57b5I5+Rcl/6quRcDPR9jHZRVs5PAtPgr F2tA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=D+Sdrs9y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f13-20020a65400d000000b0050c0e269719si24339564pgp.513.2023.03.26.06.53.22; Sun, 26 Mar 2023 06:53:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=D+Sdrs9y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231966AbjCZNm7 (ORCPT + 99 others); Sun, 26 Mar 2023 09:42:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230123AbjCZNmy (ORCPT ); Sun, 26 Mar 2023 09:42:54 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08F2972AB for ; Sun, 26 Mar 2023 06:42:52 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 77C71B80C9A for ; Sun, 26 Mar 2023 13:42:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 204DAC433EF; Sun, 26 Mar 2023 13:42:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1679838170; bh=QomJxmHFHEg1D6+6n5cFYGToSzAqlNRqVQNvQ76f0pE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=D+Sdrs9yVNlYys8gz9LIFR7W4UwRT+pPt3M02zS9/T+iCIerY74bm8BnJUZMpW6Dr Yq7VqJxfT9nl6FtBQOyk0DwJPA52+pFxjolIczpOY9RjS6QiN0DpH1sZrgrlV82OEF o4SsjTvLE2wTkvLcZgjeAuUunNVVfwqEyt8vcioPmvsOqQO9FL2ripJC5xmR+inIg5 EiGIPxusQ3NE0QkoQPs5oFkZU2W2leY8nOuHMyGtQvzuy6X5PUfGu7Dp1uaBjLv35Q h9aiQE+nflrTMIQyTDhbKP4z+rB9kK8R0gGSr5bnITr5XGqakndMt0+NLPGLLBNXVA /a2rE7aqpy6iw== From: Mark Brown Date: Sun, 26 Mar 2023 14:42:38 +0100 Subject: [PATCH v2 1/2] regmap: Factor out single value register syncing MIME-Version: 1.0 Message-Id: <20230325-regcache-maple-v2-1-799dcab3ecb1@kernel.org> References: <20230325-regcache-maple-v2-0-799dcab3ecb1@kernel.org> In-Reply-To: <20230325-regcache-maple-v2-0-799dcab3ecb1@kernel.org> To: "Liam R. Howlett" Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Mark Brown X-Mailer: b4 0.13-dev-2eb1a X-Developer-Signature: v=1; a=openpgp-sha256; l=2689; i=broonie@kernel.org; h=from:subject:message-id; bh=QomJxmHFHEg1D6+6n5cFYGToSzAqlNRqVQNvQ76f0pE=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBkIEvVZtvtk5LqHIofZVwrdWpYutCKKSOUZgBYKqpc rZvCqXeJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZCBL1QAKCRAk1otyXVSH0JtzB/ 41ddUryS62ss/+QHOKfK7Xwje0qB/PpTxcabZVNL1tuNehf+GnsMC140hRMR4qPvIhd2A4wUkjU2w8 71Z79RH2pLxYRQ03bxjuzCqvekrO9OyDTQ1gPYmbKXxRjzJuiq472TOi463b7zEPaL5mGLhxNJBgCK z/BxAH6ZKlycr8NKjizwFOyhe4NECoox5D95yXQGX4tJGCd9xdl9CzOzHrv4j+30hIo5o+Na5EcXKf T0aUw8rrakl0Ebgq4LhPbjwptRydT+3rA8cTgbb3U66bcazSwHJ2Gj/mjcCf5bBNRS+YxVipTLu5R5 7vJUq6LQ+DY6njuNWXadFM2Q1YL9kQ X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-5.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761438665041155191?= X-GMAIL-MSGID: =?utf-8?q?1761438665041155191?= In order to support sparse caches that don't store data in raw format factor out the parts of the raw block sync implementation that deal with writing a single register via _regmap_write(). Signed-off-by: Mark Brown --- drivers/base/regmap/internal.h | 1 + drivers/base/regmap/regcache.c | 40 ++++++++++++++++++++++++++-------------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h index 10aca7119d33..7b9ef43bcea6 100644 --- a/drivers/base/regmap/internal.h +++ b/drivers/base/regmap/internal.h @@ -270,6 +270,7 @@ unsigned int regcache_get_val(struct regmap *map, const void *base, bool regcache_set_val(struct regmap *map, void *base, unsigned int idx, unsigned int val); int regcache_lookup_reg(struct regmap *map, unsigned int reg); +int regcache_sync_val(struct regmap *map, unsigned int reg, unsigned int val); int _regmap_raw_write(struct regmap *map, unsigned int reg, const void *val, size_t val_len, bool noinc); diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c index d4877099e990..e5d6b535c002 100644 --- a/drivers/base/regmap/regcache.c +++ b/drivers/base/regmap/regcache.c @@ -669,6 +669,30 @@ static bool regcache_reg_present(unsigned long *cache_present, unsigned int idx) return test_bit(idx, cache_present); } +int regcache_sync_val(struct regmap *map, unsigned int reg, unsigned int val) +{ + int ret; + + if (!regcache_reg_needs_sync(map, reg, val)) + return 0; + + map->cache_bypass = true; + + ret = _regmap_write(map, reg, val); + + map->cache_bypass = false; + + if (ret != 0) { + dev_err(map->dev, "Unable to sync register %#x. %d\n", + reg, ret); + return ret; + } + dev_dbg(map->dev, "Synced register %#x, value %#x\n", + reg, val); + + return 0; +} + static int regcache_sync_block_single(struct regmap *map, void *block, unsigned long *cache_present, unsigned int block_base, @@ -685,21 +709,9 @@ static int regcache_sync_block_single(struct regmap *map, void *block, continue; val = regcache_get_val(map, block, i); - if (!regcache_reg_needs_sync(map, regtmp, val)) - continue; - - map->cache_bypass = true; - - ret = _regmap_write(map, regtmp, val); - - map->cache_bypass = false; - if (ret != 0) { - dev_err(map->dev, "Unable to sync register %#x. %d\n", - regtmp, ret); + ret = regcache_sync_val(map, regtmp, val); + if (ret != 0) return ret; - } - dev_dbg(map->dev, "Synced register %#x, value %#x\n", - regtmp, val); } return 0;