From edfbe0ff7573cb48bd45442be45e40411d23ae6b Mon Sep 17 00:00:00 2001 From: Taehwan Kim Date: Fri, 23 Sep 2022 18:39:27 +0900 Subject: [PATCH 1/3] BoardConfig.mk: add BOARD_SUPPORT_MFC_ENC_BT2020 Bug: 239912381 Test: atest android.mediav2.cts.EncoderColorAspectsTest Change-Id: I68be5ef52d60d65886cf9e1dae5069e7daa60775 Signed-off-by: Taehwan Kim --- BoardConfig-common.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 0f7c8822..c7ff9a53 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -195,6 +195,8 @@ BOARD_USE_DEC_SW_CSC := true BOARD_USE_ENC_SW_CSC := true BOARD_SUPPORT_MFC_ENC_RGB := true BOARD_USE_BLOB_ALLOCATOR := false +BOARD_SUPPORT_MFC_ENC_BT2020 := true + ######################## BOARD_SUPER_PARTITION_SIZE := 8531214336 From 694c890c33acbea00f525b8fe4c6abc527f445fe Mon Sep 17 00:00:00 2001 From: Badhri Jagan Sridharan Date: Mon, 31 Jan 2022 15:57:24 -0800 Subject: [PATCH 2/3] Rename enable_usb dev node to move_data_to_usb kernel dev attribute has now been renamed from enable_usb to move_data_to_usb. Update the same. Bug: 251381400 Signed-off-by: Badhri Jagan Sridharan Change-Id: I8e4aa0b2e09bfef807f0169eabb79e2fa2e4d2c7 --- usb/usb/Usb.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index d7227840..f25ee347 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -73,7 +73,7 @@ constexpr char kThermalZoneForTempReadPrimary[] = "usb_pwr_therm2"; constexpr char kThermalZoneForTempReadSecondary1[] = "usb_pwr_therm"; constexpr char kThermalZoneForTempReadSecondary2[] = "qi_therm"; constexpr char kPogoUsbActive[] = "/sys/devices/platform/google,pogo/pogo_usb_active"; -constexpr char kPogoEnableUsb[] = "/sys/devices/platform/google,pogo/enable_usb"; +constexpr char KPogoMoveDataToUsb[] = "/sys/devices/platform/google,pogo/move_data_to_usb"; constexpr char kPowerSupplyUsbType[] = "/sys/class/power_supply/usb/usb_type"; constexpr int kSamplingIntervalSec = 5; void queryVersionHelper(android::hardware::usb::Usb *usb, @@ -159,12 +159,12 @@ ScopedAStatus Usb::enableUsbDataWhileDocked(const string& in_portName, ALOGI("Userspace enableUsbDataWhileDocked opID:%ld", in_transactionId); int flags = O_RDONLY; - ::android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(kPogoEnableUsb, flags))); + ::android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(KPogoMoveDataToUsb, flags))); if (fd != -1) { notSupported = false; - success = WriteStringToFile("1", kPogoEnableUsb); + success = WriteStringToFile("1", KPogoMoveDataToUsb); if (!success) { - ALOGE("Write to enable_usb failed"); + ALOGE("Write to move_data_to_usb failed"); } } From 3b533e5227b67f5bde8daa12de2f9da3605998c0 Mon Sep 17 00:00:00 2001 From: Daniel Mentz Date: Thu, 21 Jul 2022 14:45:34 -0700 Subject: [PATCH 3/3] Import prebuilt kernel modules like fips140.ko Add support for copying prebuilt kernel modules like fips140.ko into the vendor kernel ramdisk. These kernel modules are different in the following ways: - They do not appear in vendor_kernel_boot.modules.load provided by the kernel build system. - We want to put their names at the very beginning of the output modules.load file to ensure that they are loaded prior to all other modules. We define a new Makefile variable named BOARD_PREBUILT_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES. For every filename on this list, we verify that the file exists in $(KERNEL_MODULE_DIR), and if it does, we include its name in the modules.load for the vendor kernel boot ramdisk. Bug: 194712883 Change-Id: I91a1d834b32717d32621d0a67da9052324cab20c --- BoardConfig-common.mk | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index c7ff9a53..20ce92cc 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -391,11 +391,20 @@ KERNEL_MODULES := $(wildcard $(KERNEL_MODULE_DIR)/*.ko) BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.blocklist -BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_kernel_boot.modules.load)) -ifndef BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD +# Prebuilt kernel modules that are *not* listed in vendor_kernel_boot.modules.load +BOARD_PREBUILT_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES = fips140/fips140.ko +BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_EXTRA = $(foreach k,$(BOARD_PREBUILT_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES),$(if $(wildcard $(KERNEL_MODULE_DIR)/$(k)), $(k))) +KERNEL_MODULES += $(addprefix $(KERNEL_MODULE_DIR)/, $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_EXTRA)) + +# Kernel modules that are listed in vendor_kernel_boot.modules.load +BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_FILE := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_kernel_boot.modules.load)) +ifndef BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_FILE $(error vendor_kernel_boot.modules.load not found or empty) endif -BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD))) +BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD := $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_EXTRA) +BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD += $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_FILE) +BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_EXTRA)) +BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES += $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_FILE))) BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.load)) ifndef BOARD_VENDOR_KERNEL_MODULES_LOAD