From 9b476ebe99ad04458a259a7b91d93fb6caf6cff5 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 1 Feb 2024 11:12:42 -0800 Subject: [PATCH] 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 --- arch/arm64/configs/gki_defconfig | 2 ++ arch/x86/configs/gki_defconfig | 2 ++ modules.bzl | 5 +++++ 3 files changed, 9 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index dbf1e1ca23fd..bc18ada0bd54 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -309,6 +309,7 @@ CONFIG_ARM_SCPI_PROTOCOL=y # CONFIG_ARM_SCPI_POWER_DOMAIN is not set # CONFIG_EFI_ARMSTUB_DTB_LOADER is not set CONFIG_GNSS=y +CONFIG_BLK_DEV_NULL_BLK=m CONFIG_ZRAM=m CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=16 @@ -322,6 +323,7 @@ CONFIG_UID_SYS_STATS=y CONFIG_SCSI=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y +CONFIG_SCSI_DEBUG=m CONFIG_MD=y CONFIG_BLK_DEV_DM=y CONFIG_DM_CRYPT=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 8330afe50d28..8090b1ca2a28 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -295,6 +295,7 @@ CONFIG_FW_LOADER_USER_HELPER=y # CONFIG_FW_CACHE is not set CONFIG_GNSS=y CONFIG_OF=y +CONFIG_BLK_DEV_NULL_BLK=m CONFIG_ZRAM=m CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=16 @@ -308,6 +309,7 @@ CONFIG_UID_SYS_STATS=y CONFIG_SCSI=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y +CONFIG_SCSI_DEBUG=m CONFIG_MD=y CONFIG_BLK_DEV_DM=y CONFIG_DM_CRYPT=y diff --git a/modules.bzl b/modules.bzl index 52d92225aab4..ad71a36c4ff5 100644 --- a/modules.bzl +++ b/modules.bzl @@ -8,6 +8,9 @@ This module contains a full list of kernel modules _COMMON_GKI_MODULES_LIST = [ # keep sorted + "crypto/crct10dif_common.ko", + "crypto/crct10dif_generic.ko", + "drivers/block/null_blk/null_blk.ko", "drivers/block/zram/zram.ko", "drivers/bluetooth/btbcm.ko", "drivers/bluetooth/btqca.ko", @@ -35,10 +38,12 @@ _COMMON_GKI_MODULES_LIST = [ "drivers/net/usb/rtl8150.ko", "drivers/net/usb/usbnet.ko", "drivers/net/wwan/wwan.ko", + "drivers/scsi/scsi_debug.ko", "drivers/usb/class/cdc-acm.ko", "drivers/usb/serial/ftdi_sio.ko", "drivers/usb/serial/usbserial.ko", "kernel/kheaders.ko", + "lib/crc-t10dif.ko", "lib/crypto/libarc4.ko", "mm/zsmalloc.ko", "net/6lowpan/6lowpan.ko",