From cedffc0b92712ac008cba51fa8803c34d37192fc Mon Sep 17 00:00:00 2001 From: Jim Tang Date: Fri, 4 Oct 2024 15:56:41 +0800 Subject: [PATCH 1/5] Move modem_svc_sit from gs201 to pantah Module `modem_svc_sit` is not valid unless: * USES_LASSEN_MODEM is true * BOARD_WITHOUT_RADIO is NOT true (or NOT set) Devices in gs201 family will set "USES_LASSEN_MODEM := true"; however, not evevy gs201 device disables BOARD_WITHOUT_RADIO. This commit defines PRODUCT_PACKAGES `modem_svc_sit` because it is converted from bp by moving the if-statement constrain from the module level to device level. Flag: EXEMPT refactor Bug: 358485346 Test: m modem_svc_sit Change-Id: Ie8ab9f12007b0faa3fb90e9ff0b0bb3f66e20593 --- device-cheetah.mk | 3 +++ device-cloudripper.mk | 3 +++ device-panther.mk | 3 +++ factory_ravenclaw.mk | 3 +++ 4 files changed, 12 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 5310870..719ccd6 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -130,6 +130,9 @@ PRODUCT_PACKAGES += \ android.hardware.nfc-service.st \ NfcOverlayCheetah +# modem_svc_sit daemon +PRODUCT_PACKAGES += modem_svc_sit + # SecureElement PRODUCT_PACKAGES += \ android.hardware.secure_element@1.2-service-gto \ diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 6a3638f..527cb14 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -79,6 +79,9 @@ PRODUCT_PACKAGES += \ Tag \ android.hardware.nfc-service.st +# modem_svc_sit daemon +PRODUCT_PACKAGES += modem_svc_sit + # SecureElement PRODUCT_PACKAGES += \ android.hardware.secure_element@1.2-service-gto \ diff --git a/device-panther.mk b/device-panther.mk index 08cf3bb..f376135 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -109,6 +109,9 @@ PRODUCT_PACKAGES += \ android.hardware.nfc-service.st \ NfcOverlayPanther +# modem_svc_sit daemon +PRODUCT_PACKAGES += modem_svc_sit + # SecureElement PRODUCT_PACKAGES += \ android.hardware.secure_element@1.2-service-gto \ diff --git a/factory_ravenclaw.mk b/factory_ravenclaw.mk index cd07164..0e2b679 100644 --- a/factory_ravenclaw.mk +++ b/factory_ravenclaw.mk @@ -29,3 +29,6 @@ PRODUCT_MANUFACTURER := Google # default BDADDR for EVB only PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" + +# modem_svc_sit daemon +PRODUCT_PACKAGES += modem_svc_sit From e87bccccca2cde47640db2bf27f56bcc67e16b16 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Thu, 26 Sep 2024 12:18:13 -0700 Subject: [PATCH 2/5] pantah: Pull init.insmod.*.cfg from vendor_dlkm We've started pushing init.insmod.*.cfg into the kernel prebuilts, and installing it to /vendor_dlkm/etc, but it may not be available on all prebuilt variants (e.g., kernel 5.10). Here, we: 1. conditionally install our common init.*cfg to /vendor_dlkm (only if $(TARGET_KERNEL_DIR) doesn't have a copy) 2. point init at /vendor_dlkm/etc When we've cycled completely off of kernel 5.10, we can drop #1. Bug: 369686096 Test: build, boot Flag: EXEMPT refactor Change-Id: Iff56b163d332d6226c05ff56f7838b3ad9806674 --- conf/init.cloudripper.rc | 2 +- conf/init.pantah.rc | 2 +- conf/init.ravenclaw.rc | 2 +- device-cheetah.mk | 10 +++++++--- device-cloudripper.mk | 8 ++++++-- device-panther.mk | 8 ++++++-- device-ravenclaw.mk | 8 ++++++-- 7 files changed, 28 insertions(+), 12 deletions(-) diff --git a/conf/init.cloudripper.rc b/conf/init.cloudripper.rc index 53c7e91..9cf49a2 100644 --- a/conf/init.cloudripper.rc +++ b/conf/init.cloudripper.rc @@ -15,7 +15,7 @@ on early-boot wait_for_prop vendor.common.modules.ready 1 start insmod_sh_cloudripper -service insmod_sh_cloudripper /vendor/bin/insmod.sh /vendor/etc/init.insmod.cloudripper.cfg +service insmod_sh_cloudripper /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.cloudripper.cfg class main user root group root system diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc index 7fe3687..a404bb5 100644 --- a/conf/init.pantah.rc +++ b/conf/init.pantah.rc @@ -13,7 +13,7 @@ on early-boot wait_for_prop vendor.common.modules.ready 1 start insmod_sh_pantah -service insmod_sh_pantah /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg +service insmod_sh_pantah /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.${ro.hardware}.cfg class main user root group root system diff --git a/conf/init.ravenclaw.rc b/conf/init.ravenclaw.rc index 0482aa6..5b0c9aa 100644 --- a/conf/init.ravenclaw.rc +++ b/conf/init.ravenclaw.rc @@ -15,7 +15,7 @@ on early-boot wait_for_prop vendor.common.modules.ready 1 start insmod_sh_ravenclaw -service insmod_sh_ravenclaw /vendor/bin/insmod.sh /vendor/etc/init.insmod.ravenclaw.cfg +service insmod_sh_ravenclaw /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.ravenclaw.cfg class main user root group root system diff --git a/device-cheetah.mk b/device-cheetah.mk index 719ccd6..15b8c15 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -72,9 +72,13 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/pantah/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.cheetah.rc -# insmod files +# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our +# own copy if they're not in the prebuilts. +# TODO(b/369686096): drop this when 5.10 is gone. +ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),) PRODUCT_COPY_FILES += \ - device/google/pantah/init.insmod.cheetah.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.cheetah.cfg + device/google/pantah/init.insmod.cheetah.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.cheetah.cfg +endif # MIPI Coex Configs PRODUCT_COPY_FILES += \ @@ -477,4 +481,4 @@ ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) endif -endif \ No newline at end of file +endif diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 527cb14..5c7f213 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -55,9 +55,13 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/pantah/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.cloudripper.rc -# insmod files +# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our +# own copy if they're not in the prebuilts. +# TODO(b/369686096): drop this when 5.10 is gone. +ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),) PRODUCT_COPY_FILES += \ - device/google/pantah/init.insmod.cloudripper.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.cloudripper.cfg + device/google/pantah/init.insmod.cloudripper.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.cloudripper.cfg +endif # Camera PRODUCT_COPY_FILES += \ diff --git a/device-panther.mk b/device-panther.mk index f376135..38d6608 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -63,9 +63,13 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/pantah/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.panther.rc -# insmod files +# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our +# own copy if they're not in the prebuilts. +# TODO(b/369686096): drop this when 5.10 is gone. +ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),) PRODUCT_COPY_FILES += \ - device/google/pantah/init.insmod.panther.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.panther.cfg + device/google/pantah/init.insmod.panther.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.panther.cfg +endif # MIPI Coex Configs PRODUCT_COPY_FILES += \ diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index 86c1858..1c205eb 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -59,9 +59,13 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/pantah/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.ravenclaw.rc -# insmod files +# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our +# own copy if they're not in the prebuilts. +# TODO(b/369686096): drop this when 5.10 is gone. +ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),) PRODUCT_COPY_FILES += \ - device/google/pantah/init.insmod.ravenclaw.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.ravenclaw.cfg + device/google/pantah/init.insmod.ravenclaw.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.ravenclaw.cfg +endif # Camera PRODUCT_COPY_FILES += \ From d2145494f004631bc455b5d5d8803af9a7c2baa6 Mon Sep 17 00:00:00 2001 From: Eileen Lai Date: Wed, 9 Oct 2024 08:07:17 +0000 Subject: [PATCH 3/5] modem_svc: use shared_modem_platform to replace all modem_svc_sit Bug: 368257019 Flag: EXEMPT resource only update Change-Id: Iba54f9fbbad25c236feb265ff04545998a7134e5 --- device-cheetah.mk | 7 +++++-- device-cloudripper.mk | 7 +++++-- device-panther.mk | 7 +++++-- factory_ravenclaw.mk | 7 +++++-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 15b8c15..34276c3 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -134,8 +134,11 @@ PRODUCT_PACKAGES += \ android.hardware.nfc-service.st \ NfcOverlayCheetah -# modem_svc_sit daemon -PRODUCT_PACKAGES += modem_svc_sit +# Shared Modem Platform +SHARED_MODEM_PLATFORM_VENDOR := lassen + +# Shared Modem Platform +include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk # SecureElement PRODUCT_PACKAGES += \ diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 5c7f213..151f1db 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -83,8 +83,11 @@ PRODUCT_PACKAGES += \ Tag \ android.hardware.nfc-service.st -# modem_svc_sit daemon -PRODUCT_PACKAGES += modem_svc_sit +# Shared Modem Platform +SHARED_MODEM_PLATFORM_VENDOR := lassen + +# Shared Modem Platform +include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk # SecureElement PRODUCT_PACKAGES += \ diff --git a/device-panther.mk b/device-panther.mk index 38d6608..2d92c63 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -113,8 +113,11 @@ PRODUCT_PACKAGES += \ android.hardware.nfc-service.st \ NfcOverlayPanther -# modem_svc_sit daemon -PRODUCT_PACKAGES += modem_svc_sit +# Shared Modem Platform +SHARED_MODEM_PLATFORM_VENDOR := lassen + +# Shared Modem Platform +include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk # SecureElement PRODUCT_PACKAGES += \ diff --git a/factory_ravenclaw.mk b/factory_ravenclaw.mk index 0e2b679..f11f738 100644 --- a/factory_ravenclaw.mk +++ b/factory_ravenclaw.mk @@ -30,5 +30,8 @@ PRODUCT_MANUFACTURER := Google PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" -# modem_svc_sit daemon -PRODUCT_PACKAGES += modem_svc_sit +# Shared Modem Platform +SHARED_MODEM_PLATFORM_VENDOR := lassen + +# Shared Modem Platform +include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk From 99a2848193647b8c40d72f44ff6616ff285511d7 Mon Sep 17 00:00:00 2001 From: "Ali K. Zadeh" Date: Fri, 2 Aug 2024 19:44:40 +0000 Subject: [PATCH 4/5] [pantah] Define CAMERA_MULTICAM_BOOST Port from ag/28607900 This CL defines CAMERA_MULTICAM_BOOST (with the same settings as the existing CAMERA_ZOOMING_BOOST). Having both definitions is necessary to be able to transition from zooming boost to multicam boost. Once the multicam boost flag is fully rolled out, we can remove the CAMERA_ZOOMING_BOOST. Bug: 347829135 Test: adb logcat Flag: EXEMPT resource file only change Change-Id: I9da2cdfe5c23aab43b5189788b0a90f2780d5f6f --- powerhint-cheetah-a0.json | 12 ++++++++++++ powerhint-cheetah.json | 12 ++++++++++++ powerhint-panther-a0.json | 12 ++++++++++++ powerhint-panther.json | 12 ++++++++++++ 4 files changed, 48 insertions(+) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index 0d0a92c..fe84255 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -995,6 +995,18 @@ "Duration": 100, "Value": "0" }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", "Node": "TAPreferHighCap", diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index f7f991e..802422b 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -1135,6 +1135,18 @@ "Duration": 100, "Value": "0" }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", "Node": "TAPreferHighCap", diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index d75dfca..22aaa14 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -984,6 +984,18 @@ "Duration": 100, "Value": "0" }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", "Node": "TAPreferHighCap", diff --git a/powerhint-panther.json b/powerhint-panther.json index 866fb9c..cb203c4 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -1093,6 +1093,18 @@ "Duration": 100, "Value": "0" }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", "Node": "TAPreferHighCap", From 38c5d366ef4a32751f0642a2cf9c9e34f50dbcba Mon Sep 17 00:00:00 2001 From: Kyle Hsiao Date: Tue, 5 Nov 2024 03:03:40 +0000 Subject: [PATCH 5/5] Update ISODEP routing setting Bug: 323953256 Test: manual Flag: EXEMPT bugfix Change-Id: Ic809f837493ea92b47545dde7b5cf7c52831326f --- nfc/libnfc-hal-st.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf index ee5feaa..bcce399 100644 --- a/nfc/libnfc-hal-st.conf +++ b/nfc/libnfc-hal-st.conf @@ -135,7 +135,7 @@ OFFHOST_ROUTE_ESE={86} # host 0x00 # eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) # UICC 0x81 (UICC_1), 0x85 (UICC_2) -DEFAULT_ISODEP_ROUTE=0x81 +DEFAULT_ISODEP_ROUTE=0x00 ############################################################################### # Configure the HAL Clock control