From 39a77a74b217714a75c2d2a868979b9277fed58c Mon Sep 17 00:00:00 2001
From: pswbuild <pswbuild@oppo.com>
Date: Wed, 5 Jun 2024 14:24:12 +0800
Subject: [PATCH] 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

---
 drivers/iommu/qcom-io-pgtable-arm.c | 4 +++-
 drivers/soc/oplus/boot              | 1 +
 drivers/soc/oplus/device_info       | 1 +
 drivers/soc/oplus/dfr               | 1 +
 drivers/soc/oplus/dft               | 1 +
 drivers/soc/oplus/hans              | 1 +
 drivers/soc/oplus/mdmrst            | 1 +
 drivers/soc/oplus/midas             | 1 +
 drivers/soc/oplus/multimedia        | 1 +
 drivers/soc/oplus/power             | 1 +
 drivers/soc/oplus/storage           | 1 +
 11 files changed, 13 insertions(+), 1 deletion(-)
 create mode 120000 drivers/soc/oplus/boot
 create mode 120000 drivers/soc/oplus/device_info
 create mode 120000 drivers/soc/oplus/dfr
 create mode 120000 drivers/soc/oplus/dft
 create mode 120000 drivers/soc/oplus/hans
 create mode 120000 drivers/soc/oplus/mdmrst
 create mode 120000 drivers/soc/oplus/midas
 create mode 120000 drivers/soc/oplus/multimedia
 create mode 120000 drivers/soc/oplus/power
 create mode 120000 drivers/soc/oplus/storage

diff --git a/drivers/iommu/qcom-io-pgtable-arm.c b/drivers/iommu/qcom-io-pgtable-arm.c
index 664f431da6322..9369e32842cf5 100644
--- 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
new file mode 120000
index 0000000000000..a92ff6bb36071
--- /dev/null
+++ b/drivers/soc/oplus/boot
@@ -0,0 +1 @@
+../../../../../vendor/oplus/kernel/boot
\ No newline at end of file
diff --git a/drivers/soc/oplus/device_info b/drivers/soc/oplus/device_info
new file mode 120000
index 0000000000000..4a2c7e7f135c7
--- /dev/null
+++ b/drivers/soc/oplus/device_info
@@ -0,0 +1 @@
+../../../../../vendor/oplus/kernel/device_info/device_info
\ No newline at end of file
diff --git a/drivers/soc/oplus/dfr b/drivers/soc/oplus/dfr
new file mode 120000
index 0000000000000..52d7e52e96814
--- /dev/null
+++ b/drivers/soc/oplus/dfr
@@ -0,0 +1 @@
+../../../../../vendor/oplus/kernel/dfr
\ No newline at end of file
diff --git a/drivers/soc/oplus/dft b/drivers/soc/oplus/dft
new file mode 120000
index 0000000000000..61bfcade4cdb4
--- /dev/null
+++ b/drivers/soc/oplus/dft
@@ -0,0 +1 @@
+../../../../../vendor/oplus/kernel/dft
\ No newline at end of file
diff --git a/drivers/soc/oplus/hans b/drivers/soc/oplus/hans
new file mode 120000
index 0000000000000..a382fe1862052
--- /dev/null
+++ b/drivers/soc/oplus/hans
@@ -0,0 +1 @@
+../../../../../vendor/oplus/kernel/hans
\ No newline at end of file
diff --git a/drivers/soc/oplus/mdmrst b/drivers/soc/oplus/mdmrst
new file mode 120000
index 0000000000000..49d59b3cdb4f2
--- /dev/null
+++ b/drivers/soc/oplus/mdmrst
@@ -0,0 +1 @@
+../../../../../vendor/oplus/hardware/radio/kernel/mdmrst
\ No newline at end of file
diff --git a/drivers/soc/oplus/midas b/drivers/soc/oplus/midas
new file mode 120000
index 0000000000000..f216f234664ab
--- /dev/null
+++ b/drivers/soc/oplus/midas
@@ -0,0 +1 @@
+../../../../../vendor/oplus/kernel/cpu/midas
\ No newline at end of file
diff --git a/drivers/soc/oplus/multimedia b/drivers/soc/oplus/multimedia
new file mode 120000
index 0000000000000..633f461ee5757
--- /dev/null
+++ b/drivers/soc/oplus/multimedia
@@ -0,0 +1 @@
+../../../../../vendor/oplus/kernel/multimedia/feedback
\ No newline at end of file
diff --git a/drivers/soc/oplus/power b/drivers/soc/oplus/power
new file mode 120000
index 0000000000000..ebdd494a83a1a
--- /dev/null
+++ b/drivers/soc/oplus/power
@@ -0,0 +1 @@
+../../../../../vendor/oplus/kernel/power
\ No newline at end of file
diff --git a/drivers/soc/oplus/storage b/drivers/soc/oplus/storage
new file mode 120000
index 0000000000000..85763db0e9b8e
--- /dev/null
+++ b/drivers/soc/oplus/storage
@@ -0,0 +1 @@
+../../../../../vendor/oplus/kernel/storage/storage_feature_in_module
\ No newline at end of file