update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/platform/qcom/venus/firmware.c
..
..
@@ -27,19 +27,19 @@
27
27
 static void venus_reset_cpu(struct venus_core *core)
28
28
 {
29
29
 	u32 fw_size = core->fw.mapped_mem_size;
30
-	void __iomem *base = core->base;
30
+	void __iomem *wrapper_base = core->wrapper_base;
31
31
 
32
-	writel(0, base + WRAPPER_FW_START_ADDR);
33
-	writel(fw_size, base + WRAPPER_FW_END_ADDR);
34
-	writel(0, base + WRAPPER_CPA_START_ADDR);
35
-	writel(fw_size, base + WRAPPER_CPA_END_ADDR);
36
-	writel(fw_size, base + WRAPPER_NONPIX_START_ADDR);
37
-	writel(fw_size, base + WRAPPER_NONPIX_END_ADDR);
38
-	writel(0x0, base + WRAPPER_CPU_CGC_DIS);
39
-	writel(0x0, base + WRAPPER_CPU_CLOCK_CONFIG);
32
+	writel(0, wrapper_base + WRAPPER_FW_START_ADDR);
33
+	writel(fw_size, wrapper_base + WRAPPER_FW_END_ADDR);
34
+	writel(0, wrapper_base + WRAPPER_CPA_START_ADDR);
35
+	writel(fw_size, wrapper_base + WRAPPER_CPA_END_ADDR);
36
+	writel(fw_size, wrapper_base + WRAPPER_NONPIX_START_ADDR);
37
+	writel(fw_size, wrapper_base + WRAPPER_NONPIX_END_ADDR);
38
+	writel(0x0, wrapper_base + WRAPPER_CPU_CGC_DIS);
39
+	writel(0x0, wrapper_base + WRAPPER_CPU_CLOCK_CONFIG);
40
40
 
41
41
 	/* Bring ARM9 out of reset */
42
-	writel(0, base + WRAPPER_A9SS_SW_RESET);
42
+	writel(0, wrapper_base + WRAPPER_A9SS_SW_RESET);
43
43
 }
44
44
 
45
45
 int venus_set_hw_state(struct venus_core *core, bool resume)
..
..
@@ -56,7 +56,7 @@
56
56
 	if (resume)
57
57
 		venus_reset_cpu(core);
58
58
 	else
59
-		writel(1, core->base + WRAPPER_A9SS_SW_RESET);
59
+		writel(1, core->wrapper_base + WRAPPER_A9SS_SW_RESET);
60
60
 
61
61
 	return 0;
62
62
 }
..
..
@@ -159,12 +159,12 @@
159
159
 	size_t unmapped;
160
160
 	u32 reg;
161
161
 	struct device *dev = core->fw.dev;
162
-	void __iomem *base = core->base;
162
+	void __iomem *wrapper_base = core->wrapper_base;
163
163
 
164
164
 	/* Assert the reset to ARM9 */
165
-	reg = readl_relaxed(base + WRAPPER_A9SS_SW_RESET);
165
+	reg = readl_relaxed(wrapper_base + WRAPPER_A9SS_SW_RESET);
166
166
 	reg |= WRAPPER_A9SS_SW_RESET_BIT;
167
-	writel_relaxed(reg, base + WRAPPER_A9SS_SW_RESET);
167
+	writel_relaxed(reg, wrapper_base + WRAPPER_A9SS_SW_RESET);
168
168
 
169
169
 	/* Make sure reset is asserted before the mapping is removed */
170
170
 	mb();