Synchronize code for OnePlus CPH2573_14.0.0.610(EX01) CPH2581_14.0.0.…

…610(EX01) CPH2583_14.0.0.610(EX01) Based on QCOM release TAG:AU_LINUX_KERNEL.PLATFORM.3.0.R1.00.00.00.017.045
OnePlusOSS · Jun 5, 2024 · 39a77a7 · 39a77a7
1 parent 1cf4fb8
commit 39a77a7
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 1 deletion.
diff --git a/drivers/iommu/qcom-io-pgtable-arm.c b/drivers/iommu/qcom-io-pgtable-arm.c
@@ -746,8 +746,10 @@ static int arm_lpae_map_by_pgsize(struct io_pgtable_ops *ops,
 
 		if (ms->pgtable && (iova < ms->iova_end)) {
 			ms_ptep = ms->pgtable + ARM_LPAE_LVL_IDX(iova, MAP_STATE_LVL, data);
-			arm_lpae_init_pte(data, iova, paddr, prot, MAP_STATE_LVL,
+			ret = arm_lpae_init_pte(data, iova, paddr, prot, MAP_STATE_LVL,
 					  1, ms_ptep, ms->prev_pgtable, false);
+			if (ret)
+				return ret;
 			ms->num_pte++;
 		} else {
 			ret = __arm_lpae_map(data, iova, paddr, pgsize, 1,

diff --git a/drivers/soc/oplus/boot b/drivers/soc/oplus/boot
@@ -0,0 +1 @@
+../../../../../vendor/oplus/kernel/boot
diff --git a/drivers/soc/oplus/device_info b/drivers/soc/oplus/device_info
@@ -0,0 +1 @@
+../../../../../vendor/oplus/kernel/device_info/device_info
diff --git a/drivers/soc/oplus/dfr b/drivers/soc/oplus/dfr
@@ -0,0 +1 @@
+../../../../../vendor/oplus/kernel/dfr
diff --git a/drivers/soc/oplus/dft b/drivers/soc/oplus/dft
@@ -0,0 +1 @@
+../../../../../vendor/oplus/kernel/dft
diff --git a/drivers/soc/oplus/hans b/drivers/soc/oplus/hans
@@ -0,0 +1 @@
+../../../../../vendor/oplus/kernel/hans
diff --git a/drivers/soc/oplus/mdmrst b/drivers/soc/oplus/mdmrst
@@ -0,0 +1 @@
+../../../../../vendor/oplus/hardware/radio/kernel/mdmrst
diff --git a/drivers/soc/oplus/midas b/drivers/soc/oplus/midas
@@ -0,0 +1 @@
+../../../../../vendor/oplus/kernel/cpu/midas
diff --git a/drivers/soc/oplus/multimedia b/drivers/soc/oplus/multimedia
@@ -0,0 +1 @@
+../../../../../vendor/oplus/kernel/multimedia/feedback
diff --git a/drivers/soc/oplus/power b/drivers/soc/oplus/power
@@ -0,0 +1 @@
+../../../../../vendor/oplus/kernel/power
diff --git a/drivers/soc/oplus/storage b/drivers/soc/oplus/storage
@@ -0,0 +1 @@
+../../../../../vendor/oplus/kernel/storage/storage_feature_in_module
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../../../vendor/oplus/kernel/device_info/device_info
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../../../vendor/oplus/hardware/radio/kernel/mdmrst
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../../../vendor/oplus/kernel/multimedia/feedback
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../../../vendor/oplus/kernel/storage/storage_feature_in_module