From patchwork Thu Jun 15 23:04:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 108735 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp974007vqr; Thu, 15 Jun 2023 16:21:10 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6pg779LTbLjqqEKvfZxeuZa2avsEjhjrIJGwVI6+4KXGY0JiGjDjR8DVzvQyZIr0AMvVGR X-Received: by 2002:a05:6a00:228e:b0:64c:c841:4e8a with SMTP id f14-20020a056a00228e00b0064cc8414e8amr609728pfe.22.1686871270295; Thu, 15 Jun 2023 16:21:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686871270; cv=none; d=google.com; s=arc-20160816; b=iaqRHEoM2TMVs8alQ2KuCwUZ7KONk4ZLIGh40a1kcD9D2DOKi7SgvTTi1CSuJIJgDp B74UOuwBKYlSOrCg9gHD+f4fLR1Kvg6r6lBHVxU+I4KCgz6H3QF9b+g78XzXqtICDKCH OIoOlxMOs+6YKf5e5ll3pt4WtjoMjV+7bfQu0a2K+jVMACLZr2TR3kCEt0zmVJvvXqn6 KE/eKzLtqmgnYuKby5oEMyWz98zCnCxMz6XmB8dH0om7z8GQn2PxU4uQ+gNgIhoZVUVJ xKbW+wEChMng8UUnHJx64lQUjcIoFE7HSxerKYvr5EHio0al8l6Tduqa5tuSSPL0B8rZ 362A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:message-id:content-transfer-encoding :mime-version:subject:date:from:dkim-signature; bh=DPTTV1Hgiub2SU0N4IlHX2bhUyooLVYtlEb1kqDrtW0=; b=ToXLsxVS6tqugWxQFF0YJhxmHd6I4LBe05/QoFZHvURoxO3vfLKXaIEtTwGVl6EdXW AC5xBiuxSVBgMNHhwJyn6Q9TzaMb53OMP2+jcE2UxSbhzFLTdiQJQkTIHXpPOehzJkAC tKCN2esp6sOHQYfLPxfbfcTnBLD1UHyqR74o7iuCdYbrMJ2idjH/6PTqf9VQcm7DVeG1 cds5auhBwvJrg/wiXhaaVWHrrT/LiXBIqwVSirW5zZSjUeqiR6OLtrCFwb/CFkpoouaY Yt1U+3+FmJV5K+cX4P9/h052zvRaQb0VhwdVaiYf+ISsu/t8K3vTCoEFRSG+NxvlUNYH w/KA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="Fz/zbDmJ"; 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 p123-20020a625b81000000b006668f12b055si2370543pfb.74.2023.06.15.16.20.50; Thu, 15 Jun 2023 16:21:10 -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="Fz/zbDmJ"; 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 S232031AbjFOXFE (ORCPT + 99 others); Thu, 15 Jun 2023 19:05:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232199AbjFOXEx (ORCPT ); Thu, 15 Jun 2023 19:04:53 -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 54141270E for ; Thu, 15 Jun 2023 16:04:52 -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 D79EB61D3D for ; Thu, 15 Jun 2023 23:04:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B209C433C0; Thu, 15 Jun 2023 23:04:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686870291; bh=8+cqmpEluGFJUjsLLUOCmEf447swesb08oyLW1en1sw=; h=From:Date:Subject:To:Cc:From; b=Fz/zbDmJxir+nK9UpEh2aBfB27t/vPAuEq35Odr8BAVk5v3dvNe8EVjYCk8L4fhyt ZDCf8S5VFbYMP4Z5uFL/B/jfBiMzw3lT/jCMd9k/DKMR4RTWtIAT+4FKTcjhTjJ5bg 4aHtBEyiN97mXKok/YBFSGAvc3uEfteoMG0hb13+vZcGafzbMJb+EEVMnxz+Mvrw8w kclAbtUfJQV5cQs2lbSEH0qnxB000Db20Cr1BXyLUUOFq6viB7hV6UACvT7oefpy4x +IrZZyFBcKXzk9Bg8UeM/bbfnZUDySqc3dwPGdK8buZDOgp6GPeJf+ZEmrodSfHZa1 /s9tUM07qtsGg== From: Mark Brown Date: Fri, 16 Jun 2023 00:04:40 +0100 Subject: [PATCH] regmap: Drop early readability check MIME-Version: 1.0 Message-Id: <20230615-regmap-drop-early-readability-v1-1-8135094362de@kernel.org> X-B4-Tracking: v=1; b=H4sIAAeZi2QC/x2NQQ6CMBAAv0L27Ca0tWr8iuGwpStsxNJsjUoIf 7d4nDnMrFBYhQtcmxWU31JkThXMoYF+pDQwSqwMtrWuPRmPysOTMkadMzLptFRDkYJM8lrQXZw NZ++JzRFqI1BhDEqpH/fKZ9bHrrPyXb7/7a3bth8TS8ZGhgAAAA== To: linux-kernel@vger.kernel.org, Konrad Dybcio Cc: Mark Brown X-Mailer: b4 0.13-dev-c6835 X-Developer-Signature: v=1; a=openpgp-sha256; l=1489; i=broonie@kernel.org; h=from:subject:message-id; bh=8+cqmpEluGFJUjsLLUOCmEf447swesb08oyLW1en1sw=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBki5kRpW8FX6gkrdmtBpRiHJCxgxBYszWPZJkze4iS MQtpGgGJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZIuZEQAKCRAk1otyXVSH0BN1B/ 4mv2FA2lK9jsOxosXcMBqP7xAdOVRP27AUrJqgsfDtjfKRRYI5U7EMlLNbn7CtKp8IMOJj0vy4EO61 BiTMsqECJkpsnygtkOo6v4ZcnHbH4jjXlW5NNGHu8UpOioeg52rcAs8OHD1+MhLFSu+MMGxPCl/Ao1 i6/tYhPGv7NAzHZ5LeeKkli9uA975I9uvDd2LL9GVgqF2l1mUqGngynF9rnrupCKExnoyhwg5biA3Y VTUhAmo5unKZGQftr4XYX/BbpS8UU88VKyQtHUZ1ty1KYKeUkwjtKEEyo8KmrJ1Z9V38HCNY3kAmsU Xq+XChIMwVh3vAn8qioHWG0b4ijNWg X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768812729184028292?= X-GMAIL-MSGID: =?utf-8?q?1768812729184028292?= We have some drivers that have a use case for cached write only registers, doing read/modify/writes on read only registers in order to work more easily with bitfields. Go back to trying the cache before we check if we can read from the device. Fixes: eab5abdeb79f0 ("regmap: Check for register readability before checking cache during read") Reported-by: Konrad Dybcio Signed-off-by: Mark Brown --- drivers/base/regmap/regmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- base-commit: 505cb70cd27abde24bd48b2c9a539cca485d722f change-id: 20230615-regmap-drop-early-readability-3832b755ae14 Best regards, diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index fad66b309ef9..89a7f1c459c1 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -2897,9 +2897,6 @@ static int _regmap_read(struct regmap *map, unsigned int reg, int ret; void *context = _regmap_map_get_context(map); - if (!regmap_readable(map, reg)) - return -EIO; - if (!map->cache_bypass) { ret = regcache_read(map, reg, val); if (ret == 0) @@ -2909,6 +2906,9 @@ static int _regmap_read(struct regmap *map, unsigned int reg, if (map->cache_only) return -EBUSY; + if (!regmap_readable(map, reg)) + return -EIO; + ret = map->reg_read(context, reg, val); if (ret == 0) { if (regmap_should_log(map))