Commit Graph

20 Commits

Author SHA1 Message Date
Bart Van Assche
70fdaa07de Revert "ANDROID: Build null_blk and scsi_debug as kernel modules"
Revert commit 9b476ebe99 in preparation of making this a
Pixel-specific change. A disadvantage of building null_blk and
scsi_debug as kernel modules for all vendors is that this causes these
kernel modules to be loaded by the init process during boot and there is
no vendor-independent mechanism for preventing kernel modules to be
loaded.

Bug: 323406846
Change-Id: I6e7bcdd9fd06194bbc134ee52251b6ae9a3c1477
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2024-02-29 10:22:01 -08:00
Bart Van Assche
9b476ebe99 ANDROID: Build null_blk and scsi_debug as kernel modules
Both kernel modules are important for testing block layer and SCSI core
performance and functionality. Hence enable these in the kernel
configuration.

Bug: 323406846
Change-Id: I23cee78cd7d4e5f891395624a6bed01cffee4aa8
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2024-02-01 23:53:56 +00:00
Ramji Jiyani
20266a0652 ANDROID: kleaf: Remove ptp_kvm.ko from i386 modules
commit 638804ea1c ("ANDROID: kleaf: get_gki_modules_list add i386
option") introduced i386 as an option for get_gki_modules_list()
with ptp_kvm.ko as i386 module. ptp_kvm.ko is not a module on
anrdoid14-6.1, and cherry pick from android15-6.1 should have been worked to remove it.

Remove ptp_kvm.ko from i386 list and make it empty for android14-6.1.

Fixes: 638804ea1c ("ANDROID: kleaf: get_gki_modules_list add i386 option")
Bug: 293529933
Test: TH
Change-Id: Ied9d8c06c9f38dc271d541275afee053a87ecd79
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
2023-08-31 17:47:21 +00:00
Ramji Jiyani
638804ea1c ANDROID: kleaf: get_gki_modules_list add i386 option
Adds "i386" as an option to get the list of 32-bit x86
modules in get_gki_modules_list().

virtual_device_i686 Cuttlefish target is a consumer.
Option is named i386 to match the `arch` attributes
in kernel_build rule.

Bug: 293529933
Test: TH
Change-Id: Ic5278aa687999a2bb2d98b97b204b99d1fcd809a
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
(cherry picked from commit 2a9967e15f99010ec06ac089b42a2ac20f2a57cb)
2023-08-31 03:24:10 +00:00
Ramji Jiyani
264e2973a4 ANDROID: arm as an option for get_gki_modules_list
If driver config depends on ARM64, driver is not
available for the ARM targets as module.

Introduce arm as an option for get_gki_modules_list()
to separate ARM64 dependent modules.

virtual_device_arm Cuttlefish target is the current
consumer of this; and it fails when there is ARM64
dependent module is introduced like OEM hypervisors.

Bug: 293529933
Test: TH
Change-Id: I462e8968faa48d58721d884688af62ff603c9a3d
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
(cherry picked from commit b0e30c021b79d9cb9a67b12a94d1fe2f61126f14)
2023-08-31 03:21:33 +00:00
Yi-De Wu
67018dd4e4 ANDROID: virt: geniezone: Enable as GKI module for arm64
Enables CONFIG_MTK_GZVM (gzvm.ko) as protected GKI
module for arm64.

Depends on ARM64 so no need to explicitly disable for
other architecture's gki_defconfig files.

Change-Id: I7bbef9192d92db295623f491e2a923147473a196
Signed-off-by: Yingshiuan Pan <yingshiuan.pan@mediatek.com>
Signed-off-by: Yi-De Wu <yi-de.wu@mediatek.com>
Bug: 280363874
2023-08-29 18:02:40 +00:00
Ulises Mendez Martinez
9a399ca713 ANDROID: Add arch specific gki module list targets
* This is a no-op change preparing for the split of target and files
  based on the architecture used.

Bug: 293529933
Change-Id: I7783b60e591aaad23b5446af5cb04af5765f4b3f
Signed-off-by: Ulises Mendez Martinez <umendez@google.com>
2023-08-29 18:02:40 +00:00
lambert wang
214e6f268b 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 <lambert.wang@mediatek.com>
2023-07-13 15:23:46 +00:00
Yifan Hong
09e0f85096 ANDROID: set CONFIG_IKHEADERS=m for gki_defconfig.
The tarball, when implemented correctly, adds around
3.7MB of kheaders.tar.xz to the kernel image, which
increases memory usage. Since this tarball is usually
for debugging only, mark it as a module so it can
be conditionally loaded.

Bug: 276339429
Test: treehugger
Change-Id: Icc330a947ff25006fa48ffc5801d7a2746369893
Signed-off-by: Yifan Hong <elsk@google.com>
2023-06-12 08:25:19 +00:00
Ramji Jiyani
417e9da491 ANDROID: GKI: cfg/mac 80211 as vendor modules
Convert cfg80211.ko and mac80211.ko as vendor modules to
pave a way for merging 802.11be Wi-Fi 7 functionalities
from upstream over the next year without affecting the KMI.

Bug: 281137343
Test: TH
Change-Id: Id1823924a3e5d8d03518599e6b3209e9cdd771d5
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
2023-05-11 05:22:29 +00:00
Ramji Jiyani
fbb735239d 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>
2023-04-28 20:29:07 +00:00
Ulises Mendez Martinez
46bb86f7e9 ANDROID: GKI: Fix linter warning
* Warning solved:
The file has no module docstring.

* Add license header.

Bug: 252888476
Bug: 252888476
Change-Id: Ic0d98a8ef04766b3bca5c3ca6d17daf9dc74346f
Signed-off-by: Ulises Mendez Martinez <umendez@google.com>
2022-12-01 13:06:20 +00:00
Ramji Jiyani
1f23fcc683 ANDROID: GKI: Convert Net PPP Protocol as module
Converts networking Point to Point Protocol drivers as GKI modules.

CONFIG_PPP: PPP (point-to-point protocol) support
CONFIG_PPP_BSDCOMP: PPP BSD-Compress compression
CONFIG_PPP_DEFLATE: PPP Deflate compression
CONFIG_PPP_MPPE: PPP MPPE compression (encryption); selects CRYPTO_LIB_ARC4=m
CONFIG_PPTP: PPP over IPv4 (PPTP)

Bug: 232431151
Test: TH
Change-Id: Id6ef00a4cda0433d375554a965835d6d59d2d473
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
2022-11-17 06:23:43 +00:00
Ramji Jiyani
fbf5679ace ANDROID: GKI: Convert L2TP as modules
Converts L2TP and PPP over L2TP as GKI modules.
CONFIG_L2TP: Layer Two Tunneling Protocol (L2TP)
CONFIG_PPOL2TP: PPP over L2TP

Makes CONFIG_NETFILTER_XT_MATCH_L2TP visible in the savedefconfig.

Bug: 232431151
Test: TH
Change-Id: I0e1cbd8f04f97f172f8b1551eade21cf303b24ed
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
2022-11-17 01:20:22 +00:00
Ramji Jiyani
8e514b4fe6 ANDROID: GKI: Convert 802.15.4 support as module
Converts IEEE 802.15.4 Protocol, Socket & MAC drivers
as GKI modules.

CONFIG_IEEE802154: IEEE Std 802.15.4 Low-Rate Wireless PANs support
CONFIG_IEEE802154_SOCKET: IEEE 802.15.4 socket interface
CONFIG_MAC802154: Generic IEEE 802.15.4 Soft Networking Stack

CONFIG_MAC802154=m makes following configs visible in savedefconfig:
CONFIG_CRC_CCITT & CONFIG_CRYPTO_CCM

Bug: 232431151
Test: TH
Change-Id: Iec93faf73e2955054474e482c1d25ad3df822659
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
2022-11-17 00:16:46 +00:00
Ramji Jiyani
51fdad54ab ANDROID: GKI: Convert CAN Bus Subsystem as module
Sets CONFIG_CAN=m to conver CAN Bus subsystem as
GKI module.

Bug: 232431151
Test: TH
Change-Id: Ia90fcc7a30edb994a8e47dea617050836356729d
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
2022-11-16 23:01:19 +00:00
Ramji Jiyani
0a53ec9384 ANDROID: GKI: Convert 6LoWPAN Support as module
Converts IPv6 6LoWPAN as GKI modules.

CONFIG_6LOWPAN: 6LoWPAN Support
IPv6 over Low power Wireless Personal Area Network -
"6LoWPAN" which is supported by IEEE 802.15.4 or Bluetooth stacks.

CONFIG_IEEE802154_6LOWPAN: 6lowpan support over IEEE 802.15.4

Bug: 232431151
Test: TH
Change-Id: I4257cedfd499e1e01faba966e17c3d9dbf4dcbb7
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
2022-11-16 22:11:01 +00:00
Ramji Jiyani
18a522d05a ANDROID: GKI: Convert RF switch subsys as module
Convert RF swithc subsys as GKI module.

CONFIG_RFKILL: RF switch subsystem support
To have control over RF switches found on
many WiFi and Bluetooth cards.

Bug: 232431151
Test: TH
Change-Id: I6fb84f82d7a65b3d4f17261d361be1c44c6b77bb
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
(cherry picked from commit 6a0f9b1a5aa6f2377f6de01471c07ed550137b42)
2022-11-16 19:06:40 +00:00
Ramji Jiyani
3f4a3cdd1f ANDROID: GKI: Convert Bluetooth Support as module
Converts CONFIG_BT: Bluetooth subsystem support as
GKI modules.

CRYPTO_CMAC & CRYPTO_ECDH are being added as
CONFIG_BT is selecting them i.e. they were
enabled but not visibile in savedefconfig when
BT was an in-built feature and becomes visible
in savedefconfig when BT is a module.

Bug: 232431151
Test: TH
Change-Id: I624939d007fadbf852ad53c4404df12ac769fcd8
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
2022-11-16 19:03:05 +00:00
Yifan Hong
f032c7ae45 ANDROID: kleaf: Move list of kernel modules to an extension.
This is so that it can be loaded by other packages. Some
device's may wish to not build mixed build, in which case
they'll either need to use 'auto' in module_outs (discouraged),
or load the list of GKI modules.

Test: TH
Bug: 258308697
Change-Id: Iff7778b9edae7101a2debd44a49bb5eb403bfb2f
Signed-off-by: Yifan Hong <elsk@google.com>
2022-11-16 18:10:21 +00:00