From patchwork Mon Jul 17 20:33:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 121598 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1342143vqt; Mon, 17 Jul 2023 14:02:01 -0700 (PDT) X-Google-Smtp-Source: APBJJlG5LoSvlIo5JFrMJDtKcTWx99VoXo5C+VmwdmtXrjmh5naL0PmQ9PUpQjkh4qslQgt0WwKx X-Received: by 2002:a05:6a20:12ca:b0:121:fd18:4b51 with SMTP id v10-20020a056a2012ca00b00121fd184b51mr16857441pzg.36.1689627721245; Mon, 17 Jul 2023 14:02:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689627721; cv=none; d=google.com; s=arc-20160816; b=voOLB4WkI0kSBOG9w80Cb0Fmf6zyGVRycK/SiXJUZ7UgdgWaIZ/rVYaMA/qYs00cs+ CZyThKIs9/dRpFdHqUxQIdNpQMSyz3jMsP+rbsxIiFXry9yMHTw7Lv6NLnoH1/8Z1fuf 7fMig3mSeahcaDVISf3ZAeFYZZRwAP3KEAGlDWEIByO8p2SVybuQ2cEU1XWXj+8eDi83 ARRu8PVcqZRN/QKkDOyozfvI9+IuAHuEVTyXKDmVh6CX8KhJTuFnJsQzxh75Qp+CnQwM 5SDlSL5QlcVsodCOmbrtm8E4yHaH8MZj2u6raiZk0MnIll0hZ1SHvIzj3qzNqq4rTiDN G5CQ== 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=wv5mLLcrIQB+nJ7uZqlf0WoBB1+a37AaQ+lx5j1ABFg=; fh=McUMXeUuhXkaH27wfiHa8kg8t6UxwDdzZ1NoGqLVlME=; b=PO5riFF3gkiKolR3skqan2HfeNOnwDcEHaduniZUApSn0+VxSD594y4Vnp0pFC8euP WeUgyegiA9JFWnhqRMkSzlguvC2SvbjdGodrBi96g/TBXZcCTPrXESr7ftJq6mBwL6Og mM9T/HC9JM0kyyP2c+UCJh5K5he5dcg4DzCR9qqNOCVf773rNlasOuPtNmMCLLWWQc3F 4oYq7l3+R1zWYpKvQHVuwUQpcwSn8uyOgqR3pOM2AIx/v7ACYC9qGKzAHY+BG9018Ome LRqHGMexIGGHmw421+5u6eh9dxvm3xuhvp6d/x2lyBsZJWlGHinff7k/H3M/ANbSe/98 2kYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=dfbHZzBN; 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 j184-20020a6380c1000000b00537c6c285a0si369095pgd.167.2023.07.17.14.01.46; Mon, 17 Jul 2023 14:02:01 -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=dfbHZzBN; 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 S230428AbjGQUdT (ORCPT + 99 others); Mon, 17 Jul 2023 16:33:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230241AbjGQUdR (ORCPT ); Mon, 17 Jul 2023 16:33:17 -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 5F20A191 for ; Mon, 17 Jul 2023 13:33:16 -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 E75DB61278 for ; Mon, 17 Jul 2023 20:33:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 12199C433C7; Mon, 17 Jul 2023 20:33:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689625995; bh=asnEKCSLQS/uNfyRgYl+ksnbJzzBRAv8Ur+NiRrtqSE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=dfbHZzBNjmAh2GPJQXl4+PaLzVLBTGWLswICTnQVJW216Oo8KlI66DrLdViLmyf2C 9rK28bfTGMx4Q0OHIrus77fko1PutrcwiMIHF41ViglSealy8zAZgcAwvU3SnTewYc oynzCKz+H5BOCykQKioEVO8XQlr6ea6iOYeG8yeFCCSUtoaWHfnZYYAzMpldeu/5Fd sPcKYDeBugl4TJ0gadfrRYF9R0wMV2mu822lsNUEbgr8dvQPF3RD39KWkCeriq7sU6 2o/nO4NJQCSZ2LUcDVwOlVZPDyzep9NAdPclZDWYNki1And5yKrvoTOUWjZHu9l683 g2XEA7uVOyktw== From: Mark Brown Date: Mon, 17 Jul 2023 21:33:03 +0100 Subject: [PATCH 1/3] regmap: Let users check if a register is cached MIME-Version: 1.0 Message-Id: <20230717-regmap-cache-check-v1-1-73ef688afae3@kernel.org> References: <20230717-regmap-cache-check-v1-0-73ef688afae3@kernel.org> In-Reply-To: <20230717-regmap-cache-check-v1-0-73ef688afae3@kernel.org> To: Jaroslav Kysela , Takashi Iwai Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Mark Brown X-Mailer: b4 0.13-dev-099c9 X-Developer-Signature: v=1; a=openpgp-sha256; l=1894; i=broonie@kernel.org; h=from:subject:message-id; bh=asnEKCSLQS/uNfyRgYl+ksnbJzzBRAv8Ur+NiRrtqSE=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBktaWFmLfcJep5LqvVZiSrYHrXWYcDXZnPESyRi cO5BUNFXQKJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZLWlhQAKCRAk1otyXVSH 0IDsCACCdkNOcaAD2yxTysnsoFA5Go65pphKHCRH16FNb9l77a994IjWeN6pqJb/HoIhCx4v8qm NV9os3vvsXgvzc++6x42Fe0DnYKdlF4FWccBqddxjdYtGKxQFocxz6QxfDJMApOrf8jjgBQ2Lga LrrOASaENXQfKC1M7W/+MBpzvLhEzXi3Zlm9rtoGNce3EFxYe4XZBCWkT6LHlF/ggLDMk+4PjUo b5aVLhhWfO0rLd0ZodVPjM7S3IWWjsahQC0HiTZQB7QhVowINFH3+DFd7HjAPBQvLM/aQvw9lRx SR2v3OItdm7tkpng4SgeDNv76HdCJQIYiaYP0T5+q2VHcx5z X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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: INBOX X-GMAIL-THRID: 1771703077790915580 X-GMAIL-MSGID: 1771703077790915580 The HDA driver has a use case for checking if a register is cached which it bodges in awkwardly and unclearly. Provide an API which allows it to directly do what it's trying to do. Signed-off-by: Mark Brown --- drivers/base/regmap/regcache.c | 23 +++++++++++++++++++++++ include/linux/regmap.h | 1 + 2 files changed, 24 insertions(+) diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c index 28bc3ae9458a..4d25a906b688 100644 --- a/drivers/base/regmap/regcache.c +++ b/drivers/base/regmap/regcache.c @@ -561,6 +561,29 @@ void regcache_cache_bypass(struct regmap *map, bool enable) } EXPORT_SYMBOL_GPL(regcache_cache_bypass); +/** + * regcache_reg_cached - Check if a register is cached + * + * @map: map to check + * @reg: register to check + * + * Reports if a register is cached. + */ +bool regcache_reg_cached(struct regmap *map, unsigned int reg) +{ + unsigned int val; + int ret; + + map->lock(map->lock_arg); + + ret = regcache_read(map, reg, &val); + + map->unlock(map->lock_arg); + + return ret == 0; +} +EXPORT_SYMBOL_GPL(regcache_reg_cached); + void regcache_set_val(struct regmap *map, void *base, unsigned int idx, unsigned int val) { diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 8fc0b3ebce44..c9182a47736e 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -1287,6 +1287,7 @@ int regcache_drop_region(struct regmap *map, unsigned int min, void regcache_cache_only(struct regmap *map, bool enable); void regcache_cache_bypass(struct regmap *map, bool enable); void regcache_mark_dirty(struct regmap *map); +bool regcache_reg_cached(struct regmap *map, unsigned int reg); bool regmap_check_range_table(struct regmap *map, unsigned int reg, const struct regmap_access_table *table); From patchwork Mon Jul 17 20:33:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 121597 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1341649vqt; Mon, 17 Jul 2023 14:01:21 -0700 (PDT) X-Google-Smtp-Source: APBJJlGXia+KByHDfR27HN26zLh9M1uPzX5ApNCJvSwyNKyoS/oFWVRbDhJyekzG8uPQ9aNwGswx X-Received: by 2002:a17:90b:882:b0:262:fbb4:1a with SMTP id bj2-20020a17090b088200b00262fbb4001amr11932704pjb.20.1689627680723; Mon, 17 Jul 2023 14:01:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689627680; cv=none; d=google.com; s=arc-20160816; b=pHuU3vjEb1/gRrkiz7PhmhsnUk5lBwGeb+4YOxGjYb6WAu12OD5Xnnip6XIYXHTUfX XHwHljgTQnYT8I+rndm98E6axY2X7MMluzZvSn1UiMAfWUs1+MSZNepE4+Ut0uNBJclv 3h64RvrEnndOa/ESW6eiMMPRoAqXki5Mt7aQM+CqwrR5ky5YuzbrEH3tFJIwAZTUizHH zTz2g99IAIbcpl5gOYTEE/i+sLFtnLqvC6Ka5zuDbLJF4PNHh1gdCbkqOxpXMmp9+QfB Vw+zhpnwOxY9U7Wq0avzoMyJ0kzNSogDBmm3LCVDWWom65UCxmiu6iweEAoN6pDEdKnl ze0w== 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=nrHUUi6gjCa+eALPRz2kTQ7hp7Gb/+vkFkMFY3jq6FE=; fh=McUMXeUuhXkaH27wfiHa8kg8t6UxwDdzZ1NoGqLVlME=; b=iP+xE67oGD8gtinHXj5k3c6G2Jzn+uccw9Olq8otyU+upn6WFoMpRa/Qh8UcW4fhP7 8Ui4/oevWfDLUlpzOnYeqMwtbdmeXHi8uW6yrdECEpq8SurbyZ+U8QMH+KHCHrhSlrfG tAn7Lxln+zN03GOcW6qeOkcIWGJ/tUwRTWU30JVF0p2gCfnrOTJdkK9aKj38p3ys/wLT XWtPgK2YJ16ySLVOFZmSEEMNqv0o+jGvsr1444lcmmuJs6wzTMzsGjflqDIXsqUY4fem ZPV19ti7jjmNTZ83a4VD7KRKyaS2atepZnClkAE+2EHwFId6LZs9TD8kPuqO5BWZr9rJ HoCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bYUx7Tx+; 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 i11-20020a636d0b000000b0055ffa8eed68si380340pgc.92.2023.07.17.14.01.06; Mon, 17 Jul 2023 14:01:20 -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=bYUx7Tx+; 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 S229918AbjGQUdX (ORCPT + 99 others); Mon, 17 Jul 2023 16:33:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230419AbjGQUdS (ORCPT ); Mon, 17 Jul 2023 16:33:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E44C191 for ; Mon, 17 Jul 2023 13:33:18 -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 C09B06125B for ; Mon, 17 Jul 2023 20:33:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF7D3C433CC; Mon, 17 Jul 2023 20:33:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689625997; bh=b4IseGb2UCJOtvGxtD0s69we2S7StSFhtsSuvhYajGE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=bYUx7Tx+9t535IoOQV/4NtVlpxBG7M991N4cV4OqhNx4wRPhr5DGivfAiQryXF12n pJxVGPrmIzvL/TZwHM+ndvVkxwTe5qR8ln0ERy6uxlPeS1+ZUfJ47CwqIrddBzOT50 +IEERnG54L7UMOCXTeF10Ur06YR1yyKMDweQDUsnv0Ht3WcwzD5Nt0zkOmfbHK6Ybr s7L1jz8KoO6bU0+MLGZgJdjxjJ53yjtwb1G23Nhp66NYNgIGk2PGCgNawDN3M21BSh emIahnZHgmy9xiPaE6mt+7/4Ux4zJ+XyLR99spw0xiV8YekKvK9cDQXvsKOaVIiTNB oJJFlJLLGNJkA== From: Mark Brown Date: Mon, 17 Jul 2023 21:33:04 +0100 Subject: [PATCH 2/3] regmap: Provide test for regcache_reg_present() MIME-Version: 1.0 Message-Id: <20230717-regmap-cache-check-v1-2-73ef688afae3@kernel.org> References: <20230717-regmap-cache-check-v1-0-73ef688afae3@kernel.org> In-Reply-To: <20230717-regmap-cache-check-v1-0-73ef688afae3@kernel.org> To: Jaroslav Kysela , Takashi Iwai Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Mark Brown X-Mailer: b4 0.13-dev-099c9 X-Developer-Signature: v=1; a=openpgp-sha256; l=2145; i=broonie@kernel.org; h=from:subject:message-id; bh=b4IseGb2UCJOtvGxtD0s69we2S7StSFhtsSuvhYajGE=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBktaWGL+nsYDeQ22H29T7708cuCbVpYatWsfswB LsgPmEyUSSJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZLWlhgAKCRAk1otyXVSH 0GQhB/9KWjFZlmAi+CPCw9ErcXaD+o+f0UjE/xjMg7gOp/EfCUE6G2TwovHElx9AmZ0pmW3Ua+H LLIazLhmOHiSHmoYSQ94ocWkaYUWes9LUSOfVeQsVinH+LHGFmCUy3dc1BrE+Va0wbXbohaCpO1 lQeW9sv+UBPQRB/4cPXPd3bvfBb+ov1+mQ8TST3PqLXkkYymkJCT8W+5hxGa2H4tk1hpFJVa5Tq 9RG4/ljJ8eZoNKAkwD9uwkMlSLpKsF4qy8V90N0wgZ+7rDLzT2zVzDGntkGFVsTdb7b4hqAuBZ0 aac6c469KmaIBHy4OBB2ADZpICLO6aiyVzMmDOOB6lLC7f0s X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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: INBOX X-GMAIL-THRID: 1771703034598510584 X-GMAIL-MSGID: 1771703034598510584 Provide a KUnit test for the newly added API. Signed-off-by: Mark Brown --- drivers/base/regmap/regmap-kunit.c | 40 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/drivers/base/regmap/regmap-kunit.c b/drivers/base/regmap/regmap-kunit.c index 24257aa9004d..8dd96a55d976 100644 --- a/drivers/base/regmap/regmap-kunit.c +++ b/drivers/base/regmap/regmap-kunit.c @@ -833,6 +833,45 @@ static void cache_drop(struct kunit *test) regmap_exit(map); } +static void cache_present(struct kunit *test) +{ + struct regcache_types *t = (struct regcache_types *)test->param_value; + struct regmap *map; + struct regmap_config config; + struct regmap_ram_data *data; + unsigned int val; + int i; + + config = test_regmap_config; + config.cache_type = t->type; + + map = gen_regmap(&config, &data); + KUNIT_ASSERT_FALSE(test, IS_ERR(map)); + if (IS_ERR(map)) + return; + + for (i = 0; i < BLOCK_TEST_SIZE; i++) + data->read[i] = false; + + /* No defaults so no registers cached. */ + for (i = 0; i < BLOCK_TEST_SIZE; i++) + KUNIT_ASSERT_FALSE(test, regcache_reg_cached(map, i)); + + /* We didn't trigger any reads */ + for (i = 0; i < BLOCK_TEST_SIZE; i++) + KUNIT_ASSERT_FALSE(test, data->read[i]); + + /* Fill the cache */ + for (i = 0; i < BLOCK_TEST_SIZE; i++) + KUNIT_EXPECT_EQ(test, 0, regmap_read(map, i, &val)); + + /* Now everything should be cached */ + for (i = 0; i < BLOCK_TEST_SIZE; i++) + KUNIT_ASSERT_TRUE(test, regcache_reg_cached(map, i)); + + regmap_exit(map); +} + struct raw_test_types { const char *name; @@ -1172,6 +1211,7 @@ static struct kunit_case regmap_test_cases[] = { KUNIT_CASE_PARAM(cache_sync_readonly, real_cache_types_gen_params), KUNIT_CASE_PARAM(cache_sync_patch, real_cache_types_gen_params), KUNIT_CASE_PARAM(cache_drop, sparse_cache_types_gen_params), + KUNIT_CASE_PARAM(cache_present, sparse_cache_types_gen_params), KUNIT_CASE_PARAM(raw_read_defaults_single, raw_test_types_gen_params), KUNIT_CASE_PARAM(raw_read_defaults, raw_test_types_gen_params), From patchwork Mon Jul 17 20:33:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 121594 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1336294vqt; Mon, 17 Jul 2023 13:46:57 -0700 (PDT) X-Google-Smtp-Source: APBJJlE0lLJEnV9qqmFG4OTP8WnghPInKjbvC3Bks1I3z1ymi9ssKgii8b97bAbDTPQnoHWCkwLk X-Received: by 2002:a05:6e02:1aa7:b0:348:8eb8:3ae1 with SMTP id l7-20020a056e021aa700b003488eb83ae1mr861058ilv.13.1689626816967; Mon, 17 Jul 2023 13:46:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689626816; cv=none; d=google.com; s=arc-20160816; b=GU39i0e8sye0+Kq1Yycp8r2Le+If+ooQsKNSfDBdEbmurzWi/foCFcDTkkAqG7ncSN xmtQwjwjqXAQ5K4lwY2LWcSqCZeg+4FpmCLRhqJe1mSlFwfpIWjSqkUdsIFowzvI4L6R 79w2YJrK9OA+pxI3t3Jo3/Isk2qctQBWjcKpFMBnB+knPBi7VybNfWG/3y6vbgJuLq0J IdUzCmAJWvW0U8eobfY6Kncr8zn18Zj9or6lO1kIJVTSUbo6lYywyGKgg+w9jsDf5KiN +IHJGjZe5I8rDf079TB4jtNOpFlXaasA6HMjF+5EQODj5KWpqLxfyDKrwDMtpM5bfXCz t/ww== 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=ee8Ku8MX72Tm9J/NEm0GOURoZ9bKLLw0DBw9D2wUaf4=; fh=McUMXeUuhXkaH27wfiHa8kg8t6UxwDdzZ1NoGqLVlME=; b=XQj7B8++a+/JAEwFS7rVnXiiy6aMozDmDymNuYcZ8A8cVhHhFcytUt7VyOj2YsFXFl wG4xaINRAmv3kpZoKuA6z0+VgfYR44TV7e+c6lk1++/A17xAXLd456zfI0Pjg7a5Ki3P JY+CMvr8OPmIGxCWwUeE2QzYzpDJ0NjJkHkEvl8qZ1pOgdr44Rje6Cfobc+s8m3bywBF 2FArmcXprgfSSukMYH8ad8bo2Zyc0/2V8tjx/tCanECWk427aeuUKRorF9h0QY2mPfF1 d/1pEBvLIwXW+unFTh33CroVW8bTQnkZmw/Cak9E2MCGoOVENc2Q7L/VIZbU0KU9UXNW RfIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=gLZUVojg; 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 lj14-20020a17090b344e00b00263e4949dbbsi419175pjb.29.2023.07.17.13.46.42; Mon, 17 Jul 2023 13:46:56 -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=gLZUVojg; 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 S230491AbjGQUd1 (ORCPT + 99 others); Mon, 17 Jul 2023 16:33:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230447AbjGQUdV (ORCPT ); Mon, 17 Jul 2023 16:33:21 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 143081A8 for ; Mon, 17 Jul 2023 13:33:20 -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 975DA61254 for ; Mon, 17 Jul 2023 20:33:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B94ECC433C8; Mon, 17 Jul 2023 20:33:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689625999; bh=cdhA/uWMGFYNLiuZXNgnxDS/KR9lMC2udWWSbRYPndE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=gLZUVojg4jKy4PTMuuRaJRkPy+KTOrIc2UqPsvLIftUTjRU0kvMiaTuoTgweG9Bht gDFKrXKBxBCs+bnehoD3lhqDPcmEDlSGL6Idg9YliOGb435aFLHWn5PHm8/uCb3Kpm LDaOJU5IrN8F5ERCzO4kozWw4HWr+CTKw9cPrimuqScteGzPG3tEnRkSJ+YGKLXLYF 8oV/pREqjmFcItdEBJncwBwbGTV6R7uYNsU0Mkp+/0bZfzDp9mXJptYkw//OTqgE0E RNPM3BrwctvGv3QNMKYhdq3dEbQCBp8UIOVb909e4fIhvossYCCIUNYtbLks91BjZ1 MGv+Am4MHzkGw== From: Mark Brown Date: Mon, 17 Jul 2023 21:33:05 +0100 Subject: [PATCH 3/3] ALSA: hda: Use regcache_reg_cached() rather than open coding MIME-Version: 1.0 Message-Id: <20230717-regmap-cache-check-v1-3-73ef688afae3@kernel.org> References: <20230717-regmap-cache-check-v1-0-73ef688afae3@kernel.org> In-Reply-To: <20230717-regmap-cache-check-v1-0-73ef688afae3@kernel.org> To: Jaroslav Kysela , Takashi Iwai Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Mark Brown X-Mailer: b4 0.13-dev-099c9 X-Developer-Signature: v=1; a=openpgp-sha256; l=1479; i=broonie@kernel.org; h=from:subject:message-id; bh=cdhA/uWMGFYNLiuZXNgnxDS/KR9lMC2udWWSbRYPndE=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBktaWHp8xs+otXp3Fz83pPngNJL1ch5h3eptyOK 9g68ULu8WKJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZLWlhwAKCRAk1otyXVSH 0FCcB/4/yqh/MT+mdIfR75L/u63k+FCJNO88xJeft85zjt58cF6oIUCQASp6BHpO+VK0Mqo+gaj vG2O+pbUy5tqfb6sVSbE3smMne18FuwqkldckIQsIxAQsJmjZgroJDCXgjiFqmIpfURfXQE021y kBTCvDuGa4jfVy7zC5w8JYa6TabufjXiuWOZ04u9a+8ngQjVvPbJFxFEG3OMKpGdOx/mHIhyFj/ OjMt+3AN1u3TX69YaRBa+908Tpc7x20j2RZro3hA/wiZ8Ogw2Xj1C//ABatTJx3oh57QxhcfXqC oMyVfCXaeM3x8HbZiNxXDtBC/mob9h9QTvXJLImqCDortOj+ X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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: INBOX X-GMAIL-THRID: 1771702128755027110 X-GMAIL-MSGID: 1771702128755027110 The HDA driver intentionally drops repeated writes to registers in some circumstances, beyond the suppression of noop writes that regmap does in regmap_update_bits(). It does this by checking if the register is cached before doing a regmap_update_bits(), now we have an API for querying this directly use it directly rather than trying a read in cache only mode making the code a little clearer. Signed-off-by: Mark Brown --- sound/hda/hdac_regmap.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sound/hda/hdac_regmap.c b/sound/hda/hdac_regmap.c index 9b1bcabd8414..97cee096a286 100644 --- a/sound/hda/hdac_regmap.c +++ b/sound/hda/hdac_regmap.c @@ -556,17 +556,14 @@ EXPORT_SYMBOL_GPL(snd_hdac_regmap_update_raw); static int reg_raw_update_once(struct hdac_device *codec, unsigned int reg, unsigned int mask, unsigned int val) { - unsigned int orig; - int err; + int err = 0; if (!codec->regmap) return reg_raw_update(codec, reg, mask, val); mutex_lock(&codec->regmap_lock); - regcache_cache_only(codec->regmap, true); - err = regmap_read(codec->regmap, reg, &orig); - regcache_cache_only(codec->regmap, false); - if (err < 0) + /* Discard any updates to already initialised registers. */ + if (!regcache_reg_cached(codec->regmap, reg)) err = regmap_update_bits(codec->regmap, reg, mask, val); mutex_unlock(&codec->regmap_lock); return err;