tegra: hwpm: add func to write sticky bits

Currently, HWPM requires raw readl/writel functions
to access sticky bits and as workaround for IP registers.
- Move the raw readl/writel logic along with IO mapping
of the address to a static function.
- Implement the wrapper functions to access sticky bits
and IP registers to use the created static functions.

Jira THWPM-86

Change-Id: Ib0b3229d4b8795d19aca142233622a166436e3bd
Signed-off-by: Vedashree Vidwans <vvidwans@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-hwpm/+/3014028
Reviewed-by: Adeel Raza <araza@nvidia.com>
Reviewed-by: Vasuki Shankar <vasukis@nvidia.com>
Reviewed-by: Seema Khowala <seemaj@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>

drivers/tegra/hwpm/include/tegra_hwpm_io.h

@@ -71,6 +71,9 @@ static inline u32 get_field(u32 input_data, u32 mask)
 #define tegra_hwpm_read_sticky_bits(hwpm, reg_base, reg_offset, val) \
 	tegra_hwpm_read_sticky_bits_impl(hwpm, reg_base, reg_offset, val)
 
+#define tegra_hwpm_write_sticky_bits(hwpm, reg_base, reg_offset, val) \
+	tegra_hwpm_write_sticky_bits_impl(hwpm, reg_base, reg_offset, val)
+
 #define tegra_hwpm_fake_readl(hwpm, aperture, addr, val)	\
 	tegra_hwpm_fake_readl_impl(hwpm, aperture, addr, val)
 

drivers/tegra/hwpm/os/linux/io_utils.c

@@ -26,16 +26,12 @@
 #include <tegra_hwpm_log.h>
 #include <tegra_hwpm_static_analysis.h>
 
-int tegra_hwpm_read_sticky_bits_impl(struct tegra_soc_hwpm *hwpm,
+static int hwpm_remap_readl(struct tegra_soc_hwpm *hwpm, u64 addr, u32 *val)
-	u64 reg_base, u64 reg_offset, u32 *val)
 {
-	void __iomem *ptr = NULL;
+	void __iomem *ptr = ioremap(addr, 0x4);
-	u64 reg_addr = tegra_hwpm_safe_add_u64(reg_base, reg_offset);
 
-	ptr = ioremap(reg_addr, 0x4);
 	if (!ptr) {
-		tegra_hwpm_err(hwpm, "Failed to map register(0x%llx)",
+		tegra_hwpm_err(hwpm, "Failed to map address(0x%llx)", addr);
-			reg_addr);
 		return -ENODEV;
 	}
 	*val = __raw_readl(ptr);
@@ -44,6 +40,36 @@ int tegra_hwpm_read_sticky_bits_impl(struct tegra_soc_hwpm *hwpm,
 	return 0;
 }
 
+static int hwpm_remap_writel(struct tegra_soc_hwpm *hwpm, u64 addr, u32 val)
+{
+	void __iomem *ptr = ioremap(addr, 0x4);
+
+	if (!ptr) {
+		tegra_hwpm_err(hwpm, "Failed to map address(0x%llx)", addr);
+		return -ENODEV;
+	}
+	__raw_writel(val, ptr);
+	iounmap(ptr);
+
+	return 0;
+}
+
+int tegra_hwpm_read_sticky_bits_impl(struct tegra_soc_hwpm *hwpm,
+	u64 reg_base, u64 reg_offset, u32 *val)
+{
+	u64 reg_addr = tegra_hwpm_safe_add_u64(reg_base, reg_offset);
+
+	return hwpm_remap_readl(hwpm, reg_addr, val);
+}
+
+int tegra_hwpm_write_sticky_bits_impl(struct tegra_soc_hwpm *hwpm,
+	u64 reg_base, u64 reg_offset, u32 val)
+{
+	u64 reg_addr = tegra_hwpm_safe_add_u64(reg_base, reg_offset);
+
+	return hwpm_remap_writel(hwpm, reg_addr, val);
+}
+
 int tegra_hwpm_fake_readl_impl(struct tegra_soc_hwpm *hwpm,
 	struct hwpm_ip_aperture *aperture, u64 offset, u32 *val)
 {

drivers/tegra/hwpm/os/linux/io_utils.h

@@ -23,6 +23,8 @@ struct hwpm_ip_aperture;
 
 int tegra_hwpm_read_sticky_bits_impl(struct tegra_soc_hwpm *hwpm,
 	u64 reg_base, u64 reg_offset, u32 *val);
+int tegra_hwpm_write_sticky_bits_impl(struct tegra_soc_hwpm *hwpm,
+	u64 reg_base, u64 reg_offset, u32 val);
 int tegra_hwpm_fake_readl_impl(struct tegra_soc_hwpm *hwpm,
 	struct hwpm_ip_aperture *aperture, u64 offset, u32 *val);
 int tegra_hwpm_fake_writel_impl(struct tegra_soc_hwpm *hwpm,