From cf891d2ebe30ab91c287ea8b45694cb7df1c3bfb Mon Sep 17 00:00:00 2001 From: Jim Tang Date: Fri, 4 Oct 2024 15:30:30 +0800 Subject: [PATCH 1/3] Move modem_svc_sit from gs101 to raviole Module `modem_svc_sit` is not valid unless: * USES_LASSEN_MODEM is true * BOARD_WITHOUT_RADIO is NOT true (or NOT set) Devices in gs101 family will set "USES_LASSEN_MODEM := true"; however, not evevy gs101 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: Ib3f7c8b0376e7cdec70e4baaf37e7a43c7d41333 --- device-oriole.mk | 3 +++ device-raven.mk | 3 +++ device-slider.mk | 3 +++ device-whitefin.mk | 3 +++ 4 files changed, 12 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index 52a9216..8959feb 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -155,6 +155,9 @@ PRODUCT_PACKAGES += \ android.hardware.nfc-service.st \ NfcOverlayOriole +# modem_svc_sit daemon +PRODUCT_PACKAGES += modem_svc_sit + # SecureElement PRODUCT_PACKAGES += \ android.hardware.secure_element@1.2-service-gto \ diff --git a/device-raven.mk b/device-raven.mk index 3cfe900..d43d2cb 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -160,6 +160,9 @@ PRODUCT_PACKAGES += \ android.hardware.nfc-service.st \ NfcOverlayRaven +# modem_svc_sit daemon +PRODUCT_PACKAGES += modem_svc_sit + # SecureElement PRODUCT_PACKAGES += \ android.hardware.secure_element@1.2-service-gto \ diff --git a/device-slider.mk b/device-slider.mk index f960cba..e49b151 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -91,6 +91,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-whitefin.mk b/device-whitefin.mk index d82b530..7dea345 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -87,6 +87,9 @@ PRODUCT_PACKAGES += \ Tag \ android.hardware.nfc-service.st +# modem_svc_sit daemon +PRODUCT_PACKAGES += modem_svc_sit + # PowerStats HAL PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin From 1ea54293900eae55e8daa6efe3152debfea1f3dc Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Thu, 26 Sep 2024 12:18:13 -0700 Subject: [PATCH 2/3] raviole: 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: Ibefafbcfe1fdf9b4e65ee3d73126c33f04ee193b --- conf/init.raviole.rc | 2 +- conf/init.slider.rc | 2 +- conf/init.whitefin.rc | 2 +- device-oriole.mk | 8 ++++++-- device-raven.mk | 8 ++++++-- device-slider.mk | 8 ++++++-- device-whitefin.mk | 8 ++++++-- 7 files changed, 27 insertions(+), 11 deletions(-) diff --git a/conf/init.raviole.rc b/conf/init.raviole.rc index a09cbae..f70546d 100644 --- a/conf/init.raviole.rc +++ b/conf/init.raviole.rc @@ -32,7 +32,7 @@ on boot && property:ro.build.type=userdebug && \ property:persist.vendor.fingerprint.disable.fake.override=100 setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override} -service insmod_sh_raviole /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg +service insmod_sh_raviole /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.${ro.hardware}.cfg class main user root group root system diff --git a/conf/init.slider.rc b/conf/init.slider.rc index 49c20ea..db78b71 100644 --- a/conf/init.slider.rc +++ b/conf/init.slider.rc @@ -16,7 +16,7 @@ on early-boot start insmod_sh_slider -service insmod_sh_slider /vendor/bin/insmod.sh /vendor/etc/init.insmod.slider.cfg +service insmod_sh_slider /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.slider.cfg class main user root group root system diff --git a/conf/init.whitefin.rc b/conf/init.whitefin.rc index 8894c75..b492fdd 100644 --- a/conf/init.whitefin.rc +++ b/conf/init.whitefin.rc @@ -14,7 +14,7 @@ on early-boot wait_for_prop vendor.common.modules.ready 1 start insmod_sh_whitefin -service insmod_sh_whitefin /vendor/bin/insmod.sh /vendor/etc/init.insmod.whitefin.cfg +service insmod_sh_whitefin /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.whitefin.cfg class main user root group root system diff --git a/device-oriole.mk b/device-oriole.mk index 8959feb..a59b2ed 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -69,9 +69,13 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.oriole.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/raviole/init.insmod.oriole.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.oriole.cfg + device/google/raviole/init.insmod.oriole.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.oriole.cfg +endif # Thermal Config PRODUCT_COPY_FILES += \ diff --git a/device-raven.mk b/device-raven.mk index d43d2cb..0b63ac5 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -77,9 +77,13 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.raven.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/raviole/init.insmod.raven.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.raven.cfg + device/google/raviole/init.insmod.raven.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.raven.cfg +endif # Thermal Config PRODUCT_COPY_FILES += \ diff --git a/device-slider.mk b/device-slider.mk index e49b151..5e90e1a 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -48,9 +48,13 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.slider.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/raviole/init.insmod.slider.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.slider.cfg + device/google/raviole/init.insmod.slider.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.slider.cfg +endif # Thermal Config PRODUCT_COPY_FILES += \ diff --git a/device-whitefin.mk b/device-whitefin.mk index 7dea345..94938f6 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -52,9 +52,13 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.whitefin.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/raviole/init.insmod.whitefin.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.whitefin.cfg + device/google/raviole/init.insmod.whitefin.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.whitefin.cfg +endif # Thermal Config PRODUCT_COPY_FILES += \ From 013069b4781ce6a91e69aed75587e01c2250aded Mon Sep 17 00:00:00 2001 From: Eileen Lai Date: Wed, 9 Oct 2024 08:13:38 +0000 Subject: [PATCH 3/3] modem_svc: use shared_modem_platform to replace all modem_svc_sit Bug: 368257019 Flag: EXEMPT resource only update Change-Id: I27053324a5b58fa290c3c1a3e5211812bf1acc58 --- device-oriole.mk | 7 +++++-- device-raven.mk | 7 +++++-- device-slider.mk | 7 +++++-- device-whitefin.mk | 7 +++++-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index a59b2ed..b38f140 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -159,8 +159,11 @@ PRODUCT_PACKAGES += \ android.hardware.nfc-service.st \ NfcOverlayOriole -# 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-raven.mk b/device-raven.mk index 0b63ac5..49ff1e0 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -164,8 +164,11 @@ PRODUCT_PACKAGES += \ android.hardware.nfc-service.st \ NfcOverlayRaven -# 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-slider.mk b/device-slider.mk index 5e90e1a..f47ab65 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -95,8 +95,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-whitefin.mk b/device-whitefin.mk index 94938f6..41a969c 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -91,8 +91,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 # PowerStats HAL PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin