ANDROID: GKI: Add WWAN as GKI protected module

CONFIG_WWAN=m : WWAN driver core. This driver provides a common framework for WWAN drivers. Required to integrate modem devices with WWAN subsystem. Selects CONFIG_WWAN_DEBUGFS=y; override to disable it until it is required in the future. Bug: 287170531 Change-Id: I18517a7aca17cfb5bdbb7ad0399fcb92c575a48e Signed-off-by: lambert wang <[email protected]>
OnePlusOSS · Jul 13, 2023 · 214e6f2 · 214e6f2
1 parent 8726a2d
commit 214e6f2
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 2 deletions.
diff --git a/android/abi_gki_protected_exports_aarch64 b/android/abi_gki_protected_exports_aarch64
@@ -334,4 +334,14 @@ wpan_phy_for_each
 wpan_phy_free
 wpan_phy_new
 wpan_phy_register
-wpan_phy_unregister
+wpan_phy_unregister
+wwan_create_port
+wwan_get_debugfs_dir
+wwan_port_get_drvdata
+wwan_port_rx
+wwan_port_txoff
+wwan_port_txon
+wwan_put_debugfs_dir
+wwan_register_ops
+wwan_remove_port
+wwan_unregister_ops
diff --git a/android/abi_gki_protected_exports_x86_64 b/android/abi_gki_protected_exports_x86_64
@@ -334,4 +334,14 @@ wpan_phy_for_each
 wpan_phy_free
 wpan_phy_new
 wpan_phy_register
-wpan_phy_unregister
+wpan_phy_unregister
+wwan_create_port
+wwan_get_debugfs_dir
+wwan_port_get_drvdata
+wwan_port_rx
+wwan_port_txoff
+wwan_port_txon
+wwan_put_debugfs_dir
+wwan_register_ops
+wwan_remove_port
+wwan_unregister_ops
diff --git a/android/gki_aarch64_protected_modules b/android/gki_aarch64_protected_modules
@@ -23,6 +23,7 @@ drivers/net/usb/r8152.ko
 drivers/net/usb/r8153_ecm.ko
 drivers/net/usb/rtl8150.ko
 drivers/net/usb/usbnet.ko
+drivers/net/wwan/wwan.ko
 drivers/usb/class/cdc-acm.ko
 drivers/usb/serial/ftdi_sio.ko
 drivers/usb/serial/usbserial.ko

diff --git a/android/gki_x86_64_protected_modules b/android/gki_x86_64_protected_modules
@@ -23,6 +23,7 @@ drivers/net/usb/r8152.ko
 drivers/net/usb/r8153_ecm.ko
 drivers/net/usb/rtl8150.ko
 drivers/net/usb/usbnet.ko
+drivers/net/wwan/wwan.ko
 drivers/usb/class/cdc-acm.ko
 drivers/usb/serial/ftdi_sio.ko
 drivers/usb/serial/usbserial.ko

diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
@@ -365,6 +365,8 @@ CONFIG_USB_NET_AQC111=m
 # CONFIG_WLAN_VENDOR_TI is not set
 # CONFIG_WLAN_VENDOR_ZYDAS is not set
 # CONFIG_WLAN_VENDOR_QUANTENNA is not set
+CONFIG_WWAN=m
+# CONFIG_WWAN_DEBUGFS is not set
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_GPIO=y
 # CONFIG_MOUSE_PS2 is not set

diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
@@ -351,6 +351,8 @@ CONFIG_USB_NET_AQC111=m
 # CONFIG_WLAN_VENDOR_TI is not set
 # CONFIG_WLAN_VENDOR_ZYDAS is not set
 # CONFIG_WLAN_VENDOR_QUANTENNA is not set
+CONFIG_WWAN=m
+# CONFIG_WWAN_DEBUGFS is not set
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_GPIO=y
 # CONFIG_MOUSE_PS2 is not set

diff --git a/modules.bzl b/modules.bzl
@@ -34,6 +34,7 @@ COMMON_GKI_MODULES_LIST = [
     "drivers/net/usb/r8153_ecm.ko",
     "drivers/net/usb/rtl8150.ko",
     "drivers/net/usb/usbnet.ko",
+    "drivers/net/wwan/wwan.ko",
     "drivers/usb/class/cdc-acm.ko",
     "drivers/usb/serial/ftdi_sio.ko",
     "drivers/usb/serial/usbserial.ko",