linux-kernel - [PATCH 2/3] regmap: Add API call apply but not register a patch file

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1393011432-28909-2-git-send-email-ckeepax@opensource.wolfsonmicro.com>
Date:	Fri, 21 Feb 2014 19:37:11 +0000
From:	Charles Keepax <ckeepax@...nsource.wolfsonmicro.com>
To:	broonie@...nel.org
Cc:	gregkh@...uxfoundation.org, sameo@...ux.intel.com,
	lee.jones@...aro.org, linux-kernel@...r.kernel.org,
	patches@...nsource.wolfsonmicro.com
Subject: [PATCH 2/3] regmap: Add API call apply but not register a patch file

This patch provides a new regmap API call that allows a patch to be
applied but not registered with the regmap core. Common code between
this and the existing regmap_register_patch function is factored out to
reduce duplication.

This can be helpful when devices have more complex boot proceedures and
the patch file must be applied manually during the boot process.

Signed-off-by: Charles Keepax <ckeepax@...nsource.wolfsonmicro.com>
---
 drivers/base/regmap/regmap.c |   85 +++++++++++++++++++++++++++++++-----------
 include/linux/regmap.h       |    2 +
 2 files changed, 65 insertions(+), 22 deletions(-)

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index c2ba89a..faed8f1 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -2178,24 +2178,9 @@ int regmap_async_complete(struct regmap *map)
 }
 EXPORT_SYMBOL_GPL(regmap_async_complete);
 
-/**
- * regmap_register_patch: Register and apply register updates to be applied
- *                        on device initialistion
- *
- * @map: Register map to apply updates to.
- * @regs: Values to update.
- * @num_regs: Number of entries in regs.
- *
- * Register a set of register updates to be applied to the device
- * whenever the device registers are synchronised with the cache and
- * apply them immediately.  Typically this is used to apply
- * corrections to be applied to the device defaults on startup, such
- * as the updates some vendors provide to undocumented registers.
- */
-int regmap_register_patch(struct regmap *map, const struct reg_default *regs,
-			  int num_regs)
+int _regmap_apply_patch(struct regmap *map, const struct reg_default *regs,
+		       int num_regs)
 {
-	struct reg_default *p;
 	int i, ret;
 	bool bypass;
 
@@ -2203,8 +2188,6 @@ int regmap_register_patch(struct regmap *map, const struct reg_default *regs,
 	    num_regs))
 		return 0;
 
-	map->lock(map->lock_arg);
-
 	bypass = map->cache_bypass;
 
 	map->cache_bypass = true;
@@ -2224,6 +2207,67 @@ int regmap_register_patch(struct regmap *map, const struct reg_default *regs,
 		}
 	}
 
+out:
+	map->async = false;
+	map->cache_bypass = bypass;
+
+	return ret;
+}
+
+/**
+ * regmap_apply_patch: Apply register patch updates
+ *
+ * @map: Register map to apply updates to.
+ * @regs: Values to update.
+ * @num_regs: Number of entries in regs.
+ *
+ * Immediately applies a set of register updates to the device, but does
+ * not register them so they won't be reapplied on subsequent boots of
+ * the device.
+ */
+int regmap_apply_patch(struct regmap *map, const struct reg_default *regs,
+		       int num_regs)
+{
+	int ret;
+
+	map->lock(map->lock_arg);
+
+	ret = _regmap_apply_patch(map, regs, num_regs);
+
+	map->unlock(map->lock_arg);
+
+	regmap_async_complete(map);
+
+	return ret;
+}
+EXPORT_SYMBOL_GPL(regmap_apply_patch);
+
+/**
+ * regmap_register_patch: Register and apply register updates to be applied
+ *                        on device initialistion
+ *
+ * @map: Register map to apply updates to.
+ * @regs: Values to update.
+ * @num_regs: Number of entries in regs.
+ *
+ * Register a set of register updates to be applied to the device
+ * whenever the device registers are synchronised with the cache and
+ * apply them immediately.  Typically this is used to apply
+ * corrections to be applied to the device defaults on startup, such
+ * as the updates some vendors provide to undocumented registers.
+ */
+int regmap_register_patch(struct regmap *map, const struct reg_default *regs,
+			  int num_regs)
+{
+	struct reg_default *p;
+	int ret;
+
+	map->lock(map->lock_arg);
+
+	ret = _regmap_apply_patch(map, regs, num_regs);
+	if (ret != 0)
+		goto out;
+
 	p = krealloc(map->patch,
 		     sizeof(struct reg_default) * (map->patch_regs + num_regs),
 		     GFP_KERNEL);
@@ -2236,9 +2280,6 @@ int regmap_register_patch(struct regmap *map, const struct reg_default *regs,
 	}
 
 out:
-	map->async = false;
-	map->cache_bypass = bypass;
-
 	map->unlock(map->lock_arg);
 
 	regmap_async_complete(map);
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index fa4d079..c6d638a 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -423,6 +423,8 @@ void regcache_mark_dirty(struct regmap *map);
 bool regmap_check_range_table(struct regmap *map, unsigned int reg,
 			      const struct regmap_access_table *table);
 
+int regmap_apply_patch(struct regmap *map, const struct reg_default *regs,
+			  int num_regs);
 int regmap_register_patch(struct regmap *map, const struct reg_default *regs,
 			  int num_regs);
 
-- 
1.7.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/