From patchwork Thu Mar 30 00:10:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 76863 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp786542vqo; Wed, 29 Mar 2023 17:53:41 -0700 (PDT) X-Google-Smtp-Source: AKy350bRFE1KdXIDDLdc8TKYbrFSn8Un0bLiKnYaURA8azyyxvpJHD3vlFqMR1UawTScLgPpDOg5 X-Received: by 2002:a17:906:13cd:b0:931:2306:f363 with SMTP id g13-20020a17090613cd00b009312306f363mr22837627ejc.21.1680137621327; Wed, 29 Mar 2023 17:53:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680137621; cv=none; d=google.com; s=arc-20160816; b=KhU1XGCbnS/qA0lZY8EhylFjqnJy9gevS6oXF+mnCzAdMfbrUVkS4AUsLIQp+f3bee GDeGxu9L5cXWIxpxzCA5nnttQaqgsevWMQ8Pwi6c3LZn+tdKCZeNscI59BYbkvfiQE7V THi3j6KSUR2LA/CVNzJQKq4crFF7Ykv1G2U5V9JkT04e7OiqXx8jhvvyQJUnblBnG7Ia Y0MeIlJuCcLX/lk7LyhosLYSFnqBdRC+lkikhchnDQRXFT4gOwsCInVwAv47vtUd0ExI 30tfztU+ICyJbfNVp2spwRaENjfU/AtXYZPatVfnNaVfk6zSgYI9Gx+sl7VbpkHCnQy5 oCsQ== 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=QcjRSrK2d+jzvdjXGIt8iMi/3zZimW3xDQL7D4Ivfw1O1j+7JFnjkE+oJoCIoIpGRy A4ayxVvyEaBbT2qX/nUpo0k1vAT6bBgsBQC+QzsMeveJWSwH2ynquEFmTg/HChCRaqcg QCDaFKYMSm67CglzySZPHvkjMcib4EI9km6K/TIpujdCnDbq8+sV+vctDvDAturiuJ6+ WgaVs0tO2WQFZSWL/Pn3X42gqBNc/h5z1rQJ/9Dd+h1HPCWYMJphYX6pIoL46WtmyzCI GubGM1bsbvcTJy+jbkG1+XB3NxDT8peVHy6Y/aKig1qj1wIvOU1pGVM/UjmbvjCJNHpO qiTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VYrIzViU; 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 ca15-20020a170906a3cf00b008dd491949d5si34813208ejb.553.2023.03.29.17.53.17; Wed, 29 Mar 2023 17:53:41 -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=VYrIzViU; 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 S229844AbjC3AKj (ORCPT + 99 others); Wed, 29 Mar 2023 20:10:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36918 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229694AbjC3AKh (ORCPT ); Wed, 29 Mar 2023 20:10:37 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4AC0F4202 for ; Wed, 29 Mar 2023 17:10:36 -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 DB122B82548 for ; Thu, 30 Mar 2023 00:10:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 67081C4339C; Thu, 30 Mar 2023 00:10:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680135033; bh=QomJxmHFHEg1D6+6n5cFYGToSzAqlNRqVQNvQ76f0pE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=VYrIzViUDhkCXh0s4reRK+ILASouwRvLkS+lo+OwpqLf5qDlm5HeyqYEb7VTPjblq ITunRr5Xqxv0pNaw1swr1mWO2+61uIxKM7mpjb3ugSrYdenqQoYvOzs9RMnoXY+7+/ 1ctwK5SXwi9HkKqtEKmAJd7ebHMGNEtYK3c4mO4qui1koPWz21y4M7PKYKC55UPEyU rhraEWJ65KKSX0wFLuRGaz7xCx5a5e69xIkn+F7RrcmCzQZMe4/IbN7l0rweXtlA9V 1yAGVExyf7e/zT0ZOWJadQHeYge16xFOLikuCJsGauayTrt/EY6zKrsNjgXzYiXvtd 2OZX4khsi2+QA== From: Mark Brown Date: Thu, 30 Mar 2023 01:10:23 +0100 Subject: [PATCH v3 1/2] regmap: Factor out single value register syncing MIME-Version: 1.0 Message-Id: <20230325-regcache-maple-v3-1-23e271f93dc7@kernel.org> References: <20230325-regcache-maple-v3-0-23e271f93dc7@kernel.org> In-Reply-To: <20230325-regcache-maple-v3-0-23e271f93dc7@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=owGbwMvMwMWocq27KDak/QLjabUkhhSVy8U+5oW63pf41jOds+HM+qDQu/CX+uabosuPxf79fG+q Nuv2TkZjFgZGLgZZMUWWtc8yVqWHS2yd/2j+K5hBrEwgUxi4OAVgIq+N2f/7H9NIbbAuuixX9D7vH1 sB5+y9bHqGKd9+KeuaT8w3rrew//dTRKLF1yDp/XXLXxlnO+dzbl7eFbnrTJvd0sPGtx+Jrxb6djdZ Wf1jaa7L7QPFlm+eScnHflv3p7Jd3jBzhdfea3mF939cUeR/lBKbWpuZLM46a14d74OPzmt35PzZeT 6td8mUIvXrP7Vz1bnZb+hyNzVph5jq93NvvO/ZOzskrkJtGpNY/Iacatdpdma1Leub1VgrvhyyM7+8 RGru1P8nXL9dM8rJ0o8MiUvosdvPwTL5/2TpbQ+CjExfe2hHKZvOmpRTI8zdIcjwT/A0t+4m3hW/by 2/05viu8pEaIq9kEnZxqDbwurcAA== 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?1761751986099787172?= X-GMAIL-MSGID: =?utf-8?q?1761751986099787172?= 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;