From a8af756c9bd2fdd1de4112ceb53b8880f76ae1b5 Mon Sep 17 00:00:00 2001
From: UtsavBalar1231 <utsavbalar1231@gmail.com>
Date: Fri, 4 Jun 2021 17:38:53 +0200
Subject: [PATCH] techpack: Build high performance rmnet optimization drivers

Change-Id: Id2c3d2acfa2dc08e0f95d87fd2f1f29a95de70e1
Signed-off-by: UtsavBalar1231 <utsavbalar1231@gmail.com>
---
 arch/arm64/Kconfig                       |  4 ++++
 techpack/Kconfig                         |  5 +++++
 techpack/data/Kconfig                    |  1 +
 techpack/data/Makefile                   |  2 ++
 techpack/data/drivers/Kconfig            |  5 +++++
 techpack/data/drivers/Makefile           |  1 +
 techpack/data/drivers/rmnet/Kconfig      |  2 ++
 techpack/data/drivers/rmnet/Makefile     |  2 ++
 techpack/data/drivers/rmnet/perf/Kbuild  |  2 +-
 techpack/data/drivers/rmnet/perf/Kconfig | 12 ++++++------
 techpack/data/drivers/rmnet/shs/Kbuild   |  2 +-
 techpack/data/drivers/rmnet/shs/Kconfig  | 12 ++++++------
 12 files changed, 36 insertions(+), 14 deletions(-)
 create mode 100644 techpack/Kconfig
 create mode 100644 techpack/data/Kconfig
 create mode 100644 techpack/data/Makefile
 create mode 100644 techpack/data/drivers/Kconfig
 create mode 100644 techpack/data/drivers/Makefile
 create mode 100644 techpack/data/drivers/rmnet/Kconfig
 create mode 100644 techpack/data/drivers/rmnet/Makefile

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 80b0a65347b5..804a2af00c60 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1670,3 +1670,7 @@ source "arch/arm64/kvm/Kconfig"
 if CRYPTO
 source "arch/arm64/crypto/Kconfig"
 endif
+
+if ARCH_QCOM
+source "techpack/Kconfig"
+endif
diff --git a/techpack/Kconfig b/techpack/Kconfig
new file mode 100644
index 000000000000..eb57c169ff17
--- /dev/null
+++ b/techpack/Kconfig
@@ -0,0 +1,5 @@
+menu "Tech Packages"
+
+source techpack/data/Kconfig
+
+endmenu
diff --git a/techpack/data/Kconfig b/techpack/data/Kconfig
new file mode 100644
index 000000000000..696071f9cd05
--- /dev/null
+++ b/techpack/data/Kconfig
@@ -0,0 +1 @@
+source "techpack/data/drivers/Kconfig"
diff --git a/techpack/data/Makefile b/techpack/data/Makefile
new file mode 100644
index 000000000000..25c9baabe4b5
--- /dev/null
+++ b/techpack/data/Makefile
@@ -0,0 +1,2 @@
+obj-y += drivers/rmnet/perf/
+obj-y += drivers/rmnet/shs/
diff --git a/techpack/data/drivers/Kconfig b/techpack/data/drivers/Kconfig
new file mode 100644
index 000000000000..1ab65d246b70
--- /dev/null
+++ b/techpack/data/drivers/Kconfig
@@ -0,0 +1,5 @@
+menu "RMNet Optimization extensions"
+
+source "techpack/data/drivers/rmnet/Kconfig"
+
+endmenu
diff --git a/techpack/data/drivers/Makefile b/techpack/data/drivers/Makefile
new file mode 100644
index 000000000000..4576d471d9f9
--- /dev/null
+++ b/techpack/data/drivers/Makefile
@@ -0,0 +1 @@
+obj-y		+= rmnet/
diff --git a/techpack/data/drivers/rmnet/Kconfig b/techpack/data/drivers/rmnet/Kconfig
new file mode 100644
index 000000000000..82b861ac06bd
--- /dev/null
+++ b/techpack/data/drivers/rmnet/Kconfig
@@ -0,0 +1,2 @@
+source "techpack/data/drivers/rmnet/perf/Kconfig"
+source "techpack/data/drivers/rmnet/shs/Kconfig"
diff --git a/techpack/data/drivers/rmnet/Makefile b/techpack/data/drivers/rmnet/Makefile
new file mode 100644
index 000000000000..602f42392d66
--- /dev/null
+++ b/techpack/data/drivers/rmnet/Makefile
@@ -0,0 +1,2 @@
+obj-y		+= perf/
+obj-y		+= shs/
diff --git a/techpack/data/drivers/rmnet/perf/Kbuild b/techpack/data/drivers/rmnet/perf/Kbuild
index e3537c75ed67..71bae10b8c1c 100644
--- a/techpack/data/drivers/rmnet/perf/Kbuild
+++ b/techpack/data/drivers/rmnet/perf/Kbuild
@@ -1,3 +1,3 @@
-obj-m += rmnet_perf.o
+obj-$(CONFIG_RMNET_PERF) += rmnet_perf.o
 rmnet_perf-y := rmnet_perf_config.o rmnet_perf_core.o rmnet_perf_opt.o \
 		rmnet_perf_tcp_opt.o rmnet_perf_udp_opt.o
diff --git a/techpack/data/drivers/rmnet/perf/Kconfig b/techpack/data/drivers/rmnet/perf/Kconfig
index e55d24e59668..af5daa50b83f 100644
--- a/techpack/data/drivers/rmnet/perf/Kconfig
+++ b/techpack/data/drivers/rmnet/perf/Kconfig
@@ -2,9 +2,9 @@
 # RMNET_PERF driver
 #
 
-menuconfig RMNET_PERF
-    tristate "Rmnet Perf driver"
-    default m
-#    depends on RMNET
-    ---help---
-        performance mode of rmnet driver
\ No newline at end of file
+config RMNET_PERF
+    bool "Rmnet Perf driver"
+    default y
+    depends on RMNET
+    help
+      performance mode of rmnet driver
diff --git a/techpack/data/drivers/rmnet/shs/Kbuild b/techpack/data/drivers/rmnet/shs/Kbuild
index 196d128a4a55..636848794a9c 100644
--- a/techpack/data/drivers/rmnet/shs/Kbuild
+++ b/techpack/data/drivers/rmnet/shs/Kbuild
@@ -1,2 +1,2 @@
-obj-m += rmnet_shs.o
+obj-$(CONFIG_RMNET_SHS) += rmnet_shs.o
 rmnet_shs-y := rmnet_shs_config.o rmnet_shs_main.o rmnet_shs_wq.o rmnet_shs_freq.o rmnet_shs_wq_mem.o rmnet_shs_wq_genl.o
diff --git a/techpack/data/drivers/rmnet/shs/Kconfig b/techpack/data/drivers/rmnet/shs/Kconfig
index 52c401995bb3..4288a927d573 100644
--- a/techpack/data/drivers/rmnet/shs/Kconfig
+++ b/techpack/data/drivers/rmnet/shs/Kconfig
@@ -2,9 +2,9 @@
 # RMNET_SHS driver
 #
 
-menuconfig RMNET_SHS
-    tristate "Rmnet SHS driver"
-    default m
-#    depends on RMNET
-    ---help---
-        performance mode of rmnet driver
+config RMNET_SHS
+    bool "Rmnet SHS driver"
+    default y
+    depends on RMNET
+    help
+      performance mode of rmnet driver