From 214e6f268b6a576c603d01a27410192c1e03e942 Mon Sep 17 00:00:00 2001 From: lambert wang Date: Wed, 12 Jul 2023 20:55:17 +0800 Subject: [PATCH] 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 --- android/abi_gki_protected_exports_aarch64 | 12 +++++++++++- android/abi_gki_protected_exports_x86_64 | 12 +++++++++++- android/gki_aarch64_protected_modules | 1 + android/gki_x86_64_protected_modules | 1 + arch/arm64/configs/gki_defconfig | 2 ++ arch/x86/configs/gki_defconfig | 2 ++ modules.bzl | 1 + 7 files changed, 29 insertions(+), 2 deletions(-) diff --git a/android/abi_gki_protected_exports_aarch64 b/android/abi_gki_protected_exports_aarch64 index 6b40237c253a9..e4792af0a0ef0 100644 --- 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 \ No newline at end of file +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 \ No newline at end of file diff --git a/android/abi_gki_protected_exports_x86_64 b/android/abi_gki_protected_exports_x86_64 index 6b40237c253a9..e4792af0a0ef0 100644 --- 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 \ No newline at end of file +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 \ No newline at end of file diff --git a/android/gki_aarch64_protected_modules b/android/gki_aarch64_protected_modules index 2a232a69f4a5e..d6b0777dd474f 100644 --- 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 index 2a232a69f4a5e..d6b0777dd474f 100644 --- 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 index 271b64954fe57..a354cff562ed8 100644 --- 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 index 71c6497318455..6307a01286918 100644 --- 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 index 5d3d31af91f7e..868ef5ed2bd3e 100644 --- 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",