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 E359FC77B60 for ; Mon, 1 May 2023 02:57:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232203AbjEAC5w (ORCPT ); Sun, 30 Apr 2023 22:57:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232174AbjEAC5k (ORCPT ); Sun, 30 Apr 2023 22:57:40 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD54610FA; Sun, 30 Apr 2023 19:57:15 -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 A91A361628; Mon, 1 May 2023 02:57:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7C793C433EF; Mon, 1 May 2023 02:57:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682909833; bh=HLRyMgawJujuYVpZlrvvskARUUQdZ/XGpjg2b3W8cVk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bALZVpMXQ2H7pal0vTMOLWR30TiIhO6u4e/Q4cBVsRiUMEkt3+wGzJfP1f81oAB4K hqZxixjlIS9kW0hqGjAKnfbGbjybg4DrsSWY4k1wjPsVhgTYnMVJ0UyzlRI2ioTXSD qTD4AYHXMX6yqcKdP+c35yz1SnQ2VC9z+hHMPFBQIkrz0UnRe/I90LMAznO7sKoNb5 OiEKoKRtMdPwGyIF6BTguUtkIkTGgsnxfruYD8gUqx+qHTagB637PbkO0mc/+npmFA y4b3LmN0OtgUkBkCTNkkHg4FDvV0TS93zxcwqRAyMW8R/jOiiXcBbsR8UonTOpbM5g +H0R8QauvyJ+w== 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 6.3 08/44] regmap: cache: Return error in cache sync operations for REGCACHE_NONE Date: Sun, 30 Apr 2023 22:55:56 -0400 Message-Id: <20230501025632.3253067-8-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230501025632.3253067-1-sashal@kernel.org> References: <20230501025632.3253067-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: linux-kernel@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 362e043e26d86..8031007b4887d 100644 --- a/drivers/base/regmap/regcache.c +++ b/drivers/base/regmap/regcache.c @@ -349,6 +349,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); @@ -418,6 +421,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