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 1A444C77B7F for ; Mon, 1 May 2023 03:17:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233329AbjEADRi (ORCPT ); Sun, 30 Apr 2023 23:17:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233992AbjEADQd (ORCPT ); Sun, 30 Apr 2023 23:16:33 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 316CF5245; Sun, 30 Apr 2023 20:07:22 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 879AC617BD; Mon, 1 May 2023 03:06:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C154C433A7; Mon, 1 May 2023 03:06:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682910398; bh=DCVNbjGMGfIbz2CpfFSPJzI4jiwj0IB8pQKaeMtyeCY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PGAAVHZGBefRDN5IcqDZ6JjGQ4CuOSb6sN3rmJJjO/uh1cu0cyuWGQi6qUC6emCLo uP52QhQy/JJ9LVzJ07mwheArHdruBdvlaiHe7uKyTo7VDh0CM8xuFQxWG2iRW1iGD4 o/TRvZGfhCcvt9hMDglBIY2QzdUQw3NCdMOHC/oVUeqvWkiCtCV2kPKQn1L6+nh3uM 0Yovgne3PTdF8140uoVL4D/j16SckVY7yQehaDazocJhyl1F9tD6ubBTs7iFQSuff6 x2gxt7rMbNJ1dpzWwU72tzXfmrlcEuKI9FnaCcp4BlX1yBnNDW/XID2FDaYHpenehU J23j31fdcVqEQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alexander Stein , Mark Brown , Sasha Levin , gregkh@linuxfoundation.org Subject: [PATCH AUTOSEL 4.19 2/9] regmap: cache: Return error in cache sync operations for REGCACHE_NONE Date: Sun, 30 Apr 2023 23:06:24 -0400 Message-Id: <20230501030633.3255202-2-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230501030633.3255202-1-sashal@kernel.org> References: <20230501030633.3255202-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Alexander Stein [ Upstream commit fd883d79e4dcd2417c2b80756f22a2ff03b0f6e0 ] There is no sense in doing a cache sync on REGCACHE_NONE regmaps. Instead of panicking the kernel due to missing cache_ops, return an error to client driver. Signed-off-by: Alexander Stein Link: https://lore.kernel.org/r/20230313071812.13577-1-alexander.stein@ew.tq-group.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/base/regmap/regcache.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c index 773560348337f..b78e4b6e2c9da 100644 --- a/drivers/base/regmap/regcache.c +++ b/drivers/base/regmap/regcache.c @@ -347,6 +347,9 @@ int regcache_sync(struct regmap *map) const char *name; bool bypass; + if (WARN_ON(map->cache_type == REGCACHE_NONE)) + return -EINVAL; + BUG_ON(!map->cache_ops); map->lock(map->lock_arg); @@ -416,6 +419,9 @@ int regcache_sync_region(struct regmap *map, unsigned int min, const char *name; bool bypass; + if (WARN_ON(map->cache_type == REGCACHE_NONE)) + return -EINVAL; + BUG_ON(!map->cache_ops); map->lock(map->lock_arg); -- 2.39.2