ANDROID: GKI: Convert USB network adpaters to modules

Converts these config items from built-in to GKI protected
modules:

CONFIG_USB_NET_DRIVERS
CONFIG_USB_USBNET
CONFIG_USB_RTL8150
CONFIG_USB_RTL8152
CONFIG_USB_NET_AX8817X
CONFIG_USB_NET_AX88179_178A
CONFIG_USB_NET_CDCETHER
CONFIG_USB_NET_CDC_EEM
CONFIG_USB_NET_CDC_NCM
CONFIG_USB_NET_AQC111
CONFIG_USB_RTL8153_ECM

Bug: 232431151
Bug: 279972445
Test: TH
Change-Id: I8a6e34be1ed86a8ea1d44e6721954fb5888e1fa4
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>

android/abi_gki_protected_exports_aarch64

@@ -77,8 +77,20 @@ can_rx_unregister
 can_send
 can_skb_get_frame_len
 can_sock_destruct
+cdc_ncm_bind_common
+cdc_ncm_change_mtu
+cdc_ncm_fill_tx_frame
+cdc_ncm_rx_fixup
+cdc_ncm_rx_verify_ndp16
+cdc_ncm_rx_verify_ndp32
+cdc_ncm_rx_verify_nth16
+cdc_ncm_rx_verify_nth32
+cdc_ncm_select_altsetting
+cdc_ncm_tx_fixup
+cdc_ncm_unbind
 close_candev
 free_candev
+generic_mii_ioctl
 h4_recv_buf
 hci_alloc_dev_priv
 hci_cmd_sync
@@ -166,6 +178,15 @@ lowpan_register_netdev
 lowpan_register_netdevice
 lowpan_unregister_netdev
 lowpan_unregister_netdevice
+mii_check_gmii_support
+mii_check_link
+mii_check_media
+mii_ethtool_get_link_ksettings
+mii_ethtool_gset
+mii_ethtool_set_link_ksettings
+mii_ethtool_sset
+mii_link_ok
+mii_nway_restart
 nfc_add_se
 nfc_alloc_recv_skb
 nfc_allocate_device
@@ -228,6 +249,7 @@ rfkill_set_states
 rfkill_set_sw_state
 rfkill_soft_blocked
 rfkill_unregister
+rtl8152_get_version
 safe_candev_priv
 slhc_compress
 slhc_free
@@ -263,6 +285,50 @@ usb_serial_port_softint
 usb_serial_register_drivers
 usb_serial_resume
 usb_serial_suspend
+usbnet_cdc_bind
+usbnet_cdc_status
+usbnet_cdc_unbind
+usbnet_cdc_update_filter
+usbnet_cdc_zte_rx_fixup
+usbnet_change_mtu
+usbnet_defer_kevent
+usbnet_device_suggests_idle
+usbnet_disconnect
+usbnet_ether_cdc_bind
+usbnet_generic_cdc_bind
+usbnet_get_drvinfo
+usbnet_get_endpoints
+usbnet_get_ethernet_addr
+usbnet_get_link
+usbnet_get_link_ksettings_internal
+usbnet_get_link_ksettings_mii
+usbnet_get_msglevel
+usbnet_link_change
+usbnet_manage_power
+usbnet_nway_reset
+usbnet_open
+usbnet_pause_rx
+usbnet_probe
+usbnet_purge_paused_rxq
+usbnet_read_cmd
+usbnet_read_cmd_nopm
+usbnet_resume
+usbnet_resume_rx
+usbnet_set_link_ksettings_mii
+usbnet_set_msglevel
+usbnet_set_rx_mode
+usbnet_skb_return
+usbnet_start_xmit
+usbnet_status_start
+usbnet_status_stop
+usbnet_stop
+usbnet_suspend
+usbnet_tx_timeout
+usbnet_unlink_rx_urbs
+usbnet_update_max_qlen
+usbnet_write_cmd
+usbnet_write_cmd_async
+usbnet_write_cmd_nopm
 wpan_phy_find
 wpan_phy_for_each
 wpan_phy_free

android/abi_gki_protected_exports_x86_64

@@ -83,6 +83,17 @@ can_rx_unregister
 can_send
 can_skb_get_frame_len
 can_sock_destruct
+cdc_ncm_bind_common
+cdc_ncm_change_mtu
+cdc_ncm_fill_tx_frame
+cdc_ncm_rx_fixup
+cdc_ncm_rx_verify_ndp16
+cdc_ncm_rx_verify_ndp32
+cdc_ncm_rx_verify_nth16
+cdc_ncm_rx_verify_nth32
+cdc_ncm_select_altsetting
+cdc_ncm_tx_fixup
+cdc_ncm_unbind
 cfg80211_any_usable_channels
 cfg80211_assoc_comeback
 cfg80211_assoc_failure
@@ -175,11 +186,13 @@ cfg80211_tx_mlme_mgmt
 cfg80211_unlink_bss
 cfg80211_unregister_wdev
 cfg80211_update_owe_info_event
+cfg80211_valid_disable_subchannel_bitmap
 cfg80211_vendor_cmd_get_sender
 cfg80211_vendor_cmd_reply
 close_candev
 free_candev
 freq_reg_info
+generic_mii_ioctl
 get_wiphy_regdom
 h4_recv_buf
 hci_alloc_dev_priv
@@ -414,6 +427,15 @@ lowpan_register_netdev
 lowpan_register_netdevice
 lowpan_unregister_netdev
 lowpan_unregister_netdevice
+mii_check_gmii_support
+mii_check_link
+mii_check_media
+mii_ethtool_get_link_ksettings
+mii_ethtool_gset
+mii_ethtool_set_link_ksettings
+mii_ethtool_sset
+mii_link_ok
+mii_nway_restart
 nfc_add_se
 nfc_alloc_recv_skb
 nfc_allocate_device
@@ -484,6 +506,7 @@ rfkill_set_states
 rfkill_set_sw_state
 rfkill_soft_blocked
 rfkill_unregister
+rtl8152_get_version
 safe_candev_priv
 slhc_compress
 slhc_free
@@ -519,6 +542,50 @@ usb_serial_port_softint
 usb_serial_register_drivers
 usb_serial_resume
 usb_serial_suspend
+usbnet_cdc_bind
+usbnet_cdc_status
+usbnet_cdc_unbind
+usbnet_cdc_update_filter
+usbnet_cdc_zte_rx_fixup
+usbnet_change_mtu
+usbnet_defer_kevent
+usbnet_device_suggests_idle
+usbnet_disconnect
+usbnet_ether_cdc_bind
+usbnet_generic_cdc_bind
+usbnet_get_drvinfo
+usbnet_get_endpoints
+usbnet_get_ethernet_addr
+usbnet_get_link
+usbnet_get_link_ksettings_internal
+usbnet_get_link_ksettings_mii
+usbnet_get_msglevel
+usbnet_link_change
+usbnet_manage_power
+usbnet_nway_reset
+usbnet_open
+usbnet_pause_rx
+usbnet_probe
+usbnet_purge_paused_rxq
+usbnet_read_cmd
+usbnet_read_cmd_nopm
+usbnet_resume
+usbnet_resume_rx
+usbnet_set_link_ksettings_mii
+usbnet_set_msglevel
+usbnet_set_rx_mode
+usbnet_skb_return
+usbnet_start_xmit
+usbnet_status_start
+usbnet_status_stop
+usbnet_stop
+usbnet_suspend
+usbnet_tx_timeout
+usbnet_unlink_rx_urbs
+usbnet_update_max_qlen
+usbnet_write_cmd
+usbnet_write_cmd_async
+usbnet_write_cmd_nopm
 wdev_chandef
 wdev_to_ieee80211_vif
 wiphy_apply_custom_regulatory

android/gki_aarch64_protected_modules

@@ -5,6 +5,7 @@ drivers/bluetooth/hci_uart.ko
 drivers/net/can/dev/can-dev.ko
 drivers/net/can/slcan/slcan.ko
 drivers/net/can/vcan.ko
+drivers/net/mii.ko
 drivers/net/ppp/bsd_comp.ko
 drivers/net/ppp/ppp_deflate.ko
 drivers/net/ppp/ppp_generic.ko
@@ -12,6 +13,16 @@ drivers/net/ppp/ppp_mppe.ko
 drivers/net/ppp/pppox.ko
 drivers/net/ppp/pptp.ko
 drivers/net/slip/slhc.ko
+drivers/net/usb/aqc111.ko
+drivers/net/usb/asix.ko
+drivers/net/usb/ax88179_178a.ko
+drivers/net/usb/cdc_eem.ko
+drivers/net/usb/cdc_ether.ko
+drivers/net/usb/cdc_ncm.ko
+drivers/net/usb/r8152.ko
+drivers/net/usb/r8153_ecm.ko
+drivers/net/usb/rtl8150.ko
+drivers/net/usb/usbnet.ko
 drivers/usb/class/cdc-acm.ko
 drivers/usb/serial/ftdi_sio.ko
 drivers/usb/serial/usbserial.ko

android/gki_system_dlkm_modules

@@ -6,6 +6,7 @@ drivers/bluetooth/hci_uart.ko
 drivers/net/can/dev/can-dev.ko
 drivers/net/can/slcan/slcan.ko
 drivers/net/can/vcan.ko
+drivers/net/mii.ko
 drivers/net/ppp/bsd_comp.ko
 drivers/net/ppp/ppp_deflate.ko
 drivers/net/ppp/ppp_generic.ko
@@ -13,6 +14,16 @@ drivers/net/ppp/ppp_mppe.ko
 drivers/net/ppp/pppox.ko
 drivers/net/ppp/pptp.ko
 drivers/net/slip/slhc.ko
+drivers/net/usb/aqc111.ko
+drivers/net/usb/asix.ko
+drivers/net/usb/ax88179_178a.ko
+drivers/net/usb/cdc_eem.ko
+drivers/net/usb/cdc_ether.ko
+drivers/net/usb/cdc_ncm.ko
+drivers/net/usb/r8152.ko
+drivers/net/usb/r8153_ecm.ko
+drivers/net/usb/rtl8150.ko
+drivers/net/usb/usbnet.ko
 drivers/usb/class/cdc-acm.ko
 drivers/usb/serial/ftdi_sio.ko
 drivers/usb/serial/usbserial.ko

android/gki_x86_64_protected_modules

@@ -5,6 +5,7 @@ drivers/bluetooth/hci_uart.ko
 drivers/net/can/dev/can-dev.ko
 drivers/net/can/slcan/slcan.ko
 drivers/net/can/vcan.ko
+drivers/net/mii.ko
 drivers/net/ppp/bsd_comp.ko
 drivers/net/ppp/ppp_deflate.ko
 drivers/net/ppp/ppp_generic.ko
@@ -12,6 +13,16 @@ drivers/net/ppp/ppp_mppe.ko
 drivers/net/ppp/pppox.ko
 drivers/net/ppp/pptp.ko
 drivers/net/slip/slhc.ko
+drivers/net/usb/aqc111.ko
+drivers/net/usb/asix.ko
+drivers/net/usb/ax88179_178a.ko
+drivers/net/usb/cdc_eem.ko
+drivers/net/usb/cdc_ether.ko
+drivers/net/usb/cdc_ncm.ko
+drivers/net/usb/r8152.ko
+drivers/net/usb/r8153_ecm.ko
+drivers/net/usb/rtl8150.ko
+drivers/net/usb/usbnet.ko
 drivers/usb/class/cdc-acm.ko
 drivers/usb/serial/ftdi_sio.ko
 drivers/usb/serial/usbserial.ko

arch/arm64/configs/gki_defconfig

@@ -329,6 +329,7 @@ CONFIG_IFB=y
 CONFIG_MACSEC=y
 CONFIG_TUN=y
 CONFIG_VETH=y
+CONFIG_AX88796B_PHY=y
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_SLCAN=m
 CONFIG_PPP=m
@@ -337,14 +338,15 @@ CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_MPPE=m
 CONFIG_PPTP=m
 CONFIG_PPPOL2TP=m
-CONFIG_USB_RTL8150=y
+CONFIG_USB_NET_DRIVERS=m
-CONFIG_USB_RTL8152=y
+CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET=y
+CONFIG_USB_RTL8152=m
-CONFIG_USB_NET_CDC_EEM=y
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_CDC_EEM=m
 # CONFIG_USB_NET_NET1080 is not set
 # CONFIG_USB_NET_CDC_SUBSET is not set
 # CONFIG_USB_NET_ZAURUS is not set
-CONFIG_USB_NET_AQC111=y
+CONFIG_USB_NET_AQC111=m
 # CONFIG_WLAN_VENDOR_ADMTEK is not set
 # CONFIG_WLAN_VENDOR_ATH is not set
 # CONFIG_WLAN_VENDOR_ATMEL is not set

arch/x86/configs/gki_defconfig

@@ -317,6 +317,7 @@ CONFIG_IFB=y
 CONFIG_MACSEC=y
 CONFIG_TUN=y
 CONFIG_VETH=y
+CONFIG_AX88796B_PHY=y
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_SLCAN=m
 CONFIG_PPP=m
@@ -325,14 +326,15 @@ CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_MPPE=m
 CONFIG_PPTP=m
 CONFIG_PPPOL2TP=m
-CONFIG_USB_RTL8150=y
+CONFIG_USB_NET_DRIVERS=m
-CONFIG_USB_RTL8152=y
+CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET=y
+CONFIG_USB_RTL8152=m
-CONFIG_USB_NET_CDC_EEM=y
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_CDC_EEM=m
 # CONFIG_USB_NET_NET1080 is not set
 # CONFIG_USB_NET_CDC_SUBSET is not set
 # CONFIG_USB_NET_ZAURUS is not set
-CONFIG_USB_NET_AQC111=y
+CONFIG_USB_NET_AQC111=m
 # CONFIG_WLAN_VENDOR_ADMTEK is not set
 # CONFIG_WLAN_VENDOR_ATH is not set
 # CONFIG_WLAN_VENDOR_ATMEL is not set

modules.bzl

@@ -16,6 +16,7 @@ COMMON_GKI_MODULES_LIST = [
     "drivers/net/can/dev/can-dev.ko",
     "drivers/net/can/slcan/slcan.ko",
     "drivers/net/can/vcan.ko",
+    "drivers/net/mii.ko",
     "drivers/net/ppp/bsd_comp.ko",
     "drivers/net/ppp/ppp_deflate.ko",
     "drivers/net/ppp/ppp_generic.ko",
@@ -23,6 +24,16 @@ COMMON_GKI_MODULES_LIST = [
     "drivers/net/ppp/pppox.ko",
     "drivers/net/ppp/pptp.ko",
     "drivers/net/slip/slhc.ko",
+    "drivers/net/usb/aqc111.ko",
+    "drivers/net/usb/asix.ko",
+    "drivers/net/usb/ax88179_178a.ko",
+    "drivers/net/usb/cdc_eem.ko",
+    "drivers/net/usb/cdc_ether.ko",
+    "drivers/net/usb/cdc_ncm.ko",
+    "drivers/net/usb/r8152.ko",
+    "drivers/net/usb/r8153_ecm.ko",
+    "drivers/net/usb/rtl8150.ko",
+    "drivers/net/usb/usbnet.ko",
     "drivers/usb/class/cdc-acm.ko",
     "drivers/usb/serial/ftdi_sio.ko",
     "drivers/usb/serial/usbserial.ko",